Team 3 Pull Request Sprint 4 #294
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Moksh-Mehta7
requested review from
MiniSoda17,
The-AhmadAA,
Mohamad11Dab,
meganroxburgh,
shiv-0831,
Hasakev and
ThivanW
Gaganx0
requested review from
SonjaMcNeilly,
Hasakev,
BlairCannon97,
shiv-0831 and
ThivanW
and removed request for
shiv-0831,
Hasakev and
ThivanW
meganroxburgh
approved these changes
Oct 16, 2023
BlairCannon97
approved these changes
Oct 16, 2023
# Conflicts: # source/core/src/main/com/csse3200/game/areas/ForestGameArea.java
|
New bug: If you pause and click level select you can directly access the new level (locked before) - can make it a feature 🤣 |
The-AhmadAA
approved these changes
Oct 17, 2023
Hasakev
approved these changes
Oct 17, 2023
|
Hi please merge main again |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The following merge request introduces following changes: