mirror of
https://git.do.srb2.org/STJr/UltimateZoneBuilder.git
synced 2025-01-18 22:41:46 +00:00
Dynamic lights had 0 width and height in Skulltag config, so they weren't shown in Visual modes.
Now only the root node of Folder/PK3/PK7 resource is expanded in Textures browser.
This commit is contained in:
parent
59a7f315e9
commit
7d9b846d20
24 changed files with 33 additions and 393 deletions
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
gzdoom
|
||||
gzdoom_lights
|
||||
{
|
||||
dynlights
|
||||
{
|
||||
|
@ -453,6 +453,10 @@ gzdoom
|
|||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
gzdoom
|
||||
{
|
||||
zdoom
|
||||
{
|
||||
blocking = 2;
|
||||
|
|
|
@ -1,6 +1,9 @@
|
|||
// New things available in all games
|
||||
skulltag
|
||||
{
|
||||
//dynamic lights
|
||||
include("GZDoom_things.cfg", "gzdoom_lights")
|
||||
|
||||
// Team player starts
|
||||
players
|
||||
{
|
||||
|
@ -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
|
||||
|
|
|
@ -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;
|
||||
|
|
Loading…
Reference in a new issue