stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-02-05 07:51:42 +00:00
Code Issues Projects Releases Packages Wiki Activity
15963 commits 180 branches 42 tags 329 MiB
Commit graph

1043 commits

Author SHA1 Message Date
MascaraSnake
5df079c653 Backwards compatibility: Add back bouncy FOF sector type, but mark it as deprecated 2021-06-23 22:21:19 +02:00
MascaraSnake
23efeeed8e Merge branch 'next' into udmf-fofs-mkii 2021-06-23 19:48:26 +02:00
James R
4d22b9f17f Merge remote-tracking branch 'origin/next' into hooklib-refactor 2021-06-07 18:12:52 -07:00
Nev3r
b49238f7c4 Merge branch 'remove-iterdeclarations' into 'next' 
Remove TAG_ITER_DECLARECOUNTER

See merge request STJr/SRB2!1398
 2021-06-01 07:36:50 -04:00
SteelT
2cb920a5a6 Merge branch 'failed-level-lua' into 'next' 
[SUGOI] Make stagefailed more useful, add linedef executor to toggle, and expose to Lua

Closes #361

See merge request STJr/SRB2!1463
 2021-05-28 21:51:00 -04:00
sphere
60bbf1d8bc Merge branch 'fix-pit_checkthing-crash' into 'next' 
Check against null tmpusher source before attempting to push a thing.

See merge request STJr/SRB2!1413
 2021-05-19 08:12:30 -04:00
LJ Sonic
d325c7e6d3 The year is 2021 2021-05-07 17:45:56 +02:00
Sally Coolatta
d8d3dee46f Add linedef executor for toggling stagefailed 
By default, the executor will fail the stage. If Not Climbable is checked, the stage can be completed normally again.
 2021-04-19 17:20:34 -04:00
GoldenTails
12205314bc Check against null tmpusher source before attempting to push a thing. 2021-02-21 19:32:00 -06:00
Nev3r
66d858fbcb Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2 into remove-iterdeclarations 
# Conflicts:
#	src/p_spec.c
 2021-02-15 09:20:40 +01:00
LJ Sonic
09d911a5b6 Revert "Replace all instances of P_AproxDistance with FixedHypot" 
This reverts commit 75633bde50.
 2021-02-13 17:45:20 +01:00
Nev3r
eda6b0ad8e Remove TAG_ITER_DECLARECOUNTER and the level field on the iterator macros. 
Declare the position counters inside the for loops instead; RIP C90.
 2021-02-11 13:24:20 +01:00
LJ Sonic
83947d4428 Merge branch 'redundant-hypot' into 'next' 
Replace P_AproxDistance with FixedHypot, and replace FixedHypot's algorithm with R_PointToDist2's

See merge request STJr/SRB2!1320
 2021-01-25 18:08:25 -05:00
James R
353692fa79 Merge remote-tracking branch 'origin/next' into hooklib-refactor 2020-12-16 08:43:49 -08:00
James R
00c5d70bfc Merge branch 'drain-antiri' into 'next' 
Make Ring Drain sectors play the depletion sound instead of the ring sound

See merge request STJr/SRB2!1315
 2020-12-15 20:51:39 -05:00
James R
73a7365798 Merge branch 'circuit-finallap' into 'next' 
Final lap text for circuit

See merge request STJr/SRB2!1303
 2020-12-15 20:42:59 -05:00
James R
75633bde50 Replace all instances of P_AproxDistance with FixedHypot 2020-12-12 14:53:54 -08:00
James R
2778cc3ce9 Merge remote-tracking branch 'origin/next' into hooklib-refactor 2020-12-12 02:02:38 -08:00
Zippy_Zolton
68de9f4bbe Make Ring Drain sectors play the depletion sound instead of the ring sound 2020-12-11 12:34:30 -06:00
James R
0b2e60ba1d Merge branch 'my-junk' into 'next' 
Initialize dummy linedef tag lists

See merge request STJr/SRB2!1279
 2020-12-10 15:29:10 -05:00
James R
8d382e49fb Big Large Lua Hooklib Refactor 
* Hooks are no longer a mess of lua boiler plate. Helper functions reduce hooks
  to, at the most basic level, only two calls.
* Lua tables (the array part) are used to index hooks. Such tables contain only
  hooks of the same type.
* Hook types are defined in one place so you no longer need to sync up the enum
  and name array.
 2020-12-10 00:36:41 -08:00
Zippy_Zolton
1b888c689c CTF text 1 2020-12-08 15:56:45 -06:00
Zippy_Zolton
45a4b728b3 zwip suggestion 2020-12-08 12:05:06 -06:00
Zippy_Zolton
2721725962 Final lap text for circuit 2020-12-07 16:46:05 -06:00
Tatsuru
fae845f935 Initialize in p_spec.c too + magic number replacement 2020-12-03 17:50:10 -03:00
SMS Alfredo
7ad8aa1477 Allow the Forcespin sector type to be used with intangible fofs 
Didn't think simply removing the P_IsObjectOnGround was gonna work, but apparently it does.
 2020-11-18 12:27:09 -06:00
SMS Alfredo
16fd754a39 Allow forcespin sectors to work on no spin characters 2020-11-18 11:49:17 -06:00
Nev3r
70512f11ff Merge branch 'udmf-multitag' into udmf-fofs-mkii and pray 
# Conflicts:
#	src/p_floor.c
#	src/p_spec.c
 2020-11-13 13:23:14 +01:00
Nev3r
2c8a99f25a Add a level parameter to the iterators to account for nesting, and thus avoid variable shadowing. 2020-11-12 13:48:14 +01:00
Nev3r
a931d09e7d Forgot to change %d to %s for sizeu1(). 2020-11-10 13:11:42 +01:00
Nev3r
56c3e93d3a Remove unused tag parameter. 2020-11-10 13:10:01 +01:00
Nev3r
b65211d148 Use sizeu1() 2020-11-10 12:34:08 +01:00
Nev3r
95a61a226b rename TAG_ITER_C to TAG_ITER_DECLARECOUNTER and remove the semicolon from the macro. 2020-11-10 12:22:55 +01:00
Nev3r
3d2d44bfff Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2 into udmf-fofs-mkii 
# Conflicts:
#	src/p_user.c
 2020-10-27 22:23:30 +01:00
Nev3r
ad9e3411a1 Rename bustable type BT_SPIN to BT_SPINBUST to avoid conflicts with next. 2020-10-27 22:13:10 +01:00
Nev3r
c62ef355ef Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2 into udmf-multitag 
# Conflicts:
#	src/lua_baselib.c
#	src/lua_maplib.c
 2020-10-27 20:48:25 +01:00
Lachlan Wright
1caf92f0ae Merge branch 'fix-236' into 'next' 
Only allow explicitly living players to trigger sector specials

Closes #236

See merge request STJr/SRB2!1152
 2020-09-25 09:31:06 -04:00
Lachlan Wright
f1d2992f51 Merge branch 'dye-fix' into 'next' 
Fix players not properly decolorizing via linedef action

See merge request STJr/SRB2!1127
 2020-09-25 08:54:16 -04:00
lachwright
7eb760afca Only allow explicitly living players to trigger sector specials 2020-09-20 11:49:53 +09:30
SteelT
a033f482be Merge branch 'pictureformats' into 'next' 
PNG conversion refactoring

See merge request STJr/SRB2!675
 2020-09-10 15:58:18 -04:00
Tatsuru
48d6ae8e53 Decolorize players as intended 2020-08-24 23:53:21 -03:00
Nev3r
b15c760dc2 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-multitag 2020-08-15 13:44:59 +02:00
James R
3e8cf5ab06 Merge branch 'bt_spin' into 'next' 
Replace all occurances of BT_USE with BT_SPIN (2.2!)

See merge request STJr/SRB2!982
 2020-08-09 21:03:17 -04:00
Nev3r
ac8590132b Add a provisional GZDoom-esque 3D floor setup for the sake of immediate UDB usability. 2020-07-13 11:09:19 +02:00
Nev3r
d1db5ebf56 Merge branch 'udmf-next' into udmf-fofs-mkii 2020-07-13 09:34:32 +02:00
GoldenTails
465ad1a7bc Replace all occurances of BT_USE with BT_SPIN (2.3?) 
I'd use `next-major` but it doesn't exist lol
 2020-07-11 21:59:54 -05:00
Nev3r
ad55f5f872 Merge branch 'udmf-next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-multitag 
# Conflicts:
#	src/hardware/hw_main.c
#	src/p_ceilng.c
#	src/p_floor.c
#	src/p_mobj.c
#	src/p_mobj.h
#	src/p_polyobj.c
#	src/p_saveg.c
#	src/p_setup.c
#	src/p_spec.c
#	src/p_spec.h
#	src/p_user.c
#	src/r_bsp.c
#	src/r_defs.h
 2020-07-10 18:18:07 +02:00
Jaime Passos
7911deebf8 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into pictureformats 2020-07-06 19:29:14 -03:00
Nev3r
fd5b05cafc Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next 2020-07-06 11:13:27 +02:00
LJ Sonic
6c61baa818 Merge branch 'fix-oldbrak-missiles2' into 'next' 
Take 2: Fix Old Brak missiles + add pw_ignorelatch

See merge request STJr/SRB2!1006
 2020-07-04 16:28:48 -04:00
LJ Sonic
77e39a0fd5 Merge branch 'make-linedef-422-smarter' into 'next' 
Make Linedef type 422 smarter

See merge request STJr/SRB2!1014
 2020-07-04 08:35:42 -04:00
Nev3r
ff8759e507 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next 
# Conflicts:
#	src/hardware/hw_main.c
 2020-06-30 20:29:48 +02:00
James R
067d9b9a63 Merge remote-tracking branch 'origin/next' into gtr-fixes 2020-06-24 19:31:19 -07:00
GoldenTails
f0787077e3 More people ought to know what modulo is... 
Or modulous if your prefer.
 2020-06-22 04:14:42 -05:00
GoldenTails
6fe0874606 Stop resetting cusval cause that's annoying 2020-06-21 23:21:42 -05:00
GoldenTails
d609cfc9e3 Make it so Linedef type 422 instead sets cusval when the titlemap is in action. 
I have no idea why it wasn't like this before, but oh well.
 2020-06-21 22:20:06 -05:00
kaysrishaq
682791a024 brak missile fix, pw_ignorelatch, small Recycler fix 2020-06-18 17:09:29 -04:00
MascaraSnake
88aad41310 Remove unnecessary options from quicksand FOF again 2020-06-12 18:22:16 +02:00
MascaraSnake
698c18bd40 Remove temporary splat rendering special case 2020-06-12 17:57:24 +02:00
MascaraSnake
06b581dcdf Trim down options for the bobbing FOF preset types 2020-06-12 17:48:43 +02:00
MascaraSnake
5f9af65aa0 Revamp alpha setup for the remaining FOFs 2020-06-12 16:45:18 +02:00
MascaraSnake
6521496d8a Revamp alpha setup for bobbing FOFs 2020-06-12 10:53:27 +02:00
MascaraSnake
3317827151 Revamp alpha setup for bustable FOFs 2020-06-12 10:31:26 +02:00
MascaraSnake
f4e28f5cc4 Revamp alpha setup for quicksand FOFs 2020-06-12 10:23:16 +02:00
MascaraSnake
cc6820187c Handle splat flag for laser FOFs 2020-06-12 10:17:52 +02:00
MascaraSnake
cadb03fd12 Revamp alpha setup for laser FOFs 2020-06-12 10:03:27 +02:00
MascaraSnake
d6a104f8a5 Revamp alpha setup for custom FOFs 2020-06-12 09:57:56 +02:00
MascaraSnake
ac549eddeb Revamp alpha setup for crumbling FOFs 2020-06-12 09:28:41 +02:00
MascaraSnake
1ad8f75538 Revamp alpha setup for water FOFs 2020-06-12 09:00:06 +02:00
MascaraSnake
8dd3c78b05 Add FOF flag for splat flat rendering 2020-06-12 08:27:10 +02:00
MascaraSnake
a79862285e Step 1 in refactoring FOF alpha setup: Pass alpha value to FOF adding functions as a parameter 2020-06-12 08:16:50 +02:00
MascaraSnake
9dbfa28dbc Merge branch 'udmf-next' into udmf-fofs-mkii 
# Conflicts:
#	extras/conf/udb/Includes/SRB222_linedefs.cfg
#	src/p_setup.c
 2020-06-09 09:50:02 +02:00
MascaraSnake
4a0206b38d Merge branch 'next' into udmf-next 
# Conflicts:
#	src/p_mobj.c
#	src/p_polyobj.c
 2020-06-09 09:38:01 +02:00
LJ Sonic
e2b860dc28 Merge branch 'next' into 'fix-spawn-desynch' 
# Conflicts:
#   src/p_map.c
 2020-06-01 08:15:02 -04:00
MascaraSnake
11493e61d2 Merge branch 'executordelay' into 'udmf-next' 
UDMF linedef executor delay

See merge request STJr/SRB2!918
 2020-06-01 07:57:23 -04:00
SteelT
07da7f7d29 Merge branch 'scroller-tweaks' into 'next' 
Add back side wall scrollers & allow using offsets for tagged wall scrollers.

See merge request STJr/SRB2!955
 2020-05-28 11:29:39 -04:00
Louis-Antoine
67eef5a37f Fix potential desynch when a player spawns 2020-05-28 11:03:35 +02:00
SwitchKaze
b37c73b008 Make colors UINT16, increase color freeslots to 1024 2020-05-23 19:35:36 -05:00
sphere
934b28989f Add linedef actions 507 & 508, allow using offsets for actions 502-504. 2020-05-19 23:39:35 +02:00
MascaraSnake
6f854f2de3 Merge branch 'more-polyobject-cleanup' into 'next' 
Smooth polyobject movement and other cleanup

See merge request STJr/SRB2!947
 2020-05-18 16:00:55 -04:00
MascaraSnake
33a22331f8 Merge branch 'waypoints' into 'next' 
Store waypoints at map load instead of iterating through the thinker list to find them

See merge request STJr/SRB2!938
 2020-05-18 16:00:46 -04:00
Louis-Antoine
d0abd6e86c Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into slope-cleanup 
# Conflicts:
#	src/hardware/hw_main.c
#	src/p_spec.c
 2020-05-18 16:14:05 +02:00
MascaraSnake
a7c7f7afa9 Merge branch 'fof-cleanup' into 'next' 
FOF cleanup

See merge request STJr/SRB2!910
 2020-05-17 02:30:16 -04:00
MascaraSnake
969c48fac8 Merge branch 'udmf-next' into udmf-polyobjects 
# Conflicts:
#	src/p_polyobj.c
 2020-05-16 11:18:47 +02:00
MascaraSnake
536e355cdf polywaypointdata_t: Turn reverse and continuous into flags 2020-05-16 09:49:30 +02:00
Jaime Passos
1a79f6246d Merge remote-tracking branch 'origin/next' into pictureformats 2020-05-15 01:34:54 -03:00
MascaraSnake
02c2aeb46a Merge branch 'udmf-next' into udmf-fofs-mkii 2020-05-13 16:23:36 +02:00
MascaraSnake
7413da918b Store PolyObject waypoint return behavior in an enum 2020-05-13 16:21:47 +02:00
MascaraSnake
ff3768f3e0 Merge branch 'udmf-next' into executordelay 2020-05-13 10:01:41 +02:00
MascaraSnake
1ccda0b85c Merge branch 'next' into udmf-next 2020-05-13 10:01:12 +02:00
MascaraSnake
d3ec12c842 Merge branch 'udmf-next' into executordelay 
# Conflicts:
#	src/p_spec.c
 2020-05-13 09:55:25 +02:00
MascaraSnake
36843cbfd6 Merge branch 'next' into waypoints 2020-05-12 23:51:32 +02:00
MascaraSnake
d708789c3a Store waypoints (for zoom tubes, rope hangs, polyobjects) explicitly 2020-05-12 23:50:30 +02:00
Jaime Passos
39c5ab4e17 Merge remote-tracking branch 'origin/next' into gtr-fixes 2020-05-09 17:12:52 -03:00
MascaraSnake
650f44566f Fixed a typo 2020-05-07 21:59:39 +02:00
MascaraSnake
8c36b9efa5 Adapt basic PolyObject setup to UDMF 2020-05-04 22:40:49 +02:00
MascaraSnake
6e7373a475 Merge branch 'next' into udmf-next 2020-05-04 20:32:56 +02:00
MascaraSnake
023c095d55 Merge branch 'polyobject-cleanup' into 'next' 
PolyObject cleanup

See merge request STJr/SRB2!919
 2020-05-04 14:18:08 -04:00
MascaraSnake
d03742b15b 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
248df41a2f Simplify set/fade polyobject translucency code 2020-05-04 10:29:35 +02:00
MascaraSnake
78a700f5fa Remove non-descriptive comments 2020-05-04 10:01:44 +02:00
MascaraSnake
2be775e74c Move parameter parsing for EV_DoPolyObjFlag into its own function 2020-05-04 09:58:27 +02:00
MascaraSnake
482adc6124 Pass parameters to EV_DoPolyObjFlag in a struct and not via the line 2020-05-04 09:54:32 +02:00
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
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
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
MascaraSnake
1aafc2f463 Replace "bouncy FOF" sector type with "make FOF bouncy" linedef type 2020-05-03 12:44:30 +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
4dd25721f6 Merge branch 'movement-refactor' into udmf-fofs-mkii 2020-05-02 14:29:10 +02:00
MascaraSnake
485a4e5035 Remove POLYOBJECTS and POLYOBJECTS_PLANES defines 2020-05-02 12:08:31 +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
Monster Iestyn
0d3876abf3 Merge branch 'next' into netarchive-cleanup 2020-04-29 15:27:07 +01: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
MascaraSnake
4f3d837835 Store "no bosses" setting for lasers in thinker instead of checking sourceline. 2020-04-27 13:09:57 +02:00
MascaraSnake
630af5d225 Pass thwomp settings to P_AddThwompThinker 2020-04-27 13:01:31 +02:00
MascaraSnake
556c2a8c18 Store tag instead of sourceline in raise thinker 2020-04-27 12:54:08 +02:00
MascaraSnake
863ac48c9b Fix rising FOF speed 2020-04-27 11:56:29 +02:00
MascaraSnake
c702e697b6 Fix bobbing FOF speed 2020-04-27 11:55:05 +02:00
MascaraSnake
d9f761b619 Adapt setup of rising FOFs 2020-04-27 11:52:31 +02:00
MascaraSnake
0877427168 Merge branch 'raisethinker' into udmf-fofs-mkii 
# Conflicts:
#	src/p_spec.c
 2020-04-27 11:32:51 +02:00
MascaraSnake
2f9cccf287 Make P_AddRaiseThinker more configurable via function parameters (needed for UDMF) 2020-04-27 11:19:07 +02:00
MascaraSnake
7198cc46fd Adapt setup of water bobbing FOF 2020-04-27 11:05:27 +02:00
MascaraSnake
607aeb3a52 Adapt setup of air bobbing FOFs 2020-04-27 10:29:29 +02:00
MascaraSnake
fb1746e95b Deprecate the camera scanner effect and print a warning when it's used 2020-04-26 18:42:31 +02:00
MascaraSnake
e00531ed9c Merge branch 'udmf-next' into udmf-fofs-mkii 
# Conflicts:
#	src/p_floor.c
#	src/p_spec.c
#	src/p_spec.h
 2020-04-26 11:13:09 +02:00
MascaraSnake
abcc47ac61 Bring signature of P_AddAirbob in line with next 2020-04-26 10:35:08 +02:00
MascaraSnake
1aa90754db Port over raise thinker changes from next (preparation for merge) 2020-04-26 10:33:13 +02:00
Monster Iestyn
7034e2537a whoops the sequel 2020-04-25 16:53:52 +01:00
Monster Iestyn
049a7db877 whoops 2020-04-25 16:52:11 +01:00
Nev3r
9ebb4071ee Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-multitag 
# Conflicts:
#	src/p_floor.c
#	src/p_mobj.c
#	src/p_spec.c
#	src/r_segs.c
 2020-04-25 10:47:45 +02:00
MascaraSnake
0ab01cd4b2 Port over thwomp thinker changes manually, to avoid merge conflicts 2020-04-25 09:20:53 +02:00
MascaraSnake
04c10ed41b Merge branch 'next' into udmf-next 2020-04-25 08:19:26 +02:00
MascaraSnake
3cd8f62ae9 Remove a line I overlooked in the thinker cleanup branch 2020-04-25 08:18:48 +02:00
Monster Iestyn
7dda5f6b94 created P_GetFFloorID to get an "ID" of an FOF in its target sector (an opposite to P_GetFFloorByID you could say!), rewrote floor/ceiling rover archiving code to use both P_GetFFloorID and P_GetFFloorByID 2020-04-24 22:29:41 +01:00
MascaraSnake
3170f2b8c3 Merge branch 'next' into udmf-next 
# Conflicts:
#	src/p_mobj.c
#	src/r_segs.c
 2020-04-24 21:15:53 +02:00
Monster Iestyn
d1d006a1a7 Merge branch 'thinker-cleanup' into 'next' 
Plane movement thinker cleanup

See merge request STJr/SRB2!880
 2020-04-24 14:30:52 -04:00
Nev3r
5c605a8a39 Merge branch 'udmf-next' into udmf-multitag 2020-04-20 09:05:55 +02:00
Nev3r
efb81fc526 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next 2020-04-20 09:05:21 +02:00
James R
cbe181c66d Merge branch 'angle-for-spawn-object' into 'next' 
Make the Spawn Object linedef executor able to set the object's angle.

See merge request STJr/SRB2!877
 2020-04-18 20:16:07 -04:00
MascaraSnake
1d3aa7129a Add enums for textmap FOF values 2020-04-18 18:02:43 +02:00
MascaraSnake
8e5effa07b Merge branch 'udmf-argenums' into udmf-fofs-mkii 2020-04-18 17:23:02 +02:00
MascaraSnake
09506112d7 Add enums to encapsulate the textmap colormap settings 2020-04-18 17:15:25 +02:00
MascaraSnake
c031008eab Enable SF_TRIGGERSPECIAL_TOUCH for sectors with spike damage 2020-04-18 15:17:25 +02:00
Nev3r
ffc161e2aa Merge branch 'udmf-next' into udmf-multitag 
# Conflicts:
#	src/p_spec.c
 2020-04-18 14:04:15 +02:00
Nev3r
2b2a18fdf1 Merge branch 'udmf-colormaps' into 'udmf-next' 
UDMF colormaps

See merge request STJr/SRB2!855
 2020-04-18 07:42:24 -04:00
MascaraSnake
54cbd66999 Eradicate levelspecthink_t 2020-04-18 11:05:58 +02:00
MascaraSnake
08f1e03e79 Refactor T_ThwompSector 2020-04-18 10:26:03 +02:00
MascaraSnake
29d33f0a93 Refactor T_NoEnemiesSector 2020-04-18 09:21:04 +02:00
MascaraSnake
cc0f686c95 Refactor T_FloatSector 2020-04-18 00:26:49 +02:00
Nev3r
aa0d76f8fa Delete tags. 2020-04-18 00:23:24 +02:00
Nev3r
e87ad0fb38 Delete old taglists. 2020-04-18 00:05:55 +02:00
MascaraSnake
fd598f315e Add an enum for crumblestate 2020-04-17 23:54:37 +02:00
Nev3r
9eb17e4104 Remove P_ChangeSectorTag(). 2020-04-17 23:30:07 +02:00
MascaraSnake
9b27d004e3 Remove the spike thinker, which hasn't been necessary for a while now 2020-04-17 22:54:35 +02:00
Nev3r
7904856e8e Remove presumably the remaining old tag references in the gamelogic. 2020-04-17 22:28:41 +02:00
MascaraSnake
099ad6cf20 Remove sec assignments that have become superfluous 2020-04-17 21:39:38 +02:00
Nev3r
b5eaad42fc Carry over a considerable case regarding accessing the old tag vars. 2020-04-17 18:15:25 +02:00
MascaraSnake
89539512f6 Make T_EachTimeThinker use its own struct 2020-04-17 14:00:48 +02:00
Nev3r
b690d35a99 Move the global taglist init functionality to the taglist files. 2020-04-17 12:52:44 +02:00
MascaraSnake
3e0a9c8718 Forgot to clean up some stuff 2020-04-17 11:13:13 +02:00
MascaraSnake
63a901b714 -Remove superfluous variables from raise_t 
-Cleanup signatures of P_AddRaiseThinker and P_AddAirbob
 2020-04-17 11:11:36 +02:00
Nev3r
a5bc3fb507 P_SpawnSpecials() line special spawn sequence now uses the taglist, until we move on to using args[0]. 2020-04-17 10:52:12 +02:00
MascaraSnake
d0c473c9ae Make T_RaiseSector use its own thinker struct instead of levelspecthink_t 2020-04-17 09:58:53 +02:00
Nev3r
95c7690a40 Remove P_FindSpecialLineFromTag() 2020-04-15 10:16:49 +02:00
MascaraSnake
f815597219 Implement FOF types 170-180 2020-04-15 09:44:33 +02:00
Nev3r
439fde3434 Replace most P_FindSpecialLineFromTag() cases with Tag_FindLineSpecial(), which settle with the first found result. 2020-04-14 23:59:22 +02:00
Nev3r
d518703334 Replaces P_FindSectorFromTag() occurrences with its corresponding macro and vanishes it from existence. 2020-04-14 23:33:56 +02:00
Nev3r
25102ab4af Remove P_FindSectorFromLineTag() 2020-04-14 22:22:48 +02:00
Nev3r
35f539e398 Merge branch 'udmf-next' into udmf-multitag 2020-04-14 22:21:32 +02:00
Nev3r
d40713d08b Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next 2020-04-14 22:20:54 +02:00
Nev3r
24baf5bea0 Replace P_FindSectorFromLineTag() with its corresponding macro for most cases. 2020-04-14 22:19:18 +02:00
MascaraSnake
5389344a32 Implement FOF type 257 2020-04-14 11:56:11 +02:00
Nev3r
464ecc01a4 Merge branch 't_moveplane-refactor' into 'next' 
Remove faulty code from T_MovePlane()

See merge request STJr/SRB2!876
 2020-04-14 05:53:59 -04:00
MascaraSnake
e3b86d0c74 Implement FOF types 252-256 2020-04-14 11:45:37 +02:00
Nev3r
778ef86fee Remove the bridge thinker code. 2020-04-14 10:31:07 +02:00
MascaraSnake
f8c51ccde3 Implement FOF types 220-222 2020-04-14 10:13:38 +02:00
MascaraSnake
9fc2b5b1b9 Implement FOF type 258 2020-04-14 09:51:48 +02:00
MascaraSnake
32a1131c68 Implement FOF type 251 2020-04-14 09:43:49 +02:00
MascaraSnake
916f831edb Implement linedef type 250 2020-04-14 09:14:10 +02:00
MascaraSnake
60e589e92a Implement FOF types 200-201 2020-04-14 09:03:00 +02:00
MascaraSnake
61d903cb5b Revise setup of solid FOFs 2020-04-14 01:34:11 +02:00
sphere
01b28b66a6 Make linedef type 461 able to set object angle, using the line's angle. 2020-04-13 17:10:25 +02:00
Nev3r
74bd23c275 Actually remove the entire code block in T_MovePlane(), and remove line_t.tagline as it served no other purpose. 2020-04-13 15:17:53 +02:00
Nev3r
909268d175 Replace P_FindLineFromLineTag() instances with macros and remove its code. 2020-04-13 13:10:38 +02:00
Nev3r
de07c04f5c Make the macros and their usage relatively cleaner. 2020-04-13 13:09:58 +02:00
Nev3r
0d1f898869 Added disabled test code in P_FindSectorFromTag(). 2020-04-13 13:09:04 +02:00
Nev3r
499c884501 Add multitag support to FOF spawners. 2020-04-12 18:52:47 +02:00
Nev3r
07b4d0ee3d Add lookup tag tables construction. 2020-04-12 15:16:04 +02:00
Nev3r
ab2619d538 Wrap P_FindSectorFromLineTag() is now a wrapper for P_FindSectorFromTag(). 2020-04-12 13:04:15 +02:00
Nev3r
4128f826b7 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next 
# Conflicts:
#	src/lua_hooklib.c
 2020-04-12 09:57:19 +02:00
James R
b8d40a5783 Merge branch 'dye' into 'next' 
Expose colorization to mappers and SOC

See merge request STJr/SRB2!679
 2020-04-09 19:50:32 -04:00
MascaraSnake
92c74814cf Standardize the behavior of FF_INVERTSIDES and FF_INVERTPLANES 2020-03-25 08:34:52 +01:00
Louis-Antoine
6f9422d380 Encapsulate plane height checks 2020-03-22 17:28:50 +01:00
MascaraSnake
77936f6c12 Merge branch 'udmf-colormaps' into udmf-fofs-mkii 2020-03-22 08:06:03 +01:00
MascaraSnake
2133bc89e6 Merge branch 'udmf-next' into udmf-colormaps 2020-03-22 08:05:05 +01:00
MascaraSnake
1580e14cbc Merge branch 'next' into udmf-next 
# Conflicts:
#	extras/conf/Includes/SRB222_linedefs.cfg
#	extras/conf/Includes/SRB222_misc.cfg
#	src/p_spec.c
 2020-03-21 20:04:31 +01:00
Louis-Antoine
892a8dd6e7 Make SRB2 flat like Earth 2020-03-20 18:55:29 +01:00
MascaraSnake
6e8760524c Implement water FOF types 2020-03-20 16:15:39 +01:00
MascaraSnake
1e306dc7b4 Implement linedef type 100-146 2020-03-20 16:08:48 +01:00
MascaraSnake
a9866f84ad Implemented FOF types 100-105 2020-03-20 16:03:48 +01:00
MascaraSnake
0ecf8616ba Add sector flag that protects the colormap from being changed 2020-03-20 12:19:02 +01:00
MascaraSnake
7cf9ad2f2b Adapt setup of colormap linedefs 2020-03-20 11:19:30 +01:00
Louis-Antoine
e3cbdf8fab Use HAVE_BLUA as fuel for my fireplace 2020-03-19 18:36:14 +01:00
Nev3r
68f60f3c29 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next 2020-03-11 09:31:31 +01:00
Monster Iestyn
f4cb6e1f5e Include r_skins.h instead of r_things.h in many files where all they wanted from it was skins stuff 
(oddly enough, this actually revealed some secret file dependencies previously included via r_things.h! I also needed to include d_player.h in r_skins.h itself it seems)
 2020-03-09 13:54:56 +00:00
Jaime Passos
26e367eb9b Merge remote-tracking branch 'origin/next' into pictureformats 2020-03-07 20:43:16 -03:00
Jaime Passos
7d77600e71 Make exitmove friendly, don't start empty intermission screens 2020-02-29 01:51:45 -03:00
Jaime Passos
4e7b47440f G_CoopGametype, for all the GT_COOP cases 2020-02-29 00:57:22 -03:00
Jaime Passos
d3ed5ad44f Race is Competition without the lives 2020-02-28 23:47:38 -03:00
Steel Titanium
76f26cda24 Merge branch 'master' into next 2020-02-21 21:01:29 -05:00
James R
7060083db5 Update copyright year to 2020 2020-02-19 14:08:45 -08:00
Tatsuru
80edefa56e Merge branch 'next' of git@git.magicalgirl.moe:STJr/SRB2.git into dye 2020-02-19 17:32:43 -03:00
Jaime Passos
2893803c68 Merge remote-tracking branch 'origin/next' into pictureformats 2020-02-19 02:25:36 -03:00
MascaraSnake
cae99654be Merge branch 'next' into udmf-next 2020-02-18 18:39:11 +01:00
MascaraSnake
512c6f24a9 Clean up the mess that is extracolormap_t::fog 2020-02-16 20:19:24 +01:00
James R
5a524f21da Merge branch 'starpost-config-additions' into 'next' 
Starpost config additions

See merge request STJr/SRB2!680
 2020-02-01 21:42:43 -05:00
fickleheart
332b22a87a Move spawnsnap to Special/ignore on sector trigger 
Also includes splitting the starpost logic into its own function.
 2020-01-24 23:54:54 -06:00
MascaraSnake
97c58957ee Merge branch 'next' into udmf-next 2020-01-24 22:38:26 +01:00
Louis-Antoine
f209721ded Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into keep-body 
# Conflicts:
#	src/g_game.c
#	src/p_setup.c
 2020-01-22 03:57:22 +01:00
Louis-Antoine
2527b6c389 Teleport disconnected players to starpost if they fall in a pit 2020-01-22 03:20:27 +01:00
Jaime Passos
f4a976f3be Merge remote-tracking branch 'origin/next' into pictureformats 2020-01-20 16:53:41 -03:00
Jaime Passos
7adc108a2a typoe 2020-01-17 00:34:31 -03:00
Tatsuru
7b3cc02ddc Range check 2020-01-11 21:38:10 -03:00
Tatsuru
5d33ca42cf Expose colorization to mappers and SOC 2020-01-11 20:40:57 -03:00
MascaraSnake
b163316cbf Merge branch 'udmf-next' into stringargs 2020-01-11 16:17:53 +01:00
MascaraSnake
bac379a7a3 Merge branch 'udmf-next' into stringargs 2020-01-11 16:03:38 +01:00
MascaraSnake
661c44b260 Merge branch 'udmf-vslopes' into 'next' 
Add textmap vertex slope support

See merge request STJr/SRB2!633
 2020-01-11 10:02:51 -05:00
MascaraSnake
f0d663ea90 Adapt setup of linedef type 443 (Call Lua function) to UDMF 2020-01-11 15:38:50 +01:00
MascaraSnake
ba7a1c0375 Some minor cleanup 2020-01-10 19:56:29 +01:00
Jaime Passos
c1acdfe52e Merge remote-tracking branch 'origin/next' into pictureformats 2020-01-10 04:11:26 -03:00
toaster
004cfb45aa Allow Rollout Rocks that are being ridden to: 
* Break bustable FOFs like pushables.
* Activate pushable-counting executor activators.
* Get pushed by currents/wind.

This takes advantage of the previously-existing hack relating to objects with MF_PUSHABLE infotable (but not active) flags and a nonzero fuse, which is used as the condition to group this under (rather than MT_ROLLOUTROCK specific fuckery).

Thanks to the bug report submitted by our kirbs pal for getting me off my ass this evening.
 2020-01-08 22:36:29 +00:00
fickleheart
c133e645f7 Merge remote-tracking branch 'upstream/next' into next-newcontrols 2020-01-07 23:43:43 -06:00
Jaime Passos
5a2ad5c2f3 Merge remote-tracking branch 'origin/next' into pictureformats 2020-01-07 16:10:25 -03:00
Jaime Passos
f85476c723 Move texture stuff to its own file 2020-01-07 12:35:10 -03:00
Nev3r
91222f7527 Adapt P_ClosestPointOnLine3D() to be much like FV3_ClosestPointOnLine() and use vector3_t's as args, save for the hypotenuse calculation, which remains the same; the output should be the same as before. 
Adapt the rope hang snapping to the new function's form.
 2020-01-04 18:28:25 +01:00
fickleheart
f8a3e3b898 Merge remote-tracking branch 'origin/next' into next-newcontrols 2020-01-04 09:57:09 -06:00
MascaraSnake
4f26a8e73a Move MAXFLATSIZE define to p_spec.h so p_spec.c doesn't have to redefine it 2020-01-01 16:01:07 +01:00
fickleheart
b22de48c03 Merge branch 'next' into next-newcontrols 
# Conflicts:
#	src/g_game.c
#	src/p_setup.c
 2019-12-31 12:58:36 -06:00
fickleheart
c3d14064e2 Convert simple movement to directionchar+analog 
Analog + no directionchar is old analog (now known as
CS_LMAOGALOG because lmao if you still use it).
 2019-12-30 15:05:24 -06:00
MascaraSnake
c43a83dc04 Remove virtres_t pointer in P_SpawnSpecials that's no longer needed 2019-12-29 12:26:02 +01:00
MascaraSnake
abdfe60aa7 Store custom FOF flags directly in back toptexture field at map load instead of re-reading the sidedefs data later on 2019-12-29 12:01:41 +01:00
MascaraSnake
e9376a8353 Cleaned up some more stuff in P_LoadLevel() 2019-12-28 12:48:32 +01:00
Jaime Passos
89b4a558a8 Merge remote-tracking branch 'origin/next' into gametype-clownery 2019-12-23 23:08:16 -03:00
Jaime Passos
61b72203a8 Merge remote-tracking branch 'origin/master' into gametype-clownery 2019-12-23 18:21:13 -03:00
Nev3r
bb54597552 Remove redundant netarchive-related sector vars as they're not used anymore. 
Replace lump-based difference checks for sectors in P_NetArchiveWorld(), now it uses the mapload-created copy instead.
 2019-12-23 12:42:38 +01:00
James R
64af7badfb Merge remote-tracking branch 'origin/master' into next 2019-12-22 20:47:15 -08:00
Jaime Passos
e3584e8230 GTR_ALLOWEXIT 2019-12-18 16:52:05 -03:00
Jaime Passos
299f2bd8cd GTR_TEAMFLAGS 2019-12-18 11:43:50 -03:00
Jaime Passos
ea5e0d28ed More gametype rules yay!! 2019-12-18 01:54:45 -03:00
Jaime Passos
0652ffd67f Merge remote-tracking branch 'origin/master' into flats-in-walls 2019-12-11 21:53:47 -03:00
Nev3r
222336ac0b Oversight, do not free the data yet vres_Free() does it already at the end. 2019-12-11 15:16:56 +01:00
Nev3r
14ad3b938e Use virtres in P_SpawnSpecials(). Whether accessing the lump again here is right or not is also a different question. 2019-12-11 14:04:09 +01:00
MascaraSnake
a3549cc8f2 Merge branch 'datestuff' into 'master' 
Date stuff

See merge request STJr/SRB2Internal!618
 2019-12-06 16:10:36 -05:00
Steel Titanium
d415cd5c6d
Update copyright date on source files 2019-12-06 13:49:42 -05:00
lachwright
8ddfdf2d0f Fix signpost camera for S_SKIN camerascale, exitmove, opposite gravity, and analog mode 2019-12-05 12:36:25 +08:00
toaster
92f8c002f3 Prevent exit sectors having any effect whatsoever outside of platform gametypes (resolve #396). 2019-11-29 19:11:17 +00:00
James R
ccbb122143 Holy shit 2019-11-28 12:10:57 -08:00
Nev3r
1b360d2cd8 Fix the "play from nowhere as long as you're in the tagged areas" behavior in the Play Sound line executor. 2019-11-25 20:30:06 +01:00
toaster
abf0c5e632 resolve #315 2019-11-20 14:34:19 +00:00
lachwright
cde56dbe6c WIP fix signpost issues with exitmove 2019-11-20 21:02:34 +08:00
toaster
86f343b84b Make the All Players linedef exectutor activator sector type more reliable for FOFs that span multiple sectors (resolves #301). 2019-11-19 14:09:24 +00:00
Louis-Antoine
29501a992b Merge branch 'master' into exit-move-lj 2019-11-15 19:35:47 +01:00
Louis-Antoine
ff62a0732a Let players move after completing the level 
This only takes effect in co-op,
and can be disabled with "exitmove off"
 2019-11-15 15:35:28 +01:00
MascaraSnake
14477748be Merge branch 'stopclock' into 'master' 
Stop the clock!

See merge request STJr/SRB2Internal!450
 2019-11-13 14:39:59 -05:00
Jaime Passos
408288255f Merge remote-tracking branch 'origin/master' into flats-in-walls 2019-11-11 14:10:37 -03:00
Jaime Passos
4e6513b583 Merge remote-tracking branch 'origin/master' into texture-flats-optimization 2019-11-11 14:05:03 -03:00
Jaime Passos
615547ddd1 Fix animated flats yet again 2019-11-09 19:32:06 -03:00
Jaime Passos
78a0048ee4 Support animations 2019-11-09 13:23:38 -03:00
Jaime Passos
773f2efdd9 minor fixes 2019-11-09 01:45:00 -03:00
Jaime Passos
c7d0d7b1c2 Flats as walls textures support, WIP, doesn't support animations yet 2019-11-09 01:36:53 -03:00
Jaime Passos
249cf5c8ad fix invisible planes, fix flat animation 2019-11-08 23:42:15 -03:00
Jaime Passos
ae838d4879 Merge remote-tracking branch 'origin/master' into texture-flats-optimization 2019-11-08 23:01:29 -03:00
lachwright
3734eab7b6 Add signpost camera (and fix a typo whoops) 2019-11-09 00:47:51 +08:00
toaster
d8ad0b4eaa STOP THE CLOCK linedef exectutor! 
* When activated, stops the timer in SP/MP.
* Applies to the mapheader countdowntimer as well.
* If you're playing Record Attack, also exits the level immediately.
* It has no special modes, no linedef flags, no parameters, nothing.
* Only not an innate property of A_BossDeath because people may want it to NOT happen sometimes, or make it happen with non-boss events too.

Also, skip over calling P_DoPlayerExit if the player isn't in game.
 2019-11-08 15:47:12 +00:00
lachwright
bd9878eb48 Merge branch 'master' into spinny-sign 2019-11-08 19:59:08 +08:00
James R
b157c21a35 There's some whitespace... 2019-11-07 14:56:42 -08:00
lachwright
cf39e181bb Display Eggman more frequently during skin roulette 2019-11-05 01:33:09 +08:00
lachwright
5e03d40b33 New end-of-level signpost logic 2019-11-04 16:28:44 +08:00
MascaraSnake
1c1fefe25f Merge branch 'linedef-153' into 'master' 
Dynamic Sinking Platform (for Red Volcano Zone)

See merge request STJr/SRB2Internal!401
 2019-10-25 16:56:19 -04:00
MascaraSnake
46d105dd53 Some basic code hygiene: Remove references to the air bob code being "old" or "outdated" 2019-10-25 22:55:10 +02:00
MascaraSnake
0ef50557c2 Merge branch 'spinbust' into 'master' 
Make spinbust behavior consistent with other bustable blocks

Closes #254

See merge request STJr/SRB2Internal!398
 2019-10-23 02:51:47 -04:00
Nev3r
dbd8e563b4 Merge branch 'soundex_tweak' into 'master' 
Tweak Line Special 414's behavior

See merge request STJr/SRB2Internal!382
 2019-10-22 05:31:22 -04:00
James R
e15ffd2bc8 Optimize texture/patch/png/flat flat caching 
SIGSEGV in the case where you have a TEXTURES entry, but no texture or flat,
has been fixed.

Missing flats for now yield a HOM instead of REDFLR as well.

OpenGL also doesn't work yet. And I'm too tired for now to bother with it.
 2019-10-20 20:24:03 -07:00
lachwright
a2f0f61d75 Merge branch 'master' into linedef-153 2019-10-20 20:20:41 +08:00
MascaraSnake
1604e4d439 Make spinbust behavior consistent with other bustable blocks and rename FF_ONLYKNUX to FF_STRONGBUST 2019-10-19 22:20:48 +02:00
MascaraSnake
2f9a13d5e0 Make shatter blocks intangible to the player, but solid to everything else 2019-10-14 20:15:03 +02:00
Nev3r
c935797a34 Encapsulate the second behavior branch into an else. 
When a tag is provided, the tagged sector-related branch is run exclusively now. This prevents playing the same sound again from the caller object's origin and other unwanted behaviors.

Signed-off-by: Nev3r <apophycens@gmail.com>
 2019-10-14 16:30:20 +02:00
MascaraSnake
ad4033ec9e Make shatter blocks solid 2019-10-13 23:08:54 +02:00
lachwright
2daeb81f36 Create new linedef special type 153: Dynamically Sinking Platform 2019-10-12 04:23:11 +08:00
toaster
a5704238c7 Resolve #242 by adding SF_TRIGGERSPECIAL_HEADBUMP, enabled by ML_EFFECT2. 
Also, readd SF_INVERTPRECIP, which was done in a random branch last year and then lost because it was never merged. Enabled by ML_EFFECT1.
 2019-10-06 14:34:25 +01:00
Jaime Passos
6553d816ea Merge remote-tracking branch 'origin/master' into flats-png_port 2019-09-09 14:12:28 -03:00
toaster
0392cfc158 Merge branch 'spawnobject-linedef' into 'master' 
Linedef type 461 (Spawn Object)

See merge request STJr/SRB2Internal!304
 2019-09-08 18:58:50 -04:00
Steel Titanium
1bf78a2423
Move mobj_t declaration to top of the block 2019-09-08 17:14:47 -04:00
toaster
d26ff197dc * Store gravflip (resolves #206) and destscale in starposts. (Using the same field, taking advantage of the fact that object scale will always be positive!) 
* Update the function signature of P_MixUp to accomodate both it and drawangle instead of doing it outside of the function.
* If the player is spawning from the start of the stage and it's from the ceiling, be in fall frames as requested (resolves #191).
 2019-09-07 22:12:47 +01:00
Jaime Passos
0cc553be5f Merge remote-tracking branch 'jimita/flats-png' into flats-png_port 2019-09-06 19:20:45 -03:00
Steel Titanium
10ea0f21ae
Fix spawning within random range 2019-08-29 23:56:15 -04:00
Steel Titanium
8655b8f1f1
Add spawn object linedef special. 
Note that spawning a object within a random range does not fully work yet and crashes the game
 2019-08-29 01:57:58 -04:00
Monster Iestyn
eacc589ae1 Added quick validity checks for three linedef executor specials that require a player mobj to be the triggerer (432, 434 and 437) 2019-08-20 20:31:28 +01:00
Alam Ed Arias
cebc1d46f0 All C files should a newline at the end 2019-08-07 12:39:51 -04:00
toaster
8a0f1e7ed4 Merge branch 'ending' into 'master' 
ENDINGS

See merge request STJr/SRB2Internal!264
 2019-08-03 16:23:51 -04:00
toaster
9f34a7aa82 Merge branch 'bossenable' into 'master' 
Boss enable linedef (type 449)

See merge request STJr/SRB2Internal!272
 2019-08-03 16:23:22 -04:00
toaster
8f729c33d3 Merge branch 'linedef-award-rings' into 'master' 
New award rings linedef executor

See merge request STJr/SRB2Internal!263
 2019-08-03 16:21:58 -04:00
toaster
f3baac8577 Fix the minor issues since steel's busy 2019-08-03 08:04:02 -04:00
toaster
105df2395d MI made a good argument for bossdisabled not being conditional on fromnetsave. 2019-08-03 12:09:18 +01:00
toaster
8d56133425 Fix old Special Stage failure sounds not always playing. 2019-08-02 20:02:55 +01:00
toaster
7cb02985f4 * Added boss enable linedef (type 449). 
- Frontside x offset = boss ID (determined via parameter for all bosses)
	- Noclimb flag = disable mode
	- Bosses don't do a fuckin' THING - no state updates, no player searches, no sounds, no lua, no nothin' - and it's all totally netsynced.
	- The only thing they WILL do is flash infinitely if you hurt them, but this is designed for stuff where you're not meant to be in the same room as the boss til it's activated.
	- All bosses of all IDs are automatically enabled on mapload, then if an enable mode version of this linedef is present in the map for a specific boss id, that boss id is automatically disabled.
* Add multi-boss support via parameter for:
	- All bosses' MT_BOSSFLYPOINT search
	- Boss 5's waypoint search
	- Oldbrak's waypoint search (this one's for you, jood)
 2019-07-31 23:17:17 +01:00
toaster
47554b57e4 * Made the evaluation screen even more attractive. 
* Fixed an unused variable warning in lua_skinlib.c.
- fixed post-level cutscenes playing when you get game over in MP (still kinda on-topic)
Also with apologies to MI:
- golden egg statue mode for tutorial, since the grey doesn't contrast enough with the blue and lime green
- fixed closed captions for replaced player sounds being incorrect
- fixed closed captions overlapping tutorial text
 2019-07-29 14:55:36 +01:00
Steel Titanium
60ffef9830 More simplified code 
Also delay is in tics, per MS' request.
 2019-07-24 21:18:07 -04:00
Steel Titanium
6c2ef839c1 New award rings linedef executor 2019-07-18 22:42:46 -04:00
Jonas Sauer
166f1fac66 Fixed the thinkerlist issues by removing THINK_LIMBO. Delay-removed thinkers now stay in their list. 
Also includes toaster's assorted fixes and improvements from target_painted_on_your_ass.
 2019-07-13 01:42:03 +02:00
Monster Iestyn
dc71e297bb Fixed mixed-code-and-declaration, shadowed variables, etc ...and the compiler doesn't like P_AddEachTimeThinker being inline anymore for some reason, oh well 2019-07-09 21:15:12 +01:00
Monster Iestyn
c1bea02f03 Merge branch 'rainfixesmkII' into 'master' 
Accidentially broke rain in the rainfixes branch (oh, the irony!)

See merge request STJr/SRB2Internal!249
 2019-07-09 14:24:14 -04:00
MascaraSnake
d3d24bc0bd Removed the "disable" linedef effect, since it's useless now that the character flags are gone 2019-07-08 22:58:31 +02:00
MascaraSnake
5b741d8232 Simplified checks for ML_NETONLY and ML_NONET 2019-07-08 22:56:00 +02:00
toaster
a65925aeca Realised I accidentially broke rain in the rainfixes branch (oh, the irony!), realised it needed a few additional P_RecalcPrecipInSector calls to properly work with the new arena, and increased its speed. 
If you must, I can cherrypick this into another branch - but it's required for this one, at least.
 2019-07-08 13:39:21 +01:00
MascaraSnake
a5074a846b Implemented a skin-based linedef executor trigger 2019-07-03 09:19:29 +02:00
MascaraSnake
5cec737985 Remove character-specific flags, replace them with net-only/no-net flags 2019-07-03 00:10:22 +02:00
MascaraSnake
e9978b2955 Merge branch 'master' into thinkerlists 
# Conflicts:
#	src/f_finale.c
#	src/p_enemy.c
 2019-07-02 23:08:37 +02:00
Jaime Passos
28566008b4 Merge remote-tracking branch 'upstream/master' into flats-png 2019-06-25 16:02:35 -03:00
toaster
28a61f2f3c Correct some oversights where drawangle was incorrectly ignored. 2019-06-22 17:07:18 +01:00
Monster Iestyn
149a8bb760 Merge branch 'public_next' 2019-06-21 22:13:39 +01:00
Monster Iestyn
50e8f13c03 Fix FOF slopes briefly glitching on level load in software mode, by ensuring the FOFs' target sectors have hasslope set on creation 2019-06-17 18:46:51 +01:00
Monster Iestyn
0fd3668111 Revert "Merge branch '144-scrolltweaks' into 'master'" 
This reverts merge request !213
 2019-06-04 17:34:59 +00:00
Jaime Passos
dbb1575a6d Animations, better flat management. 2019-05-21 15:24:26 -03:00
Jaime Passos
714c997aac Support for patches and textures to be used in place of sector flats 
Still a work in progress.
 2019-05-21 00:28:52 -03:00
mazmazz
89ab777c40 Merge remote-tracking branch 'origin/master' into menu-execs 2019-05-02 18:47:43 -04:00
Nev3r
a9110c0645 Fixed more mobj thinker iterator oversights and removed all mobj thinker function checks 
Mobjs got their own thinker list after all, and disappearing thinkers are automatically purged from their lists and sent to the limbo list.
So it's safe to assume all thinkers inside the mobj list must be mobjs.

Signed-off-by: Nev3r <apophycens@gmail.com>
 2019-04-21 16:39:57 +02:00
Nev3r
d264d06879 Merge branch 'slopethinkers' into thinkerlists 
Signed-off-by: Nev3r <apophycens@gmail.com>
 2019-04-21 11:47:34 +02:00
Nev3r
b60c66325c Added a mobj-only list entry for mobj thinkers 
Signed-off-by: Nev3r <apophycens@gmail.com>
 2019-04-20 23:29:20 +02:00