Merge branch 'master' of https://bitbucket.org/JoshuaReason/ggj-2019

Assets/FBX/terrain_Prefabs/terr1.prefab

@@ -1334,6 +1334,7 @@ GameObject:
   - component: {fileID: 4975842787030052}
   - component: {fileID: 33629073012227056}
   - component: {fileID: 23116066766466258}
+  - component: {fileID: 64604591463635736}
   m_Layer: 0
   m_Name: terr1
   m_TagString: Untagged
@@ -3993,7 +3994,7 @@ Transform:
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1564554960623202}
   m_LocalRotation: {x: 0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 570.8, y: 592.641, z: -744.858}
+  m_LocalPosition: {x: 184.17563, y: 75.83002, z: 65.7773}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 4154508751402390}
@@ -14960,6 +14961,20 @@ MeshCollider:
   m_CookingOptions: 14
   m_SkinWidth: 0.01
   m_Mesh: {fileID: 4300000, guid: 99d0111f01c394540a69064c1a297091, type: 3}
+--- !u!64 &64604591463635736
+MeshCollider:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1415288639118134}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 3
+  m_Convex: 0
+  m_CookingOptions: 14
+  m_SkinWidth: 0.01
+  m_Mesh: {fileID: 4300000, guid: a8ba5e24558027e4f9c4fb1163c18e91, type: 3}
 --- !u!64 &64617258855263634
 MeshCollider:
   m_ObjectHideFlags: 1

Assets/FBX/terrain_Prefabs/terr2.prefab

@@ -2946,6 +2946,7 @@ GameObject:
   - component: {fileID: 4168695833297474}
   - component: {fileID: 33234938509264894}
   - component: {fileID: 23215868258078946}
+  - component: {fileID: 64068868250161464}
   m_Layer: 0
   m_Name: terr2
   m_TagString: Untagged
@@ -14453,6 +14454,20 @@ MeshCollider:
   m_CookingOptions: 14
   m_SkinWidth: 0.01
   m_Mesh: {fileID: 4300000, guid: 99d0111f01c394540a69064c1a297091, type: 3}
+--- !u!64 &64068868250161464
+MeshCollider:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1902606196175456}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 3
+  m_Convex: 0
+  m_CookingOptions: 14
+  m_SkinWidth: 0.01
+  m_Mesh: {fileID: 4300000, guid: 4ca26ac77d0762944818d911d3d4e171, type: 3}
 --- !u!64 &64071740955508294
 MeshCollider:
   m_ObjectHideFlags: 1

Assets/Shaders.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: f87a054963b01dc4c8aa2e3ffedcca21
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: