Merge remote-tracking branch 'origin/main'

Browse Source

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

...

This commit is contained in:

Caspar

2026-09-17 09:28:50 +02:00

parent c719e5b053 b3a951626c

commit 6215bff73d

27 changed files with 109 additions and 90 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/Breaking1.png

BIN

Binary file not shown.

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

SMIMS-Game/images/Breaking2.png

BIN

Binary file not shown.

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

SMIMS-Game/images/Health.png

BIN

Binary file not shown.

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

SMIMS-Game/images/Spikes.png

BIN

Binary file not shown.

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

SMIMS-Game/images/Spikes2.png

BIN

Binary file not shown.

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

SMIMS-Game/images/Spikes3.png

BIN

Binary file not shown.

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

SMIMS-Game/images/StartBackground.png

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 160 KiB After Width:  |  Height:  |  Size: 272 KiB

SMIMS-Game/images/inactiveSpike.png

BIN

Binary file not shown.

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

SMIMS-Game/images/singleSpike.png

BIN

Binary file not shown.

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