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
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
Nev3r
68f60f3c29
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next
2020-03-11 09:31:31 +01:00
Monster Iestyn
f4cb6e1f5e
Include r_skins.h instead of r_things.h in many files where all they wanted from it was skins stuff
...
(oddly enough, this actually revealed some secret file dependencies previously included via r_things.h! I also needed to include d_player.h in r_skins.h itself it seems)
2020-03-09 13:54:56 +00:00
Steel Titanium
76f26cda24
Merge branch 'master' into next
2020-02-21 21:01:29 -05:00
James R
7060083db5
Update copyright year to 2020
2020-02-19 14:08:45 -08:00
Tatsuru
80edefa56e
Merge branch 'next' of git@git.magicalgirl.moe:STJr/SRB2.git into dye
2020-02-19 17:32:43 -03:00
MascaraSnake
cae99654be
Merge branch 'next' into udmf-next
2020-02-18 18:39:11 +01:00
MascaraSnake
512c6f24a9
Clean up the mess that is extracolormap_t::fog
2020-02-16 20:19:24 +01:00
James R
5a524f21da
Merge branch 'starpost-config-additions' into 'next'
...
Starpost config additions
See merge request STJr/SRB2!680
2020-02-01 21:42:43 -05:00
fickleheart
332b22a87a
Move spawnsnap to Special/ignore on sector trigger
...
Also includes splitting the starpost logic into its own function.
2020-01-24 23:54:54 -06:00
MascaraSnake
97c58957ee
Merge branch 'next' into udmf-next
2020-01-24 22:38:26 +01:00
Louis-Antoine
f209721ded
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into keep-body
...
# Conflicts:
# src/g_game.c
# src/p_setup.c
2020-01-22 03:57:22 +01:00
Louis-Antoine
2527b6c389
Teleport disconnected players to starpost if they fall in a pit
2020-01-22 03:20:27 +01:00
Jaime Passos
7adc108a2a
typoe
2020-01-17 00:34:31 -03:00
Tatsuru
7b3cc02ddc
Range check
2020-01-11 21:38:10 -03:00
Tatsuru
5d33ca42cf
Expose colorization to mappers and SOC
2020-01-11 20:40:57 -03:00
MascaraSnake
b163316cbf
Merge branch 'udmf-next' into stringargs
2020-01-11 16:17:53 +01:00
