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

Browse Source

# Conflicts:
#	CMakeLists.txt
#	main.cpp

...

This commit is contained in:

hamx

2024-11-22 12:28:57 +01:00

parent f57d7a8d8a 1a228bdfc2

commit ec3d4e78ce

18 changed files with 270 additions and 52 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/fonts/arial.TTF

BIN

Binary file not shown.

assets/img/Rocket_111.png

BIN

Binary file not shown.

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

assets/img/Rocket_115.png

BIN

Binary file not shown.

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

assets/img/meteor-1.png

BIN

Binary file not shown.

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

assets/img/meteor-2.png

BIN

Binary file not shown.

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

assets/ship/Dreadnought-Base.png

BIN

Binary file not shown.

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