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

1556 commits

Author SHA1 Message Date
Sally Coolatta
8e62efb79c Merge branch 'master' into next 2020-08-23 04:44:27 -04:00
Hannu Hanhi
28882fec24 Fix replay recording memory leak 2020-08-22 22:04:45 +03:00
Sally Coolatta
9d304d3d16 Show game speed and encore 2020-08-17 09:08:05 -04:00
Sally Coolatta
1d5251e1f1 Fix ZONE being all caps, standardize the function comments 2020-08-17 06:13:32 -04:00
Sally Coolatta
632df264a3 Merge remote-tracking branch 'public/next' into discord-rpc-support 2020-08-16 20:57:31 -04:00
Sally Coolatta
51aef1ce75 Fix some of the dehacked tables, change doomednums of haunted heights stuff to not conflict with items/waypoints, use "rings" variable instead of "kartstuff[k_rings]" 2020-08-16 01:46:54 -04:00
James R
36885c1343 Merge remote-tracking branch 'origin/the-scary-22-merge' into the-scary-22-merge 2020-08-15 21:35:17 -07:00
James R
b1fb9ed737 Fix more compiler errors 2020-08-15 21:32:02 -07:00
Sally Coolatta
a251c3909b Lots of little fixes 
Gameplay seems to work (besides the addplayer & client config stuff), but visuals (mostly sprites, but a little bit of HUD) are really messed up
 2020-08-16 00:29:04 -04:00
Sally Coolatta
631f698432 Cleanup 
So for whatever reason it's still giving me a warning about functions in i_threads having duplicate definitions, even though they clearly do not.

I'm completely stumped so I'm just gonna mess with my compile setup....... in the mean time, if anyone else could try to compile it, I'd appreciate it, so we know if it's just my end or if its something else
 2020-08-15 08:32:56 -04:00
Sally Coolatta
0dc21106e5 Lua stuff is done 2020-08-15 07:47:18 -04:00
Sally Coolatta
dfd733eb80 Up to screen.o 
Lots of renderer files I didn't need to touch at all here :)
 2020-08-15 00:55:30 -04:00
Louis-Antoine
8471f9e71f Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into resend-gamestate 
# Conflicts:
#	src/d_clisrv.c
#	src/d_clisrv.h
#	src/d_net.c
#	src/p_saveg.c
#	src/p_saveg.h
 2020-08-13 13:53:10 +02:00
Sally Coolatta
6ef0af4ba5 g_game and g_input now compile 2020-08-13 00:05:44 -04:00
Sally Coolatta
9a21b3a46b g_demo compiles 2020-08-12 23:08:31 -04:00
Sally Coolatta
f9ca40e673 Merge branch 'master' into the-scary-22-merge 2020-08-12 20:59:09 -04:00
Sally Coolatta
f8d1e75025 Merge remote-tracking branch 'public/next' 2020-08-12 18:50:41 -04:00
Sally Coolatta
135e9b9797 f_finale now compiles 2020-08-11 23:13:25 -04:00
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
Sally Coolatta
a6b2bc99de Demo variable fixes 2020-08-10 19:42:45 -04:00
Sally Coolatta
737f01fae0 Move axis_input_e to g_game.h 2020-08-10 17:04:02 -04:00
Sally Coolatta
8071ec92e8 InputDown -> PlayerInputDown, JoyAxis -> PlayerJoyAxis 2020-08-10 17:00:45 -04:00
Sally Coolatta
a771bb0047 Merge g_game.c/h 2020-08-10 13:09:26 -04:00
James R
0a85046b22 Merge branch 'bt_spin' into 'next' 
Replace all occurances of BT_USE with BT_SPIN (2.2!)

See merge request STJr/SRB2!982
 2020-08-09 21:03:17 -04:00
Sally Coolatta
e296e1309a YAY, round 2 2020-08-09 21:02:56 -04:00
Sally Coolatta
20dcd07fa4 Merge g_game.c/h 
Also includes required changes to g_demo.c/h
 2020-08-09 14:43:13 -04:00
James R
3332c22801 Fault again if you spectate then respawn during a fault 2020-08-05 05:07:42 -07:00
Sal
21dfe49bf8 Merge branch 'antigrav-respawn' into 'master' 
Antigravity fixes, round 2

See merge request KartKrew/Kart!305
 2020-07-31 21:55:38 -04:00
Zachary McAlpin
70fc6854b1 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into playercmd-kart-port 2020-07-30 15:37:41 -05:00
lachwright
12c622902f Make old analog functional again 2020-07-30 18:22:15 +08:00
Sally Coolatta
c45a67c3f9 Pre start bulbs 2020-07-29 01:19:53 -04:00
Sally Coolatta
69b6ba2f18 I tore apart the entire code to try and fix braking friction and gave up, so now it's back to v1 
My rewrites clean up a LOT of weird/misleading behavior anyway, so I'm gonna push this regardless. Someone else will have to figure out another way to reimplement braking friction though -- we can't use it as is because it prevents being able to bump people.
 2020-07-28 03:34:39 -04:00
Sally Coolatta
b08459cbee Buffer time before countdown depends on player count, no intro spin in 1v1 2020-07-27 23:31:46 -04:00
Latapostrophe
b62ef5a51d Kill flipcam again but nothing else associated with it. 2020-07-26 21:15:32 +02:00
Latapostrophe
90cde7379c Revert "Push flipcam down the nearest staircase" 
This reverts commit 06d70c1f8e.
 2020-07-26 20:27:22 +02:00
Sally Coolatta
f0044e05c1 Crossing the finish line first before anyone else gives you a free rainbow boost 2020-07-24 21:41:41 -04:00
Latapostrophe
06d70c1f8e Push flipcam down the nearest staircase 2020-07-24 16:17:07 +02:00
James R
329bd3e36a Fix Credits sequence from Extras being unskippable 
This is because a server is not started before going to the credits. I'm way
too stupid/lazy to try starting a server, so have a special case!
 2020-07-24 03:58:38 -07:00
Sally Coolatta
5c1a33f95c Increase buffer time so that high speed characters have time to get in position, change ra_timeskip to introtime 2020-07-24 03:13:17 -04:00
Sally Coolatta
fc89f2cc47 Remove start boosts, let you roam, kill you for crossing the line before the start 2020-07-24 02:59:47 -04:00
Sally Coolatta
25e9c72bab Merge branch 'master' into spindash 2020-07-23 19:12:00 -04:00
Sally Coolatta
ef2579f2b3 Merge branch 'master' into draw-flags 2020-07-20 13:38:48 -04:00
Zachary McAlpin
6877df94bc Ported Lat's PlayerCmd hook to vanilla SRB2 2020-07-17 00:08:38 -05:00
toaster
de1257d524 Two minor fixes for Marathon Mode. 
* Apply the RTA penalty to the live event backup rather than the current timer. (Resolves #184)
* Snap the character name and timer mode text to the bottom of the screen, just above the bar.
 2020-07-12 13:00:08 +01:00
GoldenTails
b3198ed063 Replace PF_USEDOWN with PF_SPINDOWN 2020-07-11 21:59:54 -05:00
GoldenTails
50fd9de9d8 Oops! Missed a couple... 2020-07-11 21:59:54 -05:00