Commit graph

27568 commits

Author SHA1 Message Date
Ashnal
01e85517e6 Faulting via pit will now respawn about 1 second sooner 2024-05-05 13:26:36 -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
James R
2f527f736e K_drawInput: fix lambda syntax 2024-05-03 17:08:19 -07: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
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
bitten2up
cfacbd91be Fix implicit casts of int expecting 4-byte width
This fixes the issue with certain compilers that have int set to
different sizes by either explicitly casting or setting templates
manually
2024-05-03 17:53:53 +00:00
James R
44923c2b2a Line sweep polyobject sides
Gremlin III vanquished for Balloon Park elephants.
2024-05-03 00:57:06 -07:00
Oni
e14f510fc7 Merge branch 'can-communication' into 'master'
Spray Can Statistics Communication

See merge request KartKrew/Kart!2345
2024-05-03 06:49:15 +00:00
AJ Martinez
6867fcfba3 Race starting rings 5->10 2024-05-02 20:43:10 -07:00
James R.
fa361eaa54 Merge branch 'fix-old-sdl-build' into 'master'
Fix build against old SDL versions

See merge request KartKrew/Kart!2350
2024-05-03 03:24:30 +00:00
Eidolon
9960336554 Bump version to 2.2, modversion to 3 2024-05-02 22:23:55 -05:00
Oni
34ff000af8 Merge branch 's-or-better' into 'master'
PodiumCup condition: Don't say "Grade S or better"

See merge request KartKrew/Kart!2347
2024-05-03 03:21:26 +00:00
Oni
d7be08d5c8 Merge branch 'no-free-dunk' into 'master'
Don't count dunking a landmine on yourself for the landmine dunk challenge

See merge request KartKrew/Kart!2346
2024-05-03 03:21:17 +00:00
Eidolon
d0932922c0 Fix build against old SDL versions
There are a few (void) casts of unused variables in some gamepad-
related functions which do not compile on old SDL versions because
their parameters don't match up. This fixes that.
2024-05-02 20:47:51 -05:00
AJ Martinez
cbd7b29cb6 Merge branch 'unbuff-bot-rings' into 'master'
Only buff bots' ring duration, NOT their boost

See merge request KartKrew/Kart!2349
2024-05-03 01:46:17 +00:00
Oni
fbf252b6b6 Merge branch 'fix-rivals-again' into 'master'
Fix Rivals & Tutorial Again

Closes #1359

See merge request KartKrew/Kart!2344
2024-05-03 01:21:51 +00:00
AJ Martinez
46c7f849a2 Merge branch 'better-fastfall-bounce' into 'master'
Fastfall refinements

See merge request KartKrew/Kart!2340
2024-05-02 23:47:10 +00:00
AJ Martinez
1db5972791 Revert "WIP"
This reverts commit c05a9db159.
2024-05-02 16:40:12 -07:00
Sally Coolatta
9600c1945e Only buff bots' ring duration, NOT their boost
T'was an unintentional side effect of other rebalances, bots don't really need the extra speed. It is barely noticeable to me, but figure we might as well cut off a possible source of uncapped speed.
2024-05-02 19:03:00 -04:00
toaster
8790e20df7 PodiumCup condition: Don't say "Grade S or better"
No longer in unlocks.pk3, but fixed for future
2024-05-02 23:07:56 +01:00
toaster
6c8242cd0a Don't count dunking a landmine on yourself for the landmine dunk challenge 2024-05-02 21:55:51 +01:00
toaster
c44fbc8200 Communicate the total number of Spray Cans to grab on the Courses & Medals page of the Statistics screen 2024-05-02 20:49:45 +01:00
toaster
3a8de19aa4 TryRunTics: Handle deferred title/credits continue outside inner tic loop, don't bail outside of level gamestate
Fixes netxcmds not being processed locally in time to init rivals properly
2024-05-02 20:28:15 +01:00
Oni
32c43044cb Merge branch 'mindelay-client' into 'master'
Fix delay indicator online

See merge request KartKrew/Kart!2311
2024-05-02 12:58:20 +00:00
AJ Martinez
359b9439af Merge remote-tracking branch 'origin/master' into better-fastfall-bounce 2024-05-02 00:43:12 -07:00
AJ Martinez
c05a9db159 WIP 2024-05-02 00:43:07 -07:00
AJ Martinez
68e1dcd94c Merge branch 'no-air-magnet' into 'master'
Don't slow down on fastfall bounce (regression)

See merge request KartKrew/Kart!2343
2024-05-02 06:06:44 +00:00
AJ Martinez
a314a4dada Don't slow down on fastfall bounce (regression) 2024-05-01 23:05:28 -07:00
Oni
1c6d6be426 Merge branch 'bubble-pop' into 'master'
Shield fixups

See merge request KartKrew/Kart!2338
2024-05-02 05:27:40 +00:00
Oni
fb9aeb3466 Merge branch 'trick-panel-controls' into 'master'
Accel press to trick

See merge request KartKrew/Kart!2332
2024-05-02 05:25:37 +00:00
Oni
f3824b5ad9 Merge branch 'improved-spindash-fucking-again' into 'master'
Improved spindash + ebrake

Closes #1345 and #1344

See merge request KartKrew/Kart!2341
2024-05-02 04:58:29 +00:00
AJ Martinez
50b64e2f08 No extended debt for recovery spindash 2024-05-01 21:04:20 -07:00
AJ Martinez
3c68ab7674 Improved spindash + ebrake 2024-05-01 20:35:49 -07:00
Oni
7bb49a9f67 Merge branch 'always-musicdef-author' into 'master'
Always show author on song credit (resolves #1332)

Closes #1332

See merge request KartKrew/Kart!2333
2024-05-02 02:45:10 +00:00
Oni
7d0db372c4 Merge branch 'tumble-soften' into 'master'
Add soft tumble, don't drop items vs invinc

Closes #1341

See merge request KartKrew/Kart!2339
2024-05-02 02:44:48 +00:00
Oni
d994b7068d Merge branch 'dlz-rockabilly' into 'master'
Dismount DLZ Rocket and Rideroid properly

Closes #1338 and #1357

See merge request KartKrew/Kart!2337
2024-05-02 02:14:46 +00:00
AJ Martinez
8615ed9db9 Fastfall refinements 2024-05-01 19:10:47 -07:00
AJ Martinez
bf585359c9 Add soft tumble, don't drop items vs invinc 2024-05-01 18:09:34 -07:00
AJ Martinez
1b8faf9233 Shield fixups 2024-05-01 17:27:42 -07:00
toaster
e88c162161 Also dismount DLZ rocket/rideroid if respawning for any reason 2024-05-02 00:47:04 +01:00
toaster
f2de83843b Dismount DLZ Rocket on tumble bounce counter being nonzero, not tumble height
Tumble height is not set to 0 between (s)tumble events
2024-05-02 00:43:00 +01:00
Eidolon
d288b588d1 Merge branch 'master' of git.do.srb2.org:KartKrew/RingRacers 2024-05-01 18:03:02 -05:00
Eidolon
205da284e1 Merge branch 'GitlabRunner' into 'master'
use gitlabrunner to make builds

See merge request KartKrew/RingRacers!8
2024-05-01 23:02:35 +00:00
Logan Aerl Arias
34ff2c16aa use gitlabrunner to make builds 2024-05-01 23:02:35 +00:00
Eidolon
0f0683633a Merge branch 'implementDebugItemAmount' into 'master'
Implement debugitemamount

See merge request KartKrew/RingRacers!4
2024-05-01 22:50:24 +00:00
Eidolon
7c249318c4 Merge branch 'exit-tryruntics-deferred-credits' into 'master'
Always exit TryRunTics loop early if deferring gamestate change

Closes #1185

See merge request KartKrew/Kart!2325
2024-05-01 14:43:31 +00:00
Eidolon
8ab9f9c2cb Merge branch 'remove-renderbuffers' into 'master'
Temporarily remove uses of RHI renderbuffers

Closes RingRacers#1

See merge request KartKrew/Kart!2323
2024-05-01 14:38:27 +00:00
Eidolon
16e7fd475b Merge branch 'emerald-hud-gfx-tags' into 'master'
Always cache EMEMAP/SUPMAP in PU_HUDGFX tag

Closes #1240

See merge request KartKrew/Kart!2326
2024-05-01 14:35:50 +00:00