Code

Team 2 UI - further improvements#271

Code

Merged

The-AhmadAA merged 49 commits intomainUQcsse3200/2023-studio-3:mainfrom team-2-uiUQcsse3200/2023-studio-3:team-2-uiCopy head branch name to clipboardOct 16, 2023

+882-382

Commits

Commits on Oct 15, 2023

• fixed some code smells

  Mohamad11Dab

  committed
  3add298

  Copy full SHA for 3add298

• fixed merge conflict

  Mohamad11Dab

  committed
  26995f3

  Copy full SHA for 26995f3

• code smell fixes

  The-AhmadAA

  committed
  1e76226

  Copy full SHA for 1e76226

• Merge pull request #264 from UQcsse3200/Mohamad_Juice

  Show description for ba0b4c2
  The-AhmadAA

  authored
  ba0b4c2

  Copy full SHA for ba0b4c2

• code smell fixes and updated levelSelect font

  The-AhmadAA

  committed
  c2ab57b

  Copy full SHA for c2ab57b

• Added A progress bar that keeps track of the level's progress

  Mohamad11Dab

  committed
  be6419c

  Copy full SHA for be6419c

• Merge branch 'main' into Mohamad_Juice

  Mohamad11Dab

  committed
  a4676f7

  Copy full SHA for a4676f7

• initial implementation of new build menu

  The-AhmadAA

  committed
  b69b1f2

  Copy full SHA for b69b1f2

• fixed merge conflicts

  Mohamad11Dab

  committed
  7f9c8c3

  Copy full SHA for 7f9c8c3

• removed resize of tower buttons

  The-AhmadAA

  committed
  fade9b8

  Copy full SHA for fade9b8

• Merge pull request #267 from UQcsse3200/Mohamad_Juice

  Show description for 6f0c14b
  The-AhmadAA

  authored
  6f0c14b

  Copy full SHA for 6f0c14b

• mixed ferge conflicts

  The-AhmadAA

  committed
  04b86aa

  Copy full SHA for 04b86aa

• Merge pull request #268 from UQcsse3200/team-2-ahmad

  Show description for 2c00bc9
  Mohamad11Dab

  authored
  2c00bc9

  Copy full SHA for 2c00bc9

• cleanup of code, added button updating for shortcut keys

  The-AhmadAA

  committed
  31ca8f4

  Copy full SHA for 31ca8f4

• removed unused arg to toggleTower

  The-AhmadAA

  committed
  126d427

  Copy full SHA for 126d427

• code smell cleanup

  The-AhmadAA

  committed
  3406eab

  Copy full SHA for 3406eab

Commits on Oct 16, 2023

• Implemented functionality to pause the wave timer when the pause menu is active.

  AlasdairS4698737

  committed
  e2cb2dd

  Copy full SHA for e2cb2dd

• updated engineer warning threshold, pause menu shortcut key

  The-AhmadAA

  committed
  180c99d

  Copy full SHA for 180c99d

• Updated pause menu tests to work with the new services invoked by the pausing implementation last commit.

  AlasdairS4698737

  committed
  5b541ce

  Copy full SHA for 5b541ce

• added pause status, getter and setter in TimeSource

  The-AhmadAA

  committed
  6813fba

  Copy full SHA for 6813fba

• Merge branch 'team-2-ui' into team-2-ui-Alasdair

  AlasdairS4698737

  authored
  d003a1e

  Copy full SHA for d003a1e

• Merge branch 'main' into Mohamad_Juice

  Mohamad11Dab

  committed
  ad37fdb

  Copy full SHA for ad37fdb

• Update WaveService.java

  Show description for 7e0b62b
  AlasdairS4698737

  authored
  7e0b62b

  Copy full SHA for 7e0b62b

• Update MainGameDisplay.java

  Show description for 74ae017
  The-AhmadAA

  authored
  74ae017

  Copy full SHA for 74ae017

• Merge pull request #269 from UQcsse3200/team-2-ahmad

  Show description for f757a9d
  The-AhmadAA

  authored
  f757a9d

  Copy full SHA for f757a9d

• Added sliding animations for pause button, timer button, mob button and all of tower select buttons

  shiv-0831

  committed
  c489bb1

  Copy full SHA for c489bb1

• Merge pull request #270 from UQcsse3200/team-2-ui-Alasdair

  Show description for e3c9c33
  The-AhmadAA

  authored
  e3c9c33

  Copy full SHA for e3c9c33

• resolved merge conflicts

  shiv-0831

  committed
  b001b87

  Copy full SHA for b001b87

• code smell fixes

  The-AhmadAA

  committed
  69e2558

  Copy full SHA for 69e2558

• tweaking UI element positions

  The-AhmadAA

  committed
  8950f1e

  Copy full SHA for 8950f1e

• Merge branch 'main' into team-2-ui

  The-AhmadAA

  committed
  8df2f1f

  Copy full SHA for 8df2f1f

• disabling progress bar until positioned and working

  The-AhmadAA

  committed
  afeb827

  Copy full SHA for afeb827

• Merge branch 'team-2-ahmad' of github.com:UQcsse3200/2023-studio-3 into team-2-ahmad

  The-AhmadAA

  committed
  9b11375

  Copy full SHA for 9b11375

• added level name display'

  The-AhmadAA

  committed
  3e2eb4d

  Copy full SHA for 3e2eb4d

• fixed progress bar positioning

  The-AhmadAA

  committed
  7b7af9e

  Copy full SHA for 7b7af9e

• Merge pull request #274 from UQcsse3200/team-2-ahmad

  Show description for 845e5f8
  Mohamad11Dab

  authored
  845e5f8

  Copy full SHA for 845e5f8

• fixed pause menu closing issue

  The-AhmadAA

  committed
  7bfa5fb

  Copy full SHA for 7bfa5fb

• Merge pull request #275 from UQcsse3200/team-2-ahmad

  Show description for 6f52147
  The-AhmadAA

  authored
  6f52147

  Copy full SHA for 6f52147

• Merge branch 'team-2-ui' into Mohamad_Juice

  Mohamad11Dab

  committed
  8636502

  Copy full SHA for 8636502

• Finalised the animations for tower select buttons

  shiv-0831

  committed
  3e5c6ff

  Copy full SHA for 3e5c6ff

• merging the latest commits

  shiv-0831

  committed
  8badc4a

  Copy full SHA for 8badc4a

• fixed pauseMenu bug

  The-AhmadAA

  committed
  f54bf8e

  Copy full SHA for f54bf8e

• Merge branch 'team-2-ui' of github.com:UQcsse3200/2023-studio-3 into team-2-ui

  The-AhmadAA

  committed
  49caee2

  Copy full SHA for 49caee2

• Merge branch 'main' into team-2-ui

  The-AhmadAA

  committed
  dac4854

  Copy full SHA for dac4854

• Integrated Mob Count with Level Progress Bar

  Mohamad11Dab

  committed
  f7e239f

  Copy full SHA for f7e239f

• Merge branch 'team-2-ui' into Mohamad_Juice

  Mohamad11Dab

  committed
  d22f925

  Copy full SHA for d22f925

• Merge pull request #276 from UQcsse3200/Mohamad_Juice

  Show description for e8f9d2c
  The-AhmadAA

  authored
  e8f9d2c

  Copy full SHA for e8f9d2c

• remove setDebug

  The-AhmadAA

  committed
  d620802

  Copy full SHA for d620802

• Merge branch 'team-2-ui' of github.com:UQcsse3200/2023-studio-3 into team-2-ui

  The-AhmadAA

  committed
  781a328

  Copy full SHA for 781a328