Code

Team 4 general mobs#136

Code

Merged

meganroxburgh merged 52 commits intomainUQcsse3200/2023-studio-3:mainfrom Team-4---General-MobsUQcsse3200/2023-studio-3:Team-4---General-MobsCopy head branch name to clipboardSep 11, 2023

+382-97

Commits

Commits on Sep 4, 2023

• Made changes to xenoAnimationController and ForestGameArea to support the second xeno melee.

  BlairCannon97

  committed
  1e18d77

Commits on Sep 6, 2023

• Merge remote-tracking branch 'origin/Team4-GeneralMobs-Megan' into team-4---General-Mobs---Animations

  BlairCannon97

  committed
  1408d26

Commits on Sep 7, 2023

• Merge branch 'main' into feature/Team4/integrate-enemies

  Show description for a97c059
  samsully

  committed
  a97c059

Commits on Sep 8, 2023

• Merge branch 'Team-3-maps-main' into Team4-GeneralMobs-Megan

  meganroxburgh

  committed
  8a50404

• Removed the rescaling of projectiles in MobAttackTask

  meganroxburgh

  committed
  ab853e0

• Modifies spawning functionality of mobs to correspond with the lanes of the map

  bojyyy

  committed
  9780bc8

• Merge branch 'Team-4---General-Mobs' into team-4---General-Mobs---Animations

  BlairCannon97

  committed
  60a0e6b

• Refactored xeno files into mobs folder

  BlairCannon97

  committed
  6888d38

• Updated references to xeno atlas

  BlairCannon97

  committed
  0e68b7b

Commits on Sep 9, 2023

• Cleaned up CreateXeno function in NPC factory. Added animation triggers to MobAttackTask and MobDeathTask

  BlairCannon97

  committed
  cdc8b59

• Updated and removed redundant code in MobAttackTask

  meganroxburgh

  committed
  b581bc9

• Added comments for testing

  meganroxburgh

  committed
  cd4895e

• Added in print statements for testing

  meganroxburgh

  committed
  0954648

• Merge branch 'main' into Team4-GeneralMobs-Megan

  meganroxburgh

  committed
  92d3c99

• got mobs to stop when firing

  samsully

  committed
  a9aedbc

• Removed extra print statements for testing and moved position of mobball

  meganroxburgh

  committed
  0aa993a

• Merge branch 'feature/Team4/integrate-enemies' into Team4-GeneralMobs-Megan

  meganroxburgh

  committed
  fba189a

• Fixed build errors of missing commas

  meganroxburgh

  committed
  111f022

• created raycast function to find fixture

  samsully

  committed
  bde19c5

• Commented out some spawning of entities for testing purposes

  meganroxburgh

  committed
  8808670

• Merge branch 'feature/Team4/integrate-enemies' into Team4-GeneralMobs-Megan

  meganroxburgh

  committed
  64d0d13

• Fixed issues with mob not stopping when moving

  meganroxburgh

  committed
  da3b804

• Committing changes to merge feature branch.

  BlairCannon97

  committed
  62141ea

• Fixed merge conflicts

  BlairCannon97

  committed
  f277fd4

Commits on Sep 10, 2023

• Animation checks added to XenoAnimation controller to assist with animation timing.

  BlairCannon97

  committed
  4d3ab82

• Added death animation and currency dropping to the WanderTask.java. Mobs will now die when shot & drop currency.

  

  max9753

  committed
  bb66ce4

• Added comments to abandoned MobDeathTask.java

  

  max9753

  committed
  c2c873c

• Changed the hitbox properties of the NPC entities to suit the Xeno

  BlairCannon97

  committed
  72c1ca4

• Merged recent changes to main onto feature branch

  BlairCannon97

  committed
  0ff348f

• for each attack task start, choose between melee and projectiles

  samsully

  committed
  f8102bf

• clean up

  samsully

  committed
  9372179

• will only activate shoot task if target is attackable

  samsully

  committed
  f832a84

• Merge branch 'Team-4---General-Mobs' into feature/Team4/integrate-enemies & change mob target to HUMANS

  Show description for d1a2a98
  samsully

  committed
  d1a2a98

• mobs stopping when shooting again and fixed spawning coordinates

  samsully

  committed
  b4ebcc1

• clean up

  samsully

  committed
  bdbb628

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

  

  max9753

  committed
  7b27e04

• Merge branch 'Team-4---General-Mobs' into feature/Team4/integrate-enemies

  samsully

  committed
  4003dcd

• Fixed local conflicts

  BlairCannon97

  committed
  01c32e7

• Removed MobDeathTask.java use from NPCFactory.java as it is not longer used or maintained.

  

  max9753

  committed
  e303bd5

Commits on Sep 11, 2023

• Some basic tests added for NPCFactory regarding Xeno creation.

  BlairCannon97

  committed
  c1ca012

• More tests added for NPCFactory regarding Xeno creation.

  BlairCannon97

  committed
  783bd7e

• Adds unit testing for SpawnWaveTask

  bojyyy

  committed
  28de058

• mobs will attack with melee if within range

  samsully

  committed
  7d5637e

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

  

  max9753

  committed
  1c6dac0

• Removed several unused statements which were added for mob death from WanderTask.java

  

  max9753

  committed
  4beb796

• Fixed recent merge conflicts

  BlairCannon97

  committed
  12395d0

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

  

  max9753

  committed
  64512c2

• Merge branch 'Team-4---General-Mobs' of github.com:UQcsse3200/2023-studio-3 into Team-4---General-Mobs

  BlairCannon97

  committed
  ac20c2a

• Fixing merge conflicts

  bojyyy

  committed
  eaa840d

• Modifies mob spawning to correspond to new allowable game area

  bojyyy

  committed
  e075616

• Fixed merge conflicts after merging main.

  BlairCannon97

  committed
  24a9daf

• Removed scale down of mob balls in MobAttackTask

  meganroxburgh

  committed
  4a23ae5