Create art folder

sjalkote · Jun 5, 2023 · e267ff1 · e267ff1
1 parent f541909
commit e267ff1
Show file tree

Hide file tree

Showing 81 changed files with 168 additions and 152 deletions.
diff --git a/Assets/Art.meta b/Assets/Art.meta
diff --git a/Assets/Materials.meta → Assets/Art/Materials.meta b/Assets/Materials.meta → Assets/Art/Materials.meta
diff --git a/Assets/Materials/Materials.meta → Assets/Art/Materials/Materials.meta b/Assets/Materials/Materials.meta → Assets/Art/Materials/Materials.meta
diff --git a/Assets/Materials/Materials/ground 1.mat → Assets/Art/Materials/Materials/ground 1.mat b/Assets/Materials/Materials/ground 1.mat → Assets/Art/Materials/Materials/ground 1.mat
diff --git a/Assets/Materials/Materials/ground 1.mat.meta → ...Art/Materials/Materials/ground 1.mat.meta b/Assets/Materials/Materials/ground 1.mat.meta → ...Art/Materials/Materials/ground 1.mat.meta
diff --git a/Assets/Materials/Materials/ground.mat → Assets/Art/Materials/Materials/ground.mat b/Assets/Materials/Materials/ground.mat → Assets/Art/Materials/Materials/ground.mat
diff --git a/Assets/Materials/Materials/ground.mat.meta → ...s/Art/Materials/Materials/ground.mat.meta b/Assets/Materials/Materials/ground.mat.meta → ...s/Art/Materials/Materials/ground.mat.meta
diff --git a/Assets/Materials/Trails.meta → Assets/Art/Materials/Trails.meta b/Assets/Materials/Trails.meta → Assets/Art/Materials/Trails.meta
diff --git a/Assets/Materials/Trails/Hot Trail.mat → Assets/Art/Materials/Trails/Hot Trail.mat b/Assets/Materials/Trails/Hot Trail.mat → Assets/Art/Materials/Trails/Hot Trail.mat
diff --git a/Assets/Materials/Trails/Hot Trail.mat.meta → ...s/Art/Materials/Trails/Hot Trail.mat.meta b/Assets/Materials/Trails/Hot Trail.mat.meta → ...s/Art/Materials/Trails/Hot Trail.mat.meta
diff --git a/Assets/Materials/Trails/Hot Trail.png → Assets/Art/Materials/Trails/Hot Trail.png b/Assets/Materials/Trails/Hot Trail.png → Assets/Art/Materials/Trails/Hot Trail.png
diff --git a/Assets/Materials/Trails/Hot Trail.png.meta → ...s/Art/Materials/Trails/Hot Trail.png.meta b/Assets/Materials/Trails/Hot Trail.png.meta → ...s/Art/Materials/Trails/Hot Trail.png.meta
diff --git a/Assets/Materials/Trails/Smoke Trail.mat → Assets/Art/Materials/Trails/Smoke Trail.mat b/Assets/Materials/Trails/Smoke Trail.mat → Assets/Art/Materials/Trails/Smoke Trail.mat
diff --git a/Assets/Materials/Trails/Smoke Trail.mat.meta → ...Art/Materials/Trails/Smoke Trail.mat.meta b/Assets/Materials/Trails/Smoke Trail.mat.meta → ...Art/Materials/Trails/Smoke Trail.mat.meta
diff --git a/Assets/Materials/Trails/Smoke Trail.png → Assets/Art/Materials/Trails/Smoke Trail.png b/Assets/Materials/Trails/Smoke Trail.png → Assets/Art/Materials/Trails/Smoke Trail.png
diff --git a/Assets/Materials/Trails/Smoke Trail.png.meta → ...Art/Materials/Trails/Smoke Trail.png.meta b/Assets/Materials/Trails/Smoke Trail.png.meta → ...Art/Materials/Trails/Smoke Trail.png.meta
diff --git a/Assets/Materials/ground.png → Assets/Art/Materials/ground.png b/Assets/Materials/ground.png → Assets/Art/Materials/ground.png
diff --git a/Assets/Materials/ground.png.meta → Assets/Art/Materials/ground.png.meta b/Assets/Materials/ground.png.meta → Assets/Art/Materials/ground.png.meta
diff --git a/Assets/Models.meta → Assets/Art/Models.meta b/Assets/Models.meta → Assets/Art/Models.meta
diff --git a/Assets/Models/Arena.meta → Assets/Art/Models/Arena.meta b/Assets/Models/Arena.meta → Assets/Art/Models/Arena.meta
diff --git a/Assets/Models/Arena/Materials.meta → Assets/Art/Models/Arena/Materials.meta b/Assets/Models/Arena/Materials.meta → Assets/Art/Models/Arena/Materials.meta
diff --git a/Assets/Models/Arena/Materials/sky.mat → Assets/Art/Models/Arena/Materials/sky.mat b/Assets/Models/Arena/Materials/sky.mat → Assets/Art/Models/Arena/Materials/sky.mat
diff --git a/Assets/Models/Arena/Materials/sky.mat.meta → ...s/Art/Models/Arena/Materials/sky.mat.meta b/Assets/Models/Arena/Materials/sky.mat.meta → ...s/Art/Models/Arena/Materials/sky.mat.meta
diff --git a/Assets/Models/Arena/Simple game arena.blend → .../Art/Models/Arena/Simple game arena.blend b/Assets/Models/Arena/Simple game arena.blend → .../Art/Models/Arena/Simple game arena.blend
diff --git a/...Models/Arena/Simple game arena.blend.meta → ...Models/Arena/Simple game arena.blend.meta b/...Models/Arena/Simple game arena.blend.meta → ...Models/Arena/Simple game arena.blend.meta
diff --git a/Assets/Models/Arena/outdoor arena.blend → Assets/Art/Models/Arena/outdoor arena.blend b/Assets/Models/Arena/outdoor arena.blend → Assets/Art/Models/Arena/outdoor arena.blend
diff --git a/Assets/Models/Arena/outdoor arena.blend.meta → ...Art/Models/Arena/outdoor arena.blend.meta b/Assets/Models/Arena/outdoor arena.blend.meta → ...Art/Models/Arena/outdoor arena.blend.meta
diff --git a/Assets/Models/Arena/sky.png → Assets/Art/Models/Arena/sky.png b/Assets/Models/Arena/sky.png → Assets/Art/Models/Arena/sky.png
diff --git a/Assets/Models/Arena/sky.png.meta → Assets/Art/Models/Arena/sky.png.meta b/Assets/Models/Arena/sky.png.meta → Assets/Art/Models/Arena/sky.png.meta
diff --git a/Assets/Models/BambooGun.meta → Assets/Art/Models/BambooGun.meta b/Assets/Models/BambooGun.meta → Assets/Art/Models/BambooGun.meta
diff --git a/...odels/BambooGun/bamboo pistol texture.png → ...odels/BambooGun/bamboo pistol texture.png b/...odels/BambooGun/bamboo pistol texture.png → ...odels/BambooGun/bamboo pistol texture.png
diff --git a/.../BambooGun/bamboo pistol texture.png.meta → .../BambooGun/bamboo pistol texture.png.meta b/.../BambooGun/bamboo pistol texture.png.meta → .../BambooGun/bamboo pistol texture.png.meta
diff --git a/Assets/Models/BambooGun/bamboo pistol.fbx → ...ts/Art/Models/BambooGun/bamboo pistol.fbx b/Assets/Models/BambooGun/bamboo pistol.fbx → ...ts/Art/Models/BambooGun/bamboo pistol.fbx
diff --git a/...s/Models/BambooGun/bamboo pistol.fbx.meta → ...t/Models/BambooGun/bamboo pistol.fbx.meta b/...s/Models/BambooGun/bamboo pistol.fbx.meta → ...t/Models/BambooGun/bamboo pistol.fbx.meta
diff --git a/Assets/Models/Banana.meta → Assets/Art/Models/Banana.meta b/Assets/Models/Banana.meta → Assets/Art/Models/Banana.meta
diff --git a/Assets/Models/Banana/Materials.meta → Assets/Art/Models/Banana/Materials.meta b/Assets/Models/Banana/Materials.meta → Assets/Art/Models/Banana/Materials.meta
diff --git a/Assets/Models/Banana/Materials/bannana.mat → ...s/Art/Models/Banana/Materials/bannana.mat b/Assets/Models/Banana/Materials/bannana.mat → ...s/Art/Models/Banana/Materials/bannana.mat
diff --git a/.../Models/Banana/Materials/bannana.mat.meta → .../Models/Banana/Materials/bannana.mat.meta b/.../Models/Banana/Materials/bannana.mat.meta → .../Models/Banana/Materials/bannana.mat.meta
diff --git a/Assets/Models/Banana/bannana.fbx → Assets/Art/Models/Banana/bannana.fbx b/Assets/Models/Banana/bannana.fbx → Assets/Art/Models/Banana/bannana.fbx
diff --git a/Assets/Models/Banana/bannana.fbx.meta → Assets/Art/Models/Banana/bannana.fbx.meta b/Assets/Models/Banana/bannana.fbx.meta → Assets/Art/Models/Banana/bannana.fbx.meta
diff --git a/Assets/Models/Banana/bannana.png → Assets/Art/Models/Banana/bannana.png b/Assets/Models/Banana/bannana.png → Assets/Art/Models/Banana/bannana.png
diff --git a/Assets/Models/Banana/bannana.png.meta → Assets/Art/Models/Banana/bannana.png.meta b/Assets/Models/Banana/bannana.png.meta → Assets/Art/Models/Banana/bannana.png.meta
diff --git a/Assets/Models/FruitFly.meta → Assets/Art/Models/FruitFly.meta b/Assets/Models/FruitFly.meta → Assets/Art/Models/FruitFly.meta
diff --git a/Assets/Models/FruitFly/FruitFly.controller → ...s/Art/Models/FruitFly/FruitFly.controller b/Assets/Models/FruitFly/FruitFly.controller → ...s/Art/Models/FruitFly/FruitFly.controller
diff --git a/.../Models/FruitFly/FruitFly.controller.meta → .../Models/FruitFly/FruitFly.controller.meta b/.../Models/FruitFly/FruitFly.controller.meta → .../Models/FruitFly/FruitFly.controller.meta
diff --git a/Assets/Models/FruitFly/FruitFly.fbx → Assets/Art/Models/FruitFly/FruitFly.fbx b/Assets/Models/FruitFly/FruitFly.fbx → Assets/Art/Models/FruitFly/FruitFly.fbx
diff --git a/Assets/Models/FruitFly/FruitFly.fbx.meta → Assets/Art/Models/FruitFly/FruitFly.fbx.meta b/Assets/Models/FruitFly/FruitFly.fbx.meta → Assets/Art/Models/FruitFly/FruitFly.fbx.meta
diff --git a/Assets/Models/FruitFly/FruitFlyMesh.fbx → Assets/Art/Models/FruitFly/FruitFlyMesh.fbx b/Assets/Models/FruitFly/FruitFlyMesh.fbx → Assets/Art/Models/FruitFly/FruitFlyMesh.fbx
diff --git a/Assets/Models/FruitFly/FruitFlyMesh.fbx.meta → ...Art/Models/FruitFly/FruitFlyMesh.fbx.meta b/Assets/Models/FruitFly/FruitFlyMesh.fbx.meta → ...Art/Models/FruitFly/FruitFlyMesh.fbx.meta
diff --git a/Assets/Models/FruitFly/fruitflytexture.png → ...s/Art/Models/FruitFly/fruitflytexture.png b/Assets/Models/FruitFly/fruitflytexture.png → ...s/Art/Models/FruitFly/fruitflytexture.png
diff --git a/.../Models/FruitFly/fruitflytexture.png.meta → .../Models/FruitFly/fruitflytexture.png.meta b/.../Models/FruitFly/fruitflytexture.png.meta → .../Models/FruitFly/fruitflytexture.png.meta
diff --git a/Assets/Models/Materials.meta → Assets/Art/Models/Materials.meta b/Assets/Models/Materials.meta → Assets/Art/Models/Materials.meta
diff --git a/Assets/Models/MonkeyArms.meta → Assets/Art/Models/MonkeyArms.meta b/Assets/Models/MonkeyArms.meta → Assets/Art/Models/MonkeyArms.meta
diff --git a/Assets/Models/MonkeyArms/Monkey.fbx → Assets/Art/Models/MonkeyArms/Monkey.fbx b/Assets/Models/MonkeyArms/Monkey.fbx → Assets/Art/Models/MonkeyArms/Monkey.fbx
diff --git a/Assets/Models/MonkeyArms/Monkey.fbx.meta → Assets/Art/Models/MonkeyArms/Monkey.fbx.meta b/Assets/Models/MonkeyArms/Monkey.fbx.meta → Assets/Art/Models/MonkeyArms/Monkey.fbx.meta
diff --git a/...els/MonkeyArms/MonkeyAnimation.controller → ...els/MonkeyArms/MonkeyAnimation.controller b/...els/MonkeyArms/MonkeyAnimation.controller → ...els/MonkeyArms/MonkeyAnimation.controller
diff --git a/...onkeyArms/MonkeyAnimation.controller.meta → ...onkeyArms/MonkeyAnimation.controller.meta b/...onkeyArms/MonkeyAnimation.controller.meta → ...onkeyArms/MonkeyAnimation.controller.meta
diff --git a/Assets/Models/MonkeyArms/Unbenannt2.png → Assets/Art/Models/MonkeyArms/Unbenannt2.png b/Assets/Models/MonkeyArms/Unbenannt2.png → Assets/Art/Models/MonkeyArms/Unbenannt2.png
diff --git a/Assets/Models/MonkeyArms/Unbenannt2.png.meta → ...Art/Models/MonkeyArms/Unbenannt2.png.meta b/Assets/Models/MonkeyArms/Unbenannt2.png.meta → ...Art/Models/MonkeyArms/Unbenannt2.png.meta
diff --git a/Assets/Models/MonkeyArmsAnimated.meta → Assets/Art/Models/MonkeyArmsAnimated.meta b/Assets/Models/MonkeyArmsAnimated.meta → Assets/Art/Models/MonkeyArmsAnimated.meta
diff --git a/...Models/MonkeyArmsAnimated/Controller.meta → ...Models/MonkeyArmsAnimated/Controller.meta b/...Models/MonkeyArmsAnimated/Controller.meta → ...Models/MonkeyArmsAnimated/Controller.meta
diff --git a/...ontroller/MonkeyArmsController.controller → ...ontroller/MonkeyArmsController.controller b/...ontroller/MonkeyArmsController.controller → ...ontroller/MonkeyArmsController.controller
diff --git a/...ller/MonkeyArmsController.controller.meta → ...ller/MonkeyArmsController.controller.meta b/...ller/MonkeyArmsController.controller.meta → ...ller/MonkeyArmsController.controller.meta
diff --git a/...ls/MonkeyArmsAnimated/MonkeyAnimated2.fbx → ...ls/MonkeyArmsAnimated/MonkeyAnimated2.fbx b/...ls/MonkeyArmsAnimated/MonkeyAnimated2.fbx → ...ls/MonkeyArmsAnimated/MonkeyAnimated2.fbx
diff --git a/...nkeyArmsAnimated/MonkeyAnimated2.fbx.meta → ...nkeyArmsAnimated/MonkeyAnimated2.fbx.meta b/...nkeyArmsAnimated/MonkeyAnimated2.fbx.meta → ...nkeyArmsAnimated/MonkeyAnimated2.fbx.meta
diff --git a/Assets/Models/Rat.meta → Assets/Art/Models/Rat.meta b/Assets/Models/Rat.meta → Assets/Art/Models/Rat.meta
diff --git a/Assets/Models/Rat/Rat.fbx → Assets/Art/Models/Rat/Rat.fbx b/Assets/Models/Rat/Rat.fbx → Assets/Art/Models/Rat/Rat.fbx
diff --git a/Assets/Models/Rat/Rat.fbx.meta → Assets/Art/Models/Rat/Rat.fbx.meta b/Assets/Models/Rat/Rat.fbx.meta → Assets/Art/Models/Rat/Rat.fbx.meta
diff --git a/Assets/Models/Rat/RatTextureFull.png → Assets/Art/Models/Rat/RatTextureFull.png b/Assets/Models/Rat/RatTextureFull.png → Assets/Art/Models/Rat/RatTextureFull.png
diff --git a/Assets/Models/Rat/RatTextureFull.png.meta → ...ts/Art/Models/Rat/RatTextureFull.png.meta b/Assets/Models/Rat/RatTextureFull.png.meta → ...ts/Art/Models/Rat/RatTextureFull.png.meta
diff --git a/Assets/Models/Shotgun.meta → Assets/Art/Models/Shotgun.meta b/Assets/Models/Shotgun.meta → Assets/Art/Models/Shotgun.meta
diff --git a/Assets/Models/Shotgun/Shotgun.fbx → Assets/Art/Models/Shotgun/Shotgun.fbx b/Assets/Models/Shotgun/Shotgun.fbx → Assets/Art/Models/Shotgun/Shotgun.fbx
diff --git a/Assets/Models/Shotgun/Shotgun.fbx.meta → Assets/Art/Models/Shotgun/Shotgun.fbx.meta b/Assets/Models/Shotgun/Shotgun.fbx.meta → Assets/Art/Models/Shotgun/Shotgun.fbx.meta
diff --git a/Assets/Models/Shotgun/texturewhole.png → Assets/Art/Models/Shotgun/texturewhole.png b/Assets/Models/Shotgun/texturewhole.png → Assets/Art/Models/Shotgun/texturewhole.png
diff --git a/Assets/Models/Shotgun/texturewhole.png.meta → .../Art/Models/Shotgun/texturewhole.png.meta b/Assets/Models/Shotgun/texturewhole.png.meta → .../Art/Models/Shotgun/texturewhole.png.meta
diff --git a/Assets/Art/UI.meta b/Assets/Art/UI.meta
diff --git a/Assets/crosshair.png → Assets/Art/UI/crosshair.png b/Assets/crosshair.png → Assets/Art/UI/crosshair.png
diff --git a/Assets/crosshair.png.meta → Assets/Art/UI/crosshair.png.meta b/Assets/crosshair.png.meta → Assets/Art/UI/crosshair.png.meta
diff --git a/Assets/panel_beige.png → Assets/Art/UI/panel_beige.png b/Assets/panel_beige.png → Assets/Art/UI/panel_beige.png
diff --git a/Assets/panel_beige.png.meta → Assets/Art/UI/panel_beige.png.meta b/Assets/panel_beige.png.meta → Assets/Art/UI/panel_beige.png.meta
diff --git a/Assets/Scenes/MainLevel/MainLevel.unity b/Assets/Scenes/MainLevel/MainLevel.unity
@@ -1530,7 +1530,7 @@ Transform:
   - {fileID: 577381783}
   - {fileID: 1295508183}
   m_Father: {fileID: 0}
-  m_RootOrder: 4
+  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1343097813
 GameObject:
@@ -1625,8 +1625,8 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 1068714379}
-  m_Father: {fileID: 0}
-  m_RootOrder: 2
+  m_Father: {fileID: 1354318432}
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -2553,11 +2553,11 @@ RectTransform:
   m_Children:
   - {fileID: 1483543805}
   m_Father: {fileID: 0}
-  m_RootOrder: 3
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0.204, y: 2.258}
+  m_AnchoredPosition: {x: 0.204, y: 1937.5027}
   m_SizeDelta: {x: 400, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1001 &621131598848870900