MascaraSnake
|
f26648e6f2
|
Adapt linedef executor delay to UDMF
|
2020-05-03 20:41:37 +02:00 |
|
MascaraSnake
|
5c8b50ca8b
|
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
|
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
|
04c10ed41b
|
Merge branch 'next' into udmf-next
|
2020-04-25 08:19:26 +02: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 |
|
MascaraSnake
|
3170f2b8c3
|
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
|
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 |
|
Nev3r
|
efb81fc526
|
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next
|
2020-04-20 09:05:21 +02: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
|
09506112d7
|
Add enums to encapsulate the textmap colormap settings
|
2020-04-18 17:15:25 +02:00 |
|
MascaraSnake
|
c031008eab
|
Enable SF_TRIGGERSPECIAL_TOUCH for sectors with spike damage
|
2020-04-18 15:17:25 +02:00 |
|
Nev3r
|
2b2a18fdf1
|
Merge branch 'udmf-colormaps' into 'udmf-next'
UDMF colormaps
See merge request STJr/SRB2!855
|
2020-04-18 07:42:24 -04: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 |
|
MascaraSnake
|
d0c473c9ae
|
Make T_RaiseSector use its own thinker struct instead of levelspecthink_t
|
2020-04-17 09:58:53 +02:00 |
|
Nev3r
|
d40713d08b
|
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next
|
2020-04-14 22:20:54 +02:00 |
|
Nev3r
|
464ecc01a4
|
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
|
778ef86fee
|
Remove the bridge thinker code.
|
2020-04-14 10:31:07 +02:00 |
|
sphere
|
01b28b66a6
|
Make linedef type 461 able to set object angle, using the line's angle.
|
2020-04-13 17:10:25 +02:00 |
|
Nev3r
|
74bd23c275
|
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
|
4128f826b7
|
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
|
b8d40a5783
|
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 |
|
MascaraSnake
|
92c74814cf
|
Standardize the behavior of FF_INVERTSIDES and FF_INVERTPLANES
|
2020-03-25 08:34:52 +01:00 |
|
MascaraSnake
|
2133bc89e6
|
Merge branch 'udmf-next' into udmf-colormaps
|
2020-03-22 08:05:05 +01:00 |
|
MascaraSnake
|
1580e14cbc
|
Merge branch 'next' into udmf-next
# Conflicts:
# extras/conf/Includes/SRB222_linedefs.cfg
# extras/conf/Includes/SRB222_misc.cfg
# src/p_spec.c
|
2020-03-21 20:04:31 +01:00 |
|
Louis-Antoine
|
892a8dd6e7
|
Make SRB2 flat like Earth
|
2020-03-20 18:55:29 +01:00 |
|
MascaraSnake
|
0ecf8616ba
|
Add sector flag that protects the colormap from being changed
|
2020-03-20 12:19:02 +01:00 |
|
MascaraSnake
|
7cf9ad2f2b
|
Adapt setup of colormap linedefs
|
2020-03-20 11:19:30 +01:00 |
|
Louis-Antoine
|
e3cbdf8fab
|
Use HAVE_BLUA as fuel for my fireplace
|
2020-03-19 18:36:14 +01:00 |
|