MascaraSnake
|
6f854f2de3
|
Merge branch 'more-polyobject-cleanup' into 'next'
Smooth polyobject movement and other cleanup
See merge request STJr/SRB2!947
|
2020-05-18 16:00:55 -04:00 |
|
MascaraSnake
|
33a22331f8
|
Merge branch 'waypoints' into 'next'
Store waypoints at map load instead of iterating through the thinker list to find them
See merge request STJr/SRB2!938
|
2020-05-18 16:00:46 -04:00 |
|
Louis-Antoine
|
d0abd6e86c
|
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into slope-cleanup
# Conflicts:
# src/hardware/hw_main.c
# src/p_spec.c
|
2020-05-18 16:14:05 +02:00 |
|
MascaraSnake
|
a7c7f7afa9
|
Merge branch 'fof-cleanup' into 'next'
FOF cleanup
See merge request STJr/SRB2!910
|
2020-05-17 02:30:16 -04:00 |
|
MascaraSnake
|
536e355cdf
|
polywaypointdata_t: Turn reverse and continuous into flags
|
2020-05-16 09:49:30 +02:00 |
|
MascaraSnake
|
7413da918b
|
Store PolyObject waypoint return behavior in an enum
|
2020-05-13 16:21:47 +02:00 |
|
MascaraSnake
|
36843cbfd6
|
Merge branch 'next' into waypoints
|
2020-05-12 23:51:32 +02:00 |
|
MascaraSnake
|
d708789c3a
|
Store waypoints (for zoom tubes, rope hangs, polyobjects) explicitly
|
2020-05-12 23:50:30 +02:00 |
|
MascaraSnake
|
650f44566f
|
Fixed a typo
|
2020-05-07 21:59:39 +02:00 |
|
MascaraSnake
|
023c095d55
|
Merge branch 'polyobject-cleanup' into 'next'
PolyObject cleanup
See merge request STJr/SRB2!919
|
2020-05-04 14:18:08 -04:00 |
|
MascaraSnake
|
d03742b15b
|
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
|
248df41a2f
|
Simplify set/fade polyobject translucency code
|
2020-05-04 10:29:35 +02:00 |
|
MascaraSnake
|
78a700f5fa
|
Remove non-descriptive comments
|
2020-05-04 10:01:44 +02:00 |
|
MascaraSnake
|
2be775e74c
|
Move parameter parsing for EV_DoPolyObjFlag into its own function
|
2020-05-04 09:58:27 +02:00 |
|
MascaraSnake
|
482adc6124
|
Pass parameters to EV_DoPolyObjFlag in a struct and not via the line
|
2020-05-04 09:54:32 +02:00 |
|
MascaraSnake
|
700b340827
|
Allow map-wide gravity to be set via level header
|
2020-05-03 18:33:18 +02:00 |
|
MascaraSnake
|
4b87bee759
|
Add level header options for setting special stage time and spheres requirements
|
2020-05-03 17:56:49 +02:00 |
|
MascaraSnake
|
a9bd307dc0
|
Merge branch 'next' into egg-capsule
# Conflicts:
# src/p_spec.c
|
2020-05-03 15:29:20 +02:00 |
|
MascaraSnake
|
dd50990e85
|
Add "trigger egg capsule" linedef executor
|
2020-05-03 15:22:13 +02:00 |
|
MascaraSnake
|
485a4e5035
|
Remove POLYOBJECTS and POLYOBJECTS_PLANES defines
|
2020-05-02 12:08:31 +02:00 |
|
MascaraSnake
|
2a39265156
|
Make the laser thinker find the FOF itself instead of storing it in the thinker struct
|
2020-05-02 10:03:16 +02:00 |
|
MascaraSnake
|
c1304e019d
|
Clean up Thwomp spawning code
|
2020-05-02 09:15:34 +02:00 |
|
MascaraSnake
|
2449c66b78
|
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
|
7922306113
|
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
|
790affd13b
|
Merge branch 'next' into elevator-cleanup
# Conflicts:
# src/p_saveg.c
|
2020-05-01 11:42:05 +02:00 |
|
Monster Iestyn
|
0d3876abf3
|
Merge branch 'next' into netarchive-cleanup
|
2020-04-29 15:27:07 +01:00 |
|
MascaraSnake
|
4cec927bbb
|
Replace P_FindLineFromLineTag with P_FindLineFromTag
|
2020-04-27 14:34:42 +02:00 |
|
MascaraSnake
|
0a0812bc57
|
Remove P_FindSectorFromLineTag
|
2020-04-27 14:31:37 +02:00 |
|
MascaraSnake
|
4f3d837835
|
Store "no bosses" setting for lasers in thinker instead of checking sourceline.
|
2020-04-27 13:09:57 +02:00 |
|
MascaraSnake
|
630af5d225
|
Pass thwomp settings to P_AddThwompThinker
|
2020-04-27 13:01:31 +02:00 |
|
MascaraSnake
|
556c2a8c18
|
Store tag instead of sourceline in raise thinker
|
2020-04-27 12:54:08 +02:00 |
|
MascaraSnake
|
2f9cccf287
|
Make P_AddRaiseThinker more configurable via function parameters (needed for UDMF)
|
2020-04-27 11:19:07 +02:00 |
|
MascaraSnake
|
fb1746e95b
|
Deprecate the camera scanner effect and print a warning when it's used
|
2020-04-26 18:42:31 +02:00 |
|
Monster Iestyn
|
7034e2537a
|
whoops the sequel
|
2020-04-25 16:53:52 +01:00 |
|
Monster Iestyn
|
049a7db877
|
whoops
|
2020-04-25 16:52:11 +01:00 |
|
MascaraSnake
|
3cd8f62ae9
|
Remove a line I overlooked in the thinker cleanup branch
|
2020-04-25 08:18:48 +02:00 |
|
Monster Iestyn
|
7dda5f6b94
|
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 |
|
Monster Iestyn
|
d1d006a1a7
|
Merge branch 'thinker-cleanup' into 'next'
Plane movement thinker cleanup
See merge request STJr/SRB2!880
|
2020-04-24 14:30:52 -04:00 |
|
James R
|
cbe181c66d
|
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
|
c031008eab
|
Enable SF_TRIGGERSPECIAL_TOUCH for sectors with spike damage
|
2020-04-18 15:17:25 +02:00 |
|
MascaraSnake
|
54cbd66999
|
Eradicate levelspecthink_t
|
2020-04-18 11:05:58 +02:00 |
|
MascaraSnake
|
08f1e03e79
|
Refactor T_ThwompSector
|
2020-04-18 10:26:03 +02:00 |
|
MascaraSnake
|
29d33f0a93
|
Refactor T_NoEnemiesSector
|
2020-04-18 09:21:04 +02:00 |
|
MascaraSnake
|
cc0f686c95
|
Refactor T_FloatSector
|
2020-04-18 00:26:49 +02:00 |
|
MascaraSnake
|
fd598f315e
|
Add an enum for crumblestate
|
2020-04-17 23:54:37 +02:00 |
|
MascaraSnake
|
9b27d004e3
|
Remove the spike thinker, which hasn't been necessary for a while now
|
2020-04-17 22:54:35 +02:00 |
|
MascaraSnake
|
099ad6cf20
|
Remove sec assignments that have become superfluous
|
2020-04-17 21:39:38 +02:00 |
|
MascaraSnake
|
89539512f6
|
Make T_EachTimeThinker use its own struct
|
2020-04-17 14:00:48 +02:00 |
|
MascaraSnake
|
3e0a9c8718
|
Forgot to clean up some stuff
|
2020-04-17 11:13:13 +02:00 |
|
MascaraSnake
|
63a901b714
|
-Remove superfluous variables from raise_t
-Cleanup signatures of P_AddRaiseThinker and P_AddAirbob
|
2020-04-17 11:11:36 +02:00 |
|