Code

Team 2 engineers#125

Code

Merged

V4N5HM merged 22 commits intoTeam6UQcsse3200/2023-studio-3:Team6from Team-2--EngineersUQcsse3200/2023-studio-3:Team-2--EngineersCopy head branch name to clipboardSep 12, 2023

+222-556

Commits

Commits on Sep 10, 2023

• cleaning up

  The-AhmadAA

  committed
  4390f55

  Copy full SHA for 4390f55

Commits on Sep 11, 2023

• merging Collab-end-game-state into Team-2--Engineers

  The-AhmadAA

  committed
  38fcf45

  Copy full SHA for 38fcf45

• Added test class XenoAnimationTest to test animation triggers.

  BlairCannon97

  committed
  61dbfde

  Copy full SHA for 61dbfde

Commits on Sep 12, 2023

• Cleaned up redundant tests in XenoAnimationController

  BlairCannon97

  committed
  ba0396f

  Copy full SHA for ba0396f

• Added an additional test testCreateXenoGruntHasPhysicsMovementComponent() to NPCFactoryTest.

  BlairCannon97

  committed
  5f7c4f4

  Copy full SHA for 5f7c4f4

• fixed display not updating at start if engineerCount is not default

  The-AhmadAA

  committed
  8f466e1

  Copy full SHA for 8f466e1

• added upper bound to engineerCount (1000)

  The-AhmadAA

  committed
  4cb118b

  Copy full SHA for 4cb118b

• Added random melee animation triggers in XenoAnimationController.

  BlairCannon97

  committed
  fe7dc16

  Copy full SHA for fe7dc16

• restored forestGameArea after testing

  The-AhmadAA

  committed
  2e7dcc5

  Copy full SHA for 2e7dcc5

• Merge remote-tracking branch 'origin/main-recovery' into Team-4---General-Mobs

  meganroxburgh

  committed
  91ec9a3

  Copy full SHA for 91ec9a3

• Merge pull request #147 from UQcsse3200/Team-4---General-Mobs

  Show description for b66b7a0
  The-AhmadAA

  authored
  b66b7a0

  Copy full SHA for b66b7a0

• Merge pull request #146 from UQcsse3200/Team-3-maps-main

  Show description for 7b3146f
  The-AhmadAA

  authored
  7b3146f

  Copy full SHA for 7b3146f

• merging main into Team-2--Engineers in preparation for PR

  The-AhmadAA

  committed
  ca941e9

  Copy full SHA for ca941e9

• uncommented code to allow engineers to spawn

  The-AhmadAA

  committed
  2242ac7

  Copy full SHA for 2242ac7

• Added the spawnDroidTower() after somebody deleted it

  Mohamad11Dab

  committed
  75a1cc3

  Copy full SHA for 75a1cc3

• Merge branch 'main' into Team-4---General-Mobs

  BlairCannon97

  committed
  97b7b59

  Copy full SHA for 97b7b59

• Merge pull request #155 from UQcsse3200/Mohamad-Tower

  Show description for f90b2e0
  Hasakev

  authored
  f90b2e0

  Copy full SHA for f90b2e0

• Merge pull request #156 from UQcsse3200/Team6

  Show description for 477f2d6
  rahulsagar500

  authored
  477f2d6

  Copy full SHA for 477f2d6

• Revert "Team6"

  Jonoym

  authored
  58c51ff

  Copy full SHA for 58c51ff

• Merge pull request #159 from UQcsse3200/revert-156-Team6

  Show description for d3a362c
  Jonoym

  authored
  d3a362c

  Copy full SHA for d3a362c

• Merge pull request #157 from UQcsse3200/Team-4---General-Mobs

  Show description for b0bd5ed
  meganroxburgh

  authored
  b0bd5ed

  Copy full SHA for b0bd5ed

• Merge branch 'main' into Team-2--Engineers

  The-AhmadAA

  authored
  71e46d7

  Copy full SHA for 71e46d7