Sally Coolatta
b4f8d708a4
Merge branch 'master' into new-menus
2020-05-09 17:04:10 -04:00
James R
18ced99463
Put some mutex on CONS_Printf etc. hahaha
2020-04-28 13:08:43 -07:00
James R
eb0ba37dce
Merge remote-tracking branch 'origin/master' into HEAD
2020-04-24 22:10:59 -07:00
toasterbabe
ae3c4a0227
Removal of cv_allcaps for console stuff.
...
(cherry picked from commit 95d89078f5
2020-03-23 15:05:00 -07:00
Jaime Passos
876d4cd02b
Fix OpenGL
2020-03-17 15:23:13 -03:00
Jaime Passos
7ac4c3eea7
Fix con_backpic
2020-03-17 13:05:54 -03:00
fickleheart
33a9e5aa83
Merge remote-tracking branch 'upstream/master' into shaders-222
...
# Conflicts:
# src/hardware/r_opengl/r_opengl.c
# src/i_video.h
# src/r_main.c
# src/r_main.h
# src/screen.c
# src/sdl/i_video.c
# src/sdl/ogl_sdl.c
# src/w_wad.c
2020-03-14 12:52:15 -05:00
James R
c69ca7381c
Merge branch 'console-in-menus-mk-ii' into 'master'
...
Console in menus again!
See merge request STJr/SRB2!797
2020-02-23 18:15:43 -05:00
James R
2274129f57
Update copyright year to 2020
2020-02-19 14:08:45 -08:00
James R
2d98b3f9eb
Revert "Revert "Let the console open in menus""
...
This reverts commit 73368b0c9a
2020-02-17 16:37:13 -08:00
Jaime Passos
043057532c
Merge remote-tracking branch 'origin/master' into sal-oglshaderport
2020-02-17 12:28:16 -03:00
James R
73368b0c9a
Revert "Let the console open in menus"
...
This reverts commit 3a9cc8db92
2020-02-16 17:14:54 -08:00
Jaime Passos
830583d973
why does this still exist?
2020-02-08 18:19:27 -03:00
James R
294543037d
Oops
2020-01-30 23:58:35 -08:00
James R
1de00bc6bb
Merge branch 'word' into 'master'
...
Word jumping
See merge request STJr/SRB2!653
2020-01-16 20:05:12 -05:00
James R
a5904808d1
Merge branch 'you-cant-escape-console' into 'master'
...
Open the console in menus and draw backpic correctly
See merge request STJr/SRB2!665
2020-01-12 15:38:51 -05:00
James R
3a9cc8db92
Let the console open in menus
2020-01-09 22:42:00 -08:00
James R
ed6a78fe05
Show Sonic's ass if con_backpic. No wait, I mean crop the backpic...
2020-01-09 22:39:01 -08:00
James R
cee3612dea
Let Escape close the console
2020-01-09 22:16:46 -08:00
James R
0f4ef9a354
Put the word jumping code in functions
2020-01-08 12:58:19 -08:00
James R
d68c420315
Left word jump (whoo that took long)
2020-01-08 02:54:17 -08:00
James R
827d673667
Right word jump
2020-01-08 01:03:44 -08:00
Louis-Antoine
61a681ed02
Grab mouse again when closing menu, unpausing, etc
2020-01-02 00:45:28 +01:00
Jaime Passos
6976b9bf01
Merge remote-tracking branch 'origin/master' into renderswitch
2019-12-10 23:01:10 -03:00
Steel Titanium
a5cdb0a4b3
Update copyright date on source files
2019-12-06 13:49:42 -05:00
Jaime Passos
845b82668b
Merge remote-tracking branch 'origin/master' into renderswitch
2019-11-12 20:25:40 -03:00
toaster
69d43435f5
Improved "HELP" command!
...
Ported from Kart, original commit also by me (toaster).
2019-10-15 13:36:04 +01:00
TehRealSalt
ca83b06d93
Fuckhuge restructuring
...
- m_menu.c and m_menu.h are dead. Everything has now been moved to k_menudef.c, k_menufunc.c, k_menudraw.c, and k_menu.h.
- Expanded menu_t and menuitem_t to add transitions and tooltips
- Early character select screen
- Removed almost all menu definitions, I'll be reimporting them as they are needed
2019-10-02 11:31:11 -04:00
Jaime Passos
ce8b821691
Merge remote-tracking branch 'jimita/renderswitch' into renderswitch
2019-09-10 18:12:01 -03:00
Jaime Passos
371e160940
I am the CEO of renderers
2019-09-09 16:20:17 -03:00
Jaime Passos
93ea8c4019
can i push this already?
2019-09-08 22:25:18 -03:00
Jaime Passos
11077c2bac
still making things better
2019-09-08 21:37:24 -03:00
Jaime Passos
1cb22d5e6b
initial stuff
2019-09-08 18:44:40 -03:00
Jaime Passos
398b320aec
initial stuff
2019-09-08 18:27:35 -03:00
toaster
74c32c1b2b
A good and bad ending cutscene now exist.
...
Also:
* SPR2_XTRA - instead of defining lumpnames in S_SKIN, those kinds of assets can just be bundled into the spriteset. Required for ending cutscene stuff, I guess, but also done for HUD life icon and character select image (aside from Sonic&Tails, still SOC'd in).
* Minor oversights in SPR2 support corrected.
* Better evaluation, featuring ending assets.
* Intro has warping-in blackrock, reusing ending assets.
* Cutscene text now supports lowercase (intro and custom).
* Disable the asset-fucking "gamma correction" I put in over two years ago when implementing colour cube. (This is the only thing I could move into another branch if you MUST, but it's basically invisble in the diff so w/e.)
* Don't blank the screen if the top left pixel of a screen-covering patch is transparent. (Checked via nonzero topdelta for first column)
Bugs:
* OPENGL ONLY: The first ~20 frames of both endings are fucked. A little help here? Might be HWR_DrawFadeFill's fault, which I just created. OR it could be in f_finale, but I doubt it, since it doesn't appear in Software.
2019-07-28 00:32:57 +01:00
Steel Titanium
8d1db45599
Fix console back color not being correct.
...
This also adds support for using such colors in a text prompt
2019-06-26 22:08:17 -04:00
Monster Iestyn
04a8c9a283
Merge branch 'public_next'
2019-05-16 15:58:17 +01:00
Steel Titanium
2c4555493d
Merge branch 'perpetual-modifier-updates' into 'master'
...
Set modifiers in a non-reactive manner
See merge request STJr/SRB2!456
2019-05-13 00:36:06 -04:00
TehRealSalt
6ee5b2d887
Change some of the text colors
2019-05-12 21:49:11 -04:00
TehRealSalt
dc41fe3d8d
Port over only the relevant changes from the reduced-palette branch, update some of the Kart-specific stuff
2019-05-12 17:19:49 -04:00
wolfy852
2222738e1c
Merge remote-tracking branch 'remotes/srb2pub/public_flatsprite' into next
...
# Conflicts:
# src/d_netcmd.c
# src/doomdef.h
# src/doomstat.h
# src/f_finale.c
# src/g_game.c
# src/hu_stuff.c
# src/m_menu.c
# src/p_spec.c
# src/p_user.c
# src/r_main.c
# src/r_things.c
# src/s_sound.c
# src/v_video.c
# src/y_inter.c
2019-05-06 22:40:12 -05:00
Monster Iestyn
6827688575
Merge branch 'public_next'
2019-04-02 15:49:15 +01:00
James R
f995e8c241
Resize console upon resolution change
...
Basically, changing to a lower resolution won't cause your console to extend
past the screen anymore.
2019-03-26 12:30:02 -07:00
jameds
a8aea17469
Keep color across wrapped lines
...
And this works by inserting the same color code on each wrapped line.
2019-03-26 12:07:11 -07:00
jameds
f6143dafb0
Scroll console immediately upon pressing PageUp
2019-03-26 12:05:23 -07:00
fickleheart
a16243e84d
Deduplicate character shifting code
2019-03-10 18:09:15 -05:00
fickleheart
acf1827d9e
Handle capslock in just one place...?
2019-03-09 16:55:18 -06:00
james
e4a1470116
Set modifiers in a non-reactive manner
2019-01-17 16:47:01 -08:00
mazmazz
7a97ebe985
Dummy out SRB2-CHAT console colors
...
Pending translation to 2.2 palette indexes
2019-01-07 21:54:38 -05:00
mazmazz
4f40d2abdb
Merge errors for compile
2019-01-07 17:05:20 -05:00
