0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-12-29 22:20:42 +00:00
Commit graph

356 commits

Author SHA1 Message Date
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
spherallic
93512ae9f9 Update Zone Builder configuration. 2022-01-12 00:46:24 +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
95bf8ea4bb Merge branch 'udmf-linedef-executors' into udmf-executor-triggers 2022-01-09 13:51:21 +01:00
MascaraSnake
fba986ff1c Merge branch 'udmf-lighting' into udmf-linedef-executors 2022-01-09 13:50:47 +01:00
MascaraSnake
b6a5ff98f0 Merge branch 'udmf-sector-fields' into udmf-full 2022-01-07 12:46:47 +01:00
MascaraSnake
2bef8da42f Remove access to unused effect6 flag in UDMF 2022-01-05 18:42:53 +01:00
MascaraSnake
577ae68d6d Make sector friction a floating-point field 2022-01-04 21:25:34 +01:00
MascaraSnake
8291d433cb Chained spring: Correct flag description in UDB config 2022-01-04 20:05:21 +01:00
MascaraSnake
70a28bad94 Gas jet: Fix typo in UDB config 2022-01-04 20:02:58 +01:00
MascaraSnake
9d67420e5c Egg Slimer: Fix typo in binary-to-UDMF conversion and invert speed-up flag 2022-01-04 19:57:14 +01:00
MascaraSnake
46ad1e4a5c UDB config: Move thing type args from Doom section to UDMF section 2022-01-04 19:54:43 +01:00
MascaraSnake
6cc7cc3276 Fix UDB config typo 2022-01-04 19:50:34 +01:00
MascaraSnake
e0ed58f577 Fix UDB config typo 2022-01-04 19:49:28 +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
2886a277d8 Turn the fog wall linedef type into a blendmode 2021-12-31 15:00:27 +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
e011962156 Make the sector special field inaccessible in UDMF 2021-12-31 11:44:05 +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
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
e3d41e0bda Adapt linedef type 540 to UDMF 2021-12-30 15:32:28 +01:00
MascaraSnake
f30b97ba93 Adapt heat wave effect to UDMF 2021-12-30 14:48:40 +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
ff4b68424f Fix missing section title in UDB config 2021-12-30 08:32:59 +01:00
MascaraSnake
34229030f2 Make implementation of slope copying with linedef type 700 not hacky 2021-12-30 08:10:20 +01:00
MascaraSnake
696d4945a7 Adapt linedef type 14 to UDMF 2021-12-30 07:54:16 +01:00
MascaraSnake
69797377c4 Adapt some parameter linedef types to UDMF 2021-12-29 23:03:37 +01:00
MascaraSnake
208f852c4b Remove bridge thinker linedef type from UDB config 2021-12-29 21:04:55 +01:00
MascaraSnake
0b3180cdfa Adapt linedef type 64 to UDMF 2021-12-29 21:03:47 +01:00
MascaraSnake
29ee8484eb Merge branch 'udmf-thing-types' into udmf-more-linedef-types 2021-12-29 15:53:46 +01:00
MascaraSnake
338f1357a6 Particle generator: Use args[6] instead of angle for tagging 2021-12-29 15:53:20 +01:00
MascaraSnake
228efa5ffc Add "relative" setting to linedef type 799 and adapt it to UDMF 2021-12-29 15:29:59 +01:00
MascaraSnake
49c1645b5f Adapt linedef type 63 to UDMF 2021-12-29 11:03:00 +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
2a868ca60d Adapt Glaregoyles to UDMF 2021-12-28 23:06:48 +01:00
MascaraSnake
a091b7d16d Adapt bosses to UDMF and remove now-unused mapthing flags 2021-12-28 22:52:24 +01:00
MascaraSnake
e71a952d70 Adapt monitors to UDMF 2021-12-28 17:54:26 +01:00
MascaraSnake
79c3197de2 Adapt various thing types for UDMF 2021-12-28 16:38:52 +01:00
MascaraSnake
53931727bd Adapt pushables to UDMF 2021-12-28 14:28:36 +01:00
MascaraSnake
42f823600c Adapt NiGHTS items to UDMF 2021-12-28 14:04:30 +01:00
MascaraSnake
b4a206c063 Adapt remaining enemies to UDMF 2021-12-28 13:14:48 +01:00
MascaraSnake
1cff7a161a Adapt ambient sound effects to UDMF 2021-12-28 09:58:45 +01:00
MascaraSnake
5248271619 Adapt blast linedef executor to UDMF 2021-12-28 08:33:57 +01:00
MascaraSnake
e140bd8252 Adapt balloon colors to UDMF 2021-12-28 08:26:04 +01:00
MascaraSnake
8b69c62111 Adapt more scenery items to UDMF 2021-12-28 08:19:56 +01:00
MascaraSnake
b1d0870511 (Mostly) adapt fan to UDMF 2021-12-28 07:47:10 +01:00
MascaraSnake
90eb7c71a3 Adapt skybox view point to UDMF 2021-12-28 07:29:41 +01:00
MascaraSnake
43a15387d2 Adapt diagonal springs to UDMF 2021-12-27 21:28:42 +01:00
MascaraSnake
fd3fa9a924 Adapt flame-related objects to UDMF 2021-12-27 18:52:46 +01:00
MascaraSnake
720df51b6e Adapt most flame jet settings to UDMF 2021-12-27 17:58:18 +01:00
MascaraSnake
3bab07d036 Adapt flickies to UDMF 2021-12-27 17:36:51 +01:00
MascaraSnake
8db84ffef9 Adapt boss waypoint to UDMF 2021-12-27 15:39:14 +01:00
MascaraSnake
06bbee50bf Adapt boss IDs and trigger tags to UDMF 2021-12-27 15:07:37 +01:00
MascaraSnake
c550de5dfa Adapt spikes to UDMF 2021-12-27 07:32:57 +01:00
MascaraSnake
36217c6468 Finish adapting slope vertices to UDMF 2021-12-26 21:33:20 +01:00
MascaraSnake
baa99150d0 Adapt Fang waypoint to UDMF 2021-12-25 09:58:00 +01:00
MascaraSnake
fe8c1d1331 Adapt Pyre Fly to UDMF 2021-12-21 22:00:42 +01:00
MascaraSnake
5eb2448a40 Adapt Pterabytes to UDMF 2021-12-21 21:57:35 +01:00
MascaraSnake
a5ac10733a Adapt Hive Elemental to UDMF 2021-12-21 21:51:37 +01:00
MascaraSnake
52c319167f (Mostly) adapt the Ideya Drone to UDMF 2021-12-21 21:41:00 +01:00
MascaraSnake
693fa7ba81 Adapt star posts to UDMF 2021-12-21 18:27:19 +01:00
MascaraSnake
af30847a1f Adapt zoom tube waypoint to UDMF 2021-12-21 18:24:58 +01:00
MascaraSnake
cbebdc219d Adapt pop-up turret to UDMF 2021-12-21 17:45:43 +01:00
MascaraSnake
bfcbf5136b Adapt SDURF and Puma to UDMF 2021-12-21 17:28:29 +01:00
MascaraSnake
3205b6d83a Adapt player starts to UDMF 2021-12-21 08:01:51 +01:00
MascaraSnake
72e2c24fdb Adapt some reserved tags to UDMF 2021-12-20 23:28:18 +01:00
MascaraSnake
db1f215327 Implement generic item rows and circles 2021-12-20 21:14:39 +01:00
MascaraSnake
59c6d59c00 Adapt NiGHTS things to UDMF 2021-12-19 21:30:49 +01:00
MascaraSnake
482c24a1fb Adapt NiGHTS track items to UDMF 2021-12-18 10:45:50 +01:00
MascaraSnake
1a1e5faf08 Adapt fan particle generator to UDMF 2021-12-18 10:31:42 +01:00
MascaraSnake
ebf692f143 Adapt push/pull point to UDMF 2021-12-16 07:00:30 +01:00
MascaraSnake
add371a1ce Add UDMF thing types to UDB config 2021-12-14 19:48:05 +01:00
MascaraSnake
c1e22c4bb6 Add two more linedef/thing args because the maces need them 2021-12-14 06:43:06 +01:00
MascaraSnake
ac3dd146c7 Expose blendmodes to UDMF 2021-12-12 07:02:17 +01:00
MascaraSnake
f431b20911 Add new blendmode linedef types to config 2021-12-12 06:54:48 +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
MascaraSnake
22420f92d2 Some trigger lineder cleanup 2021-12-09 20:02:03 +01:00
MascaraSnake
c43d5c7183 Adapt linedef types 334-336 to UDMF 2021-12-09 19:53:14 +01:00
MascaraSnake
adaf599e87 Adapt linedef types 331-333 to UDMF 2021-12-09 19:33:02 +01:00
MascaraSnake
a7f5bcfea7 Adapt linedef type 305-307 to UDMF 2021-12-09 19:17:16 +01:00
MascaraSnake
670e32908e Adapt linedef type 308 to UDMF 2021-12-09 18:56:50 +01:00
MascaraSnake
126cbdd189 Adapt linedef types 321-322 to UDMF 2021-12-09 18:15:27 +01:00