Merge branch 'master' of https://github.com/Steffo99/ld42

Assets/Prefabs/Terrain.prefab

@@ -320,10 +320,15 @@ PolygonCollider2D:
       - {x: 46.82357, y: 3.0117798}
       - {x: 48.709915, y: 1.6964321}
       - {x: 50.16885, y: 0.83608246}
-      - {x: 50.13909, y: 21.834969}
+      - {x: 50.008274, y: 55.055428}
+      - {x: 50.191864, y: 55.6062}
       - {x: 50.683697, y: -24.33369}
       - {x: -49.972443, y: -23.321346}
-      - {x: -50.039696, y: 22.184658}
+      - {x: -52.564972, y: 58.340706}
+      - {x: 50.177364, y: 55.705566}
+      - {x: 51.006096, y: 56.45051}
+      - {x: 49.914623, y: 57.248528}
+      - {x: -50.21778, y: 56.741875}
       - {x: -49.91083, y: 20.208763}
 --- !u!212 &212998951973022566
 SpriteRenderer:

Assets/Scenes/Game.unity

@@ -209,6 +209,11 @@ Prefab:
   m_Modification:
     m_TransformParent: {fileID: 0}
     m_Modifications:
+    - target: {fileID: 60970885189888988, guid: 0514a38f22bae454d821a12517a141c4,
+        type: 2}
+      propertyPath: m_Points.m_Paths.Array.data[0].Array.size
+      value: 265
+      objectReference: {fileID: 0}
     - target: {fileID: 4023639078503100, guid: 0514a38f22bae454d821a12517a141c4, type: 2}
       propertyPath: m_LocalPosition.x
       value: 0
@@ -244,23 +249,103 @@ Prefab:
     - target: {fileID: 60970885189888988, guid: 0514a38f22bae454d821a12517a141c4,
         type: 2}
       propertyPath: m_Points.m_Paths.Array.data[0].Array.data[258].y
-      value: 56.741875
+      value: -23.321346
       objectReference: {fileID: 0}
     - target: {fileID: 60970885189888988, guid: 0514a38f22bae454d821a12517a141c4,
         type: 2}
       propertyPath: m_Points.m_Paths.Array.data[0].Array.data[258].x
-      value: -50.21778
+      value: -49.972443
       objectReference: {fileID: 0}
     - target: {fileID: 60970885189888988, guid: 0514a38f22bae454d821a12517a141c4,
         type: 2}
       propertyPath: m_Points.m_Paths.Array.data[0].Array.data[255].y
-      value: 55.6062
+      value: 55.055428
       objectReference: {fileID: 0}
     - target: {fileID: 60970885189888988, guid: 0514a38f22bae454d821a12517a141c4,
         type: 2}
       propertyPath: m_Points.m_Paths.Array.data[0].Array.data[255].x
+      value: 50.008274
+      objectReference: {fileID: 0}
+    - target: {fileID: 60970885189888988, guid: 0514a38f22bae454d821a12517a141c4,
+        type: 2}
+      propertyPath: m_Points.m_Paths.Array.data[0].Array.data[256].x
       value: 50.191864
       objectReference: {fileID: 0}
+    - target: {fileID: 60970885189888988, guid: 0514a38f22bae454d821a12517a141c4,
+        type: 2}
+      propertyPath: m_Points.m_Paths.Array.data[0].Array.data[256].y
+      value: 55.6062
+      objectReference: {fileID: 0}
+    - target: {fileID: 60970885189888988, guid: 0514a38f22bae454d821a12517a141c4,
+        type: 2}
+      propertyPath: m_Points.m_Paths.Array.data[0].Array.data[257].x
+      value: 50.683697
+      objectReference: {fileID: 0}
+    - target: {fileID: 60970885189888988, guid: 0514a38f22bae454d821a12517a141c4,
+        type: 2}
+      propertyPath: m_Points.m_Paths.Array.data[0].Array.data[257].y
+      value: -24.33369
+      objectReference: {fileID: 0}
+    - target: {fileID: 60970885189888988, guid: 0514a38f22bae454d821a12517a141c4,
+        type: 2}
+      propertyPath: m_Points.m_Paths.Array.data[0].Array.data[259].x
+      value: -52.564972
+      objectReference: {fileID: 0}
+    - target: {fileID: 60970885189888988, guid: 0514a38f22bae454d821a12517a141c4,
+        type: 2}
+      propertyPath: m_Points.m_Paths.Array.data[0].Array.data[259].y
+      value: 58.340706
+      objectReference: {fileID: 0}
+    - target: {fileID: 60970885189888988, guid: 0514a38f22bae454d821a12517a141c4,
+        type: 2}
+      propertyPath: m_Points.m_Paths.Array.data[0].Array.data[260].x
+      value: 50.177364
+      objectReference: {fileID: 0}
+    - target: {fileID: 60970885189888988, guid: 0514a38f22bae454d821a12517a141c4,
+        type: 2}
+      propertyPath: m_Points.m_Paths.Array.data[0].Array.data[260].y
+      value: 55.705566
+      objectReference: {fileID: 0}
+    - target: {fileID: 60970885189888988, guid: 0514a38f22bae454d821a12517a141c4,
+        type: 2}
+      propertyPath: m_Points.m_Paths.Array.data[0].Array.data[261].x
+      value: 51.006096
+      objectReference: {fileID: 0}
+    - target: {fileID: 60970885189888988, guid: 0514a38f22bae454d821a12517a141c4,
+        type: 2}
+      propertyPath: m_Points.m_Paths.Array.data[0].Array.data[261].y
+      value: 56.45051
+      objectReference: {fileID: 0}
+    - target: {fileID: 60970885189888988, guid: 0514a38f22bae454d821a12517a141c4,
+        type: 2}
+      propertyPath: m_Points.m_Paths.Array.data[0].Array.data[262].x
+      value: 49.914623
+      objectReference: {fileID: 0}
+    - target: {fileID: 60970885189888988, guid: 0514a38f22bae454d821a12517a141c4,
+        type: 2}
+      propertyPath: m_Points.m_Paths.Array.data[0].Array.data[262].y
+      value: 57.248528
+      objectReference: {fileID: 0}
+    - target: {fileID: 60970885189888988, guid: 0514a38f22bae454d821a12517a141c4,
+        type: 2}
+      propertyPath: m_Points.m_Paths.Array.data[0].Array.data[263].x
+      value: -50.21778
+      objectReference: {fileID: 0}
+    - target: {fileID: 60970885189888988, guid: 0514a38f22bae454d821a12517a141c4,
+        type: 2}
+      propertyPath: m_Points.m_Paths.Array.data[0].Array.data[263].y
+      value: 56.741875
+      objectReference: {fileID: 0}
+    - target: {fileID: 60970885189888988, guid: 0514a38f22bae454d821a12517a141c4,
+        type: 2}
+      propertyPath: m_Points.m_Paths.Array.data[0].Array.data[264].x
+      value: -49.91083
+      objectReference: {fileID: 0}
+    - target: {fileID: 60970885189888988, guid: 0514a38f22bae454d821a12517a141c4,
+        type: 2}
+      propertyPath: m_Points.m_Paths.Array.data[0].Array.data[264].y
+      value: 20.208763
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 0514a38f22bae454d821a12517a141c4, type: 2}
   m_IsPrefabAsset: 0
@@ -303,6 +388,10 @@ Prefab:
       propertyPath: m_RootOrder
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 4108515592884750, guid: 4dc0408b236da9847b1c799161bbd70a, type: 2}
+      propertyPath: m_LocalPosition.y
+      value: -0.02
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 4dc0408b236da9847b1c799161bbd70a, type: 2}
   m_IsPrefabAsset: 0

Assets/Scenes/MainMenu.unity

@@ -113,6 +113,234 @@ NavMeshSettings:
     debug:
       m_Flags: 0
   m_NavMeshData: {fileID: 0}
+--- !u!1 &650713241
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 650713243}
+  - component: {fileID: 650713242}
+  m_Layer: 0
+  m_Name: TopCollider
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!61 &650713242
+BoxCollider2D:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 650713241}
+  m_Enabled: 1
+  m_Density: 1
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_UsedByEffector: 0
+  m_UsedByComposite: 0
+  m_Offset: {x: 30.55227, y: 34.170967}
+  m_SpriteTilingProperty:
+    border: {x: 0, y: 0, z: 0, w: 0}
+    pivot: {x: 0, y: 0}
+    oldSize: {x: 0, y: 0}
+    newSize: {x: 0, y: 0}
+    adaptiveTilingThreshold: 0
+    drawMode: 0
+    adaptiveTiling: 0
+  m_AutoTiling: 0
+  serializedVersion: 2
+  m_Size: {x: 62.10454, y: 2.3336678}
+  m_EdgeRadius: 0
+--- !u!4 &650713243
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 650713241}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: -30.46, y: -1.3, z: -50.34375}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 5
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &670477758
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 670477760}
+  - component: {fileID: 670477759}
+  - component: {fileID: 670477761}
+  m_Layer: 0
+  m_Name: GameStart
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!61 &670477759
+BoxCollider2D:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 670477758}
+  m_Enabled: 1
+  m_Density: 1
+  m_Material: {fileID: 0}
+  m_IsTrigger: 1
+  m_UsedByEffector: 0
+  m_UsedByComposite: 0
+  m_Offset: {x: -9.650415, y: -0.44705772}
+  m_SpriteTilingProperty:
+    border: {x: 0, y: 0, z: 0, w: 0}
+    pivot: {x: 0, y: 0}
+    oldSize: {x: 0, y: 0}
+    newSize: {x: 0, y: 0}
+    adaptiveTilingThreshold: 0
+    drawMode: 0
+    adaptiveTiling: 0
+  m_AutoTiling: 0
+  serializedVersion: 2
+  m_Size: {x: 19.925472, y: 40.10512}
+  m_EdgeRadius: 0
+--- !u!4 &670477760
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 670477758}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 29.7, y: 0.4, z: -50.34375}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 7
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &670477761
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 670477758}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 594e0c139ab753e46afbb701fdea7867, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!1 &922617565
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 922617567}
+  - component: {fileID: 922617566}
+  m_Layer: 0
+  m_Name: BottomCollider
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!61 &922617566
+BoxCollider2D:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 922617565}
+  m_Enabled: 1
+  m_Density: 1
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_UsedByEffector: 0
+  m_UsedByComposite: 0
+  m_Offset: {x: 30.55227, y: 33.725967}
+  m_SpriteTilingProperty:
+    border: {x: 0, y: 0, z: 0, w: 0}
+    pivot: {x: 0, y: 0}
+    oldSize: {x: 0, y: 0}
+    newSize: {x: 0, y: 0}
+    adaptiveTilingThreshold: 0
+    drawMode: 0
+    adaptiveTiling: 0
+  m_AutoTiling: 0
+  serializedVersion: 2
+  m_Size: {x: 62.10454, y: 1.4436646}
+  m_EdgeRadius: 0
+--- !u!4 &922617567
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 922617565}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: -30.46, y: -53.11, z: -50.34375}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 6
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &984464199
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 984464201}
+  - component: {fileID: 984464200}
+  m_Layer: 0
+  m_Name: LeftCollider
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!61 &984464200
+BoxCollider2D:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 984464199}
+  m_Enabled: 1
+  m_Density: 1
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_UsedByEffector: 0
+  m_UsedByComposite: 0
+  m_Offset: {x: 0, y: 8.33074}
+  m_SpriteTilingProperty:
+    border: {x: 0, y: 0, z: 0, w: 0}
+    pivot: {x: 0, y: 0}
+    oldSize: {x: 0, y: 0}
+    newSize: {x: 0, y: 0}
+    adaptiveTilingThreshold: 0
+    drawMode: 0
+    adaptiveTiling: 0
+  m_AutoTiling: 0
+  serializedVersion: 2
+  m_Size: {x: 1, y: 54.01412}
+  m_EdgeRadius: 0
+--- !u!4 &984464201
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 984464199}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: -30.46, y: -1.3, z: -50.34375}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 3
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1001 &1018142136
 Prefab:
   m_ObjectHideFlags: 0
@@ -126,7 +354,7 @@ Prefab:
       objectReference: {fileID: 0}
     - target: {fileID: 4059627635461364, guid: acb6270a21e7fa744878210a4df90d27, type: 2}
       propertyPath: m_LocalPosition.y
-      value: -0.9170408
+      value: 0.66
       objectReference: {fileID: 0}
     - target: {fileID: 4059627635461364, guid: acb6270a21e7fa744878210a4df90d27, type: 2}
       propertyPath: m_LocalPosition.z
@@ -173,7 +401,7 @@ Prefab:
       objectReference: {fileID: 0}
     - target: {fileID: 4769752010558754, guid: 4dc0408b236da9847b1c799161bbd70a, type: 2}
       propertyPath: m_LocalPosition.y
-      value: -48.618
+      value: -47.23
       objectReference: {fileID: 0}
     - target: {fileID: 4769752010558754, guid: 4dc0408b236da9847b1c799161bbd70a, type: 2}
       propertyPath: m_LocalPosition.z
@@ -220,6 +448,18 @@ Prefab:
       propertyPath: m_LocalScale.z
       value: 1.3323
       objectReference: {fileID: 0}
+    - target: {fileID: 4108515592884750, guid: 4dc0408b236da9847b1c799161bbd70a, type: 2}
+      propertyPath: m_LocalPosition.x
+      value: -3.3248
+      objectReference: {fileID: 0}
+    - target: {fileID: 4108515592884750, guid: 4dc0408b236da9847b1c799161bbd70a, type: 2}
+      propertyPath: m_LocalScale.x
+      value: 1.975
+      objectReference: {fileID: 0}
+    - target: {fileID: 4108515592884750, guid: 4dc0408b236da9847b1c799161bbd70a, type: 2}
+      propertyPath: m_LocalPosition.y
+      value: -0.37
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 4dc0408b236da9847b1c799161bbd70a, type: 2}
   m_IsPrefabAsset: 0
@@ -278,6 +518,64 @@ Prefab:
       propertyPath: m_LocalEulerAnglesHint.z
       value: -5.727
       objectReference: {fileID: 0}
+    - target: {fileID: 1506768218425990, guid: 1cf703958a669d942a42326499701367, type: 2}
+      propertyPath: m_TagString
+      value: Player
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 1cf703958a669d942a42326499701367, type: 2}
   m_IsPrefabAsset: 0
+--- !u!1 &1377091584
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1377091586}
+  - component: {fileID: 1377091585}
+  m_Layer: 0
+  m_Name: RightCollider
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!61 &1377091585
+BoxCollider2D:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 1377091584}
+  m_Enabled: 1
+  m_Density: 1
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_UsedByEffector: 0
+  m_UsedByComposite: 0
+  m_Offset: {x: 0, y: 8.281294}
+  m_SpriteTilingProperty:
+    border: {x: 0, y: 0, z: 0, w: 0}
+    pivot: {x: 0, y: 0}
+    oldSize: {x: 0, y: 0}
+    newSize: {x: 0, y: 0}
+    adaptiveTilingThreshold: 0
+    drawMode: 0
+    adaptiveTiling: 0
+  m_AutoTiling: 0
+  serializedVersion: 2
+  m_Size: {x: 1, y: 54.11301}
+  m_EdgeRadius: 0
+--- !u!4 &1377091586
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 1377091584}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 30.54, y: -1.3, z: -50.34375}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 4
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

Assets/Scripts/GameStarter.cs

@@ -0,0 +1,14 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class GameStarter : MonoBehaviour {
+
+    void OnTriggerEnter2D(Collider2D GameStart)
+    {
+        Application.LoadLevel(1);
+        Debug.Log("Hi Mark");
+
+    }
+
+}

Assets/Scripts/GameStarter.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 594e0c139ab753e46afbb701fdea7867
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: