Commit Graph

9 Commits

Author SHA1 Message Date
Marlie 95e96d7e44 Merge remote-tracking branch 'origin/main'
# Conflicts:
#	SMIMS-Game/MyWorld.class
#	SMIMS-Game/MyWorld.java
#	SMIMS-Game/Player.class
#	SMIMS-Game/Player.ctxt
#	SMIMS-Game/project.greenfoot
2026-09-15 12:22:37 +02:00
Marlie d35e3a62de Start und Game Over Bildschirm 2026-09-15 12:19:02 +02:00
Caspar e63fc5cadc Merge remote-tracking branch 'origin/main'
# Conflicts:
#	SMIMS-Game/MyWorld.class
#	SMIMS-Game/MyWorld.java
#	SMIMS-Game/project.greenfoot
2026-09-15 11:55:52 +02:00
Caspar d9f0219cf1 Plattform Verssion 1 2026-09-15 11:53:27 +02:00
Jonas 9cef598196 PowerUps/JumpBoost
neue Klassen: PowerUps, JumpBoostItem

Die aktivieren und das deaktivieren der PowerUps wird im Player durchgeführt.
2026-09-15 11:33:47 +02:00
Marlie c188985e02 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
Marlie 07c5614d44 Projektil und Game Over Transition bei Kollision 2026-09-15 10:21:16 +02:00
Caspar 46823901dd Plattform Verssion 1 2026-09-15 10:06:00 +02:00
Jonas 13edb7d2b6 initial 2026-09-15 09:25:25 +02:00