Merge remote-tracking branch 'origin/main'

# Conflicts:
#	SMIMS-Game/MyWorld.class
#	SMIMS-Game/MyWorld.java
#	SMIMS-Game/Player.class
#	SMIMS-Game/project.greenfoot
This commit is contained in:
2026-09-17 09:28:50 +02:00
27 changed files with 109 additions and 90 deletions
+7 -1
View File
@@ -58,7 +58,13 @@ public class MyWorld extends World
plattform2.setLocation(308,382);
Healthbar healthbar = new Healthbar();
addObject(healthbar,50,50);
Heart heart = new Heart();
addObject(heart,371,27);
Heart heart2 = new Heart();
addObject(heart2,343,27);
Heart heart3 = new Heart();
addObject(heart3,314,27);
addObject(new TemporaryGround(60*50), 200, 575);
}