stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-12-29 14:10:43 +00:00
Code Issues Projects Releases Packages Wiki Activity
10069 commits 173 branches 41 tags 313 MiB
Commit graph

8824 commits

Author SHA1 Message Date
MascaraSnake
9eb81539a6 Merge branch 'udmf-next' into udmf-fofs-mkii 2020-05-03 19:31:36 +02:00
MascaraSnake
7fec1211fd Bugfix in XGL3 ZNODES parsing 2020-05-03 19:28:52 +02:00
MascaraSnake
1aafc2f463 Replace "bouncy FOF" sector type with "make FOF bouncy" linedef type 2020-05-03 12:44:30 +02:00
MascaraSnake
c68fea3d06 Merge branch 'movement-refactor' into udmf-fofs-mkii 2020-05-03 10:03:18 +02:00
MascaraSnake
d0d25025e1 Refactor P_CheckBouncySectors 2020-05-03 10:01:58 +02:00
MascaraSnake
35e9e5b33c Rearrange FOF flags and improve custom FOF backwards compatibility 2020-05-03 09:13:14 +02:00
MascaraSnake
96a464c881 Move FOF modifier linedef type to the 70s range, to avoid being considered FOFs themselves 2020-05-03 08:43:16 +02:00
MascaraSnake
6949b70dbf Remove temporary FOF setup code 2020-05-02 23:33:07 +02:00
MascaraSnake
0d4d7bfc38 Adapt custom FOF setup 2020-05-02 23:00:22 +02:00
MascaraSnake
25219b614e Implement "Make FOF quicksand" linedef type 2020-05-02 22:07:42 +02:00
MascaraSnake
1693689305 Implement "make FOF bustable" linedef type 2020-05-02 21:50:49 +02:00
MascaraSnake
1f041496c7 Store bustable FOF data directly in ffloor_t instead of referring to master line 2020-05-02 21:19:55 +02:00
MascaraSnake
245d5be047 Merge branch 'movement-refactor' into udmf-fofs-mkii 
# Conflicts:
#	src/p_mobj.c
#	src/p_user.c
 2020-05-02 19:05:48 +02:00
MascaraSnake
452fd100b8 Refactor P_CheckBustableBlocks 2020-05-02 15:50:18 +02:00
MascaraSnake
122104815a Revert some very incorrect refactoring 2020-05-02 15:33:15 +02:00
MascaraSnake
ddb4c2c97f Refactor P_PushableCheckBustables 2020-05-02 15:30:56 +02:00
MascaraSnake
bc2d0dcea6 Some minor PTR_GlideClimbTraverse cleanup 2020-05-02 15:25:19 +02:00
MascaraSnake
929064b998 Refactor PTR_SlideTraverse 2020-05-02 15:21:53 +02:00
MascaraSnake
21eccc15d8 Bustable blocks: Forgot to adapt linedef executor triggering for pushables 2020-05-02 14:51:03 +02:00
MascaraSnake
4dd25721f6 Merge branch 'movement-refactor' into udmf-fofs-mkii 2020-05-02 14:29:10 +02:00
MascaraSnake
a67c8786ae P_PlayerZMovement: Move PolyObject handling code into its own function 2020-05-02 13:49:16 +02:00
MascaraSnake
29192eff9a Merge branch 'remove-polyobjects' into movement-refactor 2020-05-02 13:37:13 +02:00
MascaraSnake
afc6378868 P_PlayerZMovement: Move checks for Mario blocks into their own function 2020-05-02 13:34:24 +02:00
MascaraSnake
2605f29bd4 P_PlayerMobjThinker: Move check for floatbob platforms into its own function 2020-05-02 13:08:13 +02:00
MascaraSnake
19d77bfc53 P_PlayerMobjThinker: Move crumbling platforms check into its own function 2020-05-02 12:50:09 +02:00
MascaraSnake
485a4e5035 Remove POLYOBJECTS and POLYOBJECTS_PLANES defines 2020-05-02 12:08:31 +02:00
MascaraSnake
538c81676b Recognize ML_EFFECT1 and ML_EFFECT2 on crumbling FOFs 2020-05-02 10:40:35 +02:00
MascaraSnake
312a2def3d Implement "add laser thinker to FOF" linedef type 2020-05-02 10:30:21 +02:00
MascaraSnake
1ae797359e Merge branch 'fof-cleanup' into udmf-fofs-mkii 
# Conflicts:
#	src/p_spec.c
 2020-05-02 10:24:40 +02:00
MascaraSnake
2a39265156 Make the laser thinker find the FOF itself instead of storing it in the thinker struct 2020-05-02 10:03:16 +02:00
MascaraSnake
c1304e019d Clean up Thwomp spawning code 2020-05-02 09:15:34 +02:00
MascaraSnake
7000c203a2 Implement "add thwomp thinker to FOF" linedef type 2020-05-01 19:41:52 +02:00
MascaraSnake
cada0d2928 Implement "add airbob thinker to FOF" linedef type 2020-05-01 19:29:19 +02:00
MascaraSnake
d7363ff87a Implement linedef type that adds a raise thinker to an FOF 2020-05-01 19:07:29 +02:00
MascaraSnake
f3360bd373 Merge branch 'udmf-next' into udmf-fofs-mkii 
# Conflicts:
#	src/p_floor.c
#	src/p_spec.c
 2020-05-01 14:02:48 +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
MascaraSnake
be0959fa90 Remove bogus comments from p_saveg.c 2020-05-01 11:25:32 +02:00
LJ Sonic
ef5f8f3bd2 Merge branch 'join-delay' into 'next' 
Add a minimum delay between connections

See merge request STJr/SRB2!889
 2020-05-01 03:29:15 -04:00
Monster Iestyn
279ad0707e Merge branch 'strncpy-brullshit' into 'next' 
Fix a few strncpy bullshit

See merge request STJr/SRB2!895
 2020-04-30 14:53:46 -04:00
Monster Iestyn
0d3876abf3 Merge branch 'next' into netarchive-cleanup 2020-04-29 15:27:07 +01:00
Monster Iestyn
2f0bf3860f Don't discard const, added missing & 2020-04-29 15:24:28 +01:00
Monster Iestyn
d89d2505bb Whoops the third 2020-04-29 14:45:52 +01:00
Louis-Antoine
9b3917cd72 Revert "Replace a few instance of strncpy with strlcpy" 
This reverts commit 2e27f32d3e.
 2020-04-29 10:55:49 +02:00
LJ Sonic
5c16e33432 Merge branch 'fix-intermission-mouse' into 'next' 
Fix mouse being grabbed in intermission and cutscenes

See merge request STJr/SRB2!891
 2020-04-28 04:25:32 -04:00
MascaraSnake
df692645c4 Merge branch 'raisethinker' into 'next' 
Make P_AddRaiseThinker more configurable via function parameters (needed for UDMF)

See merge request STJr/SRB2!899
 2020-04-27 15:04:37 -04: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