Merge remote-tracking branch 'origin/main'

Browse Source

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

...

This commit is contained in:

Caspar

2026-09-15 11:55:52 +02:00

parent d9f0219cf1 9cef598196

commit e63fc5cadc

24 changed files with 232 additions and 93 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/Projectile1.jpeg

BIN

Binary file not shown.

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

SMIMS-Game/images/Projectile1.png

BIN

Binary file not shown.

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

SMIMS-Game/images/bluerock.jpg

BIN

Binary file not shown.

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

SMIMS-Game/images/mushroom.png

BIN

Binary file not shown.

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