Code

Updated comments#45

Code

Merged

Mohamad11Dab merged 39 commits intomainUQcsse3200/2023-studio-3:mainfrom Tower-GraphicsUQcsse3200/2023-studio-3:Tower-GraphicsCopy head branch name to clipboardAug 25, 2023

+1,327-7

Commits

Commits on Aug 16, 2023

• updated readme for individual branch (sub-branch of team-2)

  The-AhmadAA

  committed
  2a9f37a

  Copy full SHA for 2a9f37a

Commits on Aug 18, 2023

• updated readme for team 2

  The-AhmadAA

  committed
  db7e7fe

  Copy full SHA for db7e7fe

• Added TowerFactory class

  Mohamad11Dab

  committed
  79f29c3

  Copy full SHA for 79f29c3

• Implemented CostComponent for entities that necessitate a cost

  Mohamad11Dab

  committed
  5c27158

  Copy full SHA for 5c27158

• Added empty files baseTowerConfigs and tower.json

  Mohamad11Dab

  committed
  91c121c

  Copy full SHA for 91c121c

• Added comments in TowerFactory

  Mohamad11Dab

  committed
  ff7cfc1

  Copy full SHA for ff7cfc1

Commits on Aug 19, 2023

• added static sprite and spritesheet for graphics development

  The-AhmadAA

  committed
  b680796

  Copy full SHA for b680796

• changed tree texture into turret texture

  The-AhmadAA

  committed
  55d0f47

  Copy full SHA for 55d0f47

• added skeleton JUnit files for Tower graphics specific rendering testing

  The-AhmadAA

  committed
  95c142b

  Copy full SHA for 95c142b

• merged changes from Mohamad-Tower-state into Tower-Graphics branch to continue development

  The-AhmadAA

  committed
  c6b9ca2

  Copy full SHA for c6b9ca2

Commits on Aug 20, 2023

• Added JUnit tests for TowerFactoryTest and CostComponentTest

  Mohamad11Dab

  committed
  d18aca6

  Copy full SHA for d18aca6

Commits on Aug 22, 2023

• Added Configurations for WallTower and WeaponTower entities

  Mohamad11Dab

  committed
  c1e4c0e

  Copy full SHA for c1e4c0e

• Implemented WeaponTower and WallTower in TowerFactory

  Mohamad11Dab

  committed
  12064f0

  Copy full SHA for 12064f0

• Added new JUnit tests in TowerFactoryTest

  Mohamad11Dab

  committed
  925e86f

  Copy full SHA for 925e86f

• added turret (weapon tower) animation assets

  The-AhmadAA

  committed
  18f435d

  Copy full SHA for 18f435d

• modified animation atlas files to animate

  The-AhmadAA

  committed
  97e4d12

  Copy full SHA for 97e4d12

• configured ghosts to appear as towers and animate

  The-AhmadAA

  committed
  ea0a7a4

  Copy full SHA for ea0a7a4

Commits on Aug 23, 2023

• Test has bug

  AlasdairS4698737

  committed
  a478674

  Copy full SHA for a478674

• Added Tower animation controller class

  The-AhmadAA

  committed
  a165843

  Copy full SHA for a165843

• added updated tower deployment assets

  The-AhmadAA

  committed
  9c8c156

  Copy full SHA for 9c8c156

Commits on Aug 24, 2023

• modified atlas file to include all animations

  The-AhmadAA

  committed
  96e2f0e

  Copy full SHA for 96e2f0e

• asset update

  The-AhmadAA

  committed
  e3a9202

  Copy full SHA for e3a9202

• modified TowerFactory with AiTaskComponent and AnimationRenderComponent additions

  The-AhmadAA

  committed
  48528c7

  Copy full SHA for 48528c7

• created TowerAnimationController class

  The-AhmadAA

  committed
  fa94aaf

  Copy full SHA for fa94aaf

• modified ForestGameArea for testing, added TowerCombatTask and TowerIdleTask

  The-AhmadAA

  committed
  5f1e1a7

  Copy full SHA for 5f1e1a7

• Built tower idle and combat tasks

  The-AhmadAA

  committed
  c1fff29

  Copy full SHA for c1fff29

• updated the TowerFactory to add animator and aiTask components

  The-AhmadAA

  committed
  23cebb2

  Copy full SHA for 23cebb2

• fixed some naming

  The-AhmadAA

  committed
  97cea2d

  Copy full SHA for 97cea2d

• restored ghost functionality to focus on dedicated turret classes

  The-AhmadAA

  committed
  b9cec11

  Copy full SHA for b9cec11

• duplicated assets for troubleshooting

  The-AhmadAA

  committed
  f1ca47d

  Copy full SHA for f1ca47d

• More adjustments to animation and tower ai for troubleshooting.

  The-AhmadAA

  committed
  2cef542

  Copy full SHA for 2cef542

• Fixed bug in PopupMenuComponent that caused its override method to be ignored in lieu of the original.

  AlasdairS4698737

  committed
  4fe7ac6

  Copy full SHA for 4fe7ac6

Commits on Aug 25, 2023

• fixed animation and event triggering in TowerCombatTask, removed TowerIdleTask from TowerFactory

  The-AhmadAA

  committed
  f1d773a

  Copy full SHA for f1d773a

• fixed TowerFactory JUnit test 'asset not loaded' error

  The-AhmadAA

  committed
  b44a783

  Copy full SHA for b44a783

• Merge pull request #42 from UQcsse3200/Team-2--Alasdair-Branch

  Show description for 9ab82c1
  The-AhmadAA

  authored
  9ab82c1

  Copy full SHA for 9ab82c1

• Merge branch 'Team-2--Towers' into Tower-Graphics

  Mohamad11Dab

  authored
  d06363b

  Copy full SHA for d06363b

• Merge pull request #43 from UQcsse3200/Tower-Graphics

  Show description for 7dd76bb
  Mohamad11Dab

  authored
  7dd76bb

  Copy full SHA for 7dd76bb

• fixed merge conflict

  The-AhmadAA

  committed
  3d2f6cb

  Copy full SHA for 3d2f6cb

• updated comments

  The-AhmadAA

  committed
  b2e61b8

  Copy full SHA for b2e61b8