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
11783 commits 1 branch 12 tags 205 MiB
Commit graph

903 commits

Author SHA1 Message Date
Steel Titanium
98be23e3c2 Merge branch 'master' into next 2020-03-18 15:42:02 -04:00
SteelT
d2d8fe64f5 Merge branch 'fix-nights-mode-menu-wrong-return' into 'master' 
NiGHTS Mode menu fixes

See merge request STJr/SRB2!841
 2020-03-18 15:41:17 -04:00
LJ Sonic
b46b698c91 Merge branch 'screenshot-menu-header' into 'master' 
Actually use the "SCREENSHOT OPTIONS" header for its menu.

See merge request STJr/SRB2!832
 2020-03-18 10:56:35 -04:00
LJ Sonic
21cb05b1f7 Merge branch 'fix-playernode-crash' into 'next' 
Fix buffer overrun with players with no associated node

See merge request STJr/SRB2!810
 2020-03-15 15:36:45 -04: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
sphere
db26ce5139 Check if emblem hints are actually unlocked. 2020-03-13 10:46:57 -04:00
Steel Titanium
b9c7eafdfe Fix guest data being deleted regardless of choice 2020-03-08 00:34:15 -05:00
Steel Titanium
0cd8a94a5b Fix guest deletion confirmation returning to Record Attack menu from Nights Mode menu 2020-03-08 00:02:43 -05:00
Jaime Passos
81a57d5fac Merge remote-tracking branch 'origin/next' into pictureformats 2020-03-07 20:43:16 -03:00
Jaime Passos
b800e013d0 Fix NiGHTS Attack crash after render mode change 2020-03-04 09:42:34 -03:00
SteelT
800d277dec Merge branch 'fix-ogllib' into 'master' 
Fix -OGLlib

See merge request STJr/SRB2!794
 2020-03-02 15:21:50 -05:00
sphere
422bc7439b Actually use the "SCREENSHOT OPTIONS" header for its menu. 2020-03-02 13:23:54 +01:00
SwitchKaze
9508b23d85 Merge branch 'next' of https://github.com/STJr/SRB2 into next-luacolors 2020-02-29 23:41:16 -05:00
SwitchKaze
044e19e328 Prohibit modification of built-in colors 
In addition, fixes a bug where loading a custom color using command line params exhibits strange behavior.
 2020-02-29 23:14:49 -05:00
fickleheart
eaeae45ec2 Use a named macro for menu hierarchy 
This _really_ needs to be a UINT8 array instead of
all this bit-shifting nonsense that saves no space,
but at least this way reading the menu structs doesn't
make me want to die.
 2020-02-24 18:00:17 -06:00
sphere
24511e67fc Allow emblem hints (and radar) in record attack. 2020-02-24 17:31:30 +01:00
fickleheart
663403e016 Skip empty gametypes in level select menu 2020-02-24 10:02:48 -06: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
SwitchKaze
99a1840101 Merge branch 'next' of https://github.com/STJr/SRB2 into next-luacolors 2020-02-23 11:50:13 -05:00
James Hale
51137837c4 Custom skincolors 2020-02-21 21:56:39 -05:00
Steel Titanium
fc042e90f0 Merge branch 'master' into next 2020-02-21 21:01:29 -05:00
Louis-Antoine
59a53908e5 Improve join refusal handling 2020-02-22 02:17:21 +01:00
James R
2274129f57 Update copyright year to 2020 2020-02-19 14:08:45 -08:00
Jaime Passos
b0ce2e088f Merge remote-tracking branch 'origin/next' into pictureformats 2020-02-19 02:25:36 -03:00
Steel Titanium
f1204a80aa Merge branch 'next' into the-colors-feel-so-right 2020-02-18 14:29:50 -05:00
Monster Iestyn
41bdc91bf0 Merge branch 'master' into next 2020-02-18 17:38:05 +00:00
James R
b9c2cab265 Don't let console open with menu keys while the menu is open 2020-02-17 17:10:29 -08:00
Jaime Passos
fd23294cc4 Rename stuff around 2020-02-17 21:11:56 -03:00
Jaime Passos
043057532c Merge remote-tracking branch 'origin/master' into sal-oglshaderport 2020-02-17 12:28:16 -03:00
Jaime Passos
f189e0425f add -nogl parm 2020-02-17 12:14:51 -03:00
James R
d1aa45212d Merge branch 'trim-floats' into 'master' 
Trim the trailing zeros off floats for cvars

See merge request STJr/SRB2!716
 2020-02-17 00:04:15 -05:00
James R
88809684ef Merge branch 'extra-emblem-display' into 'next' 
Extra emblem hint display

See merge request STJr/SRB2!721
 2020-02-17 00:00:36 -05:00
James R
256c9a20db Merge branch 'local-color-table' into 'master' 
Local Color Table for GIF movie mode

See merge request STJr/SRB2!742
 2020-02-16 23:58:11 -05:00
Steel Titanium
299d8b2772 Merge branch 'next' into the-colors-feel-so-right 2020-02-16 22:56:27 -05:00
Steel Titanium
eed763651f Add prefoppoistecolor support to save cards 2020-02-15 17:34:21 -05:00
MascaraSnake
de939049ee Merge branch 'master' into next 2020-02-15 12:32:09 +01:00
GoldenTails
54acb48e4a I broke SHIFT in the Connect IP Textbox.. whoops. 
It's okay, I literally had to remove one line lmao.
 2020-02-11 19:07:48 -06:00
Jaime Passos
d552e4a1c2 Restore some functionality that went missing 2020-02-03 02:12:55 -03:00
Jaime Passos
3f834d2de0 Merge remote-tracking branch 'origin/master' into local-color-table 2020-02-03 01:52:43 -03:00
Jaime Passos
e56273f909 Merge remote-tracking branch 'origin/next' into sal-oglshaderport 2020-02-01 23:02:15 -03:00
James R
ff2ec925ee Merge remote-tracking branch 'origin/master' into next 2020-01-30 23:54:56 -08:00
Jaime Passos
dac93c343f Update the Screenshot Options menu 2020-01-29 13:52:02 -03:00
Jaime Passos
ada3f58d25 Fix M_DrawNightsAttackMountains being broken for obvious reasons 2020-01-27 00:44:10 -03:00
Monster Iestyn
eca4bc63da Merge branch 'master' into next 
# Conflicts:
#	src/g_game.c
 2020-01-26 19:23:05 +00:00
Jaime Passos
6b709386cf fix corona compiling lol 2020-01-23 23:41:09 -03:00
Jaime Passos
f89191c6cf Menu organisation 2020-01-23 23:15:27 -03:00
Jaime Passos
6f2635d4c1 bye 2020-01-23 23:09:53 -03:00
Jaime Passos
2cdd40ffdb I LOVE MENU CODE! 2020-01-23 22:38:54 -03:00
Bartu İnce
15ecc1358a no message 2020-01-22 22:08:08 +01:00
Bartu İnce
5d32334164 "page x of y" 2020-01-22 21:57:28 +01:00