Commit graph

577 commits

Author SHA1 Message Date
MascaraSnake
9ead3a8b47 Merge branch 'udmf-next' into executordelay 2020-05-13 10:01:41 +02:00
MascaraSnake
c2037391d2 Merge branch 'next' into udmf-next 2020-05-13 10:01:12 +02:00
MascaraSnake
2e9a6afa3e Merge branch 'udmf-next' into executordelay
# Conflicts:
#	src/p_spec.c
2020-05-13 09:55:25 +02:00
MascaraSnake
9ebbb5b7c2 Fixed a typo 2020-05-07 21:59:39 +02:00
MascaraSnake
8c22834b46 Merge branch 'next' into udmf-next 2020-05-04 20:32:56 +02:00
MascaraSnake
b3f81349ae Merge branch 'polyobject-cleanup' into 'next'
PolyObject cleanup

See merge request STJr/SRB2!919
2020-05-04 14:18:08 -04:00
MascaraSnake
58a5e4ce7c Merge branch 'level-header-sector-typeskd' into 'next'
Allow some map-wide settings to be set via level header instead of sector types

See merge request STJr/SRB2!917
2020-05-04 05:21:49 -04:00
MascaraSnake
ef394eccfb Simplify set/fade polyobject translucency code 2020-05-04 10:29:35 +02:00
MascaraSnake
5e188cb71b Remove non-descriptive comments 2020-05-04 10:01:44 +02:00
MascaraSnake
a69201bf68 Move parameter parsing for EV_DoPolyObjFlag into its own function 2020-05-04 09:58:27 +02:00
MascaraSnake
c6d245879a Pass parameters to EV_DoPolyObjFlag in a struct and not via the line 2020-05-04 09:54:32 +02:00
MascaraSnake
9566d7db96 Implement "set linedef executor delay" linedef type 2020-05-03 21:03:15 +02:00
MascaraSnake
5c0559a3d2 Adapt linedef executor delay to UDMF 2020-05-03 20:41:37 +02:00
MascaraSnake
2df5758ecf Allow map-wide gravity to be set via level header 2020-05-03 18:33:18 +02:00
MascaraSnake
9abfcacc3c Add level header options for setting special stage time and spheres requirements 2020-05-03 17:56:49 +02:00
MascaraSnake
40f228c952 Merge branch 'next' into egg-capsule
# Conflicts:
#	src/p_spec.c
2020-05-03 15:29:20 +02:00
MascaraSnake
6002a0e443 Add "trigger egg capsule" linedef executor 2020-05-03 15:22:13 +02:00
MascaraSnake
8efec04051 Remove POLYOBJECTS and POLYOBJECTS_PLANES defines 2020-05-02 12:08:31 +02:00
MascaraSnake
7f74258951 Merge branch 'next' into udmf-next
# Conflicts:
#	src/p_saveg.c
#	src/p_slopes.c
#	src/p_spec.c
2020-05-01 12:44:39 +02:00
MascaraSnake
238513ffd6 Merge branch 'find-sector-from-tag' into 'next'
Remove P_FindSectorFromLineTag and P_FindLineFromLineTag

See merge request STJr/SRB2!901
2020-05-01 05:49:52 -04:00
MascaraSnake
e967c32a10 Merge branch 'more-thinker-refactor' into 'next'
More thinker refactoring

See merge request STJr/SRB2!900
2020-05-01 05:47:14 -04:00
MascaraSnake
5cf3fd0074 Merge branch 'next' into elevator-cleanup
# Conflicts:
#	src/p_saveg.c
2020-05-01 11:42:05 +02:00
Monster Iestyn
edfbd799db Merge branch 'next' into netarchive-cleanup 2020-04-29 15:27:07 +01:00
MascaraSnake
8e5646d708 Replace P_FindLineFromLineTag with P_FindLineFromTag 2020-04-27 14:34:42 +02:00
MascaraSnake
c2cf8d57d0 Remove P_FindSectorFromLineTag 2020-04-27 14:31:37 +02:00
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
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