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
James R
12a229285b
Kill CRLF
2020-03-21 17:37:16 -07:00
Sryder
203aa0602e
Use P_FindSpecialLineFromTag for MT_WAYPOINT, now that it works where we need it
...
This matches how MT_SPINMACEPOINT was changed
2020-03-22 00:25:48 +00:00
James R
310a9cd09c
Merge remote-tracking branch 'origin/master' into parties
2020-03-21 17:22:57 -07:00
Sryder
5cd1296505
Include license/copyright headers on new files.
2020-03-22 00:16:32 +00:00
Sally Cochenour
22702f88bc
"Delete items" sector type
2020-03-21 19:54:24 -04:00
Sryder
da2f1fc972
Merge branch 'master' of git@git.magicalgirl.moe:KartKrew/Kart.git into waypoints
...
# Conflicts:
# src/k_kart.c
2020-03-21 23:27:55 +00:00
Sryder
e874af3e43
Very minor fix to WRONG WAY
...
More opaque waypoint markers for kartdebugwaypoints
Looks like whitespace got murdered in k_kart.c again
2020-03-21 23:24:04 +00:00
Sally Cochenour
58df481cd3
Replace "Block Enemies" with "Block Players"
...
We don't need the ability to make invisible walls for enemies as often as we've needed invisible walls for players that don't block their thrown items.
2020-03-21 19:08:59 -04:00
Sal
bda7dc9ddf
Merge branch 'colors-yet-again' into 'master'
...
Another round of small color tweaks
See merge request KartKrew/Kart!208
2020-03-21 19:03:27 -04:00
Sal
9d35d0f5d8
Merge branch 'driftspark-update' into 'master'
...
Yellow drift sparks & new drift spark effects
See merge request KartKrew/Kart!211
2020-03-21 19:02:48 -04:00
James R
c3b967468a
Revert "Remove kartdebugitem"
...
This reverts commit 803884c55a
2020-03-21 15:56:40 -07:00
James R
4a973e2906
Revert "...Also remove kartdebugamount"
...
This reverts commit 22cb7451e9
2020-03-21 15:56:38 -07:00
Sal
cbfce16dcc
Merge branch 'done-with-spikeballs' into 'master'
...
Slow down backwards spikeballs (again)
See merge request KartKrew/Kart!212
2020-03-21 18:49:02 -04:00
Sal
0cb5e5893c
Merge branch 'objscalefixes' into 'master'
...
Minor map object scale fixes
See merge request KartKrew/Kart!206
2020-03-21 18:48:36 -04:00
Sally Cochenour
668f80a8ea
Properly scale...
2020-03-21 18:47:44 -04:00
Sal
21f28b27f5
Merge branch 'oops' into 'master'
...
Fix compile error with camtilt
See merge request KartKrew/Kart!214
2020-03-21 18:45:19 -04:00
Sryder
738d1f1940
Make kartdebugwaypoints far more clear to use for the debugging lines
...
Fix memory reallocation issue that I don't think could be seen currently
2020-03-21 21:32:40 +00:00
James R
52fa738ef8
Replace even more ints with INT32
2020-03-21 13:18:17 -07:00
James R
8a28d3cfe5
Replace some instances of int with fixed width types
2020-03-21 13:12:50 -07:00
James R
29ebf7ee60
Attempt to fix Sal's compiler warnings
2020-03-21 13:07:22 -07:00
James R
1dd95f5e3b
gr_shearing doesn't exist in master!
2020-03-21 12:53:33 -07:00
James R
b1db9077a4
splitscreen -> r_splitscreen
2020-03-21 12:48:51 -07:00
James R
fd1cb69a87
Merge remote-tracking branch 'origin/master' into parties
2020-03-21 12:45:23 -07:00
Sryder
3d3b8b6bc6
Replace many cases of if else if statements with I_Asserts.
...
This is done specifically on static functions that aren't used as callbacks.
This is done to keep the code cleaner, and the I_Asserts get compiled out in Release builds.
Logic is left in the "public" functions to avoid crashes as a result of the modules.
2020-03-21 19:00:00 +00:00
