Merge branch 'DevelopmentBranch' into Level_01_BeatsPerMinute

jotoland · Mar 27, 2017 · ffb1e05 · ffb1e05
2 parents 7da3218 + 56070c2
commit ffb1e05
Show file tree

Hide file tree

Showing 12 changed files with 285 additions and 170 deletions.
diff --git a/uot/Assets/Materials/Back_MauveSpaceBox.mat b/uot/Assets/Materials/Back_MauveSpaceBox.mat
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/_Prefabs/Hazards_Enemy/Level_04_hazards/Level_4_comet.prefab b/uot/Assets/_Prefabs/Hazards_Enemy/Level_04_hazards/Level_4_comet.prefab
diff --git a/uot/Assets/_Prefabs/Hazards_Enemy/Level_04_hazards/Level_4_comet.prefab.meta b/uot/Assets/_Prefabs/Hazards_Enemy/Level_04_hazards/Level_4_comet.prefab.meta
diff --git a/uot/Assets/_Prefabs/Hazards_Enemy/Level_04_hazards/Level_4_comet_slow.prefab b/uot/Assets/_Prefabs/Hazards_Enemy/Level_04_hazards/Level_4_comet_slow.prefab
diff --git a/uot/Assets/_Prefabs/Hazards_Enemy/Level_04_hazards/Level_4_comet_slow.prefab.meta b/uot/Assets/_Prefabs/Hazards_Enemy/Level_04_hazards/Level_4_comet_slow.prefab.meta
diff --git a/uot/Assets/_Scenes/Level_04.unity b/uot/Assets/_Scenes/Level_04.unity
diff --git a/uot/Assets/_Scenes/Level_04.unity.meta b/uot/Assets/_Scenes/Level_04.unity.meta