diff --git a/Build/Configurations/Configs for other games/GZDoom_Action2Hexen.cfg b/Build/Configurations/Configs for other games/GZDoom_Action2Hexen.cfg index a2a49ff3..248aa08c 100644 --- a/Build/Configurations/Configs for other games/GZDoom_Action2Hexen.cfg +++ b/Build/Configurations/Configs for other games/GZDoom_Action2Hexen.cfg @@ -51,6 +51,7 @@ thingtypes include("Includes\\ZDoom_things.cfg", "zdoom"); // Additional actors from the engine include("Includes\\GZDoom_things.cfg", "gzdoom"); + include("Includes\\GZDoom_things.cfg", "gzdoom_lights"); } // ENUMERATIONS diff --git a/Build/Configurations/Configs for other games/GZDoom_Action2UDMF.cfg b/Build/Configurations/Configs for other games/GZDoom_Action2UDMF.cfg index eb48fa4f..79d1b9c5 100644 --- a/Build/Configurations/Configs for other games/GZDoom_Action2UDMF.cfg +++ b/Build/Configurations/Configs for other games/GZDoom_Action2UDMF.cfg @@ -51,6 +51,7 @@ thingtypes include("Includes\\ZDoom_things.cfg", "zdoom"); // Additional actors from the engine include("Includes\\GZDoom_things.cfg", "gzdoom"); + include("Includes\\GZDoom_things.cfg", "gzdoom_lights"); } // ENUMERATIONS diff --git a/Build/Configurations/Configs for other games/GZDoom_Chex3Hexen.cfg b/Build/Configurations/Configs for other games/GZDoom_Chex3Hexen.cfg index 1dd4aef6..a8a5fe5d 100644 --- a/Build/Configurations/Configs for other games/GZDoom_Chex3Hexen.cfg +++ b/Build/Configurations/Configs for other games/GZDoom_Chex3Hexen.cfg @@ -52,6 +52,7 @@ thingtypes include("Includes\\ZDoom_things.cfg", "zdoom"); // Additional actors from the engine include("Includes\\GZDoom_things.cfg", "gzdoom"); + include("Includes\\GZDoom_things.cfg", "gzdoom_lights"); } // ENUMERATIONS diff --git a/Build/Configurations/Configs for other games/GZDoom_Chex3UDMF.cfg b/Build/Configurations/Configs for other games/GZDoom_Chex3UDMF.cfg index bd4de795..1742944a 100644 --- a/Build/Configurations/Configs for other games/GZDoom_Chex3UDMF.cfg +++ b/Build/Configurations/Configs for other games/GZDoom_Chex3UDMF.cfg @@ -52,6 +52,7 @@ thingtypes include("Includes\\ZDoom_things.cfg", "zdoom"); // Additional actors from the engine include("Includes\\GZDoom_things.cfg", "gzdoom"); + include("Includes\\GZDoom_things.cfg", "gzdoom_lights"); } // ENUMERATIONS diff --git a/Build/Configurations/Configs for other games/GZDoom_ChexDoom.cfg b/Build/Configurations/Configs for other games/GZDoom_ChexDoom.cfg index 55adca0c..5ccb8238 100644 --- a/Build/Configurations/Configs for other games/GZDoom_ChexDoom.cfg +++ b/Build/Configurations/Configs for other games/GZDoom_ChexDoom.cfg @@ -51,6 +51,7 @@ thingtypes include("Includes\\ZDoom_things.cfg", "zdoom"); // Additional actors from the engine include("Includes\\GZDoom_things.cfg", "gzdoom"); + include("Includes\\GZDoom_things.cfg", "gzdoom_lights"); } // ENUMERATIONS diff --git a/Build/Configurations/Configs for other games/GZDoom_ChexHexen.cfg b/Build/Configurations/Configs for other games/GZDoom_ChexHexen.cfg index 57930495..29df0139 100644 --- a/Build/Configurations/Configs for other games/GZDoom_ChexHexen.cfg +++ b/Build/Configurations/Configs for other games/GZDoom_ChexHexen.cfg @@ -51,6 +51,7 @@ thingtypes include("Includes\\ZDoom_things.cfg", "zdoom"); // Additional actors from the engine include("Includes\\GZDoom_things.cfg", "gzdoom"); + include("Includes\\GZDoom_things.cfg", "gzdoom_lights"); } // ENUMERATIONS diff --git a/Build/Configurations/Configs for other games/GZDoom_ChexUDMF.cfg b/Build/Configurations/Configs for other games/GZDoom_ChexUDMF.cfg index 35383d32..c76b5404 100644 --- a/Build/Configurations/Configs for other games/GZDoom_ChexUDMF.cfg +++ b/Build/Configurations/Configs for other games/GZDoom_ChexUDMF.cfg @@ -51,6 +51,7 @@ thingtypes include("Includes\\ZDoom_things.cfg", "zdoom"); // Additional actors from the engine include("Includes\\GZDoom_things.cfg", "gzdoom"); + include("Includes\\GZDoom_things.cfg", "gzdoom_lights"); } // ENUMERATIONS diff --git a/Build/Configurations/Configs for other games/GZDoom_DoomDoom.cfg b/Build/Configurations/Configs for other games/GZDoom_DoomDoom.cfg index 7583462a..572d5378 100644 --- a/Build/Configurations/Configs for other games/GZDoom_DoomDoom.cfg +++ b/Build/Configurations/Configs for other games/GZDoom_DoomDoom.cfg @@ -52,6 +52,7 @@ thingtypes include("Includes\\ZDoom_things.cfg", "zdoom"); // Additional actors from the engine include("Includes\\GZDoom_things.cfg", "gzdoom"); + include("Includes\\GZDoom_things.cfg", "gzdoom_lights"); } // ENUMERATIONS diff --git a/Build/Configurations/Configs for other games/GZDoom_HarmonyDoom.cfg b/Build/Configurations/Configs for other games/GZDoom_HarmonyDoom.cfg index cc70b728..146cf69e 100644 --- a/Build/Configurations/Configs for other games/GZDoom_HarmonyDoom.cfg +++ b/Build/Configurations/Configs for other games/GZDoom_HarmonyDoom.cfg @@ -51,6 +51,7 @@ thingtypes include("Includes\\ZDoom_things.cfg", "zdoom"); // Additional actors from the engine include("Includes\\GZDoom_things.cfg", "gzdoom"); + include("Includes\\GZDoom_things.cfg", "gzdoom_lights"); } // ENUMERATIONS diff --git a/Build/Configurations/Configs for other games/GZDoom_HarmonyHexen.cfg b/Build/Configurations/Configs for other games/GZDoom_HarmonyHexen.cfg index 8aa528af..7db2f8a0 100644 --- a/Build/Configurations/Configs for other games/GZDoom_HarmonyHexen.cfg +++ b/Build/Configurations/Configs for other games/GZDoom_HarmonyHexen.cfg @@ -51,6 +51,7 @@ thingtypes include("Includes\\ZDoom_things.cfg", "zdoom"); // Additional actors from the engine include("Includes\\GZDoom_things.cfg", "gzdoom"); + include("Includes\\GZDoom_things.cfg", "gzdoom_lights"); } // ENUMERATIONS diff --git a/Build/Configurations/Configs for other games/GZDoom_HarmonyUDMF.cfg b/Build/Configurations/Configs for other games/GZDoom_HarmonyUDMF.cfg index f9e532cb..ad2715e2 100644 --- a/Build/Configurations/Configs for other games/GZDoom_HarmonyUDMF.cfg +++ b/Build/Configurations/Configs for other games/GZDoom_HarmonyUDMF.cfg @@ -51,6 +51,7 @@ thingtypes include("Includes\\ZDoom_things.cfg", "zdoom"); // Additional actors from the engine include("Includes\\GZDoom_things.cfg", "gzdoom"); + include("Includes\\GZDoom_things.cfg", "gzdoom_lights"); } // ENUMERATIONS diff --git a/Build/Configurations/Configs for other games/GZDoom_HereticDoom.cfg b/Build/Configurations/Configs for other games/GZDoom_HereticDoom.cfg index ecf876b0..f07ecda2 100644 --- a/Build/Configurations/Configs for other games/GZDoom_HereticDoom.cfg +++ b/Build/Configurations/Configs for other games/GZDoom_HereticDoom.cfg @@ -51,6 +51,7 @@ thingtypes include("Includes\\ZDoom_things.cfg", "zdoom"); // Additional actors from the engine include("Includes\\GZDoom_things.cfg", "gzdoom"); + include("Includes\\GZDoom_things.cfg", "gzdoom_lights"); } // ENUMERATIONS diff --git a/Build/Configurations/Configs for other games/GZDoom_HereticHexen.cfg b/Build/Configurations/Configs for other games/GZDoom_HereticHexen.cfg index 0064da93..50a29a65 100644 --- a/Build/Configurations/Configs for other games/GZDoom_HereticHexen.cfg +++ b/Build/Configurations/Configs for other games/GZDoom_HereticHexen.cfg @@ -51,6 +51,7 @@ thingtypes include("Includes\\ZDoom_things.cfg", "zdoom"); // Additional actors from the engine include("Includes\\GZDoom_things.cfg", "gzdoom"); + include("Includes\\GZDoom_things.cfg", "gzdoom_lights"); } // ENUMERATIONS diff --git a/Build/Configurations/Configs for other games/GZDoom_HereticUDMF.cfg b/Build/Configurations/Configs for other games/GZDoom_HereticUDMF.cfg index 553e4a11..1cf1b881 100644 --- a/Build/Configurations/Configs for other games/GZDoom_HereticUDMF.cfg +++ b/Build/Configurations/Configs for other games/GZDoom_HereticUDMF.cfg @@ -51,6 +51,7 @@ thingtypes include("Includes\\ZDoom_things.cfg", "zdoom"); // Additional actors from the engine include("Includes\\GZDoom_things.cfg", "gzdoom"); + include("Includes\\GZDoom_things.cfg", "gzdoom_lights"); } // ENUMERATIONS diff --git a/Build/Configurations/Configs for other games/GZDoom_HexenHexen.cfg b/Build/Configurations/Configs for other games/GZDoom_HexenHexen.cfg index dffd384d..4cf151a2 100644 --- a/Build/Configurations/Configs for other games/GZDoom_HexenHexen.cfg +++ b/Build/Configurations/Configs for other games/GZDoom_HexenHexen.cfg @@ -51,6 +51,7 @@ thingtypes include("Includes\\ZDoom_things.cfg", "zdoom"); // Additional actors from the engine include("Includes\\GZDoom_things.cfg", "gzdoom"); + include("Includes\\GZDoom_things.cfg", "gzdoom_lights"); } // ENUMERATIONS diff --git a/Build/Configurations/Configs for other games/GZDoom_HexenUDMF.cfg b/Build/Configurations/Configs for other games/GZDoom_HexenUDMF.cfg index d2f65f52..5c25006a 100644 --- a/Build/Configurations/Configs for other games/GZDoom_HexenUDMF.cfg +++ b/Build/Configurations/Configs for other games/GZDoom_HexenUDMF.cfg @@ -51,6 +51,7 @@ thingtypes include("Includes\\ZDoom_things.cfg", "zdoom"); // Additional actors from the engine include("Includes\\GZDoom_things.cfg", "gzdoom"); + include("Includes\\GZDoom_things.cfg", "gzdoom_lights"); } // ENUMERATIONS diff --git a/Build/Configurations/Configs for other games/GZDoom_StrifeDoom.cfg b/Build/Configurations/Configs for other games/GZDoom_StrifeDoom.cfg index 2b8d4f26..7f35a10e 100644 --- a/Build/Configurations/Configs for other games/GZDoom_StrifeDoom.cfg +++ b/Build/Configurations/Configs for other games/GZDoom_StrifeDoom.cfg @@ -51,6 +51,7 @@ thingtypes include("Includes\\ZDoom_things.cfg", "zdoom"); // Additional actors from the engine include("Includes\\GZDoom_things.cfg", "gzdoom"); + include("Includes\\GZDoom_things.cfg", "gzdoom_lights"); } // ENUMERATIONS diff --git a/Build/Configurations/Configs for other games/GZDoom_StrifeHexen.cfg b/Build/Configurations/Configs for other games/GZDoom_StrifeHexen.cfg index feabd8f4..00d87812 100644 --- a/Build/Configurations/Configs for other games/GZDoom_StrifeHexen.cfg +++ b/Build/Configurations/Configs for other games/GZDoom_StrifeHexen.cfg @@ -51,6 +51,7 @@ thingtypes include("Includes\\ZDoom_things.cfg", "zdoom"); // Additional actors from the engine include("Includes\\GZDoom_things.cfg", "gzdoom"); + include("Includes\\GZDoom_things.cfg", "gzdoom_lights"); } // ENUMERATIONS diff --git a/Build/Configurations/Configs for other games/GZDoom_StrifeUDMF.cfg b/Build/Configurations/Configs for other games/GZDoom_StrifeUDMF.cfg index 13cd194e..b2724051 100644 --- a/Build/Configurations/Configs for other games/GZDoom_StrifeUDMF.cfg +++ b/Build/Configurations/Configs for other games/GZDoom_StrifeUDMF.cfg @@ -51,6 +51,7 @@ thingtypes include("Includes\\ZDoom_things.cfg", "zdoom"); // Additional actors from the engine include("Includes\\GZDoom_things.cfg", "gzdoom"); + include("Includes\\GZDoom_things.cfg", "gzdoom_lights"); } // ENUMERATIONS diff --git a/Build/Configurations/GZDoom_DoomHexen.cfg b/Build/Configurations/GZDoom_DoomHexen.cfg index d3617808..b06d66d6 100644 --- a/Build/Configurations/GZDoom_DoomHexen.cfg +++ b/Build/Configurations/GZDoom_DoomHexen.cfg @@ -52,6 +52,7 @@ thingtypes include("Includes\\ZDoom_things.cfg", "zdoom"); // Additional actors from the engine include("Includes\\GZDoom_things.cfg", "gzdoom"); + include("Includes\\GZDoom_things.cfg", "gzdoom_lights"); } // ENUMERATIONS diff --git a/Build/Configurations/GZDoom_DoomUDMF.cfg b/Build/Configurations/GZDoom_DoomUDMF.cfg index 77d4c46e..4a85d9d6 100644 --- a/Build/Configurations/GZDoom_DoomUDMF.cfg +++ b/Build/Configurations/GZDoom_DoomUDMF.cfg @@ -52,6 +52,7 @@ thingtypes include("Includes\\ZDoom_things.cfg", "zdoom"); // Additional actors from the engine include("Includes\\GZDoom_things.cfg", "gzdoom"); + include("Includes\\GZDoom_things.cfg", "gzdoom_lights"); } // ENUMERATIONS diff --git a/Build/Configurations/Includes/GZDoom_things.cfg b/Build/Configurations/Includes/GZDoom_things.cfg index 91e84b4d..8b8fd3db 100644 --- a/Build/Configurations/Includes/GZDoom_things.cfg +++ b/Build/Configurations/Includes/GZDoom_things.cfg @@ -1,4 +1,4 @@ -gzdoom +gzdoom_lights { dynlights { @@ -453,7 +453,11 @@ gzdoom } } } - zdoom +} + +gzdoom +{ + zdoom { blocking = 2; 5004 = "Map Spot (FraggleScript)"; diff --git a/Build/Configurations/Includes/Skulltag_common.cfg b/Build/Configurations/Includes/Skulltag_common.cfg index b8bb2aac..5a9aea19 100644 --- a/Build/Configurations/Includes/Skulltag_common.cfg +++ b/Build/Configurations/Includes/Skulltag_common.cfg @@ -1,7 +1,10 @@ // New things available in all games skulltag { - // Team player starts + //dynamic lights + include("GZDoom_things.cfg", "gzdoom_lights") + + // Team player starts players { color = 10; // Light Green @@ -92,387 +95,6 @@ skulltag } } - - dynlights - { - color = 7; - arrow = 0; - title = "Dynamic Lights"; - sort = 1; - width = 0; - height = 0; - hangs = 0; - blocking = 0; - fixedsize = true; - sprite = "internal:action"; - - 9800 - { - title = "Light"; - arg0 - { - title = "Red"; - } - arg1 - { - title = "Green"; - } - arg2 - { - title = "Blue"; - } - arg3 - { - title = "Intensity"; - } - } - 9801 - { - title = "Light Pulse"; - arg0 - { - title = "Red"; - } - arg1 - { - title = "Green"; - } - arg2 - { - title = "Blue"; - } - arg3 - { - title = "Start intensity"; - } - arg4 - { - title = "End intensity"; - } - } - 9802 - { - title = "Light Flicker"; - arg0 - { - title = "Red"; - } - arg1 - { - title = "Green"; - } - arg2 - { - title = "Blue"; - } - arg3 - { - title = "Primary intensity"; - } - arg4 - { - title = "Secondary intensity"; - } - } - 9803 - { - title = "Light Sector"; - arg0 - { - title = "Red"; - } - arg1 - { - title = "Green"; - } - arg2 - { - title = "Blue"; - } - arg3 - { - title = "Intensity scale"; - } - } - 9804 - { - title = "Light Random"; - arg0 - { - title = "Red"; - } - arg1 - { - title = "Green"; - } - arg2 - { - title = "Blue"; - } - arg3 - { - title = "Minimal intensity"; - } - arg4 - { - title = "Maximal intensity"; - } - } - 9810 - { - title = "Light, Additive"; - arg0 - { - title = "Red"; - } - arg1 - { - title = "Green"; - } - arg2 - { - title = "Blue"; - } - arg3 - { - title = "Intensity"; - } - } - 9811 - { - title = "Light Pulse, Additive"; - arg0 - { - title = "Red"; - } - arg1 - { - title = "Green"; - } - arg2 - { - title = "Blue"; - } - arg3 - { - title = "Start intensity"; - } - arg4 - { - title = "End intensity"; - } - } - 9812 - { - title = "Light Flicker, Additive"; - arg0 - { - title = "Red"; - } - arg1 - { - title = "Green"; - } - arg2 - { - title = "Blue"; - } - arg3 - { - title = "Primary intensity"; - } - arg4 - { - title = "Secondary intensity"; - } - } - 9813 - { - title = "Light Sector, Additive"; - arg0 - { - title = "Red"; - } - arg1 - { - title = "Green"; - } - arg2 - { - title = "Blue"; - } - arg3 - { - title = "Intensity scale"; - } - } - 9814 - { - title = "Light Random, Additive"; - arg0 - { - title = "Red"; - } - arg1 - { - title = "Green"; - } - arg2 - { - title = "Blue"; - } - arg3 - { - title = "Minimal intensity"; - } - arg4 - { - title = "Maximal intensity"; - } - } - 9820 - { - title = "Light, Subtractive"; - arg0 - { - title = "Red"; - } - arg1 - { - title = "Green"; - } - arg2 - { - title = "Blue"; - } - arg3 - { - title = "Radius"; - } - } - 9821 - { - title = "Light Pulse, Subtractive"; - arg0 - { - title = "Red"; - } - arg1 - { - title = "Green"; - } - arg2 - { - title = "Blue"; - } - arg3 - { - title = "Start intensity"; - } - arg4 - { - title = "End intensity"; - } - } - 9822 - { - title = "Light Flicker, Subtractive"; - arg0 - { - title = "Red"; - } - arg1 - { - title = "Green"; - } - arg2 - { - title = "Blue"; - } - arg3 - { - title = "Primary intensity"; - } - arg4 - { - title = "Secondary intensity"; - } - } - 9823 - { - title = "Light Sector, Subtractive"; - arg0 - { - title = "Red"; - } - arg1 - { - title = "Green"; - } - arg2 - { - title = "Blue"; - } - arg3 - { - title = "Intensity scale"; - } - } - 9824 - { - title = "Light Random, Subtractive"; - arg0 - { - title = "Red"; - } - arg1 - { - title = "Green"; - } - arg2 - { - title = "Blue"; - } - arg3 - { - title = "Minimal intensity"; - } - arg4 - { - title = "Maximal intensity"; - } - } - 9825 = "Vavoom Light"; - 1502 - { - title = "Vavoom Light "; - arg0 - { - title = "Radius"; - } - } - 1503 - { - title = "Vavoom Light Color"; - arg0 - { - title = "Radius"; - } - arg1 - { - title = "Red"; - } - arg2 - { - title = "Green"; - } - arg3 - { - title = "Blue"; - } - } - } - obstacles { color = 3; // Cyan diff --git a/Source/Core/Windows/TextureBrowserForm.cs b/Source/Core/Windows/TextureBrowserForm.cs index cffc1141..60696f8c 100644 --- a/Source/Core/Windows/TextureBrowserForm.cs +++ b/Source/Core/Windows/TextureBrowserForm.cs @@ -138,21 +138,14 @@ namespace CodeImp.DoomBuilder.Windows if (selectedset == null && match != null) selectedset = match; - tvTextureSets.ExpandAll();//mxd + if(tvTextureSets.Nodes.Count > 0) + tvTextureSets.Nodes[0].Expand();//mxd tvTextureSets.EndUpdate();//mxd if (selectedset != null) {//mxd tvTextureSets.SelectedNode = selectedset; - //FillImagesList(); } - // Texture to select when list is filled - //selecttextureonfill = selecttexture; - - // Make groups - //usedgroup = browser.AddGroup("Used Textures"); - //availgroup = browser.AddGroup("Available Textures"); - // Keep last position and size lastposition = this.Location; lastsize = this.Size;