Commit graph

27745 commits

Author SHA1 Message Date
Gunla
97f3475ca4 Merge branch 'correctly-defer-encore' into 'master'
G_GetNextMap: More ironclad behaviour for encore update deferral

See merge request KartKrew/Kart!2334
2024-05-05 22:22:29 +00:00
Sally Coolatta
e01234285b Don't allow auto-roulette to get challenging items 2024-05-05 18:22:04 -04:00
AJ Martinez
693ffe12d0 Revert buubbledash changes 2024-05-05 15:20:33 -07:00
Gunla
642c04c250 Merge branch 'gp-naming' into 'master'
GP naming

See merge request KartKrew/Kart!2365
2024-05-05 22:20:08 +00:00
Gunla
254cdc795f Merge branch 'claw-determination' into 'master'
UFO determination

See merge request KartKrew/Kart!2355
2024-05-05 22:14:03 +00:00
AJ Martinez
cee99e6565 Merge branch 'burger' into 'master'
Burger deflection

See merge request KartKrew/Kart!2364
2024-05-05 21:38:25 +00:00
AJ Martinez
d32ba6cf64 Vicious difficulty 2024-05-05 13:57:18 -07:00
toaster
1ed7591c40 Only apply maxconnections to bots in netgame contexts 2024-05-05 21:28:59 +01:00
AJ Martinez
1a8b4dc78f Retheme difficulty modes 2024-05-05 20:56:40 +01:00
toaster
2dc8ce330a Review
- Update SAV_VERSIONMINOR so 2.0/2.1 cup backup files won't load
- Move specialDamage to grandprixinfo_t (from rank_t, per Sal review)
2024-05-05 20:36:43 +01:00
Ashnal
01e85517e6 Faulting via pit will now respawn about 1 second sooner 2024-05-05 13:26:36 -04:00
Oni
873d16e6c0 Merge branch 'autoring' into 'master'
Auto-Ring

See merge request KartKrew/Kart!2351
2024-05-05 12:35:50 +00:00
James R
11fce987c0 autoring: replace followerskin Goddess cases with K_GetEffectiveFollowerSkin function 2024-05-05 03:02:53 -07:00
James R
78411a25ee jartha review, autoring: add PF_AUTORING to dehacked table (Lua) 2024-05-05 01:44:16 -07:00
James R
b79918cee8 jartha review, autoring: fix PF_AUTORING at start of replays 2024-05-05 01:39:42 -07:00
Ashnal
f1210cec17 Forwardmove also returns negative values, Oops 2024-05-05 01:20:08 -07:00
Ashnal
d1ec829d5f Fix horn and and hitconfirm anim for fallback follower 2024-05-05 01:20:08 -07:00
Ashnal
009034e848 Default anim time from 6 to 10 2024-05-05 01:20:08 -07:00
James R
489bc15161 Autoring: set follower to 50% transparency if player cannot use rings 2024-05-05 01:20:08 -07:00
James R
4a239e024c Fix fallback follower 2024-05-05 01:20:08 -07:00
Ashnal
3b27feb533 Fallback follower
Ring use animation broken atm
2024-05-05 01:20:06 -07:00
Ashnal
f85cb8c400 Instead 180 from player facing angle 2024-05-05 01:18:26 -07:00
Ashnal
947b918c83 swap follower angle facing when autoring 2024-05-05 01:18:26 -07:00
Ashnal
500cfa74de tiered ringdelay for autoring 2024-05-05 01:18:26 -07:00
Ashnal
633ffb6195 The one line hookup 2024-05-05 01:18:25 -07:00
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