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

T3branch External UI #212

Merged
merged 38 commits into from
Oct 3, 2023
Merged

T3branch External UI #212

merged 38 commits into from
Oct 3, 2023

Conversation

Moksh-Mehta7
Copy link
Contributor

@Moksh-Mehta7 Moksh-Mehta7 commented Oct 2, 2023 •
edited by aadityayadav17
Loading

The following merge request introduces following changes:

  • A new cursor icon.
  • Fresh backgrounds for the main menu and settings screens.
  • Story screen has been updated with the inclusion of "continue" and "skip" buttons.
  • The previously non-functional "Help" button on the Main Menu is now operational.
  • Sound effects for button clicks within the external UI.
  • A back button on the LevelSelectScreen.

Death7Bed and others added 30 commits September 15, 2023 23:19
@Death7Bed
Added code for custom cursor
5cb1b29
@Death7Bed
Cursor added
6ca65c1
@Moksh-Mehta7
Created a method to implement different types of button universally
cd34e9c
@Moksh-Mehta7
Added Cursor
f262c86
@Gaganx0
Created asset loader
6fb4eee
@aadityayadav17
Main Menu Background 1/n
a63f380
@Moksh-Mehta7
Made ButtonFactory.java Static
f64d364
@Moksh-Mehta7
Made ButtonFactory.java Static
d3cf853
@Moksh-Mehta7
Made ButtonFactory.java Static
307a417
@aadityayadav17
Main Menu Background 2/n
715c95a
@aadityayadav17
Main Menu Background 3/n
3b8c1e9
@aadityayadav17
Main Menu Background 4/n
7f6aae8
@Moksh-Mehta7
Merge remote-tracking branch 'origin/Team-3' into Team-3
50fb285
@Moksh-Mehta7
Made changes in ButtonFactory
5926f22
@aadityayadav17
Main Menu Background 5/n
b81b406
@aadityayadav17
Merge remote-tracking branch 'origin/Team-3' into Team-3
fd12185
@Gaganx0
Help screen
507ece0
@Gaganx0
Main Menu, Help Screen
7586598
@aadityayadav17
Settings Screen 1/m
0737e49
@aadityayadav17
Settings Screen 2/m
91043de
@aadityayadav17
Main Menu Background 6/n
306a45e
@Moksh-Mehta7
Merge branch 'main' into t3branch
7130634 
# Conflicts:
#	source/core/src/main/com/csse3200/game/areas/ForestGameArea.java
@Moksh-Mehta7
merged main into t3 brach
0af96ee
@Moksh-Mehta7
Edited StoryScreen
aba7640
@aadityayadav17
Settings Screen Issue Fixed
1bcf302
@aadityayadav17
Java Doc Added
9f11505
@aadityayadav17
Java Doc Added
9c43232
@aadityayadav17
Merge remote-tracking branch 'origin/t3branch' into t3branch
b26862b
@Gaganx0
HelpScreen, back button , button sound
3ba68b1
@Gaganx0
Merge remote-tracking branch 'origin/t3branch' into t3branch
ba4b4a7
@Moksh-Mehta7 Moksh-Mehta7 added this to the Sprint 3 milestone Oct 2, 2023
The-AhmadAA
The-AhmadAA requested changes Oct 3, 2023
View reviewed changes
Copy link
Contributor

@The-AhmadAA The-AhmadAA left a comment

Choose a reason for hiding this comment

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

Fix merge conflict and request review.

@Gaganx0
Copy link
Contributor

Gaganx0 commented Oct 3, 2023

@The-AhmadAA merge is done.

@Gaganx0 Gaganx0 requested a review from The-AhmadAA October 3, 2023 00:43
The-AhmadAA
The-AhmadAA requested changes Oct 3, 2023
View reviewed changes
Copy link
Contributor

@The-AhmadAA The-AhmadAA left a comment

Choose a reason for hiding this comment

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

There seems to be a bug that causes the main menu buttons to be unusable if you enter the help screen and then exit

@aadityayadav17
Copy link
Contributor

@The-AhmadAA thanks for noting that. we have fixed that and also merged again with the main

The-AhmadAA
The-AhmadAA approved these changes Oct 3, 2023
View reviewed changes
Copy link
Contributor

@The-AhmadAA The-AhmadAA left a comment

Choose a reason for hiding this comment

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

Thanks for resolving that, happy for merge to go ahead

samsully
samsully approved these changes Oct 3, 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 great, happy to merge, didn't find any issues.

@Gaganx0 Gaganx0 merged commit a8c5164 into main Oct 3, 2023
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

@The-AhmadAA The-AhmadAA The-AhmadAA approved these changes

@gregchan550 gregchan550 Awaiting requested review from gregchan550

@Mohamad11Dab Mohamad11Dab Awaiting requested review from Mohamad11Dab

@shiv-0831 shiv-0831 Awaiting requested review from shiv-0831

Assignees

@Gaganx0 Gaganx0

@aadityayadav17 aadityayadav17

@Moksh-Mehta7 Moksh-Mehta7

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

Successfully merging this pull request may close these issues.
6 participants
@Moksh-Mehta7 @Gaganx0 @aadityayadav17 @The-AhmadAA @samsully @Death7Bed