Commit graph

29121 commits

Author SHA1 Message Date
Oni VelocitOni
f0bc1071f9 Merge branch 'bot-minor' into 'master'
K_RetireBots revamp (resolves #1498, #1535, #1615, #1616)

Closes #1498, #1535, #1615, and #1616

See merge request kart-krew-dev/ring-racers-internal!2716
2025-08-03 21:53:07 +00:00
toaster
7b134a1a90 Resolve #1616 2025-08-03 20:17:15 +01:00
Oni VelocitOni
f0f33dfc7c Merge branch 'tripwire-lockout-vfx' into 'master'
Tripwire Lockout VFX's initial setup

See merge request kart-krew-dev/ring-racers-internal!2721
2025-08-03 18:30:58 +00:00
VelocitOni
259f0455ed Put it in more spots
Forgot the MT_ versions in a couple of spots. The actual MT_ in deh_tables now uses the actual sprite & not a placeholder
2025-08-03 14:16:49 -04:00
VelocitOni
bd09ab2bec Merge branch 'master' into tripwire-lockout-vfx
# Conflicts:
#	src/info.c
#	src/info.h
2025-08-03 02:47:32 -04:00
Oni VelocitOni
07e7c00fb5 Merge branch 'cap-spindash-thrust' into 'master'
Cap spindash thrust according to max charge time

See merge request kart-krew-dev/ring-racers-internal!2717
2025-08-03 04:53:51 +00:00
Oni VelocitOni
cb1c00ae2b Merge branch 'reduce-bailstun-by-1-more-second' into 'master'
Lower bail-stun by 1 more second

See merge request kart-krew-dev/ring-racers-internal!2718
2025-08-03 03:58:23 +00:00
VelocitOni
9c428bad16 Lower bail-stun by 1 more second
Just 1 more second, feels like the appropriate sweetspot. I want people to like this button just a tiny bit more
2025-08-02 03:38:49 -04:00
Oni VelocitOni
14940276b8 Merge branch 'demeteor-spikes' into 'master'
De-meteor Spikes

See merge request kart-krew-dev/ring-racers-internal!2714
2025-08-02 05:06:35 +00:00
Antonio Martinez
4f45393c9b Cap spindash thrust according to max charge time 2025-08-02 00:06:33 -04:00
toaster
5da7e1612e Don't show "position" in GT_TUTORIAL tab rankings, as everybody's in 1st place all the time 2025-08-01 23:38:11 +01:00
toaster
9675dcfa2d Pretend that Eggman CPU in Rings tutorial is actually another local player for hudtracking purposes 2025-08-01 23:37:42 +01:00
toaster
4bbaab0381 K_RetireBots revamp (resolves #1615)
- All Shuffle Loser code first
- Replace all NOCONTESTed CPU per previous behaviour
- Fix "0"-prefixed character regression
- Instead of tying it to GP specifically, simply don't shuffle bots/players past the final (non-special) round of the Queue
2025-08-01 23:01:04 +01:00
toaster
1c6254c426 Anti-marbel-garden softlock
Stumble if you touch a spike while already flashing/spunout (and not just collided with it 2 tics ago)
2025-08-01 21:27:51 +01:00
Oni VelocitOni
1867079623 Merge branch 'jartha/mach-spheres-half' into 'master'
Nerf Phantom Cup Blue Spheres, 30 ring boost -> 10, each sphere awards 1 ring

See merge request kart-krew-dev/ring-racers-internal!2696
2025-08-01 16:00:48 +00:00
Oni VelocitOni
47248f2030 Merge branch 'bubble-mash' into 'master'
Bubble shield mash limit (resolves #1613)

Closes #1613

See merge request kart-krew-dev/ring-racers-internal!2712
2025-08-01 14:31:52 +00:00
toaster
d63d0279e6 Falling into infinite shrinkage in death pit should not do drift/tumble sounds/bounces
Discovered while testing Atlantis with improved spike behaviour
2025-08-01 15:08:46 +01:00
toaster
2726da8e86 MT_WALLSPIKE bumps are now literally reusing wallspring code
The code clearly *wanted* them to behave like wallsprings, but it was a mess so they were instead nuclear railguns. Now they're grey springs with damage but without tiregrease!

Also:
- Fixes pop-out wallspike interactions
- If a custom MF_SPRING has a "starcolor" (tiregrease stars) of SKINCOLOR_NONE, instead don't apply any tiregrease
2025-08-01 14:46:42 +01:00
toaster
763b9e970a P_DoSpringEx: Only permit new detaching from ground if the spring has a vertical component to its momentum 2025-08-01 14:02:51 +01:00
James R
1754ff0782 Mach Spheres: do not collect in stun 2025-08-01 01:10:12 -07:00
James R
fcf2dc1909 Mach Spheres: do not award rings in stun 2025-08-01 01:08:28 -07:00
Antonio Martinez
8c0f07ad6d Refactor bubble speed limit, trap duration 3.5sec, 6 inputs per second 2025-07-29 19:08:29 -04:00
Antonio Martinez
3e78ba17ac Bubble shield mash limit 2025-07-29 17:55:18 -04:00
Oni VelocitOni
efd7442c65 Merge branch 'bail-move-drain' into 'master'
Move bail ring drain to end of hitlag, bail stun reduction based on charge

See merge request kart-krew-dev/ring-racers-internal!2711
2025-07-28 06:44:39 +00:00
VelocitOni
2e516b0761 Even more forgiving
+ 125%
2025-07-27 18:17:44 -04:00
Ashnal
2b291c107f Remove debugprint 2025-07-27 15:10:57 -04:00
Ashnal
16628c59ca Rework logic ordering
fixes charge logic
2025-07-27 14:44:21 -04:00
Ashnal
371e34122a move bail ring deduction to after hitlag 2025-07-25 21:49:41 -04:00
Ashnal
5e4bd6adbb bailquake rename to bailhitlag 2025-07-25 21:16:04 -04:00
Oni VelocitOni
df9d4cf177 Merge branch 'ringbox-115-percent' into 'master'
Ringbox 115%

See merge request kart-krew-dev/ring-racers-internal!2709
2025-07-25 06:02:27 +00:00
VelocitOni
38951e892b Ringbox 115%
Made a change, we all tested on it, I didn't commit it and merged it. Has happened twice in my life now and I just don't understand why I do it
2025-07-25 02:00:38 -04:00
Oni VelocitOni
aabfe728c2 Merge branch 'recorrect-ringbox-buff-mistake' into 'master'
Ringbox now actually gives +10% more

See merge request kart-krew-dev/ring-racers-internal!2707
2025-07-25 05:50:19 +00:00
Oni VelocitOni
e7917b2f05 Merge branch 'change-public-server-wording' into 'master'
Advertising a Server & Voice Chat Menu Rewording

See merge request kart-krew-dev/ring-racers-internal!2705
2025-07-25 04:52:14 +00:00
Eidolon
4fd5f1f986 Fix remaining issues with voice cvar logic flip 2025-07-24 22:59:25 -05:00
Eidolon
4e7816c05c Merge public master 2025-07-24 22:52:12 -05:00
Eidolon
758480a7ea Move include in m_misc.h where it belongs 2025-07-24 22:49:45 -05:00
VelocitOni
9726c999ce Merge branch 'master' into recorrect-ringbox-buff-mistake 2025-07-24 23:47:13 -04:00
Oni VelocitOni
10f846d56e Merge branch 'bailcharge-no-painnerf' into 'master'
Bailcharge no painnerf

See merge request kart-krew-dev/ring-racers-internal!2706
2025-07-25 03:43:33 +00:00
VelocitOni
0ad6882883 One more reversal in HUD
0 to 1
2025-07-24 23:26:42 -04:00
VelocitOni
d3e4f91824 More reversals to fix
More reverals fixed, forgot wording on blurb
2025-07-24 23:19:03 -04:00
VelocitOni
3e194b1a28 Missed a reversal
I sure hope there's not one of these for allowservervoice too...
2025-07-24 23:12:50 -04:00
VelocitOni
1881208d5f Caught 2 more variables that needed renaming
VoiceChat_OnChange -> VoiceSelfDeafen_OnChange, & voice_chat -> voice_selfdeafen
2025-07-24 23:02:25 -04:00
Oni VelocitOni
207d4c6a70 Merge branch 'goner-choice' into 'master'
Goner Choice

See merge request kart-krew-dev/ring-racers-internal!2702
2025-07-25 02:56:20 +00:00
VelocitOni
29d1dcef2d "Deafen" and "Server Voice Chat" now have new variables
cv_voice_chat -> cv_voice_selfdeafen & cv_voice_servermute -> cv_voice_allowservervoice
2025-07-24 22:54:43 -04:00
VelocitOni
283e010301 "Server Voice Chat" (still named cv_voice_servermute for now)
Flipped all bools (HOPEFULLY CORRECTLY)
2025-07-24 22:38:42 -04:00
VelocitOni
51ac6c250b "Undeafen" (still cv_voice_chat for now), flipped all bools
Flipped all bools on Undeafen since it's worded different
2025-07-24 22:37:51 -04:00
VelocitOni
2c98eefa8d Another bit of renaming, and now is in mirrors into Server Options
Flipped the On/Off switch on Server Voice Chat & Deafen, put the server VC options in Server Options too
2025-07-24 22:02:07 -04:00
VelocitOni
aa0667bac3 Put Server VC options in Server options
Made a copy of Server VC Options and put it in the Server Options menu
2025-07-24 21:52:42 -04:00
VelocitOni
62e19778a0 Renamed "All Voice Chat" to "Undeafen & Unmute"
Even less confusion, All Voice Chat -> Undeafen & Unmute, moved Self-Mute to the top right above it.
2025-07-24 21:12:26 -04:00
VelocitOni
f7e9ae4bf1 Non-thunderdome value fixed
Non-thunderdome value fixed (125% to 150% again); should now overall give +25% of the original values instead of nearly nothing extra
2025-07-24 20:38:51 -04:00