Cherrypick: Simplified Floor Tiles #519
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
…esolved with unity merge tool
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
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 (*)
Cherrypick PR for bigger floor tiles PR for GDC branch