Commit graph

7706 commits

Author SHA1 Message Date
Sally Cochenour
1e10ec00d7 Merge branch 'waypoints' into sal-waypoints 2020-03-15 20:23:24 -04:00
Sally Cochenour
fa34e4eee4 Merge branch 'master' into sal-waypoints 2020-03-15 20:21:17 -04:00
Sryder
c268313f0a Merge branch 'master' of git@git.magicalgirl.moe:KartKrew/Kart.git into waypoints
# Conflicts:
#	src/Makefile
#	src/k_kart.c
#	src/p_map.c
#	src/p_setup.c
#	src/p_spec.c
2020-03-16 00:13:42 +00:00
Sally Cochenour
084901a8b1 Add warnings for old map setups
We probably don't want to keep these for release, but we need reminders to get rid of them ourselves :V
2020-03-15 19:21:06 -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
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
Latapostrophe
b6bc575a70 Merge branch 'spb-blockmap-fix' of git.magicalgirl.moe:KartKrew/Kart-Public into awful-mix 2020-03-13 22:38:20 +01:00
Latapostrophe
f55f889fbd Merge branch 'fix-double-bombs' into awful-mix 2020-03-13 13:52:37 +01:00
Latapostrophe
bcca38d014 This flag shouldn't have been applied there 2020-03-13 13:50:22 +01:00
Latapostrophe
d2f1b83a09 Merge branch 'awful-mix' of git.magicalgirl.moe:SinnamonLat/Kart-Public into awful-mix 2020-03-12 16:04:49 +01:00
Latapostrophe
6fe54eafba Fix Lua crashes when loading without addons 2020-03-12 16:03:12 +01:00
Latapostrophe
9abbd2d1b3 Fix Demo lua archive crash for real this time 2020-03-12 15:31:58 +01:00
Latapostrophe
4c367a9b5a What the fuck how did this get here 2020-03-11 15:03:12 -04:00
Latapostrophe
ba8b962f61 Fix tiny conflict because I forgot to merge 2020-03-11 19:55:56 +01:00
Latapostrophe
5f11f7b8df Remove debug prints 2020-03-11 19:53:52 +01:00
Latapostrophe
778ab0a2bb Attempt to fix replay loading crash 2020-03-11 19:33:22 +01:00
lachwright
49f9d830ed Attempt to make splitscreen's camtilt better 2020-03-12 01:23:09 +08:00
Latapostrophe
14a26c412a Merge branch 'too-many-files' into awful-mix 2020-03-11 12:34:54 +01:00
Latapostrophe
8ed53d1aaa don't set MAX_WADFILES to 256, worst mistake of my life 2020-03-11 12:34:35 +01: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
Latapostrophe
eca292dae0 Merge branch 'too-many-files' into awful-mix 2020-03-11 07:21:41 +01:00
Latapostrophe
4fcefbc48b Bump MAX_WADFILES to 256 2020-03-11 07:20:11 +01:00
Latapostrophe
b7702f5ff5 Merge branch 'antifreeze' of https://gitlab.com/fickleheart/srb2kart-mods into awful-mix 2020-03-10 21:46:12 +01:00
Latapostrophe
8ca1571c78 Merge branch 'damned-springpads' into v1.2-frankeinstein 2020-03-10 20:39:35 +01:00
Latapostrophe
e75f98b5e8 Merge branch 'push-more-lua' into v1.2-frankeinstein 2020-03-10 20:35:29 +01:00
Latapostrophe
3d74bc2ebc Merge branch 'fix-orbit-shield' into v1.2-frankeinstein 2020-03-10 20:35:19 +01:00
Latapostrophe
f776de7a90 Merge branch 'fix-double-bombs' into v1.2-frankeinstein 2020-03-10 20:34:47 +01:00
Latapostrophe
403d30dc15 Merge branch 'no-cheese' into v1.2-frankeinstein 2020-03-10 20:34:38 +01:00
Latapostrophe
207e68e55d Merge branch 'gl-qol' into v1.2-frankeinstein 2020-03-10 20:34:20 +01:00
Latapostrophe
a75eb7bff4 Merge branch 'stack-draw-flags' into v1.2-frankeinstein 2020-03-10 20:27:52 +01:00
Latapostrophe
4dfb47dff6 Merge branch 'record-attack-changes' into v1.2-frankeinstein 2020-03-10 20:27:00 +01:00
Latapostrophe
af4922b53e VoteThinker Hook for Lua 2020-03-10 18:58:44 +01:00
Latapostrophe
e801057559 Expose CV_FindVar to Lua 2020-03-10 18:12:20 +01:00
Latapostrophe
1abe899060 Push race countdowns and functions to set them 2020-03-10 12:57:30 +01:00
lachwright
e2c95a0060 Visibility improvement 2020-03-10 19:30:02 +08:00
Latapostrophe
d7146021c1 Push consoleplayer and displayplayers to Lua 2020-03-10 11:53:28 +01:00
Latapostrophe
5147cabff2 Remove debug print 2020-03-10 10:21:47 +01: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