MascaraSnake
|
607aeb3a52
|
Adapt setup of air bobbing FOFs
|
2020-04-27 10:29:29 +02:00 |
|
MascaraSnake
|
e00531ed9c
|
Merge branch 'udmf-next' into udmf-fofs-mkii
# Conflicts:
# src/p_floor.c
# src/p_spec.c
# src/p_spec.h
|
2020-04-26 11:13:09 +02:00 |
|
MascaraSnake
|
abcc47ac61
|
Bring signature of P_AddAirbob in line with next
|
2020-04-26 10:35:08 +02:00 |
|
MascaraSnake
|
1aa90754db
|
Port over raise thinker changes from next (preparation for merge)
|
2020-04-26 10:33:13 +02:00 |
|
MascaraSnake
|
0ab01cd4b2
|
Port over thwomp thinker changes manually, to avoid merge conflicts
|
2020-04-25 09:20:53 +02: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 |
|
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
|
1d3aa7129a
|
Add enums for textmap FOF values
|
2020-04-18 18:02:43 +02:00 |
|
MascaraSnake
|
8e5effa07b
|
Merge branch 'udmf-argenums' into udmf-fofs-mkii
|
2020-04-18 17:23:02 +02: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 |
|
MascaraSnake
|
f815597219
|
Implement FOF types 170-180
|
2020-04-15 09:44:33 +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 |
|
MascaraSnake
|
5389344a32
|
Implement FOF type 257
|
2020-04-14 11:56:11 +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 |
|
MascaraSnake
|
e3b86d0c74
|
Implement FOF types 252-256
|
2020-04-14 11:45:37 +02:00 |
|
Nev3r
|
778ef86fee
|
Remove the bridge thinker code.
|
2020-04-14 10:31:07 +02:00 |
|
MascaraSnake
|
f8c51ccde3
|
Implement FOF types 220-222
|
2020-04-14 10:13:38 +02:00 |
|
MascaraSnake
|
9fc2b5b1b9
|
Implement FOF type 258
|
2020-04-14 09:51:48 +02:00 |
|
MascaraSnake
|
32a1131c68
|
Implement FOF type 251
|
2020-04-14 09:43:49 +02:00 |
|
MascaraSnake
|
916f831edb
|
Implement linedef type 250
|
2020-04-14 09:14:10 +02:00 |
|
MascaraSnake
|
60e589e92a
|
Implement FOF types 200-201
|
2020-04-14 09:03:00 +02:00 |
|
MascaraSnake
|
61d903cb5b
|
Revise setup of solid FOFs
|
2020-04-14 01:34:11 +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
|
77936f6c12
|
Merge branch 'udmf-colormaps' into udmf-fofs-mkii
|
2020-03-22 08:06:03 +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
|
6e8760524c
|
Implement water FOF types
|
2020-03-20 16:15:39 +01:00 |
|
MascaraSnake
|
1e306dc7b4
|
Implement linedef type 100-146
|
2020-03-20 16:08:48 +01:00 |
|