Commit graph

7030 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
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
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
Sally Cochenour
46364422d9 Real dumb bug 2020-03-21 05:58:42 -04: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
Sal
aeb6567b53 Merge branch 'sal-waypoints' into 'waypoints'
Sal edits to waypoints

See merge request KartKrew/Kart!202
2020-03-20 20:43:27 -04:00
Sally Cochenour
263ef8f92c Use divide/multiply for waypoint closest calculations 2020-03-20 19:33:41 -04:00
Latapostrophe
366fff9942 Red rings, fuse, and spb game speed support 2020-03-20 21:58:14 +01:00
Latapostrophe
897feac651 Make SPB spawn damaging dust and sliptides while it moves around 2020-03-20 14:59:38 +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
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
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