Merge branch 'master' of https://github.com/BRNSystems/GeoJam2021

Assets/Scenes/Level1.unity

@@ -5884,12 +5884,12 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 073797afb82c5a1438f328866b10b3f0, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_LightType: 4
+  m_LightType: 3
   m_BlendStyleIndex: 0
-  m_FalloffIntensity: 0.5
+  m_FalloffIntensity: 0.342
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_Intensity: 1
-  m_LightVolumeOpacity: 0
+  m_LightVolumeOpacity: 0.023
   m_ApplyToSortingLayers: 00000000
   m_LightCookieSprite: {fileID: 0}
   m_UseNormalMap: 0
@@ -5899,13 +5899,13 @@ MonoBehaviour:
   m_ShadowVolumeIntensity: 0
   m_PointLightInnerAngle: 360
   m_PointLightOuterAngle: 360
-  m_PointLightInnerRadius: 0
-  m_PointLightOuterRadius: 1
+  m_PointLightInnerRadius: 2.13
+  m_PointLightOuterRadius: 42.7
   m_PointLightDistance: 3
   m_PointLightQuality: 1
   m_ShapeLightParametricSides: 5
   m_ShapeLightParametricAngleOffset: 0
-  m_ShapeLightParametricRadius: 1
+  m_ShapeLightParametricRadius: 20
   m_ShapeLightFalloffSize: 0.5
   m_ShapeLightFalloffOffset: {x: 0, y: 0}
   m_ShapePath:

Assets/Scripts/Death.cs

@@ -10,6 +10,9 @@ public class Death : MonoBehaviour
     }
     private void OnCollisionEnter2D (Collision2D collisionInfo)
     {
-        collisionInfo.collider.transform.position = Vector3.zero;
+        if (collisionInfo.collider.name == "Player") {
+            collisionInfo.collider.transform.position = Vector3.zero;
+            collisionInfo.collider.GetComponent<Rigidbody2D>().velocity = Vector3.zero;
+        }
     }
 }

UserSettings/EditorUserSettings.asset

@@ -8,6 +8,9 @@ EditorUserSettings:
     RecentlyUsedScenePath-0:
       value: 22424703114646680e0b0227036c6c111b07142f1f2b233e2867083debf42d
       flags: 0
+    RecentlyUsedScenePath-1:
+      value: 22424703114646680e0b0227036c73150012147b623d28393930
+      flags: 0
     UnityRemoteCompression:
       value: 337f73
       flags: 0