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
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
cbd4693de7
Merge remote-tracking branch 'origin/master' into parties
2020-03-22 14:34:29 -07: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
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
Sryder
2be2277f4b
Fix the merge confluct I SOMEHOW missed
2020-03-22 00:44:28 +00:00
James R
310a9cd09c
Merge remote-tracking branch 'origin/master' into parties
2020-03-21 17:22:57 -07: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
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
Sally Cochenour
668f80a8ea
Properly scale...
2020-03-21 18:47:44 -04:00
Sally Cochenour
46364422d9
Real dumb bug
2020-03-21 05:58:42 -04:00
Latapostrophe
366fff9942
Red rings, fuse, and spb game speed support
2020-03-20 21:58:14 +01:00
Latapostrophe
b959c01349
Fix antigrav respawn, no respawn flag, and remove spinout when respawning
2020-03-20 11:04:26 +01:00
Sally Cochenour
2ccc3894e2
Make size differences impact bump knockback more
2020-03-20 00:35:18 -04:00
Sally Cochenour
e83e162463
Thrust when you extinguish flame shield
2020-03-20 00:30:50 -04:00
Sally Cochenour
86edea91d4
Scale thrown items with grow/shrink
2020-03-20 00:27:31 -04:00
Sally Cochenour
46049dba40
Fix drift spark weirdness in mobjscale maps
2020-03-19 22:52:11 -04:00
Sally Cochenour
9a1c013cfc
Add basic sound effect
2020-03-19 20:23:00 -04:00
Sally Cochenour
ac8717b981
Make flame gauge placeholder behavior proportional to player count
2020-03-19 20:17:25 -04:00
Sally Cochenour
6969c833c2
Add more momentum variation
2020-03-19 02:17:12 -04:00
Sally Cochenour
f8d5a5bdf1
Copy boost smoke effect but bigger
2020-03-19 02:12:09 -04:00
Sally Cochenour
9de1e535f2
More complete flame shield rework
2020-03-19 01:35:31 -04:00
James R
cca9b5e2f4
Merge branch 'parties-only' into parties
2020-03-18 19:42:58 -07:00
James R
26794eef46
Draw mini ping counter in splitscreen
2020-03-18 19:42:13 -07:00
Sally Cochenour
10c625b42e
Start on flame shield rework
2020-03-18 02:38:02 -04:00
Sally Cochenour
dad1d7b610
Apply to flame shield as well (although it didn't need it)
2020-03-17 20:37:36 -04:00
Sally Cochenour
e5fb55df83
Fix infinite bubble bug
2020-03-17 20:36:23 -04:00
Sally Cochenour
5ef433f9c7
Remove bumper when you respawn in Battle again
...
(This stuff really should be its own function...)
2020-03-17 19:54:32 -04:00
Sally Cochenour
54e1444852
Reset bubble cooldown & holdready when used
2020-03-17 19:41:53 -04:00
Sally Cochenour
040865b589
Merge branch 'master' into new-items
2020-03-17 19:31:47 -04:00
Sally Cochenour
32d1abeb2b
Bubble cooldown is longer
...
It was meant to be the same length as inflate & deflate AFTER you were done, but it was only half of that -- now you're vulnerable for the same amount of time as you held it down.
2020-03-17 19:22:13 -04:00
Sally Cochenour
4b2b116481
Try using GameSpeedScalar for thrown item scaling between game speeds, rather than arbritrary values
...
In Hard mode: Spikeballs will be thrown slightly less with this code change, while Bananas will be thrown slightly farther.
That said, the difference is so small that it's very likely not noticable, it just makes the code nicer looking & more consistent :P
2020-03-17 18:55:15 -04:00
Sally Cochenour
9e3a37cdc7
Make Ballhog thrown more like normal missiles
...
(For some reason, it used banana toss throwing speeds before)
2020-03-17 18:49:16 -04:00
Sally Cochenour
fccc4d2937
Slow down backwards spikeballs (again)
2020-03-16 04:24:32 -04:00
Sally Cochenour
a322f4efd4
Merge branch 'driftspark-update' into air-spark-experiment
2020-03-16 00:54:48 -04:00
Sally Cochenour
48e69f7c91
Air sparks, start on drift boosts
2020-03-16 00:53:33 -04:00
Sally Cochenour
4026344ad3
Minor yellow-spark related cleanup
...
Sound plays when you go to yellow sparks & back, and Red transition uses Tangerine instead of Raspberry
2020-03-15 23:21:46 -04:00
Sally Cochenour
4174d9a23e
Add a function for retrieving drift spark color, to simplify a lot of code & add transition colors to everything
2020-03-15 23:02:43 -04:00
