Merge branch 'master' of https://github.com/AdronTech/GGJ_2017

AdronTech · Jan 22, 2017 · 45b1035 · 45b1035
2 parents e6434b2 + 443cc86
commit 45b1035
Show file tree

Hide file tree

Showing 45 changed files with 4,346 additions and 11 deletions.
diff --git a/GGJ17/Assets/Script/WorldControl.meta → GGJ17/Assets/Audio.meta b/GGJ17/Assets/Script/WorldControl.meta → GGJ17/Assets/Audio.meta
diff --git a/GGJ17/Assets/Audio/Nonstop.mp3 b/GGJ17/Assets/Audio/Nonstop.mp3
diff --git a/GGJ17/Assets/Audio/Nonstop.mp3.meta b/GGJ17/Assets/Audio/Nonstop.mp3.meta
diff --git a/GGJ17/Assets/Audio/Soaring.mp3 b/GGJ17/Assets/Audio/Soaring.mp3
diff --git a/GGJ17/Assets/Audio/Soaring.mp3.meta b/GGJ17/Assets/Audio/Soaring.mp3.meta
diff --git a/GGJ17/Assets/GUI/gameOver.png b/GGJ17/Assets/GUI/gameOver.png
diff --git a/GGJ17/Assets/GUI/gameOver.png.meta b/GGJ17/Assets/GUI/gameOver.png.meta
diff --git a/GGJ17/Assets/Models/Materials/modelDefault.mat b/GGJ17/Assets/Models/Materials/modelDefault.mat
diff --git a/GGJ17/Assets/Models/Materials/modelMetall.mat b/GGJ17/Assets/Models/Materials/modelMetall.mat
diff --git a/GGJ17/Assets/Models/Materials/modelSand.mat b/GGJ17/Assets/Models/Materials/modelSand.mat
diff --git a/GGJ17/Assets/Models/Materials/texture.png b/GGJ17/Assets/Models/Materials/texture.png
diff --git a/GGJ17/Assets/Models/Materials/texture.png.meta b/GGJ17/Assets/Models/Materials/texture.png.meta
diff --git a/GGJ17/Assets/Models/defense.obj.meta b/GGJ17/Assets/Models/defense.obj.meta
diff --git a/GGJ17/Assets/Models/extractor.obj.meta b/GGJ17/Assets/Models/extractor.obj.meta
diff --git a/GGJ17/Assets/Models/flag.obj.meta b/GGJ17/Assets/Models/flag.obj.meta
diff --git a/GGJ17/Assets/Models/psi.obj.meta b/GGJ17/Assets/Models/psi.obj.meta