Merge remote-tracking branch 'origin/main'

# Conflicts:
#	SMIMS-Game/Player.class
This commit is contained in:
2026-09-16 10:43:36 +02:00
3 changed files with 8 additions and 6 deletions
+4 -2
View File
@@ -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(){