Merge pull request #34 from eskarpnes/develop

Develop
hackerspace-ntnu · Feb 28, 2018 · 7c0e747 · 7c0e747
2 parents 0dbb3e0 + bd6d8b4
commit 7c0e747
Show file tree

Hide file tree

Showing 474 changed files with 19,411 additions and 50,962 deletions.
diff --git a/Assets/NatureStarterKit.meta → Assets/Audio/Enemies/Bear.meta b/Assets/NatureStarterKit.meta → Assets/Audio/Enemies/Bear.meta
diff --git a/Assets/Audio/Enemies/Bear_death.ogg → Assets/Audio/Enemies/Bear/Bear_death.ogg b/Assets/Audio/Enemies/Bear_death.ogg → Assets/Audio/Enemies/Bear/Bear_death.ogg
diff --git a/Assets/Audio/Enemies/Bear_death.ogg.meta → ...ts/Audio/Enemies/Bear/Bear_death.ogg.meta b/Assets/Audio/Enemies/Bear_death.ogg.meta → ...ts/Audio/Enemies/Bear/Bear_death.ogg.meta
diff --git a/Assets/Audio/Enemies/Bear_hurt - 1.ogg → Assets/Audio/Enemies/Bear/Bear_hurt - 1.ogg b/Assets/Audio/Enemies/Bear_hurt - 1.ogg → Assets/Audio/Enemies/Bear/Bear_hurt - 1.ogg
diff --git a/Assets/Audio/Enemies/Bear_hurt - 1.ogg.meta → ...Audio/Enemies/Bear/Bear_hurt - 1.ogg.meta b/Assets/Audio/Enemies/Bear_hurt - 1.ogg.meta → ...Audio/Enemies/Bear/Bear_hurt - 1.ogg.meta
diff --git a/Assets/Audio/Enemies/Bear_hurt - 2.ogg → Assets/Audio/Enemies/Bear/Bear_hurt - 2.ogg b/Assets/Audio/Enemies/Bear_hurt - 2.ogg → Assets/Audio/Enemies/Bear/Bear_hurt - 2.ogg
diff --git a/Assets/Audio/Enemies/Bear_hurt - 2.ogg.meta → ...Audio/Enemies/Bear/Bear_hurt - 2.ogg.meta b/Assets/Audio/Enemies/Bear_hurt - 2.ogg.meta → ...Audio/Enemies/Bear/Bear_hurt - 2.ogg.meta
diff --git a/Assets/Audio/Enemies/Bear_hurt - 3.ogg → Assets/Audio/Enemies/Bear/Bear_hurt - 3.ogg b/Assets/Audio/Enemies/Bear_hurt - 3.ogg → Assets/Audio/Enemies/Bear/Bear_hurt - 3.ogg
diff --git a/Assets/Audio/Enemies/Bear_hurt - 3.ogg.meta → ...Audio/Enemies/Bear/Bear_hurt - 3.ogg.meta b/Assets/Audio/Enemies/Bear_hurt - 3.ogg.meta → ...Audio/Enemies/Bear/Bear_hurt - 3.ogg.meta
diff --git a/Assets/Audio/Enemies/Bear_idle - 1.ogg → Assets/Audio/Enemies/Bear/Bear_idle - 1.ogg b/Assets/Audio/Enemies/Bear_idle - 1.ogg → Assets/Audio/Enemies/Bear/Bear_idle - 1.ogg
diff --git a/Assets/Audio/Enemies/Bear_idle - 1.ogg.meta → ...Audio/Enemies/Bear/Bear_idle - 1.ogg.meta b/Assets/Audio/Enemies/Bear_idle - 1.ogg.meta → ...Audio/Enemies/Bear/Bear_idle - 1.ogg.meta
diff --git a/Assets/Audio/Enemies/Bear_idle - 2.ogg → Assets/Audio/Enemies/Bear/Bear_idle - 2.ogg b/Assets/Audio/Enemies/Bear_idle - 2.ogg → Assets/Audio/Enemies/Bear/Bear_idle - 2.ogg
diff --git a/Assets/Audio/Enemies/Bear_idle - 2.ogg.meta → ...Audio/Enemies/Bear/Bear_idle - 2.ogg.meta b/Assets/Audio/Enemies/Bear_idle - 2.ogg.meta → ...Audio/Enemies/Bear/Bear_idle - 2.ogg.meta
diff --git a/Assets/Audio/Enemies/Bear_idle - 3.ogg → Assets/Audio/Enemies/Bear/Bear_idle - 3.ogg b/Assets/Audio/Enemies/Bear_idle - 3.ogg → Assets/Audio/Enemies/Bear/Bear_idle - 3.ogg
diff --git a/Assets/Audio/Enemies/Bear_idle - 3.ogg.meta → ...Audio/Enemies/Bear/Bear_idle - 3.ogg.meta b/Assets/Audio/Enemies/Bear_idle - 3.ogg.meta → ...Audio/Enemies/Bear/Bear_idle - 3.ogg.meta
diff --git a/Assets/Audio/Enemies/Bear_idle - 4.ogg → Assets/Audio/Enemies/Bear/Bear_idle - 4.ogg b/Assets/Audio/Enemies/Bear_idle - 4.ogg → Assets/Audio/Enemies/Bear/Bear_idle - 4.ogg
diff --git a/Assets/Audio/Enemies/Bear_idle - 4.ogg.meta → ...Audio/Enemies/Bear/Bear_idle - 4.ogg.meta b/Assets/Audio/Enemies/Bear_idle - 4.ogg.meta → ...Audio/Enemies/Bear/Bear_idle - 4.ogg.meta
diff --git a/Assets/NatureStarterKit/Materials.meta → Assets/Audio/Enemies/Fox.meta b/Assets/NatureStarterKit/Materials.meta → Assets/Audio/Enemies/Fox.meta
diff --git a/Assets/Audio/Enemies/Fox_death - 1.ogg → Assets/Audio/Enemies/Fox/Fox_death - 1.ogg b/Assets/Audio/Enemies/Fox_death - 1.ogg → Assets/Audio/Enemies/Fox/Fox_death - 1.ogg
diff --git a/Assets/Audio/Enemies/Fox_death - 1.ogg.meta → .../Audio/Enemies/Fox/Fox_death - 1.ogg.meta b/Assets/Audio/Enemies/Fox_death - 1.ogg.meta → .../Audio/Enemies/Fox/Fox_death - 1.ogg.meta
diff --git a/Assets/Audio/Enemies/Fox_death - 2.ogg → Assets/Audio/Enemies/Fox/Fox_death - 2.ogg b/Assets/Audio/Enemies/Fox_death - 2.ogg → Assets/Audio/Enemies/Fox/Fox_death - 2.ogg
diff --git a/Assets/Audio/Enemies/Fox_death - 2.ogg.meta → .../Audio/Enemies/Fox/Fox_death - 2.ogg.meta b/Assets/Audio/Enemies/Fox_death - 2.ogg.meta → .../Audio/Enemies/Fox/Fox_death - 2.ogg.meta
diff --git a/Assets/Audio/Enemies/Fox_hurt - 1.ogg → Assets/Audio/Enemies/Fox/Fox_hurt - 1.ogg b/Assets/Audio/Enemies/Fox_hurt - 1.ogg → Assets/Audio/Enemies/Fox/Fox_hurt - 1.ogg
diff --git a/Assets/Audio/Enemies/Fox_hurt - 1.ogg.meta → ...s/Audio/Enemies/Fox/Fox_hurt - 1.ogg.meta b/Assets/Audio/Enemies/Fox_hurt - 1.ogg.meta → ...s/Audio/Enemies/Fox/Fox_hurt - 1.ogg.meta
diff --git a/Assets/Audio/Enemies/Fox_hurt - 2.ogg → Assets/Audio/Enemies/Fox/Fox_hurt - 2.ogg b/Assets/Audio/Enemies/Fox_hurt - 2.ogg → Assets/Audio/Enemies/Fox/Fox_hurt - 2.ogg
diff --git a/Assets/Audio/Enemies/Fox_hurt - 2.ogg.meta → ...s/Audio/Enemies/Fox/Fox_hurt - 2.ogg.meta b/Assets/Audio/Enemies/Fox_hurt - 2.ogg.meta → ...s/Audio/Enemies/Fox/Fox_hurt - 2.ogg.meta
diff --git a/Assets/Audio/Enemies/Fox_hurt - 3.ogg → Assets/Audio/Enemies/Fox/Fox_hurt - 3.ogg b/Assets/Audio/Enemies/Fox_hurt - 3.ogg → Assets/Audio/Enemies/Fox/Fox_hurt - 3.ogg
diff --git a/Assets/Audio/Enemies/Fox_hurt - 3.ogg.meta → ...s/Audio/Enemies/Fox/Fox_hurt - 3.ogg.meta b/Assets/Audio/Enemies/Fox_hurt - 3.ogg.meta → ...s/Audio/Enemies/Fox/Fox_hurt - 3.ogg.meta
diff --git a/Assets/Audio/Enemies/Fox_idle - 1.ogg → Assets/Audio/Enemies/Fox/Fox_idle - 1.ogg b/Assets/Audio/Enemies/Fox_idle - 1.ogg → Assets/Audio/Enemies/Fox/Fox_idle - 1.ogg
diff --git a/Assets/Audio/Enemies/Fox_idle - 1.ogg.meta → ...s/Audio/Enemies/Fox/Fox_idle - 1.ogg.meta b/Assets/Audio/Enemies/Fox_idle - 1.ogg.meta → ...s/Audio/Enemies/Fox/Fox_idle - 1.ogg.meta
diff --git a/Assets/Audio/Enemies/Fox_idle - 2.ogg → Assets/Audio/Enemies/Fox/Fox_idle - 2.ogg b/Assets/Audio/Enemies/Fox_idle - 2.ogg → Assets/Audio/Enemies/Fox/Fox_idle - 2.ogg
diff --git a/Assets/Audio/Enemies/Fox_idle - 2.ogg.meta → ...s/Audio/Enemies/Fox/Fox_idle - 2.ogg.meta b/Assets/Audio/Enemies/Fox_idle - 2.ogg.meta → ...s/Audio/Enemies/Fox/Fox_idle - 2.ogg.meta
diff --git a/Assets/Audio/Enemies/Fox_idle - 3.ogg → Assets/Audio/Enemies/Fox/Fox_idle - 3.ogg b/Assets/Audio/Enemies/Fox_idle - 3.ogg → Assets/Audio/Enemies/Fox/Fox_idle - 3.ogg
diff --git a/Assets/Audio/Enemies/Fox_idle - 3.ogg.meta → ...s/Audio/Enemies/Fox/Fox_idle - 3.ogg.meta b/Assets/Audio/Enemies/Fox_idle - 3.ogg.meta → ...s/Audio/Enemies/Fox/Fox_idle - 3.ogg.meta
diff --git a/Assets/NatureStarterKit/Animations.meta → Assets/Audio/Enemies/Wolf.meta b/Assets/NatureStarterKit/Animations.meta → Assets/Audio/Enemies/Wolf.meta
diff --git a/Assets/Audio/Enemies/Wolf_barks - 1.ogg → Assets/Audio/Enemies/Wolf/Wolf_barks - 1.ogg b/Assets/Audio/Enemies/Wolf_barks - 1.ogg → Assets/Audio/Enemies/Wolf/Wolf_barks - 1.ogg
diff --git a/Assets/Audio/Enemies/Wolf_barks - 1.ogg.meta → ...udio/Enemies/Wolf/Wolf_barks - 1.ogg.meta b/Assets/Audio/Enemies/Wolf_barks - 1.ogg.meta → ...udio/Enemies/Wolf/Wolf_barks - 1.ogg.meta
diff --git a/Assets/Audio/Enemies/Wolf_barks - 2.ogg → Assets/Audio/Enemies/Wolf/Wolf_barks - 2.ogg b/Assets/Audio/Enemies/Wolf_barks - 2.ogg → Assets/Audio/Enemies/Wolf/Wolf_barks - 2.ogg
diff --git a/Assets/Audio/Enemies/Wolf_barks - 2.ogg.meta → ...udio/Enemies/Wolf/Wolf_barks - 2.ogg.meta b/Assets/Audio/Enemies/Wolf_barks - 2.ogg.meta → ...udio/Enemies/Wolf/Wolf_barks - 2.ogg.meta
diff --git a/Assets/Audio/Enemies/Wolf_barks - 3.ogg → Assets/Audio/Enemies/Wolf/Wolf_barks - 3.ogg b/Assets/Audio/Enemies/Wolf_barks - 3.ogg → Assets/Audio/Enemies/Wolf/Wolf_barks - 3.ogg
diff --git a/Assets/Audio/Enemies/Wolf_barks - 3.ogg.meta → ...udio/Enemies/Wolf/Wolf_barks - 3.ogg.meta b/Assets/Audio/Enemies/Wolf_barks - 3.ogg.meta → ...udio/Enemies/Wolf/Wolf_barks - 3.ogg.meta
diff --git a/Assets/Audio/Enemies/Wolf_barks - 4.ogg → Assets/Audio/Enemies/Wolf/Wolf_barks - 4.ogg b/Assets/Audio/Enemies/Wolf_barks - 4.ogg → Assets/Audio/Enemies/Wolf/Wolf_barks - 4.ogg
diff --git a/Assets/Audio/Enemies/Wolf_barks - 4.ogg.meta → ...udio/Enemies/Wolf/Wolf_barks - 4.ogg.meta b/Assets/Audio/Enemies/Wolf_barks - 4.ogg.meta → ...udio/Enemies/Wolf/Wolf_barks - 4.ogg.meta
diff --git a/Assets/Audio/Enemies/Wolf_barks - 5.ogg → Assets/Audio/Enemies/Wolf/Wolf_barks - 5.ogg b/Assets/Audio/Enemies/Wolf_barks - 5.ogg → Assets/Audio/Enemies/Wolf/Wolf_barks - 5.ogg
diff --git a/Assets/Audio/Enemies/Wolf_barks - 5.ogg.meta → ...udio/Enemies/Wolf/Wolf_barks - 5.ogg.meta b/Assets/Audio/Enemies/Wolf_barks - 5.ogg.meta → ...udio/Enemies/Wolf/Wolf_barks - 5.ogg.meta
diff --git a/Assets/Audio/Enemies/Wolf_death.ogg → Assets/Audio/Enemies/Wolf/Wolf_death.ogg b/Assets/Audio/Enemies/Wolf_death.ogg → Assets/Audio/Enemies/Wolf/Wolf_death.ogg
diff --git a/Assets/Audio/Enemies/Wolf_death.ogg.meta → ...ts/Audio/Enemies/Wolf/Wolf_death.ogg.meta b/Assets/Audio/Enemies/Wolf_death.ogg.meta → ...ts/Audio/Enemies/Wolf/Wolf_death.ogg.meta
diff --git a/Assets/Audio/Enemies/Wolf_growl - 1.ogg → Assets/Audio/Enemies/Wolf/Wolf_growl - 1.ogg b/Assets/Audio/Enemies/Wolf_growl - 1.ogg → Assets/Audio/Enemies/Wolf/Wolf_growl - 1.ogg
diff --git a/Assets/Audio/Enemies/Wolf_growl - 1.ogg.meta → ...udio/Enemies/Wolf/Wolf_growl - 1.ogg.meta b/Assets/Audio/Enemies/Wolf_growl - 1.ogg.meta → ...udio/Enemies/Wolf/Wolf_growl - 1.ogg.meta
diff --git a/Assets/Audio/Enemies/Wolf_growl - 2.ogg → Assets/Audio/Enemies/Wolf/Wolf_growl - 2.ogg b/Assets/Audio/Enemies/Wolf_growl - 2.ogg → Assets/Audio/Enemies/Wolf/Wolf_growl - 2.ogg
diff --git a/Assets/Audio/Enemies/Wolf_growl - 2.ogg.meta → ...udio/Enemies/Wolf/Wolf_growl - 2.ogg.meta b/Assets/Audio/Enemies/Wolf_growl - 2.ogg.meta → ...udio/Enemies/Wolf/Wolf_growl - 2.ogg.meta
diff --git a/Assets/Audio/Enemies/Wolf_growl - 3.ogg → Assets/Audio/Enemies/Wolf/Wolf_growl - 3.ogg b/Assets/Audio/Enemies/Wolf_growl - 3.ogg → Assets/Audio/Enemies/Wolf/Wolf_growl - 3.ogg
diff --git a/Assets/Audio/Enemies/Wolf_growl - 3.ogg.meta → ...udio/Enemies/Wolf/Wolf_growl - 3.ogg.meta b/Assets/Audio/Enemies/Wolf_growl - 3.ogg.meta → ...udio/Enemies/Wolf/Wolf_growl - 3.ogg.meta
diff --git a/Assets/Audio/Enemies/Wolf_growl - 4.ogg → Assets/Audio/Enemies/Wolf/Wolf_growl - 4.ogg b/Assets/Audio/Enemies/Wolf_growl - 4.ogg → Assets/Audio/Enemies/Wolf/Wolf_growl - 4.ogg
diff --git a/Assets/Audio/Enemies/Wolf_growl - 4.ogg.meta → ...udio/Enemies/Wolf/Wolf_growl - 4.ogg.meta b/Assets/Audio/Enemies/Wolf_growl - 4.ogg.meta → ...udio/Enemies/Wolf/Wolf_growl - 4.ogg.meta
diff --git a/Assets/Audio/Enemies/Wolf_growl - 5.ogg → Assets/Audio/Enemies/Wolf/Wolf_growl - 5.ogg b/Assets/Audio/Enemies/Wolf_growl - 5.ogg → Assets/Audio/Enemies/Wolf/Wolf_growl - 5.ogg
diff --git a/Assets/Audio/Enemies/Wolf_growl - 5.ogg.meta → ...udio/Enemies/Wolf/Wolf_growl - 5.ogg.meta b/Assets/Audio/Enemies/Wolf_growl - 5.ogg.meta → ...udio/Enemies/Wolf/Wolf_growl - 5.ogg.meta
diff --git a/Assets/Audio/Enemies/Wolf_growl - 6.ogg → Assets/Audio/Enemies/Wolf/Wolf_growl - 6.ogg b/Assets/Audio/Enemies/Wolf_growl - 6.ogg → Assets/Audio/Enemies/Wolf/Wolf_growl - 6.ogg
diff --git a/Assets/Audio/Enemies/Wolf_growl - 6.ogg.meta → ...udio/Enemies/Wolf/Wolf_growl - 6.ogg.meta b/Assets/Audio/Enemies/Wolf_growl - 6.ogg.meta → ...udio/Enemies/Wolf/Wolf_growl - 6.ogg.meta
diff --git a/Assets/Audio/Enemies/Wolf_hurt - 1.ogg → Assets/Audio/Enemies/Wolf/Wolf_hurt - 1.ogg b/Assets/Audio/Enemies/Wolf_hurt - 1.ogg → Assets/Audio/Enemies/Wolf/Wolf_hurt - 1.ogg
diff --git a/Assets/Audio/Enemies/Wolf_hurt - 1.ogg.meta → ...Audio/Enemies/Wolf/Wolf_hurt - 1.ogg.meta b/Assets/Audio/Enemies/Wolf_hurt - 1.ogg.meta → ...Audio/Enemies/Wolf/Wolf_hurt - 1.ogg.meta
diff --git a/Assets/Audio/Enemies/Wolf_hurt - 2.ogg → Assets/Audio/Enemies/Wolf/Wolf_hurt - 2.ogg b/Assets/Audio/Enemies/Wolf_hurt - 2.ogg → Assets/Audio/Enemies/Wolf/Wolf_hurt - 2.ogg
diff --git a/Assets/Audio/Enemies/Wolf_hurt - 2.ogg.meta → ...Audio/Enemies/Wolf/Wolf_hurt - 2.ogg.meta b/Assets/Audio/Enemies/Wolf_hurt - 2.ogg.meta → ...Audio/Enemies/Wolf/Wolf_hurt - 2.ogg.meta
diff --git a/Assets/Audio/Enemies/Wolf_hurt - 3.ogg → Assets/Audio/Enemies/Wolf/Wolf_hurt - 3.ogg b/Assets/Audio/Enemies/Wolf_hurt - 3.ogg → Assets/Audio/Enemies/Wolf/Wolf_hurt - 3.ogg
diff --git a/Assets/Audio/Enemies/Wolf_hurt - 3.ogg.meta → ...Audio/Enemies/Wolf/Wolf_hurt - 3.ogg.meta b/Assets/Audio/Enemies/Wolf_hurt - 3.ogg.meta → ...Audio/Enemies/Wolf/Wolf_hurt - 3.ogg.meta
diff --git a/Assets/Audio/Enemies/Wolf_hurt - 4.ogg → Assets/Audio/Enemies/Wolf/Wolf_hurt - 4.ogg b/Assets/Audio/Enemies/Wolf_hurt - 4.ogg → Assets/Audio/Enemies/Wolf/Wolf_hurt - 4.ogg
diff --git a/Assets/Audio/Enemies/Wolf_hurt - 4.ogg.meta → ...Audio/Enemies/Wolf/Wolf_hurt - 4.ogg.meta b/Assets/Audio/Enemies/Wolf_hurt - 4.ogg.meta → ...Audio/Enemies/Wolf/Wolf_hurt - 4.ogg.meta
diff --git a/Assets/Audio/Enemies/Wolf_hurt - 5.ogg → Assets/Audio/Enemies/Wolf/Wolf_hurt - 5.ogg b/Assets/Audio/Enemies/Wolf_hurt - 5.ogg → Assets/Audio/Enemies/Wolf/Wolf_hurt - 5.ogg
diff --git a/Assets/Audio/Enemies/Wolf_hurt - 5.ogg.meta → ...Audio/Enemies/Wolf/Wolf_hurt - 5.ogg.meta b/Assets/Audio/Enemies/Wolf_hurt - 5.ogg.meta → ...Audio/Enemies/Wolf/Wolf_hurt - 5.ogg.meta
diff --git a/Assets/Audio/Music/Lose_music.mp3 b/Assets/Audio/Music/Lose_music.mp3