Commit graph

10497 commits

Author SHA1 Message Date
James R
a7291a2ad4 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
7e981edfcc 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
a891b1126b Merge branch 'netgame-urls' into 'master'
srb2:// server URLs

See merge request STJr/SRB2!858
2020-04-18 20:11:00 -04:00
MascaraSnake
548f4a1594 Enable SF_TRIGGERSPECIAL_TOUCH for sectors with spike damage 2020-04-18 15:17:25 +02:00
MascaraSnake
0d21e4ad87 Eradicate levelspecthink_t 2020-04-18 11:05:58 +02:00
MascaraSnake
09f369846e Remove return values from a few elevator functions that don't use them 2020-04-18 10:52:58 +02:00
MascaraSnake
1d35442e16 Make T_BounceCheese use its own thinker struct 2020-04-18 10:45:21 +02:00
MascaraSnake
54de7584d1 Refactor T_ThwompSector 2020-04-18 10:26:03 +02:00
MascaraSnake
71f9fe167b Refactor T_NoEnemiesSector 2020-04-18 09:21:04 +02:00
MascaraSnake
a90735fdf0 Make T_MarioBlock use its own thinker data structure 2020-04-18 02:05:23 +02:00
MascaraSnake
e6193297d8 Refactor T_ContinuousFalling 2020-04-18 01:42:13 +02:00
MascaraSnake
06ce2b3b2c Refactor T_MovePlane a little bit 2020-04-18 01:08:01 +02:00
MascaraSnake
272a8e532b Refactor T_FloatSector 2020-04-18 00:26:49 +02:00
MascaraSnake
93eb0ee1c8 Add an enum for crumblestate 2020-04-17 23:54:37 +02:00
MascaraSnake
7e617fa938 Refactoring in T_BounceCheese 2020-04-17 23:32:39 +02:00
MascaraSnake
3add9943a8 Remove the spike thinker, which hasn't been necessary for a while now 2020-04-17 22:54:35 +02:00
MascaraSnake
7c6c14c398 Remove sec assignments that have become superfluous 2020-04-17 21:39:38 +02:00
MascaraSnake
e971a26d1d Refactor T_EachTimeThinker 2020-04-17 21:19:21 +02:00
MascaraSnake
21b92b63e9 Make T_EachTimeThinker use its own struct 2020-04-17 14:00:48 +02:00
MascaraSnake
5e013ea679 Forgot to clean up some stuff 2020-04-17 11:13:13 +02:00
MascaraSnake
1f038e827a -Remove superfluous variables from raise_t
-Cleanup signatures of P_AddRaiseThinker and P_AddAirbob
2020-04-17 11:11:36 +02:00
MascaraSnake
dc41ed93cd Get rid of code duplication in T_RaiseSector 2020-04-17 10:19:02 +02:00
MascaraSnake
cd036b57fd Make T_RaiseSector use its own thinker struct instead of levelspecthink_t 2020-04-17 09:58:53 +02:00
Nev3r
1ea15aa643 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
b7bedae60f 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
Nev3r
8c3485d82e Remove the bridge thinker entry from the ZB configuration. 2020-04-14 10:31:26 +02:00
Nev3r
d05ad892be Remove the bridge thinker code. 2020-04-14 10:31:07 +02:00
sphere
e8a202e0a3 Make linedef type 461 able to set object angle, using the line's angle. 2020-04-13 17:10:25 +02:00
Nev3r
608f4b6e54 Remove now unused P_MobjReadyToMove(). 2020-04-13 16:00:58 +02:00
Nev3r
44426fd453 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
8bbbd437c5 Refactor an unholy piece of code. 2020-04-13 14:31:19 +02:00
James R
76e93476de Make the PACKETVERSION rule easier 2020-04-12 17:05:18 -07:00
fickleheart
1844aa1445 Make a separate function instead of clogging up IdentifyVersion 2020-04-09 20:56:27 -05:00
fickleheart
8001511b7c Make chdir usage consistent with other source usage 2020-04-09 20:52:23 -05:00
fickleheart
4db9ceca03 Merge remote-tracking branch 'upstream/master' into netgame-urls 2020-04-09 20:48:52 -05:00
James R
8de2bab4a9 Merge branch 'pk3-xtra-comm-fix' into 'next'
PK3: Proper ignorance for file comments/extra data

See merge request STJr/SRB2!761
2020-04-09 21:25:11 -04:00
James R
8335a44864 Merge branch 'md2-rollangle' into 'master'
Fix MD2 rollangle in reverse gravity

See merge request STJr/SRB2!818
2020-04-09 21:25:02 -04:00
James R
d3a4647c3b Merge branch 'hw-horizon' into 'master'
OGL horizon lines

See merge request STJr/SRB2!861
2020-04-09 21:24:41 -04:00
James R
0596dbd137 Merge branch 'execcfg-fixes' into 'master'
ExecCfg fixes

See merge request STJr/SRB2!821
2020-04-09 21:24:12 -04:00
Zachary McAlpin
b6a2c21db7 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook 2020-04-09 20:12:11 -05:00
James R
45abbb0be6 You don't need to push the value twice, it's only used once 2020-04-09 17:30:53 -07:00
James R
81a01041e8 Merge remote-tracking branch 'origin/master' into next 2020-04-09 17:04:04 -07:00
James R
aff934a5b5 Merge branch 'hide-useless-1p-menu-options' into 'master'
Hide record & NiGHTS attack options if there are no available maps for them.

See merge request STJr/SRB2!868
2020-04-09 19:57:27 -04:00
James R
1bbb4d1f95 Merge branch 'ra-emblemhints' into 'master'
Allow emblem hints (and radar) in record attack.

See merge request STJr/SRB2!820
2020-04-09 19:56:17 -04:00
James R
b6b617cab7 Merge branch 'fix-256-brightness' into 'master'
Florida man fixes sectors with light level 256 blacking out OpenGL objects; mappers riot.

See merge request STJr/SRB2!840
2020-04-09 19:53:40 -04:00
James R
61a4fe06d5 Merge branch 'bot-respawn-hook' into 'next'
BotRespawn hook

See merge request STJr/SRB2!804
2020-04-09 19:52:25 -04:00
James R
17082fafbd Merge branch 'gtr-replace' into 'next'
Separate PvP damage from ringslinger

See merge request STJr/SRB2!831
2020-04-09 19:51:52 -04:00
James R
0b91ef071f Merge branch 'sdlglcontext' into 'master'
Only initialise OpenGL if the user intends to load it (for real this time)

See merge request STJr/SRB2!796
2020-04-09 19:51:20 -04:00
James R
71f4433b98 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
James R
ae3bf2498a Merge branch 'supergoldedit' into 'next'
Change SKINCOLOR_SUPERGOLD1-5

See merge request STJr/SRB2!805
2020-04-09 19:50:06 -04:00