Commit graph

26508 commits

Author SHA1 Message Date
VelocitOni
f7705e6475 Merge branch 'master' into jartha/fix-stone-relink
# Conflicts:
#	src/p_mobj.c
2025-07-14 22:05:30 -04:00
Oni VelocitOni
5fff2a9c46 Merge branch 'no-bot-ballhog' into 'master'
Disable bot ballhog

See merge request kart-krew-dev/ring-racers-internal!2675
2025-07-15 02:02:14 +00:00
Antonio Martinez
972574535a Fix sign error in baildrop debt calcs 2025-07-09 06:19:31 -04:00
Oni VelocitOni
c97e24527c Merge branch 'more-lenient-bail' into 'master'
Raise Bail Boost Speed - TWO!!!!

See merge request kart-krew-dev/ring-racers-internal!2681
2025-07-09 04:03:23 +00:00
VelocitOni
8f695d4aac Raise Bail Boost Speed
I FUCKING MERGED IT WITHOUT PUSHING THE COMMITS I BUILT AND HANDED TO THE TESTERS
2025-07-08 23:48:56 -04:00
Oni VelocitOni
5ced0439a6 Merge branch 'more-lenient-bail' into 'master'
BAILSTUN Reduced

See merge request kart-krew-dev/ring-racers-internal!2680
2025-07-09 03:45:37 +00:00
VelocitOni
cf06869550 BAILSTUN Reduced
Reduced from 10 -> 7 seconds
2025-07-08 22:41:46 -04:00
Oni VelocitOni
1dc2dd4575 Merge branch 'jartha/toxomister' into 'master'
Toxomister

See merge request kart-krew-dev/ring-racers-internal!2678
2025-07-09 02:18:20 +00:00
James R
241970b405 Toxomister: fix attached cloud offset in reverse gravity 2025-07-08 18:33:27 -07:00
James R
5a990ef027 Toxomister: make cloud visible when touched
While the cloud is despawning it can still be touched. If
it was touched on an off-tic, it would attach to a player
while remaining invisible.
2025-07-08 17:53:55 -07:00
VelocitOni
35a55e8d21 Evened out 1st place odds
Made odds for hyudoro and droptarget 1pt lower, which makes other things in 1st more common.
2025-07-08 20:29:18 -04:00
VelocitOni
c612fc26ac Slight amp buff
2->3
2025-07-08 19:32:39 -04:00
VelocitOni
0829a25d58 ring drain and stun
It wasn't actually that hard, I just don't do this kinda stuff
2025-07-08 19:20:44 -04:00
James R
e2c4341896 Toxomister death effects 2025-07-08 15:11:01 -07:00
VelocitOni
6001336873 K_PvPAmpReward 5 -> 2
Reduced the amp payout for getting gassed, too powerful
2025-07-08 17:48:46 -04:00
VelocitOni
9d2f8d02e2 K_IsItemFirstOnly
Missed this one spot
2025-07-08 17:33:07 -04:00
VelocitOni
479481f59f Put in roulette
Put toxomister in roulette, reduced stone shoe odds by 1, let bots use toxomister in 1st
2025-07-08 17:16:34 -04:00
Oni VelocitOni
ac8ead7c5a Merge branch '4p-duel' into 'master'
Small Duel/Teams HUD fixups

Closes #1598

See merge request kart-krew-dev/ring-racers-internal!2673
2025-07-08 20:46:51 +00:00
James R
dd05900bcb Add Toxomister item 2025-07-08 13:30:48 -07:00
James R
5736f62495 Relink Stone Shoe trap object on player death 2025-07-07 22:01:29 -07:00
Antonio Martinez
5df0a31363 Fix empty item roulettes 2025-07-07 20:02:52 -04:00
Antonio Martinez
719ba464af Disable bot ballhog 2025-07-07 14:19:31 -04:00
Antonio Martinez
e24c18ce59 Duel/Teams HUD: Snap to right in 2P 2025-07-07 00:59:09 -04:00
Antonio Martinez
47c3439d21 Only draw control hints for yourself, stupid 2025-07-06 23:11:29 -04:00
Antonio Martinez
a1e029a154 Small teams/duel viewport decouple clusterfuck 2025-07-06 22:59:59 -04:00
Antonio Martinez
4b0fb90c77 Teams/duel smallhud fixes 2025-07-06 22:44:31 -04:00
Antonio Martinez
b34686c01b Small duel: Draw centered in 4P, offset in 2P 2025-07-06 16:23:40 -04:00
Antonio Martinez
a1324d18ac 4p duel HUD: use position spots in 2p 2025-07-06 05:00:03 -04:00
Antonio Martinez
6d27f2e06b 4P duel hud checkpoint 2025-07-06 04:22:05 -04:00
VelocitOni
cbdc339634 Wrong spot for that flag
I fucking put it in the wrong spot, moved it
2025-07-05 23:55:47 -04:00
VelocitOni
808621592d Amps use ff_randomanim
Flying amps should start on varying frames
2025-07-05 23:35:54 -04:00
Oni VelocitOni
45e01e8323 Merge branch 'restrict-bail' into 'master'
No bail in SPHERES

Closes #1595

See merge request kart-krew-dev/ring-racers-internal!2663
2025-07-06 03:06:37 +00:00
Oni VelocitOni
b3547e0ea0 Merge branch 'monitor-fixup' into 'master'
Fix inaccurate monitor previews

See merge request kart-krew-dev/ring-racers-internal!2662
2025-07-06 02:59:56 +00:00
Antonio Martinez
d35842c7be Always omit unimportant files from fileneeded (fixes rejoining modded always failing in DEVELOP) 2025-07-05 22:51:25 -04:00
Antonio Martinez
c9c9bee1a8 Allow room select even with mddified files 2025-07-05 22:51:24 -04:00
Antonio Martinez
f344bbf105 Fuzz fixups 2025-07-05 22:51:24 -04:00
Antonio Martinez
72c2fa645d Fix use-after-remove when bailing with attracting rings 2025-07-05 22:51:24 -04:00
Antonio Martinez
8c14e85129 Disable error messages while fuzzing 2025-07-05 22:51:24 -04:00
eebrozgi
9d395396db no HOLD! bubble on fast transfer fall
BONUS: remove unused variable that the compiler complained about

# Conflicts:
#	src/k_kart.c
2025-07-05 22:51:24 -04:00
Antonio Martinez
911634773a Fix PF2_ALWAYSDAMAGED check always being true, disabling invinc/clash 2025-07-05 22:50:43 -04:00
Antonio Martinez
35367b3cb0 Disallow failsafe when doing super transfer 2025-07-05 22:50:43 -04:00
VelocitOni
56fcc772ad Comment out ffb print
Comment out fast-fall bounce print
2025-07-05 22:50:42 -04:00
Antonio Martinez
6d4df203b3 Do fast transfer fall with C, add FX 2025-07-05 22:50:42 -04:00
Oni VelocitOni
d1906d67aa Merge branch 'addon-warning-fixup' into 'master'
Fix rejoining modded servers

See merge request kart-krew-dev/ring-racers-internal!2666
2025-07-06 02:35:44 +00:00
AJ Martinez
5e92d74f81 Merge branch 'better-fuzz' into 'master'
Fuzz fixups

See merge request kart-krew-dev/ring-racers-internal!2668
2025-07-04 17:40:28 +00:00
Antonio Martinez
64c6998807 Always omit unimportant files from fileneeded (fixes rejoining modded always failing in DEVELOP) 2025-07-03 13:21:45 -04:00
Antonio Martinez
249d97dbec Fuzz fixups 2025-07-03 11:21:22 -04:00
eebrozgi
4e86c6be9d no HOLD! bubble on fast transfer fall
BONUS: remove unused variable that the compiler complained about
2025-07-03 15:42:07 +03:00
Antonio Martinez
1d6ade51ae Fix use-after-remove when bailing with attracting rings 2025-07-03 05:21:40 -04:00
Antonio Martinez
3bc26f2e75 Disable error messages while fuzzing 2025-07-03 03:08:18 -04:00