Commit graph

10497 commits

Author SHA1 Message Date
Monster Iestyn
c06fbf4fe7 Merge branch 'master' into next 2020-05-06 21:51:36 +01:00
Monster Iestyn
b315bc7b10 Merge branch 'to-put-it-in-short' into 'master'
To put it in SHORT()

See merge request STJr/SRB2!913
2020-05-06 16:50:23 -04:00
Zipper
6d26c6e180 Update p_user.c 2020-05-06 09:30:15 -04:00
ZipperQR
dc0fbbb998 S_StopSoundByID Lua support 2020-05-06 16:22:04 +03:00
Lachlan
f533535db7 Merge branch 'next' into gfz3laser-mkii 2020-05-06 09:10:27 +08:00
lachwright
645c324d51 Update new GFZ3 laser 2020-05-06 09:03:03 +08:00
lachwright
b4648e4c78 New GFZ3 laser 2020-05-06 09:01:02 +08:00
LJ Sonic
57f30374fd Merge branch 'fix-fucking-warning-why-did-my-compiler-not-tell-me-when-i-was-testing-omfg' into 'next'
fix warning and destroy universe

See merge request STJr/SRB2!922
2020-05-05 08:10:21 -04:00
Louis-Antoine
d3d01dd8eb Fix compiler warning 2020-05-05 14:05:19 +02:00
MascaraSnake
34c55acf48 Fix PolyObject flags not being applied when there is no parameter line 2020-05-05 08:40:59 +02:00
MascaraSnake
b3f81349ae Merge branch 'polyobject-cleanup' into 'next'
PolyObject cleanup

See merge request STJr/SRB2!919
2020-05-04 14:18:08 -04:00
MascaraSnake
486996702d Add new PolyObject flag to ZB config 2020-05-04 19:55:25 +02:00
MascaraSnake
af2098c3b6 PolyObject: Allow translucency to be set via X offset 2020-05-04 19:47:39 +02:00
MascaraSnake
58a5e4ce7c Merge branch 'level-header-sector-typeskd' into 'next'
Allow some map-wide settings to be set via level header instead of sector types

See merge request STJr/SRB2!917
2020-05-04 05:21:49 -04:00
MascaraSnake
6421b7b7e8 Merge branch 'egg-capsule' into 'next'
Add "trigger egg capsule" linedef executor

See merge request STJr/SRB2!916
2020-05-04 05:21:40 -04:00
MascaraSnake
ef394eccfb Simplify set/fade polyobject translucency code 2020-05-04 10:29:35 +02:00
MascaraSnake
7b293d43c0 Make PolyObject special functions return boolean instead of INT32 2020-05-04 10:07:38 +02:00
MascaraSnake
5e188cb71b Remove non-descriptive comments 2020-05-04 10:01:44 +02:00
MascaraSnake
a69201bf68 Move parameter parsing for EV_DoPolyObjFlag into its own function 2020-05-04 09:58:27 +02:00
MascaraSnake
c6d245879a Pass parameters to EV_DoPolyObjFlag in a struct and not via the line 2020-05-04 09:54:32 +02:00
MascaraSnake
48c5bd4486 Refactor Polyobj_findSegs 2020-05-04 01:28:21 +02:00
MascaraSnake
3d9bf8335e Purge uninformative comments 2020-05-04 00:17:05 +02:00
MascaraSnake
9fa267f247 Clean up Polyobj_GetInfo 2020-05-03 23:55:23 +02:00
MascaraSnake
a1a3b54108 Remove "explicitly include line in polyobject" code which has never worked 2020-05-03 23:47:26 +02:00
MascaraSnake
2df5758ecf Allow map-wide gravity to be set via level header 2020-05-03 18:33:18 +02:00
MascaraSnake
9abfcacc3c Add level header options for setting special stage time and spheres requirements 2020-05-03 17:56:49 +02:00
MascaraSnake
89dd809e04 Merge branch 'next' into egg-capsule
# Conflicts:
#	extras/conf/SRB2-22.cfg
2020-05-03 16:00:05 +02:00
MascaraSnake
c39fd8053a Add object dye linedef executors to ZB config 2020-05-03 15:57:18 +02:00
MascaraSnake
40f228c952 Merge branch 'next' into egg-capsule
# Conflicts:
#	src/p_spec.c
2020-05-03 15:29:20 +02:00
MascaraSnake
6002a0e443 Add "trigger egg capsule" linedef executor 2020-05-03 15:22:13 +02:00
ZipperQR
d229445d43 no message 2020-05-03 14:02:23 +03:00
MascaraSnake
bfe0ad5d6a Refactor P_CheckBouncySectors 2020-05-03 10:01:58 +02:00
Steel Titanium
72b83986fa 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
Hannu Hanhi
4bfaa9ae9a Dummy I_GetTimeMicros 2020-05-02 23:24:49 +03:00
Hannu Hanhi
c5c45a1fb0 Implement I_GetTimeMicros without affecting I_GetTime behaviour details 2020-05-02 23:14:20 +03:00
Hannu Hanhi
cfafe90e78 Render stats cleanup 2020-05-02 23:14:08 +03:00
Hannu Hanhi
1350b89a06 More render stats for software mode, renamed and relocated some render stats variables 2020-05-02 23:13:53 +03:00
Hannu Hanhi
1a741f8883 Move some render stats variables to better locations, add I_FinishUpdate timing 2020-05-02 23:13:32 +03:00
Hannu Hanhi
e5531714df Render stats 2020-05-02 23:13:08 +03:00
Monster Iestyn
145b7d8f66 Fix drop shadow and rotsprite code to use SHORT() 2020-05-02 17:13:16 +01:00
MascaraSnake
4346d22480 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
96ae5dda22 Merge branch 'remove-polyobjects' into 'next'
Delete polyobjects

See merge request STJr/SRB2!911
2020-05-02 09:53:37 -04:00
MascaraSnake
c4190f2d3f Refactor P_CheckBustableBlocks 2020-05-02 15:50:18 +02:00
MascaraSnake
4e6a0c0ae9 Revert some very incorrect refactoring 2020-05-02 15:33:15 +02:00
MascaraSnake
5a6d3753c0 Refactor P_PushableCheckBustables 2020-05-02 15:30:56 +02:00
MascaraSnake
0f16d55384 Some minor PTR_GlideClimbTraverse cleanup 2020-05-02 15:25:19 +02:00
MascaraSnake
40459adbb5 Refactor PTR_SlideTraverse 2020-05-02 15:21:53 +02:00
MascaraSnake
cd9f6a2b7e P_PlayerZMovement: Move PolyObject handling code into its own function 2020-05-02 13:49:16 +02:00
MascaraSnake
1cee43f945 Merge branch 'remove-polyobjects' into movement-refactor 2020-05-02 13:37:13 +02:00
MascaraSnake
147a1a8a0a P_PlayerZMovement: Move checks for Mario blocks into their own function 2020-05-02 13:34:24 +02:00