Skip to content

Commit 77b939f

Browse files
netcode-ci-servicenetcode-ci-service
authored
Merge develop into feature/replace-guid-with-auth-playerid
2 parents 0d874b5 + b83d7b4 commit 77b939f

31 files changed

+20323
-65166
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

‎Assets/BossRoom/Models/DungeonPieces.FBX

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)