merge

UQcsse3200 · Oct 3, 2023 · 5bddacf · 5bddacf
2 parents 1c5d278 + b30c2c9
commit 5bddacf
Show file tree

Hide file tree

Showing 71 changed files with 1,686 additions and 180 deletions.
diff --git a/source/core/assets/images/attack.png b/source/core/assets/images/attack.png
diff --git a/source/core/assets/images/damage_upgrade.png b/source/core/assets/images/damage_upgrade.png
diff --git a/source/core/assets/images/engineers/engineer_outline.atlas b/source/core/assets/images/engineers/engineer_outline.atlas
@@ -0,0 +1,391 @@
+
+engineer_outline.png
+size: 2048, 128
+format: RGBA8888
+filter: Nearest, Nearest
+repeat: none
+death_outline
+  rotate: false
+  xy: 503, 79
+  size: 52, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: 6
+death_outline
+  rotate: false
+  xy: 902, 79
+  size: 52, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: 3
+death_outline
+  rotate: false
+  xy: 1358, 79
+  size: 52, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: 5
+death_outline
+  rotate: false
+  xy: 1814, 79
+  size: 52, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: 2
+death_outline
+  rotate: false
+  xy: 454, 42
+  size: 52, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: 4
+death_outline
+  rotate: false
+  xy: 796, 42
+  size: 52, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: 1
+firing_auto_outline
+  rotate: false
+  xy: 25, 80
+  size: 52, 31
+  orig: 52, 31
+  offset: 0, 0
+  index: 2
+firing_auto_outline
+  rotate: false
+  xy: 25, 44
+  size: 52, 31
+  orig: 52, 31
+  offset: 0, 0
+  index: 4
+firing_auto_outline
+  rotate: false
+  xy: 102, 80
+  size: 52, 31
+  orig: 52, 31
+  offset: 0, 0
+  index: 1
+firing_auto_outline
+  rotate: false
+  xy: 25, 8
+  size: 52, 31
+  orig: 52, 31
+  offset: 0, 0
+  index: 3
+firing_single_outline
+  rotate: false
+  xy: 102, 42
+  size: 52, 33
+  orig: 45, 33
+  offset: 0, 0
+  index: 2
+firing_single_outline
+  rotate: false
+  xy: 179, 78
+  size: 52, 33
+  orig: 45, 33
+  offset: 0, 0
+  index: 4
+firing_single_outline
+  rotate: false
+  xy: 249, 78
+  size: 52, 33
+  orig: 45, 33
+  offset: 0, 0
+  index: 1
+firing_single_outline
+  rotate: false
+  xy: 319, 78
+  size: 52, 33
+  orig: 45, 33
+  offset: 0, 0
+  index: 3
+firing_single_outline
+  rotate: false
+  xy: 343, 40
+  size: 52, 33
+  orig: 29, 33
+  offset: 0, 0
+  index: 5
+hit_outline
+  rotate: false
+  xy: 560, 79
+  size: 52, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: 3
+hit_outline
+  rotate: false
+  xy: 1415, 79
+  size: 52, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: 2
+hit_outline
+  rotate: false
+  xy: 511, 42
+  size: 52, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: 1
+idle_left_outline
+  rotate: false
+  xy: 674, 79
+  size: 52, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: 2
+idle_left_outline
+  rotate: false
+  xy: 1130, 79
+  size: 52, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: 4
+idle_left_outline
+  rotate: false
+  xy: 1529, 79
+  size: 52, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: 1
+idle_left_outline
+  rotate: false
+  xy: 102, 5
+  size: 52, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: 3
+idle_right_outline
+  rotate: false
+  xy: 1016, 79
+  size: 52, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: 2
+idle_right_outline
+  rotate: false
+  xy: 1586, 79
+  size: 52, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: 4
+default_outline
+  rotate: false
+  xy: 1928, 79
+  size: 52, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: 1
+idle_right_outline
+  rotate: false
+  xy: 1928, 79
+  size: 52, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: 1
+idle_right_outline
+  rotate: false
+  xy: 568, 42
+  size: 52, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: 3
+prep_outline
+  rotate: false
+  xy: 343, 40
+  size: 52, 33
+  orig: 29, 33
+  offset: 0, 0
+  index: 4
+prep_outline
+  rotate: false
+  xy: 853, 41
+  size: 52, 33
+  orig: 29, 33
+  offset: 0, 0
+  index: 1
+prep_outline
+  rotate: false
+  xy: 907, 41
+  size: 52, 33
+  orig: 29, 33
+  offset: 0, 0
+  index: 3
+prep_outline
+  rotate: false
+  xy: 961, 41
+  size: 52, 33
+  orig: 29, 33
+  offset: 0, 0
+  index: 2
+walk_left_outline
+  rotate: false
+  xy: 446, 79
+  size: 52, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: 6
+walk_left_outline
+  rotate: false
+  xy: 845, 79
+  size: 52, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: 3
+walk_left_outline
+  rotate: false
+  xy: 959, 79
+  size: 52, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: 8
+walk_left_outline
+  rotate: false
+  xy: 1301, 79
+  size: 52, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: 5
+walk_left_outline
+  rotate: false
+  xy: 1700, 79
+  size: 52, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: 2
+walk_left_outline
+  rotate: false
+  xy: 1871, 79
+  size: 52, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: 7
+walk_left_outline
+  rotate: false
+  xy: 397, 42
+  size: 52, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: 4
+walk_left_outline
+  rotate: false
+  xy: 739, 42
+  size: 52, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: 1
+walk_prep_outline
+  rotate: false
+  xy: 389, 79
+  size: 52, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: 8
+walk_prep_outline
+  rotate: false
+  xy: 731, 79
+  size: 52, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: 5
+walk_prep_outline
+  rotate: false
+  xy: 1073, 79
+  size: 52, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: 2
+walk_prep_outline
+  rotate: false
+  xy: 1244, 79
+  size: 52, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: 7
+walk_prep_outline
+  rotate: false
+  xy: 1643, 79
+  size: 52, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: 4
+walk_prep_outline
+  rotate: false
+  xy: 1985, 79
+  size: 52, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: 1
+walk_prep_outline
+  rotate: false
+  xy: 229, 41
+  size: 52, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: 6
+walk_prep_outline
+  rotate: false
+  xy: 625, 42
+  size: 52, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: 3
+walk_right_outline
+  rotate: false
+  xy: 617, 79
+  size: 52, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: 2
+walk_right_outline
+  rotate: false
+  xy: 788, 79
+  size: 52, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: 7
+walk_right_outline
+  rotate: false
+  xy: 1187, 79
+  size: 52, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: 4
+walk_right_outline
+  rotate: false
+  xy: 1472, 79
+  size: 52, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: 1
+walk_right_outline
+  rotate: false
+  xy: 1757, 79
+  size: 52, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: 6
+walk_right_outline
+  rotate: false
+  xy: 172, 41
+  size: 52, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: 3
+walk_right_outline
+  rotate: false
+  xy: 286, 41
+  size: 52, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: 8
+walk_right_outline
+  rotate: false
+  xy: 682, 42
+  size: 52, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: 5
diff --git a/source/core/assets/images/engineers/engineer_outline.png b/source/core/assets/images/engineers/engineer_outline.png
diff --git a/source/core/assets/images/glass.png b/source/core/assets/images/glass.png
diff --git a/source/core/assets/images/hammer.png b/source/core/assets/images/hammer.png
diff --git a/source/core/assets/images/health.png b/source/core/assets/images/health.png
diff --git a/source/core/assets/images/heart_upgrade.png b/source/core/assets/images/heart_upgrade.png
diff --git a/source/core/assets/images/hourglass.png b/source/core/assets/images/hourglass.png
diff --git a/source/core/assets/images/hourglass_upgrade.png b/source/core/assets/images/hourglass_upgrade.png
diff --git a/source/core/assets/images/scrap_upgrade.png b/source/core/assets/images/scrap_upgrade.png
diff --git a/source/core/assets/images/towers/imageedit_9_7173145411.png b/source/core/assets/images/towers/imageedit_9_7173145411.png
diff --git a/...e/core/assets/images/towers/wallTower.png → .../core/assets/images/towers/wall_tower.png b/...e/core/assets/images/towers/wallTower.png → .../core/assets/images/towers/wall_tower.png
diff --git a/source/core/assets/images/turret-select/Weapon-Tower-Clicked.png b/source/core/assets/images/turret-select/Weapon-Tower-Clicked.png
diff --git a/source/core/assets/images/turret-select/Weapon-Tower-Default.png b/source/core/assets/images/turret-select/Weapon-Tower-Default.png
diff --git a/source/core/assets/images/turret-select/droid-tower-clicked.png b/source/core/assets/images/turret-select/droid-tower-clicked.png
diff --git a/source/core/assets/images/turret-select/droid-tower-default.png b/source/core/assets/images/turret-select/droid-tower-default.png
diff --git a/source/core/assets/images/turret-select/fire-tower-clicked.png b/source/core/assets/images/turret-select/fire-tower-clicked.png
diff --git a/source/core/assets/images/turret-select/fire-tower-default.png b/source/core/assets/images/turret-select/fire-tower-default.png
diff --git a/source/core/assets/images/turret-select/imageedit_15_5627113584.png b/source/core/assets/images/turret-select/imageedit_15_5627113584.png
diff --git a/source/core/assets/images/turret-select/imageedit_28_4047785594.png b/source/core/assets/images/turret-select/imageedit_28_4047785594.png
diff --git a/source/core/assets/images/turret-select/imageedit_2_8132799771.png b/source/core/assets/images/turret-select/imageedit_2_8132799771.png
diff --git a/source/core/assets/images/turret-select/imageedit_4_5616741474.png b/source/core/assets/images/turret-select/imageedit_4_5616741474.png
diff --git a/source/core/assets/images/turret-select/mine-tower-clicked.png b/source/core/assets/images/turret-select/mine-tower-clicked.png
diff --git a/source/core/assets/images/turret-select/mine-tower-default.png b/source/core/assets/images/turret-select/mine-tower-default.png
diff --git a/source/core/assets/images/turret-select/stun-tower-clicked.png b/source/core/assets/images/turret-select/stun-tower-clicked.png
diff --git a/source/core/assets/images/turret-select/stun-tower-default.png b/source/core/assets/images/turret-select/stun-tower-default.png
diff --git a/source/core/assets/images/turret-select/tnt-tower-clicked.png b/source/core/assets/images/turret-select/tnt-tower-clicked.png
diff --git a/source/core/assets/images/turret-select/tnt-tower-default.png b/source/core/assets/images/turret-select/tnt-tower-default.png
diff --git a/source/core/assets/images/turret-select/wall-tower-clicked.png b/source/core/assets/images/turret-select/wall-tower-clicked.png
diff --git a/source/core/assets/images/turret-select/wall-tower-default.png b/source/core/assets/images/turret-select/wall-tower-default.png
diff --git a/source/core/assets/images/upgrade.png b/source/core/assets/images/upgrade.png
diff --git a/source/core/assets/sounds/turret-select/Modern4.wav b/source/core/assets/sounds/turret-select/Modern4.wav