Commit graph

12821 commits

Author SHA1 Message Date
MascaraSnake
22420f92d2 Some trigger lineder cleanup 2021-12-09 20:02:03 +01:00
MascaraSnake
c43d5c7183 Adapt linedef types 334-336 to UDMF 2021-12-09 19:53:14 +01:00
MascaraSnake
adaf599e87 Adapt linedef types 331-333 to UDMF 2021-12-09 19:33:02 +01:00
MascaraSnake
a7f5bcfea7 Adapt linedef type 305-307 to UDMF 2021-12-09 19:17:16 +01:00
MascaraSnake
670e32908e Adapt linedef type 308 to UDMF 2021-12-09 18:56:50 +01:00
MascaraSnake
126cbdd189 Adapt linedef types 321-322 to UDMF 2021-12-09 18:15:27 +01:00
MascaraSnake
2638e1212c Fix a typo 2021-12-09 16:10:39 +01:00
spherallic
6f5b34f7c1 Don't award end-of-level bonuses to bots. 2021-12-09 12:45:18 +01:00
John FrostFox
c420de6f11 Include pmomz for mobjs in net savestates and load if it exists 2021-12-09 11:42:06 +03:00
MascaraSnake
875ba7915c Adapt linedef types 309-312 to UDMF 2021-12-09 08:49:50 +01:00
MascaraSnake
9d87e97275 Adapt linedef types 317-320 to UDMF 2021-12-09 08:08:04 +01:00
MascaraSnake
f86dff8cf2 Adapt linedef types 314-315 to UDMF 2021-12-09 07:56:15 +01:00
MascaraSnake
92e724faca Adapt linedef types 303-304 to UDMF 2021-12-09 07:47:01 +01:00
MascaraSnake
f60873c19b Adapt linedef types 300-302 to UDMF 2021-12-09 07:30:55 +01:00
MascaraSnake
44434a64d1 Refactor P_RunTriggerLinedef 2021-12-09 07:10:16 +01:00
MascaraSnake
060bc5fde0 Replace P_ThingOnSpecial3DFloor with the more versatile P_MobjTouchingSectorSpecial 2021-12-08 21:07:26 +01:00
MascaraSnake
1a2b0d24ab Make all players triggers work if players are in different sectors with the same tag 2021-12-08 20:29:10 +01:00
MascaraSnake
c8cb096647 "Floor touch" sector specials are no longer contaminated by "anywhere in sector" specials 2021-12-07 21:39:45 +01:00
MascaraSnake
3cd56e456d Rewrite pushable/mobj linedef executor trigger code 2021-12-07 19:20:26 +01:00
MascaraSnake
c9ed484129 Rewrite each time thinker 2021-12-07 07:17:58 +01:00
MascaraSnake
222d05a424 Refactor sector special plane touching code 2021-12-07 07:15:52 +01:00
katsy
97e2fe18c6 fix spike sandwich teleportation issue 2021-12-06 18:00:30 -06:00
MascaraSnake
9ebc259ab3 Split P_ProcessSpecialSector into multiple functions 2021-12-06 18:50:06 +01:00
LJ Sonic
6504557393 Merge branch 'asin' into 'next'
arcsine Lua wrapper

See merge request STJr/SRB2!1554
2021-12-06 00:01:45 +00:00
LJ Sonic
066a9d1534 Merge branch 'fix-musicchange-hook' into 'next'
Fix MusicChange hook crashing when called

See merge request STJr/SRB2!1671
2021-12-05 17:02:20 +00:00
LJ Sonic
f271f88c7f Fix MusicChange hook crashing when called
BRUH MOMENT BRUH MOMENT
PREPARE THE HALL OF SHAME
2021-12-05 17:59:33 +01:00
sphere
76bbef29a9 Merge branch 'trigger-bruh' into 'next'
Fix "all players" check in T_EachTimeThinker

See merge request STJr/SRB2!1668
2021-12-05 14:45:01 +00:00
katsy
b2d693a547 minor spike optimisations 2021-12-05 02:13:09 -06:00
MascaraSnake
f359151457 Merge branch 'trigger-bruh' into udmf-executor-triggers 2021-12-05 08:36:11 +01:00
MascaraSnake
55fc7cbd67 Fix "all players" check in T_EachTimeThinker 2021-12-05 07:20:55 +01:00
Radicalicious
86edb1e4ca Fix player disappearing when drowning in painstate 2021-12-03 23:20:07 -06:00
Radicalicious
d791fc2dc8 Merge remote-tracking branch 'stjr/next' into we-do-a-little-trolling 2021-12-03 21:53:32 -06:00
MascaraSnake
87a6528f00 Merge branch 'udmf-linedef-executors' into udmf-executor-triggers 2021-12-03 19:26:46 +01:00
MascaraSnake
f5cda9f64c Merge branch 'udmf-lighting' into udmf-linedef-executors 2021-12-03 19:23:24 +01:00
MascaraSnake
aee4996eba Merge branch 'udmf-polyobjects' into udmf-lighting 2021-12-03 19:22:37 +01:00
MascaraSnake
99515bce24 Merge branch 'udmf-scrollers' into udmf-polyobjects 2021-12-03 19:21:44 +01:00
MascaraSnake
76962a3a3f Merge branch 'udmf-plane-linedefs' into udmf-scrollers 2021-12-03 19:20:39 +01:00
MascaraSnake
c4775ed37b Merge branch 'udmf-fofs-mkii' into udmf-plane-linedefs
# Conflicts:
#	extras/conf/SRB2-22.cfg
#	src/p_ceilng.c
2021-12-03 19:10:29 +01:00
LJ Sonic
1acd0f6bac Merge branch 'starstruck' into 'next'
Null gamestate before map transition to prevent unwanted interactions with the map (resolves #601)

Closes #601

See merge request STJr/SRB2!1624
2021-12-03 18:02:06 +00:00
MascaraSnake
adce427299 Merge branch 'next' into udmf-fofs-mkii
# Conflicts:
#	src/p_user.c
2021-12-03 18:58:02 +01:00
MascaraSnake
6dc49042de Port katsy's bouncy FOF cleanup 2021-12-03 18:48:16 +01:00
Lach
ac2e8119db Merge branch 'supersuck' into 'next'
Add MFE_FORCESUPER, MFE_FORCENOSUPER, and MFE_REVERSESUPER extra flags (Solves #520)

See merge request STJr/SRB2!1452
2021-12-03 12:18:39 +00:00
SteelT
bb514a0627 Merge branch 'metal-recording-srb2home' into 'next'
Fix metal recordings not being saved in srb2home

See merge request STJr/SRB2!1601
2021-12-03 00:32:06 +00:00
LJ Sonic
d77b427329 Merge branch 'adjust-max-downloadspeed' into 'next'
Raise the maximum value of file upload speed drastically

See merge request STJr/SRB2!1665
2021-12-02 23:57:42 +00:00
LJ Sonic
b959d0f4ab Merge branch 'fix-console-keyup' into 'next'
Fix `KeyUp` hook being called when the console is open

See merge request STJr/SRB2!1664
2021-12-02 23:57:38 +00:00
LJ Sonic
be87a84a01 Merge branch 'perfstats-averaging-rebased' into 'next'
Perfstats averaging and refactor

See merge request STJr/SRB2!1643
2021-12-02 23:57:26 +00:00
LJ Sonic
95c61e0fab Merge branch 'ksf-wadfiles' into 'next'
Raise addon limit

See merge request STJr/SRB2!1465
2021-12-02 22:50:46 +00:00
LZA
a3353be0dc Raise addon limit 2021-12-02 22:50:44 +00:00
LJ Sonic
599abc2a78 Merge branch 'lua-timestamp' into 'next'
Timestamp function for Lua

See merge request STJr/SRB2!1647
2021-12-02 22:41:08 +00:00
LJ Sonic
ff037a8160 Remove downloadspeed cruft 2021-12-02 23:34:28 +01:00