Merge remote-tracking branch 'refs/remotes/origin/refactor'

Browse Source

# Conflicts:
#	main.cpp

...

This commit is contained in:

hamx

2024-12-04 23:46:09 +01:00

parent 0e1b53fc9b 9d4af21d4d

commit 087a8d7672

184 changed files with 322 additions and 238 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

assets/img/space.png → assets/img/background/background.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.1 MiB After Width:  |  Height:  |  Size: 1.1 MiB

assets/img/bullet_right.png → assets/img/bullets/bullet_green.png

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

assets/img/bullet_left.png → assets/img/bullets/bullet_pink.png

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

assets/img/ikonka.png → assets/img/icon/ikonka.png

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

assets/img/meteor-1.png → assets/img/meteors/meteor-1.png

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

assets/img/meteor-2.png → assets/img/meteors/meteor-2.png

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

assets/img/Rocket_111.png → assets/img/rockets/Rocket_111.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 489 B After Width:  |  Height:  |  Size: 489 B

assets/img/Rocket_115.png → assets/img/rockets/Rocket_115.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 503 B After Width:  |  Height:  |  Size: 503 B