Commit graph

12870 commits

Author SHA1 Message Date
MascaraSnake
a881662ca9 Implement "set linedef executor delay" linedef type 2020-05-03 21:03:15 +02:00
MascaraSnake
f26648e6f2 Adapt linedef executor delay to UDMF 2020-05-03 20:41:37 +02:00
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
700b340827 Allow map-wide gravity to be set via level header 2020-05-03 18:33:18 +02:00
MascaraSnake
4b87bee759 Add level header options for setting special stage time and spheres requirements 2020-05-03 17:56:49 +02:00
MascaraSnake
f7bcc759b6 Merge branch 'next' into egg-capsule
# Conflicts:
#	extras/conf/SRB2-22.cfg
2020-05-03 16:00:05 +02:00
MascaraSnake
1b66d1f936 Add object dye linedef executors to ZB config 2020-05-03 15:57:18 +02:00
MascaraSnake
a9bd307dc0 Merge branch 'next' into egg-capsule
# Conflicts:
#	src/p_spec.c
2020-05-03 15:29:20 +02:00
MascaraSnake
dd50990e85 Add "trigger egg capsule" linedef executor 2020-05-03 15:22:13 +02:00
ZipperQR
0d7c49e7e4 no message 2020-05-03 14:02:23 +03: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
Steel Titanium
887c25e047 Remove inline keyword from P_DoTwinSpin function
The compiler doesn't like this and will give you a "inlining failed in call to 'P_DoTwinSpin': call is unlikely and code size would grow" error
2020-05-02 17:39:55 -04:00
MascaraSnake
6949b70dbf Remove temporary FOF setup code 2020-05-02 23:33:07 +02:00
MascaraSnake
f8f773d6e7 Remove "bustable" and "quicksand" flags from custom FOF in the UDB config, since you're not supposed to set them that way 2020-05-02 23:06:44 +02:00
MascaraSnake
0d4d7bfc38 Adapt custom FOF setup 2020-05-02 23:00:22 +02:00
Hannu Hanhi
c9114867cc Dummy I_GetTimeMicros 2020-05-02 23:24:49 +03:00
Hannu Hanhi
1b6e65b91c Implement I_GetTimeMicros without affecting I_GetTime behaviour details 2020-05-02 23:14:20 +03:00
Hannu Hanhi
724e093ce8 Render stats cleanup 2020-05-02 23:14:08 +03:00
Hannu Hanhi
7e8543a408 More render stats for software mode, renamed and relocated some render stats variables 2020-05-02 23:13:53 +03:00
Hannu Hanhi
8dcc2fe20d Move some render stats variables to better locations, add I_FinishUpdate timing 2020-05-02 23:13:32 +03:00
Hannu Hanhi
64a153fdee Render stats 2020-05-02 23:13:08 +03: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
be92ed7091 UDB config fix 2020-05-02 20:24:17 +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
Monster Iestyn
1528f2aef8 Fix drop shadow and rotsprite code to use SHORT() 2020-05-02 17:13:16 +01:00
MascaraSnake
d9ed914e14 Merge branch 'amyswings' into 'next'
Restore jump-related pflags properly during twinspin

See merge request STJr/SRB2!908
2020-05-02 10:03:49 -04:00
MascaraSnake
b8a9686aaf Merge branch 'remove-polyobjects' into 'next'
Delete polyobjects

See merge request STJr/SRB2!911
2020-05-02 09:53:37 -04: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