Code

Team 2 alasdair branch#97

Code

Merged

The-AhmadAA merged 67 commits intoTeam-2--TowersUQcsse3200/2023-studio-3:Team-2--Towersfrom Team-2--Alasdair-BranchUQcsse3200/2023-studio-3:Team-2--Alasdair-BranchCopy head branch name to clipboardSep 6, 2023

+706-118

Commits

Commits on Aug 24, 2023

• Added direction variables for projectiles i.e. towards mobs or towards towers. Also cleaned up some of the code.

  JSLLW

  committed
  21e7687

• Fixed bug that I had accidentally introduced in the last commit.

  JSLLW

  committed
  b907d19

• Merge branch 'Team-1--Projectiles' of https://github.com/UQcsse3200/2023-studio-3 into Team-1--Projectiles

  MiniSoda17

  committed
  a6b4dd9

• Added more parameters to spawn projectile functions for better adaptability. Removed shooter param from createProjectile

  JSLLW

  committed
  93bfc36

• Merge branch 'Team-1--Projectiles' of https://github.com/UQcsse3200/2023-studio-3 into Team-1--Projectiles

  MiniSoda17

  committed
  8508a17

• Added ability to spawn multiple projectiles of any odd number greater than 2.

  JSLLW

  committed
  1ca17c6

• Merge branch 'Team-1--Projectiles' of https://github.com/UQcsse3200/2023-studio-3 into Team-1--Projectiles

  JSLLW

  committed
  d4cd555

• Improved spawnMultiProjectile function

  JSLLW

  committed
  43e519b

Commits on Aug 25, 2023

• Add minor temporary changes for testing

  freshc0w

  committed
  f5bcfbb

• Add togglable feature for destroying projectile on collision

  freshc0w

  committed
  88c9388

• Add selective targeting for projectiles and configure exception handling in ProjectileDestructors@

  freshc0w

  committed
  22e218f

• Make base projectile factory method and create fireball factory method

  freshc0w

  committed
  dcdf9fd

• Initialise aoe fireball class

  freshc0w

  committed
  9694abf

• Change json naming for config

  freshc0w

  committed
  e66be18

• Merge remote-tracking branch 'origin/main' into interaction

  freshc0w

  committed
  3081ca5

• Revert "Change json naming for config"

  Show description for 710f088
  freshc0w

  committed
  710f088

• Change projectile to fireball in config.json

  freshc0w

  committed
  904fc65

Commits on Aug 26, 2023

• Merge main into team1 branch

  freshc0w

  committed
  9cd1bad

• Initialise collider test

  freshc0w

  committed
  cd8d41f

• Created aoe fireball entity and touch attack component with aoe size parameter

  gregchan550

  committed
  ebcc19f

• Removing code smells from Team-1--Projectiles branch

  MiniSoda17

  committed
  88d7dd9

Commits on Aug 27, 2023

• Added new method in entity service which gets nearby entities and also aoe component which uses method to damage nearby entites

  gregchan550

  committed
  611c93c

• Fixed bug where game was crashing because createaoefireball was trying to add 2 texture render components

  gregchan550

  committed
  3cc0dd3

• Update README.md

  Show description for 373ae0d
  The-AhmadAA

  authored
  373ae0d

Commits on Aug 28, 2023

• Merge pull request #56 from UQcsse3200/Team-2--Towers

  Mohamad11Dab

  authored
  e79570b

• added event listener so that aoe damage can be applied on collision end

  gregchan550

  committed
  a39787b

• Added JUnit testing to the ProjectileFactory

  cindyle1

  committed
  996623e

• Merge branch 'Team-1--Projectiles' of github.com:UQcsse3200/2023-studio-3 into single-target

  cindyle1

  committed
  f212be4

• Removed a variable which caused the TowerProjectileFactory Junit tests to fail

  cindyle1

  committed
  55ad213

• Removed the function that caused JUnit test failure

  cindyle1

  committed
  a1fc6fb

• Removed 'static' in maxSpeed variable from PhysicsMovementComponent to allow for ghosts to move slower

  cindyle1

  committed
  112ecc6

• Fixed bug in setSpeed

  cindyle1

  committed
  d045449

• Added FireBall entity to test in Junit

  MiniSoda17

  committed
  92f007e

• Merge branch 'Team-1--Projectiles' of https://github.com/UQcsse3200/2023-studio-3 into Team-1--Projectiles

  MiniSoda17

  committed
  53ef509

• fixed bug where when aoe damage is applied it deals double damage

  gregchan550

  committed
  9421369

• fixed .vimrc nocompatible, relativenumber, fillchars+=eob:~

  gregchan550

  committed
  d890cac

• Merge branch 'Team-1--Projectiles' of https://github.com/UQcsse3200/2023-studio-3 into Team-1--Projectiles

  MiniSoda17

  committed
  fd72989

• Added some javadocs c:; cd 'c:\Users\Joey\OneDrive\Desktop\CSSE3200\repos\2023-studio-3'; & 'C:\Program Files\Java\jdk-17.0.2\bin\java.exe' '@C:\Users\Joey\AppData\Local\Temp\cp_avw9q36qqucrxu3ihe6…

  Show description for 5edf61a
  JSLLW

  committed
  5edf61a

• Added to javadocs

  JSLLW

  committed
  d255a26

• Merge branch 'Team-1--Projectiles' of https://github.com/UQcsse3200/2023-studio-3 into Team-1--Projectiles

  MiniSoda17

  committed
  d5f1bc1

• Implemented additional Junit testing for ProjectileFactory creation of Projectiles and their components

  MiniSoda17

  committed
  fed85e9

Commits on Aug 29, 2023

• Add dispose testing and remove fireball testing.

  MiniSoda17

  committed
  0224fb5

• Remove code smells

  MiniSoda17

  committed
  ed364e9

• Merge with Team-2 towers state

  MiniSoda17

  committed
  305973a

• Pull from main

  MiniSoda17

  committed
  7a430a8

• Pull from main

  MiniSoda17

  committed
  19334e3

• Fix merge conflicts

  MiniSoda17

  committed
  9069ebc

• Merge pull request #65 from UQcsse3200/Team-2--Towers

  Show description for 8e1abd9
  The-AhmadAA

  authored
  8e1abd9

• Fix merge conflicts with Tower combat stats and combatstats component

  MiniSoda17

  committed
  95764bd

• merge main

  MiniSoda17

  committed
  e4a2738

• fixed merge conflict

  The-AhmadAA

  committed
  569fb24

• Att getEntityAtPosition at EntityService

  MiniSoda17

  committed
  0841f6e

• fix merge conflict

  The-AhmadAA

  committed
  7efc04e

• commented out line checkAndDeleteBodies()

  The-AhmadAA

  committed
  07ab4db

• Merge pull request #71 from UQcsse3200/Team-1--Projectiles

  Show description for 449c63a
  The-AhmadAA

  authored
  449c63a

• bump

  Jonoym

  committed
  cb83eb8

• Merge pull request #72 from UQcsse3200/test

  Show description for d307431
  Jonoym

  authored
  d307431

• Update gradle_release.yaml

  Jonoym

  authored
  cc9a4c2

• Updated javadocs

  Jonoym

  committed
  6a3ae93

Commits on Aug 31, 2023

• Created new TowerUpgraderComponent class, which listens for an event to make an upgrade to the tower. No upgrade types do anything yet.

  AlasdairS4698737

  committed
  0dddd12

• Added capabilty for TowerUpgraderComponent to increase the the base attack stat in the CombatStatsComponent of the same entity.

  AlasdairS4698737

  committed
  9cde24a

Commits on Sep 1, 2023

• Merge branch 'main' into Team-2--Alasdair-Branch

  AlasdairS4698737

  committed
  0d189ca

Commits on Sep 3, 2023

• Fixed filename typo

  AlasdairS4698737

  committed
  98c3dc5

• Implemented the upgrading of a tower's max health, including changes to CombatStatsComponent to alter the fullHealth variable.

  AlasdairS4698737

  committed
  c75f782

Commits on Sep 6, 2023

• Added fire rate upgrade functionality to TowerUpgraderComponent, also added functionality to TowerCombatTask for supporting fire rate upgrades.

  AlasdairS4698737

  committed
  82715be

• TowerUpgraderComponent is now added to tower entities when they are created.

  AlasdairS4698737

  committed
  705c3e2

• Added repair capability to TowerUpgraderComponent

  AlasdairS4698737

  committed
  23d4e6e