merged with john's work, build setting lost, rebuilding and merging w…

…ith my test scene. PULL before next PUSH plz
GameDev · Oct 9, 2013 · 3bb53d5 · 3bb53d5
1 parent 44e8932
commit 3bb53d5
Show file tree

Hide file tree

Showing 160 changed files with 3,316 additions and 9 deletions.
diff --git a/Guardian of Silverkeep/Assets/Music.meta b/Guardian of Silverkeep/Assets/Music.meta
diff --git a/Guardian of Silverkeep/Assets/Music/Game Over Music.ogg b/Guardian of Silverkeep/Assets/Music/Game Over Music.ogg
diff --git a/Guardian of Silverkeep/Assets/Music/Game Over Music.ogg.meta b/Guardian of Silverkeep/Assets/Music/Game Over Music.ogg.meta
diff --git a/Guardian of Silverkeep/Assets/Music/Main Menu.ogg b/Guardian of Silverkeep/Assets/Music/Main Menu.ogg
diff --git a/Guardian of Silverkeep/Assets/Music/Main Menu.ogg.meta b/Guardian of Silverkeep/Assets/Music/Main Menu.ogg.meta
diff --git a/Guardian of Silverkeep/Assets/Music/Music.meta b/Guardian of Silverkeep/Assets/Music/Music.meta
diff --git a/Guardian of Silverkeep/Assets/Music/Music/Music.meta b/Guardian of Silverkeep/Assets/Music/Music/Music.meta
diff --git a/Guardian of Silverkeep/Assets/Music/Music/Music/Day Time Draft 1.wav b/Guardian of Silverkeep/Assets/Music/Music/Music/Day Time Draft 1.wav
diff --git a/Guardian of Silverkeep/Assets/Music/Music/Music/Day Time Draft 1.wav.meta b/Guardian of Silverkeep/Assets/Music/Music/Music/Day Time Draft 1.wav.meta
diff --git a/Guardian of Silverkeep/Assets/Music/Music/Music/Game Over Music.wav b/Guardian of Silverkeep/Assets/Music/Music/Music/Game Over Music.wav
diff --git a/Guardian of Silverkeep/Assets/Music/Music/Music/Game Over Music.wav.meta b/Guardian of Silverkeep/Assets/Music/Music/Music/Game Over Music.wav.meta
diff --git a/Guardian of Silverkeep/Assets/Music/Music/Music/Game Over Sound.wav b/Guardian of Silverkeep/Assets/Music/Music/Music/Game Over Sound.wav
diff --git a/Guardian of Silverkeep/Assets/Music/Music/Music/Game Over Sound.wav.meta b/Guardian of Silverkeep/Assets/Music/Music/Music/Game Over Sound.wav.meta
diff --git a/Guardian of Silverkeep/Assets/Music/Music/Music/Main Menu 2.wav b/Guardian of Silverkeep/Assets/Music/Music/Music/Main Menu 2.wav
diff --git a/Guardian of Silverkeep/Assets/Music/Music/Music/Main Menu 2.wav.meta b/Guardian of Silverkeep/Assets/Music/Music/Music/Main Menu 2.wav.meta
diff --git a/Guardian of Silverkeep/Assets/Music/Music/Music/Main Menu Draft 1.wav b/Guardian of Silverkeep/Assets/Music/Music/Music/Main Menu Draft 1.wav
diff --git a/Guardian of Silverkeep/Assets/Music/Music/Music/Main Menu Draft 1.wav.meta b/Guardian of Silverkeep/Assets/Music/Music/Music/Main Menu Draft 1.wav.meta
diff --git a/Guardian of Silverkeep/Assets/Music/Music/Music/Main Menu Draft 2.wav b/Guardian of Silverkeep/Assets/Music/Music/Music/Main Menu Draft 2.wav
diff --git a/Guardian of Silverkeep/Assets/Music/Music/Music/Main Menu Draft 2.wav.meta b/Guardian of Silverkeep/Assets/Music/Music/Music/Main Menu Draft 2.wav.meta
diff --git a/Guardian of Silverkeep/Assets/Music/Music/Music/Night Opening.wav b/Guardian of Silverkeep/Assets/Music/Music/Music/Night Opening.wav
diff --git a/Guardian of Silverkeep/Assets/Music/Music/Music/Night Opening.wav.meta b/Guardian of Silverkeep/Assets/Music/Music/Music/Night Opening.wav.meta
diff --git a/Guardian of Silverkeep/Assets/Music/Music/Music/Night Time 2.wav b/Guardian of Silverkeep/Assets/Music/Music/Music/Night Time 2.wav
diff --git a/Guardian of Silverkeep/Assets/Music/Music/Music/Night Time 2.wav.meta b/Guardian of Silverkeep/Assets/Music/Music/Music/Night Time 2.wav.meta
diff --git a/Guardian of Silverkeep/Assets/Music/Music/Music/Night Time Draft 3 Part 1.wav b/Guardian of Silverkeep/Assets/Music/Music/Music/Night Time Draft 3 Part 1.wav
diff --git a/Guardian of Silverkeep/Assets/Music/Music/Music/Night Time Draft 3 Part 1.wav.meta b/Guardian of Silverkeep/Assets/Music/Music/Music/Night Time Draft 3 Part 1.wav.meta
diff --git a/Guardian of Silverkeep/Assets/Music/Music/Music/Night Time draft 3 part 2.wav b/Guardian of Silverkeep/Assets/Music/Music/Music/Night Time draft 3 part 2.wav
diff --git a/Guardian of Silverkeep/Assets/Music/Music/Music/Night Time draft 3 part 2.wav.meta b/Guardian of Silverkeep/Assets/Music/Music/Music/Night Time draft 3 part 2.wav.meta
diff --git a/Guardian of Silverkeep/Assets/Music/Music/Music/Victory.wav b/Guardian of Silverkeep/Assets/Music/Music/Music/Victory.wav
diff --git a/Guardian of Silverkeep/Assets/Music/Music/Music/Victory.wav.meta b/Guardian of Silverkeep/Assets/Music/Music/Music/Victory.wav.meta
diff --git a/Guardian of Silverkeep/Assets/Music/Music/OGG Music.meta b/Guardian of Silverkeep/Assets/Music/Music/OGG Music.meta
diff --git a/Guardian of Silverkeep/Assets/Music/Music/OGG Music/Day Time.ogg b/Guardian of Silverkeep/Assets/Music/Music/OGG Music/Day Time.ogg
diff --git a/Guardian of Silverkeep/Assets/Music/Music/OGG Music/Day Time.ogg.meta b/Guardian of Silverkeep/Assets/Music/Music/OGG Music/Day Time.ogg.meta
diff --git a/Guardian of Silverkeep/Assets/Music/Music/OGG Music/Game Over Music.ogg b/Guardian of Silverkeep/Assets/Music/Music/OGG Music/Game Over Music.ogg
diff --git a/Guardian of Silverkeep/Assets/Music/Music/OGG Music/Game Over Music.ogg.meta b/Guardian of Silverkeep/Assets/Music/Music/OGG Music/Game Over Music.ogg.meta
diff --git a/Guardian of Silverkeep/Assets/Music/Music/OGG Music/Game Over Sound.ogg b/Guardian of Silverkeep/Assets/Music/Music/OGG Music/Game Over Sound.ogg
diff --git a/Guardian of Silverkeep/Assets/Music/Music/OGG Music/Game Over Sound.ogg.meta b/Guardian of Silverkeep/Assets/Music/Music/OGG Music/Game Over Sound.ogg.meta
diff --git a/Guardian of Silverkeep/Assets/Music/Music/OGG Music/Main Menu.ogg b/Guardian of Silverkeep/Assets/Music/Music/OGG Music/Main Menu.ogg
diff --git a/Guardian of Silverkeep/Assets/Music/Music/OGG Music/Main Menu.ogg.meta b/Guardian of Silverkeep/Assets/Music/Music/OGG Music/Main Menu.ogg.meta
diff --git a/Guardian of Silverkeep/Assets/Music/Music/OGG Sound FX.meta b/Guardian of Silverkeep/Assets/Music/Music/OGG Sound FX.meta
diff --git a/Guardian of Silverkeep/Assets/Music/Music/OGG Sound FX/Death.ogg b/Guardian of Silverkeep/Assets/Music/Music/OGG Sound FX/Death.ogg
diff --git a/Guardian of Silverkeep/Assets/Music/Music/OGG Sound FX/Death.ogg.meta b/Guardian of Silverkeep/Assets/Music/Music/OGG Sound FX/Death.ogg.meta
diff --git a/Guardian of Silverkeep/Assets/Music/Music/OGG Sound FX/Explosion 1.ogg b/Guardian of Silverkeep/Assets/Music/Music/OGG Sound FX/Explosion 1.ogg
diff --git a/Guardian of Silverkeep/Assets/Music/Music/OGG Sound FX/Explosion 1.ogg.meta b/Guardian of Silverkeep/Assets/Music/Music/OGG Sound FX/Explosion 1.ogg.meta
diff --git a/Guardian of Silverkeep/Assets/Music/Music/OGG Sound FX/Game Over Sound.ogg b/Guardian of Silverkeep/Assets/Music/Music/OGG Sound FX/Game Over Sound.ogg
diff --git a/Guardian of Silverkeep/Assets/Music/Music/OGG Sound FX/Game Over Sound.ogg.meta b/Guardian of Silverkeep/Assets/Music/Music/OGG Sound FX/Game Over Sound.ogg.meta
diff --git a/Guardian of Silverkeep/Assets/Music/Music/OGG Sound FX/Health.ogg b/Guardian of Silverkeep/Assets/Music/Music/OGG Sound FX/Health.ogg
diff --git a/Guardian of Silverkeep/Assets/Music/Music/OGG Sound FX/Health.ogg.meta b/Guardian of Silverkeep/Assets/Music/Music/OGG Sound FX/Health.ogg.meta
diff --git a/Guardian of Silverkeep/Assets/Music/Music/OGG Sound FX/Hit 1.ogg b/Guardian of Silverkeep/Assets/Music/Music/OGG Sound FX/Hit 1.ogg
diff --git a/Guardian of Silverkeep/Assets/Music/Music/OGG Sound FX/Hit 1.ogg.meta b/Guardian of Silverkeep/Assets/Music/Music/OGG Sound FX/Hit 1.ogg.meta
diff --git a/Guardian of Silverkeep/Assets/Music/Music/OGG Sound FX/Hit 10.ogg b/Guardian of Silverkeep/Assets/Music/Music/OGG Sound FX/Hit 10.ogg
diff --git a/Guardian of Silverkeep/Assets/Music/Music/OGG Sound FX/Hit 10.ogg.meta b/Guardian of Silverkeep/Assets/Music/Music/OGG Sound FX/Hit 10.ogg.meta
diff --git a/Guardian of Silverkeep/Assets/Music/Music/OGG Sound FX/Hit 2.ogg b/Guardian of Silverkeep/Assets/Music/Music/OGG Sound FX/Hit 2.ogg
diff --git a/Guardian of Silverkeep/Assets/Music/Music/OGG Sound FX/Hit 2.ogg.meta b/Guardian of Silverkeep/Assets/Music/Music/OGG Sound FX/Hit 2.ogg.meta
diff --git a/Guardian of Silverkeep/Assets/Music/Music/OGG Sound FX/Hit 3.ogg b/Guardian of Silverkeep/Assets/Music/Music/OGG Sound FX/Hit 3.ogg
diff --git a/Guardian of Silverkeep/Assets/Music/Music/OGG Sound FX/Hit 3.ogg.meta b/Guardian of Silverkeep/Assets/Music/Music/OGG Sound FX/Hit 3.ogg.meta
diff --git a/Guardian of Silverkeep/Assets/Music/Music/OGG Sound FX/Hit 4.ogg b/Guardian of Silverkeep/Assets/Music/Music/OGG Sound FX/Hit 4.ogg
diff --git a/Guardian of Silverkeep/Assets/Music/Music/OGG Sound FX/Hit 4.ogg.meta b/Guardian of Silverkeep/Assets/Music/Music/OGG Sound FX/Hit 4.ogg.meta
diff --git a/Guardian of Silverkeep/Assets/Music/Music/OGG Sound FX/Hit 5.ogg b/Guardian of Silverkeep/Assets/Music/Music/OGG Sound FX/Hit 5.ogg
diff --git a/Guardian of Silverkeep/Assets/Music/Music/OGG Sound FX/Hit 5.ogg.meta b/Guardian of Silverkeep/Assets/Music/Music/OGG Sound FX/Hit 5.ogg.meta
diff --git a/Guardian of Silverkeep/Assets/Music/Music/OGG Sound FX/Hit 6.ogg b/Guardian of Silverkeep/Assets/Music/Music/OGG Sound FX/Hit 6.ogg
diff --git a/Guardian of Silverkeep/Assets/Music/Music/OGG Sound FX/Hit 6.ogg.meta b/Guardian of Silverkeep/Assets/Music/Music/OGG Sound FX/Hit 6.ogg.meta
diff --git a/Guardian of Silverkeep/Assets/Music/Music/OGG Sound FX/Hit 7.ogg b/Guardian of Silverkeep/Assets/Music/Music/OGG Sound FX/Hit 7.ogg