Commit graph

7017 commits

Author SHA1 Message Date
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
Sally Cochenour
4e63b39ccb Firery shield 2020-03-22 23:27:27 -04:00
Sally Cochenour
e5a59c28d1 Use smaller value 2020-03-22 22:09:32 -04:00
Sally Cochenour
227a4dcbd3 Flame Shield improvin's 2020-03-22 22:01:40 -04:00
James R
90d415ccc0 Ignore spectators for gentlemen's ping 2020-03-22 18:55:28 -07:00
James R
abcba53781 Merge remote-tracking branch 'origin/master' into parties 2020-03-22 18:28:07 -07:00
Sally Cochenour
ec7528a333 Merge branch 'master' into new-items 2020-03-22 21:17:43 -04:00
Sally Cochenour
464e3273a9 Missing include 2020-03-22 21:16:55 -04:00
Sally Cochenour
8a5d00d1c7 Increase distance for natural spb 2020-03-22 20:52:54 -04:00
Sally Cochenour
9379202dc4 Dumb mistake 2020-03-22 20:52:20 -04:00
Sally Cochenour
7690eeab2b Merge branch 'new-items-blah' into new-items 2020-03-22 20:51:16 -04:00
Sally Cochenour
25bc236bde Merge branch 'master' into new-items 2020-03-22 20:50:28 -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
Sally Cochenour
013aa22c16 Minor item calculation fixes 2020-03-22 17:53:11 -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
Sally Cochenour
7f1d55421a Merge branch 'master' into new-items 2020-03-22 14:23:51 -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
1c7c972e08 Merge branch 'master' into power-level-tweak 2020-03-22 12:55:45 -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
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