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