Merge remote-tracking branch 'refs/remotes/origin/master'

Conflicts: GGJ17/Assets/Scene/BlockTest.unity
AdronTech · Jan 21, 2017 · 8ee819a · 8ee819a
2 parents d644181 + 69844c0
commit 8ee819a
Show file tree

Hide file tree

Showing 59 changed files with 5,761 additions and 84 deletions.
diff --git a/GGJ17/Assets/GUI.meta b/GGJ17/Assets/GUI.meta
diff --git a/GGJ17/Assets/GUI/title.png b/GGJ17/Assets/GUI/title.png
diff --git a/GGJ17/Assets/GUI/title.png.meta b/GGJ17/Assets/GUI/title.png.meta
diff --git a/GGJ17/Assets/Images.meta b/GGJ17/Assets/Images.meta
diff --git a/GGJ17/Assets/Images/portrait1.png b/GGJ17/Assets/Images/portrait1.png
diff --git a/GGJ17/Assets/Images/portrait1.png.meta b/GGJ17/Assets/Images/portrait1.png.meta
diff --git a/GGJ17/Assets/Images/portrait2.png b/GGJ17/Assets/Images/portrait2.png
diff --git a/GGJ17/Assets/Images/portrait2.png.meta b/GGJ17/Assets/Images/portrait2.png.meta
diff --git a/GGJ17/Assets/Material/titleFloor.mat b/GGJ17/Assets/Material/titleFloor.mat
diff --git a/GGJ17/Assets/Material/titleFloor.mat.meta b/GGJ17/Assets/Material/titleFloor.mat.meta
diff --git a/GGJ17/Assets/Material/titleObjects.physicMaterial b/GGJ17/Assets/Material/titleObjects.physicMaterial
diff --git a/GGJ17/Assets/Material/titleObjects.physicMaterial.meta b/GGJ17/Assets/Material/titleObjects.physicMaterial.meta