Merge remote-tracking branch 'origin/main'

Browse Source

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

...

This commit is contained in:

Caspar

2026-09-16 17:21:25 +02:00

parent a0de2fb58d aa8fb9a067

commit eba1e4567e

31 changed files with 389 additions and 123 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/Platform1.png

BIN

Binary file not shown.

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

SMIMS-Game/images/Player.png

BIN

Binary file not shown.

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

SMIMS-Game/images/Score1.png

BIN

Binary file not shown.

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

SMIMS-Game/images/Score2.png

BIN

Binary file not shown.

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

SMIMS-Game/images/greenfoot.png

BIN

Binary file not shown.

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

SMIMS-Game/images/herz.png

BIN

Binary file not shown.

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