Browse Source

- Removed a dead assets
- Fixed some broken asset references
- Added missing assets
- Add a new GuiControlProfile
- All above changes are leading up to a new toy that will allow a user to preview all loaded assets, similar to the old 3SS asset library. Still working on that, though.

MichPerry-GG 12 years ago
parent
commit
d16878f

+ 0 - 3
modules/Sandbox/1/assets/gui/ToolsIconDown.asset.taml

@@ -1,3 +0,0 @@
-<ImageAsset
-    AssetName="toolsIconDown"
-    ImageFile="toolsIconDown.png" />

+ 13 - 0
modules/Sandbox/1/gui/guiProfiles.cs

@@ -288,6 +288,19 @@ if(!isObject(GuiScrollProfile)) new GuiControlProfile (GuiScrollProfile)
 
 //-----------------------------------------------------------------------------
 
+if(!isObject(GuiTransparentScrollProfile)) new GuiControlProfile (GuiTransparentScrollProfile)
+{
+   opaque = false;
+   fillColor = "255 255 255";
+   border = false;
+   borderThickness = 2;
+   borderColor = "0 0 0";
+   bitmap = "^Sandbox/gui/images/scrollBar.png";
+   hasBitmapArray = true;
+};
+
+//-----------------------------------------------------------------------------
+
 if(!isObject(ConsoleScrollProfile)) new GuiControlProfile( ConsoleScrollProfile : GuiScrollProfile )
 {
     opaque = true;

+ 1 - 1
modules/ToyAssets/1/assets/animations/Ice_Projectile_1Animation.asset.taml

@@ -1,6 +1,6 @@
 <AnimationAsset
     AssetName="Ice_Projectile_1Animation"
-    Image="@asset=ToyAssets:Ice_Projectile_1Sprite"
+    Image="@asset=ToyAssets:Ice_Projectile_1"
     animationFrames="0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15"
     animationTime="1"
     animationCycle="1"

+ 1 - 1
modules/ToyAssets/1/assets/animations/Ice_Projectile_2Animation.asset.taml

@@ -1,6 +1,6 @@
 <AnimationAsset
     AssetName="Ice_Projectile_2Animation"
-    Image="@asset=ToyAssets:Ice_Projectile_2Sprite"
+    Image="@asset=ToyAssets:Ice_Projectile_2"
     animationFrames="0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15"
     animationTime="1"
     animationCycle="1"

+ 1 - 1
modules/ToyAssets/1/assets/animations/Ice_Projectile_3Animation.asset.taml

@@ -1,6 +1,6 @@
 <AnimationAsset
     AssetName="Ice_Projectile_3Animation"
-    Image="@asset=ToyAssets:Ice_Projectile_3Sprite"
+    Image="@asset=ToyAssets:Ice_Projectile_3"
     animationFrames="0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15"
     animationTime="1"
     animationCycle="1"

BIN
modules/ToyAssets/1/assets/images/Ice_Projectile_1.png


+ 8 - 0
modules/ToyAssets/1/assets/images/Ice_Projectile_1Sprite.asset.taml

@@ -0,0 +1,8 @@
+<ImageAsset
+    AssetName="Ice_Projectile_1"
+    imageFile="Ice_Projectile_1.png"
+    cellCountX="4"
+    cellCountY="4"
+    cellWidth="64"
+    cellHeight="64"
+	AssetCategory="sprites" />

BIN
modules/ToyAssets/1/assets/images/Ice_Projectile_2.png


+ 8 - 0
modules/ToyAssets/1/assets/images/Ice_Projectile_2Sprite.asset.taml

@@ -0,0 +1,8 @@
+<ImageAsset
+    AssetName="Ice_Projectile_2"
+    imageFile="Ice_Projectile_2.png"
+    cellCountX="4"
+    cellCountY="4"
+    cellWidth="64"
+    cellHeight="64"
+	AssetCategory="sprites" />

BIN
modules/ToyAssets/1/assets/images/Ice_Projectile_3.png


+ 8 - 0
modules/ToyAssets/1/assets/images/Ice_Projectile_3Sprite.asset.taml

@@ -0,0 +1,8 @@
+<ImageAsset
+    AssetName="Ice_Projectile_3"
+    imageFile="Ice_Projectile_3.png"
+    cellCountX="4"
+    cellCountY="4"
+    cellWidth="64"
+    cellHeight="64"
+	AssetCategory="sprites" />