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
23677 commits 1 branch 12 tags 205 MiB
Commit graph

23677 commits

This branch
This branch
All branches
Author SHA1 Message Date
Oni
f93e925a4a Merge branch 'cap-ring-speed-lines' into 'master' 
Don't ringboost-scale speedlines past 2x (3x with tripwire leniency)

See merge request KartKrew/Kart!1366
 2023-08-01 01:06:30 +00:00
AJ Martinez
4cfa163cf5 Save a math operation sometimes 2023-07-31 03:15:27 -07:00
AJ Martinez
0d3b6c57b0 Don't ringboost-scale speedlines past 2x (3x with tripwire leniency) 2023-07-31 03:04:13 -07:00
Oni
087cb961b5 Merge branch 'ring-box-sound' into 'master' 
Ring Box dopamine

See merge request KartKrew/Kart!1365
 2023-07-31 08:58:39 +00:00
Oni
a047373bf6 Merge branch 'map-angrier-git-sucks' into 'master' 
Required anger rounds 5 -> 3

See merge request KartKrew/Kart!1362
 2023-07-31 08:14:41 +00:00
AJ Martinez
0c45500901 Ring Box dopamine 2023-07-30 22:15:50 -07:00
Eidolon
cd6925538e Merge branch 'fix-xmp-resume' into 'master' 
Only throw XmpException on negative seek pos

Closes #449

See merge request KartKrew/Kart!1364
 2023-07-30 18:09:31 +00:00
Eidolon
743c9fe8ef Only throw XmpException on negative seek pos 2023-07-30 10:21:05 -05:00
AJ Martinez
658177243b Required anger rounds 5 -> 3 2023-07-30 01:55:09 -07:00
Oni
1325bf7afa Merge branch 'slow-degrease' into 'master' 
Slower players lose springgrease faster (resolves #242)

Closes #242

See merge request KartKrew/Kart!1360
 2023-07-29 18:45:37 +00:00
Oni
e9cea99ae7 Merge branch 'dashrings' into 'master' 
Hardcode MT_DASHRING & MT_RAINBOWDASHRING

See merge request KartKrew/Kart!1345
 2023-07-29 18:29:08 +00:00
Oni
a18982dc55 Merge branch 'splatbooster' into 'dashrings' 
Hardcode MT_SNEAKERPANEL & MT_SNEAKERPANELSPAWNER

See merge request KartKrew/Kart!1349
 2023-07-29 18:28:48 +00:00
Oni
1c2ec244dd Merge branch 'frame-shield' into 'master' 
Simpler 120-tic flame shield behavior (resolves #586)

Closes #586

See merge request KartKrew/Kart!1361
 2023-07-29 18:25:08 +00:00
AJ Martinez
1a6b8d49ea Allow flameshield gauge to quickly grow on acquisition 2023-07-29 05:18:36 -07:00
AJ Martinez
6607722b64 Simpler 120-tic flame shield behavior 2023-07-29 05:10:14 -07:00
AJ Martinez
dc39566acf Clarify degrease magic number 2023-07-29 03:53:04 -07:00
AJ Martinez
424cda41d4 Slower players lose springgrease faster 2023-07-29 03:51:46 -07:00
Lach
6b86cbb500 Fix compile warnings 2023-07-29 18:23:04 +10:00
Lach
fd8ba4236d Hardcode MT_SNEAKERPANELSPAWNER & adjust FF_GLOBALANIM behaviour 2023-07-29 17:51:25 +10:00
toaster
bdc77ce940 Add "../k_objects.h" to dash-rings.c 2023-07-28 23:40:12 +01:00
toaster
16e036a0bd Merge branch 'master' of https://git.do.srb2.org/KartKrew/Kart into dashrings 2023-07-28 23:12:06 +01:00
toaster
9171992a9f Merge branch 'inter-duel' into 'master' 
Intermission - DUEL mode

See merge request KartKrew/Kart!1354
 2023-07-28 22:09:51 +00:00
toaster
421a9f1990 Merge branch 'max-errors' into 'master' 
CMakeLists.txt: add -fmax-errors=5 for GNU

See merge request KartKrew/Kart!1357
 2023-07-28 21:54:55 +00:00
toaster
1b5d59746f Adjustments/fixes to Duel Intermission view 
- Always show, even in online
- Add Egga Channel/CPU icon if not a local player-controlled character
    - This fixes an infinite loop crash that could previously affect 1v1s VS bots
 2023-07-28 22:21:37 +01:00
Oni
bdad8d59ac Merge branch 'sunbeam-palms' into 'master' 
Sunbeam Palm

See merge request KartKrew/Kart!1353
 2023-07-28 19:15:37 +00:00
James R
b7d4513fba CMakeLists.txt: add -fmax-errors=5 for GNU 
Stops compilation after 5 errors, such as in the case of
cascading errors from a missing semicolon.
 2023-07-27 18:37:24 -07:00
James R
3eb356f7b9 Comptime.cmake: get rid of CMake < 3.5 compatibility warning 2023-07-27 18:19:14 -07:00
James R
3cf2b27b11 Merge branch 'fix-ring-drain' into 'master' 
Fix negative ring count in (460) Award Rings not actually subtracting rings

See merge request KartKrew/Kart!1355
 2023-07-27 05:44:54 +00:00
James R
092bfd475e P_ProcessSpecial: fix ring drain sign 2023-07-26 18:05:44 -07:00
toaster
2b4cd831e1 Fix on-screen alignment of Duel Intermission boxes 
- Now more consistent between time/score and rankings mode
- Symmetrical if you flipped the screen, no slight rightward bias in placement
 2023-07-26 16:51:05 +01:00
toaster
8553581d80 Improved behaviour for skipping second half of intermission in offline games 
Instead of tying it directly to the number of players, instead base it on whether the points are important to keep track of.
- Match Race or Time Attack
- No next map override, since points will persist to that one
- No maps queued, so points aren't relevant
    - OR maps are queued but you haven't started them yet, so the points will be discarded
 2023-07-26 15:51:39 +01:00
toaster
23f479f365 Intermission - DUEL mode 
Show players' appearances on intermissions with less than or equal to 2 players, in port priority order, to mimic Sonic 3 Competition.

Also shows player letter and profile name in Match Race, to really drive the reference home.
 2023-07-26 14:31:50 +01:00
toaster
03f9ff0847 Character Select menu: Put B, D on the right side of the PLAYER/profile name text, to avoid overlapping the player's eyes 2023-07-26 14:20:46 +01:00
toaster
f040523b19 Implement the Sunbeam Palm decoration 
- Randomised tilt
- Randomised leaf angles
- Technically specifiable number of leaves, but the default of 5 is sane enough
 2023-07-25 18:01:07 +01:00
Oni
ddf55d4040 Merge branch 'server-param' into 'master' 
-server for map command

See merge request KartKrew/Kart!1350
 2023-07-24 23:13:50 +00:00
Oni
0b5cae201e Merge branch 'dont-rewrite-the-past' into 'master' 
Don't rewrite the past if we might still need to send it

See merge request KartKrew/Kart!1333
 2023-07-24 23:12:41 +00:00
James R
3f162db960 Merge branch 'vres-multiref' into 'master' 
Double-free emergency fix for virtual resources

See merge request KartKrew/Kart!1352
 2023-07-24 22:53:49 +00:00
toaster
b4197a2263 Double-free emergency fix for virtual resources 
- vres_GetMap guarantees the same memory for the same lump id, provided it's active
- vres_Free won't delete curmapvirt unless you do some silly temp pointer stuff
 2023-07-24 23:40:30 +01:00
Oni
87aab3c881 Merge branch 'music-joining' into 'master' 
Fix music on midgame server join

Closes #473

See merge request KartKrew/Kart!1351
 2023-07-23 17:51:47 +00:00
Oni
b82392dee6 Merge branch 'more-conversions' into 'master' 
More UDMF conversions

See merge request KartKrew/Kart!1336
 2023-07-23 17:24:17 +00:00
Oni
5fbed38c82 Merge branch 'springs-scaled' into 'master' 
UDMF upscaled springs: Treat as an increased hitbox only, not as a strength multiplier

See merge request KartKrew/Kart!1346
 2023-07-23 17:22:52 +00:00
Oni
e2aea58474 Merge branch 'louder-wavedash' into 'master' 
Play wavedash sounds at full volume

See merge request KartKrew/Kart!1348
 2023-07-23 17:22:36 +00:00
Oni
7912b24e6f Merge branch 'rivals-fix' into 'master' 
Rivals and Replays and Re-Entry, oh my

Closes #544 and #577

See merge request KartKrew/Kart!1340
 2023-07-23 17:21:06 +00:00
toaster
2dbb11af89 Use S_AttemptToRestoreMusic to handle music after server connection 
Resolves #473
 2023-07-22 19:24:25 +01:00
toaster
2fd7c7717c P_StartPositionMusic 
Consistently sets position or encore hum for multiple contexts
Now can be used in P_RestoreMusic for restoration purposes
 2023-07-22 18:55:49 +01:00
toaster
7c952e3509 Tidy P_LoadLevel music starting a little 2023-07-22 18:32:50 +01:00
toaster
67a1fda79b Permit starting a netgame or match race from the console via the map command 
None of the following can be combined together, and Grand Prix is still the default with no parameter from the menus.

- `-server`
    - Starts a server
- `-match`
    - Starts a Match (Race) round
- `-skill`
    - Already existed, but can now only be used for GP

Also guarantees the main menu wil be closed, which wasn't previously guaranteed.
 2023-07-22 17:02:53 +01:00
toaster
3d383f209e Got_TeamChange: Applying PF_WANTSTOJOIN is NOT a playstate change 2023-07-22 14:37:34 +01:00
toaster
39d9dc99aa FinalisePlaystateChange: Don't reset spectatorReentry timer if it's already nonzero 2023-07-22 14:33:32 +01:00
toaster
e0b47b16e7 Improve Spectator entry handling 
- Re-entry SHOULDN'T get stuck nonzero on first join for a given node
    - Set to 0 for all players on level start
    - Set to 0 for all players on level end
    - DEFINITELY never intentionally set on join with teamchange finalisation
    - This basically just prevents people from spamming New Challenger after hopping out mid-session, since the previous version, in addition to being buggy, was a little annoying.
- New Challenger no longer happens on tic 0 of mapload
    - Handles any late, pending PF_PF_WANTSTOJOINs without threat of reset in P_PostLoadLevel
 2023-07-22 14:03:11 +01:00