Browse Source

Reorganize Editor & NinjaSnowWar resources into subdirectories.

Lasse Öörni 11 years ago
parent
commit
16605301bc
62 changed files with 173 additions and 173 deletions
  1. 5 5
      Bin/ConvertModels.bat
  2. 0 0
      Bin/Data/Materials/Editor/BlueUnlit.xml
  3. 0 0
      Bin/Data/Materials/Editor/BrightBlueUnlit.xml
  4. 0 0
      Bin/Data/Materials/Editor/BrightGreenUnlit.xml
  5. 0 0
      Bin/Data/Materials/Editor/BrightRedUnlit.xml
  6. 0 0
      Bin/Data/Materials/Editor/GreenUnlit.xml
  7. 0 0
      Bin/Data/Materials/Editor/RedUnlit.xml
  8. 5 5
      Bin/Data/Materials/NinjaSnowWar/CloudPlane.xml
  9. 4 4
      Bin/Data/Materials/NinjaSnowWar/Ninja.xml
  10. 4 4
      Bin/Data/Materials/NinjaSnowWar/Potion.xml
  11. 4 4
      Bin/Data/Materials/NinjaSnowWar/Snow.xml
  12. 4 4
      Bin/Data/Materials/NinjaSnowWar/SnowCrate.xml
  13. 0 0
      Bin/Data/Models/Editor/Axes.mdl
  14. 0 0
      Bin/Data/Models/Editor/RotateAxes.mdl
  15. 0 0
      Bin/Data/Models/Editor/ScaleAxes.mdl
  16. 0 0
      Bin/Data/Models/NinjaSnowWar/CloudPlane.mdl
  17. 0 0
      Bin/Data/Models/NinjaSnowWar/Level.mdl
  18. 0 0
      Bin/Data/Models/NinjaSnowWar/Ninja.mdl
  19. 0 0
      Bin/Data/Models/NinjaSnowWar/Ninja_Attack1.ani
  20. 0 0
      Bin/Data/Models/NinjaSnowWar/Ninja_Attack2.ani
  21. 0 0
      Bin/Data/Models/NinjaSnowWar/Ninja_Attack3.ani
  22. 0 0
      Bin/Data/Models/NinjaSnowWar/Ninja_Backflip.ani
  23. 0 0
      Bin/Data/Models/NinjaSnowWar/Ninja_Block.ani
  24. 0 0
      Bin/Data/Models/NinjaSnowWar/Ninja_Climb.ani
  25. 0 0
      Bin/Data/Models/NinjaSnowWar/Ninja_Crouch.ani
  26. 0 0
      Bin/Data/Models/NinjaSnowWar/Ninja_Death1.ani
  27. 0 0
      Bin/Data/Models/NinjaSnowWar/Ninja_Death2.ani
  28. 0 0
      Bin/Data/Models/NinjaSnowWar/Ninja_HighJump.ani
  29. 0 0
      Bin/Data/Models/NinjaSnowWar/Ninja_Idle1.ani
  30. 0 0
      Bin/Data/Models/NinjaSnowWar/Ninja_Idle2.ani
  31. 0 0
      Bin/Data/Models/NinjaSnowWar/Ninja_Idle3.ani
  32. 0 0
      Bin/Data/Models/NinjaSnowWar/Ninja_Jump.ani
  33. 0 0
      Bin/Data/Models/NinjaSnowWar/Ninja_JumpNoHeight.ani
  34. 0 0
      Bin/Data/Models/NinjaSnowWar/Ninja_Kick.ani
  35. 0 0
      Bin/Data/Models/NinjaSnowWar/Ninja_SideKick.ani
  36. 0 0
      Bin/Data/Models/NinjaSnowWar/Ninja_Spin.ani
  37. 0 0
      Bin/Data/Models/NinjaSnowWar/Ninja_Stealth.ani
  38. 4 4
      Bin/Data/Models/NinjaSnowWar/Ninja_Stealth.xml
  39. 0 0
      Bin/Data/Models/NinjaSnowWar/Ninja_Walk.ani
  40. 4 4
      Bin/Data/Models/NinjaSnowWar/Ninja_Walk.xml
  41. 0 0
      Bin/Data/Models/NinjaSnowWar/SnowBall.mdl
  42. 0 0
      Bin/Data/Models/NinjaSnowWar/SnowCrate.mdl
  43. 2 2
      Bin/Data/Objects/Ninja.xml
  44. 2 2
      Bin/Data/Objects/Potion.xml
  45. 2 2
      Bin/Data/Objects/SnowBall.xml
  46. 2 2
      Bin/Data/Objects/SnowCrate.xml
  47. 5 5
      Bin/Data/Scenes/NinjaSnowWar.xml
  48. 13 10
      Bin/Data/Scripts/Editor/EditorGizmo.as
  49. 3 3
      Bin/Data/Scripts/NinjaSnowWar.as
  50. 17 17
      Bin/Data/Scripts/NinjaSnowWar/Ninja.as
  51. 0 0
      Bin/Data/Textures/Editor/EditorIcons.png
  52. 0 0
      Bin/Data/Textures/Editor/EditorIcons.xml
  53. 0 0
      Bin/Data/Textures/NinjaSnowWar/CloudPlane.dds
  54. 0 0
      Bin/Data/Textures/NinjaSnowWar/HealthBarBorder.png
  55. 0 0
      Bin/Data/Textures/NinjaSnowWar/HealthBarInside.png
  56. 0 0
      Bin/Data/Textures/NinjaSnowWar/Ninja.dds
  57. 0 0
      Bin/Data/Textures/NinjaSnowWar/Sight.png
  58. 5 5
      Bin/Data/Textures/NinjaSnowWar/Sight.xml
  59. 0 0
      Bin/Data/Textures/NinjaSnowWar/Snow.dds
  60. 0 0
      Bin/Data/Textures/NinjaSnowWar/SnowCrate.dds
  61. 88 88
      Bin/Data/UI/EditorIcons.xml
  62. 0 3
      Source/Android/assets/.gitignore

+ 5 - 5
Bin/ConvertModels.bat

@@ -1,7 +1,7 @@
 OgreImporter ../SourceAssets/Jack.mesh.xml Data/Models/Jack.mdl -t
 OgreImporter ../SourceAssets/Jack.mesh.xml Data/Models/Jack.mdl -t
-OgreImporter ../SourceAssets/Level.mesh.xml Data/Models/Level.mdl -t
+OgreImporter ../SourceAssets/Level.mesh.xml Data/Models/NinjaSnowWar/Level.mdl -t
 OgreImporter ../SourceAssets/Mushroom.mesh.xml Data/Models/Mushroom.mdl -t
 OgreImporter ../SourceAssets/Mushroom.mesh.xml Data/Models/Mushroom.mdl -t
-OgreImporter ../SourceAssets/Ninja.mesh.xml Data/Models/Ninja.mdl -t
-OgreImporter ../SourceAssets/Potion.mesh.xml Data/Models/Potion.mdl -t
-OgreImporter ../SourceAssets/SnowBall.mesh.xml Data/Models/SnowBall.mdl -t 
-OgreImporter ../SourceAssets/SnowCrate.mesh.xml Data/Models/SnowCrate.mdl -t
+OgreImporter ../SourceAssets/Ninja.mesh.xml Data/Models/NinjaSnowWar/Ninja.mdl -t
+OgreImporter ../SourceAssets/Potion.mesh.xml Data/Models/NinjaSnowWar/Potion.mdl -t
+OgreImporter ../SourceAssets/SnowBall.mesh.xml Data/Models/NinjaSnowWar/SnowBall.mdl -t 
+OgreImporter ../SourceAssets/SnowCrate.mesh.xml Data/Models/NinjaSnowWar/SnowCrate.mdl -t

+ 0 - 0
Bin/CoreData/Materials/BlueUnlit.xml → Bin/Data/Materials/Editor/BlueUnlit.xml


+ 0 - 0
Bin/CoreData/Materials/BrightBlueUnlit.xml → Bin/Data/Materials/Editor/BrightBlueUnlit.xml


+ 0 - 0
Bin/CoreData/Materials/BrightGreenUnlit.xml → Bin/Data/Materials/Editor/BrightGreenUnlit.xml


+ 0 - 0
Bin/CoreData/Materials/BrightRedUnlit.xml → Bin/Data/Materials/Editor/BrightRedUnlit.xml


+ 0 - 0
Bin/CoreData/Materials/GreenUnlit.xml → Bin/Data/Materials/Editor/GreenUnlit.xml


+ 0 - 0
Bin/CoreData/Materials/RedUnlit.xml → Bin/Data/Materials/Editor/RedUnlit.xml


+ 5 - 5
Bin/Data/Materials/CloudPlane.xml → Bin/Data/Materials/NinjaSnowWar/CloudPlane.xml

@@ -1,5 +1,5 @@
-<material>
-    <technique name="Techniques/DiffSkyplane.xml" />
-    <texture unit="diffuse" name="Textures/CloudPlane.dds" />
-    <cull value="none" />
-</material>
+<material>
+    <technique name="Techniques/DiffSkyplane.xml" />
+    <texture unit="diffuse" name="Textures/NinjaSnowWar/CloudPlane.dds" />
+    <cull value="none" />
+</material>

+ 4 - 4
Bin/Data/Materials/Ninja.xml → Bin/Data/Materials/NinjaSnowWar/Ninja.xml

@@ -1,5 +1,5 @@
-<material>
-    <technique name="Techniques/Diff.xml" />
-    <texture unit="diffuse" name="Textures/Ninja.dds" />
-    <parameter name="MatSpecColor" value="0 0 0 1" />
+<material>
+    <technique name="Techniques/Diff.xml" />
+    <texture unit="diffuse" name="Textures/NinjaSnowWar/Ninja.dds" />
+    <parameter name="MatSpecColor" value="0 0 0 1" />
 </material>
 </material>

+ 4 - 4
Bin/Data/Materials/Potion.xml → Bin/Data/Materials/NinjaSnowWar/Potion.xml

@@ -1,5 +1,5 @@
-<material>
-    <technique name="Techniques/NoTexture.xml" />
-    <parameter name="MatDiffColor" value="1 0 0 1" />
-    <parameter name="MatSpecColor" value="0.25 0.25 0.25 16" />
+<material>
+    <technique name="Techniques/NoTexture.xml" />
+    <parameter name="MatDiffColor" value="1 0 0 1" />
+    <parameter name="MatSpecColor" value="0.25 0.25 0.25 16" />
 </material>
 </material>

+ 4 - 4
Bin/Data/Materials/Snow.xml → Bin/Data/Materials/NinjaSnowWar/Snow.xml

@@ -1,5 +1,5 @@
-<material>
-    <technique name="Techniques/Diff.xml" />
-    <texture unit="diffuse" name="Textures/Snow.dds" />
-    <parameter name="MatSpecColor" value="0.25 0.25 0.25 16" />
+<material>
+    <technique name="Techniques/Diff.xml" />
+    <texture unit="diffuse" name="Textures/NinjaSnowWar/Snow.dds" />
+    <parameter name="MatSpecColor" value="0.25 0.25 0.25 16" />
 </material>
 </material>

+ 4 - 4
Bin/Data/Materials/SnowCrate.xml → Bin/Data/Materials/NinjaSnowWar/SnowCrate.xml

@@ -1,5 +1,5 @@
-<material>
-    <technique name="Techniques/Diff.xml" />
-    <texture unit="diffuse" name="Textures/SnowCrate.dds" />
-    <parameter name="MatSpecColor" value="0.15 0.15 0.15 16" />
+<material>
+    <technique name="Techniques/Diff.xml" />
+    <texture unit="diffuse" name="Textures/NinjaSnowWar/SnowCrate.dds" />
+    <parameter name="MatSpecColor" value="0.15 0.15 0.15 16" />
 </material>
 </material>

+ 0 - 0
Bin/Data/Models/Axes.mdl → Bin/Data/Models/Editor/Axes.mdl


+ 0 - 0
Bin/Data/Models/RotateAxes.mdl → Bin/Data/Models/Editor/RotateAxes.mdl


+ 0 - 0
Bin/Data/Models/ScaleAxes.mdl → Bin/Data/Models/Editor/ScaleAxes.mdl


+ 0 - 0
Bin/Data/Models/CloudPlane.mdl → Bin/Data/Models/NinjaSnowWar/CloudPlane.mdl


+ 0 - 0
Bin/Data/Models/Level.mdl → Bin/Data/Models/NinjaSnowWar/Level.mdl


+ 0 - 0
Bin/Data/Models/Ninja.mdl → Bin/Data/Models/NinjaSnowWar/Ninja.mdl


+ 0 - 0
Bin/Data/Models/Ninja_Attack1.ani → Bin/Data/Models/NinjaSnowWar/Ninja_Attack1.ani


+ 0 - 0
Bin/Data/Models/Ninja_Attack2.ani → Bin/Data/Models/NinjaSnowWar/Ninja_Attack2.ani


+ 0 - 0
Bin/Data/Models/Ninja_Attack3.ani → Bin/Data/Models/NinjaSnowWar/Ninja_Attack3.ani


+ 0 - 0
Bin/Data/Models/Ninja_Backflip.ani → Bin/Data/Models/NinjaSnowWar/Ninja_Backflip.ani


+ 0 - 0
Bin/Data/Models/Ninja_Block.ani → Bin/Data/Models/NinjaSnowWar/Ninja_Block.ani


+ 0 - 0
Bin/Data/Models/Ninja_Climb.ani → Bin/Data/Models/NinjaSnowWar/Ninja_Climb.ani


+ 0 - 0
Bin/Data/Models/Ninja_Crouch.ani → Bin/Data/Models/NinjaSnowWar/Ninja_Crouch.ani


+ 0 - 0
Bin/Data/Models/Ninja_Death1.ani → Bin/Data/Models/NinjaSnowWar/Ninja_Death1.ani


+ 0 - 0
Bin/Data/Models/Ninja_Death2.ani → Bin/Data/Models/NinjaSnowWar/Ninja_Death2.ani


+ 0 - 0
Bin/Data/Models/Ninja_HighJump.ani → Bin/Data/Models/NinjaSnowWar/Ninja_HighJump.ani


+ 0 - 0
Bin/Data/Models/Ninja_Idle1.ani → Bin/Data/Models/NinjaSnowWar/Ninja_Idle1.ani


+ 0 - 0
Bin/Data/Models/Ninja_Idle2.ani → Bin/Data/Models/NinjaSnowWar/Ninja_Idle2.ani


+ 0 - 0
Bin/Data/Models/Ninja_Idle3.ani → Bin/Data/Models/NinjaSnowWar/Ninja_Idle3.ani


+ 0 - 0
Bin/Data/Models/Ninja_Jump.ani → Bin/Data/Models/NinjaSnowWar/Ninja_Jump.ani


+ 0 - 0
Bin/Data/Models/Ninja_JumpNoHeight.ani → Bin/Data/Models/NinjaSnowWar/Ninja_JumpNoHeight.ani


+ 0 - 0
Bin/Data/Models/Ninja_Kick.ani → Bin/Data/Models/NinjaSnowWar/Ninja_Kick.ani


+ 0 - 0
Bin/Data/Models/Ninja_SideKick.ani → Bin/Data/Models/NinjaSnowWar/Ninja_SideKick.ani


+ 0 - 0
Bin/Data/Models/Ninja_Spin.ani → Bin/Data/Models/NinjaSnowWar/Ninja_Spin.ani


+ 0 - 0
Bin/Data/Models/Ninja_Stealth.ani → Bin/Data/Models/NinjaSnowWar/Ninja_Stealth.ani


+ 4 - 4
Bin/Data/Models/Ninja_Stealth.xml → Bin/Data/Models/NinjaSnowWar/Ninja_Stealth.xml

@@ -1,4 +1,4 @@
-<animation>
-    <trigger normalizedtime="0" type="String" value="Joint26" />
-    <trigger normalizedtime="0.5" type="String" value="Joint21" />
-</animation>
+<animation>
+    <trigger normalizedtime="0" type="String" value="Joint26" />
+    <trigger normalizedtime="0.5" type="String" value="Joint21" />
+</animation>

+ 0 - 0
Bin/Data/Models/Ninja_Walk.ani → Bin/Data/Models/NinjaSnowWar/Ninja_Walk.ani


+ 4 - 4
Bin/Data/Models/Ninja_Walk.xml → Bin/Data/Models/NinjaSnowWar/Ninja_Walk.xml

@@ -1,4 +1,4 @@
-<animation>
-    <trigger normalizedtime="0.25" type="String" value="Joint21" />
-    <trigger normalizedtime="0.75" type="String" value="Joint26" />
-</animation>
+<animation>
+    <trigger normalizedtime="0.25" type="String" value="Joint21" />
+    <trigger normalizedtime="0.75" type="String" value="Joint26" />
+</animation>

+ 0 - 0
Bin/Data/Models/SnowBall.mdl → Bin/Data/Models/NinjaSnowWar/SnowBall.mdl


+ 0 - 0
Bin/Data/Models/SnowCrate.mdl → Bin/Data/Models/NinjaSnowWar/SnowCrate.mdl


+ 2 - 2
Bin/Data/Objects/Ninja.xml

@@ -54,8 +54,8 @@
 		<attribute name="Scale" value="1 1 1" />
 		<attribute name="Scale" value="1 1 1" />
 		<attribute name="Variables" />
 		<attribute name="Variables" />
 		<component type="AnimatedModel" id="6">
 		<component type="AnimatedModel" id="6">
-			<attribute name="Model" value="Model;Models/Ninja.mdl" />
-			<attribute name="Material" value="Material;Materials/Ninja.xml;Materials/Ninja.xml" />
+			<attribute name="Model" value="Model;Models/NinjaSnowWar/Ninja.mdl" />
+			<attribute name="Material" value="Material;Materials/NinjaSnowWar/Ninja.xml;Materials/NinjaSnowWar/Ninja.xml" />
 			<attribute name="Is Occluder" value="false" />
 			<attribute name="Is Occluder" value="false" />
 			<attribute name="Can Be Occluded" value="true" />
 			<attribute name="Can Be Occluded" value="true" />
 			<attribute name="Cast Shadows" value="true" />
 			<attribute name="Cast Shadows" value="true" />

+ 2 - 2
Bin/Data/Objects/Potion.xml

@@ -18,8 +18,8 @@
 		<attribute name="Always Update Owner" value="true" />
 		<attribute name="Always Update Owner" value="true" />
 	</component>
 	</component>
 	<component type="StaticModel" id="7">
 	<component type="StaticModel" id="7">
-		<attribute name="Model" value="Model;Models/Potion.mdl" />
-		<attribute name="Material" value="Material;Materials/Potion.xml" />
+		<attribute name="Model" value="Model;Models/NinjaSnowWar/Potion.mdl" />
+		<attribute name="Material" value="Material;Materials/NinjaSnowWar/Potion.xml" />
 		<attribute name="Is Occluder" value="false" />
 		<attribute name="Is Occluder" value="false" />
 		<attribute name="Can Be Occluded" value="true" />
 		<attribute name="Can Be Occluded" value="true" />
 		<attribute name="Cast Shadows" value="true" />
 		<attribute name="Cast Shadows" value="true" />

+ 2 - 2
Bin/Data/Objects/SnowBall.xml

@@ -18,8 +18,8 @@
 		<attribute name="Always Update Owner" value="true" />
 		<attribute name="Always Update Owner" value="true" />
 	</component>
 	</component>
 	<component type="StaticModel" id="4">
 	<component type="StaticModel" id="4">
-		<attribute name="Model" value="Model;Models/SnowBall.mdl" />
-		<attribute name="Material" value="Material;Materials/Snow.xml" />
+		<attribute name="Model" value="Model;Models/NinjaSnowWar/SnowBall.mdl" />
+		<attribute name="Material" value="Material;Materials/NinjaSnowWar/Snow.xml" />
 		<attribute name="Is Occluder" value="false" />
 		<attribute name="Is Occluder" value="false" />
 		<attribute name="Can Be Occluded" value="true" />
 		<attribute name="Can Be Occluded" value="true" />
 		<attribute name="Cast Shadows" value="true" />
 		<attribute name="Cast Shadows" value="true" />

+ 2 - 2
Bin/Data/Objects/SnowCrate.xml

@@ -18,8 +18,8 @@
 		<attribute name="Always Update Owner" value="true" />
 		<attribute name="Always Update Owner" value="true" />
 	</component>
 	</component>
 	<component type="StaticModel" id="11">
 	<component type="StaticModel" id="11">
-		<attribute name="Model" value="Model;Models/SnowCrate.mdl" />
-		<attribute name="Material" value="Material;Materials/SnowCrate.xml" />
+		<attribute name="Model" value="Model;Models/NinjaSnowWar/SnowCrate.mdl" />
+		<attribute name="Material" value="Material;Materials/NinjaSnowWar/SnowCrate.xml" />
 		<attribute name="Is Occluder" value="false" />
 		<attribute name="Is Occluder" value="false" />
 		<attribute name="Can Be Occluded" value="true" />
 		<attribute name="Can Be Occluded" value="true" />
 		<attribute name="Cast Shadows" value="true" />
 		<attribute name="Cast Shadows" value="true" />

+ 5 - 5
Bin/Data/Scenes/NinjaSnowWar.xml

@@ -62,12 +62,12 @@
 		<attribute name="Scale" value="1 1 1" />
 		<attribute name="Scale" value="1 1 1" />
 		<attribute name="Variables" />
 		<attribute name="Variables" />
 		<component type="StaticModel" id="16777220">
 		<component type="StaticModel" id="16777220">
-			<attribute name="Model" value="Model;Models/Level.mdl" />
-			<attribute name="Material" value="Material;Materials/Snow.xml" />
+			<attribute name="Model" value="Model;Models/NinjaSnowWar/Level.mdl" />
+			<attribute name="Material" value="Material;Materials/NinjaSnowWar/Snow.xml" />
 		</component>
 		</component>
 		<component type="CollisionShape" id="16777221">
 		<component type="CollisionShape" id="16777221">
 			<attribute name="Shape Type" value="TriangleMesh" />
 			<attribute name="Shape Type" value="TriangleMesh" />
-			<attribute name="Model" value="Model;Models/Level.mdl" />
+			<attribute name="Model" value="Model;Models/NinjaSnowWar/Level.mdl" />
 			<attribute name="Collision Margin" value="0.01" />
 			<attribute name="Collision Margin" value="0.01" />
 		</component>
 		</component>
 		<component type="RigidBody" id="16777223">
 		<component type="RigidBody" id="16777223">
@@ -83,8 +83,8 @@
 		<attribute name="Scale" value="300 1 300" />
 		<attribute name="Scale" value="300 1 300" />
 		<attribute name="Variables" />
 		<attribute name="Variables" />
 		<component type="Skybox" id="16777222">
 		<component type="Skybox" id="16777222">
-			<attribute name="Model" value="Model;Models/CloudPlane.mdl" />
-			<attribute name="Material" value="Material;Materials/CloudPlane.xml" />
+			<attribute name="Model" value="Model;Models/NinjaSnowWar/CloudPlane.mdl" />
+			<attribute name="Material" value="Material;Materials/NinjaSnowWar/CloudPlane.xml" />
 		</component>
 		</component>
 	</node>
 	</node>
 </scene>
 </scene>

+ 13 - 10
Bin/Data/Scripts/Editor/EditorGizmo.as

@@ -77,10 +77,10 @@ void CreateGizmo()
 {
 {
     gizmoNode = Node();
     gizmoNode = Node();
     gizmo = gizmoNode.CreateComponent("StaticModel");
     gizmo = gizmoNode.CreateComponent("StaticModel");
-    gizmo.model = cache.GetResource("Model", "Models/Axes.mdl");
-    gizmo.materials[0] = cache.GetResource("Material", "Materials/RedUnlit.xml");
-    gizmo.materials[1] = cache.GetResource("Material", "Materials/GreenUnlit.xml");
-    gizmo.materials[2] = cache.GetResource("Material", "Materials/BlueUnlit.xml");
+    gizmo.model = cache.GetResource("Model", "Models/Editor/Axes.mdl");
+    gizmo.materials[0] = cache.GetResource("Material", "Materials/Editor/RedUnlit.xml");
+    gizmo.materials[1] = cache.GetResource("Material", "Materials/Editor/GreenUnlit.xml");
+    gizmo.materials[2] = cache.GetResource("Material", "Materials/Editor/BlueUnlit.xml");
     gizmo.enabled = false;
     gizmo.enabled = false;
     gizmo.viewMask = 0x80000000; // Editor raycasts use viewmask 0x7fffffff
     gizmo.viewMask = 0x80000000; // Editor raycasts use viewmask 0x7fffffff
     gizmo.occludee = false;
     gizmo.occludee = false;
@@ -155,15 +155,15 @@ void PositionGizmo()
         switch (editMode)
         switch (editMode)
         {
         {
         case EDIT_MOVE:
         case EDIT_MOVE:
-            gizmo.model = cache.GetResource("Model", "Models/Axes.mdl");
+            gizmo.model = cache.GetResource("Model", "Models/Editor/Axes.mdl");
             break;
             break;
 
 
         case EDIT_ROTATE:
         case EDIT_ROTATE:
-            gizmo.model = cache.GetResource("Model", "Models/RotateAxes.mdl");
+            gizmo.model = cache.GetResource("Model", "Models/Editor/RotateAxes.mdl");
             break;
             break;
 
 
         case EDIT_SCALE:
         case EDIT_SCALE:
-            gizmo.model = cache.GetResource("Model", "Models/ScaleAxes.mdl");
+            gizmo.model = cache.GetResource("Model", "Models/Editor/ScaleAxes.mdl");
             break;
             break;
         }
         }
 
 
@@ -236,17 +236,20 @@ void UseGizmo()
 
 
     if (gizmoAxisX.selected != gizmoAxisX.lastSelected)
     if (gizmoAxisX.selected != gizmoAxisX.lastSelected)
     {
     {
-        gizmo.materials[0] = cache.GetResource("Material", gizmoAxisX.selected ? "Materials/BrightRedUnlit.xml" : "Materials/RedUnlit.xml");
+        gizmo.materials[0] = cache.GetResource("Material", gizmoAxisX.selected ? "Materials/Editor/BrightRedUnlit.xml" :
+            "Materials/Editor/RedUnlit.xml");
         gizmoAxisX.lastSelected = gizmoAxisX.selected;
         gizmoAxisX.lastSelected = gizmoAxisX.selected;
     }
     }
     if (gizmoAxisY.selected != gizmoAxisY.lastSelected)
     if (gizmoAxisY.selected != gizmoAxisY.lastSelected)
     {
     {
-        gizmo.materials[1] = cache.GetResource("Material", gizmoAxisY.selected ? "Materials/BrightGreenUnlit.xml" : "Materials/GreenUnlit.xml");
+        gizmo.materials[1] = cache.GetResource("Material", gizmoAxisY.selected ? "Materials/Editor/BrightGreenUnlit.xml" :
+            "Materials/Editor/GreenUnlit.xml");
         gizmoAxisY.lastSelected = gizmoAxisY.selected;
         gizmoAxisY.lastSelected = gizmoAxisY.selected;
     }
     }
     if (gizmoAxisZ.selected != gizmoAxisZ.lastSelected)
     if (gizmoAxisZ.selected != gizmoAxisZ.lastSelected)
     {
     {
-        gizmo.materials[2] = cache.GetResource("Material", gizmoAxisZ.selected ? "Materials/BrightBlueUnlit.xml" : "Materials/BlueUnlit.xml");
+        gizmo.materials[2] = cache.GetResource("Material", gizmoAxisZ.selected ? "Materials/Editor/BrightBlueUnlit.xml" :
+            "Materials/Editor/BlueUnlit.xml");
         gizmoAxisZ.lastSelected = gizmoAxisZ.selected;
         gizmoAxisZ.lastSelected = gizmoAxisZ.selected;
     };
     };
 
 

+ 3 - 3
Bin/Data/Scripts/NinjaSnowWar.as

@@ -253,7 +253,7 @@ void CreateOverlays()
         height = 64;
         height = 64;
 
 
     sight = BorderImage();
     sight = BorderImage();
-    sight.texture = cache.GetResource("Texture2D", "Textures/Sight.png");
+    sight.texture = cache.GetResource("Texture2D", "Textures/NinjaSnowWar/Sight.png");
     sight.SetAlignment(HA_CENTER, VA_CENTER);
     sight.SetAlignment(HA_CENTER, VA_CENTER);
     sight.SetSize(height, height);
     sight.SetSize(height, height);
     ui.root.AddChild(sight);
     ui.root.AddChild(sight);
@@ -284,14 +284,14 @@ void CreateOverlays()
     ui.root.AddChild(messageText);
     ui.root.AddChild(messageText);
 
 
     BorderImage@ healthBorder = BorderImage();
     BorderImage@ healthBorder = BorderImage();
-    healthBorder.texture = cache.GetResource("Texture2D", "Textures/HealthBarBorder.png");
+    healthBorder.texture = cache.GetResource("Texture2D", "Textures/NinjaSnowWar/HealthBarBorder.png");
     healthBorder.SetAlignment(HA_CENTER, VA_TOP);
     healthBorder.SetAlignment(HA_CENTER, VA_TOP);
     healthBorder.SetPosition(0, 8);
     healthBorder.SetPosition(0, 8);
     healthBorder.SetSize(120, 20);
     healthBorder.SetSize(120, 20);
     ui.root.AddChild(healthBorder);
     ui.root.AddChild(healthBorder);
 
 
     healthBar = BorderImage();
     healthBar = BorderImage();
-    healthBar.texture = cache.GetResource("Texture2D", "Textures/HealthBarInside.png");
+    healthBar.texture = cache.GetResource("Texture2D", "Textures/NinjaSnowWar/HealthBarInside.png");
     healthBar.SetPosition(2, 2);
     healthBar.SetPosition(2, 2);
     healthBar.SetSize(116, 16);
     healthBar.SetSize(116, 16);
     healthBorder.AddChild(healthBar);
     healthBorder.AddChild(healthBar);

+ 17 - 17
Bin/Data/Scripts/NinjaSnowWar/Ninja.as

@@ -57,7 +57,7 @@ class Ninja : GameObject
     {
     {
         // Start playing the idle animation immediately, even before the first physics update
         // Start playing the idle animation immediately, even before the first physics update
         AnimationController@ animCtrl = node.children[0].GetComponent("AnimationController");
         AnimationController@ animCtrl = node.children[0].GetComponent("AnimationController");
-        animCtrl.PlayExclusive("Models/Ninja_Idle3.ani", LAYER_MOVE, true);
+        animCtrl.PlayExclusive("Models/NinjaSnowWar/Ninja_Idle3.ani", LAYER_MOVE, true);
     }
     }
 
 
     void SetControls(const Controls&in newControls)
     void SetControls(const Controls&in newControls)
@@ -153,19 +153,19 @@ class Ninja : GameObject
                 // Walk or sidestep animation
                 // Walk or sidestep animation
                 if (sideMove)
                 if (sideMove)
                 {
                 {
-                    animCtrl.PlayExclusive("Models/Ninja_Stealth.ani", LAYER_MOVE, true, 0.2);
-                    animCtrl.SetSpeed("Models/Ninja_Stealth.ani", animDir * 2.2);
+                    animCtrl.PlayExclusive("Models/NinjaSnowWar/Ninja_Stealth.ani", LAYER_MOVE, true, 0.2);
+                    animCtrl.SetSpeed("Models/NinjaSnowWar/Ninja_Stealth.ani", animDir * 2.2);
                 }
                 }
                 else
                 else
                 {
                 {
-                    animCtrl.PlayExclusive("Models/Ninja_Walk.ani", LAYER_MOVE, true, 0.2);
-                    animCtrl.SetSpeed("Models/Ninja_Walk.ani", animDir * 1.6);
+                    animCtrl.PlayExclusive("Models/NinjaSnowWar/Ninja_Walk.ani", LAYER_MOVE, true, 0.2);
+                    animCtrl.SetSpeed("Models/NinjaSnowWar/Ninja_Walk.ani", animDir * 1.6);
                 }
                 }
             }
             }
             else
             else
             {
             {
                 // Idle animation
                 // Idle animation
-                animCtrl.PlayExclusive("Models/Ninja_Idle3.ani", LAYER_MOVE, true, 0.2);
+                animCtrl.PlayExclusive("Models/NinjaSnowWar/Ninja_Idle3.ani", LAYER_MOVE, true, 0.2);
             }
             }
 
 
             // Overall damping to cap maximum speed
             // Overall damping to cap maximum speed
@@ -180,8 +180,8 @@ class Ninja : GameObject
                     body.position = body.position + Vector3(0, 0.03, 0);
                     body.position = body.position + Vector3(0, 0.03, 0);
                     body.ApplyImpulse(Vector3(0, ninjaJumpForce, 0));
                     body.ApplyImpulse(Vector3(0, ninjaJumpForce, 0));
                     inAirTime = 1.0f;
                     inAirTime = 1.0f;
-                    animCtrl.PlayExclusive("Models/Ninja_JumpNoHeight.ani", LAYER_MOVE, false,  0.1);
-                    animCtrl.SetTime("Models/Ninja_JumpNoHeight.ani", 0.0); // Always play from beginning
+                    animCtrl.PlayExclusive("Models/NinjaSnowWar/Ninja_JumpNoHeight.ani", LAYER_MOVE, false,  0.1);
+                    animCtrl.SetTime("Models/NinjaSnowWar/Ninja_JumpNoHeight.ani", 0.0); // Always play from beginning
                     okToJump = false;
                     okToJump = false;
                 }
                 }
             }
             }
@@ -213,7 +213,7 @@ class Ninja : GameObject
 
 
             // Falling/jumping/sliding animation
             // Falling/jumping/sliding animation
             if (inAirTime > 0.1f)
             if (inAirTime > 0.1f)
-                animCtrl.PlayExclusive("Models/Ninja_JumpNoHeight.ani", LAYER_MOVE, false, 0.1);
+                animCtrl.PlayExclusive("Models/NinjaSnowWar/Ninja_JumpNoHeight.ani", LAYER_MOVE, false, 0.1);
         }
         }
 
 
         // Shooting
         // Shooting
@@ -221,15 +221,15 @@ class Ninja : GameObject
             throwTime -= timeStep;
             throwTime -= timeStep;
 
 
         // Start fading the attack animation after it has progressed past a certain point
         // Start fading the attack animation after it has progressed past a certain point
-        if (animCtrl.GetTime("Models/Ninja_Attack1.ani") > 0.1)
-            animCtrl.Fade("Models/Ninja_Attack1.ani", 0.0, 0.5);
+        if (animCtrl.GetTime("Models/NinjaSnowWar/Ninja_Attack1.ani") > 0.1)
+            animCtrl.Fade("Models/NinjaSnowWar/Ninja_Attack1.ani", 0.0, 0.5);
 
 
         if ((controls.IsPressed(CTRL_FIRE, prevControls)) && (throwTime <= 0))
         if ((controls.IsPressed(CTRL_FIRE, prevControls)) && (throwTime <= 0))
         {
         {
             Vector3 projectileVel = GetAim() * ninjaThrowVelocity;
             Vector3 projectileVel = GetAim() * ninjaThrowVelocity;
 
 
-            animCtrl.Play("Models/Ninja_Attack1.ani", LAYER_ATTACK, false, 0.0);
-            animCtrl.SetTime("Models/Ninja_Attack1.ani", 0.0); // Always play from beginning
+            animCtrl.Play("Models/NinjaSnowWar/Ninja_Attack1.ani", LAYER_ATTACK, false, 0.0);
+            animCtrl.SetTime("Models/NinjaSnowWar/Ninja_Attack1.ani", 0.0); // Always play from beginning
 
 
             Node@ snowball = SpawnObject(node.position + vel * timeStep + q * ninjaThrowPosition, GetAim(), "SnowBall");
             Node@ snowball = SpawnObject(node.position + vel * timeStep + q * ninjaThrowPosition, GetAim(), "SnowBall");
             RigidBody@ snowballBody = snowball.GetComponent("RigidBody");
             RigidBody@ snowballBody = snowball.GetComponent("RigidBody");
@@ -290,8 +290,8 @@ class Ninja : GameObject
         {
         {
             // Backward death
             // Backward death
             animCtrl.StopLayer(LAYER_ATTACK, 0.1);
             animCtrl.StopLayer(LAYER_ATTACK, 0.1);
-            animCtrl.PlayExclusive("Models/Ninja_Death1.ani", LAYER_MOVE, false, 0.2);
-            animCtrl.SetSpeed("Models/Ninja_Death1.ani", 0.5);
+            animCtrl.PlayExclusive("Models/NinjaSnowWar/Ninja_Death1.ani", LAYER_MOVE, false, 0.2);
+            animCtrl.SetSpeed("Models/NinjaSnowWar/Ninja_Death1.ani", 0.5);
             if ((deathTime >= 0.3) && (deathTime < 0.8))
             if ((deathTime >= 0.3) && (deathTime < 0.8))
                 modelNode.Translate(Vector3(0, 0, 4.25 * timeStep));
                 modelNode.Translate(Vector3(0, 0, 4.25 * timeStep));
         }
         }
@@ -299,8 +299,8 @@ class Ninja : GameObject
         {
         {
             // Forward death
             // Forward death
             animCtrl.StopLayer(LAYER_ATTACK, 0.1);
             animCtrl.StopLayer(LAYER_ATTACK, 0.1);
-            animCtrl.PlayExclusive("Models/Ninja_Death2.ani", LAYER_MOVE, false, 0.2);
-            animCtrl.SetSpeed("Models/Ninja_Death2.ani", 0.5);
+            animCtrl.PlayExclusive("Models/NinjaSnowWar/Ninja_Death2.ani", LAYER_MOVE, false, 0.2);
+            animCtrl.SetSpeed("Models/NinjaSnowWar/Ninja_Death2.ani", 0.5);
             if ((deathTime >= 0.4) && (deathTime < 0.8))
             if ((deathTime >= 0.4) && (deathTime < 0.8))
                 modelNode.Translate(Vector3(0, 0, -4.25 * timeStep));
                 modelNode.Translate(Vector3(0, 0, -4.25 * timeStep));
         }
         }

+ 0 - 0
Bin/Data/Textures/EditorIcons.png → Bin/Data/Textures/Editor/EditorIcons.png


+ 0 - 0
Bin/Data/Textures/EditorIcons.xml → Bin/Data/Textures/Editor/EditorIcons.xml


+ 0 - 0
Bin/Data/Textures/CloudPlane.dds → Bin/Data/Textures/NinjaSnowWar/CloudPlane.dds


+ 0 - 0
Bin/Data/Textures/HealthBarBorder.png → Bin/Data/Textures/NinjaSnowWar/HealthBarBorder.png


+ 0 - 0
Bin/Data/Textures/HealthBarInside.png → Bin/Data/Textures/NinjaSnowWar/HealthBarInside.png


+ 0 - 0
Bin/Data/Textures/Ninja.dds → Bin/Data/Textures/NinjaSnowWar/Ninja.dds


+ 0 - 0
Bin/Data/Textures/Sight.png → Bin/Data/Textures/NinjaSnowWar/Sight.png


+ 5 - 5
Bin/Data/Textures/Sight.xml → Bin/Data/Textures/NinjaSnowWar/Sight.xml

@@ -1,5 +1,5 @@
-<texture>
-    <mipmap enable="false" />
-    <quality low="0" />
-</texture>
-
+<texture>
+    <mipmap enable="false" />
+    <quality low="0" />
+</texture>
+

+ 0 - 0
Bin/Data/Textures/Snow.dds → Bin/Data/Textures/NinjaSnowWar/Snow.dds


+ 0 - 0
Bin/Data/Textures/SnowCrate.dds → Bin/Data/Textures/NinjaSnowWar/SnowCrate.dds


+ 88 - 88
Bin/Data/UI/EditorIcons.xml

@@ -1,354 +1,354 @@
 <elements>
 <elements>
     <element type="Scene">
     <element type="Scene">
-        <attribute name="Texture" value="Texture2D;Textures/EditorIcons.png" />
+        <attribute name="Texture" value="Texture2D;Textures/Editor/EditorIcons.png" />
         <attribute name="Image Rect" value="16 0 30 14" />
         <attribute name="Image Rect" value="16 0 30 14" />
     </element>
     </element>
     <element type="Node">
     <element type="Node">
-        <attribute name="Texture" value="Texture2D;Textures/EditorIcons.png" />
+        <attribute name="Texture" value="Texture2D;Textures/Editor/EditorIcons.png" />
         <attribute name="Image Rect" value="0 0 14 14" />
         <attribute name="Image Rect" value="0 0 14 14" />
     </element>
     </element>
     <element type="AnimatedModel">
     <element type="AnimatedModel">
-        <attribute name="Texture" value="Texture2D;Textures/EditorIcons.png" />
+        <attribute name="Texture" value="Texture2D;Textures/Editor/EditorIcons.png" />
         <attribute name="Image Rect" value="32 16 46 30" />
         <attribute name="Image Rect" value="32 16 46 30" />
     </element>
     </element>
     <element type="AnimationController">
     <element type="AnimationController">
-        <attribute name="Texture" value="Texture2D;Textures/EditorIcons.png" />
+        <attribute name="Texture" value="Texture2D;Textures/Editor/EditorIcons.png" />
         <attribute name="Image Rect" value="128 0 142 14" />
         <attribute name="Image Rect" value="128 0 142 14" />
     </element>
     </element>
     <element type="BillboardSet">
     <element type="BillboardSet">
-        <attribute name="Texture" value="Texture2D;Textures/EditorIcons.png" />
+        <attribute name="Texture" value="Texture2D;Textures/Editor/EditorIcons.png" />
         <attribute name="Image Rect" value="48 16 62 30" />
         <attribute name="Image Rect" value="48 16 62 30" />
     </element>
     </element>
     <element type="Camera">
     <element type="Camera">
-        <attribute name="Texture" value="Texture2D;Textures/EditorIcons.png" />
+        <attribute name="Texture" value="Texture2D;Textures/Editor/EditorIcons.png" />
         <attribute name="Image Rect" value="176 0 190 14" />
         <attribute name="Image Rect" value="176 0 190 14" />
     </element>
     </element>
     <element type="CollisionShape">
     <element type="CollisionShape">
-        <attribute name="Texture" value="Texture2D;Textures/EditorIcons.png" />
+        <attribute name="Texture" value="Texture2D;Textures/Editor/EditorIcons.png" />
         <attribute name="Image Rect" value="96 0 110 14" />
         <attribute name="Image Rect" value="96 0 110 14" />
     </element>
     </element>
     <element type="CollisionBox2D">
     <element type="CollisionBox2D">
-        <attribute name="Texture" value="Texture2D;Textures/EditorIcons.png" />
+        <attribute name="Texture" value="Texture2D;Textures/Editor/EditorIcons.png" />
         <attribute name="Image Rect" value="96 0 110 14" />
         <attribute name="Image Rect" value="96 0 110 14" />
     </element>
     </element>
     <element type="CollisionChain2D">
     <element type="CollisionChain2D">
-        <attribute name="Texture" value="Texture2D;Textures/EditorIcons.png" />
+        <attribute name="Texture" value="Texture2D;Textures/Editor/EditorIcons.png" />
         <attribute name="Image Rect" value="96 0 110 14" />
         <attribute name="Image Rect" value="96 0 110 14" />
     </element>
     </element>
     <element type="CollisionCircle2D">
     <element type="CollisionCircle2D">
-        <attribute name="Texture" value="Texture2D;Textures/EditorIcons.png" />
+        <attribute name="Texture" value="Texture2D;Textures/Editor/EditorIcons.png" />
         <attribute name="Image Rect" value="96 0 110 14" />
         <attribute name="Image Rect" value="96 0 110 14" />
     </element>
     </element>
     <element type="CollisionEdge2D">
     <element type="CollisionEdge2D">
-        <attribute name="Texture" value="Texture2D;Textures/EditorIcons.png" />
+        <attribute name="Texture" value="Texture2D;Textures/Editor/EditorIcons.png" />
         <attribute name="Image Rect" value="96 0 110 14" />
         <attribute name="Image Rect" value="96 0 110 14" />
     </element>
     </element>
     <element type="CollisionPolygon2D">
     <element type="CollisionPolygon2D">
-        <attribute name="Texture" value="Texture2D;Textures/EditorIcons.png" />
+        <attribute name="Texture" value="Texture2D;Textures/Editor/EditorIcons.png" />
         <attribute name="Image Rect" value="96 0 110 14" />
         <attribute name="Image Rect" value="96 0 110 14" />
     </element>
     </element>
     <element type="Constraint">
     <element type="Constraint">
-        <attribute name="Texture" value="Texture2D;Textures/EditorIcons.png" />
+        <attribute name="Texture" value="Texture2D;Textures/Editor/EditorIcons.png" />
         <attribute name="Image Rect" value="112 0 126 14" />
         <attribute name="Image Rect" value="112 0 126 14" />
     </element>
     </element>
     <element type="CustomGeometry">
     <element type="CustomGeometry">
-        <attribute name="Texture" value="Texture2D;Textures/EditorIcons.png" />
+        <attribute name="Texture" value="Texture2D;Textures/Editor/EditorIcons.png" />
         <attribute name="Image Rect" value="32 0 46 14" />
         <attribute name="Image Rect" value="32 0 46 14" />
     </element>
     </element>
     <element type="DebugRenderer">
     <element type="DebugRenderer">
-        <attribute name="Texture" value="Texture2D;Textures/EditorIcons.png" />
+        <attribute name="Texture" value="Texture2D;Textures/Editor/EditorIcons.png" />
         <attribute name="Image Rect" value="160 0 174 14" />
         <attribute name="Image Rect" value="160 0 174 14" />
     </element>
     </element>
     <element type="DecalSet">
     <element type="DecalSet">
-        <attribute name="Texture" value="Texture2D;Textures/EditorIcons.png" />
+        <attribute name="Texture" value="Texture2D;Textures/Editor/EditorIcons.png" />
         <attribute name="Image Rect" value="48 16 62 30" />
         <attribute name="Image Rect" value="48 16 62 30" />
     </element>
     </element>
     <element type="Light">
     <element type="Light">
-        <attribute name="Texture" value="Texture2D;Textures/EditorIcons.png" />
+        <attribute name="Texture" value="Texture2D;Textures/Editor/EditorIcons.png" />
         <attribute name="Image Rect" value="48 0 62 14" />
         <attribute name="Image Rect" value="48 0 62 14" />
     </element>
     </element>
     <element type="NetworkPriority">
     <element type="NetworkPriority">
-        <attribute name="Texture" value="Texture2D;Textures/EditorIcons.png" />
+        <attribute name="Texture" value="Texture2D;Textures/Editor/EditorIcons.png" />
         <attribute name="Image Rect" value="144 0 158 14" />
         <attribute name="Image Rect" value="144 0 158 14" />
     </element>
     </element>
     <element type="Octree">
     <element type="Octree">
-        <attribute name="Texture" value="Texture2D;Textures/EditorIcons.png" />
+        <attribute name="Texture" value="Texture2D;Textures/Editor/EditorIcons.png" />
         <attribute name="Image Rect" value="160 0 174 14" />
         <attribute name="Image Rect" value="160 0 174 14" />
     </element>
     </element>
     <element type="ParticleEmitter">
     <element type="ParticleEmitter">
-        <attribute name="Texture" value="Texture2D;Textures/EditorIcons.png" />
+        <attribute name="Texture" value="Texture2D;Textures/Editor/EditorIcons.png" />
         <attribute name="Image Rect" value="0 16 14 30" />
         <attribute name="Image Rect" value="0 16 14 30" />
     </element>
     </element>
     <element type="PhysicsWorld">
     <element type="PhysicsWorld">
-        <attribute name="Texture" value="Texture2D;Textures/EditorIcons.png" />
+        <attribute name="Texture" value="Texture2D;Textures/Editor/EditorIcons.png" />
         <attribute name="Image Rect" value="160 0 174 14" />
         <attribute name="Image Rect" value="160 0 174 14" />
     </element>
     </element>
     <element type="PhysicsWorld2D">
     <element type="PhysicsWorld2D">
-        <attribute name="Texture" value="Texture2D;Textures/EditorIcons.png" />
+        <attribute name="Texture" value="Texture2D;Textures/Editor/EditorIcons.png" />
         <attribute name="Image Rect" value="160 0 174 14" />
         <attribute name="Image Rect" value="160 0 174 14" />
     </element>
     </element>
     <element type="DrawableProxy2D">
     <element type="DrawableProxy2D">
-        <attribute name="Texture" value="Texture2D;Textures/EditorIcons.png" />
+        <attribute name="Texture" value="Texture2D;Textures/Editor/EditorIcons.png" />
         <attribute name="Image Rect" value="160 0 174 14" />
         <attribute name="Image Rect" value="160 0 174 14" />
     </element>
     </element>
     <element type="MaterialCache2D">
     <element type="MaterialCache2D">
-        <attribute name="Texture" value="Texture2D;Textures/EditorIcons.png" />
+        <attribute name="Texture" value="Texture2D;Textures/Editor/EditorIcons.png" />
         <attribute name="Image Rect" value="160 0 174 14" />
         <attribute name="Image Rect" value="160 0 174 14" />
     </element>
     </element>
     <element type="RigidBody">
     <element type="RigidBody">
-        <attribute name="Texture" value="Texture2D;Textures/EditorIcons.png" />
+        <attribute name="Texture" value="Texture2D;Textures/Editor/EditorIcons.png" />
         <attribute name="Image Rect" value="80 0 94 14" />
         <attribute name="Image Rect" value="80 0 94 14" />
     </element>
     </element>
     <element type="RigidBody2D">
     <element type="RigidBody2D">
-        <attribute name="Texture" value="Texture2D;Textures/EditorIcons.png" />
+        <attribute name="Texture" value="Texture2D;Textures/Editor/EditorIcons.png" />
         <attribute name="Image Rect" value="80 0 94 14" />
         <attribute name="Image Rect" value="80 0 94 14" />
     </element>
     </element>
     <element type="ScriptInstance">
     <element type="ScriptInstance">
-        <attribute name="Texture" value="Texture2D;Textures/EditorIcons.png" />
+        <attribute name="Texture" value="Texture2D;Textures/Editor/EditorIcons.png" />
         <attribute name="Image Rect" value="64 0 78 14" />
         <attribute name="Image Rect" value="64 0 78 14" />
     </element>
     </element>
     <element type="Skybox">
     <element type="Skybox">
-        <attribute name="Texture" value="Texture2D;Textures/EditorIcons.png" />
+        <attribute name="Texture" value="Texture2D;Textures/Editor/EditorIcons.png" />
         <attribute name="Image Rect" value="16 16 30 30" />
         <attribute name="Image Rect" value="16 16 30 30" />
     </element>
     </element>
     <element type="SmoothedTransform">
     <element type="SmoothedTransform">
-        <attribute name="Texture" value="Texture2D;Textures/EditorIcons.png" />
+        <attribute name="Texture" value="Texture2D;Textures/Editor/EditorIcons.png" />
         <attribute name="Image Rect" value="144 0 158 14" />
         <attribute name="Image Rect" value="144 0 158 14" />
     </element>
     </element>
     <element type="SoundListener">
     <element type="SoundListener">
-        <attribute name="Texture" value="Texture2D;Textures/EditorIcons.png" />
+        <attribute name="Texture" value="Texture2D;Textures/Editor/EditorIcons.png" />
         <attribute name="Image Rect" value="192 0 206 14" />
         <attribute name="Image Rect" value="192 0 206 14" />
     </element>
     </element>
     <element type="SoundSource">
     <element type="SoundSource">
-        <attribute name="Texture" value="Texture2D;Textures/EditorIcons.png" />
+        <attribute name="Texture" value="Texture2D;Textures/Editor/EditorIcons.png" />
         <attribute name="Image Rect" value="208 0 222 14" />
         <attribute name="Image Rect" value="208 0 222 14" />
     </element>
     </element>
     <element type="SoundSource3D">
     <element type="SoundSource3D">
-        <attribute name="Texture" value="Texture2D;Textures/EditorIcons.png" />
+        <attribute name="Texture" value="Texture2D;Textures/Editor/EditorIcons.png" />
         <attribute name="Image Rect" value="208 0 222 14" />
         <attribute name="Image Rect" value="208 0 222 14" />
     </element>
     </element>
     <element type="StaticModel">
     <element type="StaticModel">
-        <attribute name="Texture" value="Texture2D;Textures/EditorIcons.png" />
+        <attribute name="Texture" value="Texture2D;Textures/Editor/EditorIcons.png" />
         <attribute name="Image Rect" value="32 0 46 14" />
         <attribute name="Image Rect" value="32 0 46 14" />
     </element>
     </element>
     <element type="StaticModelGroup">
     <element type="StaticModelGroup">
-        <attribute name="Texture" value="Texture2D;Textures/EditorIcons.png" />
+        <attribute name="Texture" value="Texture2D;Textures/Editor/EditorIcons.png" />
         <attribute name="Image Rect" value="32 0 46 14" />
         <attribute name="Image Rect" value="32 0 46 14" />
     </element>
     </element>
     <element type="Terrain">
     <element type="Terrain">
-        <attribute name="Texture" value="Texture2D;Textures/EditorIcons.png" />
+        <attribute name="Texture" value="Texture2D;Textures/Editor/EditorIcons.png" />
         <attribute name="Image Rect" value="224 0 238 14" />
         <attribute name="Image Rect" value="224 0 238 14" />
     </element>
     </element>
     <element type="TerrainPatch">
     <element type="TerrainPatch">
-        <attribute name="Texture" value="Texture2D;Textures/EditorIcons.png" />
+        <attribute name="Texture" value="Texture2D;Textures/Editor/EditorIcons.png" />
         <attribute name="Image Rect" value="224 0 238 14" />
         <attribute name="Image Rect" value="224 0 238 14" />
     </element>
     </element>
     <element type="Zone">
     <element type="Zone">
-        <attribute name="Texture" value="Texture2D;Textures/EditorIcons.png" />
+        <attribute name="Texture" value="Texture2D;Textures/Editor/EditorIcons.png" />
         <attribute name="Image Rect" value="240 0 254 14" />
         <attribute name="Image Rect" value="240 0 254 14" />
     </element>
     </element>
     <element type="NavigationMesh">
     <element type="NavigationMesh">
-        <attribute name="Texture" value="Texture2D;Textures/EditorIcons.png" />
+        <attribute name="Texture" value="Texture2D;Textures/Editor/EditorIcons.png" />
         <attribute name="Image Rect" value="64 16 78 30" />
         <attribute name="Image Rect" value="64 16 78 30" />
     </element>
     </element>
     <element type="Navigable">
     <element type="Navigable">
-        <attribute name="Texture" value="Texture2D;Textures/EditorIcons.png" />
+        <attribute name="Texture" value="Texture2D;Textures/Editor/EditorIcons.png" />
         <attribute name="Image Rect" value="64 16 78 30" />
         <attribute name="Image Rect" value="64 16 78 30" />
     </element>
     </element>
     <element type="Text3D">
     <element type="Text3D">
-        <attribute name="Texture" value="Texture2D;Textures/EditorIcons.png" />
+        <attribute name="Texture" value="Texture2D;Textures/Editor/EditorIcons.png" />
         <attribute name="Image Rect" value="80 16 94 30" />
         <attribute name="Image Rect" value="80 16 94 30" />
     </element>
     </element>
     <element type="OffMeshConnection">
     <element type="OffMeshConnection">
-        <attribute name="Texture" value="Texture2D;Textures/EditorIcons.png" />
+        <attribute name="Texture" value="Texture2D;Textures/Editor/EditorIcons.png" />
         <attribute name="Image Rect" value="96 16 110 30" />
         <attribute name="Image Rect" value="96 16 110 30" />
     </element>
     </element>
     <element type="SplinePath">
     <element type="SplinePath">
-        <attribute name="Texture" value="Texture2D;Textures/EditorIcons.png" />
+        <attribute name="Texture" value="Texture2D;Textures/Editor/EditorIcons.png" />
         <attribute name="Image Rect" value="96 16 110 30" />
         <attribute name="Image Rect" value="96 16 110 30" />
     </element>
     </element>
     <element type="RootUIElement">
     <element type="RootUIElement">
-        <attribute name="Texture" value="Texture2D;Textures/EditorIcons.png" />
+        <attribute name="Texture" value="Texture2D;Textures/Editor/EditorIcons.png" />
         <attribute name="Image Rect" value="0 32 14 46" />
         <attribute name="Image Rect" value="0 32 14 46" />
     </element>
     </element>
     <element type="UIElement">
     <element type="UIElement">
-        <attribute name="Texture" value="Texture2D;Textures/EditorIcons.png" />
+        <attribute name="Texture" value="Texture2D;Textures/Editor/EditorIcons.png" />
         <attribute name="Image Rect" value="16 32 30 46" />
         <attribute name="Image Rect" value="16 32 30 46" />
     </element>
     </element>
     <element type="HierarchyContainer">
     <element type="HierarchyContainer">
-        <attribute name="Texture" value="Texture2D;Textures/EditorIcons.png" />
+        <attribute name="Texture" value="Texture2D;Textures/Editor/EditorIcons.png" />
         <attribute name="Image Rect" value="16 32 30 46" />
         <attribute name="Image Rect" value="16 32 30 46" />
     </element>
     </element>
     <element type="BorderImage">
     <element type="BorderImage">
-        <attribute name="Texture" value="Texture2D;Textures/EditorIcons.png" />
+        <attribute name="Texture" value="Texture2D;Textures/Editor/EditorIcons.png" />
         <attribute name="Image Rect" value="48 32 62 46" />
         <attribute name="Image Rect" value="48 32 62 46" />
     </element>
     </element>
     <element type="Button">
     <element type="Button">
-        <attribute name="Texture" value="Texture2D;Textures/EditorIcons.png" />
+        <attribute name="Texture" value="Texture2D;Textures/Editor/EditorIcons.png" />
         <attribute name="Image Rect" value="80 32 94 46" />
         <attribute name="Image Rect" value="80 32 94 46" />
     </element>
     </element>
     <element type="Menu">
     <element type="Menu">
-        <attribute name="Texture" value="Texture2D;Textures/EditorIcons.png" />
+        <attribute name="Texture" value="Texture2D;Textures/Editor/EditorIcons.png" />
         <attribute name="Image Rect" value="192 32 206 46" />
         <attribute name="Image Rect" value="192 32 206 46" />
     </element>
     </element>
     <element type="DropDownList">
     <element type="DropDownList">
-        <attribute name="Texture" value="Texture2D;Textures/EditorIcons.png" />
+        <attribute name="Texture" value="Texture2D;Textures/Editor/EditorIcons.png" />
         <attribute name="Image Rect" value="192 32 206 46" />
         <attribute name="Image Rect" value="192 32 206 46" />
     </element>
     </element>
     <element type="CheckBox">
     <element type="CheckBox">
-        <attribute name="Texture" value="Texture2D;Textures/EditorIcons.png" />
+        <attribute name="Texture" value="Texture2D;Textures/Editor/EditorIcons.png" />
         <attribute name="Image Rect" value="96 32 110 46" />
         <attribute name="Image Rect" value="96 32 110 46" />
     </element>
     </element>
     <element type="Cursor">
     <element type="Cursor">
-        <attribute name="Texture" value="Texture2D;Textures/EditorIcons.png" />
+        <attribute name="Texture" value="Texture2D;Textures/Editor/EditorIcons.png" />
         <attribute name="Image Rect" value="224 32 238 46" />
         <attribute name="Image Rect" value="224 32 238 46" />
     </element>
     </element>
     <element type="LineEdit">
     <element type="LineEdit">
-        <attribute name="Texture" value="Texture2D;Textures/EditorIcons.png" />
+        <attribute name="Texture" value="Texture2D;Textures/Editor/EditorIcons.png" />
         <attribute name="Image Rect" value="240 32 254 46" />
         <attribute name="Image Rect" value="240 32 254 46" />
     </element>
     </element>
     <element type="Slider">
     <element type="Slider">
-        <attribute name="Texture" value="Texture2D;Textures/EditorIcons.png" />
+        <attribute name="Texture" value="Texture2D;Textures/Editor/EditorIcons.png" />
         <attribute name="Image Rect" value="112 32 126 46" />
         <attribute name="Image Rect" value="112 32 126 46" />
     </element>
     </element>
     <element type="Window">
     <element type="Window">
-        <attribute name="Texture" value="Texture2D;Textures/EditorIcons.png" />
+        <attribute name="Texture" value="Texture2D;Textures/Editor/EditorIcons.png" />
         <attribute name="Image Rect" value="144 32 158 46" />
         <attribute name="Image Rect" value="144 32 158 46" />
     </element>
     </element>
     <element type="View3D">
     <element type="View3D">
-        <attribute name="Texture" value="Texture2D;Textures/EditorIcons.png" />
+        <attribute name="Texture" value="Texture2D;Textures/Editor/EditorIcons.png" />
         <attribute name="Image Rect" value="144 32 158 46" />
         <attribute name="Image Rect" value="144 32 158 46" />
     </element>
     </element>
     <element type="ScrollBar">
     <element type="ScrollBar">
-        <attribute name="Texture" value="Texture2D;Textures/EditorIcons.png" />
+        <attribute name="Texture" value="Texture2D;Textures/Editor/EditorIcons.png" />
         <attribute name="Image Rect" value="128 32 142 46" />
         <attribute name="Image Rect" value="128 32 142 46" />
     </element>
     </element>
     <element type="ScrollView">
     <element type="ScrollView">
-        <attribute name="Texture" value="Texture2D;Textures/EditorIcons.png" />
+        <attribute name="Texture" value="Texture2D;Textures/Editor/EditorIcons.png" />
         <attribute name="Image Rect" value="160 32 174 46" />
         <attribute name="Image Rect" value="160 32 174 46" />
     </element>
     </element>
     <element type="ListView">
     <element type="ListView">
-        <attribute name="Texture" value="Texture2D;Textures/EditorIcons.png" />
+        <attribute name="Texture" value="Texture2D;Textures/Editor/EditorIcons.png" />
         <attribute name="Image Rect" value="176 32 190 46" />
         <attribute name="Image Rect" value="176 32 190 46" />
     </element>
     </element>
     <element type="Sprite">
     <element type="Sprite">
-        <attribute name="Texture" value="Texture2D;Textures/EditorIcons.png" />
+        <attribute name="Texture" value="Texture2D;Textures/Editor/EditorIcons.png" />
         <attribute name="Image Rect" value="208 32 222 46" />
         <attribute name="Image Rect" value="208 32 222 46" />
     </element>
     </element>
     <element type="Text">
     <element type="Text">
-        <attribute name="Texture" value="Texture2D;Textures/EditorIcons.png" />
+        <attribute name="Texture" value="Texture2D;Textures/Editor/EditorIcons.png" />
         <attribute name="Image Rect" value="64 32 78 46" />
         <attribute name="Image Rect" value="64 32 78 46" />
     </element>
     </element>
     <element type="ToolTip">
     <element type="ToolTip">
-        <attribute name="Texture" value="Texture2D;Textures/EditorIcons.png" />
+        <attribute name="Texture" value="Texture2D;Textures/Editor/EditorIcons.png" />
         <attribute name="Image Rect" value="64 32 78 46" />
         <attribute name="Image Rect" value="64 32 78 46" />
     </element>
     </element>
     <element type="StaticSprite2D">
     <element type="StaticSprite2D">
-        <attribute name="Texture" value="Texture2D;Textures/EditorIcons.png" />
+        <attribute name="Texture" value="Texture2D;Textures/Editor/EditorIcons.png" />
         <attribute name="Image Rect" value="48 16 62 30" />
         <attribute name="Image Rect" value="48 16 62 30" />
     </element>
     </element>
     <element type="AnimatedSprite2D">
     <element type="AnimatedSprite2D">
-        <attribute name="Texture" value="Texture2D;Textures/EditorIcons.png" />
+        <attribute name="Texture" value="Texture2D;Textures/Editor/EditorIcons.png" />
         <attribute name="Image Rect" value="48 16 62 30" />
         <attribute name="Image Rect" value="48 16 62 30" />
     </element>
     </element>
     <element type="ParticleEmitter2D">
     <element type="ParticleEmitter2D">
-        <attribute name="Texture" value="Texture2D;Textures/EditorIcons.png" />
+        <attribute name="Texture" value="Texture2D;Textures/Editor/EditorIcons.png" />
         <attribute name="Image Rect" value="0 16 14 30" />
         <attribute name="Image Rect" value="0 16 14 30" />
     </element>
     </element>
     <element type="Unknown">
     <element type="Unknown">
-        <attribute name="Texture" value="Texture2D;Textures/EditorIcons.png" />
+        <attribute name="Texture" value="Texture2D;Textures/Editor/EditorIcons.png" />
         <attribute name="Image Rect" value="240 64 254 78" />
         <attribute name="Image Rect" value="240 64 254 78" />
     </element>
     </element>
     <element type="EditMove">
     <element type="EditMove">
-        <attribute name="Texture" value="Texture2D;Textures/EditorIcons.png" />
+        <attribute name="Texture" value="Texture2D;Textures/Editor/EditorIcons.png" />
         <attribute name="Image Rect" value="0 96 30 126" />
         <attribute name="Image Rect" value="0 96 30 126" />
     </element>
     </element>
     <element type="EditRotate">
     <element type="EditRotate">
-        <attribute name="Texture" value="Texture2D;Textures/EditorIcons.png" />
+        <attribute name="Texture" value="Texture2D;Textures/Editor/EditorIcons.png" />
         <attribute name="Image Rect" value="32 96 62 126" />
         <attribute name="Image Rect" value="32 96 62 126" />
     </element>
     </element>
     <element type="EditScale">
     <element type="EditScale">
-        <attribute name="Texture" value="Texture2D;Textures/EditorIcons.png" />
+        <attribute name="Texture" value="Texture2D;Textures/Editor/EditorIcons.png" />
         <attribute name="Image Rect" value="64 96 94 126" />
         <attribute name="Image Rect" value="64 96 94 126" />
     </element>
     </element>
     <element type="EditSelect">
     <element type="EditSelect">
-        <attribute name="Texture" value="Texture2D;Textures/EditorIcons.png" />
+        <attribute name="Texture" value="Texture2D;Textures/Editor/EditorIcons.png" />
         <attribute name="Image Rect" value="96 96 126 126" />
         <attribute name="Image Rect" value="96 96 126 126" />
     </element>
     </element>
     <element type="MoveSnap">
     <element type="MoveSnap">
-        <attribute name="Texture" value="Texture2D;Textures/EditorIcons.png" />
+        <attribute name="Texture" value="Texture2D;Textures/Editor/EditorIcons.png" />
         <attribute name="Image Rect" value="128 96 158 126" />
         <attribute name="Image Rect" value="128 96 158 126" />
     </element>
     </element>
     <element type="RotateSnap">
     <element type="RotateSnap">
-        <attribute name="Texture" value="Texture2D;Textures/EditorIcons.png" />
+        <attribute name="Texture" value="Texture2D;Textures/Editor/EditorIcons.png" />
         <attribute name="Image Rect" value="160 96 190 126" />
         <attribute name="Image Rect" value="160 96 190 126" />
     </element>
     </element>
     <element type="ScaleSnap">
     <element type="ScaleSnap">
-        <attribute name="Texture" value="Texture2D;Textures/EditorIcons.png" />
+        <attribute name="Texture" value="Texture2D;Textures/Editor/EditorIcons.png" />
         <attribute name="Image Rect" value="192 96 222 126" />
         <attribute name="Image Rect" value="192 96 222 126" />
     </element>
     </element>
     <element type="SnapScaleHalf">
     <element type="SnapScaleHalf">
-        <attribute name="Texture" value="Texture2D;Textures/EditorIcons.png" />
+        <attribute name="Texture" value="Texture2D;Textures/Editor/EditorIcons.png" />
         <attribute name="Image Rect" value="224 96 254 126" />
         <attribute name="Image Rect" value="224 96 254 126" />
     </element>
     </element>
     <element type="SnapScaleQuarter">
     <element type="SnapScaleQuarter">
-        <attribute name="Texture" value="Texture2D;Textures/EditorIcons.png" />
+        <attribute name="Texture" value="Texture2D;Textures/Editor/EditorIcons.png" />
         <attribute name="Image Rect" value="0 128 30 158" />
         <attribute name="Image Rect" value="0 128 30 158" />
     </element>
     </element>
     <element type="RunUpdatePlay">
     <element type="RunUpdatePlay">
-        <attribute name="Texture" value="Texture2D;Textures/EditorIcons.png" />
+        <attribute name="Texture" value="Texture2D;Textures/Editor/EditorIcons.png" />
         <attribute name="Image Rect" value="32 128 62 158" />
         <attribute name="Image Rect" value="32 128 62 158" />
     </element>
     </element>
     <element type="RunUpdatePause">
     <element type="RunUpdatePause">
-        <attribute name="Texture" value="Texture2D;Textures/EditorIcons.png" />
+        <attribute name="Texture" value="Texture2D;Textures/Editor/EditorIcons.png" />
         <attribute name="Image Rect" value="64 128 94 158" />
         <attribute name="Image Rect" value="64 128 94 158" />
     </element>
     </element>
     <element type="RevertOnPause">
     <element type="RevertOnPause">
-        <attribute name="Texture" value="Texture2D;Textures/EditorIcons.png" />
+        <attribute name="Texture" value="Texture2D;Textures/Editor/EditorIcons.png" />
         <attribute name="Image Rect" value="160 160 190 190" />
         <attribute name="Image Rect" value="160 160 190 190" />
     </element>
     </element>
     <element type="PickGeometries">
     <element type="PickGeometries">
-        <attribute name="Texture" value="Texture2D;Textures/EditorIcons.png" />
+        <attribute name="Texture" value="Texture2D;Textures/Editor/EditorIcons.png" />
         <attribute name="Image Rect" value="96 128 126 158" />
         <attribute name="Image Rect" value="96 128 126 158" />
     </element>
     </element>
     <element type="PickLights">
     <element type="PickLights">
-        <attribute name="Texture" value="Texture2D;Textures/EditorIcons.png" />
+        <attribute name="Texture" value="Texture2D;Textures/Editor/EditorIcons.png" />
         <attribute name="Image Rect" value="128 128 158 158" />
         <attribute name="Image Rect" value="128 128 158 158" />
     </element>
     </element>
     <element type="PickZones">
     <element type="PickZones">
-        <attribute name="Texture" value="Texture2D;Textures/EditorIcons.png" />
+        <attribute name="Texture" value="Texture2D;Textures/Editor/EditorIcons.png" />
         <attribute name="Image Rect" value="160 128 190 158" />
         <attribute name="Image Rect" value="160 128 190 158" />
     </element>
     </element>
     <element type="PickRigidBodies">
     <element type="PickRigidBodies">
-        <attribute name="Texture" value="Texture2D;Textures/EditorIcons.png" />
+        <attribute name="Texture" value="Texture2D;Textures/Editor/EditorIcons.png" />
         <attribute name="Image Rect" value="192 128 222 158" />
         <attribute name="Image Rect" value="192 128 222 158" />
     </element>
     </element>
     <element type="PickUIElements">
     <element type="PickUIElements">
-        <attribute name="Texture" value="Texture2D;Textures/EditorIcons.png" />
+        <attribute name="Texture" value="Texture2D;Textures/Editor/EditorIcons.png" />
         <attribute name="Image Rect" value="224 128 254 158" />
         <attribute name="Image Rect" value="224 128 254 158" />
     </element>
     </element>
     <element type="FillPoint">
     <element type="FillPoint">
-        <attribute name="Texture" value="Texture2D;Textures/EditorIcons.png" />
+        <attribute name="Texture" value="Texture2D;Textures/Editor/EditorIcons.png" />
         <attribute name="Image Rect" value="0 160 30 190" />
         <attribute name="Image Rect" value="0 160 30 190" />
     </element>
     </element>
     <element type="FillWireFrame">
     <element type="FillWireFrame">
-        <attribute name="Texture" value="Texture2D;Textures/EditorIcons.png" />
+        <attribute name="Texture" value="Texture2D;Textures/Editor/EditorIcons.png" />
         <attribute name="Image Rect" value="32 160 62 190" />
         <attribute name="Image Rect" value="32 160 62 190" />
     </element>
     </element>
     <element type="FillSolid">
     <element type="FillSolid">
-        <attribute name="Texture" value="Texture2D;Textures/EditorIcons.png" />
+        <attribute name="Texture" value="Texture2D;Textures/Editor/EditorIcons.png" />
         <attribute name="Image Rect" value="64 160 94 190" />
         <attribute name="Image Rect" value="64 160 94 190" />
     </element>
     </element>
     <element type="AxisWorld">
     <element type="AxisWorld">
-        <attribute name="Texture" value="Texture2D;Textures/EditorIcons.png" />
+        <attribute name="Texture" value="Texture2D;Textures/Editor/EditorIcons.png" />
         <attribute name="Image Rect" value="96 160 126 190" />
         <attribute name="Image Rect" value="96 160 126 190" />
     </element>
     </element>
     <element type="AxisLocal">
     <element type="AxisLocal">
-        <attribute name="Texture" value="Texture2D;Textures/EditorIcons.png" />
+        <attribute name="Texture" value="Texture2D;Textures/Editor/EditorIcons.png" />
         <attribute name="Image Rect" value="128 160 158 190" />
         <attribute name="Image Rect" value="128 160 158 190" />
     </element>
     </element>
     <element type="Settings">
     <element type="Settings">
-        <attribute name="Texture" value="Texture2D;Textures/EditorIcons.png" />
+        <attribute name="Texture" value="Texture2D;Textures/Editor/EditorIcons.png" />
         <attribute name="Image Rect" value="112 16 126 30" />
         <attribute name="Image Rect" value="112 16 126 30" />
     </element>
     </element>
 </elements>
 </elements>

+ 0 - 3
Source/Android/assets/.gitignore

@@ -1,3 +0,0 @@
-# Ignore everything as it just contains symlinks or copied of files (Windows platform without MKLINK)
-*
-!.gitignore