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

7623 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sal
d64f77cf06 Merge branch 'welcome-to-errormode' into 'master' 
abs on unsigned does nothing

See merge request KartKrew/Kart!220
 2020-03-22 20:30:47 -04:00
Sal
fe9927fbd8 Merge branch 'targets' into 'master' 
Break the Capsules

See merge request KartKrew/Kart!172
 2020-03-22 20:30:20 -04:00
Sally Cochenour
53df47b4fe toaster suggestions 2020-03-22 20:29:58 -04:00
Sally Cochenour
013aa22c16 Minor item calculation fixes 2020-03-22 17:53:11 -04:00
James R
c74cea6d5d abs on unsigned does nothing 2020-03-22 14:47:12 -07:00
James R
0ee7456708 Fix shit 2020-03-22 14:45:21 -07:00
James R
2491efed20 EXTERN 2020-03-22 14:39:16 -07:00
James R
dda610fbd4 Merge remote-tracking branch 'origin/master' into kill-whitespace 2020-03-22 14:36:21 -07:00
James R
cbd4693de7 Merge remote-tracking branch 'origin/master' into parties 2020-03-22 14:34:29 -07:00
Sally Cochenour
7f07fa9b2d Move item box counter stuff into k_battle 2020-03-22 16:23:56 -04:00
Sally Cochenour
198b9770f7 Apply to any break the capsules, instead of only time attack 2020-03-22 16:14:53 -04:00
Sally Cochenour
8d91ff1e1c No time limit in capsules 2020-03-22 16:13:41 -04:00
Sally Cochenour
b18df427dd Break the Capsules ends when you lose bumpers 2020-03-22 16:07:25 -04:00
Sally Cochenour
601ab839f0 Set bumpers to 1 in Break the Capsules 2020-03-22 14:55:47 -04:00
Sally Cochenour
b1ec5654bc Merge branch 'master' into targets 2020-03-22 14:31:17 -04:00
Sal
6e02982e7d Merge branch 'air-spark-experiment' into 'master' 
Air spark experiment

See merge request KartKrew/Kart!217
 2020-03-22 14:26:33 -04:00
Sally Cochenour
7f1d55421a Merge branch 'master' into new-items 2020-03-22 14:23:51 -04:00
Sal
7ce109249a Merge branch 'antigrav-waypoints' into 'master' 
Fix antigrav respawn, no respawn flag, and remove spinout when respawning

See merge request KartKrew/Kart!213
 2020-03-22 14:23:21 -04:00
Sally Cochenour
1c7c972e08 Merge branch 'master' into power-level-tweak 2020-03-22 12:55:45 -04:00
Sally Cochenour
eddfc38d6e Merge branch 'master' into map-features 2020-03-22 12:54:53 -04:00
Latapostrophe
dc5284ecd0 Merge branch 'fix-double-bombs' into awful-mix 2020-03-22 13:09:06 +01:00
Latapostrophe
2cd0e1d615 I'm dumb, don't check for flashtics here... 2020-03-22 13:08:46 +01:00
Latapostrophe
80e04a2035 Use proper respawn check, don't cancel spinout, but prevent dropdashing when respawning with spinout 2020-03-22 11:32:55 +01:00
James R
5e671b3483 Don't reset special music in P_RestoreMusic 
Because that resets Grow music when you stack Grow over Invincibility, and
Invincibility ends. (Also Megamix Themes.)

Thanks Snu, for calling P_RestoreMusic every tic!
 2020-03-21 22:34:27 -07:00
James R
7e0aa16e70 Reset Invincibility (and Grow) music to the start if stacked 
Toggleable via the resetspecialmusic cvar.
 2020-03-21 22:28:55 -07:00
James R
dd1715aa15 Optionally only resync Invincibility and Grow music 2020-03-21 22:28:55 -07:00
James R
d99d1994da Let invincibility and grow music fades work again 2020-03-21 22:28:55 -07:00
James R
3ae147b01b Revert "Menu option for music resync" 
This reverts commit a210874ae421007d0bc97b827b4e52c9b076cd90.
 2020-03-21 22:28:55 -07:00
James R
e6eac8cd3d Revert "More intuitive menu for music resync option" 
This reverts commit ee78597a42b4e5edf5b22466682b9a00da6bcecf.
 2020-03-21 22:28:55 -07:00
James R
80c7cc3c87 3 AM Moment: The death fades now only apply to local players 2020-03-21 22:28:55 -07:00
James R
15e8291903 Reset the music fade in cvar pointer too 
This fixes a bug with death fades.
 2020-03-21 22:28:55 -07:00
James R
f6888ab004 Reset mapmusresume on level load etc. 
This is probably important, right?
 2020-03-21 22:28:55 -07:00
James R
7023ccc239 Death fades music 
Cvars are respawnfademusicout and respawnfademusicback. Both measure
milliseconds.
 2020-03-21 22:28:55 -07:00
James R
911dd57334 Restore level music to where it left off 
Toggleable via the resume cvar.
 2020-03-21 22:28:55 -07:00
James R
8524c3749d Fade level music back in after Invincibility and Grow 
Cvars are invincibilitymusicfade and growmusicfade. Both measure milliseconds.
 2020-03-21 22:28:54 -07:00
James R
e9c0e65e0e Only resync music if in a level 2020-03-21 22:28:54 -07:00
James R
d1dce97d15 Don't resync if it's disabled 2020-03-21 22:28:54 -07:00
James R
7d1012e85e More intuitive menu for music resync option 2020-03-21 22:28:54 -07:00
James R
04d7112538 Limit music resync threshold to one second 2020-03-21 22:28:54 -07:00
James R
1e5041375c Menu option for music resync 2020-03-21 22:28:54 -07:00
James R
530cac8673 Hey it's audio- ....resynching... 2020-03-21 22:28:54 -07:00
Sal
36f9bb4381 Merge branch 'waypoints' into 'master' 
Waypoints Exist

See merge request KartKrew/Kart!215
 2020-03-22 01:05:02 -04:00
Sally Cochenour
c75e3a025c Braces to avoid compile error 
(Not sure why I never got this until now?)
 2020-03-21 23:11:19 -04:00
Sally Cochenour
521c4662bf void out heap after done asserting, to fix an unused variable compile error I get 2020-03-21 23:09:05 -04:00
Sally Cochenour
65bd0da11d Use PWRLVRECORD_START instead of PWRLVRECORD_DEF to encourage more spread 2020-03-21 23:01:51 -04:00
Sally Cochenour
c9cff6ccc2 P_MobjTouchingSectorSpecial checks polyobjects 
This means polyobjects can have effects like offroad
 2020-03-21 22:06:01 -04:00
Sryder
4975cce3ac Just use an I_Assert on SpawnSPBRingTrail 2020-03-22 00:47:17 +00:00
Sryder
9dae62c2c6 Fix me being hyperdumb with copypaste error 2020-03-22 00:47:02 +00:00
Sryder
2be2277f4b Fix the merge confluct I SOMEHOW missed 2020-03-22 00:44:28 +00:00
James R
d46c6dc384 Kill trailing whitespace 2020-03-21 17:37:33 -07:00