merged main into shivam-ui-elements and made a new UIElementsDisplay …

…for ui elements in main game
UQcsse3200 · Sep 29, 2023 · 92228da · 92228da
1 parent a688f05
commit 92228da
Show file tree

Hide file tree

Showing 169 changed files with 6,232 additions and 1,600 deletions.
diff --git a/hs_err_pid27428.log b/hs_err_pid27428.log
diff --git a/source/core/assets/configs/Boss.json b/source/core/assets/configs/Boss.json
@@ -1,5 +1,5 @@
 {
-  "BossKing": {
+  "mobBoss": {
     "health": 100,
     "baseAttack": 25,
     "spookyFactor": 7

diff --git a/source/core/assets/images/Dusty_MoonBG.png b/source/core/assets/images/Dusty_MoonBG.png
diff --git a/source/core/assets/images/desert_bg.png b/source/core/assets/images/desert_bg.png
diff --git a/source/core/assets/images/desert_bg2.png b/source/core/assets/images/desert_bg2.png
diff --git a/source/core/assets/images/ice_bg.png b/source/core/assets/images/ice_bg.png
diff --git a/source/core/assets/images/ice_bg1.png b/source/core/assets/images/ice_bg1.png
diff --git a/source/core/assets/images/lava_bg.png b/source/core/assets/images/lava_bg.png
diff --git a/source/core/assets/images/lava_bg1.png b/source/core/assets/images/lava_bg1.png