Commit graph

929 commits

Author SHA1 Message Date
MascaraSnake
398ee65646 Store "no bosses" setting for lasers in thinker instead of checking sourceline. 2020-04-27 13:09:57 +02:00
MascaraSnake
0dbcd8766b Pass thwomp settings to P_AddThwompThinker 2020-04-27 13:01:31 +02:00
MascaraSnake
40d0fb714d Store tag instead of sourceline in raise thinker 2020-04-27 12:54:08 +02:00
MascaraSnake
0b38dae561 Make P_AddRaiseThinker more configurable via function parameters (needed for UDMF) 2020-04-27 11:19:07 +02:00
MascaraSnake
ee2ee674d9 Deprecate the camera scanner effect and print a warning when it's used 2020-04-26 18:42:31 +02:00
Monster Iestyn
1e1cd04bdf whoops the sequel 2020-04-25 16:53:52 +01:00
Monster Iestyn
b429de12f4 whoops 2020-04-25 16:52:11 +01:00
MascaraSnake
5c9edcb751 Merge branch 'next' into udmf-next 2020-04-25 08:19:26 +02:00
MascaraSnake
dbebcc8466 Remove a line I overlooked in the thinker cleanup branch 2020-04-25 08:18:48 +02: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
Monster Iestyn
d06d55e2ae created P_GetFFloorID to get an "ID" of an FOF in its target sector (an opposite to P_GetFFloorByID you could say!), rewrote floor/ceiling rover archiving code to use both P_GetFFloorID and P_GetFFloorByID 2020-04-24 22:29:41 +01:00
MascaraSnake
d2e21afaf1 Merge branch 'next' into udmf-next
# Conflicts:
#	src/p_mobj.c
#	src/r_segs.c
2020-04-24 21:15:53 +02:00
Monster Iestyn
f26e8f3df7 Merge branch 'thinker-cleanup' into 'next'
Plane movement thinker cleanup

See merge request STJr/SRB2!880
2020-04-24 14:30:52 -04:00
Nev3r
2d15e953eb Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next 2020-04-20 09:05:21 +02:00
James R
01da59fe02 Merge branch 'angle-for-spawn-object' into 'next'
Make the Spawn Object linedef executor able to set the object's angle.

See merge request STJr/SRB2!877
2020-04-18 20:16:07 -04:00
MascaraSnake
c1dff185bf Add enums to encapsulate the textmap colormap settings 2020-04-18 17:15:25 +02:00
MascaraSnake
548f4a1594 Enable SF_TRIGGERSPECIAL_TOUCH for sectors with spike damage 2020-04-18 15:17:25 +02:00
Nev3r
109d09aa4c Merge branch 'udmf-colormaps' into 'udmf-next'
UDMF colormaps

See merge request STJr/SRB2!855
2020-04-18 07:42:24 -04:00
MascaraSnake
0d21e4ad87 Eradicate levelspecthink_t 2020-04-18 11:05:58 +02:00
MascaraSnake
54de7584d1 Refactor T_ThwompSector 2020-04-18 10:26:03 +02:00
MascaraSnake
71f9fe167b Refactor T_NoEnemiesSector 2020-04-18 09:21:04 +02:00
MascaraSnake
272a8e532b Refactor T_FloatSector 2020-04-18 00:26:49 +02:00
MascaraSnake
93eb0ee1c8 Add an enum for crumblestate 2020-04-17 23:54:37 +02:00
MascaraSnake
3add9943a8 Remove the spike thinker, which hasn't been necessary for a while now 2020-04-17 22:54:35 +02:00
MascaraSnake
7c6c14c398 Remove sec assignments that have become superfluous 2020-04-17 21:39:38 +02:00
MascaraSnake
21b92b63e9 Make T_EachTimeThinker use its own struct 2020-04-17 14:00:48 +02:00
MascaraSnake
5e013ea679 Forgot to clean up some stuff 2020-04-17 11:13:13 +02:00
MascaraSnake
1f038e827a -Remove superfluous variables from raise_t
-Cleanup signatures of P_AddRaiseThinker and P_AddAirbob
2020-04-17 11:11:36 +02:00
MascaraSnake
cd036b57fd Make T_RaiseSector use its own thinker struct instead of levelspecthink_t 2020-04-17 09:58:53 +02: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
Nev3r
750cafbcbc Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next 2020-04-14 22:20:54 +02:00
Nev3r
1ea15aa643 Merge branch 't_moveplane-refactor' into 'next'
Remove faulty code from T_MovePlane()

See merge request STJr/SRB2!876
2020-04-14 05:53:59 -04:00
Nev3r
d05ad892be Remove the bridge thinker code. 2020-04-14 10:31:07 +02:00
sphere
e8a202e0a3 Make linedef type 461 able to set object angle, using the line's angle. 2020-04-13 17:10:25 +02:00
Nev3r
44426fd453 Actually remove the entire code block in T_MovePlane(), and remove line_t.tagline as it served no other purpose. 2020-04-13 15:17:53 +02:00
Nev3r
860c44d953 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next
# Conflicts:
#	src/lua_hooklib.c
2020-04-12 09:57:19 +02:00
James R
71f4433b98 Merge branch 'dye' into 'next'
Expose colorization to mappers and SOC

See merge request STJr/SRB2!679
2020-04-09 19:50:32 -04:00
Wolfy
86ac41bb4a Record attack only linedef exec 2020-04-05 22:37:42 +02: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
Sally Cochenour
751fd9ad1b Start on bots, doesn't work 2020-03-27 23:51:49 -04:00
MascaraSnake
58e8ec6500 Standardize the behavior of FF_INVERTSIDES and FF_INVERTPLANES 2020-03-25 08:34:52 +01: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