Merge remote-tracking branch 'origin/main'
# Conflicts: # SMIMS-Game/Player.class
This commit is contained in:
@@ -85,8 +85,10 @@ public class Player extends Actor
|
||||
setLocation( getX(), groundTop - getImage().getHeight() / 2 );
|
||||
verticalSpeed = 0;
|
||||
landed = true;
|
||||
break; }
|
||||
} onGround = landed;
|
||||
break;
|
||||
}
|
||||
}
|
||||
onGround = landed;
|
||||
}
|
||||
|
||||
public void shootProjectile(){
|
||||
|
||||
Reference in New Issue
Block a user