Merge pull request #40 from SWE2024/dev

almost complete sprint 4
SWE2024 · May 1, 2024 · 556bf68 · 556bf68
2 parents 9e1b5ae + d9674e2
commit 556bf68
Show file tree

Hide file tree

Showing 260 changed files with 26,599 additions and 1,034 deletions.
diff --git a/Assets/Buttons/btnAudio.png.meta b/Assets/Buttons/btnAudio.png.meta
diff --git a/Assets/Buttons/btnCancel.png.meta b/Assets/Buttons/btnCancel.png.meta
diff --git a/Assets/Buttons/btnCardInventory.png b/Assets/Buttons/btnCardInventory.png
diff --git a/Assets/Buttons/btnCardInventory.png.meta b/Assets/Buttons/btnCardInventory.png.meta
diff --git a/Assets/Buttons/btnConfirm.png.meta b/Assets/Buttons/btnConfirm.png.meta
diff --git a/Assets/Buttons/btnEndPhase.png.meta b/Assets/Buttons/btnEndPhase.png.meta
diff --git a/Assets/Buttons/btnExit.png.meta b/Assets/Buttons/btnExit.png.meta
diff --git a/Assets/Buttons/btnLeave.png.meta b/Assets/Buttons/btnLeave.png.meta
diff --git a/Assets/Buttons/btnMap1.png b/Assets/Buttons/btnMap1.png
diff --git a/Assets/Buttons/btnMap1.png.meta b/Assets/Buttons/btnMap1.png.meta
diff --git a/Assets/Buttons/btnMap2.png b/Assets/Buttons/btnMap2.png
diff --git a/Assets/Buttons/btnMap2.png.meta b/Assets/Buttons/btnMap2.png.meta
diff --git a/Assets/Buttons/btnMap3.png b/Assets/Buttons/btnMap3.png
diff --git a/Assets/Buttons/btnMap3.png.meta b/Assets/Buttons/btnMap3.png.meta
diff --git a/Assets/Buttons/btnMinus.png.meta b/Assets/Buttons/btnMinus.png.meta
diff --git a/Assets/Buttons/btnPlay.png.meta b/Assets/Buttons/btnPlay.png.meta