James R
a1502046cf
Merge remote-tracking branch 'origin/master' into resume
2020-04-30 09:32:40 -07:00
James R
48b7c75e47
Why is this still here
2020-04-24 20:39:54 -07:00
James R
4b2c13da0c
Merge remote-tracking branch 'origin/master' into fof-things-suck
2020-04-24 20:36:30 -07:00
James R
0b3b13b3b5
Remove FOF height sorting
2020-04-15 19:16:49 -07:00
James R
190fc27121
Check that a back side exists
2020-04-15 18:48:23 -07:00
James R
ab40ede955
Line special 507, scroll tagged lines' front and back textures by front and back texture offsets
2020-04-15 18:45:23 -07:00
James R
89a2f8ec8d
Thing type 2002, MT_WAYPOINT_RISER - Raise tagged waypoints in sector to FOF sorted by height
...
Thing height refers to the index of FOF. FOF are sorted by top height, lowest
to highest. Set Object Flip to sort highest to lowest.
If the waypoint thing set Object Flip, it will be placed on the bottom of the
FOF. The sorting remains the same though.
Set Ambush to raise the waypoint to the same z position.
2020-04-04 01:20:38 -07:00
James R
593003b0f7
Line special 80, raise tagged things by type to this FOF
...
Thing type is the front texture x offset.
Tag here refers to the thing's angle.
For example, you have two sectors tagged to one FOF. Put a ring in each sector,
give it angle 0. Then give a line in the FOF control sector special 80 front
texture x offset 300. Those rings will spawn on the FOF instead of on the
sector floor.
Also works for object flip and slopes.
2020-04-03 20:53:00 -07:00
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
James R
572bf314e5
Merge remote-tracking branch 'origin/master' into resume
2020-03-22 19:01:05 -07:00
James R
abcba53781
Merge remote-tracking branch 'origin/master' into parties
2020-03-22 18:28:07 -07: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
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
b1ec5654bc
Merge branch 'master' into targets
2020-03-22 14:31:17 -04:00
Sally Cochenour
eddfc38d6e
Merge branch 'master' into map-features
2020-03-22 12:54:53 -04:00
James R
f6888ab004
Reset mapmusresume on level load etc.
...
This is probably important, right?
2020-03-21 22:28:55 -07:00
Sally Cochenour
c9cff6ccc2
P_MobjTouchingSectorSpecial checks polyobjects
...
This means polyobjects can have effects like offroad
2020-03-21 22:06:01 -04:00
James R
d46c6dc384
Kill trailing whitespace
2020-03-21 17:37:33 -07:00
Sally Cochenour
22702f88bc
"Delete items" sector type
2020-03-21 19:54:24 -04: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
Sally Cochenour
fa34e4eee4
Merge branch 'master' into sal-waypoints
2020-03-15 20:21:17 -04: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
James R
18aa2972e5
Merge remote-tracking branch 'origin/master' into parties-only
2020-03-05 21:41:23 -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
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
Sally Cochenour
ff190b7a88
Fix unsigned/signed comparison
2020-03-03 17:05:04 -05:00
Sally Cochenour
3633dc341a
Merge branch 'master' into targets
2020-03-01 15:42:49 -05:00
Sally Cochenour
76e75d9756
Fix offroad collision
...
Adds an option to P_MobjTouchingSectorSpecial to only use non-FOF sectors' special if you're touching their floor/ceiling.
2020-03-01 14:36:13 -05:00
Sally Cochenour
6956e1d24e
Store random states in mobjinfo instead of precipprops
...
My reasoning is that it wouldn't make much sense to have a weather type that has snow, but doesn't randomize the sprite it uses, so we don't need to copy-paste the same "randomstates" for each weather type.
2020-03-01 13:13:59 -05:00
Sally Cochenour
a63157b937
Flip facing direction
2020-02-25 00:04:39 -05:00
James R
f164320c88
Make the order of displayplayers irrelevant and split splitscreen into splitscreen and r_splitscreen
2020-02-23 23:20:20 -08:00
TehRealSalt
80bb59031c
Blizzard weather option + much more sane workflow for adding new precipitation options
...
"precipprops" lets you create a new precipitation type by picking a mobj type to use, how many random states it has, and flags for effects such as thunder/lightning. Seesound on the mobj type sets an ambient sound (like rain drops) and mass sets the sound's frequency in tics. This could open up the possibility for SOC/Lua Weather options later.
2019-11-14 04:26:41 -05:00
TehRealSalt
bba8861d2f
Set angle for ties
2019-11-08 23:33:59 -05:00
TehRealSalt
88cb623c2a
3D signpost
2019-11-08 23:25:46 -05:00
TehRealSalt
fe3d19d15d
Remove this for now
2019-10-28 14:42:45 -04:00
TehRealSalt
377a155cda
Update Race Lap linedef executors since they stopped working
2019-10-28 14:20:09 -04:00
TehRealSalt
b69d105af3
Add respawn animation
...
This commit also fixes MF_NOCLIP not working properly on players. Sink now spawns an SPB explosion on successful hit, since dying is no longer a harsh punishment.
2019-10-24 16:35:39 -04:00
James
f9ea683312
P_PlayerTouchingSectorSpecial turned into P_MobjTouchingSectorSpecial
2019-10-22 08:45:38 -04:00
TehRealSalt
a37eb798e0
Fix bad merge
2019-10-15 22:23:01 -04:00
TehRealSalt
e7d0fde5fd
Merge branch 'master' into sal-waypoints
2019-10-15 21:34:41 -04:00
TehRealSalt
d1c20c2a5a
Don't allow finish lines to be hit multiple times per tic
2019-10-15 21:30:23 -04:00
wolfy852
027dec6702
Fix Ring Drain sectors for v2 rings
2019-10-05 19:07:26 -05:00
TehRealSalt
c6566ec31a
Merge branch 'master' into versus-record
2019-10-03 01:32:59 -04:00
TehRealSalt
bc3f0568ee
Merge master
2019-09-27 23:09:54 -04:00
TehRealSalt
22796b7633
Merge master
2019-09-27 03:44:37 -04:00
TehRealSalt
77aeb4663b
Merge branch 'master' into versus-record
2019-09-23 07:03:56 -04:00
TehRealSalt
47da526313
Use texture names instead of predesignated sky numbers
2019-09-18 19:29:28 -04:00
TehRealSalt
1ef09699d1
Functional gameplay
...
- Capsules get spawned in the proper scenarios
- Level ends when all capsules are busted
- Time gets used on the leaderboard instead of score
Also split a handful of Battle code into k_battle.c. Lots of other code could probably get moved here later
2019-09-15 20:19:48 -04:00
Sryder
0f7a704444
Merge branch 'master' of git@git.magicalgirl.moe:KartKrew/Kart.git into waypoints
...
# Conflicts:
# src/p_spec.c
2019-08-10 11:41:49 +01:00
