Commit graph

9987 commits

Author SHA1 Message Date
James R
b11845b045 Merge branch 'packetversion-revision' into 'master'
The rule for PACKETVERSION is too confusing, it's also too hard to unify formats

See merge request STJr/SRB2!875
2020-04-18 20:15:23 -04:00
James R
abb338d650 Merge branch 'continue_tweaks' into 'next'
A tangible mechanism to disable Continues

See merge request STJr/SRB2!865
2020-04-18 20:15:04 -04:00
James R
40ec8c4344 Merge branch 'netgame-urls' into 'master'
srb2:// server URLs

See merge request STJr/SRB2!858
2020-04-18 20:11:00 -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
f0c63ce76a Merge branch 'udmf-next' into udmf-argenums 2020-04-18 16:56:21 +02:00
MascaraSnake
111da04b07 Add enums to encapsulate the textmap slope settings 2020-04-18 16:55:56 +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
2a300bcea4 Fix NULL pointer crash involving stringargs 2020-04-18 12:23:01 +02:00
MascaraSnake
54cbd66999 Eradicate levelspecthink_t 2020-04-18 11:05:58 +02:00
MascaraSnake
da594db3fc Remove return values from a few elevator functions that don't use them 2020-04-18 10:52:58 +02:00
MascaraSnake
ab17267363 Make T_BounceCheese use its own thinker struct 2020-04-18 10:45:21 +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
0038605979 Make T_MarioBlock use its own thinker data structure 2020-04-18 02:05:23 +02:00
MascaraSnake
7e2f95c3f5 Refactor T_ContinuousFalling 2020-04-18 01:42:13 +02:00
MascaraSnake
70d262653e Refactor T_MovePlane a little bit 2020-04-18 01:08:01 +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
779b10681f Refactoring in T_BounceCheese 2020-04-17 23:32:39 +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
5a58b2d90e Refactor T_EachTimeThinker 2020-04-17 21:19:21 +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
a41dbe2bae Get rid of code duplication in T_RaiseSector 2020-04-17 10:19:02 +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
2e9dc59ca7 Forgot some stuff regarding FOF type 170 2020-04-15 09:49:00 +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
Nev3r
caea71b68b Merge branch 'remove-bridge' into 'next'
Remove the disabled/broken bridge thinker code

See merge request STJr/SRB2!879
2020-04-14 05:51:45 -04:00
MascaraSnake
e3b86d0c74 Implement FOF types 252-256 2020-04-14 11:45:37 +02:00
Nev3r
98481dc10b Remove the bridge thinker entry from the ZB configuration. 2020-04-14 10:31:26 +02:00
Nev3r
778ef86fee Remove the bridge thinker code. 2020-04-14 10:31:07 +02:00
MascaraSnake
15defaebeb Render insides on FOF type 222 2020-04-14 10:14:56 +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
fdb46e5d14 Implement FOF types 202 and 223 2020-04-14 09:06:02 +02:00
MascaraSnake
60e589e92a Implement FOF types 200-201 2020-04-14 09:03:00 +02:00
MascaraSnake
7f889532ea Adapt solid FOF setup in UDB config 2020-04-14 09:00:26 +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
01c0797ba6 Remove now unused P_MobjReadyToMove(). 2020-04-13 16:00:58 +02:00