Merge branch 'master' into DialogueChange

will-molloy · Oct 9, 2017 · 10461f2 · 10461f2
2 parents 915a8ef + 111e9d2
commit 10461f2
Show file tree

Hide file tree

Showing 9 changed files with 1,140 additions and 589 deletions.
diff --git a/Assets/Prefabs/Room2/Walls.prefab b/Assets/Prefabs/Room2/Walls.prefab
diff --git a/Assets/Prefabs/Room2/Walls.prefab.meta b/Assets/Prefabs/Room2/Walls.prefab.meta