Merge branch 'master' of http://git.thirdlevel.gmbh/GameDevOS/LD39

game/Assets/Prefabs/Player.prefab

@@ -1713,7 +1713,7 @@ Rigidbody:
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1341517319831398}
   serializedVersion: 2
-  m_Mass: 1
+  m_Mass: 3
   m_Drag: 0
   m_AngularDrag: 0.05
   m_UseGravity: 1

game/Assets/Prefabs/SolarBotSpawner.prefab

@@ -20,7 +20,6 @@ GameObject:
   m_Component:
   - component: {fileID: 4257224600887088}
   - component: {fileID: 33183643484044172}
-  - component: {fileID: 65503026879075802}
   - component: {fileID: 23948186995172726}
   m_Layer: 0
   m_Name: Cube
@@ -29,6 +28,24 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!1 &1245085018519836
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 4791303127295348}
+  - component: {fileID: 33077458637369316}
+  - component: {fileID: 23319541038764544}
+  - component: {fileID: 65552315199493186}
+  m_Layer: 0
+  m_Name: Cube (3)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 1
+  m_StaticEditorFlags: 8
+  m_IsActive: 1
 --- !u!1 &1352998605374168
 GameObject:
   m_ObjectHideFlags: 0
@@ -38,14 +55,14 @@ GameObject:
   m_Component:
   - component: {fileID: 4196788390560788}
   - component: {fileID: 33568036573740448}
-  - component: {fileID: 65305044255708256}
   - component: {fileID: 23788818764341524}
+  - component: {fileID: 65210877916074036}
   m_Layer: 0
-  m_Name: Cube (3)
+  m_Name: Cube (7)
   m_TagString: Untagged
   m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
+  m_NavMeshLayer: 1
+  m_StaticEditorFlags: 8
   m_IsActive: 1
 --- !u!1 &1400659369070184
 GameObject:
@@ -60,8 +77,8 @@ GameObject:
   m_Name: SolarBotSpawner
   m_TagString: EnemySpawner
   m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
+  m_NavMeshLayer: 1
+  m_StaticEditorFlags: 8
   m_IsActive: 1
 --- !u!1 &1489037399527026
 GameObject:
@@ -72,14 +89,13 @@ GameObject:
   m_Component:
   - component: {fileID: 4605930430145810}
   - component: {fileID: 33809648886260762}
-  - component: {fileID: 65188572075319432}
   - component: {fileID: 23328548979237762}
   m_Layer: 0
   m_Name: Cube (4)
   m_TagString: Untagged
   m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
+  m_NavMeshLayer: 1
+  m_StaticEditorFlags: 8
   m_IsActive: 1
 --- !u!1 &1748943684078410
 GameObject:
@@ -90,15 +106,50 @@ GameObject:
   m_Component:
   - component: {fileID: 4959340588485612}
   - component: {fileID: 33264290820164326}
-  - component: {fileID: 65758105922336286}
   - component: {fileID: 23999878650390182}
   m_Layer: 0
   m_Name: Cube (1)
   m_TagString: Untagged
   m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
+  m_NavMeshLayer: 1
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!1 &1749992113964780
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 4664274284690232}
+  - component: {fileID: 33019194558796274}
+  - component: {fileID: 23811106150121304}
+  - component: {fileID: 65778933086062260}
+  m_Layer: 0
+  m_Name: Cube (5)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 1
+  m_StaticEditorFlags: 8
+  m_IsActive: 1
+--- !u!1 &1850152247079550
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 4423314733714888}
+  - component: {fileID: 33901724892480556}
+  - component: {fileID: 23624506783526084}
+  - component: {fileID: 65381027809068726}
+  m_Layer: 0
+  m_Name: Cube (6)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 1
+  m_StaticEditorFlags: 8
+  m_IsActive: 1
 --- !u!1 &1929288038410100
 GameObject:
   m_ObjectHideFlags: 0
@@ -108,14 +159,14 @@ GameObject:
   m_Component:
   - component: {fileID: 4794608739309622}
   - component: {fileID: 33927995244448232}
-  - component: {fileID: 65243695401071542}
   - component: {fileID: 23989746764665760}
+  - component: {fileID: 65048664471315140}
   m_Layer: 0
   m_Name: Cube (2)
   m_TagString: Untagged
   m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
+  m_NavMeshLayer: 1
+  m_StaticEditorFlags: 8
   m_IsActive: 1
 --- !u!4 &4016758563413220
 Transform:
@@ -123,15 +174,18 @@ Transform:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1400659369070184}
-  m_LocalRotation: {x: 0, y: -0.6040429, z: 0, w: 0.79695183}
-  m_LocalPosition: {x: -35.2, y: 2, z: -0}
+  m_LocalRotation: {x: 0, y: 0.8765588, z: 0, w: 0.4812949}
+  m_LocalPosition: {x: 33.5, y: 2, z: -37.3}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 4257224600887088}
   - {fileID: 4959340588485612}
   - {fileID: 4794608739309622}
-  - {fileID: 4196788390560788}
+  - {fileID: 4791303127295348}
   - {fileID: 4605930430145810}
+  - {fileID: 4664274284690232}
+  - {fileID: 4423314733714888}
+  - {fileID: 4196788390560788}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -141,13 +195,13 @@ Transform:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1352998605374168}
-  m_LocalRotation: {x: 0.043619405, y: 0, z: 0, w: 0.9990483}
-  m_LocalPosition: {x: 1.7, y: -0.25, z: -2.24}
-  m_LocalScale: {x: 0.59999996, y: 4, z: 1}
+  m_LocalRotation: {x: 0.5063368, y: -0.50800353, z: 0.49353382, w: 0.49191457}
+  m_LocalPosition: {x: -0.029999852, y: -1.99, z: 4.800001}
+  m_LocalScale: {x: 2, y: 4, z: 1.0000005}
   m_Children: []
   m_Father: {fileID: 4016758563413220}
-  m_RootOrder: 3
-  m_LocalEulerAnglesHint: {x: 5, y: 0, z: 0}
+  m_RootOrder: 7
+  m_LocalEulerAnglesHint: {x: 91.656006, y: 0, z: 90.187996}
 --- !u!4 &4257224600887088
 Transform:
   m_ObjectHideFlags: 1
@@ -155,12 +209,25 @@ Transform:
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1012018468963566}
   m_LocalRotation: {x: -0.008726465, y: 0, z: 0, w: 0.999962}
-  m_LocalPosition: {x: 0, y: 0, z: -0.45}
-  m_LocalScale: {x: 4, y: 4, z: 3}
+  m_LocalPosition: {x: -0.00000074602, y: 0, z: -0.45}
+  m_LocalScale: {x: 7.275892, y: 4, z: 3}
   m_Children: []
   m_Father: {fileID: 4016758563413220}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: -1, y: 0, z: 0}
+--- !u!4 &4423314733714888
+Transform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1850152247079550}
+  m_LocalRotation: {x: 0.71724784, y: -0, z: 0.000000119209275, w: 0.6968182}
+  m_LocalPosition: {x: -3.29, y: -1.92, z: 2.29}
+  m_LocalScale: {x: 1.0913801, y: 7, z: 1.0000005}
+  m_Children: []
+  m_Father: {fileID: 4016758563413220}
+  m_RootOrder: 6
+  m_LocalEulerAnglesHint: {x: 91.655, y: 0, z: 0}
 --- !u!4 &4605930430145810
 Transform:
   m_ObjectHideFlags: 1
@@ -168,12 +235,38 @@ Transform:
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1489037399527026}
   m_LocalRotation: {x: 0.078459114, y: 0, z: 0, w: 0.99691737}
-  m_LocalPosition: {x: 0, y: 1.65, z: -2}
-  m_LocalScale: {x: 4, y: 1, z: 2}
+  m_LocalPosition: {x: -0.0000013199, y: 1.65, z: -2}
+  m_LocalScale: {x: 7.275892, y: 1, z: 2}
   m_Children: []
   m_Father: {fileID: 4016758563413220}
   m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 9, y: 0, z: 0}
+--- !u!4 &4664274284690232
+Transform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1749992113964780}
+  m_LocalRotation: {x: 0.7172479, y: -0, z: 0.000000059604638, w: 0.6968182}
+  m_LocalPosition: {x: 3.2999992, y: -1.92, z: 2.2900016}
+  m_LocalScale: {x: 1.0913804, y: 7, z: 1.0000004}
+  m_Children: []
+  m_Father: {fileID: 4016758563413220}
+  m_RootOrder: 5
+  m_LocalEulerAnglesHint: {x: 91.655, y: 0, z: 0}
+--- !u!4 &4791303127295348
+Transform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1245085018519836}
+  m_LocalRotation: {x: 0.043619405, y: 0, z: 0, w: 0.9990483}
+  m_LocalPosition: {x: 3.0923, y: -0.25, z: -2.24}
+  m_LocalScale: {x: 1.0913837, y: 4, z: 1}
+  m_Children: []
+  m_Father: {fileID: 4016758563413220}
+  m_RootOrder: 3
+  m_LocalEulerAnglesHint: {x: 5, y: 0, z: 0}
 --- !u!4 &4794608739309622
 Transform:
   m_ObjectHideFlags: 1
@@ -181,8 +274,8 @@ Transform:
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1929288038410100}
   m_LocalRotation: {x: 0.043619405, y: 0, z: 0, w: 0.9990483}
-  m_LocalPosition: {x: -1.7, y: -0.25, z: -2.26}
-  m_LocalScale: {x: 0.6, y: 4, z: 1}
+  m_LocalPosition: {x: -3.0923, y: -0.25, z: -2.26}
+  m_LocalScale: {x: 1.0913838, y: 4, z: 1}
   m_Children: []
   m_Father: {fileID: 4016758563413220}
   m_RootOrder: 2
@@ -194,12 +287,44 @@ Transform:
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1748943684078410}
   m_LocalRotation: {x: -0.42261827, y: 0, z: 0, w: 0.9063079}
-  m_LocalPosition: {x: 0, y: -1.67, z: 1.88}
-  m_LocalScale: {x: 4, y: 6, z: 4}
+  m_LocalPosition: {x: -0.00000068864, y: -1.67, z: 1.88}
+  m_LocalScale: {x: 7.2758956, y: 6, z: 4}
   m_Children: []
   m_Father: {fileID: 4016758563413220}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: -50, y: 0, z: 0}
+--- !u!23 &23319541038764544
+MeshRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1245085018519836}
+  m_Enabled: 1
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_Materials:
+  - {fileID: 2100000, guid: 3e3d9dbc3b08baa4da3975c34ebee01e, type: 2}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_PreserveUVs: 1
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_SelectedEditorRenderState: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
 --- !u!23 &23328548979237762
 MeshRenderer:
   m_ObjectHideFlags: 1
@@ -232,6 +357,38 @@ MeshRenderer:
   m_SortingLayerID: 0
   m_SortingLayer: 0
   m_SortingOrder: 0
+--- !u!23 &23624506783526084
+MeshRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1850152247079550}
+  m_Enabled: 1
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_Materials:
+  - {fileID: 2100000, guid: 3e3d9dbc3b08baa4da3975c34ebee01e, type: 2}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_PreserveUVs: 1
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_SelectedEditorRenderState: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
 --- !u!23 &23788818764341524
 MeshRenderer:
   m_ObjectHideFlags: 1
@@ -264,6 +421,38 @@ MeshRenderer:
   m_SortingLayerID: 0
   m_SortingLayer: 0
   m_SortingOrder: 0
+--- !u!23 &23811106150121304
+MeshRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1749992113964780}
+  m_Enabled: 1
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_Materials:
+  - {fileID: 2100000, guid: 3e3d9dbc3b08baa4da3975c34ebee01e, type: 2}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_PreserveUVs: 1
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_SelectedEditorRenderState: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
 --- !u!23 &23948186995172726
 MeshRenderer:
   m_ObjectHideFlags: 1
@@ -360,6 +549,20 @@ MeshRenderer:
   m_SortingLayerID: 0
   m_SortingLayer: 0
   m_SortingOrder: 0
+--- !u!33 &33019194558796274
+MeshFilter:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1749992113964780}
+  m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!33 &33077458637369316
+MeshFilter:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1245085018519836}
+  m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
 --- !u!33 &33183643484044172
 MeshFilter:
   m_ObjectHideFlags: 1
@@ -388,6 +591,13 @@ MeshFilter:
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1489037399527026}
   m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!33 &33901724892480556
+MeshFilter:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1850152247079550}
+  m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
 --- !u!33 &33927995244448232
 MeshFilter:
   m_ObjectHideFlags: 1
@@ -395,65 +605,65 @@ MeshFilter:
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1929288038410100}
   m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
---- !u!65 &65188572075319432
+--- !u!65 &65048664471315140
 BoxCollider:
   m_ObjectHideFlags: 1
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1489037399527026}
+  m_GameObject: {fileID: 1929288038410100}
   m_Material: {fileID: 0}
   m_IsTrigger: 0
   m_Enabled: 1
   serializedVersion: 2
-  m_Size: {x: 1, y: 1, z: 1}
-  m_Center: {x: 0, y: 0, z: 0}
---- !u!65 &65243695401071542
+  m_Size: {x: 1.0000001, y: 1, z: 1.0000002}
+  m_Center: {x: 0, y: -0.00000011920929, z: 0}
+--- !u!65 &65210877916074036
 BoxCollider:
   m_ObjectHideFlags: 1
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1929288038410100}
+  m_GameObject: {fileID: 1352998605374168}
   m_Material: {fileID: 0}
   m_IsTrigger: 0
   m_Enabled: 1
   serializedVersion: 2
-  m_Size: {x: 1, y: 1, z: 1}
+  m_Size: {x: 1.0000001, y: 1, z: 1.0000002}
   m_Center: {x: 0, y: 0, z: 0}
---- !u!65 &65305044255708256
+--- !u!65 &65381027809068726
 BoxCollider:
   m_ObjectHideFlags: 1
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1352998605374168}
+  m_GameObject: {fileID: 1850152247079550}
   m_Material: {fileID: 0}
   m_IsTrigger: 0
   m_Enabled: 1
   serializedVersion: 2
-  m_Size: {x: 1, y: 1, z: 1}
+  m_Size: {x: 1.0000001, y: 1, z: 1.0000002}
   m_Center: {x: 0, y: 0, z: 0}
---- !u!65 &65503026879075802
+--- !u!65 &65552315199493186
 BoxCollider:
   m_ObjectHideFlags: 1
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1012018468963566}
+  m_GameObject: {fileID: 1245085018519836}
   m_Material: {fileID: 0}
   m_IsTrigger: 0
   m_Enabled: 1
   serializedVersion: 2
-  m_Size: {x: 1, y: 1, z: 1}
+  m_Size: {x: 1.0000001, y: 1, z: 1.0000002}
   m_Center: {x: 0, y: 0, z: 0}
---- !u!65 &65758105922336286
+--- !u!65 &65778933086062260
 BoxCollider:
   m_ObjectHideFlags: 1
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1748943684078410}
+  m_GameObject: {fileID: 1749992113964780}
   m_Material: {fileID: 0}
   m_IsTrigger: 0
   m_Enabled: 1
   serializedVersion: 2
-  m_Size: {x: 1, y: 1, z: 1}
+  m_Size: {x: 1.0000001, y: 1, z: 1.0000002}
   m_Center: {x: 0, y: 0, z: 0}
 --- !u!114 &114228307958694658
 MonoBehaviour:
@@ -468,4 +678,4 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   EnemyPrefab: {fileID: 1196849215294664, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8,
     type: 2}
-  cooldownForSpawning: 2
+  cooldownForSpawning: 5

game/Assets/Scenes/Main/NavMesh.asset.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: 90990caff53762d47a7e87513a7155d0
-timeCreated: 1501351842
+timeCreated: 1501456551
 licenseType: Free
 NativeFormatImporter:
   mainObjectFileID: 23800000