Merge remote-tracking branch 'origin/main'

# Conflicts: # SMIMS-Game/Player.class # SMIMS-Game/Player.ctxt # SMIMS-Game/Player.java # SMIMS-Game/project.greenfoot
2026-09-15 10:29:31 +02:00
parent 07c5614d44 903d791b6b
commit c188985e02
19 changed files with 277 additions and 57 deletions
@@ -7,6 +7,4 @@ comment2.params=
 comment2.target=void\ player_movement()
 comment3.params=
 comment3.target=boolean\ onGround()
-comment4.params=
-comment4.target=boolean\ collision()
-numComments=5
+numComments=4