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

1981 commits

Author SHA1 Message Date
sphere
734a94439c how did this even happen 2020-10-09 05:55:10 -04:00
James R
6363162826 Merge branch 'sanity-meter-empty' into 'next' 
Replace cvar initializers with a macro

See merge request STJr/SRB2!1178
 2020-10-08 22:02:25 -04:00
sphere
77f64b0a81 A special stage is a special stage, even outside of coop. 2020-10-08 18:45:20 +02:00
James R
b7c4a82a0f Replace C90's junk with a modest macro 2020-10-06 23:04:23 -07:00
Zachary McAlpin
ae238236c8 Update comment 2020-10-06 16:43:14 -05:00
Zachary McAlpin
36d7ddeb09 Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2 into playercmd-kart-port 2020-10-06 02:07:05 -05:00
Lachlan Wright
05f4fb13fe Merge branch 'special-stage-respects-nextmapoverride' into 'next' 
Make Special Stage map transitions respect nextmapoverride.

See merge request STJr/SRB2!1129
 2020-09-27 22:42:07 -04:00
Sally Coolatta
728d4a9435 Fixes to Battle Mode capsules 2020-09-27 04:51:08 -04:00
Sally Coolatta
2f6962c103 Correct player angle when respawning from crushing 2020-09-26 03:12:22 -04:00
Sally Coolatta
285ec3e08c Player death uses damage types 
- Fixed last place elimination not working (again)
- Replaces squishing from level geometry with good old fashioned crush death
 2020-09-25 16:31:10 -04:00
Sally Coolatta
b5fcd74ef9 Merge master 
Slopes in a few maps are really broken ... think it's anchors, I'm gonna leave that to jart :V
 2020-09-25 12:00:50 -04:00
Sal
e1c5acffb9 Merge branch 'dont-cheese-fault' into 'master' 
Fault again if you spectate then respawn during a fault

See merge request KartKrew/Kart!315
 2020-09-25 09:31:37 -04:00
Sally Coolatta
672c4fb763 Make aiming relative too 2020-09-25 02:06:37 -04:00
toaster
efdb8e67d9 Fixes a duplicated condition which sends the player back to the title screen under advancemap next. Teeechnically does stuff for issue #91, but I'd like to take a more thorough approach later once I've got consent for a potentially radical change to this currently useless feature. 2020-09-23 15:08:21 +01:00
James R
c0abb2ca09 Don't let players change their name more than five times per minute 
(ported 2948885660 and 4e9d006c37)
 2020-09-22 12:04:28 -07:00
toaster
87c10047a5 A bunch of serious heavy lifting to fix title cards and closely related. 
* Fix the title card fade's one-frame invalid memory read.
* Disable a redundant gamestate-activated wipe, which A) horribly broke Encore wipes, B) made normal map transitions take longer than they should, and C) held on the one glitchy title card wipe frame to make the game look more broken than it was.
* Fix Encore wipes being broken by the merge.
* Disable (not remove; may want to use later) the :nick: patch draw attempts from the title card drawer.
* Re-add zonettl support to the title card drawer.
* Move the title card drawer in front of the fade (Looks better for if we showcase 2.2 merge footage before creating a better title card).
 2020-09-22 18:27:47 +01:00
Sally Coolatta
99a1bacb81 Turning code overhaul 
Packet drops are still broken, but at least netgames are playable now.
 2020-09-22 00:35:44 -04:00
James R
ef108cbb36 Merge remote-tracking branch 'pub/next' 2020-09-20 14:07:54 -07:00
James R
4e9d006c37 int -> INT32 2020-09-11 09:00:18 -07:00
James R
2948885660 Don't let players change their name more than five times per minute 2020-08-31 20:08:22 -07:00
Sal
1bf259e341 Merge branch 'world-tour' into 'next' 
Flush random map pool after all but 3 are played

See merge request KartKrew/Kart-Public!216
 2020-08-30 21:49:20 -04:00
Sally Coolatta
61d6ee0982 Misc changes to how the program runs 
- Call DRPC_Init at the end of D_SRB2Main instead of in the middle
- Call Discord_RunCallbacks in D_SRB2Loop instead of G_Ticker
- Fix errorcount nums in I_Error, an old leftover from when Discord_Shutdown was not handled by I_AddExitFunction
 2020-08-27 18:50:36 -04:00
TehRealSalt
99e3adcdca Flush random map pool after all but 3 are played 2020-08-27 14:32:44 -04:00
GoldenTails
ba4310939a Make Special Stage map transitions respect nextmapoverride. 
In other words: lets Luas set the next map of Special Stages via G_SetCustomExitVars.
It's otherwise impossible to do so via Lua.
 2020-08-26 23:22:53 -05:00
Sally Coolatta
3b8066a28e Merge branch 'next' into discord-rpc-support 2020-08-23 05:32:32 -04:00
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