Skip to content

Commit

Permalink
Merge branch 'release/GDC2022' into sam/fix/adding-transport-RTT-to-U…
Browse files Browse the repository at this point in the history
…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)
  • Loading branch information
SamuelBellomo committed Mar 8, 2022
2 parents 117d416 + d1596ad commit 7dab9bb
Show file tree
Hide file tree
Showing 75 changed files with 22,904 additions and 65,611 deletions.
2 changes: 1 addition & 1 deletion Assets/BossRoom/Material/Dungeon/env_deco.mat
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ Material:
m_ShaderKeywords: _METALLICSPECGLOSSMAP _NORMALMAP
m_LightmapFlags: 4
m_EnableInstancingVariants: 1
m_DoubleSidedGI: 0
m_DoubleSidedGI: 1
m_CustomRenderQueue: 2000
stringTagMap:
RenderType: Opaque
Expand Down
4 changes: 2 additions & 2 deletions Assets/BossRoom/Models/DungeonPieces.FBX
Git LFS file not shown
236 changes: 12 additions & 224 deletions Assets/BossRoom/Models/DungeonPieces.FBX.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 7dab9bb

Please sign in to comment.