stjr/ZoneBuilder
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/ZoneBuilder.git synced 2025-04-22 01:10:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

config fixes

Browse source
This commit is contained in:
spherallic 2023-01-04 17:16:25 +01:00
parent 187653bfa9
commit bf9c3c8abe
2 changed files with 2 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Build/Configurations/Includes/Hexen_linedefs.cfg
View file

@ -1,5 +1,3 @@
<<<<<<< HEAD
misc
{
@ -4378,6 +4376,4 @@ sector
title = "Sound Number";
}
}
}
>>>>>>> dddb1bbf (Added, Game configurations: added "targetclasses" argument property. Can be used with argument type 14 (Thing Tag). When set, only things of given classes will be shown in the argument dropdown list in Edit Things window.)
}

5
Build/Configurations/Includes/ZDoom_linedefs.cfg
View file

@ -1,5 +1,3 @@
<<<<<<< HEAD
// NOTE: This config contains four structures for different linedefs systems: Doom, Hexen and UDMF.
// The ZDoom structure is common to Hexen and UDMF and contains the bulk of the definitions.
// The Hexen and UDMF structures contain only the little tweaks needed for these formats.
@ -8699,5 +8697,4 @@ udmf
{
121 = NULL;
}
}
>>>>>>> dddb1bbf (Added, Game configurations: added "targetclasses" argument property. Can be used with argument type 14 (Thing Tag). When set, only things of given classes will be shown in the argument dropdown list in Edit Things window.)
}