Commit graph

28481 commits

Author SHA1 Message Date
VelocitOni
f2c92efa67 Adjust stun time
reduced stun time, 4 to 10
2025-05-20 00:04:41 -04:00
Oni VelocitOni
f84ef9da41 Merge branch 'flame-shockwave-color-change' into 'master'
Flame tripwire shockwave is now mauve

See merge request kart-krew-dev/ring-racers-internal!2555
2025-05-20 03:02:54 +00:00
VelocitOni
30abf7d744 Flame tripwire shockwave is now mauve
FUCKING FORGOT TO PUSH THIS TO THE SHIELD BRANCH, ketchup to mauve
2025-05-19 23:01:02 -04:00
Oni VelocitOni
ad5c6125a1 Merge branch 'got-it' into 'master'
Pick-me-up: got it!

See merge request kart-krew-dev/ring-racers-internal!2553
2025-05-20 02:59:21 +00:00
Oni VelocitOni
1fb70714bb Merge branch 'jartha/lightning-flame-shield' into 'master'
New Lightning Shield and Flame Shield graphics

See merge request kart-krew-dev/ring-racers-internal!2554
2025-05-20 02:53:41 +00:00
James R
53871fefc0 Make Flame Shield dash effects additive 2025-05-19 18:38:32 -07:00
James R
2e57c5fd8b Add Flame Shield visual object 2025-05-19 18:30:10 -07:00
James R
3644f8afe7 Add Lightning Shield visual object 2025-05-19 18:29:53 -07:00
James R
835785d940 Make Lightning Shield bolts additive 2025-05-19 18:29:19 -07:00
James R
cccde157d4 Add Flame Shield states 2025-05-19 18:28:37 -07:00
James R
f8afb52b1a Add Lightning Shield states 2025-05-19 18:28:11 -07:00
Oni VelocitOni
c41b3b3fa0 Merge branch 'lineondemand-crash-fix' into 'master'
Obj_CrossCheckpoints crash fix

Closes #1519

See merge request kart-krew-dev/ring-racers-internal!2552
2025-05-19 23:49:46 +00:00
Antonio Martinez
f85d3f764a Pick-me-up: got it! 2025-05-19 19:42:27 -04:00
Ashnal
b332b84ed9 fixes a crash when using optimized
Obj_CrossCheckpoints and LinOnDemand
2025-05-19 18:46:28 -04:00
Oni VelocitOni
ae962c4d14 Merge branch 'ta24' into 'master'
2.4 TA refinements mkII

Closes #1507 and #1508

See merge request kart-krew-dev/ring-racers-internal!2532
2025-05-18 22:12:47 +00:00
Oni VelocitOni
3fd8d10630 Merge branch 'camheight-mapheader' into 'master'
Add CameraHeight level header option

See merge request kart-krew-dev/ring-racers-internal!2550
2025-05-18 20:04:52 +00:00
Oni VelocitOni
3399f446a8 Merge branch 'wpz-fix-take2' into 'master'
Try to ensure this fix doesn't affect whatever might be using tracer

See merge request kart-krew-dev/ring-racers-internal!2549
2025-05-18 19:27:35 +00:00
SteelT
23548ebca7 Add support for screen quakes effect 2025-05-18 15:26:04 -04:00
Ashnal
0956ff4de7 Try to ensure this fix doesn't affect whatever might be using tracer 2025-05-18 15:06:52 -04:00
Oni VelocitOni
146f427dc2 Merge branch 'display-exp-fix-3' into 'master'
Exp Fixes

See merge request kart-krew-dev/ring-racers-internal!2513
2025-05-18 18:52:48 +00:00
Antonio Martinez
1c6096405e Merge remote-tracking branch 'origin/master' into ta24 2025-05-18 14:42:59 -04:00
Oni VelocitOni
249f1b6789 Merge branch 'jartha/bubble-shield-new-sprite' into 'master'
New sprite for the Bubble Shield

See merge request kart-krew-dev/ring-racers-internal!2540
2025-05-18 18:40:14 +00:00
Oni VelocitOni
c1b10750a3 Merge branch 'no-pain-respawn' into 'master'
Pitblame in Race, stop spinout when lightsnaking

Closes #1360

See merge request kart-krew-dev/ring-racers-internal!2534
2025-05-18 18:39:30 +00:00
Oni VelocitOni
52d39aeae2 Merge branch 'nerf-bumper-car-bots' into 'master'
Nerf bumper car bots

See merge request kart-krew-dev/ring-racers-internal!2533
2025-05-18 18:32:32 +00:00
Antonio Martinez
8d9bcb8e03 Remove debug print 2025-05-18 14:31:55 -04:00
Ashnal
1350078282 Fix turbine crash if tracer is set to a different mobj type or lacking spawnpoint info 2025-05-18 14:30:52 -04:00
Ashnal
bdc6318cd4 don't clear base player id on launch
or else we index out of bounds when fetching the player skin
2025-05-18 14:30:52 -04:00
Ashnal
d16358ec5a fix extra score for being over target 2025-05-18 14:30:52 -04:00
Ashnal
8df1595f89 reoptimize K_GetEXP 2025-05-18 14:30:52 -04:00
Ashnal
f2d323111f fix calculating exp before gradingpointnum increment
fix leftover lappoints code affecting exp
2025-05-18 14:30:52 -04:00
Ashnal
2c97f2bf1e fix defines post rebase 2025-05-18 14:30:52 -04:00
Ashnal
d4a822c088 remove exp totals from lines
adjust crystal coloring
2025-05-18 14:30:46 -04:00
Ashnal
ac02ecda3d podium screen polish
adjusts bottom right drawer positioning
colorizes exp crystals like the hud
2025-05-18 14:30:46 -04:00
Ashnal
d65fe8f6bf Removes score from,gp grading
fixes podium warp data generation
more minor renames
2025-05-18 14:30:46 -04:00
Ashnal
3d11c142cc Fix rejigger
exp is simpler than lappoints
2025-05-18 14:30:46 -04:00
Ashnal
50fd04bdb1 small hud performance improvement
now that we have spots on the player struct for both gradingfactor and exp, store exp in the exp field after adjusting gradingfactor, and just reference it instead of recalculating every time
2025-05-18 14:30:46 -04:00
Ashnal
144e2be262 More renaming 2025-05-18 14:30:46 -04:00
Ashnal
5a42c99d0a Rname stuff better 2025-05-18 14:30:45 -04:00
Ashnal
4db9773488 Fix numlaps 0 crash
Doesn't award exp proper on crossing position line but at least it doesnt crash
2025-05-18 14:30:45 -04:00
Ashnal
bf6a5babfb Reworks changes to K_CalculateGPRankPoints to account for the 125+10 max for points
and untramples the implementation
fixes gp results screen totals

I really need to refactor lappoints to be named exppoints or something later
2025-05-18 14:30:45 -04:00
Ashnal
8242cb89f0 Replace GP points with exp
update GP results screen lap patches with exp patches
2025-05-18 14:30:45 -04:00
Ashnal
b88453f995 Fix gp results screen to new target
I should make a define for this, where do I put it?
2025-05-18 14:30:45 -04:00
Ashnal
d7d0507d45 Update exp calcs to be out of 100
and adjust grading
2025-05-18 14:30:45 -04:00
Ashnal
1366f43ddd Move count to checkpoint manager 2025-05-18 14:30:45 -04:00
Ashnal
18d33e8589 Fix not clearing checkpoint list between maps 2025-05-18 14:30:45 -04:00
Antonio Martinez
0bb8684142 Merge remote-tracking branch 'origin/master' into ta24 2025-05-18 14:30:14 -04:00
Antonio Martinez
457927a36a Merge remote-tracking branch 'origin/master' into nerf-bumper-car-bots 2025-05-18 14:19:19 -04:00
Oni VelocitOni
7d0f97b8a1 Merge branch 'poverty' into 'master'
Less free rings (resolves #1517)

Closes #1517

See merge request kart-krew-dev/ring-racers-internal!2546
2025-05-18 18:13:20 +00:00
Oni VelocitOni
5fd2c09022 Merge branch 'pick-me-up' into 'master'
Pick up allied items

See merge request kart-krew-dev/ring-racers-internal!2545
2025-05-18 17:44:48 +00:00
Antonio Martinez
6642b82793 Fix TA amp calculation underflow 2025-05-18 13:41:26 -04:00