Merge branch 'main' into Team6--projectile

UQcsse3200 · Oct 17, 2023 · b2ef82b · b2ef82b
2 parents 8b56bb7 + 0943d57
commit b2ef82b
Show file tree

Hide file tree

Showing 355 changed files with 5,237 additions and 2,533 deletions.
diff --git a/source/core/assets/images/HelpScreen/Demonbosshelp.png b/source/core/assets/images/HelpScreen/Demonbosshelp.png
diff --git a/source/core/assets/images/HelpScreen/Dragonknighthelp.png b/source/core/assets/images/HelpScreen/Dragonknighthelp.png
diff --git a/source/core/assets/images/HelpScreen/Econ.png b/source/core/assets/images/HelpScreen/Econ.png
diff --git a/source/core/assets/images/HelpScreen/Engineer.png b/source/core/assets/images/HelpScreen/Engineer.png
diff --git a/source/core/assets/images/HelpScreen/Firewormhelp.png b/source/core/assets/images/HelpScreen/Firewormhelp.png
diff --git a/source/core/assets/images/HelpScreen/HTP.png b/source/core/assets/images/HelpScreen/HTP.png
diff --git a/source/core/assets/images/HelpScreen/IceBosshelp.png b/source/core/assets/images/HelpScreen/IceBosshelp.png
diff --git a/source/core/assets/images/HelpScreen/Mob.png b/source/core/assets/images/HelpScreen/Mob.png
diff --git a/source/core/assets/images/HelpScreen/Patrickbosshelp.png b/source/core/assets/images/HelpScreen/Patrickbosshelp.png
diff --git a/source/core/assets/images/HelpScreen/Skeletonhelp.png b/source/core/assets/images/HelpScreen/Skeletonhelp.png
diff --git a/source/core/assets/images/HelpScreen/Turret.png b/source/core/assets/images/HelpScreen/Turret.png
diff --git a/source/core/assets/images/HelpScreen/WaterQueenhelp.png b/source/core/assets/images/HelpScreen/WaterQueenhelp.png
diff --git a/source/core/assets/images/HelpScreen/Waterslimehelp.png b/source/core/assets/images/HelpScreen/Waterslimehelp.png
diff --git a/source/core/assets/images/HelpScreen/Wizardhelp.png b/source/core/assets/images/HelpScreen/Wizardhelp.png
diff --git a/source/core/assets/images/HelpScreen/hs.jpg b/source/core/assets/images/HelpScreen/hs.jpg
diff --git a/source/core/assets/images/LoadingScreen.png b/source/core/assets/images/LoadingScreen.png
diff --git a/source/core/assets/images/background/main_menu/main_menu_bg.png b/source/core/assets/images/background/main_menu/main_menu_bg.png
diff --git a/source/core/assets/images/background/settings/settings_bg.png b/source/core/assets/images/background/settings/settings_bg.png
diff --git a/source/core/assets/images/mobs/skeleton.atlas b/source/core/assets/images/mobs/skeleton.atlas
@@ -76,7 +76,7 @@ skeleton_attack
   index: -1
 skeleton_attack
   rotate: false
-  xy: 514, 2
+  xy: 578, 52
   size: 62, 48
   orig: 62, 48
   offset: 0, 0
@@ -90,7 +90,7 @@ skeleton_attack
   index: -1
 skeleton_attack
   rotate: false
-  xy: 770, 2
+  xy: 834, 52
   size: 62, 48
   orig: 62, 48
   offset: 0, 0
@@ -102,41 +102,6 @@ skeleton_attack
   orig: 62, 48
   offset: 0, 0
   index: -1
-skeleton_death
-  rotate: false
-  xy: 1026, 2
-  size: 62, 48
-  orig: 62, 48
-  offset: 0, 0
-  index: -1
-skeleton_death
-  rotate: false
-  xy: 66, 52
-  size: 62, 48
-  orig: 62, 48
-  offset: 0, 0
-  index: -1
-skeleton_death
-  rotate: false
-  xy: 834, 52
-  size: 62, 48
-  orig: 62, 48
-  offset: 0, 0
-  index: -1
-skeleton_death
-  rotate: false
-  xy: 1154, 55
-  size: 62, 45
-  orig: 62, 45
-  offset: 0, 0
-  index: -1
-skeleton_death
-  rotate: false
-  xy: 578, 2
-  size: 62, 48
-  orig: 62, 48
-  offset: 0, 0
-  index: -1
 skeleton_death
   rotate: false
   xy: 194, 52
@@ -195,7 +160,7 @@ skeleton_walk
   index: -1
 skeleton_walk
   rotate: false
-  xy: 514, 52
+  xy: 514, 2
   size: 62, 48
   orig: 62, 48
   offset: 0, 0
@@ -209,7 +174,7 @@ skeleton_walk
   index: -1
 skeleton_walk
   rotate: false
-  xy: 770, 52
+  xy: 770, 2
   size: 62, 48
   orig: 62, 48
   offset: 0, 0
@@ -244,21 +209,21 @@ skeleton_walk
   index: -1
 skeleton_walk
   rotate: false
-  xy: 578, 52
+  xy: 514, 52
   size: 62, 48
   orig: 62, 48
   offset: 0, 0
   index: -1
 skeleton_walk
   rotate: false
-  xy: 130, 2
+  xy: 66, 52
   size: 62, 48
   orig: 62, 48
   offset: 0, 0
   index: -1
 skeleton_walk
   rotate: false
-  xy: 834, 2
+  xy: 770, 52
   size: 62, 48
   orig: 62, 48
   offset: 0, 0

diff --git a/source/core/assets/images/mobs/skeleton.png b/source/core/assets/images/mobs/skeleton.png
diff --git a/source/core/assets/images/ui/Screen/Losing.png b/source/core/assets/images/ui/Screen/Losing.png
diff --git a/source/core/assets/images/ui/Screen/Nextlevel.png b/source/core/assets/images/ui/Screen/Nextlevel.png
diff --git a/source/core/assets/images/ui/Screen/WinningScreen.png b/source/core/assets/images/ui/Screen/WinningScreen.png
diff --git a/source/core/assets/images/ui/Sprites/UI_Glass_Arrow_Large_01a - Copy.png b/source/core/assets/images/ui/Sprites/UI_Glass_Arrow_Large_01a - Copy.png