thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
20543 commits 1 branch 12 tags 205 MiB
Commit graph

211 commits

Author SHA1 Message Date
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
SeventhSentinel
1d58c6b8c2 merge srb2 next 2019-01-05 15:59:23 -05:00
mazmazz
81352aece1 WIP 20190101 merge 
d_netcmd.c
filesrch.c
m_menu.c
p_setup.c
p_spec.c
r_data.c
r_main.c
r_things.c
w_wad.c
w_wad.h
 2019-01-02 01:09:15 -05:00
mazmazz
de0943352a Revert default console backcolor to green; changed from CHAT commit 2018-12-24 20:57:11 -05:00
Digiku
15c9404f91 Merge branch 'addons-backport' into '2122-version' 
Addons Menu backport to vanilla

See merge request STJr/SRB2!384
 2018-12-23 18:08:06 -05:00
Latapostrophe
1b8be7f1a4 Merge branch 'master' into SRB2-CHAT 2018-12-23 10:26:08 +01:00
Latapostrophe
4c88271cfb 2.1.21 and all of the kart additions. Woo. 2018-12-17 20:43:59 +01:00
Latapostrophe
34f13e9f20 merge conflict 2018-12-16 16:48:15 +01:00
mazmazz
ede6b183b1 Merge branch 'addons_menu' into 'master' 
Addons menu

See merge request KartKrew/Kart!8
 2018-12-15 20:46:42 -05:00
MPC
9372baf427 Software plane fixes 2018-12-14 14:08:25 -03:00
TehRealSalt
4507ee18fd Merge remote-tracking branch 'srb2public/next' into merge-next 2018-11-29 08:49:50 -05:00
mazmazz
c91b2b4456 Update source copyrights to 2018 2018-11-25 07:35:38 -05:00
Latapostrophe
0c16dad2d7 forgot whitespaces.... 2018-11-17 22:23:23 +01:00
Latapostrophe
30255b4c9a Fix capslock not working outside of chat/console and shifting non letter characters 2018-11-17 22:21:10 +01:00
MPC
7c18702f84 Render the startup screen on OpenGL mode 2018-11-10 15:56:13 -03:00
mazmazz
b7af1e385b Set up separate background color for prompts vs. console 2018-11-09 22:38:55 -05:00
toaster
94ea5b6c89 Redo the help command stuff, this time with much less impact on other areas of the code for sanity as we approach R1. 2018-11-05 12:49:28 +00:00
Latapostrophe
35f576c166 Spectate / enter game in chat + New console colours + Highlight chat scroll arrow + small cleanup for consolefill 2018-10-25 13:21:44 +02:00
Latapostrophe
c578617220 Merge branch 'chat-changes' of git.magicalgirl.moe:KartKrew/Kart into chat-changes 2018-10-21 14:53:22 +02:00
Latapostrophe
84b513a952 Console background color default changed to Black + Resolved merge conflict (hopefully) 2018-10-21 14:51:34 +02:00