Merge branch 'animations4' into main

This commit is contained in:
Evan Nydahl
2022-04-27 18:52:05 -05:00
53 changed files with 178396 additions and 23202 deletions

View File

@@ -122,6 +122,7 @@ public class AerialStateManager : NetworkBehaviour
rB = GetComponent<Rigidbody>(); //set Rigid Body
parentObj = transform.parent.gameObject; // set parent object
animator = GetComponent<Animator>(); // set animator
animationManager = GetComponent<AnimationManager>();
////
////Initialize Scripts
@@ -511,7 +512,7 @@ public class AerialStateManager : NetworkBehaviour
}
//Calculate wall direction
float CalculateSide(){
public float CalculateSide(){
if(isWallRunning)
{
Vector3 heading = lastWallPosition - transform.position;