Skip to content

feat: loading screen (GDC version) #495

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
merged 51 commits into from
Mar 8, 2022

Conversation

LPLafontaineB
Copy link
Contributor

Description (*)

This PR is based on #427, but with a temporary fix for the issue that is blocking it. Since in-scene NetworkObjects cannot respawn after a shutdown of the NetworkManager, the SceneLoaderWrapper is no longer a NetworkBehavior. This prevents us from calling an rpc from the server to the client to make sure their character finished spawning before telling them to close the loading screen in the case of a late join, so instead a hardcoded delay is added to simulate an RTT.

Related Pull Requests

Issue Number(s) (*)

Fixes issue(s):

Manual testing scenarios

  1. ...
  2. ...

Questions or comments

Contribution checklist

  • Pull request has a meaningful description of its purpose
  • All commits are accompanied by meaningful commit messages
  • All new or changed code is covered with unit/integration tests (if applicable)
  • All automated tests passed successfully (all builds are green)

LPLafontaineB and others added 30 commits November 26, 2021 09:26
* Renamed class and file to reflect naming conventions
* Added namespace
* Replaced magic string and const with serialized fields
This validation doesn't make sense anymore since in-scene imps are now in a different scene than the NavigationSystem
Replaced cooldown coroutine with one that unloads the scene after a delay. The coroutine is stopped in OnTriggerEnter, and before starting a new one if it wasn't stopped before.
…loading

Reverted to polling to decide when to load/unload scenes instead of doing it in events to handle those intermediary states better
* Added support for non-networked game and for before the client connects
SamuelBellomo
SamuelBellomo previously approved these changes Mar 1, 2022
@LPLafontaineB LPLafontaineB added 2-One More Review One review in, one to go and removed 1-Needs Review PR needs attention from the assignee and reviewers labels Mar 3, 2022
@LPLafontaineB LPLafontaineB added 1-Needs Review PR needs attention from the assignee and reviewers and removed 2-One More Review One review in, one to go labels Mar 7, 2022
SamuelBellomo
SamuelBellomo previously approved these changes Mar 8, 2022
@LPLafontaineB LPLafontaineB added 2-One More Review One review in, one to go and removed 1-Needs Review PR needs attention from the assignee and reviewers labels Mar 8, 2022
SamuelBellomo
SamuelBellomo previously approved these changes Mar 8, 2022
@fernando-cortez fernando-cortez added 3-Good to Merge and removed 2-One More Review One review in, one to go labels Mar 8, 2022
@LPLafontaineB LPLafontaineB merged commit 5c1aa12 into release/GDC2022 Mar 8, 2022
@LPLafontaineB LPLafontaineB deleted the feature/gdc/loading-screen branch March 8, 2022 19:58
SamuelBellomo added a commit that referenced this pull request 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
SamuelBellomo added a commit that referenced this pull request Mar 9, 2022
…I-stats

* release/GDC2022:
  lobby fix: Removing quit when lobby detects host left. (#505)
  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)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants