Commit graph

752 commits

Author SHA1 Message Date
MascaraSnake
099cea0a19 Implement "set flats" linedef type 2021-06-27 11:56:06 +02:00
MascaraSnake
4b0e311740 Fix typo 2021-06-27 09:54:48 +02:00
MascaraSnake
92982be76b Adapt the remaining plane movement linedef types to UDMF 2021-06-27 09:53:57 +02:00
MascaraSnake
9fdd9060e4 Adapt crusher linedefs to UDMF 2021-06-26 12:53:14 +02:00
MascaraSnake
8f39e23105 Adapt linedef type 405 and 407 to UDMF 2021-06-26 08:43:35 +02:00
MascaraSnake
53976e4b52 Adapt linedef types 403-404 to UDMF 2021-06-26 08:31:59 +02:00
MascaraSnake
6abcba6876 Adapt linedef types 400-401 to UDMF + some EV_ cleanup 2021-06-25 18:34:56 +02:00
MascaraSnake
259700be3c Get rid of customspeed in EV_DoElevator and read speed from args[1] 2021-06-25 11:11:16 +02:00
MascaraSnake
7025f12d95 -Pass tag as argument to EV_ functions
-Get rid of junk linedefs for specialized EV_ calls
-Store tag in args[0]
2021-06-25 10:12:16 +02:00
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