Commit graph

27920 commits

Author SHA1 Message Date
Sally Coolatta
b610353699 Add follower ring animation
Add "RingState" and "RingTime" to followers. RingState is the state to use while they're giving you an auto-ring. The animation plays for RingTime tics per-ring, so it can extend to however long they need to use rings.
2024-05-05 01:18:25 -07:00
Sally Coolatta
a557039ce3 Implement auto-ring use animation
Your current follower spits out the rings. Auto ring is in another branch, so it's just always using this currently.
2024-05-05 01:18:25 -07:00
Ashnal
71cc9c0800 Auto-Ring Accessibility Option
Lacking animation at this commit
2024-05-05 01:18:22 -07:00
AJ Martinez
d1070f5180 Reduce speed-based droptarget deflect dampening 2024-05-04 20:46:16 -07:00
AJ Martinez
cb61fc4513 Burger deflection 2024-05-04 20:01:00 -07:00
Eidolon
0926599f4e Merge branch 'master' of git.do.srb2.org:KartKrew/RingRacers 2024-05-04 20:48:07 -05:00
Eidolon
ea2d26ec77 Merge branch 'GitlabRunnerRAMfix' into 'master'
Gitlab runner ram fix

See merge request KartKrew/RingRacers!12
2024-05-05 01:47:15 +00:00
Logan Aerl Arias
06829f32b1 Gitlab runner ram fix 2024-05-05 01:47:15 +00:00
Eidolon
5b513efb96 Merge branch 'fix-http-source-crashes' into 'master'
Prevent integer div by 0 in curl progress callback

See merge request KartKrew/Kart!2363
2024-05-05 01:35:02 +00:00
AJ Martinez
ae36a6d72d Great Value Flame Dash (+ some bubble softening) 2024-05-04 17:29:35 -07:00
Oni
d69ce6d13f Merge branch 'hyper-cpu' into 'master'
Level Skull

See merge request KartKrew/Kart!2359
2024-05-05 00:20:26 +00:00
AJ Martinez
03037a2f13 Merge remote-tracking branch 'origin/master' into better-voltage-release 2024-05-04 17:14:28 -07:00
AJ Martinez
cf696ac5c7 Determination: max discount 50->40, rate .25x->.17x 2024-05-04 17:08:32 -07:00
Oni
53d5e0077a Merge branch 'free-play-items' into 'master'
Full FREE PLAY item reel

See merge request KartKrew/Kart!2356
2024-05-05 00:03:02 +00:00
Oni
3067b827f1 Merge branch 'slope-pushback-scale' into 'master'
Fix slope pushback force to scale with mapobject and player grow/shrink scale

See merge request KartKrew/Kart!2361
2024-05-05 00:01:25 +00:00
AJ Martinez
d17fe040ec Merge branch 'restartlevel-is-cheating' into 'master'
Disallow restartlevel in rule-restricted gameplay

See merge request KartKrew/Kart!2342
2024-05-04 23:27:34 +00:00
Eidolon
41fa89a3bb Make curl callbacks in d_netfil.c static
Neither of these are referenced outside this compilation unit, so
there is no need to make them visible.
2024-05-04 17:49:55 -05:00
Eidolon
b2aeef5777 Prevent integer div by 0 in curl progress callback
If the curl callback is called at the exact same time as the
download begins, this callback would cause an integer division by
zero.
2024-05-04 17:44:05 -05:00
Eidolon
715cbd5590 Merge branch 'master' of git.do.srb2.org:KartKrew/RingRacers 2024-05-04 13:55:30 -05:00
Eidolon
937f28c038 I may or may not have typo'd something 2024-05-04 13:53:30 -05:00
Aurora Latius
0f762b320d Add 'score' to hud disable options 2024-05-04 13:52:27 -05:00
Ashnal
7b6f5c9d23 More informative comment 2024-05-04 14:32:01 -04:00
Oni
954a95488c Merge branch 'demo-reliability' into 'master'
Demo reliability stuff

Closes #1258 and #1291

See merge request KartKrew/Kart!2335
2024-05-04 18:28:05 +00:00
Ashnal
f74280ad0a Compat level guarding 2024-05-04 14:24:44 -04:00
Ashnal
c26455d8b4 Fix slope pushback force to scale with mapobject and player grow/shrink scale 2024-05-04 14:07:27 -04:00
Eidolon
8c394dd52f Merge public master 2024-05-04 12:27:18 -05:00
Eidolon
ba49f18d5d Merge branch 'changeDelayBasedVars' into 'master'
Change mindelay max to 15, MAXPREDICTTICS to 30

See merge request KartKrew/RingRacers!10
2024-05-04 17:25:01 +00:00
Eidolon
8b4c32dfdb Add empty param list to lambda to fix warning 2024-05-04 12:21:46 -05:00
Eidolon
3a62df7ed7 Merge branch 'GitLabRunnerMingw' into 'master'
use gitlabrunner to make builds for Win32

See merge request KartKrew/RingRacers!11
2024-05-04 17:18:36 +00:00
Logan Aerl Arias
1b2ac7c1c5 use gitlabrunner to make builds for Win32 2024-05-04 17:18:36 +00:00
AJ Martinez
6ef988cade Make sure level skull is always max rank 2024-05-04 04:56:20 -07:00
AJ Martinez
e787988177 Merge branch 'loud-character-select' into 'master'
Play character sounds + follower horns on charsel

See merge request KartKrew/Kart!2360
2024-05-04 11:23:48 +00:00
AJ Martinez
ce1c5d03d3 Safety check t. nosegoblins 2024-05-04 04:23:26 -07:00
AJ Martinez
6ee0e40c1a Play character sounds + follower horns on charsel 2024-05-04 00:45:27 -07:00
James R.
f300623e55 Merge branch 'auto-roulette-warning' into 'master'
Auto Roulette Warning

See merge request KartKrew/Kart!2358
2024-05-04 04:56:27 +00:00
VelocitOni
1d596ac6a5 Changed == 2 to < 3
@jartha
· 25 minutes ago

Should be jsprof.version < 3 to upgrade 2.0 profiles too.
2024-05-04 00:55:02 -04:00
JugadorXEI
f93b0c5811 Change mindelay max to 15, MAXPREDICTTICS to 30 2024-05-04 06:52:49 +02:00
AJ Martinez
683f5016fb Level Skull 2024-05-03 20:15:21 -07:00
Sally Coolatta
d5141a9ea1 Update k_roulette.c 2024-05-03 22:54:37 -04:00
Oni
f43d108226 Merge branch 'polyobj-gremlin' into 'master'
Line sweep polyobject sides

See merge request KartKrew/Kart!2354
2024-05-04 00:48:42 +00:00
VelocitOni
544125bb99 Make it actually build
Oops, extra "." in version check and used comparison instead of "="
2024-05-03 20:43:24 -04:00
VelocitOni
020cb6c60b Turn Auto Roulette off in new versions
Turns off auto roulette in profiles from internal version 2 -> 3
2024-05-03 20:33:25 -04:00
VelocitOni
81ef7a3e1c Make it actually work properly
Flipped 1 to 0 so it happens when you turn it ON, also extended the message
2024-05-03 20:23:00 -04:00
James R
2f527f736e K_drawInput: fix lambda syntax 2024-05-03 17:08:19 -07:00
VelocitOni
9ce7520e53 Auto Roulette Warning
Warn the player that we didn't fucking design an RNG-baed game LOL
2024-05-03 19:59:53 -04:00
AJ Martinez
56a5f9590d Merge branch 'master' of https://git.do.srb2.org/KartKrew/Kart 2024-05-03 16:00:26 -07:00
AJ Martinez
092bd77bd4 Don't overwrite Tutorial objectives when failing tricks 2024-05-03 16:00:14 -07:00
AJ Martinez
10be033605 Cap UFO difficulty reduction at half off 2024-05-03 14:45:21 -07:00
Eidolon
f75564371d Merge public master 2024-05-03 12:55:15 -05:00
Eidolon
e6a3cce695 Merge branch 'casting-shit' into 'master'
Fix implicit casts of int expecting 4-byte width

See merge request KartKrew/RingRacers!7
2024-05-03 17:53:53 +00:00