Skip to content

Commit 339e938

Browse files
LPLafontaineBLPLafontaineB
committed
Merge branch 'develop' into fix/remove-initial-ugs-popup
2 parents 09bdc56 + df9985d commit 339e938

File tree

256 files changed

+15906
-51572
lines changed

Some content is hidden

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

256 files changed

+15906
-51572
lines changed

‎ARCHITECTURE.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ For Unity Relay based multiplayer sessions, some setup is required. Please see o
4343
Please see [Multiplayer over internet](README.md) section of our Readme for more information on using either one.
4444

4545
To allow for any of these options to be chosen at runtime we created `TransportPicker`. It allows one to choose between an IP-based and a Relay-based transport and will hook up the game UI to use those transports. The transport field in the `NetworkManager` will be ignored. Currently we support the following transports:
46-
- **UNET(IP):** UNET is the default Netcode transport. However, it is not the default IP transport for Boss Room.
4746
- **UTP (IP):** Unity Transport Package is a network transport layer, packaged with network simulation tools which are useful for spotting networking issues early during development. This IP based protocol is the default IP transport for Boss Room. See the documentation on [Unity Transport Package](https://docs-multiplayer.unity3d.com/docs/transport-utp/about-transport-utp/#unity-transport-package-utp).
4847
- **Unity (Relay):** Unity Relay is a relay service provided by Unity services, supported by Unity Transport. Read more about [Unity Relay](https://docs-multiplayer.unity3d.com/docs/relay/relay).
4948

‎Assets/BossRoom/Material/Characters/Character_Shadow.mat

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@ Material:
88
m_PrefabInstance: {fileID: 0}
99
m_PrefabAsset: {fileID: 0}
1010
m_Name: Character_Shadow
11-
m_Shader: {fileID: 4800000, guid: 650dd9526735d5b46b79224bc6e94025, type: 3}
11+
m_Shader: {fileID: -6465566751694194690, guid: a9ba79dc821093a4c9041bcede85096b, type: 3}
1212
m_ValidKeywords:
1313
- _SURFACE_TYPE_TRANSPARENT
1414
m_InvalidKeywords: []
1515
m_LightmapFlags: 4
1616
m_EnableInstancingVariants: 0
1717
m_DoubleSidedGI: 0
18-
m_CustomRenderQueue: 3000
18+
m_CustomRenderQueue: -1
1919
stringTagMap:
2020
RenderType: Transparent
2121
disabledShaderPasses:
@@ -52,6 +52,10 @@ Material:
5252
m_Texture: {fileID: 2800000, guid: 6eb539aefcd5a7846af91c0a77161b92, type: 3}
5353
m_Scale: {x: 1, y: 1}
5454
m_Offset: {x: 0, y: 0}
55+
- _MainTexture:
56+
m_Texture: {fileID: 2800000, guid: 6eb539aefcd5a7846af91c0a77161b92, type: 3}
57+
m_Scale: {x: 1, y: 1}
58+
m_Offset: {x: 0, y: 0}
5559
- _MetallicGlossMap:
5660
m_Texture: {fileID: 0}
5761
m_Scale: {x: 1, y: 1}
@@ -86,10 +90,12 @@ Material:
8690
- _Blend: 0
8791
- _BlendOp: 0
8892
- _BumpScale: 1
93+
- _CastShadows: 0
8994
- _ClearCoatMask: 0
9095
- _ClearCoatSmoothness: 0
9196
- _Cull: 2
9297
- _Cutoff: 0.5
98+
- _Depth_Blend: 0
9399
- _DetailAlbedoMapScale: 1
94100
- _DetailNormalMapScale: 1
95101
- _DstBlend: 10
@@ -100,6 +106,7 @@ Material:
100106
- _Metallic: 0
101107
- _OcclusionStrength: 1
102108
- _Parallax: 0.005
109+
- _QueueControl: 0
103110
- _QueueOffset: 0
104111
- _ReceiveShadows: 1
105112
- _SampleGI: 0
@@ -108,12 +115,17 @@ Material:
108115
- _SpecularHighlights: 1
109116
- _SrcBlend: 5
110117
- _Surface: 1
118+
- _UseAlpha: 1
119+
- _UseSoftParticles: 0
111120
- _WorkflowMode: 1
121+
- _ZTest: 4
112122
- _ZWrite: 0
123+
- _ZWriteControl: 0
113124
m_Colors:
114125
- _BaseColor: {r: 0, g: 0, b: 0, a: 0.54509807}
115126
- _Color: {r: 0, g: 0, b: 0, a: 0.54509807}
116127
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
128+
- _MainTextureTilingOffset: {r: 1, g: 1, b: 0, a: 0}
117129
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
118130
m_BuildTextureStacks: []
119131
--- !u!114 &2085413229483183920

‎Assets/BossRoom/Material/Characters/Toon/Hair_Archer_Boy.mat

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,8 @@ Material:
8383
- _Mode: 0
8484
- _OcclusionStrength: 1
8585
- _Parallax: 0.02
86+
- _QueueControl: 0
87+
- _QueueOffset: 0
8688
- _RimAmount: 0.771
8789
- _RimThreshold: 0
8890
- _SmoothnessTextureChannel: 0

‎Assets/BossRoom/Material/Characters/Toon/Hair_Archer_Girl.mat

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,8 @@ Material:
8383
- _Mode: 0
8484
- _OcclusionStrength: 1
8585
- _Parallax: 0.02
86+
- _QueueControl: 0
87+
- _QueueOffset: 0
8688
- _RimAmount: 0.778
8789
- _RimThreshold: 0
8890
- _SmoothnessTextureChannel: 0

‎Assets/BossRoom/Material/Characters/Toon/Hair_Imp_Bomb.mat

Lines changed: 0 additions & 112 deletions
This file was deleted.

‎Assets/BossRoom/Material/Characters/Toon/Hair_Mage_Boy.mat

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,8 @@ Material:
9696
- _Mode: 0
9797
- _OcclusionStrength: 1
9898
- _Parallax: 0.02
99+
- _QueueControl: 0
100+
- _QueueOffset: 0
99101
- _RimAmount: 0.778
100102
- _RimThreshold: 0
101103
- _SmoothnessTextureChannel: 0

‎Assets/BossRoom/Material/Characters/Toon/Hair_Tank_Boy.mat

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,8 @@ Material:
9696
- _Mode: 0
9797
- _OcclusionStrength: 1
9898
- _Parallax: 0.02
99+
- _QueueControl: 0
100+
- _QueueOffset: 0
99101
- _RimAmount: 0.778
100102
- _RimThreshold: 0
101103
- _SmoothnessTextureChannel: 0

‎Assets/BossRoom/Material/Characters/Toon/Hair_Tank_Girl.mat

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,8 @@ Material:
8383
- _Mode: 0
8484
- _OcclusionStrength: 1
8585
- _Parallax: 0.02
86+
- _QueueControl: 0
87+
- _QueueOffset: 0
8688
- _RimAmount: 0.588
8789
- _RimThreshold: 0
8890
- _SmoothnessTextureChannel: 0

‎Assets/BossRoom/Material/Characters/Toon/Head_Archer_Boy.mat

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,8 @@ Material:
9595
- _Mode: 0
9696
- _OcclusionStrength: 1
9797
- _Parallax: 0.02
98+
- _QueueControl: 0
99+
- _QueueOffset: 0
98100
- _RimAmount: 0.667
99101
- _RimThreshold: 0
100102
- _SmoothnessTextureChannel: 0

‎Assets/BossRoom/Material/Characters/Toon/Head_Archer_Girl.mat

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,8 @@ Material:
9595
- _Mode: 0
9696
- _OcclusionStrength: 1
9797
- _Parallax: 0.02
98+
- _QueueControl: 0
99+
- _QueueOffset: 0
98100
- _RimAmount: 0.667
99101
- _RimThreshold: 0
100102
- _SmoothnessTextureChannel: 0

‎Assets/BossRoom/Material/Characters/Toon/Head_Mage_Boy.mat

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,8 @@ Material:
9595
- _Mode: 0
9696
- _OcclusionStrength: 1
9797
- _Parallax: 0.02
98+
- _QueueControl: 0
99+
- _QueueOffset: 0
98100
- _RimAmount: 0.667
99101
- _RimThreshold: 0
100102
- _SmoothnessTextureChannel: 0

‎Assets/BossRoom/Material/Characters/Toon/Head_Tank_Boy.mat

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,8 @@ Material:
9595
- _Mode: 0
9696
- _OcclusionStrength: 1
9797
- _Parallax: 0.02
98+
- _QueueControl: 0
99+
- _QueueOffset: 0
98100
- _RimAmount: 0.667
99101
- _RimThreshold: 0
100102
- _SmoothnessTextureChannel: 0

‎Assets/BossRoom/Material/Characters/Toon/Head_Tank_Girl.mat

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,8 @@ Material:
8282
- _Mode: 0
8383
- _OcclusionStrength: 1
8484
- _Parallax: 0.02
85+
- _QueueControl: 0
86+
- _QueueOffset: 0
8587
- _RimAmount: 0.674
8688
- _RimThreshold: 0
8789
- _SmoothnessTextureChannel: 0

‎Assets/BossRoom/Material/Characters/Toon/Helmet_Imp.mat

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,8 @@ Material:
8282
- _Mode: 0
8383
- _OcclusionStrength: 1
8484
- _Parallax: 0.02
85+
- _QueueControl: 0
86+
- _QueueOffset: 0
8587
- _RimAmount: 0.428
8688
- _RimThreshold: 0.123
8789
- _SmoothnessTextureChannel: 0

‎Assets/BossRoom/Material/Characters/Toon/Torso_Boss.mat

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,8 @@ Material:
9595
- _Mode: 0
9696
- _OcclusionStrength: 1
9797
- _Parallax: 0.02
98+
- _QueueControl: 0
99+
- _QueueOffset: 0
98100
- _RimAmount: 0.208
99101
- _RimThreshold: 0.595
100102
- _SmoothnessTextureChannel: 0

‎Assets/BossRoom/Material/Characters/Toon/Torso_Mage_Girl.mat

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,8 @@ Material:
9595
- _Mode: 0
9696
- _OcclusionStrength: 1
9797
- _Parallax: 0.02
98+
- _QueueControl: 0
99+
- _QueueOffset: 0
98100
- _RimAmount: 0.366
99101
- _RimThreshold: 0
100102
- _SmoothnessTextureChannel: 0

‎Assets/BossRoom/Material/Characters/Toon/Weapons_Mage.mat

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,8 @@ Material:
9595
- _Mode: 0
9696
- _OcclusionStrength: 1
9797
- _Parallax: 0.02
98+
- _QueueControl: 0
99+
- _QueueOffset: 0
98100
- _RimAmount: 0.264
99101
- _RimThreshold: 0.058
100102
- _SmoothnessTextureChannel: 0

‎Assets/BossRoom/Material/Characters/Toon/Weapons_Tank.mat

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,8 @@ Material:
8282
- _Mode: 0
8383
- _OcclusionStrength: 1
8484
- _Parallax: 0.02
85+
- _QueueControl: 0
86+
- _QueueOffset: 0
8587
- _RimAmount: 0.343
8688
- _RimThreshold: 0.145
8789
- _SmoothnessTextureChannel: 0

‎Assets/BossRoom/Material/Characters/Toon/Weapons_VandalImp.mat

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,8 @@ Material:
8282
- _Mode: 0
8383
- _OcclusionStrength: 1
8484
- _Parallax: 0.02
85+
- _QueueControl: 0
86+
- _QueueOffset: 0
8587
- _RimAmount: 0.384
8688
- _RimThreshold: 0
8789
- _SmoothnessTextureChannel: 0

‎Assets/BossRoom/Material/Dungeon/boss_arena.mat renamed to ‎Assets/BossRoom/Material/Dungeon/M_BossFloor.mat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Material:
77
m_CorrespondingSourceObject: {fileID: 0}
88
m_PrefabInstance: {fileID: 0}
99
m_PrefabAsset: {fileID: 0}
10-
m_Name: boss_arena
10+
m_Name: M_BossFloor
1111
m_Shader: {fileID: -6465566751694194690, guid: 58d945a80f1f06c4db5c1fa66a0afc55, type: 3}
1212
m_ValidKeywords: []
1313
m_InvalidKeywords:

‎Assets/BossRoom/Material/Dungeon/boss_arena.mat.meta renamed to ‎Assets/BossRoom/Material/Dungeon/M_BossFloor.mat.meta

File renamed without changes.

0 commit comments

Comments
 (0)