Commit graph

28457 commits

Author SHA1 Message Date
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
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
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
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
7fa5967ccb Pick-me-up: eggmark hud tracking 2025-05-18 13:11:35 -04:00
Antonio Martinez
0780effcf9 doy 2025-05-18 12:21:21 -04:00
Oni VelocitOni
f9e7800d4f Merge branch 'fix-hashmap-uninitialized-move-constructor' into 'master'
Fix uninitialized values of hashmap propagating in move

See merge request kart-krew-dev/ring-racers-internal!2542
2025-05-18 14:32:23 +00:00
Antonio Martinez
fc6eb792f3 Pick-me-up review fixups 2025-05-18 08:00:58 -04:00
Antonio Martinez
38a92467ee Less free rings (resolves #1517) 2025-05-17 20:59:28 -04:00
Antonio Martinez
1009996ba4 Fix pickmeup bubble shield 2025-05-17 16:54:57 -04:00
Antonio Martinez
54b3450768 Pickmeup: one last round 2025-05-16 23:21:47 -04:00
AJ Martinez
e7ff5292a4 Merge branch 'master' into 'jartha/bubble-shield-new-sprite'
LOOK MOM I'M USING THE WEB UI

# Conflicts:
#   src/objects/CMakeLists.txt
2025-05-17 02:34:26 +00:00
Antonio Martinez
1a2f3b0d3b Merge remote-tracking branch 'origin/master' into pick-me-up 2025-05-16 22:26:35 -04:00
Antonio Martinez
719841705f Get that Gunstar sound outta here 2025-05-16 22:18:03 -04:00
Oni VelocitOni
6b7c112dca Merge branch 'fix-bumper-climbing' into 'master'
Rework Last Chance

See merge request kart-krew-dev/ring-racers-internal!2535
2025-05-17 01:42:26 +00:00
Oni VelocitOni
5a388d3308 Merge branch 'lmao-hamachi' into 'master'
Fail gracefully on Hamachi/Radmin/etc

Closes #1290

See merge request kart-krew-dev/ring-racers-internal!2521
2025-05-17 01:42:10 +00:00
Antonio Martinez
7a7b0938ac Pick-me-up Volt fixes 2025-05-16 21:41:28 -04:00
Oni VelocitOni
524d29066f Merge branch 'strict-fastfall' into 'master'
Spindash button, Strict Fastfall profile option

Closes #1312

See merge request kart-krew-dev/ring-racers-internal!2527
2025-05-17 01:40:12 +00:00
Oni VelocitOni
88e1a9e718 Merge branch 'stun' into 'master'
Add stun mechanic & Flybot767

See merge request kart-krew-dev/ring-racers-internal!2537
2025-05-17 01:39:57 +00:00
Antonio Martinez
cd68b1145a Holy shit don't email me about CI I'll fix it ok 2025-05-16 18:26:11 -04:00
Antonio Martinez
99318e3567 Pickmeup teams 2025-05-16 18:11:10 -04:00
Antonio Martinez
b62f3c65a8 Pick-me-up HUD 2025-05-16 17:15:50 -04:00
Antonio Martinez
a1c99fa890 Fix unlobbable eggbox 2025-05-16 14:58:47 -04:00
Antonio Martinez
ef853bafc4 Pick-me-up HUD tracking 2025-05-16 14:47:47 -04:00
Antonio Martinez
34ddee575a WIP: more pick-me-up 2025-05-16 13:04:55 -04:00
Antonio Martinez
dcbbea4c4b WIP: pick-me-up 2025-05-16 11:44:57 -04:00