Skip to content

Commit 70d2567

Browse files
committed
Merge branch 'release/GDC2022' into sam/fix/improve-flow-two-builds-local
* 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
2 parents 9395be2 + 92719bd commit 70d2567

File tree

80 files changed

+27123
-66895
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

80 files changed

+27123
-66895
lines changed

Assets/BossRoom/Material/Dungeon/env_deco.mat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Material:
2525
m_ShaderKeywords: _METALLICSPECGLOSSMAP _NORMALMAP
2626
m_LightmapFlags: 4
2727
m_EnableInstancingVariants: 1
28-
m_DoubleSidedGI: 0
28+
m_DoubleSidedGI: 1
2929
m_CustomRenderQueue: 2000
3030
stringTagMap:
3131
RenderType: Opaque
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:2e747cf7b7180d76b461af61eb865d4e9d554d5153c57c80767303a24f26b9a6
3-
size 1594528
2+
oid sha256:d8c3954835038728b0c18257dd8b41aff5f3530b8e128a61a269e9cb3a9d2498
3+
size 914432

Assets/BossRoom/Models/DungeonPieces.FBX.meta

Lines changed: 12 additions & 224 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)