-
Notifications
You must be signed in to change notification settings - Fork 15
Unit5 assignments #2
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.
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
Open
ManuhManuh
wants to merge
18
commits into
circuit-stream:main
Choose a base branch
from
ManuhManuh:Unit5Assignments
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Conversation
This file contains hidden or 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
Added methods to enter and leave lobbies and rooms
Fixed issue with players not seeing lobby correctly, got to stage of multi player game happening (although not yet ending correctly)
Added AppID to settings
Added Connecting notice, added use of player prefs in lobby, implemented one player per team
Set up folders and files for unit testing
All live class changes applied
All live class changes applied
Added nicknames to lobby and correct colours to tanks in game; handle disconnection (player leaving room)
Added nicknames to lobby and correct colours to tanks in game; handle disconnection (player leaving room)
…tcamp_Tanks_Start into SpecialAssignment
Fixed NickName display and correctly exits to main menu with one player left connected
Changed placement of nick name handling
Changed method of enforcing unique teams (new method actually works!)
# Conflicts: # Assets/Photon/PhotonUnityNetworking/Resources/PhotonServerSettings.asset # Assets/Scripts/Menus/CreateLobbyPopup.cs # Assets/Scripts/Menus/MainMenuController.cs # Assets/Scripts/Menus/PlayerLobbyEntry.cs # Assets/Scripts/Menus/RoomLobbyController.cs
Display the missile shoot charging effect to other clients
Added AirStrikeShell prefab, AirStrike class (added to Game Manager game object) with Air strike event
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.
No description provided.