Merge pull request #180 from jotoland/DevelopmentBranch

DevelopmentBranch
jotoland · Apr 21, 2017 · 8b76aca · 8b76aca
2 parents 5151e7e + dcb4e9f
commit 8b76aca
Show file tree

Hide file tree

Showing 945 changed files with 10,880 additions and 1,286 deletions.
diff --git a/.gitignore b/.gitignore
@@ -29,3 +29,5 @@ sysinfo.txt
 *.apk
 *.unitypackage
 uot/Assets/_Scenes/Level_02.unity
+
+uot/Assets/zImportedAssets/UnityTestTools/Examples/UnitTestExamples.meta
diff --git a/uot/Assets/Audio/AudioMixers/MainMix.mixer b/uot/Assets/Audio/AudioMixers/MainMix.mixer
diff --git a/uot/Assets/Audio/SoundTrack/07 Honey in the Heart.mp3 b/uot/Assets/Audio/SoundTrack/07 Honey in the Heart.mp3
diff --git a/uot/Assets/Audio/SoundTrack/07 Honey in the Heart.mp3.meta b/uot/Assets/Audio/SoundTrack/07 Honey in the Heart.mp3.meta
diff --git a/uot/Assets/LightMaps/PlayerSelection/ReflectionProbe-0.exr b/uot/Assets/LightMaps/PlayerSelection/ReflectionProbe-0.exr
diff --git a/uot/Assets/Materials/LEvel_4_Boss.mat b/uot/Assets/Materials/LEvel_4_Boss.mat
diff --git a/...05_hazards/Level_05_enemy 1 1.prefab.meta → uot/Assets/Materials/LEvel_4_Boss.mat.meta b/...05_hazards/Level_05_enemy 1 1.prefab.meta → uot/Assets/Materials/LEvel_4_Boss.mat.meta
diff --git a/uot/Assets/Materials/fx_bolt_orange.mat b/uot/Assets/Materials/fx_bolt_orange.mat
diff --git a/uot/Assets/Materials/prop_asteroid_03_mat.mat b/uot/Assets/Materials/prop_asteroid_03_mat.mat
diff --git a/uot/Assets/Materials/vehicle_enemyShip_glow_mat.mat b/uot/Assets/Materials/vehicle_enemyShip_glow_mat.mat
diff --git a/uot/Assets/Materials/vehicle_enemyShip_metal_mat 1.mat b/uot/Assets/Materials/vehicle_enemyShip_metal_mat 1.mat
diff --git a/uot/Assets/Materials/vehicle_playerShip_orange_dff.mat b/uot/Assets/Materials/vehicle_playerShip_orange_dff.mat
diff --git a/uot/Assets/Mobile Art.meta b/uot/Assets/Mobile Art.meta
diff --git a/uot/Assets/Mobile Art/MobileIcon.jpg b/uot/Assets/Mobile Art/MobileIcon.jpg
diff --git a/uot/Assets/Mobile Art/MobileIcon.jpg.meta b/uot/Assets/Mobile Art/MobileIcon.jpg.meta
diff --git a/uot/Assets/Mobile Art/MobileSplashScreen.jpg b/uot/Assets/Mobile Art/MobileSplashScreen.jpg
diff --git a/uot/Assets/Mobile Art/MobileSplashScreen.jpg.meta b/uot/Assets/Mobile Art/MobileSplashScreen.jpg.meta
diff --git a/uot/Assets/Mobile Art/SliderButton.png b/uot/Assets/Mobile Art/SliderButton.png