TriggerBoxes fix

9660c9c1 · Graham Solie · 0d1130cd · 9660c9c1 · 9660c9c1 · 9660c9c1
Commit 9660c9c1 authored 8 years ago by Graham Solie
--- a/Zookeepers Trial/Assets/Scenes/Town01.unity
+++ b/Zookeepers Trial/Assets/Scenes/Town01.unity
--- a/Zookeepers Trial/Library/CurrentLayout.dwlt
+++ b/Zookeepers Trial/Library/CurrentLayout.dwlt
--- a/Zookeepers Trial/Library/LastSceneManagerSetup.txt
+++ b/Zookeepers Trial/Library/LastSceneManagerSetup.txt
 sceneSetups:
-<<<<<<< HEAD
- path: Assets/Scenes/arena.unity
-=======
- path: Assets/Scenes/Town02.unity
->>>>>>> origin/master
+- path: Assets/Scenes/Town01.unity
  isLoaded: 1
  isActive: 1
--- a/Zookeepers Trial/Library/ScriptAssemblies/Assembly-CSharp.dll
+++ b/Zookeepers Trial/Library/ScriptAssemblies/Assembly-CSharp.dll
--- a/Zookeepers Trial/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
+++ b/Zookeepers Trial/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
--- a/Zookeepers Trial/Library/assetDatabase3
+++ b/Zookeepers Trial/Library/assetDatabase3
--- a/Zookeepers Trial/Library/expandedItems
+++ b/Zookeepers Trial/Library/expandedItems
--- a/Zookeepers Trial/Library/metadata/00/00000000000000004000000000000000
+++ b/Zookeepers Trial/Library/metadata/00/00000000000000004000000000000000
--- a/Zookeepers Trial/Library/metadata/00/00000000000000006100000000000000
+++ b/Zookeepers Trial/Library/metadata/00/00000000000000006100000000000000