-
Notifications
You must be signed in to change notification settings - Fork 560
lobby fix: Adding instructions when we get a service error on conflicting joins #511
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
Merged
SamuelBellomo
merged 5 commits into
release/GDC2022
from
sam/fix/improve-flow-two-builds-local
Mar 9, 2022
Merged
lobby fix: Adding instructions when we get a service error on conflicting joins #511
SamuelBellomo
merged 5 commits into
release/GDC2022
from
sam/fix/improve-flow-two-builds-local
Mar 9, 2022
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
LPLafontaineB
previously approved these changes
Mar 7, 2022
fernando-cortez
previously approved these changes
Mar 8, 2022
LPLafontaineB
previously approved these changes
Mar 8, 2022
…ocal * release/GDC2022: Cherrypick: bigger floor tiles, bossroom.unity scene merge conflict resolved with unity merge tool (#519) Cherrypick: lobby visual rework, mainmenu.unity scene merge conflict resolved with unity merge tool (#520) cherrypick: Boss and run VFX Optimizations (#514) (#521) feat: loading screen (GDC version) (#495) fix: client writing to NetworkVariable inside ServerCharacterMovement (#517) fix: imps spawning issues when late joining (#497) Adding handling of host disconnect (#486) (#509) fix: NREs when trying to quit (#516) hack fix: disabling client side rate limiting for GDC, real fix should come on develop (#500) fix: NetworkAnimator being called on clients (#512) fix: username changing before game (#499) feat: IP connection window inside main menu (#502) (#508) # Conflicts: # Assets/BossRoom/Scenes/Startup.unity
70d2567
LPLafontaineB
approved these changes
Mar 9, 2022
fernando-cortez
approved these changes
Mar 9, 2022
SamuelBellomo
added a commit
that referenced
this pull request
Mar 9, 2022
…rror on conflicting joins (#511)
SamuelBellomo
added a commit
that referenced
this pull request
Mar 10, 2022
…I-stats * release/GDC2022: added IP button to main menu (#535) fix: postgame menu button (#523) chore: adding leak detect (#492) Cherry pick: lobby blue banner fix, mainmenu.unity scene merge conflict resolved with unity merge tool (#534) Filled in some holes in the floor (#527) (#533) fix: populate lobby room name if creation room input field is empty (#522) lobby fix: Adding instructions when we get a service error on conflicting joins (#511) feat: auto reconnect (#513)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
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.
Description (*)
When getting conflict error (if we forget to set -AuthProfile on two builds), we have zero feedback on this at the moment. Adding instructions to do this.
Issue Number(s) (*)
Fixes issue(s): MTT-2742
Manual testing scenarios
Contribution checklist