Removed physics on oar

Assets/Scenes/Development/CharacterControllerTest.unity (Stored with Git LFS)

 size 19170

Assets/Scripts/Player/HandController.cs

@@ -129,6 +129,8 @@ public class HandController : MonoBehaviour
             }
         }
 
+        if (m_oar.isColliding())
+            UndoLastMovement();
 
     }
 
@@ -136,7 +138,7 @@ public class HandController : MonoBehaviour
     {
         Vector3 direction = m_lastPosition - transform.localPosition;
 
-        transform.localPosition += direction;
+        transform.localPosition = m_lastPosition;
 
     }
 

Assets/Scripts/Player/OarController.cs

@@ -96,10 +96,10 @@ public class OarController : MonoBehaviour
         Quaternion rotation = Quaternion.LookRotation(forward, direction);
 
 
-        MoveOarToPosition(m_rightHand.transform.position - direction * m_distanceFromRightHand);
-        //m_oarRigidbody.MoveRotation(rotation);
-        //m_oarRigidbody.MovePosition(m_rightHand.transform.position - direction * m_distanceFromRightHand);
-        MoveOarToRotation(rotation);
+        //MoveOarToPosition(m_rightHand.transform.position - direction * m_distanceFromRightHand);
+        m_oarRigidbody.MoveRotation(rotation);
+        m_oarRigidbody.MovePosition(m_rightHand.transform.position - direction * m_distanceFromRightHand);
+        //MoveOarToRotation(rotation);
 
 
     }
@@ -134,7 +134,7 @@ public class OarController : MonoBehaviour
 
     }
 
-
+/*
     void OnCollisionEnter(Collision collision)
     {
         
@@ -152,7 +152,7 @@ public class OarController : MonoBehaviour
 
 
 
-    }
+    }*/
 
     #endregion Class Functionality