Clean up git merge on Game.cpp added assets

Browse Source

...

This commit is contained in:

Alan Youngblood

2023-08-12 23:27:14 -04:00

parent ff1863182e

commit 6bdaefdeb9

7 changed files with 23 additions and 18 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

BIN

assets/textures/ui/TitleScreen.aseprite Normal file

Binary file not shown.

BIN

assets/textures/ui/titlescreen.png Normal file

Binary file not shown.

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

BIN

assets/textures/ui/titlescreenbig.png Normal file

Binary file not shown.

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