Commit graph

9992 commits

Author SHA1 Message Date
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
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
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
8efec04051 Remove POLYOBJECTS and POLYOBJECTS_PLANES defines 2020-05-02 12:08:31 +02:00
MascaraSnake
238513ffd6 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
e967c32a10 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
d295996d88 Merge branch 'elevator-cleanup' into 'next'
elevator_t cleanup

See merge request STJr/SRB2!896
2020-05-01 05:46:37 -04:00
MascaraSnake
5cf3fd0074 Merge branch 'next' into elevator-cleanup
# Conflicts:
#	src/p_saveg.c
2020-05-01 11:42:05 +02:00
MascaraSnake
2973b79715 Remove bogus comments from p_saveg.c 2020-05-01 11:25:32 +02:00
LJ Sonic
2c74085826 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
lachwright
d780d82ba8 Restore jump-related pflags properly during twinspin 2020-05-01 06:34:30 +08:00
Monster Iestyn
a96f0a0df3 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
405d5e1fc6 Merge branch 'netarchive-cleanup' into 'next'
Netgame $$$.sav code cleanup

See merge request STJr/SRB2!894
2020-04-30 14:53:22 -04:00
Monster Iestyn
edfbd799db Merge branch 'next' into netarchive-cleanup 2020-04-29 15:27:07 +01:00
Monster Iestyn
0ab7d0b4b5 Don't discard const, added missing & 2020-04-29 15:24:28 +01:00
Monster Iestyn
5f3a827609 Whoops the third 2020-04-29 14:45:52 +01:00
Louis-Antoine
4130a30008 Revert "Replace a few instance of strncpy with strlcpy"
This reverts commit b03e0d1289.
2020-04-29 10:55:49 +02:00
Louis-Antoine
1f830836ba Optimise number archiving 2020-04-28 23:12:02 +02:00
Louis-Antoine
9ce73e9790 Optimise boolean archiving 2020-04-28 23:11:28 +02:00
Louis-Antoine
6ec3ec4933 Optimise string archiving and allow for longer strings 2020-04-28 22:19:44 +02:00
LJ Sonic
355912cf35 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
34c379b479 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
8e5646d708 Replace P_FindLineFromLineTag with P_FindLineFromTag 2020-04-27 14:34:42 +02:00
MascaraSnake
c2cf8d57d0 Remove P_FindSectorFromLineTag 2020-04-27 14:31:37 +02:00
MascaraSnake
398ee65646 Store "no bosses" setting for lasers in thinker instead of checking sourceline. 2020-04-27 13:09:57 +02:00
MascaraSnake
0dbcd8766b Pass thwomp settings to P_AddThwompThinker 2020-04-27 13:01:31 +02:00
MascaraSnake
40d0fb714d Store tag instead of sourceline in raise thinker 2020-04-27 12:54:08 +02:00
MascaraSnake
0b38dae561 Make P_AddRaiseThinker more configurable via function parameters (needed for UDMF) 2020-04-27 11:19:07 +02:00
Monster Iestyn
bc2f478b43 Merge branch 'planethinker-followup' into 'next'
Clean up the plane thinker cleanup

See merge request STJr/SRB2!897
2020-04-26 13:22:49 -04:00
MascaraSnake
2d860cd362 Make new thinker loading functions set floordata/ceilingdata where necessary 2020-04-26 18:54:03 +02:00