Merge remote-tracking branch 'origin/main'

Browse Source

# Conflicts:
#	SMIMS-Game/MyWorld.class
#	SMIMS-Game/MyWorld.java
#	SMIMS-Game/Player.class
#	SMIMS-Game/Player.ctxt
#	SMIMS-Game/project.greenfoot

...

This commit is contained in:

Marlie

2026-09-15 12:22:37 +02:00

parent d35e3a62de 086274bc82

commit 95e96d7e44

28 changed files with 226 additions and 38 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

SMIMS-Game/images/BreakingPlattform2.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.2 KiB

SMIMS-Game/images/MovingPlattform.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 167 B

SMIMS-Game/images/Plattform.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 981 B

SMIMS-Game/images/PlattformProvisorisch.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 6.9 KiB

SMIMS-Game/images/Unbenannt.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 971 B

SMIMS-Game/images/Unbenannt2.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 610 B

SMIMS-Game/images/a.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 167 B

SMIMS-Game/images/mushroom.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.7 KiB