diff --git a/Assets/AddressableAssetsData/Windows/addressables_content_state.bin b/Assets/AddressableAssetsData/Windows/addressables_content_state.bin
index cd833efebc4d5425d6eef8fb9a21bf62c2f243da..e896f74f34c84141379db1308f42aaaac637b7c0 100644
Binary files a/Assets/AddressableAssetsData/Windows/addressables_content_state.bin and b/Assets/AddressableAssetsData/Windows/addressables_content_state.bin differ
diff --git a/Assets/AssetStore/ClassRoom Stuff/Materials/BlackBoardFrench.mat b/Assets/AssetStore/ClassRoom Stuff/Materials/BlackBoardFrench.mat
new file mode 100644
index 0000000000000000000000000000000000000000..36ba2a861397279c719110a6070d2fc32f30456d
--- /dev/null
+++ b/Assets/AssetStore/ClassRoom Stuff/Materials/BlackBoardFrench.mat
@@ -0,0 +1,106 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+ serializedVersion: 8
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: BlackBoardFrench
+ m_Shader: {fileID: 4800000, guid: 8d2bb70cbf9db8d4da26e15b26e74248, type: 3}
+ m_Parent: {fileID: 0}
+ m_ModifiedSerializedProperties: 0
+ m_ValidKeywords:
+ - _GLOSSINESS_FROM_BASE_ALPHA
+ - _NORMALMAP
+ - _SPECULAR_COLOR
+ m_InvalidKeywords: []
+ m_LightmapFlags: 4
+ m_EnableInstancingVariants: 0
+ m_DoubleSidedGI: 0
+ m_CustomRenderQueue: 2000
+ stringTagMap:
+ RenderType: Opaque
+ disabledShaderPasses:
+ - MOTIONVECTORS
+ m_LockedProperties:
+ m_SavedProperties:
+ serializedVersion: 3
+ m_TexEnvs:
+ - _BaseMap:
+ m_Texture: {fileID: 2800000, guid: 8895e2248a3da784b8cae5ca949768a8, type: 3}
+ m_Scale: {x: 1.04, y: 0.99}
+ m_Offset: {x: -0.01, y: 0.01}
+ - _BumpMap:
+ m_Texture: {fileID: 2800000, guid: 3239d3d71eec7194e858a944d0fa259c, type: 3}
+ 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}
+ - _MainTex:
+ m_Texture: {fileID: 2800000, guid: 8895e2248a3da784b8cae5ca949768a8, type: 3}
+ m_Scale: {x: 1.04, y: 0.99}
+ m_Offset: {x: -0.01, y: 0.01}
+ - _SpecGlossMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - unity_Lightmaps:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - unity_LightmapsInd:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - unity_ShadowMasks:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ m_Ints: []
+ m_Floats:
+ - _AddPrecomputedVelocity: 0
+ - _AlphaClip: 0
+ - _AlphaToMask: 0
+ - _Blend: 0
+ - _BlendModePreserveSpecular: 1
+ - _BumpScale: 1
+ - _Cull: 2
+ - _Cutoff: 0.5
+ - _DstBlend: 0
+ - _DstBlendAlpha: 0
+ - _GlossinessSource: 0
+ - _QueueOffset: 0
+ - _ReceiveShadows: 1
+ - _Shininess: 0.5245218
+ - _Smoothness: 0.5245218
+ - _SmoothnessSource: 1
+ - _SpecSource: 0
+ - _SpecularHighlights: 0
+ - _SrcBlend: 1
+ - _SrcBlendAlpha: 1
+ - _Surface: 0
+ - _ZWrite: 1
+ m_Colors:
+ - _BaseColor: {r: 0.5882353, g: 0.5882353, b: 0.5882353, a: 0.5245218}
+ - _Color: {r: 0.5882353, g: 0.5882353, b: 0.5882353, a: 0.5245218}
+ - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+ - _SpecColor: {r: 0.05970148, g: 0.05970148, b: 0.05970148, a: 1}
+ m_BuildTextureStacks: []
+ m_AllowLocking: 1
+--- !u!114 &6411943128489178946
+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: 9
diff --git a/Assets/AssetStore/ClassRoom Stuff/Materials/Green_Board_Dif.mat.meta b/Assets/AssetStore/ClassRoom Stuff/Materials/BlackBoardFrench.mat.meta
similarity index 100%
rename from Assets/AssetStore/ClassRoom Stuff/Materials/Green_Board_Dif.mat.meta
rename to Assets/AssetStore/ClassRoom Stuff/Materials/BlackBoardFrench.mat.meta
diff --git a/Assets/AssetStore/ClassRoom Stuff/Materials/Green_Board_Dif.mat b/Assets/AssetStore/ClassRoom Stuff/Materials/BlackBoardNeutral.mat
similarity index 94%
rename from Assets/AssetStore/ClassRoom Stuff/Materials/Green_Board_Dif.mat
rename to Assets/AssetStore/ClassRoom Stuff/Materials/BlackBoardNeutral.mat
index 64e4036667825a64113b7cfd8bd2cde654d29dd7..18de46300366d725745987e64c8637398f70f351 100644
--- a/Assets/AssetStore/ClassRoom Stuff/Materials/Green_Board_Dif.mat
+++ b/Assets/AssetStore/ClassRoom Stuff/Materials/BlackBoardNeutral.mat
@@ -7,7 +7,7 @@ Material:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_Name: Green_Board_Dif
+ m_Name: BlackBoardNeutral
m_Shader: {fileID: 4800000, guid: 8d2bb70cbf9db8d4da26e15b26e74248, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
@@ -30,8 +30,8 @@ Material:
m_TexEnvs:
- _BaseMap:
m_Texture: {fileID: 2800000, guid: 8895e2248a3da784b8cae5ca949768a8, type: 3}
- m_Scale: {x: 1.05, y: 0.99}
- m_Offset: {x: -0.01, y: 0}
+ m_Scale: {x: 1.04, y: 0.99}
+ m_Offset: {x: 0.02, y: 0.01}
- _BumpMap:
m_Texture: {fileID: 2800000, guid: 3239d3d71eec7194e858a944d0fa259c, type: 3}
m_Scale: {x: 1, y: 1}
@@ -42,8 +42,8 @@ Material:
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 2800000, guid: 8895e2248a3da784b8cae5ca949768a8, type: 3}
- m_Scale: {x: 1.05, y: 0.99}
- m_Offset: {x: -0.01, y: 0}
+ m_Scale: {x: 1.04, y: 0.99}
+ m_Offset: {x: 0.02, y: 0.01}
- _SpecGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
diff --git a/Assets/AssetStore/ClassRoom Stuff/Materials/BlackBoardNeutral.mat.meta b/Assets/AssetStore/ClassRoom Stuff/Materials/BlackBoardNeutral.mat.meta
new file mode 100644
index 0000000000000000000000000000000000000000..43f53eb3e813352afc69b0d0d92037e05ba7c6f7
--- /dev/null
+++ b/Assets/AssetStore/ClassRoom Stuff/Materials/BlackBoardNeutral.mat.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: ec9119907b65abb489e90afd564bae58
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 2100000
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scenes/ChemistryRoom.unity b/Assets/Scenes/ChemistryRoom.unity
index 61cf4c129d433e78c1c380d4b00202c51ec94cf7..53070e655438fe1adc1c14732d30ae7a5e974a09 100644
--- a/Assets/Scenes/ChemistryRoom.unity
+++ b/Assets/Scenes/ChemistryRoom.unity
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:86d9caf6a042f7679fe4de9732dce78d9fb1a8abe403f8718dc8947db5e17a57
-size 1354862
+oid sha256:34ffc962a40393edebe14a49801b6c5bb24b8c18a85a62f00b402e2ed9f61554
+size 1354168
diff --git a/Assets/Scenes/ComputerScienceRoom_Layout1.unity b/Assets/Scenes/ComputerScienceRoom_Layout1.unity
index 67104667a272161c151877ccc69abef64cfbbdb1..398e5d29095938502a494832c4cd3481a5c26529 100644
--- a/Assets/Scenes/ComputerScienceRoom_Layout1.unity
+++ b/Assets/Scenes/ComputerScienceRoom_Layout1.unity
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:375de70e440f5d177149fbd4c9fe7b1926fa12200efec5bbe17a242f83a15268
-size 2110551
+oid sha256:6d7819681f799ea6f066f3ef1a50f6090184f1fd67be70585461f085b283d55a
+size 2113998
diff --git a/Assets/Scenes/ComputerScienceRoom_Layout2.unity b/Assets/Scenes/ComputerScienceRoom_Layout2.unity
index da79768d11d8efb11cd627bb67913d289a46a457..e2f490f32681487de867c6f1d9085f32086db6c8 100644
--- a/Assets/Scenes/ComputerScienceRoom_Layout2.unity
+++ b/Assets/Scenes/ComputerScienceRoom_Layout2.unity
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:d9fa25b597020d1bd7b3568b0a2a1f8c7724c6fcbfd1634c8ea80db15cd8bfbf
-size 1141818
+oid sha256:a5330007bbfcf8729213ea2bfea00f474cfe4e27de319ba5a3c5d1d587ec1947
+size 1143822
diff --git a/Assets/Scenes/EntranceHall.unity b/Assets/Scenes/EntranceHall.unity
index e7b51bb5ee22c521e3a64dc911680199b9aa7f1c..731167deb0c43f580e3ac80507c42a2900996489 100644
--- a/Assets/Scenes/EntranceHall.unity
+++ b/Assets/Scenes/EntranceHall.unity
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:4b2cd8e037f929e5ba7db87d11ff30e265183ee94635aae6650026a073bd3a7c
-size 58718
+oid sha256:cd83516758ab93a993819b9599b0d3cb78a609242e805fbc966f9bd01a82ebd5
+size 59390
diff --git a/Assets/Scenes/MediaRoom.unity b/Assets/Scenes/MediaRoom.unity
index 84dabb3bdbe8f194b74f7e8a3bb306fbbfc1a636..2d3881e7af621a9c27dbaa03133bfffcab78ec2b 100644
--- a/Assets/Scenes/MediaRoom.unity
+++ b/Assets/Scenes/MediaRoom.unity
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:7f52df04c75191fa90b8f45ea766b81ef5203d0ec8a95832b7738b9fb971b185
-size 2110040
+oid sha256:d8355f7986392f4b8766f00b212c84f7f959d86c05e932c4ba3b82a7507093fc
+size 2110285
diff --git a/Assets/Scenes/fishBoneScene.unity b/Assets/Scenes/fishBoneScene.unity
index 05de188bb5148980fb988ff66d0cfe683f4a3314..6ccc9ea0848fa7aa448bb17e31374b559017f2ab 100644
--- a/Assets/Scenes/fishBoneScene.unity
+++ b/Assets/Scenes/fishBoneScene.unity
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:541a79642cb4e4fd9a49285776af5c6b321086d3a5bc36e718932b8c6cb7e3d4
-size 3094464
+oid sha256:355d0cb9f2dbae2b32c579a7ec4a7be199d3c0ffba2df464a41720d95e1da06c
+size 3095045
diff --git a/Assets/Scenes/frontalLectureScene.unity b/Assets/Scenes/frontalLectureScene.unity
index fd440af34a3d6a51fb59a7203b36f44c1567e5df..66e0175d307773031d1089fbb6dc67b9a4e4614c 100644
--- a/Assets/Scenes/frontalLectureScene.unity
+++ b/Assets/Scenes/frontalLectureScene.unity
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:ab1e8aa8504afd7028d76543154c0d6282cdbfc0c2434925f604632293dfa849
-size 3042702
+oid sha256:81d691a969a9ad104d16d847c7b9c6a2fc6a134325d8037d51fb4a1eb6c74684
+size 3043821
diff --git a/Assets/Scenes/groupWorkScene.unity b/Assets/Scenes/groupWorkScene.unity
index 6fa801643a92635ecc4bac6c71cffde8efc4b804..9aa878fc52138a0b1b35710b63b3d44a5f96f31e 100644
--- a/Assets/Scenes/groupWorkScene.unity
+++ b/Assets/Scenes/groupWorkScene.unity
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:951a9ade01b0b11d9f5fb06279f275ce0a8ccdd92bee7be017f0a8ab47bd3c05
-size 3089009
+oid sha256:9e167caa20638e593f0a30b4af99bd20f175a0da94a7ab7ee678c52a4080e77b
+size 3090895
diff --git a/Assets/Scenes/horseshoeRoom.unity b/Assets/Scenes/horseshoeRoom.unity
index 5ea054820fae5189f94aafa2681f061259393e53..310f620843b60bd29b054972c884070dd7f8efb7 100644
--- a/Assets/Scenes/horseshoeRoom.unity
+++ b/Assets/Scenes/horseshoeRoom.unity
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:78e399b04171b0e5ecfa572f8a605da8ca672120b7e20e7fe16496cc2b6c70f9
-size 3077318
+oid sha256:a3c06b4e03fac67d1d3fc6fb5454a35909c5bab717ef7235cd5962533c897a00
+size 3078497
diff --git a/Assets/UniversalRenderPipelineGlobalSettings.asset b/Assets/UniversalRenderPipelineGlobalSettings.asset
index 63b96b7e43847420db79e080f506936e097b1838..eecc004bbe45d23818af47f4ebb6ed1c987bf201 100644
--- a/Assets/UniversalRenderPipelineGlobalSettings.asset
+++ b/Assets/UniversalRenderPipelineGlobalSettings.asset
@@ -205,6 +205,9 @@ MonoBehaviour:
m_CoreBlitPS: {fileID: 4800000, guid: 93446b5c5339d4f00b85c159e1159b7c, type: 3}
m_CoreBlitColorAndDepthPS: {fileID: 4800000, guid: d104b2fc1ca6445babb8e90b0758136b, type: 3}
m_SamplingPS: {fileID: 4800000, guid: 04c410c9937594faa893a11dceb85f7e, type: 3}
+ m_TerrainDetailLit: {fileID: 4800000, guid: f6783ab646d374f94b199774402a5144, type: 3}
+ m_TerrainDetailGrassBillboard: {fileID: 4800000, guid: 29868e73b638e48ca99a19ea58c48d90, type: 3}
+ m_TerrainDetailGrass: {fileID: 4800000, guid: e507fdfead5ca47e8b9a768b51c291a1, type: 3}
- rid: 5888436126685331579
type: {class: GPUResidentDrawerResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.GPUDriven.Runtime}
data:
diff --git a/Packages/manifest.json b/Packages/manifest.json
index e72ece4b525f089ae8f8dff595ffa9dc1b5c70e9..7831acb81329ca2bfb15b79c453b8f45a3ee4ade 100644
--- a/Packages/manifest.json
+++ b/Packages/manifest.json
@@ -3,7 +3,7 @@
"com.unity.ai.navigation": "2.0.6",
"com.unity.animation.rigging": "1.3.0",
"com.unity.burst": "1.8.19",
- "com.unity.collab-proxy": "2.6.0",
+ "com.unity.collab-proxy": "2.7.1",
"com.unity.formats.fbx": "5.1.3",
"com.unity.ide.rider": "3.0.34",
"com.unity.ide.visualstudio": "2.0.22",
@@ -12,13 +12,13 @@
"com.unity.memoryprofiler": "1.1.5",
"com.unity.multiplayer.center": "1.0.0",
"com.unity.recorder": "5.1.2",
- "com.unity.render-pipelines.universal": "17.0.3",
+ "com.unity.render-pipelines.universal": "17.0.4",
"com.unity.searcher": "4.9.3",
"com.unity.test-framework": "1.4.6",
"com.unity.testtools.codecoverage": "1.2.6",
"com.unity.timeline": "1.8.8",
"com.unity.ugui": "2.0.0",
- "com.unity.visualeffectgraph": "17.0.3",
+ "com.unity.visualeffectgraph": "17.0.4",
"com.unity.visualscripting": "1.9.5",
"com.unity.xr.core-utils": "2.5.1",
"com.unity.xr.interaction.toolkit": "3.0.7",
diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json
index 08fbfba0ea1c72ce6cbe11ceef9dcbd7cba79d05..017d794c3db505b3cd1ac85acbf6e39822001184 100644
--- a/Packages/packages-lock.json
+++ b/Packages/packages-lock.json
@@ -61,7 +61,7 @@
"url": "https://packages.unity.com"
},
"com.unity.collab-proxy": {
- "version": "2.6.0",
+ "version": "2.7.1",
"depth": 0,
"source": "registry",
"dependencies": {},
@@ -201,7 +201,7 @@
"url": "https://packages.unity.com"
},
"com.unity.render-pipelines.core": {
- "version": "17.0.3",
+ "version": "17.0.4",
"depth": 1,
"source": "builtin",
"dependencies": {
@@ -216,12 +216,12 @@
}
},
"com.unity.render-pipelines.universal": {
- "version": "17.0.3",
+ "version": "17.0.4",
"depth": 0,
"source": "builtin",
"dependencies": {
- "com.unity.render-pipelines.core": "17.0.3",
- "com.unity.shadergraph": "17.0.3",
+ "com.unity.render-pipelines.core": "17.0.4",
+ "com.unity.shadergraph": "17.0.4",
"com.unity.render-pipelines.universal-config": "17.0.3"
}
},
@@ -265,12 +265,12 @@
"url": "https://packages.unity.com"
},
"com.unity.shadergraph": {
- "version": "17.0.3",
+ "version": "17.0.4",
"depth": 1,
"source": "builtin",
"dependencies": {
- "com.unity.render-pipelines.core": "17.0.3",
- "com.unity.searcher": "4.9.2"
+ "com.unity.render-pipelines.core": "17.0.4",
+ "com.unity.searcher": "4.9.3"
}
},
"com.unity.test-framework": {
@@ -326,12 +326,12 @@
}
},
"com.unity.visualeffectgraph": {
- "version": "17.0.3",
+ "version": "17.0.4",
"depth": 0,
"source": "builtin",
"dependencies": {
- "com.unity.shadergraph": "17.0.3",
- "com.unity.render-pipelines.core": "17.0.3"
+ "com.unity.shadergraph": "17.0.4",
+ "com.unity.render-pipelines.core": "17.0.4"
}
},
"com.unity.visualscripting": {
diff --git a/Packages/vr.teachr.interactables/Runtime/Blackboard/Blackboard.prefab b/Packages/vr.teachr.interactables/Runtime/Blackboard/Blackboard.prefab
index 4035f800345fe4898f53b34d198de89cd06f32b1..9c92f0f8c046ecd04bddda50c701fbc036ba6bec 100644
--- a/Packages/vr.teachr.interactables/Runtime/Blackboard/Blackboard.prefab
+++ b/Packages/vr.teachr.interactables/Runtime/Blackboard/Blackboard.prefab
@@ -204,7 +204,7 @@ MeshRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- - {fileID: 2100000, guid: 401c9c4e4793e064ebcf9d4c1cf9ead7, type: 2}
+ - {fileID: 2100000, guid: ec9119907b65abb489e90afd564bae58, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
diff --git a/Packages/vr.teachr.interactables/Runtime/Interactables.prefab b/Packages/vr.teachr.interactables/Runtime/Interactables.prefab
index 72cc36b66d5242def0da2378946333d15cd71d17..1a0c9725b8138e3ba5f2ec41925b890ec7db9b00 100644
--- a/Packages/vr.teachr.interactables/Runtime/Interactables.prefab
+++ b/Packages/vr.teachr.interactables/Runtime/Interactables.prefab
@@ -539,6 +539,10 @@ PrefabInstance:
propertyPath: m_Name
value: Interactive Whiteboard
objectReference: {fileID: 0}
+ - target: {fileID: 2815073562111842555, guid: 3363a64244c7c2d47afa622e437709c1, type: 3}
+ propertyPath: m_IsActive
+ value: 0
+ objectReference: {fileID: 0}
- target: {fileID: 3333328637019721528, guid: 3363a64244c7c2d47afa622e437709c1, type: 3}
propertyPath: m_CastShadows
value: 0
diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt
index 307f912404d5dd875dee4d2039e4e28270bd067e..a1aff48dd952466f8da0892ffacfeaa8772d51c8 100644
--- a/ProjectSettings/ProjectVersion.txt
+++ b/ProjectSettings/ProjectVersion.txt
@@ -1,2 +1,2 @@
-m_EditorVersion: 6000.0.38f1
-m_EditorVersionWithRevision: 6000.0.38f1 (82314a941f2d)
+m_EditorVersion: 6000.0.40f1
+m_EditorVersionWithRevision: 6000.0.40f1 (157d81624ddf)