thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
28520 commits 1 branch 12 tags 205 MiB
Commit graph

28520 commits

This branch
This branch
All branches
Author SHA1 Message Date
Antonio Martinez
d236620adf Fix cantact with duel Hyudoro crashing in GP bonus (trivial) 2025-05-23 03:03:08 -04:00
Oni VelocitOni
5f95ad933f Merge branch 'team-hud' into 'master' 
Team HUD

See merge request kart-krew-dev/ring-racers-internal!2562
 2025-05-22 04:43:57 +00:00
Antonio Martinez
bd250e34c8 Teamplay gameplay refinements 2025-05-22 00:32:14 -04:00
AJ Martinez
c400c5ea07 Merge remote-tracking branch 'origin/master' into team-hud 2025-05-21 20:56:19 -04:00
Oni VelocitOni
5ad2c0436f Merge branch 'new-bubble-trap-sprite' into 'master' 
New bubble trap sprites

See merge request kart-krew-dev/ring-racers-internal!2563
 2025-05-22 00:54:26 +00:00
Antonio Martinez
b7ee88fcd9 New bubble trap sprites 2025-05-21 20:41:52 -04:00
Antonio Martinez
b2d9e081b2 Remove testing visuals 2025-05-21 18:55:49 -04:00
Antonio Martinez
a6f76db0fa Fixed misaligned arrows in 4P team hud 2025-05-21 18:54:24 -04:00
Antonio Martinez
bf2f9a9898 What the fuck? 2025-05-21 17:39:33 -04:00
Antonio Martinez
f0bcc82f90 go go gadget teamplay 2025-05-21 16:49:51 -04:00
Antonio Martinez
2caea74cba Teamplay HUD 2025-05-21 02:05:33 -04:00
Oni VelocitOni
3e9d6858bf Merge branch 'shield-shenanigans' into 'master' 
Fix various shield checks using item instead of curshield

Closes #1501

See merge request kart-krew-dev/ring-racers-internal!2544
 2025-05-20 22:46:45 +00:00
Oni VelocitOni
a35bbaacf7 Merge branch 'the-hunt-continues' into 'master' 
Add bonus pickups in conditions you couldn't grab Spray Cans before

See merge request kart-krew-dev/ring-racers-internal!2502
 2025-05-20 22:45:12 +00:00
Oni VelocitOni
35ab0bd52c Merge branch 'p-speed-damage-soften' into 'master' 
Downgrade damage when tripwire lenient

Closes #1375

See merge request kart-krew-dev/ring-racers-internal!2557
 2025-05-20 22:31:29 +00:00
Oni VelocitOni
7727d70e31 Merge branch 'bawhaw' into 'master' 
Ballhog buffs

Closes #1460

See merge request kart-krew-dev/ring-racers-internal!2559
 2025-05-20 22:25:38 +00:00
Oni VelocitOni
4e1ba4f353 Merge branch 'roulette-again' into 'master' 
Tiny roulette fixes

See merge request kart-krew-dev/ring-racers-internal!2558
 2025-05-20 22:25:31 +00:00
Antonio Martinez
3c4ca02408 Source BALLHOGBOOM damage, allow BALLHOGBOOM pickup 2025-05-20 17:29:35 -04:00
Antonio Martinez
eb79838ffb Ballhog buffs 2025-05-20 16:39:55 -04:00
Antonio Martinez
2ec4fa044c Tiny roulette fixes 2025-05-20 15:35:05 -04:00
toaster
ecb4ffeeca Add bonus pickups in conditions you couldn't grab Spray Cans before 
- If you've gotten every Spray Can, or you're on a custom course...
- Only one of these spawns per map
- Correctly save and load these
- Statistics menu counts base-game bonuses
- If there are gaps in the list, or new Spray Cans are added later, these base-game bonuses are converted into the new Spray Cans
- New graphics required so far:
    - SBONA0 to SBONP0 - 16-frame prerendered circling sprite animation
    - GOTBON - 8x8 representation of the SBON object
 2025-05-20 20:27:06 +01:00
toaster
a6bf7f46a7 DEVELOP-gated reset cmd parameters 
- Introduce "-resetspraycans"
- "-resetchallengegrid" existed, now gated
 2025-05-20 20:27:06 +01:00
toaster
1fa1da9b4e Rewrite how Spray Cans are stored in gamedata 
- For programmers:
    - Deprecate GamedataSprayCanJson
        - Previously stored colour name and map name together.
        - Was swapped in place to move invalid entries to the back.
        - If the old info exists, we convert it.
    - Instead:
        - Store list of colour names
        - Index into that list in GamedataMapJson to write map ID
        - Stable-sort the list as collected then uncollected
        - Write only valid entries into gamedata_t
        - Use the map ID reference to link map back to final order
    - Sounds more complicated, and it kind of is - but the code is WAY more readable, elegant IMO, allows for expansions to be added later and takes advantage of CPP features it didn't originally
- For testers:
    - Ideally, nothing should change. Just be careful and remember to keep backups of your gamedata

# Conflicts:
#	src/g_gamedata.cpp
#	src/g_gamedata.h
 2025-05-20 20:27:06 +01:00
toaster
3f9c0685eb Move cache_spraycan on the mapheader_t struct to recorddata_t 
Still in that struct, just in a more appropriate container
 2025-05-20 20:18:11 +01:00
toaster
0449156d2e load_ng_gamedata(): No need to free grids/cans, as M_ClearSecrets (called at start) already does. Everything else already assumes it's adding to a blank gamedata... 2025-05-20 20:18:10 +01:00
Oni VelocitOni
f390564640 Merge branch 'werror-solving' into 'master' 
Werror solving (180525)

See merge request kart-krew-dev/ring-racers-internal!2547
 2025-05-20 19:16:44 +00:00
Antonio Martinez
5605121017 Don't bounce players when damage softening 2025-05-20 14:40:43 -04:00
Antonio Martinez
2adfb467f1 Also soften wipeout 2025-05-20 14:14:11 -04:00
Antonio Martinez
91b15905d2 Downgrade damage when tripwire lenient 2025-05-20 14:12:05 -04:00
Oni VelocitOni
fafda8df44 Merge branch 'jartha/fix-map-anger-crash' into 'master' 
Fix picked map anger vote looking for invalid player

Closes #1521

See merge request kart-krew-dev/ring-racers-internal!2556
 2025-05-20 17:51:38 +00:00
James R
628aab60c3 Fix picked map anger vote looking for invalid player 
It was looking to see if the local player picked the map
to play the cheer sound effect.
 2025-05-20 00:55:16 -07:00
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