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

# 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
2022-02-25 10:40:58 +01:00
parent c848107cdc 16be6c18c5
commit 930c834a4b
30 changed files with 1405 additions and 111 deletions
--- a/Assets/Sprites/UI.meta
+++ b/Assets/Sprites/UI.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: a3f6081da63cd0c418822087ccec5eb8
+guid: e49d726e63333ed41b6ac22cf8c4af8e
 folderAsset: yes
 DefaultImporter:
  externalObjects: {}
--- a/Assets/Sprites/UI/UIBase.aseprite
+++ b/Assets/Sprites/UI/UIBase.aseprite
--- a/Assets/Sprites/UI/UIBase.png
+++ b/Assets/Sprites/UI/UIBase.png
--- a/Assets/Sprites/UI/UIButtonBase.aseprite
+++ b/Assets/Sprites/UI/UIButtonBase.aseprite
--- a/Assets/Sprites/UI/UIButtonBase1.png
+++ b/Assets/Sprites/UI/UIButtonBase1.png
--- a/Assets/Sprites/UI/UIButtonBase2.png
+++ b/Assets/Sprites/UI/UIButtonBase2.png
--- a/Assets/Sprites/UI/UIButtonBase3.png
+++ b/Assets/Sprites/UI/UIButtonBase3.png
--- a/Assets/Sprites/UI/UIButtonBase4.png
+++ b/Assets/Sprites/UI/UIButtonBase4.png