Commit graph

1939 commits

Author SHA1 Message Date
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
Sally Cochenour
3093a3078e Scale dust properly 2020-03-15 22:05:43 -04:00
Sally Cochenour
c4dd88bbae Turn sparkles that warn you when you're about to hit a new drift spark! 2020-03-15 21:59:22 -04:00
Sally Cochenour
01885c5166 Revert "Actually, might've reintroduced more lawnmower problems; let's play it safe"
This reverts commit 219d4aebf2.
2020-03-15 20:52:41 -04:00
Sally Cochenour
fa34e4eee4 Merge branch 'master' into sal-waypoints 2020-03-15 20:21:17 -04:00
Sally Cochenour
e3d50862c0 Using sparks in air experiment 2020-03-15 18:38:25 -04:00
Sally Cochenour
69cc03a434 This line broke yellow sparks entirely 2020-03-14 19:01:34 -04:00
Sally Cochenour
f235a50d2e Blue sparks trail longer 2020-03-14 18:46:22 -04:00
Sally Cochenour
ed9919d47c Remove drift when hitting 0 speed
Prevents silliness like this: https://cdn.discordapp.com/attachments/275750804227489794/688515983471804455/kart0027.gif
2020-03-14 18:38:01 -04:00
Sally Cochenour
219d4aebf2 Actually, might've reintroduced more lawnmower problems; let's play it safe 2020-03-14 18:31:53 -04:00
Sally Cochenour
f37b1268b4 Slight adjustments to yellow spark nuances
Instead of setting you to yellow sparks when before you could keep red sparks, it keeps your previous "state". When going below 20 speed when you have sparks, you no longer stop charging sparks, but you have to break above 20 speed once you have yellow sparks to get normal sparks again.
2020-03-14 18:12:36 -04:00
Sally Cochenour
c6f3ac651e Switch red & blue sparks, add yellow sparks, add big spark sprites 2020-03-14 01:43:54 -04:00
Latapostrophe
1f5bbb2c3d Merge branch 'push-more-lua' into awful-mix 2020-03-11 07:37:47 +01:00
Latapostrophe
f98a74638f More explicit var names for countdown and countdown2 2020-03-11 07:37:33 +01:00
Sally Cochenour
5d2f380a13 Lightsnake scales
(The comment about scale not working was actually just paper sprite projection mucking it up)
2020-03-08 17:33:07 -04:00
Sally Cochenour
fecb2cdebd Fix item lobbing in mobjscale maps
This happened when I was trying to fix several mobjscale issues at once for v1 -- I either didn't notice the P_SetObjectMomZ, or didn't realize that this function already handles scale changes for you.
2020-03-08 00:48:56 -05:00
Sally Cochenour
d8e0bf61f6 Scale item distances with map scale 2020-03-08 00:26:33 -05:00
James R
5847d519d7 Merge branch 'parties-only' into parties 2020-03-05 21:41:28 -08:00
James R
18aa2972e5 Merge remote-tracking branch 'origin/master' into parties-only 2020-03-05 21:41:23 -08:00
James R
253ab49c07 Merge remote-tracking branch 'origin/master' into 22shadows 2020-03-05 21:36:58 -08:00
Sal
b13ebd6d15 Merge branch 'special-sector-tweak' into 'master'
Fix step-up on stairs for other objects (Orbinaut VS Toxic Palace Stairs)

See merge request KartKrew/Kart!201
2020-03-06 00:10:35 -05:00
Sal
4b5b2462b5 Merge branch 'gentlemen' into 'master'
Gentlemen's ping agreement

See merge request KartKrew/Kart!197
2020-03-06 00:10:06 -05:00
Sally Cochenour
721fb369fd Move changes to K_GetBestWaypointForMobj so that K_GetClosestWaypointToMobj can stay the same 2020-03-03 18:34:17 -05:00
Sally Cochenour
1cbb4bea6b Limited vertical range on player waypoints 2020-03-03 15:47:02 -05:00
Sally Cochenour
8a19f6f208 Wrong sign here 2020-03-03 15:41:03 -05:00
Sally Cochenour
597e6820b6 Let's try out going back to closest check again 2020-03-03 14:47:41 -05:00
Sally Cochenour
d91e8205dc Don't update respawn point when mid-air 2020-03-03 14:22:52 -05:00
Sally Cochenour
18637b9eb2 2.2 shadow port 2020-03-01 22:12:50 -05:00
Sally Cochenour
c17f4dcf15 Remove our shadows 2020-03-01 17:07:52 -05:00
Sally Cochenour
3633dc341a Merge branch 'master' into targets 2020-03-01 15:42:49 -05:00
Sally Cochenour
76e75d9756 Fix offroad collision
Adds an option to P_MobjTouchingSectorSpecial to only use non-FOF sectors' special if you're touching their floor/ceiling.
2020-03-01 14:36:13 -05:00
James R
ea8fd7348f Show lagless for all the host's splitscreen players 2020-02-23 23:23:50 -08:00
James R
f9b5f71171 Merge branch 'gentlemen' into parties 2020-02-23 23:22:37 -08:00
James R
0c814ce42d Sync look back
Also fixes look back applying to the first
player in parties instead of locally.
2020-02-23 23:21:20 -08:00
James R
4f40edaf01 Maybe localdisplayplayers is a bad idea 2020-02-23 23:21:20 -08:00
James R
f164320c88 Make the order of displayplayers irrelevant and split splitscreen into splitscreen and r_splitscreen 2020-02-23 23:20:20 -08:00
James R
4f73e26661 Show server's ping on scores if not LAGLESS 2020-02-23 23:07:57 -08:00