Commit graph

27854 commits

Author SHA1 Message Date
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
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
AJ Martinez
7a1a4c58fb Remove UFO damage debug print 2024-05-03 05:01:08 -07:00
AJ Martinez
e418996213 UFO determination 2024-05-03 01:49:05 -07: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
a83dd187d8 Allow better steering from trick MT release 2024-05-02 22:18:26 -07: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