summaryrefslogtreecommitdiff
path: root/SurvivalTest/Assets/Resources/Art
diff options
context:
space:
mode:
Diffstat (limited to 'SurvivalTest/Assets/Resources/Art')
-rw-r--r--SurvivalTest/Assets/Resources/Art/ui/weaponicon.meta (renamed from SurvivalTest/Assets/Resources/Art/ui/equipicon.meta)2
-rw-r--r--SurvivalTest/Assets/Resources/Art/ui/weaponicon/boomerang.png (renamed from SurvivalTest/Assets/Resources/Art/ui/equipicon/boomerang.png)bin4395 -> 4395 bytes
-rw-r--r--SurvivalTest/Assets/Resources/Art/ui/weaponicon/boomerang.png.meta (renamed from SurvivalTest/Assets/Resources/Art/ui/equipicon/boomerang.png.meta)0
-rw-r--r--SurvivalTest/Assets/Resources/Art/ui/weaponicon/glove.png (renamed from SurvivalTest/Assets/Resources/Art/ui/equipicon/glove.png)bin9786 -> 9786 bytes
-rw-r--r--SurvivalTest/Assets/Resources/Art/ui/weaponicon/glove.png.meta (renamed from SurvivalTest/Assets/Resources/Art/ui/equipicon/glove.png.meta)0
-rw-r--r--SurvivalTest/Assets/Resources/Art/ui/weaponicon/grenade.png (renamed from SurvivalTest/Assets/Resources/Art/ui/equipicon/grenade.png)bin7466 -> 7466 bytes
-rw-r--r--SurvivalTest/Assets/Resources/Art/ui/weaponicon/grenade.png.meta (renamed from SurvivalTest/Assets/Resources/Art/ui/equipicon/grenade.png.meta)0
-rw-r--r--SurvivalTest/Assets/Resources/Art/ui/weaponicon/gun.png (renamed from SurvivalTest/Assets/Resources/Art/ui/equipicon/gun.png)bin10775 -> 10775 bytes
-rw-r--r--SurvivalTest/Assets/Resources/Art/ui/weaponicon/gun.png.meta (renamed from SurvivalTest/Assets/Resources/Art/ui/equipicon/gun.png.meta)0
-rw-r--r--SurvivalTest/Assets/Resources/Art/ui/weaponicon/light_saber.png (renamed from SurvivalTest/Assets/Resources/Art/ui/equipicon/light_saber.png)bin9411 -> 9411 bytes
-rw-r--r--SurvivalTest/Assets/Resources/Art/ui/weaponicon/light_saber.png.meta (renamed from SurvivalTest/Assets/Resources/Art/ui/equipicon/light_saber.png.meta)0
-rw-r--r--SurvivalTest/Assets/Resources/Art/ui/weaponicon/mystery_mask.png (renamed from SurvivalTest/Assets/Resources/Art/ui/equipicon/mystery_mask.png)bin14172 -> 14172 bytes
-rw-r--r--SurvivalTest/Assets/Resources/Art/ui/weaponicon/mystery_mask.png.meta (renamed from SurvivalTest/Assets/Resources/Art/ui/equipicon/mystery_mask.png.meta)0
-rw-r--r--SurvivalTest/Assets/Resources/Art/ui/weaponicon/tesla_coil.png (renamed from SurvivalTest/Assets/Resources/Art/ui/equipicon/tesla_coil.png)bin13489 -> 13489 bytes
-rw-r--r--SurvivalTest/Assets/Resources/Art/ui/weaponicon/tesla_coil.png.meta (renamed from SurvivalTest/Assets/Resources/Art/ui/equipicon/tesla_coil.png.meta)0
15 files changed, 1 insertions, 1 deletions
diff --git a/SurvivalTest/Assets/Resources/Art/ui/equipicon.meta b/SurvivalTest/Assets/Resources/Art/ui/weaponicon.meta
index b402ae1..0ca3c42 100644
--- a/SurvivalTest/Assets/Resources/Art/ui/equipicon.meta
+++ b/SurvivalTest/Assets/Resources/Art/ui/weaponicon.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: e749821f81bfed2428b1befd0927f182
+guid: d339f1fd84bbf184b8fe7847aaadfc04
folderAsset: yes
DefaultImporter:
externalObjects: {}
diff --git a/SurvivalTest/Assets/Resources/Art/ui/equipicon/boomerang.png b/SurvivalTest/Assets/Resources/Art/ui/weaponicon/boomerang.png
index c8571b8..c8571b8 100644
--- a/SurvivalTest/Assets/Resources/Art/ui/equipicon/boomerang.png
+++ b/SurvivalTest/Assets/Resources/Art/ui/weaponicon/boomerang.png
Binary files differ
diff --git a/SurvivalTest/Assets/Resources/Art/ui/equipicon/boomerang.png.meta b/SurvivalTest/Assets/Resources/Art/ui/weaponicon/boomerang.png.meta
index 4e936cf..4e936cf 100644
--- a/SurvivalTest/Assets/Resources/Art/ui/equipicon/boomerang.png.meta
+++ b/SurvivalTest/Assets/Resources/Art/ui/weaponicon/boomerang.png.meta
diff --git a/SurvivalTest/Assets/Resources/Art/ui/equipicon/glove.png b/SurvivalTest/Assets/Resources/Art/ui/weaponicon/glove.png
index e33bf32..e33bf32 100644
--- a/SurvivalTest/Assets/Resources/Art/ui/equipicon/glove.png
+++ b/SurvivalTest/Assets/Resources/Art/ui/weaponicon/glove.png
Binary files differ
diff --git a/SurvivalTest/Assets/Resources/Art/ui/equipicon/glove.png.meta b/SurvivalTest/Assets/Resources/Art/ui/weaponicon/glove.png.meta
index 3a2f65c..3a2f65c 100644
--- a/SurvivalTest/Assets/Resources/Art/ui/equipicon/glove.png.meta
+++ b/SurvivalTest/Assets/Resources/Art/ui/weaponicon/glove.png.meta
diff --git a/SurvivalTest/Assets/Resources/Art/ui/equipicon/grenade.png b/SurvivalTest/Assets/Resources/Art/ui/weaponicon/grenade.png
index 3036358..3036358 100644
--- a/SurvivalTest/Assets/Resources/Art/ui/equipicon/grenade.png
+++ b/SurvivalTest/Assets/Resources/Art/ui/weaponicon/grenade.png
Binary files differ
diff --git a/SurvivalTest/Assets/Resources/Art/ui/equipicon/grenade.png.meta b/SurvivalTest/Assets/Resources/Art/ui/weaponicon/grenade.png.meta
index 78c3200..78c3200 100644
--- a/SurvivalTest/Assets/Resources/Art/ui/equipicon/grenade.png.meta
+++ b/SurvivalTest/Assets/Resources/Art/ui/weaponicon/grenade.png.meta
diff --git a/SurvivalTest/Assets/Resources/Art/ui/equipicon/gun.png b/SurvivalTest/Assets/Resources/Art/ui/weaponicon/gun.png
index 0b5cab0..0b5cab0 100644
--- a/SurvivalTest/Assets/Resources/Art/ui/equipicon/gun.png
+++ b/SurvivalTest/Assets/Resources/Art/ui/weaponicon/gun.png
Binary files differ
diff --git a/SurvivalTest/Assets/Resources/Art/ui/equipicon/gun.png.meta b/SurvivalTest/Assets/Resources/Art/ui/weaponicon/gun.png.meta
index 8e738de..8e738de 100644
--- a/SurvivalTest/Assets/Resources/Art/ui/equipicon/gun.png.meta
+++ b/SurvivalTest/Assets/Resources/Art/ui/weaponicon/gun.png.meta
diff --git a/SurvivalTest/Assets/Resources/Art/ui/equipicon/light_saber.png b/SurvivalTest/Assets/Resources/Art/ui/weaponicon/light_saber.png
index 9fcb826..9fcb826 100644
--- a/SurvivalTest/Assets/Resources/Art/ui/equipicon/light_saber.png
+++ b/SurvivalTest/Assets/Resources/Art/ui/weaponicon/light_saber.png
Binary files differ
diff --git a/SurvivalTest/Assets/Resources/Art/ui/equipicon/light_saber.png.meta b/SurvivalTest/Assets/Resources/Art/ui/weaponicon/light_saber.png.meta
index 31cb26f..31cb26f 100644
--- a/SurvivalTest/Assets/Resources/Art/ui/equipicon/light_saber.png.meta
+++ b/SurvivalTest/Assets/Resources/Art/ui/weaponicon/light_saber.png.meta
diff --git a/SurvivalTest/Assets/Resources/Art/ui/equipicon/mystery_mask.png b/SurvivalTest/Assets/Resources/Art/ui/weaponicon/mystery_mask.png
index 6008995..6008995 100644
--- a/SurvivalTest/Assets/Resources/Art/ui/equipicon/mystery_mask.png
+++ b/SurvivalTest/Assets/Resources/Art/ui/weaponicon/mystery_mask.png
Binary files differ
diff --git a/SurvivalTest/Assets/Resources/Art/ui/equipicon/mystery_mask.png.meta b/SurvivalTest/Assets/Resources/Art/ui/weaponicon/mystery_mask.png.meta
index e719db3..e719db3 100644
--- a/SurvivalTest/Assets/Resources/Art/ui/equipicon/mystery_mask.png.meta
+++ b/SurvivalTest/Assets/Resources/Art/ui/weaponicon/mystery_mask.png.meta
diff --git a/SurvivalTest/Assets/Resources/Art/ui/equipicon/tesla_coil.png b/SurvivalTest/Assets/Resources/Art/ui/weaponicon/tesla_coil.png
index c2acabb..c2acabb 100644
--- a/SurvivalTest/Assets/Resources/Art/ui/equipicon/tesla_coil.png
+++ b/SurvivalTest/Assets/Resources/Art/ui/weaponicon/tesla_coil.png
Binary files differ
diff --git a/SurvivalTest/Assets/Resources/Art/ui/equipicon/tesla_coil.png.meta b/SurvivalTest/Assets/Resources/Art/ui/weaponicon/tesla_coil.png.meta
index d55aa57..d55aa57 100644
--- a/SurvivalTest/Assets/Resources/Art/ui/equipicon/tesla_coil.png.meta
+++ b/SurvivalTest/Assets/Resources/Art/ui/weaponicon/tesla_coil.png.meta