merge fixes and icebolt tweaks

2022-04-14 17:56:04 +03:00
parent be8b9a987d
commit 5bf99356ff
16 changed files with 1490 additions and 36926 deletions
--- a/Files/Scripts/JonasB/ActionGestureInteraction.cs
+++ b/Files/Scripts/JonasB/ActionGestureInteraction.cs
@@ -23,16 +23,12 @@ public class ActionGestureInteraction : MonoBehaviour
    {
        Debug.LogWarning(action);

-        
-        /* todo: playerinfo doesnt have these methods?
        if (player.GetComponent<PlayerInfo>().GetRightHand() != null) 
        {
-            Debug.LogWarning(player.GetComponent<PlayerInfo>().GetRightHand().name);
            if (player.GetComponent<PlayerInfo>().GetRightHand().name.Equals("wand")) holdingWand = true;
        }
-        
        else holdingWand = false;
-        */
+        

        switch (action)
        {