Merge dAerialScript

This commit is contained in:
Evan Nydahl
2022-04-27 18:54:24 -05:00
parent 2907c3f3eb
commit 030cd225bf

View File

@@ -6,16 +6,13 @@ public class dAerialFallingState : dAerialBaseState
{
bool shouldGlide;
public override void EnterState(dAerialStateManager aSM, dAerialBaseState previousState){
<<<<<<< HEAD
if(previousState == aSM.JumpingState && aSM.jumpHeld){
shouldGlide = true;
}
else{
shouldGlide = false;
}
=======
aSM.GetComponent<Animator>().SetBool("isFalling", true);
>>>>>>> animations4
}
public override void ExitState(dAerialStateManager aSM, dAerialBaseState nextState){