diff --git a/VXMusicDesktop/Overlay/bin/VXMOverlay_Data/Managed/Assembly-CSharp-firstpass.dll b/VXMusicDesktop/Overlay/bin/VXMOverlay_Data/Managed/Assembly-CSharp-firstpass.dll index 67d72da9..5ace3d2f 100644 Binary files a/VXMusicDesktop/Overlay/bin/VXMOverlay_Data/Managed/Assembly-CSharp-firstpass.dll and b/VXMusicDesktop/Overlay/bin/VXMOverlay_Data/Managed/Assembly-CSharp-firstpass.dll differ diff --git a/VXMusicDesktop/Overlay/bin/VXMOverlay_Data/Resources/unity_builtin_extra b/VXMusicDesktop/Overlay/bin/VXMOverlay_Data/Resources/unity_builtin_extra index 06a2b4da..689b6b21 100644 Binary files a/VXMusicDesktop/Overlay/bin/VXMOverlay_Data/Resources/unity_builtin_extra and b/VXMusicDesktop/Overlay/bin/VXMOverlay_Data/Resources/unity_builtin_extra differ diff --git a/VXMusicDesktop/Overlay/bin/VXMOverlay_Data/globalgamemanagers b/VXMusicDesktop/Overlay/bin/VXMOverlay_Data/globalgamemanagers index 22fc64a2..fb9b2826 100644 Binary files a/VXMusicDesktop/Overlay/bin/VXMOverlay_Data/globalgamemanagers and b/VXMusicDesktop/Overlay/bin/VXMOverlay_Data/globalgamemanagers differ diff --git a/VXMusicDesktop/Overlay/bin/VXMOverlay_Data/globalgamemanagers.assets b/VXMusicDesktop/Overlay/bin/VXMOverlay_Data/globalgamemanagers.assets index e3b15240..d2129fca 100644 Binary files a/VXMusicDesktop/Overlay/bin/VXMOverlay_Data/globalgamemanagers.assets and b/VXMusicDesktop/Overlay/bin/VXMOverlay_Data/globalgamemanagers.assets differ diff --git a/VXMusicDesktop/Overlay/bin/VXMOverlay_Data/sharedassets0.assets b/VXMusicDesktop/Overlay/bin/VXMOverlay_Data/sharedassets0.assets index ca903f76..56d257e0 100644 Binary files a/VXMusicDesktop/Overlay/bin/VXMOverlay_Data/sharedassets0.assets and b/VXMusicDesktop/Overlay/bin/VXMOverlay_Data/sharedassets0.assets differ diff --git a/VXMusicOverlay/Assets/XR/XRGeneralSettingsPerBuildTarget.asset b/VXMusicOverlay/Assets/XR/XRGeneralSettingsPerBuildTarget.asset index aefb6f92..3347f7e9 100644 --- a/VXMusicOverlay/Assets/XR/XRGeneralSettingsPerBuildTarget.asset +++ b/VXMusicOverlay/Assets/XR/XRGeneralSettingsPerBuildTarget.asset @@ -13,7 +13,7 @@ MonoBehaviour: m_Name: Standalone Settings m_EditorClassIdentifier: m_LoaderManagerInstance: {fileID: -6875632332844132025} - m_InitManagerOnStart: 1 + m_InitManagerOnStart: 0 --- !u!114 &-6875632332844132025 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/VXMusicOverlay/Library/ArtifactDB b/VXMusicOverlay/Library/ArtifactDB index ef6cdc4b..1d8964f0 100644 Binary files a/VXMusicOverlay/Library/ArtifactDB and b/VXMusicOverlay/Library/ArtifactDB differ diff --git a/VXMusicOverlay/Library/LastBuild.buildreport b/VXMusicOverlay/Library/LastBuild.buildreport index 6b1ceb0f..3dfcf71b 100644 Binary files a/VXMusicOverlay/Library/LastBuild.buildreport and b/VXMusicOverlay/Library/LastBuild.buildreport differ diff --git a/VXMusicOverlay/Library/PlayerDataCache/Win64/Data/Managed/Assembly-CSharp-firstpass.dll b/VXMusicOverlay/Library/PlayerDataCache/Win64/Data/Managed/Assembly-CSharp-firstpass.dll index 67d72da9..5ace3d2f 100644 Binary files a/VXMusicOverlay/Library/PlayerDataCache/Win64/Data/Managed/Assembly-CSharp-firstpass.dll and b/VXMusicOverlay/Library/PlayerDataCache/Win64/Data/Managed/Assembly-CSharp-firstpass.dll differ diff --git a/VXMusicOverlay/Library/PlayerDataCache/Win64/Data/Resources/unity_builtin_extra b/VXMusicOverlay/Library/PlayerDataCache/Win64/Data/Resources/unity_builtin_extra index 06a2b4da..689b6b21 100644 Binary files a/VXMusicOverlay/Library/PlayerDataCache/Win64/Data/Resources/unity_builtin_extra and b/VXMusicOverlay/Library/PlayerDataCache/Win64/Data/Resources/unity_builtin_extra differ diff --git a/VXMusicOverlay/Library/PlayerDataCache/Win64/Data/globalgamemanagers b/VXMusicOverlay/Library/PlayerDataCache/Win64/Data/globalgamemanagers index 22fc64a2..fb9b2826 100644 Binary files a/VXMusicOverlay/Library/PlayerDataCache/Win64/Data/globalgamemanagers and b/VXMusicOverlay/Library/PlayerDataCache/Win64/Data/globalgamemanagers differ diff --git a/VXMusicOverlay/Library/PlayerDataCache/Win64/Data/globalgamemanagers.assets b/VXMusicOverlay/Library/PlayerDataCache/Win64/Data/globalgamemanagers.assets index e3b15240..d2129fca 100644 Binary files a/VXMusicOverlay/Library/PlayerDataCache/Win64/Data/globalgamemanagers.assets and b/VXMusicOverlay/Library/PlayerDataCache/Win64/Data/globalgamemanagers.assets differ diff --git a/VXMusicOverlay/Library/PlayerDataCache/Win64/Data/sharedassets0.assets b/VXMusicOverlay/Library/PlayerDataCache/Win64/Data/sharedassets0.assets index ca903f76..56d257e0 100644 Binary files a/VXMusicOverlay/Library/PlayerDataCache/Win64/Data/sharedassets0.assets and b/VXMusicOverlay/Library/PlayerDataCache/Win64/Data/sharedassets0.assets differ diff --git a/VXMusicOverlay/Library/PlayerDataCache/Win64/ScriptsOnlyCache.yaml b/VXMusicOverlay/Library/PlayerDataCache/Win64/ScriptsOnlyCache.yaml index 21da08fb..17e03373 100644 --- a/VXMusicOverlay/Library/PlayerDataCache/Win64/ScriptsOnlyCache.yaml +++ b/VXMusicOverlay/Library/PlayerDataCache/Win64/ScriptsOnlyCache.yaml @@ -11,6 +11,8 @@ ScriptsOnlyBuild: - Valve.VR.VXMusicInterface Unity.2D.Tilemap.Editor.dll: - UnityEditor.Tilemaps.GridPaintingState + - UnityEditor.Tilemaps.GridPaletteBrushes + - UnityEditor.Tilemaps.GridPalettes - UnityEditor.Tilemaps.SceneViewGridManager - UnityEditor.Tilemaps.SceneViewOpenTilePaletteHelper - UnityEditor.Tilemaps.TileDragAndDropManager @@ -20,6 +22,8 @@ ScriptsOnlyBuild: Unity.Rider.Editor.dll: - Packages.Rider.Editor.RiderScriptEditorData - Packages.Rider.Editor.UnitTesting.CallbackData + Unity.Timeline.Editor.dll: + - TimelineProjectSettings Unity.XR.Management.Editor.dll: - UnityEditor.XR.Management.XRGeneralSettingsPerBuildTarget Unity.XR.Management.dll: diff --git a/VXMusicOverlay/Library/SceneVisibilityState.asset b/VXMusicOverlay/Library/SceneVisibilityState.asset index a29b6daf..16a57347 100644 Binary files a/VXMusicOverlay/Library/SceneVisibilityState.asset and b/VXMusicOverlay/Library/SceneVisibilityState.asset differ diff --git a/VXMusicOverlay/Library/ShaderCache/EditorEncounteredVariants b/VXMusicOverlay/Library/ShaderCache/EditorEncounteredVariants index 46417b6c..6302c707 100644 Binary files a/VXMusicOverlay/Library/ShaderCache/EditorEncounteredVariants and b/VXMusicOverlay/Library/ShaderCache/EditorEncounteredVariants differ diff --git a/VXMusicOverlay/Library/SourceAssetDB b/VXMusicOverlay/Library/SourceAssetDB index 183d0aa6..5d175244 100644 Binary files a/VXMusicOverlay/Library/SourceAssetDB and b/VXMusicOverlay/Library/SourceAssetDB differ diff --git a/VXMusicOverlay/ProjectSettings/GraphicsSettings.asset b/VXMusicOverlay/ProjectSettings/GraphicsSettings.asset index 18fcd0f5..4af36959 100644 --- a/VXMusicOverlay/ProjectSettings/GraphicsSettings.asset +++ b/VXMusicOverlay/ProjectSettings/GraphicsSettings.asset @@ -3,7 +3,7 @@ --- !u!30 &1 GraphicsSettings: m_ObjectHideFlags: 0 - serializedVersion: 12 + serializedVersion: 13 m_Deferred: m_Mode: 1 m_Shader: {fileID: 69, guid: 0000000000000000f000000000000000, type: 0} @@ -28,6 +28,7 @@ GraphicsSettings: m_LensFlare: m_Mode: 1 m_Shader: {fileID: 102, guid: 0000000000000000f000000000000000, type: 0} + m_VideoShadersIncludeMode: 2 m_AlwaysIncludedShaders: [] m_PreloadedShaders: [] m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000, @@ -37,7 +38,58 @@ GraphicsSettings: m_TransparencySortAxis: {x: 0, y: 0, z: 1} m_DefaultRenderingPath: 1 m_DefaultMobileRenderingPath: 1 - m_TierSettings: [] + m_TierSettings: + - serializedVersion: 5 + m_BuildTarget: 1 + m_Tier: 0 + m_Settings: + standardShaderQuality: 0 + renderingPath: 1 + hdrMode: 1 + realtimeGICPUUsage: 25 + useReflectionProbeBoxProjection: 0 + useReflectionProbeBlending: 0 + useHDR: 0 + useDetailNormalMap: 0 + useCascadedShadowMaps: 0 + prefer32BitShadowMaps: 0 + enableLPPV: 0 + useDitherMaskForAlphaBlendedShadows: 0 + m_Automatic: 0 + - serializedVersion: 5 + m_BuildTarget: 1 + m_Tier: 1 + m_Settings: + standardShaderQuality: 0 + renderingPath: 1 + hdrMode: 1 + realtimeGICPUUsage: 25 + useReflectionProbeBoxProjection: 0 + useReflectionProbeBlending: 0 + useHDR: 0 + useDetailNormalMap: 0 + useCascadedShadowMaps: 0 + prefer32BitShadowMaps: 0 + enableLPPV: 0 + useDitherMaskForAlphaBlendedShadows: 0 + m_Automatic: 0 + - serializedVersion: 5 + m_BuildTarget: 1 + m_Tier: 2 + m_Settings: + standardShaderQuality: 0 + renderingPath: 1 + hdrMode: 1 + realtimeGICPUUsage: 50 + useReflectionProbeBoxProjection: 0 + useReflectionProbeBlending: 0 + useHDR: 0 + useDetailNormalMap: 0 + useCascadedShadowMaps: 0 + prefer32BitShadowMaps: 0 + enableLPPV: 0 + useDitherMaskForAlphaBlendedShadows: 0 + m_Automatic: 0 m_LightmapStripping: 0 m_FogStripping: 0 m_InstancingStripping: 0 @@ -53,3 +105,5 @@ GraphicsSettings: m_AlbedoSwatchInfos: [] m_LightsUseLinearIntensity: 0 m_LightsUseColorTemperature: 0 + m_DefaultRenderingLayerMask: 1 + m_LogWhenShaderIsCompiled: 0 diff --git a/VXMusicOverlay/ProjectSettings/ProjectSettings.asset b/VXMusicOverlay/ProjectSettings/ProjectSettings.asset index 96da95ca..be3a86b6 100644 --- a/VXMusicOverlay/ProjectSettings/ProjectSettings.asset +++ b/VXMusicOverlay/ProjectSettings/ProjectSettings.asset @@ -75,7 +75,7 @@ PlayerSettings: androidMinimumWindowHeight: 300 androidFullscreenMode: 1 defaultIsNativeResolution: 0 - macRetinaSupport: 1 + macRetinaSupport: 0 runInBackground: 1 captureSingleScreen: 0 muteOtherAudioSources: 0 @@ -324,7 +324,7 @@ PlayerSettings: tvOS: 1 m_BuildTargetGroupLightmapEncodingQuality: - m_BuildTarget: Standalone - m_EncodingQuality: 2 + m_EncodingQuality: 0 m_BuildTargetGroupLightmapSettings: [] m_BuildTargetNormalMapEncoding: [] playModeTestRunnerEnabled: 0 diff --git a/VXMusicOverlay/ProjectSettings/QualitySettings.asset b/VXMusicOverlay/ProjectSettings/QualitySettings.asset index 05daac3c..565bd87b 100644 --- a/VXMusicOverlay/ProjectSettings/QualitySettings.asset +++ b/VXMusicOverlay/ProjectSettings/QualitySettings.asset @@ -18,7 +18,7 @@ QualitySettings: shadowCascade2Split: 0.33333334 shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} shadowmaskMode: 0 - blendWeights: 1 + skinWeights: 1 textureQuality: 1 anisotropicTextures: 0 antiAliasing: 0 @@ -29,10 +29,18 @@ QualitySettings: vSyncCount: 0 lodBias: 0.3 maximumLODLevel: 0 + streamingMipmapsActive: 0 + streamingMipmapsAddAllCameras: 1 + streamingMipmapsMemoryBudget: 512 + streamingMipmapsRenderersPerFrame: 512 + streamingMipmapsMaxLevelReduction: 2 + streamingMipmapsMaxFileIORequests: 1024 particleRaycastBudget: 4 asyncUploadTimeSlice: 2 asyncUploadBufferSize: 4 + asyncUploadPersistentBuffer: 1 resolutionScalingFixedDPIFactor: 1 + customRenderPipeline: {fileID: 0} excludedTargetPlatforms: [] - serializedVersion: 2 name: Low @@ -46,7 +54,7 @@ QualitySettings: shadowCascade2Split: 0.33333334 shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} shadowmaskMode: 0 - blendWeights: 2 + skinWeights: 2 textureQuality: 0 anisotropicTextures: 0 antiAliasing: 0 @@ -57,10 +65,18 @@ QualitySettings: vSyncCount: 0 lodBias: 0.4 maximumLODLevel: 0 + streamingMipmapsActive: 0 + streamingMipmapsAddAllCameras: 1 + streamingMipmapsMemoryBudget: 512 + streamingMipmapsRenderersPerFrame: 512 + streamingMipmapsMaxLevelReduction: 2 + streamingMipmapsMaxFileIORequests: 1024 particleRaycastBudget: 16 asyncUploadTimeSlice: 2 asyncUploadBufferSize: 4 + asyncUploadPersistentBuffer: 1 resolutionScalingFixedDPIFactor: 1 + customRenderPipeline: {fileID: 0} excludedTargetPlatforms: [] - serializedVersion: 2 name: Medium @@ -74,7 +90,7 @@ QualitySettings: shadowCascade2Split: 0.33333334 shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} shadowmaskMode: 0 - blendWeights: 2 + skinWeights: 2 textureQuality: 0 anisotropicTextures: 1 antiAliasing: 0 @@ -85,10 +101,18 @@ QualitySettings: vSyncCount: 1 lodBias: 0.7 maximumLODLevel: 0 + streamingMipmapsActive: 0 + streamingMipmapsAddAllCameras: 1 + streamingMipmapsMemoryBudget: 512 + streamingMipmapsRenderersPerFrame: 512 + streamingMipmapsMaxLevelReduction: 2 + streamingMipmapsMaxFileIORequests: 1024 particleRaycastBudget: 64 asyncUploadTimeSlice: 2 asyncUploadBufferSize: 4 + asyncUploadPersistentBuffer: 1 resolutionScalingFixedDPIFactor: 1 + customRenderPipeline: {fileID: 0} excludedTargetPlatforms: [] - serializedVersion: 2 name: High @@ -102,7 +126,7 @@ QualitySettings: shadowCascade2Split: 0.33333334 shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} shadowmaskMode: 1 - blendWeights: 2 + skinWeights: 2 textureQuality: 0 anisotropicTextures: 1 antiAliasing: 0 @@ -113,10 +137,18 @@ QualitySettings: vSyncCount: 1 lodBias: 1 maximumLODLevel: 0 + streamingMipmapsActive: 0 + streamingMipmapsAddAllCameras: 1 + streamingMipmapsMemoryBudget: 512 + streamingMipmapsRenderersPerFrame: 512 + streamingMipmapsMaxLevelReduction: 2 + streamingMipmapsMaxFileIORequests: 1024 particleRaycastBudget: 256 asyncUploadTimeSlice: 2 asyncUploadBufferSize: 4 + asyncUploadPersistentBuffer: 1 resolutionScalingFixedDPIFactor: 1 + customRenderPipeline: {fileID: 0} excludedTargetPlatforms: [] - serializedVersion: 2 name: Very High @@ -130,7 +162,7 @@ QualitySettings: shadowCascade2Split: 0.33333334 shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} shadowmaskMode: 1 - blendWeights: 4 + skinWeights: 4 textureQuality: 0 anisotropicTextures: 2 antiAliasing: 2 @@ -141,38 +173,54 @@ QualitySettings: vSyncCount: 1 lodBias: 1.5 maximumLODLevel: 0 + streamingMipmapsActive: 0 + streamingMipmapsAddAllCameras: 1 + streamingMipmapsMemoryBudget: 512 + streamingMipmapsRenderersPerFrame: 512 + streamingMipmapsMaxLevelReduction: 2 + streamingMipmapsMaxFileIORequests: 1024 particleRaycastBudget: 1024 asyncUploadTimeSlice: 2 asyncUploadBufferSize: 4 + asyncUploadPersistentBuffer: 1 resolutionScalingFixedDPIFactor: 1 + customRenderPipeline: {fileID: 0} excludedTargetPlatforms: [] - serializedVersion: 2 name: Ultra pixelLightCount: 4 - shadows: 2 - shadowResolution: 2 + shadows: 0 + shadowResolution: 0 shadowProjection: 1 shadowCascades: 4 - shadowDistance: 150 + shadowDistance: 10 shadowNearPlaneOffset: 3 shadowCascade2Split: 0.33333334 shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} shadowmaskMode: 1 - blendWeights: 4 - textureQuality: 0 - anisotropicTextures: 2 - antiAliasing: 2 + skinWeights: 4 + textureQuality: 2 + anisotropicTextures: 0 + antiAliasing: 0 softParticles: 1 softVegetation: 1 realtimeReflectionProbes: 1 billboardsFaceCameraPosition: 1 - vSyncCount: 1 - lodBias: 2 + vSyncCount: 0 + lodBias: 1 maximumLODLevel: 0 - particleRaycastBudget: 4096 + streamingMipmapsActive: 0 + streamingMipmapsAddAllCameras: 1 + streamingMipmapsMemoryBudget: 512 + streamingMipmapsRenderersPerFrame: 512 + streamingMipmapsMaxLevelReduction: 2 + streamingMipmapsMaxFileIORequests: 1024 + particleRaycastBudget: 256 asyncUploadTimeSlice: 2 asyncUploadBufferSize: 4 + asyncUploadPersistentBuffer: 1 resolutionScalingFixedDPIFactor: 1 + customRenderPipeline: {fileID: 0} excludedTargetPlatforms: [] m_PerPlatformDefaultQuality: Android: 2 diff --git a/VXMusicOverlay/ProjectSettings/TimelineSettings.asset b/VXMusicOverlay/ProjectSettings/TimelineSettings.asset index b4fbdb09..bac48abf 100644 --- a/VXMusicOverlay/ProjectSettings/TimelineSettings.asset +++ b/VXMusicOverlay/ProjectSettings/TimelineSettings.asset @@ -12,4 +12,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a287be6c49135cd4f9b2b8666c39d999, type: 3} m_Name: m_EditorClassIdentifier: - assetDefaultFramerate: 60 + assetDefaultFramerate: 24