Code

Team 7 tower extension#213

Code

Merged

Hasakev merged 39 commits intomainUQcsse3200/2023-studio-3:mainfrom Team-7--Tower-ExtensionUQcsse3200/2023-studio-3:Team-7--Tower-ExtensionCopy head branch name to clipboardOct 3, 2023

+3,100-22

Commits

Commits on Oct 1, 2023

• added FireworksTower config

  ThivanW

  committed
  685341e

• Added FireworksTowerCombatTask

  ThivanW

  committed
  aff253f

• Added all components apart from animations to the FireworksTower

  ThivanW

  committed
  3833226

• Added PierceTower to TowerFactory

  ThivanW

  committed
  a0a26c4

• Added ricochet tower and made modifications to pierce and fireworks towers for cohesion

  ThivanW

  committed
  0386c95

• made the tower fireworks from created to working state the tower is currently spawned in and is using the fireworks projectile and the tower combat has been modified for the charging start and end …

  Show description for cacf4fc
  karthikeya-v

  committed
  cacf4fc

• created a new tower code for a health tower(experimenting)

  karthikeya-v

  committed
  b519f89

Commits on Oct 2, 2023

• added attackRate and incomeRate variables for the ui team to use in the config files

  karthikeya-v

  committed
  aa4bec5

• Added Fireworks Tower Combat Task Test

  ThivanW

  committed
  12412ce

• Added Pierce Tower Combat Task Test

  ThivanW

  committed
  0ca893e

• Added Ricochet Tower Combat Task Test

  ThivanW

  committed
  3984d3b

• removed charge states for the fireworks tower combat task

  ThivanW

  committed
  9c4fd94

• Added Bombship Movement Task

  Vishal-jodd

  committed
  fd11f32

• Added Wait Task for the bombship

  Vishal-jodd

  committed
  9675d4b

• Added the Animation Controller for the Bombship

  Vishal-jodd

  committed
  705ddcb

• changed some code regarding atlas files and animations

  karthikeya-v

  committed
  c0a28ab

• created walltowerdestructiontask and the wall towers or barricades are in place on the map to obstruct the mobs

  karthikeya-v

  committed
  6d4e561

• Added the combat task for the bombship

  Vishal-jodd

  committed
  c42b661

• Added the Bombship Wander Task

  Vishal-jodd

  committed
  5af5a14

• implemented the animations and working for the PierceTower

  karthikeya-v

  committed
  7ec9e42

• Added the ricochetTower and fine tuned the animations for the wall tower as it is doing the death animation sometimes while its not doing it sometimes

  karthikeya-v

  committed
  dd5ccbb

• changed the barrier or wallTower atlas file contents

  karthikeya-v

  committed
  b3c67a1

• fixed wall tower animation being played on reverse

  ThivanW

  committed
  2a40dd9

• Fixed merge conflicts

  ThivanW

  committed
  4005c46

• Added targets to combat task , the targets are boss and mob

  Vishal-jodd

  committed
  2e52c80

• changed the projectile used by the fireworks tower

  ThivanW

  committed
  a93747b

Commits on Oct 3, 2023

• Added the Config class

  Vishal-jodd

  committed
  915648f

• Merge remote-tracking branch 'origin/Team-7--Tower-Extension' into Team-7--Tower-Extension

  Vishal-jodd

  committed
  81216ce

• fixed merge issues and readded fireworks tower combat task test

  ThivanW

  committed
  a72ad50

• Merge branch 'Team-7--Tower-Extension' of https://github.com/UQcsse3200/2023-studio-3 into Team-7--Tower-Extension

  ThivanW

  committed
  1750b40

• Added the config classes and also cleared errors

  Vishal-jodd

  committed
  8e3585d

• Merge remote-tracking branch 'origin/Team-7--Tower-Extension' into Team-7--Tower-Extension

  Vishal-jodd

  committed
  07ee863

• Added spawn , but its working

  Vishal-jodd

  committed
  102a537

• Changes the combat logic and is not working

  Vishal-jodd

  committed
  206d181

• Merge branch 'main' into Team-7--Tower-Extension

  ThivanW

  committed
  0b9ec9e

• No other tower in the same lane

  DevenBhasin

  committed
  ee863ce

• Merge branch 'Team-7--Tower-Extension' of https://github.com/UQcsse3200/2023-studio-3 into Team-7--Tower-Extension

  DevenBhasin

  committed
  746ef5b

• Added temporary fix to prevent updating of new towers

  Hasakev

  committed
  6aaa551

• Merge branch 'Team-7--Tower-Extension' of https://github.com/UQcsse3200/2023-studio-3 into Team-7--Tower-Extension

  Hasakev

  committed
  a7c20a7