Merge pull request #32 from eskarpnes/develop

Develop
hackerspace-ntnu · Feb 8, 2018 · 0dbb3e0 · 0dbb3e0
2 parents ec3437e + 18d529d
commit 0dbb3e0
Show file tree

Hide file tree

Showing 1,721 changed files with 210,566 additions and 39,441 deletions.
diff --git a/Assets/Audio/Blastwave_FX_ArrowImpactWood_BW.54267.mp3.meta b/Assets/Audio/Blastwave_FX_ArrowImpactWood_BW.54267.mp3.meta
diff --git a/Assets/Audio/Campfire_loop.mp3 b/Assets/Audio/Campfire_loop.mp3
diff --git a/Assets/Audio/Campfire_loop.mp3.meta b/Assets/Audio/Campfire_loop.mp3.meta
diff --git a/Assets/Audio/Crows.ogg b/Assets/Audio/Crows.ogg
diff --git a/Assets/Audio/Crows.ogg.meta b/Assets/Audio/Crows.ogg.meta
diff --git a/Assets/Audio/Crows_fade.ogg b/Assets/Audio/Crows_fade.ogg
diff --git a/Assets/Audio/Crows_fade.ogg.meta b/Assets/Audio/Crows_fade.ogg.meta
diff --git a/Assets/Audio/Enemies.meta b/Assets/Audio/Enemies.meta
diff --git a/Assets/Audio/Enemies/Bear_death.ogg b/Assets/Audio/Enemies/Bear_death.ogg
diff --git a/Assets/Audio/Enemies/Bear_death.ogg.meta b/Assets/Audio/Enemies/Bear_death.ogg.meta
diff --git a/Assets/Audio/Enemies/Bear_hurt - 1.ogg b/Assets/Audio/Enemies/Bear_hurt - 1.ogg
diff --git a/Assets/Audio/Enemies/Bear_hurt - 1.ogg.meta b/Assets/Audio/Enemies/Bear_hurt - 1.ogg.meta
diff --git a/Assets/Audio/Enemies/Bear_hurt - 2.ogg b/Assets/Audio/Enemies/Bear_hurt - 2.ogg
diff --git a/Assets/Audio/Enemies/Bear_hurt - 2.ogg.meta b/Assets/Audio/Enemies/Bear_hurt - 2.ogg.meta
diff --git a/Assets/Audio/Enemies/Bear_hurt - 3.ogg b/Assets/Audio/Enemies/Bear_hurt - 3.ogg
diff --git a/Assets/Audio/Enemies/Bear_hurt - 3.ogg.meta b/Assets/Audio/Enemies/Bear_hurt - 3.ogg.meta
diff --git a/Assets/Audio/Enemies/Bear_idle - 1.ogg b/Assets/Audio/Enemies/Bear_idle - 1.ogg
diff --git a/Assets/Audio/Enemies/Bear_idle - 1.ogg.meta b/Assets/Audio/Enemies/Bear_idle - 1.ogg.meta
diff --git a/Assets/Audio/Enemies/Bear_idle - 2.ogg b/Assets/Audio/Enemies/Bear_idle - 2.ogg
diff --git a/Assets/Audio/Enemies/Bear_idle - 2.ogg.meta b/Assets/Audio/Enemies/Bear_idle - 2.ogg.meta
diff --git a/Assets/Audio/Enemies/Bear_idle - 3.ogg b/Assets/Audio/Enemies/Bear_idle - 3.ogg
diff --git a/Assets/Audio/Enemies/Bear_idle - 3.ogg.meta b/Assets/Audio/Enemies/Bear_idle - 3.ogg.meta
diff --git a/Assets/Audio/Enemies/Bear_idle - 4.ogg b/Assets/Audio/Enemies/Bear_idle - 4.ogg
diff --git a/Assets/Audio/Enemies/Bear_idle - 4.ogg.meta b/Assets/Audio/Enemies/Bear_idle - 4.ogg.meta
diff --git a/Assets/Audio/Enemies/Fox_death - 1.ogg b/Assets/Audio/Enemies/Fox_death - 1.ogg
diff --git a/Assets/Audio/Enemies/Fox_death - 1.ogg.meta b/Assets/Audio/Enemies/Fox_death - 1.ogg.meta
diff --git a/Assets/Audio/Enemies/Fox_death - 2.ogg b/Assets/Audio/Enemies/Fox_death - 2.ogg
diff --git a/Assets/Audio/Enemies/Fox_death - 2.ogg.meta b/Assets/Audio/Enemies/Fox_death - 2.ogg.meta
diff --git a/Assets/Audio/Enemies/Fox_hurt - 1.ogg b/Assets/Audio/Enemies/Fox_hurt - 1.ogg
diff --git a/Assets/Audio/Enemies/Fox_hurt - 1.ogg.meta b/Assets/Audio/Enemies/Fox_hurt - 1.ogg.meta
diff --git a/Assets/Audio/Enemies/Fox_hurt - 2.ogg b/Assets/Audio/Enemies/Fox_hurt - 2.ogg
diff --git a/Assets/Audio/Enemies/Fox_hurt - 2.ogg.meta b/Assets/Audio/Enemies/Fox_hurt - 2.ogg.meta
diff --git a/Assets/Audio/Enemies/Fox_hurt - 3.ogg b/Assets/Audio/Enemies/Fox_hurt - 3.ogg