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

1397 commits

Author SHA1 Message Date
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
Bartu İnce
15f1636be5 Extra emblems display, take 2. 2020-01-22 21:52:15 +01:00
Bartu İnce
2337393211 Added support for 10+ emblem hints 2020-01-22 18:53:17 +01:00
James R
99ad30796c Trim the trailing zeros off floats for cvars 2020-01-20 23:14:26 -08:00
Louis-Antoine
4777829d45 Fix mouse in controls setup menu 2020-01-18 20:18:20 +01:00
Tatsuru
a4215645f7 Goal posts 2020-01-18 13:15:24 -03:00
Tatsuru
d70a76bacd Put cv_exitmove in the menus 2020-01-18 12:06:04 -03:00
Alam Ed Arias
282abfd4ac Merge branch 'master' into next 2020-01-16 12:08:36 -05:00
James R
97ca460531 Merge branch 'split-emblem-hints' into 'next' 
"Symmetrical"-ish Emblem Hint pages

See merge request STJr/SRB2!670
 2020-01-12 17:16:03 -05:00
Zwip-Zwap Zapony
eb58de0980 Fix "symmetrical"-ish emblem hints for ERRORMODE 
"left_hints" is always 3, 4, or 5, so the signedness is irrelevant.
But with ERRORMODE set to 1 when compiling,
the compile would previously stop due to comparing INT32 to UINT32.
 2020-01-12 23:09:27 +01:00
Monster Iestyn
54f1cd601e Merge branch 'master' into next 2020-01-11 18:38:09 +00:00
Zwip-Zwap Zapony
599d7a5345 Make >5 <10 emblem hints appear "symmetrical"-ish 
With more than 5 but less than 10 emblem hints,
only put half of the hints on each side of the hint menu,
instead of putting e.g. 5 on the left and 1 on the right.
 2020-01-11 14:59:10 +01:00
James R
3225affa98 Merge branch 'showconditionset' into 'next' 
Showconditionset

See merge request STJr/SRB2!651
 2020-01-10 15:59:37 -05:00
James R
fc82e03600 Merge branch 'morehints' into 'next' 
Allow for 10 emblem hints on a map by poking the drawer a bit.

See merge request STJr/SRB2!650
 2020-01-10 15:59:22 -05:00
James R
3868ca6cfb Menu option for 1upsound 2020-01-10 12:55:22 -08:00
James R
4652e87948 Merge branch 'software-fov' into 'master' 
Software FOV

See merge request STJr/SRB2!662
 2020-01-10 00:33:24 -05:00
James R
f97afe47fa Merge remote-tracking branch 'origin/master' into next 2020-01-08 13:27:14 -08:00
toaster
44b68036e8 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into showconditionset 
# Conflicts:
#	src/m_menu.c
 2020-01-08 20:00:50 +00:00
toaster
a2ae30c2e2 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into morehints 
# Conflicts:
#	src/m_menu.c
 2020-01-08 19:18:35 +00:00
fickleheart
084a8db5a9 Merge remote-tracking branch 'upstream/next' into next-newcontrols 2020-01-07 23:43:43 -06:00
Steel Titanium
9a48bc65ec Update copyright statements for changed names 2020-01-06 17:16:27 -05:00
Alam Ed Arias
06849fed6b Merge branch 'master' into next 2020-01-06 10:28:21 -05:00
Alam Ed Arias
4ffe5d0670 cleanup whitespace 2020-01-05 21:49:07 -05:00
James R
a850a97300 Merge branch 'connect-ip-textbox' into 'master' 
Add clipboard functionality to the Connect via IP textbox.

See merge request STJr/SRB2!597
 2020-01-05 17:06:45 -05:00
fickleheart
067b132eb1 Merge remote-tracking branch 'origin/next' into next-newcontrols 2020-01-04 09:57:09 -06:00
fickleheart
ce0c42a767 Merge branch 'newcontrols' into next-newcontrols 2020-01-04 09:56:24 -06:00
fickleheart
992ead1c85 Merge remote-tracking branch 'origin/master' into newcontrols 2020-01-04 09:35:12 -06:00
Alam Ed Arias
caa7f52f7f Merge branch 'master' into next 2020-01-03 14:56:37 -05:00
LJ Sonic
3ae44063f1 Merge branch 'ungrab-mouse-in-menus' into 'master' 
Let the mouse move freely when a menu is open or game is paused

See merge request STJr/SRB2!617
 2020-01-02 18:48:38 -05:00
Louis-Antoine
f750144c88 Minor code refactoring 2020-01-02 00:47:20 +01:00
Louis-Antoine
61a681ed02 Grab mouse again when closing menu, unpausing, etc 2020-01-02 00:45:28 +01:00