sphere
ac7f983c8a
Merge branch 'exclusivescrollfix' into 'next'
...
Fix 'exclusive' flag on plane scrollers being inverted
Closes #885
See merge request STJr/SRB2!1813
2022-09-28 21:03:56 +00:00
spherallic
5f62af05f1
Fix 'exclusive' flag on plane scrollers being inverted
2022-09-18 11:21:00 +02:00
spherallic
cd85240ec3
Add toggle for action 439 to use backside textures
2022-09-17 11:40:44 +02:00
spherallic
872a2001c8
Add new linedef executor trigger that checks gravity
2022-09-17 02:14:25 +02:00
spherallic
b7dd3ac4bf
Restore CR_FAN application for fan sectors
2022-09-16 22:56:26 +02:00
spherallic
0ee81a1cc3
Support gravity override flag in UDMF
2022-09-11 19:46:57 +02:00
spherallic
1f73c9cf99
Add flag to per-sector gravity for overriding MF2_OBJECTFLIP
2022-09-11 16:15:50 +02:00
spherallic
f0adc71f9b
Add flag to invert current gravity to gravity flip executor
2022-09-08 16:56:35 +02:00
MascaraSnake
ec119eac2f
Merge branch 'next' into udmf-fof-flags
2022-07-31 13:27:03 +02:00
MascaraSnake
8d4baace53
Add Lua backwards compatibility for FOF flags
2022-07-31 12:04:42 +02:00
Eidolon
69c5da2720
Merge branch 'next' into uncappedrevengeance
2022-07-15 00:14:27 -05:00
Eidolon
6829e4ae62
Merge branch 'sp-secfset-update-triggertag' into 'next'
...
Update triggertag on sector tag fset
Closes #865
See merge request STJr/SRB2!1789
2022-05-31 21:15:56 +00:00
MascaraSnake
af7c0f4d6c
Allow linedef types 409/410 to change the trigger tag
2022-05-29 12:24:14 +02:00
Eidolon
f94c25c05c
Change UDMF wall scroll scale to SCROLL_SHIFT
...
UDMF special 502 now must scale arg 2 and 3 in the same scale
space as line length scrolling in binary format. This
is to ensure compatibility with the binary format.
Fixes STJr/SRB2#862
Co-Authored-By: MascaraSnake <jonassauer27@gmail.com>
2022-05-29 02:02:20 -05:00
Eidolon
805941a98f
Merge public next into uncappedrevengeance
...
This is to capture the UDMF merges and make the later code review
easier.
2022-05-03 14:45:14 -05:00
Sally Coolatta
dbd5ddf95d
Add interpolation to more moving plane types
...
Adds interpolation to the following:
- Crumbling platforms
- Mario blocks
- Floatbob platforms (this one works really strangely due to two thinkers, maybe double-check this one?)
2022-04-26 20:56:34 -05:00
Eidolon
9f845622cd
Revert "P_InitAngle, to fix angle interpolation on spawning objects"
...
This reverts commit a80c98bd164a2748cbbfad9027b34601185d93f5.
2022-04-26 20:56:34 -05:00
Eidolon
5790168194
Convert P_TeleportMove use to origin funcs
2022-04-26 20:56:34 -05:00
Sally Coolatta
e4930535f3
P_InitAngle, to fix angle interpolation on spawning objects
2022-04-26 20:56:31 -05:00
Eidolon
330b34ee6b
Add SideScroll interpolator
2022-04-26 20:56:30 -05:00
Eidolon
ba110852a7
Add SectorScroll interpolator
2022-04-26 20:56:30 -05:00
Eidolon
9c8d0a3b6f
Add sector plane level interpolations
2022-04-26 20:56:30 -05:00
MascaraSnake
5fbe5189ce
Merge branch 'udmf-sector-fields' into udmf-full
2022-04-20 21:01:52 +02:00
MascaraSnake
faa7d89e3e
Merge branch 'udmf-more-linedef-types' into udmf-sector-fields
2022-04-20 21:01:16 +02:00
MascaraSnake
5660d896e6
Merge branch 'udmf-thing-types' into udmf-more-linedef-types
2022-04-20 21:00:44 +02:00
MascaraSnake
54640a8664
Merge branch 'udmf-executor-triggers' into udmf-thing-types
...
# Conflicts:
# extras/conf/udb/Includes/SRB222_things.cfg
2022-04-20 20:59:55 +02:00
MascaraSnake
465327288c
Fix int type error
2022-04-20 20:55:13 +02:00
MascaraSnake
39b7fb9ff8
Merge commit 'd624ee25' into udmf-thing-types
...
# Conflicts:
# src/p_mobj.c
# src/p_spec.c
2022-04-20 20:41:46 +02:00
MascaraSnake
36bf8b1a77
Merge branch 'udmf-linedef-executors' into udmf-executor-triggers
2022-04-19 22:33:53 +02:00
MascaraSnake
863b1e125a
Merge branch 'udmf-lighting' into udmf-linedef-executors
...
# Conflicts:
# src/p_spec.c
2022-04-19 22:31:57 +02:00
MascaraSnake
2e56c3de35
Merge branch 'udmf-polyobjects' into udmf-lighting
2022-04-19 22:18:30 +02:00
MascaraSnake
f672b1b940
Merge branch 'udmf-scrollers' into udmf-polyobjects
...
# Conflicts:
# src/p_spec.c
2022-04-19 22:17:28 +02:00
MascaraSnake
f164809618
Merge branch 'udmf-plane-linedefs' into udmf-scrollers
2022-04-19 22:06:32 +02:00
MascaraSnake
36692483df
Merge branch 'udmf-fofs-mkii' into udmf-plane-linedefs
...
# Conflicts:
# src/p_inter.c
2022-04-19 22:04:04 +02:00
MascaraSnake
0b4bbacec0
Merge branch 'next' into udmf-fofs-mkii
2022-04-19 21:59:31 +02:00
sphere
55854410ac
Merge branch 'line-angle' into 'next'
...
Add angle field to linedef_t
See merge request STJr/SRB2!1602
2022-03-22 09:09:40 +00:00
MascaraSnake
a78e4e553c
Merge branch 'next' into udmf-fofs-mkii
2022-03-18 07:29:02 +01:00
spherallic
14295ac7de
2022
2022-03-03 20:24:46 +01:00
James R
6325185091
Add P_SetPower; remove mobj hack from line 434
2022-02-01 03:52:31 -08:00
MascaraSnake
13b8d1cf7e
Merge branch 'udmf-more-linedef-types' into udmf-sector-fields
2022-01-14 21:09:11 +01:00
MascaraSnake
7fd1c0512a
Merge branch 'udmf-thing-types' into udmf-more-linedef-types
...
# Conflicts:
# src/p_setup.c
2022-01-14 21:06:45 +01:00
MascaraSnake
0833f0bd4f
Merge branch 'udmf-executor-triggers' into udmf-thing-types
...
# Conflicts:
# src/p_setup.c
# src/p_spec.h
2022-01-14 21:01:39 +01:00
MascaraSnake
0d9860c368
Merge branch 'udmf-linedef-executors' into udmf-executor-triggers
2022-01-14 20:42:59 +01:00
MascaraSnake
4b8f5bd7f3
Merge branch 'udmf-lighting' into udmf-linedef-executors
...
# Conflicts:
# extras/conf/udb/Includes/SRB222_misc.cfg
# src/doomdata.h
# src/r_defs.h
2022-01-14 20:30:29 +01:00
MascaraSnake
79cf2f53e8
Merge branch 'udmf-polyobjects' into udmf-lighting
2022-01-14 20:24:51 +01:00
MascaraSnake
7d2a188c31
Merge branch 'udmf-scrollers' into udmf-polyobjects
2022-01-14 20:24:13 +01:00
MascaraSnake
940d076190
Merge branch 'udmf-plane-linedefs' into udmf-scrollers
...
# Conflicts:
# extras/conf/udb/Includes/SRB222_misc.cfg
# src/p_spec.h
2022-01-14 20:21:48 +01:00
MascaraSnake
5d343f9c13
Merge branch 'udmf-fofs-mkii' into udmf-plane-linedefs
...
# Conflicts:
# extras/conf/udb/Includes/SRB222_misc.cfg
# src/p_spec.h
2022-01-14 20:17:18 +01:00
MascaraSnake
323cfaace9
Add blendmode support to FOFs
2022-01-14 19:40:45 +01:00
MascaraSnake
6bb6dc88ca
Merge branch 'next' into udmf-fofs-mkii
...
# Conflicts:
# src/hardware/hw_main.c
# src/lua_maplib.c
# src/p_spec.c
# src/p_user.c
2022-01-14 07:24:05 +01:00
MascaraSnake
37bb9d9c11
Fix oversight with rising FOFs
2022-01-13 23:11:10 +01:00
MascaraSnake
576ded6537
Fix incorrectly applied FOF blendmodes
2022-01-10 20:59:57 +01:00
MascaraSnake
868b2577ad
Merge branch 'udmf-sector-fields' into udmf-full
...
# Conflicts:
# src/hardware/hw_main.c
# src/p_setup.c
# src/p_spec.c
2022-01-09 13:58:27 +01:00
MascaraSnake
020b738aa9
Merge branch 'udmf-more-linedef-types' into udmf-sector-fields
2022-01-09 13:52:59 +01:00
MascaraSnake
e7a281d994
Merge branch 'udmf-thing-types' into udmf-more-linedef-types
2022-01-09 13:52:26 +01:00
MascaraSnake
e19ba99f57
Merge branch 'udmf-executor-triggers' into udmf-thing-types
2022-01-09 13:51:50 +01:00
MascaraSnake
b6a5ff98f0
Merge branch 'udmf-sector-fields' into udmf-full
2022-01-07 12:46:47 +01:00
MascaraSnake
fcb69b9c2f
Rename more linedef flags
2022-01-05 19:43:40 +01:00
MascaraSnake
577ae68d6d
Make sector friction a floating-point field
2022-01-04 21:25:34 +01:00
MascaraSnake
afde568856
Add blendmode support to FOFs
2022-01-04 19:33:17 +01:00
MascaraSnake
913731b4bc
Merge branch 'blentran-update' into udmf-full
...
# Conflicts:
# src/lua_maplib.c
# src/p_setup.c
# src/p_spec.c
2022-01-02 23:19:47 +01:00
MascaraSnake
8e4cbf8b76
Disable ML_EFFECT5 on linedef executor triggers for UDMF maps (what a pointless feature)
2021-12-31 15:33:47 +01:00
MascaraSnake
e4d7b3df6c
Minor cleanup in P_SpawnSpecials
2021-12-31 14:17:17 +01:00
MascaraSnake
0d2d7a2803
Merge branch 'udmf-more-linedef-types' into udmf-sector-fields
...
# Conflicts:
# src/p_spec.c
2021-12-31 14:14:23 +01:00
MascaraSnake
5873ecfa02
Merge branch 'udmf-thing-types' into udmf-more-linedef-types
2021-12-31 14:12:13 +01:00
MascaraSnake
98157daa1c
Merge branch 'udmf-executor-triggers' into udmf-thing-types
2021-12-31 14:11:50 +01:00
MascaraSnake
63978b76df
Merge branch 'udmf-linedef-executors' into udmf-executor-triggers
2021-12-31 14:11:18 +01:00
MascaraSnake
b35da98a3c
Merge branch 'udmf-lighting' into udmf-linedef-executors
2021-12-31 14:10:50 +01:00
MascaraSnake
ee728126df
Fix oversight with linedef type 604
2021-12-31 14:09:38 +01:00
MascaraSnake
9b780f417e
Fix a conversion oversight with linedef type 8
2021-12-31 14:06:06 +01:00
MascaraSnake
eef7763d68
Set SSF_WINDCURRENT and SSF_CONVEYOR automatically if there's a pusher/conveyor
2021-12-31 13:58:41 +01:00
MascaraSnake
2b4d32b372
Turn solid lava into a damagetype
2021-12-31 12:15:01 +01:00
MascaraSnake
208395214a
Implement sector fields for linedef executor triggering
2021-12-31 11:39:34 +01:00
MascaraSnake
b3be8d1f44
Implement sector damagetype field
2021-12-31 08:53:00 +01:00
MascaraSnake
417809f78e
Fix typo in P_MobjTouchingSectorSpecial
2021-12-31 00:05:47 +01:00
MascaraSnake
feaa4f1273
Replace most sector specials with sector special flags
2021-12-31 00:03:24 +01:00
MascaraSnake
e1393954c7
Make deprecated sector types inaccessible in UDMF
2021-12-30 21:27:09 +01:00
MascaraSnake
570a6ab395
Turn "intangible to camera" sector special into a sector flag
2021-12-30 20:37:57 +01:00
MascaraSnake
7b830fbddf
Add "change sector's gravity" linedef executor in UDMF to replace linedef type 1
2021-12-30 19:28:01 +01:00
MascaraSnake
b3863c57be
Replace verticalflip in sector_t with a sector flag that's accessible via Lua and UDMF
2021-12-30 18:50:02 +01:00
MascaraSnake
86e2fefcac
Add sector gravity field for UDMF
2021-12-30 18:19:42 +01:00
MascaraSnake
e3d41e0bda
Adapt linedef type 540 to UDMF
2021-12-30 15:32:28 +01:00
MascaraSnake
2a1f96aa3c
Adapt linedef type 8 to UDMF
2021-12-30 14:26:51 +01:00
MascaraSnake
2fd6eafbcf
Expose sector flags to Lua and UDMF
2021-12-30 14:16:00 +01:00
MascaraSnake
9af28321a5
Fix unadapted flag for linedef type 426
2021-12-29 23:12:46 +01:00
MascaraSnake
69797377c4
Adapt some parameter linedef types to UDMF
2021-12-29 23:03:37 +01:00
MascaraSnake
0b3180cdfa
Adapt linedef type 64 to UDMF
2021-12-29 21:03:47 +01:00
MascaraSnake
49c1645b5f
Adapt linedef type 63 to UDMF
2021-12-29 11:03:00 +01:00
MascaraSnake
63548fe235
Merge branch 'udmf-thing-types' into udmf-more-linedef-types
2021-12-29 10:59:43 +01:00
MascaraSnake
3bac97ee65
Clean up P_SpawnSpecials a bit
2021-12-29 10:59:26 +01:00
MascaraSnake
234e8f5f8f
Disable camera scanner effect in UDMF
2021-12-29 10:55:39 +01:00
MascaraSnake
c76d0e3326
Implement linedef executor for changing linedef args
2021-12-29 10:42:20 +01:00
MascaraSnake
cbf32c6615
Adapt some miscellaneous linedef types to UDMF
2021-12-29 08:12:28 +01:00
MascaraSnake
e76d332678
Disable the old hacky way of doing egg capsules in UDMF maps
2021-12-28 23:51:08 +01:00
MascaraSnake
ebf692f143
Adapt push/pull point to UDMF
2021-12-16 07:00:30 +01:00
MascaraSnake
21f8baea4a
Make trigger conditions for "all players" triggers consistent
2021-12-09 21:36:46 +01:00
MascaraSnake
a35a3b3edc
Sector specials: Give up on trying to find polyobjects in touched sectors
2021-12-09 21:32:34 +01:00
MascaraSnake
cc38cd0071
Remove outdated console warning that never happens anyway
2021-12-09 21:00:22 +01:00
MascaraSnake
dc4dd75810
Add NiGHTS mare trigger linedef type and deprecate the NiGHTS mare sector type
2021-12-09 20:57:44 +01:00
MascaraSnake
18e8ebf394
Add emerald check trigger linedef types and deprecate the emerald check sector type
2021-12-09 20:37:39 +01:00
