Merge remote-tracking branch 'origin/Syntriax' into Over

Browse Source

# Conflicts:
#	Assets/Sprites/UI.meta
#	Assets/Sprites/UI/UIBase.aseprite
#	Assets/Sprites/UI/UIBase.png
#	Assets/Sprites/UI/UIButtonBase.aseprite
#	Assets/Sprites/UI/UIButtonBase1.png
#	Assets/Sprites/UI/UIButtonBase2.png
#	Assets/Sprites/UI/UIButtonBase3.png
#	Assets/Sprites/UI/UIButtonBase4.png

...

This commit is contained in:

OverflowNarhoym

2022-02-25 10:40:58 +01:00

parent c848107cdc 16be6c18c5

commit 930c834a4b

30 changed files with 1405 additions and 111 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/Sprites/UI/UIBase.aseprite

Binary file not shown.

BIN

Assets/Sprites/UI/UIBase.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 258 B

BIN

Assets/Sprites/UI/UIButtonBase.aseprite

Binary file not shown.

BIN

Assets/Sprites/UI/UIButtonBase1.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 275 B

BIN

Assets/Sprites/UI/UIButtonBase2.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 275 B

BIN

Assets/Sprites/UI/UIButtonBase3.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 275 B

BIN

Assets/Sprites/UI/UIButtonBase4.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 275 B