Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Team 2 UI - further improvements #271

Merged
merged 49 commits into from
Oct 16, 2023
Merged

Team 2 UI - further improvements #271

merged 49 commits into from
Oct 16, 2023

Conversation

The-AhmadAA
Copy link
Contributor

@The-AhmadAA The-AhmadAA commented Oct 16, 2023 •
edited by shiv-0831
Loading

This merge brings in further in-game UI improvements:

  • Wave timer and mob counter now working correctly
  • Pause functionality improvements
  • pause state now accessible via TimeSource
  • added a shortcut key for bringing up the pause menu (ESC) and closing again.
  • Initial implementation of level progress bar
  • Added a level name display
  • Added start-up animations for in-game ui elements

Tower Build Menu

  • Finally added new Tower build menu buttons
  • Buttons now toggle and reflect status of button selection
  • Buttons now go red and disable if insufficient resources to build
  • Button state also updates if shortcut keys (1 - 5) are used, and added number labels under the tower buttons to indicate shortcut keys

Mohamad11Dab and others added 30 commits October 15, 2023 16:56
@Mohamad11Dab
fixed some code smells
3add298
@Mohamad11Dab
fixed merge conflict
26995f3
@The-AhmadAA
code smell fixes
1e76226
@The-AhmadAA
Merge pull request #264 from UQcsse3200/Mohamad_Juice
ba0b4c2 
Code smells
@The-AhmadAA
code smell fixes and updated levelSelect font
c2ab57b
@Mohamad11Dab
Added A progress bar that keeps track of the level's progress
be6419c
@Mohamad11Dab
Merge branch 'main' into Mohamad_Juice
a4676f7
@The-AhmadAA
initial implementation of new build menu
b69b1f2
@Mohamad11Dab
fixed merge conflicts
7f9c8c3
@The-AhmadAA
removed resize of tower buttons
fade9b8
@The-AhmadAA
Merge pull request #267 from UQcsse3200/Mohamad_Juice
6f0c14b 
Mohamad juice
@The-AhmadAA
mixed ferge conflicts
04b86aa
@Mohamad11Dab
Merge pull request #268 from UQcsse3200/team-2-ahmad
2c00bc9 
Team 2 progress merge
@The-AhmadAA
cleanup of code, added button updating for shortcut keys
31ca8f4
@The-AhmadAA
removed unused arg to toggleTower
126d427
@The-AhmadAA
code smell cleanup
3406eab
@AlasdairS4698737
Implemented functionality to pause the wave timer when the pause menu…
e2cb2dd 
… is active.
@The-AhmadAA
updated engineer warning threshold, pause menu shortcut key
180c99d
@AlasdairS4698737
Updated pause menu tests to work with the new services invoked by the…
5b541ce 
… pausing implementation last commit.
@The-AhmadAA
added pause status, getter and setter in TimeSource
6813fba
@AlasdairS4698737
Merge branch 'team-2-ui' into team-2-ui-Alasdair
d003a1e
@Mohamad11Dab
Merge branch 'main' into Mohamad_Juice
ad37fdb
@AlasdairS4698737
Update WaveService.java
7e0b62b 
The merge conflict stole a closing bracket to a method. I fixed that.
@The-AhmadAA
Update MainGameDisplay.java
74ae017 
fixed errant towerToggle call for tower5
@The-AhmadAA
Merge pull request #269 from UQcsse3200/team-2-ahmad
f757a9d 
Team 2 - merge to team branch
@shiv-0831
Added sliding animations for pause button, timer button, mob button a…
c489bb1 
…nd all of tower select buttons
@The-AhmadAA
Merge pull request #270 from UQcsse3200/team-2-ui-Alasdair
e3c9c33 
Team 2 UI alasdair
@shiv-0831
resolved merge conflicts
b001b87
@The-AhmadAA
code smell fixes
69e2558
@The-AhmadAA
tweaking UI element positions
8950f1e
@The-AhmadAA The-AhmadAA added this to the Sprint 4 milestone Oct 16, 2023
@The-AhmadAA The-AhmadAA self-assigned this Oct 16, 2023
Hasakev
Hasakev approved these changes Oct 16, 2023
View reviewed changes
Copy link
Contributor

@Hasakev Hasakev left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nicely done with the tower build menu, no issues found LGTM

@Hasakev
Copy link
Contributor

Hasakev commented Oct 16, 2023 •
edited
Loading

Need to merge in new change from Isaac (454cb59)

samsully
samsully approved these changes Oct 16, 2023
View reviewed changes
Copy link
Contributor

@samsully samsully left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me!

@The-AhmadAA The-AhmadAA merged commit be64e3d into main Oct 16, 2023
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@samsully samsully samsully approved these changes

@Hasakev Hasakev Hasakev approved these changes

@gregchan550 gregchan550 Awaiting requested review from gregchan550

@MiniSoda17 MiniSoda17 Awaiting requested review from MiniSoda17

@meganroxburgh meganroxburgh Awaiting requested review from meganroxburgh

@Gaganx0 Gaganx0 Awaiting requested review from Gaganx0

@cindyle1 cindyle1 Awaiting requested review from cindyle1

Assignees

@The-AhmadAA The-AhmadAA

Labels
feature sprint 4 team 2
Projects
2023 Studio 3 Project
Status: Done
Milestone
Sprint 4
Development

Successfully merging this pull request may close these issues.
6 participants
@The-AhmadAA @Hasakev @samsully @Mohamad11Dab @AlasdairS4698737 @shiv-0831