Merge branch 'master' of ssh://git.breab.org:2222/gamejam-gpn15/dyingIsMainstream

Assets/Scripts/FireScript.cs

@@ -46,6 +46,7 @@ public class FireScript : MonoBehaviour
   {
     CancelInvoke("stopBurning");
     parentHealth = null;
+    transform.parent = null;
     transform.position = new Vector2(100, 100);
     Invoke("Activate", respawnTime);
   }

Assets/Scripts/ShieldScript.cs

@@ -41,6 +41,7 @@ public class ShieldScript : MonoBehaviour
     CancelInvoke("stopShielding");
     if (parentHealth != null) parentHealth.setShield(false);
     parentHealth = null;
+    transform.parent = null;
     transform.position = new Vector2(100, 100);
     Invoke("Activate", respawnTime);
   }