Skip to content

[MTT-9072] Fix/distributed authority sample/collider adjustments hub scene #225

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Sep 11, 2024
Merged

[MTT-9072] Fix/distributed authority sample/collider adjustments hub scene #225

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
556ec71
Add: colliderless variants for stone and tree prefabs, removing colli…
Elfi0Kuhndorf Sep 11, 2024
487b89d
Add: Adding sunset skybox to scene
Elfi0Kuhndorf Sep 11, 2024
cc8f867
Merge branch 'develop' into fix/distributed-authority-sample/collider…
Elfi0Kuhndorf Sep 11, 2024
6cb2093
Merge branch 'develop' into fix/distributed-authority-sample/collider…
Elfi0Kuhndorf Sep 11, 2024
eb5fd5f
Fix: added collider mesh and layer to prefabs to fix collision
Elfi0Kuhndorf Sep 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions Experimental/DistributedAuthoritySample/Assets/Art/Skybox.meta
View file
Open in desktop

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

8 changes: 8 additions & 0 deletions Experimental/DistributedAuthoritySample/Assets/Art/Skybox/Painted.meta
View file
Open in desktop

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

8 changes: 8 additions & 0 deletions Experimental/DistributedAuthoritySample/Assets/Art/Skybox/Painted/Materials.meta
View file
Open in desktop

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

121 changes: 121 additions & 0 deletions Experimental/DistributedAuthoritySample/Assets/Art/Skybox/Painted/Materials/Sunset.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,121 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &-4454652384297788124
MonoBehaviour:
m_ObjectHideFlags: 11
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 2
--- !u!21 &2100000
Material:
serializedVersion: 6
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Sunset
m_Shader: {fileID: 103, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _BackTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _BaseMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _BumpMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DownTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _EmissionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _FrontTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _LeftTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _RightTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _SpecGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _Tex:
m_Texture: {fileID: 8900000, guid: d20cd5ed86c21844c929595fc106bc45, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _UpTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- _AlphaClip: 0
- _Blend: 0
- _BumpScale: 1
- _Cull: 2
- _Cutoff: 0.5
- _DstBlend: 0
- _EnvironmentReflections: 1
- _Exposure: 1
- _GlossMapScale: 0
- _Glossiness: 0
- _GlossyReflections: 0
- _Metallic: 0
- _OcclusionStrength: 1
- _QueueOffset: 0
- _ReceiveShadows: 1
- _Rotation: 308
- _Smoothness: 0.5
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _Surface: 0
- _WorkflowMode: 1
- _ZWrite: 1
m_Colors:
- _BaseColor: {r: 1, g: 1, b: 1, a: 1}
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
- _Tint: {r: 0.5, g: 0.5, b: 0.5, a: 0.5}
m_BuildTextureStacks: []
8 changes: 8 additions & 0 deletions Experimental/DistributedAuthoritySample/Assets/Art/Skybox/Painted/Materials/Sunset.mat.meta
View file
Open in desktop

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

Binary file added ...ntal/DistributedAuthoritySample/Assets/Art/Skybox/Painted/SunsetSky_Painted.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
120 changes: 120 additions & 0 deletions Experimental/DistributedAuthoritySample/Assets/Art/Skybox/Painted/SunsetSky_Painted.png.meta
View file
Open in desktop

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

6 changes: 3 additions & 3 deletions Experimental/DistributedAuthoritySample/Assets/Prefabs/GameCam/Main Camera.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ Camera:
m_GameObject: {fileID: 203267159508449517}
m_Enabled: 1
serializedVersion: 2
m_ClearFlags: 2
m_ClearFlags: 1
m_BackGroundColor: {r: 0, g: 0, b: 0, a: 0}
m_projectionMatrixMode: 1
m_GateFitMode: 2
Expand All @@ -67,8 +67,8 @@ Camera:
y: 0
width: 1
height: 1
near clip plane: 0.1
far clip plane: 5000
near clip plane: 0.01
far clip plane: 2000
field of view: 45
orthographic: 0
orthographic size: 10
Expand Down
33 changes: 29 additions & 4 deletions Experimental/DistributedAuthoritySample/Assets/Prefabs/Nature/Rocks/BigRock.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 919132149155446097, guid: 03e6d2192f81540a3876da105c48110e, type: 3}
propertyPath: m_Layer
value: 11
value: 0
objectReference: {fileID: 0}
- target: {fileID: 919132149155446097, guid: 03e6d2192f81540a3876da105c48110e, type: 3}
propertyPath: m_StaticEditorFlags
Expand Down Expand Up @@ -157,7 +157,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 919132149155446097, guid: 03e6d2192f81540a3876da105c48110e, type: 3}
propertyPath: m_Layer
value: 11
value: 0
objectReference: {fileID: 0}
- target: {fileID: 919132149155446097, guid: 03e6d2192f81540a3876da105c48110e, type: 3}
propertyPath: m_StaticEditorFlags
Expand All @@ -178,6 +178,9 @@ PrefabInstance:
insertIndex: -1
addedObject: {fileID: 7690392044118038905}
m_AddedComponents:
- targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 03e6d2192f81540a3876da105c48110e, type: 3}
insertIndex: -1
addedObject: {fileID: 5819738510758694112}
- targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 03e6d2192f81540a3876da105c48110e, type: 3}
insertIndex: -1
addedObject: {fileID: 6717327971221786811}
Expand All @@ -187,6 +190,28 @@ GameObject:
m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 03e6d2192f81540a3876da105c48110e, type: 3}
m_PrefabInstance: {fileID: 1735839378847478682}
m_PrefabAsset: {fileID: 0}
--- !u!64 &5819738510758694112
MeshCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1501837665180028619}
m_Material: {fileID: 0}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_LayerOverridePriority: 0
m_IsTrigger: 0
m_ProvidesContacts: 0
m_Enabled: 1
serializedVersion: 5
m_Convex: 0
m_CookingOptions: 30
m_Mesh: {fileID: 0}
--- !u!205 &6717327971221786811
LODGroup:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -289,7 +314,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 919132149155446097, guid: 03e6d2192f81540a3876da105c48110e, type: 3}
propertyPath: m_Layer
value: 11
value: 0
objectReference: {fileID: 0}
- target: {fileID: 919132149155446097, guid: 03e6d2192f81540a3876da105c48110e, type: 3}
propertyPath: m_StaticEditorFlags
Expand Down Expand Up @@ -380,7 +405,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 919132149155446097, guid: 03e6d2192f81540a3876da105c48110e, type: 3}
propertyPath: m_Layer
value: 11
value: 0
objectReference: {fileID: 0}
- target: {fileID: 919132149155446097, guid: 03e6d2192f81540a3876da105c48110e, type: 3}
propertyPath: m_StaticEditorFlags
Expand Down
Loading