Commit graph

6638 commits

Author SHA1 Message Date
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
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
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
James R
1dd95f5e3b gr_shearing doesn't exist in master! 2020-03-21 12:53:33 -07:00
Sal
68bec970a3 Merge branch 'viewpoint-text-toggle' into 'master'
Option to hide/show viewpoint text

See merge request KartKrew/Kart!209
2020-03-20 22:07:30 -04:00
Sal
27a7f020d3 Merge branch 'camtilt' into 'master'
Add camera pitching when driving on downhill slopes

See merge request KartKrew/Kart!210
2020-03-20 21:41:17 -04:00
Sally Cochenour
46049dba40 Fix drift spark weirdness in mobjscale maps 2020-03-19 22:52:11 -04:00
Sally Cochenour
7924606fe4 Opaque splash 2020-03-19 22:37:13 -04:00
Sally Cochenour
40e01fb71c Increase thrust of destroyed items
Roughly matches what it was supposed to look like before gravity was increased
2020-03-19 22:35:07 -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
860c1fe23b Opaque rain 2020-03-16 04:17:45 -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
7d1c132ca2 Fix drift spark camera when you go to yellow sparks 2020-03-15 21:21:07 -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
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
9dfbd918a4 Don't forcefully remove drift when bumping walls 2020-03-14 18:14:21 -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
lachwright
49f9d830ed Attempt to make splitscreen's camtilt better 2020-03-12 01:23:09 +08:00
lachwright
e2c95a0060 Visibility improvement 2020-03-10 19:30:02 +08:00
lachwright
f0c98697dc Add camera pitching when driving on downhill slopes 2020-03-10 05:18:05 +08: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
b4933bacb3 Didn't work, let's try this
objectSpeed was getting scaled with the spring's size, when only the spring's base speed should be scaled
2020-03-08 01:37:48 -05:00
Sally Cochenour
8c1aec3713 Fix springs having weird launch speeds in mobjscale maps
Same issue as lobbing -- scale being double-applied
2020-03-08 01:12:53 -05: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
7174b707a1 Draw distance uses object scale 2020-03-08 00:39:21 -05:00
Sal
b3a1bb6064 Merge branch 'fullbright-boosters' into 'master'
Fullbright boosters

See merge request KartKrew/Kart!205
2020-03-07 14:37:36 -05:00
Sally Cochenour
558f8607c9 Merge branch 'master' into fullbright-boosters 2020-03-06 12:56:36 -05:00
Sally Cochenour
83c74af696 Fix bad master merge 2020-03-06 12:56:12 -05:00
Sally Cochenour
76188e89fb Fullbright boosters
We no longer have to maintain this standard manually. I actually suggest making booster sectors use the lightlevel of their surrounding sectors so that only the booster itself glows.

(OGL support is commented out, since it conflicts with sal-lighting and should probably be done there)
2020-03-06 12:54:54 -05:00
Sal
5852b40482 Merge branch '22shadows' into 'master'
2.2 shadows port

See merge request KartKrew/Kart!203
2020-03-06 00:37:41 -05: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
9392282b23 Merge branch 'exists-fix' into 'master'
Prevent LF2_EXISTSHACK from ever getting removed

See merge request KartKrew/Kart!196
2020-03-06 00:10:20 -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
Sal
10fe9434f6 Merge branch 'blizzard' into 'master'
Weather system refactor, Blizzard weather type

See merge request KartKrew/Kart!200
2020-03-06 00:09:43 -05:00
Sal
2448ab34e9 Merge branch 'no-charge' into 'master'
Disable charging drift sparks in bounce pad state

See merge request KartKrew/Kart!190
2020-03-06 00:09:27 -05:00