Merge pull request #99 from jotoland/DevelopmentBranch

DevelopmentBranch
jotoland · Apr 1, 2017 · 5151e7e · 5151e7e
2 parents 89a89f2 + 87c0495
commit 5151e7e
Show file tree

Hide file tree

Showing 205 changed files with 4,299 additions and 328 deletions.
diff --git a/.gitignore b/.gitignore
@@ -28,3 +28,4 @@ sysinfo.txt
 # Builds
 *.apk
 *.unitypackage
+uot/Assets/_Scenes/Level_02.unity
diff --git a/readme.txt b/readme.txt
@@ -1 +1 @@
-Universe of Things, is an arcade style game using 3D animations in a 2D environment. The plot  of the game is that you are a pilot (the player) in space traveling to a distant land. The journey takes you through a vast universe where you encounter different obstacles along the way. During your journey you fight off different space hazards and alien ships, which pose a threat to your survival. The game is not completed (won) until the player makes it to his/her home planet, which occurs after the completion of the final level.
+My edit
diff --git a/uot/Assets/Audio/SoundTrack/06 Holding Space.mp3 b/uot/Assets/Audio/SoundTrack/06 Holding Space.mp3
diff --git a/uot/Assets/Audio/SoundTrack/06 Holding Space.mp3.meta b/uot/Assets/Audio/SoundTrack/06 Holding Space.mp3.meta
diff --git a/uot/Assets/Audio/SoundTrack/06 Oleander.mp3 b/uot/Assets/Audio/SoundTrack/06 Oleander.mp3
diff --git a/uot/Assets/Audio/SoundTrack/06 Oleander.mp3.meta b/uot/Assets/Audio/SoundTrack/06 Oleander.mp3.meta
diff --git a/uot/Assets/Audio/SoundTrack/06 phoenix rising.mp3 b/uot/Assets/Audio/SoundTrack/06 phoenix rising.mp3
diff --git a/uot/Assets/Audio/SoundTrack/06 phoenix rising.mp3.meta b/uot/Assets/Audio/SoundTrack/06 phoenix rising.mp3.meta
diff --git a/uot/Assets/Audio/SoundTrack/Pitch Black- Ape to Angel (Bluetech Remix).mp3 b/uot/Assets/Audio/SoundTrack/Pitch Black- Ape to Angel (Bluetech Remix).mp3
diff --git a/uot/Assets/Audio/SoundTrack/Pitch Black- Ape to Angel (Bluetech Remix).mp3.meta b/uot/Assets/Audio/SoundTrack/Pitch Black- Ape to Angel (Bluetech Remix).mp3.meta
diff --git a/uot/Assets/Materials/Back_MauveSpaceBox.mat b/uot/Assets/Materials/Back_MauveSpaceBox.mat
diff --git a/uot/Assets/Materials/Back_MauveSpaceBox.mat.meta b/uot/Assets/Materials/Back_MauveSpaceBox.mat.meta
diff --git a/uot/Assets/Materials/comet.mat b/uot/Assets/Materials/comet.mat
diff --git a/uot/Assets/Materials/comet.mat.meta b/uot/Assets/Materials/comet.mat.meta
diff --git a/uot/Assets/Materials/prop_asteroid_01_mat.mat b/uot/Assets/Materials/prop_asteroid_01_mat.mat
diff --git a/uot/Assets/Materials/prop_asteroid_02_mat.mat b/uot/Assets/Materials/prop_asteroid_02_mat.mat
diff --git a/uot/Assets/Materials/tile_nebula_green_dff.mat b/uot/Assets/Materials/tile_nebula_green_dff.mat
diff --git a/uot/Assets/Models/Materials/vehicle_playerShip_glass_mat.mat b/uot/Assets/Models/Materials/vehicle_playerShip_glass_mat.mat
diff --git a/uot/Assets/Models/Materials/vehicle_playerShip_metal_mat.mat b/uot/Assets/Models/Materials/vehicle_playerShip_metal_mat.mat
diff --git a/uot/Assets/SpaceShips.meta b/uot/Assets/SpaceShips.meta
diff --git a/uot/Assets/SpaceShips/SpaceShip1.meta b/uot/Assets/SpaceShips/SpaceShip1.meta
diff --git a/uot/Assets/SpaceShips/SpaceShip1/Materials.meta b/uot/Assets/SpaceShips/SpaceShip1/Materials.meta
diff --git a/uot/Assets/SpaceShips/SpaceShip1/Materials/defaultMat.mat b/uot/Assets/SpaceShips/SpaceShip1/Materials/defaultMat.mat
diff --git a/uot/Assets/SpaceShips/SpaceShip1/Materials/defaultMat.mat.meta b/uot/Assets/SpaceShips/SpaceShip1/Materials/defaultMat.mat.meta
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		Universe of Things, is an arcade style game using 3D animations in a 2D environment. The plot of the game is that you are a pilot (the player) in space traveling to a distant land. The journey takes you through a vast universe where you encounter different obstacles along the way. During your journey you fight off different space hazards and alien ships, which pose a threat to your survival. The game is not completed (won) until the player makes it to his/her home planet, which occurs after the completion of the final level.
		My edit