Sal
8d763afae6
Merge branch 'map-features' into 'master'
...
Minor but handy new mapping features
See merge request KartKrew/Kart!218
2020-03-23 00:44:18 -04:00
Sal
14bd304b06
Merge branch 'parties' into 'master'
...
Parties (Online Splitscreen Mk. II)
See merge request KartKrew/Kart!198
2020-03-23 00:43:33 -04:00
James R
abcba53781
Merge remote-tracking branch 'origin/master' into parties
2020-03-22 18:28:07 -07:00
Sally Cochenour
464e3273a9
Missing include
2020-03-22 21:16:55 -04:00
Sally Cochenour
a638054332
Bad whoopsie
2020-03-22 20:37:20 -04:00
Sal
82a39f6c85
Merge branch 'kill-whitespace' into 'master'
...
Kill CRLF and trailing whitespace
See merge request KartKrew/Kart!216
2020-03-22 20:31:08 -04:00
Sal
d64f77cf06
Merge branch 'welcome-to-errormode' into 'master'
...
abs on unsigned does nothing
See merge request KartKrew/Kart!220
2020-03-22 20:30:47 -04:00
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
53df47b4fe
toaster suggestions
2020-03-22 20:29:58 -04:00
James R
c74cea6d5d
abs on unsigned does nothing
2020-03-22 14:47:12 -07:00
James R
0ee7456708
Fix shit
2020-03-22 14:45:21 -07:00
James R
2491efed20
EXTERN
2020-03-22 14:39:16 -07:00
James R
dda610fbd4
Merge remote-tracking branch 'origin/master' into kill-whitespace
2020-03-22 14:36:21 -07:00
James R
cbd4693de7
Merge remote-tracking branch 'origin/master' into parties
2020-03-22 14:34:29 -07:00
Sally Cochenour
7f07fa9b2d
Move item box counter stuff into k_battle
2020-03-22 16:23:56 -04:00
Sally Cochenour
198b9770f7
Apply to any break the capsules, instead of only time attack
2020-03-22 16:14:53 -04:00
Sally Cochenour
8d91ff1e1c
No time limit in capsules
2020-03-22 16:13:41 -04: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
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
Sally Cochenour
eddfc38d6e
Merge branch 'master' into map-features
2020-03-22 12:54:53 -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
Sal
36f9bb4381
Merge branch 'waypoints' into 'master'
...
Waypoints Exist
See merge request KartKrew/Kart!215
2020-03-22 01:05:02 -04:00
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
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
