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

1609 commits

Author SHA1 Message Date
SteelT
e242a87f01 Merge branch 'fix-ticcmd-received' into 'next' 
Fix TICCMD_RECEIVED being overridden by gamelogic

See merge request STJr/SRB2!1337
 2021-01-07 16:31:45 -05:00
LJ Sonic
5884f803bb Fix TICCMD_RECEIVED being overridden by gamelogic 2020-12-16 17:35:39 +01:00
James R
498ff708bb Replace all instances of P_AproxDistance with FixedHypot 2020-12-12 14:53:54 -08:00
James R
956fd338f0 Merge branch 'oldguards' into 'next' 
Kill remaining HAVE_BLUA and SEENAMES

See merge request STJr/SRB2!1319
 2020-12-12 17:34:04 -05:00
James R
41f1b3b97c Kill SEENAMES 2020-12-12 02:11:23 -08:00
James R
34f09b2845 Merge branch 'marathon-mode-tokens' into 'next' 
Fix emeralds,  tokens, etc not resetting when restarting marathon mode in first level

See merge request STJr/SRB2!1252
 2020-12-10 14:57:23 -05:00
James R
71553a8ad0 Merge branch 'battle-rethink' into 'master' 
Battle rethink

See merge request KartKrew/Kart!335
 2020-11-29 19:13:38 -05:00
toaster
762dfd3063 When resuming from a rewind, don't: 
* run wipes again
* run titlecards again
* stop the music
 2020-11-28 12:31:16 +00:00
LJ Sonic
2e71d1be63 Fix PlayerCmd not handling angle and aiming correctly 2020-11-23 01:23:34 +01:00
Riku Salminen
a336bcf60c No need to reset tokens twice 2020-11-22 23:23:32 +02:00
Riku Salminen
9bb2014a79 Now the fix actually does what the MR says... +lua banks 2020-11-22 23:19:24 +02:00
Riku Salminen
571d6f2124 Reset a couple of other variables while we're at it 2020-11-14 20:17:35 +02:00
Riku Salminen
33e99a0276 Emeralds and tokens now reset when restarting marathon mode in first level 2020-11-14 19:18:36 +02:00
Sally Coolatta
e6a9e5a68e Merge branch 'master' into new-menus 2020-11-08 02:49:28 -05:00
James R
8f68a21f2f Fix many instances of G_BuildMapName 
Some things are gonna be busted. Fix it later, BYE.
 2020-10-31 20:17:12 -07:00
James R
2520b87f76 Fix map warp 2020-10-30 20:10:32 -07:00
James R
37c345c7eb Map lump names can be anything, map number is dynamically allocated 2020-10-30 20:10:31 -07:00
Sally Coolatta
62139f144a Paper item spawners 
Code is a little horrendous in a few places but I will hopefully fix later :V
 2020-10-26 22:20:02 -04:00
Sally Coolatta
2509d5a29c Merge branch 'the-scary-22-merge' into battle-rethink 2020-10-24 21:39:32 -04:00
Sally Coolatta
7c2bd0d1c2 Merge remote-tracking branch 'srb2/next' into the-scary-22-merge 2020-10-24 20:50:58 -04:00
Sally Coolatta
9b6aa946ea Merge remote-tracking branch 'srb2/master' into the-scary-22-merge 2020-10-24 19:28:06 -04:00
Sally Coolatta
fda698a290 Merge master 2020-10-24 18:34:07 -04:00
Sally Coolatta
0969ca1af9 Karma bombs rework 
- Fixed the bugs with them in our last netgame
- Karma bombs are no longer slippery or have stat changes
- Karma bombs cannot pick up spheres. Their remaining spheres before they died are removed 1 per tic.
- Karma bombs are out of the game permanently when touching the overtime barrier
- When successfully hurting another player, instead of getting 0.5 bumpers, they steal ALL of the opponent's bumpers, effectively swapping places with them. One bumper is lost in the process, meaning bumpers are slowly flitered out the more people need to come back.
- Removed karma items/eggboxes... hopefully this is temporary and we can bring them back later, but currently we don't have a design for how they should work under the new rules :x. They are still in the code behind the `OTHERKARMAMODES` define
- Bumpers & comeback timer are now player_t variables instead of kartstuff shit
- eliminated boolean on player_t for checking when a player touched the barrier
 2020-10-24 11:27:42 -04:00
Louis-Antoine
ddec491b0b Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2.git into resend-gamestate 2020-10-24 16:21:44 +02:00
Sally Coolatta
7ce53ac104 Add blue spheres 
Doesn't have animations, and doesn't have stat-specific buffs. But it's already a massive improvement
 2020-10-22 02:52:33 -04:00
James R
da41c5b79d Merge branch 'skip-credits-gone-wrong' into 'next' 
Fix clients being able to skip credits AGAIN (closes #339)

Closes #339

See merge request STJr/SRB2!1182
 2020-10-12 18:09:48 -04:00
James R
c9532c32e2 Merge branch 'specialstagecheck' into 'next' 
A special stage is a special stage, even outside of coop.

Closes #211

See merge request STJr/SRB2!1180
 2020-10-12 18:08:02 -04:00
James R
1d6fbed871 Oops, go straight to evaluation if not in a netgame 
serverrunning means that you are actually the server.
 2020-10-09 13:16:56 -07:00
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