Merge remote-tracking branch 'origin/Team-3' into Team-3

# Conflicts: # source/core/src/main/com/csse3200/game/screens/StoryScreen.java
UQcsse3200 · Oct 2, 2023 · 6149726 · 6149726
2 parents 1adc26d + 0c8e0cc
commit 6149726
Show file tree

Hide file tree

Showing 171 changed files with 1,649 additions and 6,265 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 @@
 {
-  "mobBoss": {
+  "BossKing": {
     "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/background/HelpScreenBG.png b/source/core/assets/images/background/HelpScreenBG.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