diff --git a/Packages/manifest.json b/Packages/manifest.json index 78f7ab1b..d3cc93b3 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -8,6 +8,7 @@ "com.unity.inputsystem": "1.14.2", "com.unity.multiplayer.center": "1.0.0", "com.unity.nuget.newtonsoft-json": "3.2.1", + "com.unity.recorder": "5.1.3", "com.unity.render-pipelines.universal": "17.2.0", "com.unity.test-framework": "1.6.0", "com.unity.timeline": "1.8.9", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index f3b6ebe0..3378be4c 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -15,6 +15,15 @@ }, "url": "https://packages.unity.com" }, + "com.unity.bindings.openimageio": { + "version": "1.0.0", + "depth": 1, + "source": "registry", + "dependencies": { + "com.unity.collections": "1.0.0" + }, + "url": "https://packages.unity.com" + }, "com.unity.burst": { "version": "1.8.25", "depth": 2, @@ -34,7 +43,7 @@ }, "com.unity.collections": { "version": "2.5.7", - "depth": 2, + "depth": 1, "source": "registry", "dependencies": { "com.unity.burst": "1.8.19", @@ -95,7 +104,7 @@ }, "com.unity.nuget.mono-cecil": { "version": "1.11.5", - "depth": 3, + "depth": 2, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" @@ -107,6 +116,17 @@ "dependencies": {}, "url": "https://packages.unity.com" }, + "com.unity.recorder": { + "version": "5.1.3", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.timeline": "1.8.7", + "com.unity.collections": "1.2.4", + "com.unity.bindings.openimageio": "1.0.0" + }, + "url": "https://packages.unity.com" + }, "com.unity.render-pipelines.core": { "version": "17.2.0", "depth": 1, @@ -194,7 +214,7 @@ }, "com.unity.test-framework.performance": { "version": "3.2.0", - "depth": 3, + "depth": 2, "source": "registry", "dependencies": { "com.unity.test-framework": "1.1.33", diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index 197106ed..1e68b901 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -11,6 +11,9 @@ EditorBuildSettings: - enabled: 1 path: Assets/_/Levels/TitleScreen.unity guid: 6743833d09976436f9d12e6a44d2dc70 + - enabled: 1 + path: Assets/_/Levels/MARKETING.unity + guid: 12365dde14cc143f28f571566ebddf91 m_configObjects: com.unity.input.settings.actions: {fileID: -944628639613478452, guid: 052faaac586de48259a63d0c4782560b, type: 3} m_UseUCBPForAssetBundles: 0 diff --git a/ProjectSettings/EditorSettings.asset b/ProjectSettings/EditorSettings.asset index d85f86bc..878c4cb8 100644 --- a/ProjectSettings/EditorSettings.asset +++ b/ProjectSettings/EditorSettings.asset @@ -3,7 +3,7 @@ --- !u!159 &1 EditorSettings: m_ObjectHideFlags: 0 - serializedVersion: 13 + serializedVersion: 15 m_SerializationMode: 2 m_LineEndingsForNewScripts: 0 m_DefaultBehaviorMode: 0 @@ -33,6 +33,7 @@ EditorSettings: m_UseLegacyProbeSampleCount: 0 m_SerializeInlineMappingsOnOneLine: 1 m_DisableCookiesInLightmapper: 0 + m_ShadowmaskStitching: 0 m_AssetPipelineMode: 1 m_RefreshImportMode: 0 m_CacheServerMode: 0 @@ -46,3 +47,4 @@ EditorSettings: m_CacheServerDownloadBatchSize: 128 m_EnableEnlightenBakedGI: 0 m_ReferencedClipsExactNaming: 1 + m_ForceAssetUnloadAndGCOnSceneLoad: 1