Merge remote-tracking branch 'origin/main'

Browse Source

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

...

This commit is contained in:

Marlie

2026-09-15 10:29:31 +02:00

parent 07c5614d44 903d791b6b

commit c188985e02

19 changed files with 277 additions and 57 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/Wall.jpg

BIN

Binary file not shown.

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

SMIMS-Game/images/bathroom-tile.jpg

BIN

Binary file not shown.

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

SMIMS-Game/images/sandstone.jpg

BIN

Binary file not shown.

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