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
Sally Coolatta
b9436ee015 More fixing up 
Got tired again, but now it makes it to f_finale
 2020-08-11 18:46:00 -04:00
Sally Coolatta
8731c6b7a4 Another round of fixing up 
- gametyperules are now fitting for kart, not applied to the whole codebase though
- a few more files compile
 2020-08-11 16:13:17 -04:00
Sally Coolatta
a50a9a1843 Lots of splitscreen fixes 
LOTS of stuff I changed to use arrays instead of constantly duplicated code
 2020-08-10 23:38:32 -04:00
Sally Coolatta
c96bd5f64a Many removals 
Lots of NiGHTS code, lots of ringslinger code, revert actnum behavior back to vanilla
 2020-08-10 21:45:51 -04:00
Sally Coolatta
7ac6723e46 gamecontrol has another index for player num, instead of being duplicated for players 2-4 2020-08-10 20:08:32 -04:00
Sal
80d37b1939 Merge branch 'http-mserv' into 'master' 
Make the HTTP Master Server official

See merge request KartKrew/Kart-Public!193
 2020-08-10 16:49:47 -04:00
Sally Coolatta
0b6621371c master m_menu again 2020-08-10 15:19:03 -04:00
Sally Coolatta
e296e1309a YAY, round 2 2020-08-09 21:02:56 -04:00
James R
42dbdd8c4a Merge branch 'http-mserv' into 'next' 
HTTP Based Master Server + Multithreading

See merge request STJr/SRB2!940
 2020-08-09 20:24:26 -04:00
Sally Coolatta
90bd22aac3 Replace m_menu with ours 
No, we're not fixing 229 conflicts for a file that we're completely deleting later.
 2020-08-09 20:08:11 -04:00
James R
9955ff1357 Merge branch 'kill-dos' into 'next' 
Remove support for DOS

See merge request STJr/SRB2!1090
 2020-08-08 21:26:18 -04:00
James R
2e3b0ae4c8 Merge remote-tracking branch 'origin/next' into http-mserv 2020-08-08 15:05:03 -07:00
AJ Martinez
4f1642bbce Clarify addon-related messages 2020-08-05 00:40:56 -05:00
Sally Coolatta
3d53adaa2b Sliding HUD 
- Split HUD stuff into k_hud.c/h
- V_SPLITSCREEN replaces the old function that sets V_SPLITSCREEN/V_HORZSCREEN flags system, and instead automatically moves it based on player number
- V_SLIDEIN makes HUD items slide in after the intro animation.
 2020-07-26 05:47:53 -04:00
James R
38d9fddac2 Merge branch 'musicpref-var' into 'next' 
Console variable to select music preference

See merge request STJr/SRB2!939
 2020-07-25 20:14:22 -04:00
Steel Titanium
62c85ea4a5 WIP: Remove support for DOS 
WIP because I don't know if this wording is right for the error.
 2020-07-25 18:55:51 -04:00
Sally Coolatta
ba6d5e95ba Add Sneaker x2 to pad out the item table a bit better 
Jeck mentioned it, we agreed it might be a fun item because stacking sneakers is possible now
 2020-07-24 19:11:52 -04:00
James R
47719474ef Merge remote-tracking branch 'origin/next' into http-mserv 2020-07-13 08:58:43 -07:00
James R
e09a430804 Merge remote-tracking branch 'origin/next' into remove-glide-2 2020-07-12 16:05:15 -07:00
James R
84d9aa93c7 Merge remote-tracking branch 'origin/next' into http-mserv 2020-07-11 17:41:46 -07:00
toaster
517b243cb7 Hopefully fix the issue, which I can't recreate, of live event backups being created even if they shouldn't. 2020-07-10 21:27:34 +01:00
toaster
3c3143effa Change the default value of the In-game/Realtime timer selection, based on speedrunner feedback. 2020-07-10 21:24:25 +01:00
Latapostrophe
fb978f9b91 Merge branch 'v2-master' into followme-internal 2020-07-09 23:34:24 +02:00
SteelT
d67ad1a08f Fully fix replay hut crashing if addons isn't loaded. 2020-07-09 00:29:46 -04:00
toaster
0f1280025d M_RATHON header text. 2020-07-07 17:30:20 +01:00
Jaime Passos
615c7121ed gr_ -> gl_ 2020-07-06 01:15:08 -03:00
LJ Sonic
79857ea9e8 Merge branch 'patch-1' into 'next' 
Rename "Legacy" control scheme

See merge request STJr/SRB2!1029
 2020-07-04 06:50:15 -04:00
LJ Sonic
e4b5d85f31 Merge branch 'shift-when-hiding-in-1p-menu' into 'next' 
Tweak display of hidden items in "1 Player" menu

See merge request STJr/SRB2!1013
 2020-07-03 17:04:42 -04:00
colette
da537d8695 "Legacy controls" was a mistake of a name 2020-07-02 23:17:33 -04:00
Steel Titanium
db559d73d0 Correct comment 2020-06-29 23:57:39 -04:00
Steel Titanium
e0b524d6a9 Address compat with old-style names 2020-06-29 23:54:45 -04:00
Steel Titanium
f891c6cde4 Add support for saving/loading per-skin NiGHTS replays 2020-06-28 16:59:36 -04:00
Zachary McAlpin
feb56fc3b6 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook 2020-06-24 19:47:52 -05:00
Zwip-Zwap Zapony
fa9a140a45 Fix re-opening 1 Player menu re-lowering options 
If an add-on disabled an option, re-opening the 1 Player menu
multiple times would lower the above options multiple times

Also fix Marathon Run and Tutorial being "perma-(un)lock"-able
 2020-06-21 16:16:12 +02:00
Zwip-Zwap Zapony
940689d3ae Tweak display of hidden items in "1 Player" menu 
If an option in the "1 Player" menu is unavailable in an add-on,
lower the above options to close the gap from the invisible option

Also make Marathon Run display as question marks if locked
And also change "sploadgame" to "spstartgame"
 2020-06-21 09:30:55 +02:00
SteelT
dbd5198ac2 Merge branch 'marathonmode' into 'next' 
MARATHON RUN

See merge request STJr/SRB2!941
 2020-06-17 19:36:10 -04:00
Latapostrophe
4eac7f8366 Merge branch 'v2-master' into followme-internal 2020-06-10 23:38:19 +02:00
Latapostrophe
9fec0562c9 Don't do anything if you somehow have a negative follower in menus 2020-06-10 23:21:25 +02:00
Latapostrophe
84a31e288f Fix some V_FLIP stuff in player/follower drawing 2020-06-09 20:09:18 +02:00
Latapostrophe
3914128ce3 Check for missing skin before the lump 2020-06-08 22:11:42 +02:00
Latapostrophe
232cc1a20b Fix replay hut crashing when skins were missing 2020-06-08 22:00:24 +02:00
Latapostrophe
cab9c2a139 Merge branch 'v2-master' into followme-internal 2020-06-07 23:56:32 +02:00
Hannu Hanhi
6961bba693 Merge remote-tracking branch 'upstream/next' into shaders-224-next-merge 2020-06-07 20:01:05 +03:00
Sally Coolatta
136bb1d252 Add K_CanChangeRules, and start a "single session" GP when warping to a map in single player 2020-06-06 19:45:13 -04:00
Latapostrophe
6ac63cca7a Merge branch 'v2-master' into followme-internal 2020-06-02 22:21:16 +02:00
Zachary McAlpin
8826eeeeb9 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook 2020-05-29 15:32:59 -05:00
Sally Coolatta
63917ffccc The start of the scary 2.2 merge 
All conflicts are left in-tact. We should be collaborating on solving these files one at a time.
 2020-05-29 13:43:38 -04:00
Sally Coolatta
20b2dabae9 Merge branch 'pet-robo' into grand-pricks 2020-05-25 12:44:59 -04:00
SwitchKaze
58cac1fd73 Make colors UINT16, increase color freeslots to 1024 2020-05-23 19:35:36 -05:00
SwitchKaze
afe56667b8 Update to 2.2.4 2020-05-22 16:47:51 -05:00