Commit graph

1090 commits

Author SHA1 Message Date
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
0b8204491d Merge branch 'udmf-polyobjects' into udmf-lighting 2022-01-09 13:50:14 +01:00
MascaraSnake
904b434c65 Merge branch 'udmf-scrollers' into udmf-polyobjects 2022-01-09 13:49:46 +01:00
MascaraSnake
0c6e2c70c7 Merge branch 'udmf-plane-linedefs' into udmf-scrollers 2022-01-09 13:49:14 +01:00
MascaraSnake
5e7547b822 Merge branch 'udmf-fofs-mkii' into udmf-plane-linedefs 2022-01-09 13:48:40 +01:00
MascaraSnake
0a2294118e Merge branch 'udmf-scrollers' into udmf-full 2022-01-09 12:53:35 +01:00
MascaraSnake
ce29d05be8 Fix typo in wall scroller conversion 2022-01-09 12:53:12 +01:00
MascaraSnake
b3ca6845c1 P_WriteTextmap: Don't bother with equation slopes because binary maps can't have them anyway 2022-01-09 12:38:49 +01:00
MascaraSnake
7276c6bef5 P_WriteTextmap: Correctly write linedef executor delays 2022-01-09 12:37:46 +01:00
MascaraSnake
1fbfc9bea9 P_WriteTextmap: Convert custom gravity and custom exit 2022-01-09 11:44:53 +01:00
MascaraSnake
5f6014223d Don't convert global colormaps 2022-01-09 10:41:50 +01:00
MascaraSnake
c1f03e7720 P_WriteTextmap: Convert colormaps 2022-01-09 10:22:25 +01:00
MascaraSnake
8615e86a0b P_WriteTextmap: Don't try to write invalid textures 2022-01-09 09:27:39 +01:00
MascaraSnake
90cd009b23 Remove writethings because it no longer works properly with the binary-to-UDMF conversion 2022-01-08 16:58:55 +01:00
MascaraSnake
1269fe6c0e Implement faster textmap parser 2022-01-08 13:17:15 +01:00
MascaraSnake
b05bcc4657 P_WriteTextmap: Correct flat offsets 2022-01-07 15:44:56 +01:00
MascaraSnake
c912222df6 Merge branch 'znodes-offset-fix' into udmf-full 2022-01-07 14:44:42 +01:00
MascaraSnake
56b00fac54 P_WriteTextmap: Rearrange properties and remove some defaults 2022-01-07 13:39:25 +01:00
MascaraSnake
95ce2aca98 P_WriteTextmap: Update friction to float 2022-01-07 12:59:29 +01:00
MascaraSnake
b6a5ff98f0 Merge branch 'udmf-sector-fields' into udmf-full 2022-01-07 12:46:47 +01:00
MascaraSnake
8b5f6cca37 Add command line parameter for saving the current map in TEXTMAP format 2022-01-07 12:45:40 +01:00
MascaraSnake
1de5b77710 Fix typo 2022-01-07 10:25:32 +01:00
MascaraSnake
659410dde1 Use Slope Skew flag instead of Upper Unpegged for FOF skewing 2022-01-05 23:47:05 +01:00
MascaraSnake
2bef8da42f Remove access to unused effect6 flag in UDMF 2022-01-05 18:42:53 +01:00
MascaraSnake
5f97047b96 Rename linedef flags 2022-01-05 18:40:02 +01:00
MascaraSnake
55559a5f98 Split P_ConvertBinaryMap into multiple functions 2022-01-05 18:15:04 +01:00
MascaraSnake
06b7d7ceb8 Make only ML_EFFECT3 affect midtexture pegging in UDMF 2022-01-05 18:05:47 +01:00
MascaraSnake
549569e75b Fix offset calculation for segs that represent linedef backsides 2022-01-05 10:08:49 +01:00
MascaraSnake
d25bc75a92 Remove redundant UDMF check in P_LoadSidedefs 2022-01-05 09:22:13 +01:00
MascaraSnake
577ae68d6d Make sector friction a floating-point field 2022-01-04 21:25:34 +01:00
MascaraSnake
88fae019a2 Fix typos in binary-to-UDMF conversion 2022-01-04 19:59:51 +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
7609f300ba Fix typo in laser FOF conversion 2022-01-04 19:45:36 +01:00
MascaraSnake
ca1d844278 Merge branch 'blentran-update' into udmf-full 2022-01-04 19:36:20 +01:00
MascaraSnake
afde568856 Add blendmode support to FOFs 2022-01-04 19:33:17 +01:00
MascaraSnake
8c17bb57e6 Turn the fog wall linedef type into a blendmode 2022-01-04 14:26:03 +01:00
MascaraSnake
3b08a15860 Expose blendmodes to UDMF 2022-01-04 14:26:03 +01:00
sphere
f455bf347b blentran part 3: Wall & plane blendmodes. 2022-01-04 14:26:03 +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
570a6ab395 Turn "intangible to camera" sector special into a sector flag 2021-12-30 20:37:57 +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
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
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
73ba288e5d P_ProcessLinedefsAfterSidedefs: Skip text copying in UDMF 2021-12-29 23:45:43 +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
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
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
5d1284bc81 Fix unitialized array in P_ConvertBinaryMap 2021-12-28 11:42:53 +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
3661fd5079 Adapt boss fly point to UDMF 2021-12-26 20:09:38 +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
4b58b45b5f Adapt emblem tags to UDMF 2021-12-21 17:58:37 +01:00