diff --git a/.vscode/extensions.json b/.vscode/extensions.json new file mode 100644 index 00000000..ddb6ff85 --- /dev/null +++ b/.vscode/extensions.json @@ -0,0 +1,5 @@ +{ + "recommendations": [ + "visualstudiotoolsforunity.vstuc" + ] +} diff --git a/.vscode/launch.json b/.vscode/launch.json new file mode 100644 index 00000000..da60e25a --- /dev/null +++ b/.vscode/launch.json @@ -0,0 +1,10 @@ +{ + "version": "0.2.0", + "configurations": [ + { + "name": "Attach to Unity", + "type": "vstuc", + "request": "attach" + } + ] +} \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 00000000..722c04ff --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,55 @@ +{ + "files.exclude": { + "**/.DS_Store": true, + "**/.git": true, + "**/.gitmodules": true, + "**/*.booproj": true, + "**/*.pidb": true, + "**/*.suo": true, + "**/*.user": true, + "**/*.userprefs": true, + "**/*.unityproj": true, + "**/*.dll": true, + "**/*.exe": true, + "**/*.pdf": true, + "**/*.mid": true, + "**/*.midi": true, + "**/*.wav": true, + "**/*.gif": true, + "**/*.ico": true, + "**/*.jpg": true, + "**/*.jpeg": true, + "**/*.png": true, + "**/*.psd": true, + "**/*.tga": true, + "**/*.tif": true, + "**/*.tiff": true, + "**/*.3ds": true, + "**/*.3DS": true, + "**/*.fbx": true, + "**/*.FBX": true, + "**/*.lxo": true, + "**/*.LXO": true, + "**/*.ma": true, + "**/*.MA": true, + "**/*.obj": true, + "**/*.OBJ": true, + "**/*.asset": true, + "**/*.cubemap": true, + "**/*.flare": true, + "**/*.mat": true, + "**/*.meta": true, + "**/*.prefab": true, + "**/*.unity": true, + "build/": true, + "Build/": true, + "Library/": true, + "library/": true, + "obj/": true, + "Obj/": true, + "ProjectSettings/": true, + "temp/": true, + "Temp/": true + }, + "dotnet.defaultSolution": "dungeons.sln" +} \ No newline at end of file diff --git a/Assets/HurricaneVR/Framework/Integrations/FinalIK_Integration.unitypackage.meta b/Assets/HurricaneVR/Framework/Integrations/FinalIK_Integration.unitypackage.meta deleted file mode 100644 index 3a8c7fd9..00000000 --- a/Assets/HurricaneVR/Framework/Integrations/FinalIK_Integration.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 2a39b3c0d6d9bbe46a4816fd62320f4b -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/HurricaneVR/Framework/Integrations/HexaBodyVR_Integration.unitypackage.meta b/Assets/HurricaneVR/Framework/Integrations/HexaBodyVR_Integration.unitypackage.meta deleted file mode 100644 index 8816f9fb..00000000 --- a/Assets/HurricaneVR/Framework/Integrations/HexaBodyVR_Integration.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 31c90a1529188b947854cd14e13aef5a -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/HurricaneVR/Framework/Integrations/OculusIntegration.unitypackage.meta b/Assets/HurricaneVR/Framework/Integrations/OculusIntegration.unitypackage.meta deleted file mode 100644 index d51cb357..00000000 --- a/Assets/HurricaneVR/Framework/Integrations/OculusIntegration.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 19be22f6bb3775a478ef0c441b6c3a20 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/HurricaneVR/Framework/Integrations/SteamVRIntegration.unitypackage.meta b/Assets/HurricaneVR/Framework/Integrations/SteamVRIntegration.unitypackage.meta deleted file mode 100644 index d3ee020a..00000000 --- a/Assets/HurricaneVR/Framework/Integrations/SteamVRIntegration.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 669e8154ef4d9b64787f2974409f606c -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Oculus/OculusProjectConfig.asset b/Assets/Oculus/OculusProjectConfig.asset index fb54c829..11b9e925 100644 --- a/Assets/Oculus/OculusProjectConfig.asset +++ b/Assets/Oculus/OculusProjectConfig.asset @@ -41,5 +41,5 @@ MonoBehaviour: systemSplashScreen: {fileID: 0} systemSplashScreenType: 0 _systemLoadingScreenBackground: 0 - ovrPluginMd5Win64: aa662cdf2f901973cc80422bf87a766d438fe4f2245bacd864e9180e0a41d7ca - ovrPluginMd5Android: b191da349d7c05c640e5f41721d8abdfa7931b9213e8e481fc0316f7eef4ffc9 + ovrPluginMd5Win64: aa662cdf2f901973cc80422bf87a766d1bbe7d8a73b1be1e622af9e4457d65e2 + ovrPluginMd5Android: b191da349d7c05c640e5f41721d8abdfa2a3f8d400e1e1d353e3c5d59202932c diff --git a/Assets/Plugins/Sirenix/Demos/Custom Attribute Processors.unitypackage.meta b/Assets/Plugins/Sirenix/Demos/Custom Attribute Processors.unitypackage.meta deleted file mode 100644 index 92a6ac5a..00000000 --- a/Assets/Plugins/Sirenix/Demos/Custom Attribute Processors.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: f597f19f656ba56eae4f6a3a7cc528f4 -timeCreated: 1488828285 -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/Sirenix/Demos/Custom Drawers.unitypackage.meta b/Assets/Plugins/Sirenix/Demos/Custom Drawers.unitypackage.meta deleted file mode 100644 index 71af8df2..00000000 --- a/Assets/Plugins/Sirenix/Demos/Custom Drawers.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 48e08dc33330d11e9d4a1b246c52e4f6 -timeCreated: 1488828285 -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/Sirenix/Demos/Editor Windows.unitypackage.meta b/Assets/Plugins/Sirenix/Demos/Editor Windows.unitypackage.meta deleted file mode 100644 index cc5570c5..00000000 --- a/Assets/Plugins/Sirenix/Demos/Editor Windows.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: ed09910c0094cb27be8f3ca264680da3 -timeCreated: 1488828285 -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/Sirenix/Demos/Sample - RPG Editor.unitypackage.meta b/Assets/Plugins/Sirenix/Demos/Sample - RPG Editor.unitypackage.meta deleted file mode 100644 index 26bd5b8a..00000000 --- a/Assets/Plugins/Sirenix/Demos/Sample - RPG Editor.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: cc355dd4cf1e6173beaeb22c2858cbe1 -timeCreated: 1488828285 -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/Zenject/OptionalExtras/ReflectionBaking/Zenject-ReflectionBaking.csproj.meta b/Assets/Plugins/Zenject/OptionalExtras/ReflectionBaking/Zenject-ReflectionBaking.csproj.meta deleted file mode 100644 index 17593550..00000000 --- a/Assets/Plugins/Zenject/OptionalExtras/ReflectionBaking/Zenject-ReflectionBaking.csproj.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: 91b0b4c77fdd1d24aa1af646e9d29960 -timeCreated: 1536994288 -licenseType: Store -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/Zenject/OptionalExtras/Signals/Zenject-Signals.csproj.meta b/Assets/Plugins/Zenject/OptionalExtras/Signals/Zenject-Signals.csproj.meta deleted file mode 100644 index 2569935e..00000000 --- a/Assets/Plugins/Zenject/OptionalExtras/Signals/Zenject-Signals.csproj.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: aebd7ef925dd4fe4690c3238e879f914 -timeCreated: 1537606270 -licenseType: Store -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/Zenject/Source/Zenject.csproj.meta b/Assets/Plugins/Zenject/Source/Zenject.csproj.meta deleted file mode 100644 index eff454de..00000000 --- a/Assets/Plugins/Zenject/Source/Zenject.csproj.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 8645273165cb7f54290d6eaa1e10ab37 -timeCreated: 1461878212 -licenseType: Store -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Resources/OculusPlatformSettings.asset b/Assets/Resources/OculusPlatformSettings.asset new file mode 100644 index 00000000..5f7f34f2 --- /dev/null +++ b/Assets/Resources/OculusPlatformSettings.asset @@ -0,0 +1,17 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + 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: b3d881e962d099f4a8eb492ef7e9a8c0, type: 3} + m_Name: OculusPlatformSettings + m_EditorClassIdentifier: + ovrAppID: + ovrMobileAppID: + ovrUseStandalonePlatform: 1 diff --git a/Assets/HurricaneVR/Framework/Integrations/EmeraldAI_v3.unitypackage.meta b/Assets/Resources/OculusPlatformSettings.asset.meta similarity index 52% rename from Assets/HurricaneVR/Framework/Integrations/EmeraldAI_v3.unitypackage.meta rename to Assets/Resources/OculusPlatformSettings.asset.meta index 4062a6a1..fcebb152 100644 --- a/Assets/HurricaneVR/Framework/Integrations/EmeraldAI_v3.unitypackage.meta +++ b/Assets/Resources/OculusPlatformSettings.asset.meta @@ -1,7 +1,8 @@ fileFormatVersion: 2 -guid: 464b3c5ba97aca44ab958c34d08ea3d5 -DefaultImporter: +guid: e2a2c9747eb20431da6bdc2712dd0d1f +NativeFormatImporter: externalObjects: {} + mainObjectFileID: 11400000 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Settings/URP-Quest3-Renderer.asset b/Assets/Settings/URP-Quest3-Renderer.asset index 13a2981c..de724a04 100644 --- a/Assets/Settings/URP-Quest3-Renderer.asset +++ b/Assets/Settings/URP-Quest3-Renderer.asset @@ -15,10 +15,12 @@ MonoBehaviour: debugShaders: debugReplacementPS: {fileID: 4800000, guid: cf852408f2e174538bcd9b7fda1c5ae7, type: 3} + hdrDebugViewPS: {fileID: 4800000, guid: 573620ae32aec764abd4d728906d2587, type: 3} m_RendererFeatures: [] m_RendererFeatureMap: m_UseNativeRenderPass: 0 postProcessData: {fileID: 11400000, guid: 41439944d30ece34e96484bdb6645b55, type: 2} + xrSystemData: {fileID: 11400000, guid: 60e1133243b97e347b653163a8c01b64, type: 2} shaders: blitPS: {fileID: 4800000, guid: c17132b1f77d20942aa75f8429c0f8bc, type: 3} copyDepthPS: {fileID: 4800000, guid: d6dae50ee9e1bfa4db75f19f99355220, type: 3} @@ -26,11 +28,19 @@ MonoBehaviour: samplingPS: {fileID: 4800000, guid: 04c410c9937594faa893a11dceb85f7e, type: 3} stencilDeferredPS: {fileID: 4800000, guid: e9155b26e1bc55942a41e518703fe304, type: 3} fallbackErrorPS: {fileID: 4800000, guid: e6e9a19c3678ded42a3bc431ebef7dbd, type: 3} + fallbackLoadingPS: {fileID: 4800000, guid: 7f888aff2ac86494babad1c2c5daeee2, type: 3} materialErrorPS: {fileID: 4800000, guid: 5fd9a8feb75a4b5894c241777f519d4e, type: 3} - coreBlitPS: {fileID: 0} - coreBlitColorAndDepthPS: {fileID: 0} - cameraMotionVector: {fileID: 0} - objectMotionVector: {fileID: 0} + coreBlitPS: {fileID: 4800000, guid: 93446b5c5339d4f00b85c159e1159b7c, type: 3} + coreBlitColorAndDepthPS: {fileID: 4800000, guid: d104b2fc1ca6445babb8e90b0758136b, + type: 3} + blitHDROverlay: {fileID: 4800000, guid: a89bee29cffa951418fc1e2da94d1959, type: 3} + cameraMotionVector: {fileID: 4800000, guid: c56b7e0d4c7cb484e959caeeedae9bbf, + type: 3} + objectMotionVector: {fileID: 4800000, guid: 7b3ede40266cd49a395def176e1bc486, + type: 3} + dataDrivenLensFlare: {fileID: 4800000, guid: 6cda457ac28612740adb23da5d39ea92, + type: 3} + m_AssetVersion: 2 m_OpaqueLayerMask: serializedVersion: 2 m_Bits: 4294967295 @@ -47,6 +57,6 @@ MonoBehaviour: m_ShadowTransparentReceive: 1 m_RenderingMode: 0 m_DepthPrimingMode: 0 + m_CopyDepthMode: 0 m_AccurateGbufferNormals: 0 - m_ClusteredRendering: 0 - m_TileSize: 32 + m_IntermediateTextureMode: 1 diff --git a/Assets/Settings/XR/XRGeneralSettingsPerBuildTarget.asset b/Assets/Settings/XR/XRGeneralSettingsPerBuildTarget.asset index ce98bee2..db72bc53 100644 --- a/Assets/Settings/XR/XRGeneralSettingsPerBuildTarget.asset +++ b/Assets/Settings/XR/XRGeneralSettingsPerBuildTarget.asset @@ -14,6 +14,22 @@ MonoBehaviour: m_EditorClassIdentifier: m_LoaderManagerInstance: {fileID: 497588161846361939} m_InitManagerOnStart: 1 +--- !u!114 &-1117143410020441566 +MonoBehaviour: + m_ObjectHideFlags: 0 + 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: f4c3631f5e58749a59194e0cf6baf6d5, type: 3} + m_Name: WebGL Providers + m_EditorClassIdentifier: + m_RequiresSettingsUpdate: 0 + m_AutomaticLoading: 0 + m_AutomaticRunning: 0 + m_Loaders: [] --- !u!114 &-544434020768572872 MonoBehaviour: m_ObjectHideFlags: 0 @@ -43,10 +59,11 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d2dc886499c26824283350fa532d087d, type: 3} m_Name: XRGeneralSettingsPerBuildTarget m_EditorClassIdentifier: - Keys: 0700000001000000 + Keys: 07000000010000000d000000 Values: - {fileID: -3242307658584684348} - {fileID: 1076377558943198834} + - {fileID: 7092022235217126321} --- !u!114 &497588161846361939 MonoBehaviour: m_ObjectHideFlags: 0 @@ -78,3 +95,17 @@ MonoBehaviour: m_EditorClassIdentifier: m_LoaderManagerInstance: {fileID: -544434020768572872} m_InitManagerOnStart: 1 +--- !u!114 &7092022235217126321 +MonoBehaviour: + m_ObjectHideFlags: 0 + 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: d236b7d11115f2143951f1e14045df39, type: 3} + m_Name: WebGL Settings + m_EditorClassIdentifier: + m_LoaderManagerInstance: {fileID: -1117143410020441566} + m_InitManagerOnStart: 1 diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 99b9511b..42deee3e 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -5,10 +5,10 @@ "depth": 1, "source": "registry", "dependencies": { - "com.unity.ai.navigation": "1.1.4", - "com.unity.nuget.newtonsoft-json": "3.0.2", "com.meta.xr.sdk.core": "67.0.0", - "com.unity.textmeshpro": "3.0.6" + "com.unity.textmeshpro": "3.0.6", + "com.unity.ai.navigation": "1.1.4", + "com.unity.nuget.newtonsoft-json": "3.0.2" }, "url": "https://packages.unity.com" }, @@ -17,15 +17,15 @@ "depth": 0, "source": "registry", "dependencies": { - "com.meta.xr.sdk.audio": "67.0.0", - "com.meta.xr.sdk.interaction": "67.0.0", - "com.meta.xr.sdk.interaction.ovr": "67.0.1", - "com.meta.xr.sdk.platform": "67.0.0", "com.meta.xr.sdk.core": "67.0.0", + "com.meta.xr.sdk.audio": "67.0.0", "com.meta.xr.sdk.voice": "67.0.0", - "com.meta.xr.sdk.haptics": "67.0.0", "com.meta.xr.simulator": "66.0.1", - "com.meta.xr.mrutilitykit": "67.0.0" + "com.meta.xr.sdk.haptics": "67.0.0", + "com.meta.xr.mrutilitykit": "67.0.0", + "com.meta.xr.sdk.platform": "67.0.0", + "com.meta.xr.sdk.interaction": "67.0.0", + "com.meta.xr.sdk.interaction.ovr": "67.0.1" }, "url": "https://packages.unity.com" }, @@ -57,8 +57,8 @@ "depth": 1, "source": "registry", "dependencies": { - "com.unity.textmeshpro": "3.0.6", - "com.unity.ugui": "1.0.0" + "com.unity.ugui": "1.0.0", + "com.unity.textmeshpro": "3.0.6" }, "url": "https://packages.unity.com" }, @@ -67,8 +67,8 @@ "depth": 1, "source": "registry", "dependencies": { - "com.meta.xr.sdk.interaction": "67.0.0", - "com.meta.xr.sdk.core": "67.0.0" + "com.meta.xr.sdk.core": "67.0.0", + "com.meta.xr.sdk.interaction": "67.0.0" }, "url": "https://packages.unity.com" }, @@ -105,7 +105,7 @@ "url": "https://packages.unity.com" }, "com.unity.burst": { - "version": "1.8.16", + "version": "1.8.17", "depth": 1, "source": "registry", "dependencies": { @@ -289,9 +289,9 @@ "depth": 0, "source": "registry", "dependencies": { - "com.unity.modules.subsystems": "1.0.0", "com.unity.modules.vr": "1.0.0", "com.unity.modules.xr": "1.0.0", + "com.unity.modules.subsystems": "1.0.0", "com.unity.xr.legacyinputhelpers": "2.1.7" }, "url": "https://packages.unity.com" diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index bd61713f..706c5ab4 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -824,7 +824,7 @@ PlayerSettings: PS5: ULTIMATEXR_USE_OCULUS_SDK QNX: ULTIMATEXR_USE_OCULUS_SDK Stadia: ULTIMATEXR_USE_OCULUS_SDK - Standalone: USE_INPUT_SYSTEM_POSE_CONTROL;USE_STICK_CONTROL_THUMBSTICKS;ULTIMATEXR_USE_OCULUS_SDK + Standalone: USE_INPUT_SYSTEM_POSE_CONTROL;USE_STICK_CONTROL_THUMBSTICKS;ULTIMATEXR_USE_OCULUS_SDK;ODIN_INSPECTOR;ODIN_INSPECTOR_3;ODIN_INSPECTOR_3_1;ODIN_INSPECTOR_3_2;ODIN_INSPECTOR_3_3 VisionOS: ULTIMATEXR_USE_OCULUS_SDK WebGL: ULTIMATEXR_USE_OCULUS_SDK Windows Store Apps: USE_INPUT_SYSTEM_POSE_CONTROL;USE_STICK_CONTROL_THUMBSTICKS;ULTIMATEXR_USE_OCULUS_SDK diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index cfbed013..094355ec 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2022.3.40f1 -m_EditorVersionWithRevision: 2022.3.40f1 (cbdda657d2f0) +m_EditorVersion: 2022.3.42f1 +m_EditorVersionWithRevision: 2022.3.42f1 (2dcb6a0abc42)