diff --git a/EntitiesSamples/.vsconfig b/EntitiesSamples/.vsconfig new file mode 100644 index 000000000..f019fd0ad --- /dev/null +++ b/EntitiesSamples/.vsconfig @@ -0,0 +1,6 @@ +{ + "version": "1.0", + "components": [ + "Microsoft.VisualStudio.Workload.ManagedGame" + ] +} diff --git a/EntitiesSamples/Assets/Settings/URP-HighFidelity-Renderer.asset b/EntitiesSamples/Assets/Settings/URP-HighFidelity-Renderer.asset index 986dc81ff..48612441a 100644 --- a/EntitiesSamples/Assets/Settings/URP-HighFidelity-Renderer.asset +++ b/EntitiesSamples/Assets/Settings/URP-HighFidelity-Renderer.asset @@ -73,6 +73,8 @@ MonoBehaviour: type: 3} objectMotionVector: {fileID: 4800000, guid: 7b3ede40266cd49a395def176e1bc486, type: 3} + dataDrivenLensFlare: {fileID: 4800000, guid: 6cda457ac28612740adb23da5d39ea92, + type: 3} m_AssetVersion: 2 m_OpaqueLayerMask: serializedVersion: 2 diff --git a/EntitiesSamples/Packages/manifest.json b/EntitiesSamples/Packages/manifest.json index 6fa90ac55..cebbf7cce 100644 --- a/EntitiesSamples/Packages/manifest.json +++ b/EntitiesSamples/Packages/manifest.json @@ -8,6 +8,7 @@ "com.unity.ide.vscode": "1.2.5", "com.unity.render-pipelines.universal": "14.0.10", "com.unity.textmeshpro": "3.0.6", + "com.unity.toolchain.win-x86_64-linux-x86_64": "2.0.6", "com.unity.ugui": "1.0.0", "com.unity.visualscripting": "1.9.1", "com.unity.modules.ai": "1.0.0", diff --git a/EntitiesSamples/Packages/packages-lock.json b/EntitiesSamples/Packages/packages-lock.json index a3ac04cb9..3e87506eb 100644 --- a/EntitiesSamples/Packages/packages-lock.json +++ b/EntitiesSamples/Packages/packages-lock.json @@ -1,12 +1,11 @@ { "dependencies": { "com.unity.burst": { - "version": "1.8.12", + "version": "1.8.8", "depth": 1, "source": "registry", "dependencies": { - "com.unity.mathematics": "1.2.1", - "com.unity.modules.jsonserialize": "1.0.0" + "com.unity.mathematics": "1.2.1" }, "url": "https://packages.unity.com" }, @@ -76,13 +75,13 @@ "depth": 0, "source": "builtin", "dependencies": { - "com.unity.ide.visualstudio": "2.0.22", - "com.unity.ide.rider": "3.0.27", + "com.unity.ide.visualstudio": "2.0.18", + "com.unity.ide.rider": "3.0.24", "com.unity.ide.vscode": "1.2.5", "com.unity.editorcoroutines": "1.0.0", "com.unity.performance.profile-analyzer": "1.2.2", "com.unity.test-framework": "1.1.33", - "com.unity.testtools.codecoverage": "1.2.5" + "com.unity.testtools.codecoverage": "1.2.4" } }, "com.unity.ide.rider": { @@ -139,7 +138,7 @@ "url": "https://packages.unity.com" }, "com.unity.render-pipelines.core": { - "version": "14.0.10", + "version": "14.0.8", "depth": 1, "source": "builtin", "dependencies": { @@ -155,22 +154,13 @@ "source": "builtin", "dependencies": { "com.unity.mathematics": "1.2.1", - "com.unity.burst": "1.8.9", - "com.unity.render-pipelines.core": "14.0.10", - "com.unity.shadergraph": "14.0.10", - "com.unity.render-pipelines.universal-config": "14.0.9" - } - }, - "com.unity.render-pipelines.universal-config": { - "version": "14.0.9", - "depth": 1, - "source": "builtin", - "dependencies": { - "com.unity.render-pipelines.core": "14.0.9" + "com.unity.burst": "1.8.4", + "com.unity.render-pipelines.core": "14.0.8", + "com.unity.shadergraph": "14.0.8" } }, "com.unity.scriptablebuildpipeline": { - "version": "1.21.21", + "version": "1.21.9", "depth": 2, "source": "registry", "dependencies": {}, @@ -201,14 +191,30 @@ "url": "https://packages.unity.com" }, "com.unity.shadergraph": { - "version": "14.0.10", + "version": "14.0.8", "depth": 1, "source": "builtin", "dependencies": { - "com.unity.render-pipelines.core": "14.0.10", + "com.unity.render-pipelines.core": "14.0.8", "com.unity.searcher": "4.9.2" } }, + "com.unity.sysroot": { + "version": "2.0.7", + "depth": 1, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, + "com.unity.sysroot.linux-x86_64": { + "version": "2.0.6", + "depth": 1, + "source": "registry", + "dependencies": { + "com.unity.sysroot": "2.0.7" + }, + "url": "https://packages.unity.com" + }, "com.unity.test-framework": { "version": "1.1.33", "depth": 1, @@ -221,7 +227,7 @@ "url": "https://packages.unity.com" }, "com.unity.testtools.codecoverage": { - "version": "1.2.5", + "version": "1.2.4", "depth": 1, "source": "registry", "dependencies": { @@ -239,6 +245,16 @@ }, "url": "https://packages.unity.com" }, + "com.unity.toolchain.win-x86_64-linux-x86_64": { + "version": "2.0.6", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.sysroot": "2.0.7", + "com.unity.sysroot.linux-x86_64": "2.0.6" + }, + "url": "https://packages.unity.com" + }, "com.unity.ugui": { "version": "1.0.0", "depth": 0, diff --git a/EntitiesSamples/ProjectSettings/ProjectVersion.txt b/EntitiesSamples/ProjectSettings/ProjectVersion.txt index 224decfe3..88bb9cf99 100644 --- a/EntitiesSamples/ProjectSettings/ProjectVersion.txt +++ b/EntitiesSamples/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2022.3.20f1 -m_EditorVersionWithRevision: 2022.3.20f1 (61c2feb0970d) +m_EditorVersion: 2022.3.10f1 +m_EditorVersionWithRevision: 2022.3.10f1 (ff3792e53c62) diff --git a/GraphicsSamples/URPSamples/Assets/URPSettings/UniversalRenderPipelineAsset_Renderer.asset b/GraphicsSamples/URPSamples/Assets/URPSettings/UniversalRenderPipelineAsset_Renderer.asset index a1eeaecb5..b792d009e 100644 --- a/GraphicsSamples/URPSamples/Assets/URPSettings/UniversalRenderPipelineAsset_Renderer.asset +++ b/GraphicsSamples/URPSamples/Assets/URPSettings/UniversalRenderPipelineAsset_Renderer.asset @@ -15,6 +15,7 @@ MonoBehaviour: debugShaders: debugReplacementPS: {fileID: 4800000, guid: cf852408f2e174538bcd9b7fda1c5ae7, type: 3} + hdrDebugViewPS: {fileID: 4800000, guid: 573620ae32aec764abd4d728906d2587, type: 3} m_RendererFeatures: [] m_RendererFeatureMap: m_UseNativeRenderPass: 0 @@ -33,10 +34,13 @@ MonoBehaviour: 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 diff --git a/GraphicsSamples/URPSamples/Packages/manifest.json b/GraphicsSamples/URPSamples/Packages/manifest.json index 7726fba6d..793f1e901 100644 --- a/GraphicsSamples/URPSamples/Packages/manifest.json +++ b/GraphicsSamples/URPSamples/Packages/manifest.json @@ -8,6 +8,7 @@ "com.unity.ide.visualstudio": "2.0.18", "com.unity.probuilder": "5.0.4", "com.unity.render-pipelines.universal": "14.0.7", + "com.unity.toolchain.win-x86_64-linux-x86_64": "2.0.6", "com.unity.ugui": "1.0.0", "com.unity.modules.ai": "1.0.0", "com.unity.modules.androidjni": "1.0.0", diff --git a/GraphicsSamples/URPSamples/ProjectSettings/PackageManagerSettings.asset b/GraphicsSamples/URPSamples/ProjectSettings/PackageManagerSettings.asset index 94a75fbcc..30e96da67 100644 --- a/GraphicsSamples/URPSamples/ProjectSettings/PackageManagerSettings.asset +++ b/GraphicsSamples/URPSamples/ProjectSettings/PackageManagerSettings.asset @@ -16,7 +16,7 @@ MonoBehaviour: m_AdvancedSettingsExpanded: 1 m_ScopedRegistriesSettingsExpanded: 1 m_SeeAllPackageVersions: 0 - m_DismissPreviewPackagesInUse: 0 + m_DismissPreviewPackagesInUse: 1 oneTimeWarningShown: 0 m_Registries: - m_Id: main @@ -31,6 +31,6 @@ MonoBehaviour: m_RegistryInfoDraft: m_Modified: 0 m_ErrorMessage: - m_UserModificationsInstanceId: -834 - m_OriginalInstanceId: -836 + m_UserModificationsInstanceId: -858 + m_OriginalInstanceId: -860 m_LoadAssets: 0 diff --git a/GraphicsSamples/URPSamples/ProjectSettings/ProjectSettings.asset b/GraphicsSamples/URPSamples/ProjectSettings/ProjectSettings.asset index 3bec5d9f3..bfdcb80d7 100644 --- a/GraphicsSamples/URPSamples/ProjectSettings/ProjectSettings.asset +++ b/GraphicsSamples/URPSamples/ProjectSettings/ProjectSettings.asset @@ -3,7 +3,7 @@ --- !u!129 &1 PlayerSettings: m_ObjectHideFlags: 0 - serializedVersion: 24 + serializedVersion: 26 productGUID: 5f41690cb587e42408b914b2430ca466 AndroidProfiler: 0 AndroidFilterTouchesWhenObscured: 0 @@ -52,6 +52,7 @@ PlayerSettings: m_MTRendering: 1 mipStripping: 0 numberOfMipsStripped: 0 + numberOfMipsStrippedPerMipmapLimitGroup: {} m_StackTraceTypes: 010000000100000001000000010000000100000001000000 iosShowActivityIndicatorOnLoading: -1 androidShowActivityIndicatorOnLoading: -1 @@ -85,6 +86,7 @@ PlayerSettings: hideHomeButton: 0 submitAnalytics: 1 usePlayerLog: 1 + dedicatedServerOptimizations: 0 bakeCollisionMeshes: 0 forceSingleInstance: 0 useFlipModelSwapchain: 1 @@ -124,6 +126,7 @@ PlayerSettings: switchNVNMaxPublicTextureIDCount: 0 switchNVNMaxPublicSamplerIDCount: 0 switchNVNGraphicsFirmwareMemory: 32 + switchMaxWorkerMultiple: 8 stadiaPresentMode: 0 stadiaTargetFramerate: 0 vulkanNumSwapchainBuffers: 2 @@ -131,12 +134,7 @@ PlayerSettings: vulkanEnablePreTransform: 0 vulkanEnableLateAcquireNextImage: 0 vulkanEnableCommandBufferRecycling: 1 - m_SupportedAspectRatios: - 4:3: 1 - 5:4: 1 - 16:10: 1 - 16:9: 1 - Others: 1 + loadStoreDebugModeEnabled: 0 bundleVersion: 0.1 preloadedAssets: [] metroInputSource: 0 @@ -148,11 +146,13 @@ PlayerSettings: enable360StereoCapture: 0 isWsaHolographicRemotingEnabled: 0 enableFrameTimingStats: 0 + enableOpenGLProfilerGPURecorders: 1 useHDRDisplay: 0 - D3DHDRBitDepth: 0 + hdrBitDepth: 0 m_ColorGamuts: 00000000 targetPixelDensity: 30 resolutionScalingMode: 0 + resetResolutionOnWindowResize: 0 androidSupportedAspectRatio: 1 androidMaxAspectRatio: 2.1 applicationIdentifier: @@ -163,6 +163,7 @@ PlayerSettings: tvOS: com.DefaultCompany.HybridURPSamples buildNumber: Standalone: 0 + VisionOS: 0 iPhone: 0 tvOS: 0 overrideDefaultApplicationIdentifier: 1 @@ -187,6 +188,8 @@ PlayerSettings: tvOSSdkVersion: 0 tvOSRequireExtendedGameController: 0 tvOSTargetOSVersionString: 12.0 + VisionOSSdkVersion: 0 + VisionOSTargetOSVersionString: 1.0 uIPrerenderedIcon: 0 uIRequiresPersistentWiFi: 0 uIRequiresFullScreen: 1 @@ -234,8 +237,10 @@ PlayerSettings: appleDeveloperTeamID: iOSManualSigningProvisioningProfileID: tvOSManualSigningProvisioningProfileID: + VisionOSManualSigningProvisioningProfileID: iOSManualSigningProvisioningProfileType: 0 tvOSManualSigningProvisioningProfileType: 0 + VisionOSManualSigningProvisioningProfileType: 0 appleEnableAutomaticSigning: 0 iOSRequireARKit: 0 iOSAutomaticallyDetectAndAddCapabilities: 1 @@ -250,6 +255,7 @@ PlayerSettings: useCustomLauncherGradleManifest: 0 useCustomBaseGradleTemplate: 0 useCustomGradlePropertiesTemplate: 0 + useCustomGradleSettingsTemplate: 0 useCustomProguardFile: 0 AndroidTargetArchitectures: 5 AndroidTargetDevices: 0 @@ -257,6 +263,7 @@ PlayerSettings: androidSplashScreen: {fileID: 0} AndroidKeystoreName: '{inproject}: ' AndroidKeyaliasName: + AndroidEnableArmv9SecurityFeatures: 0 AndroidBuildApkPerCpuArchitecture: 0 AndroidTVCompatibility: 0 AndroidIsGame: 1 @@ -270,7 +277,6 @@ PlayerSettings: banner: {fileID: 0} androidGamepadSupportLevel: 0 chromeosInputEmulation: 1 - AndroidMinifyWithR8: 0 AndroidMinifyRelease: 0 AndroidMinifyDebug: 0 AndroidValidateAppBundleSize: 1 @@ -369,10 +375,108 @@ PlayerSettings: m_Height: 36 m_Kind: 1 m_SubKind: + - m_BuildTarget: iPhone + m_Icons: + - m_Textures: [] + m_Width: 180 + m_Height: 180 + m_Kind: 0 + m_SubKind: iPhone + - m_Textures: [] + m_Width: 120 + m_Height: 120 + m_Kind: 0 + m_SubKind: iPhone + - m_Textures: [] + m_Width: 167 + m_Height: 167 + m_Kind: 0 + m_SubKind: iPad + - m_Textures: [] + m_Width: 152 + m_Height: 152 + m_Kind: 0 + m_SubKind: iPad + - m_Textures: [] + m_Width: 76 + m_Height: 76 + m_Kind: 0 + m_SubKind: iPad + - m_Textures: [] + m_Width: 120 + m_Height: 120 + m_Kind: 3 + m_SubKind: iPhone + - m_Textures: [] + m_Width: 80 + m_Height: 80 + m_Kind: 3 + m_SubKind: iPhone + - m_Textures: [] + m_Width: 80 + m_Height: 80 + m_Kind: 3 + m_SubKind: iPad + - m_Textures: [] + m_Width: 40 + m_Height: 40 + m_Kind: 3 + m_SubKind: iPad + - m_Textures: [] + m_Width: 87 + m_Height: 87 + m_Kind: 1 + m_SubKind: iPhone + - m_Textures: [] + m_Width: 58 + m_Height: 58 + m_Kind: 1 + m_SubKind: iPhone + - m_Textures: [] + m_Width: 29 + m_Height: 29 + m_Kind: 1 + m_SubKind: iPhone + - m_Textures: [] + m_Width: 58 + m_Height: 58 + m_Kind: 1 + m_SubKind: iPad + - m_Textures: [] + m_Width: 29 + m_Height: 29 + m_Kind: 1 + m_SubKind: iPad + - m_Textures: [] + m_Width: 60 + m_Height: 60 + m_Kind: 2 + m_SubKind: iPhone + - m_Textures: [] + m_Width: 40 + m_Height: 40 + m_Kind: 2 + m_SubKind: iPhone + - m_Textures: [] + m_Width: 40 + m_Height: 40 + m_Kind: 2 + m_SubKind: iPad + - m_Textures: [] + m_Width: 20 + m_Height: 20 + m_Kind: 2 + m_SubKind: iPad + - m_Textures: [] + m_Width: 1024 + m_Height: 1024 + m_Kind: 4 + m_SubKind: App Store m_BuildTargetBatching: - m_BuildTarget: Standalone m_StaticBatching: 0 m_DynamicBatching: 0 + m_BuildTargetShaderSettings: [] m_BuildTargetGraphicsJobs: - m_BuildTarget: MacStandaloneSupport m_GraphicsJobs: 1 @@ -422,6 +526,8 @@ PlayerSettings: m_APIs: 15000000 m_Automatic: 0 m_BuildTargetVRSettings: [] + m_DefaultShaderChunkSizeInMB: 16 + m_DefaultShaderChunkCount: 0 openGLRequireES31: 0 openGLRequireES31AEP: 0 openGLRequireES32: 0 @@ -449,6 +555,7 @@ PlayerSettings: - m_BuildTarget: Windows Store Apps m_EncodingQuality: 2 m_BuildTargetGroupLightmapSettings: [] + m_BuildTargetGroupLoadStoreDebugModeSettings: [] m_BuildTargetNormalMapEncoding: [] m_BuildTargetDefaultTextureCompressionFormat: [] playModeTestRunnerEnabled: 0 @@ -469,6 +576,7 @@ PlayerSettings: switchSocketConcurrencyLimit: 14 switchScreenResolutionBehavior: 2 switchUseCPUProfiler: 0 + switchEnableFileSystemTrace: 0 switchUseGOLDLinker: 0 switchLTOSetting: 0 switchApplicationID: 0x01004b9000490000 @@ -547,7 +655,6 @@ PlayerSettings: switchReleaseVersion: 0 switchDisplayVersion: 1.0.0 switchStartupUserAccount: 0 - switchTouchScreenUsage: 0 switchSupportedLanguagesMask: 0 switchLogoType: 0 switchApplicationErrorCodeCategory: @@ -589,6 +696,7 @@ PlayerSettings: switchNativeFsCacheSize: 32 switchIsHoldTypeHorizontal: 0 switchSupportedNpadCount: 8 + switchEnableTouchScreen: 1 switchSocketConfigEnabled: 0 switchTcpInitialSendBufferSize: 32 switchTcpInitialReceiveBufferSize: 64 @@ -601,6 +709,7 @@ PlayerSettings: switchNetworkInterfaceManagerInitializeEnabled: 1 switchPlayerConnectionEnabled: 1 switchUseNewStyleFilepaths: 0 + switchUseLegacyFmodPriorities: 0 switchUseMicroSleepForYield: 1 switchEnableRamDiskSupport: 0 switchMicroSleepForYieldTime: 25 @@ -688,6 +797,7 @@ PlayerSettings: webGLMemorySize: 16 webGLExceptionSupport: 1 webGLNameFilesAsHashes: 0 + webGLShowDiagnostics: 0 webGLDataCaching: 1 webGLDebugSymbols: 0 webGLEmscriptenArgs: @@ -706,6 +816,7 @@ PlayerSettings: webGLMemoryLinearGrowthStep: 16 webGLMemoryGeometricGrowthStep: 0.2 webGLMemoryGeometricGrowthCap: 96 + webGLPowerPreference: 2 scriptingDefineSymbols: : UNITY_POST_PROCESSING_STACK_V2;ENABLE_TRANSFORM_V1 Android: ENABLE_HYBRID_RENDERER_V2;ENABLE_COMPUTE_DEFORMATIONS;ENABLE_TRANSFORM_V1 @@ -735,11 +846,9 @@ PlayerSettings: suppressCommonWarnings: 1 allowUnsafeCode: 1 useDeterministicCompilation: 1 - enableRoslynAnalyzers: 1 additionalIl2CppArgs: scriptingRuntimeVersion: 1 gcIncremental: 0 - assemblyVersionValidation: 1 gcWBarrierValidation: 0 apiCompatibilityLevelPerPlatform: {} m_RenderingPath: 1 @@ -771,6 +880,7 @@ PlayerSettings: metroFTAName: metroFTAFileTypes: [] metroProtocolName: + vcxProjDefaultLanguage: XboxOneProductId: XboxOneUpdateKey: XboxOneSandboxId: @@ -812,8 +922,14 @@ PlayerSettings: luminVersion: m_VersionCode: 1 m_VersionName: + hmiPlayerDataPath: + hmiForceSRGBBlit: 1 + embeddedLinuxEnableGamepadInput: 1 + hmiLogStartupTiming: 0 + hmiCpuConfiguration: apiCompatibilityLevel: 6 activeInputHandler: 0 + windowsGamepadBackendHint: 0 cloudProjectId: framebufferDepthMemorylessMode: 0 qualitySettingsNames: [] @@ -821,7 +937,7 @@ PlayerSettings: organizationId: cloudEnabled: 0 legacyClampBlendShapeWeights: 0 - playerDataPath: - forceSRGBBlit: 1 + hmiLoadingImage: {fileID: 0} + platformRequiresReadableAssets: 0 virtualTexturingSupportEnabled: 0 insecureHttpOption: 0 diff --git a/GraphicsSamples/URPSamples/ProjectSettings/ProjectVersion.txt b/GraphicsSamples/URPSamples/ProjectSettings/ProjectVersion.txt index 56ddb83a4..88bb9cf99 100644 --- a/GraphicsSamples/URPSamples/ProjectSettings/ProjectVersion.txt +++ b/GraphicsSamples/URPSamples/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2022.3.0f1 -m_EditorVersionWithRevision: 2022.3.0f1 (fb119bb0b476) +m_EditorVersion: 2022.3.10f1 +m_EditorVersionWithRevision: 2022.3.10f1 (ff3792e53c62) diff --git a/PhysicsSamples/.vsconfig b/PhysicsSamples/.vsconfig new file mode 100644 index 000000000..d70cd98b7 --- /dev/null +++ b/PhysicsSamples/.vsconfig @@ -0,0 +1,6 @@ +{ + "version": "1.0", + "components": [ + "Microsoft.VisualStudio.Workload.ManagedGame" + ] +} diff --git a/PhysicsSamples/Assets/Common/UniversalRenderPipelineAsset_Renderer.asset b/PhysicsSamples/Assets/Common/UniversalRenderPipelineAsset_Renderer.asset index cacebdc3c..a15171ff6 100644 --- a/PhysicsSamples/Assets/Common/UniversalRenderPipelineAsset_Renderer.asset +++ b/PhysicsSamples/Assets/Common/UniversalRenderPipelineAsset_Renderer.asset @@ -38,6 +38,8 @@ MonoBehaviour: type: 3} objectMotionVector: {fileID: 4800000, guid: 7b3ede40266cd49a395def176e1bc486, type: 3} + dataDrivenLensFlare: {fileID: 4800000, guid: 6cda457ac28612740adb23da5d39ea92, + type: 3} m_AssetVersion: 2 m_OpaqueLayerMask: serializedVersion: 2 diff --git a/PhysicsSamples/Packages/manifest.json b/PhysicsSamples/Packages/manifest.json index cf84fdf4e..a36af19a6 100644 --- a/PhysicsSamples/Packages/manifest.json +++ b/PhysicsSamples/Packages/manifest.json @@ -10,6 +10,7 @@ "com.unity.performance.profile-analyzer": "1.1.1", "com.unity.physics": "1.0.10", "com.unity.render-pipelines.universal": "14.0.7", + "com.unity.toolchain.win-x86_64-linux-x86_64": "2.0.6", "com.unity.ugui": "1.0.0", "com.unity.modules.ai": "1.0.0", "com.unity.modules.androidjni": "1.0.0", diff --git a/PhysicsSamples/ProjectSettings/EditorBuildSettings.asset b/PhysicsSamples/ProjectSettings/EditorBuildSettings.asset index c0ab315c5..876b4485e 100644 --- a/PhysicsSamples/ProjectSettings/EditorBuildSettings.asset +++ b/PhysicsSamples/ProjectSettings/EditorBuildSettings.asset @@ -5,7 +5,7 @@ EditorBuildSettings: m_ObjectHideFlags: 0 serializedVersion: 2 m_Scenes: - - enabled: 1 + - enabled: 0 path: Assets/Tests/LoaderScene/LoaderScene.unity guid: 9ef2d32d6fbf442a8b7576ec22353d30 - enabled: 1 @@ -14,13 +14,13 @@ EditorBuildSettings: - enabled: 1 path: Assets/1. Hello World/SphereAndBoxColliders.unity guid: 73e5687e5a408214ca1c5de063a29931 - - enabled: 1 + - enabled: 0 path: Assets/Demos/1. Hello World/1c. Conversion.unity guid: 2e2067153c43e3148806937cdb5335a9 - - enabled: 1 + - enabled: 0 path: Assets/Demos/1. Hello World/1c. Conversion/1c1. GameObjects GravityWell.unity guid: d83b2db332f922247b1ac452d36eb0d3 - - enabled: 1 + - enabled: 0 path: Assets/Demos/1. Hello World/1c. Conversion/1c2. Convertible GravityWell.unity guid: 90012837924254c43a65890d3128c569 - enabled: 1 @@ -161,221 +161,221 @@ EditorBuildSettings: - enabled: 1 path: Assets/13. Raycast Car/Raycast Car.unity guid: 9f45049bdc7f68d4fa2c1170d7bd2550 - - enabled: 1 + - enabled: 0 path: Assets/Tests/AddRemove/AddRemove.unity guid: e9c09f36907a8e14190f322770cea95b - - enabled: 1 + - enabled: 0 path: Assets/Tests/BehaviorUnitTests/Activation/ChangeGroundFilter.unity guid: 7af369973a235fd4493c1d2816d9510e - - enabled: 1 + - enabled: 0 path: Assets/Tests/BehaviorUnitTests/Activation/ChangeGroundFilterChangeCollider.unity guid: d65c5600acf64024e97fcf3c4be89dae - - enabled: 1 + - enabled: 0 path: Assets/Tests/JointTest/Hinge.unity guid: 1b66c83dd2ded0a44a80462c42d4eb01 - - enabled: 1 + - enabled: 0 path: Assets/Tests/JointTest/InvalidJoint.unity guid: 815fa2fc1a0eeb747a5838fa9cb51da2 - - enabled: 1 + - enabled: 0 path: Assets/Tests/JointTest/Prismatic.unity guid: dc01c0eb8d7ef4941969cad192adcd5a - - enabled: 1 + - enabled: 0 path: Assets/Tests/LargeMesh/LargeMesh.unity guid: 5211f6293288d59408a79b01a5bcdb0a - - enabled: 1 + - enabled: 0 path: Assets/Tests/BehaviorUnitTests/Activation/ChangeGroundFilterRemove.unity guid: f9f350e451e88194885d326e7e5a34be - - enabled: 1 + - enabled: 0 path: Assets/Tests/BehaviorUnitTests/Activation/ChangeGroundFilterTeleport.unity guid: 6566dc2b247bff14a97bac4e803cdd87 - - enabled: 1 + - enabled: 0 path: Assets/Tests/BehaviorUnitTests/Collision/CollisionUT.unity guid: d79e7bc9ccc049d4588116ffa10e487d - - enabled: 1 + - enabled: 0 path: Assets/Tests/BehaviorUnitTests/Events/CollisionEventDataUT.unity guid: a0a6ec2b127f6ae429eb92a80632690d - - enabled: 1 + - enabled: 0 path: Assets/Tests/BehaviorUnitTests/Events/CollisionEventsUT.unity guid: 1bcdea0e31ca97440a9f4c806162ad54 - - enabled: 1 + - enabled: 0 path: Assets/Tests/BehaviorUnitTests/Events/TriggerEventDataUT.unity guid: bf6edd97bcc39194eaf6f2d1470d15c4 - - enabled: 1 + - enabled: 0 path: Assets/Tests/BehaviorUnitTests/Events/TriggerEventsUT.unity guid: ff2830679915cc64cac236d64c307427 - - enabled: 1 + - enabled: 0 path: Assets/Tests/BehaviorUnitTests/Events/ZeroDynamicBodiesNoEvents.unity guid: f2c19f08f77896b41b2e28f0b5fa5073 - - enabled: 1 + - enabled: 0 path: Assets/Tests/BehaviorUnitTests/Materials/FrictionUT.unity guid: 93383a0cf1389bd419c772699b549a98 - - enabled: 1 + - enabled: 0 path: Assets/Tests/BehaviorUnitTests/Materials/RestitutionUT.unity guid: 4f2e2dd3010fda74b9974308c9291cd7 - - enabled: 1 + - enabled: 0 path: Assets/Tests/BehaviorUnitTests/Modifiers/BodyPairModifiersUT.unity guid: 3c005a4c711c1e743b5925f93228dbe0 - - enabled: 1 + - enabled: 0 path: Assets/Tests/BehaviorUnitTests/Modifiers/ContactModifiersUT.unity guid: eca804ba4e3fb24489a035f51fb46216 - - enabled: 1 + - enabled: 0 path: Assets/Tests/BehaviorUnitTests/Modifiers/JacobianModifiersUT.unity guid: 80e0e4713e3fa9342b21ab9b2e7b733d - - enabled: 1 + - enabled: 0 path: Assets/Tests/BehaviorUnitTests/Motions/GravityFactorUT.unity guid: 01fe9da950084e440af34f5f6248f358 - - enabled: 1 + - enabled: 0 path: Assets/Tests/BehaviorUnitTests/Motors/AllMotors.unity guid: 7d8a565e14ecfaa439ccc0347a7b0309 - - enabled: 1 + - enabled: 0 path: Assets/Tests/BroadphaseStaticLayerChanged/BroadphaseStaticLayerChanged.unity guid: 549dcfbd14343e14898cebced20a7420 - - enabled: 1 + - enabled: 0 path: Assets/Tests/CharacterController/CC_Events.unity guid: 250ce4ca9a250ad4886a46f2a17a3536 - - enabled: 1 + - enabled: 0 path: Assets/Tests/CharacterController/CC_Walking.unity guid: 7ac394f13e2cc124688775a132893a73 - - enabled: 1 + - enabled: 0 path: Assets/Tests/CollisionEvents/CollisionEvents.unity guid: 4c8b1c84008838a41bf6181d5209eae3 - - enabled: 1 + - enabled: 0 path: Assets/Tests/CollisionEvents/NoDynamicBodies.unity guid: d9d1615654759e246bc1ed9141fb2e1c - - enabled: 1 + - enabled: 0 path: Assets/Tests/CollisionResponse/CollisionResponse.None.unity guid: b3de4f8ab2d375843916ac983d165596 - - enabled: 1 + - enabled: 0 path: Assets/Tests/Compound/ChangeCompoundFilter.unity guid: 1cf942cdcb049254ca95172f502c3b89 - - enabled: 1 + - enabled: 0 path: Assets/Tests/Compound/Compound.unity guid: 6a4e16ec98ecb9643915c051aa87c73c - - enabled: 1 + - enabled: 0 path: Assets/Tests/ContinuousTest/ContinuousTest.unity guid: 94ebd19dc0e8cda4fbfc4749381cced9 - - enabled: 1 + - enabled: 0 path: Assets/Tests/DoubleModifyBroadphasePairs/DoubleModifyBroadphasePairs.unity guid: 48fa271285c8885488362e47961c2a13 - - enabled: 1 + - enabled: 0 path: Assets/Tests/JointTest/FixedAngleGrid.unity guid: d0bacb4b4fb344a4f8d3aaa69436be83 - - enabled: 1 + - enabled: 0 path: Assets/Tests/JointTest/LimitedHinge.unity guid: 5c4808b9180492a438ea49463e65777b - - enabled: 1 + - enabled: 0 path: Assets/Tests/JointTest/RagdollGrid.unity guid: fe5c6b01d949e714eae90002b17145eb - - enabled: 1 + - enabled: 0 path: Assets/Tests/JointTest/SoftJoint.unity guid: 41010a76716e85b47b4213f07834470c - - enabled: 1 + - enabled: 0 path: Assets/Tests/MultipleWorlds/Animation/Animation.unity guid: ba31bb9cb6720be4fb3cc2a2bd20faea - - enabled: 1 + - enabled: 0 path: Assets/Tests/MultipleWorlds/ClientServer/ClientServer.unity guid: d8baf345c65419345b691f223771dbbf - - enabled: 1 + - enabled: 0 path: Assets/Tests/MultipleWorlds/CustomPhysicsGroup/MultiWorldMousePicker.unity guid: a5328904cd4900b4c93a14b4b68768df - - enabled: 1 + - enabled: 0 path: Assets/Tests/MultipleWorlds/CustomPhysicsGroup/CustomPhysicsGroup.unity guid: 54963e34d8f8f974d9d1e852b23de241 - - enabled: 1 + - enabled: 0 path: Assets/Tests/Pyramids/Pyramids.unity guid: 0b0ae4ff46cb00648990f935f6b14f1c - - enabled: 1 + - enabled: 0 path: Assets/Tests/Restitution/Bounce.unity guid: 0c349ea0521c9914ab69806b04fefc4c - - enabled: 1 + - enabled: 0 path: Assets/Tests/Restitution/EnergyGain.unity guid: 3f8f2b479f809c044a87a5c19b477e8f - - enabled: 1 + - enabled: 0 path: Assets/Tests/Restitution/RandomShapes.unity guid: 6b739d087578ad34aa4c424efef6427d - - enabled: 1 + - enabled: 0 path: Assets/Tests/RuntimeScale/Runtime scale query.unity guid: 0950ef924fabc3449a67ee1fdc7bf246 - - enabled: 1 + - enabled: 0 path: Assets/Tests/RuntimeScale/Runtime scale simulation.unity guid: 652f648397f9a8a49add93c51a2830e7 - - enabled: 1 + - enabled: 0 path: Assets/Tests/SamplesTest/SampleScene.unity guid: e4e90d7ea4e50d6459d8191214bc151a - - enabled: 1 + - enabled: 0 path: Assets/Tests/SchedulerTest/SchedulerTest.unity guid: 12dc13a62df336b4db6da8f87f57cb53 - - enabled: 1 + - enabled: 0 path: Assets/Tests/SingleThreadedPhysics/SingleThreadedPhysics.unity guid: a56102b05c5d1284a8eee3a83d57d25c - - enabled: 1 + - enabled: 0 path: Assets/Tests/SingleThreadedRagdoll/SingleThreadedRagdoll.unity guid: b4c33aff9562c744dba604f0ea637dda - - enabled: 1 + - enabled: 0 path: Assets/Tests/Stacking/BasicStacks.unity guid: 57753409bad1c304bac6620f2e98cd26 - - enabled: 1 + - enabled: 0 path: Assets/Tests/Stacking/ComplexStacking.unity guid: d7d9a1f50c842444f87fd276dac8119b - - enabled: 1 + - enabled: 0 path: Assets/Tests/Stacking/SimpleStacking.unity guid: f2b27c604df25a84c875bd047ae927ed - - enabled: 1 + - enabled: 0 path: Assets/Tests/SystemScheduling/SchedulingSample.unity guid: 27060ebe8ecbd384cbbba0f1f6562192 - - enabled: 1 + - enabled: 0 path: Assets/Tests/Terrain/Terrain_Triangles.unity guid: 2760396ab1a5aac4e81b87183606f8c2 - - enabled: 1 + - enabled: 0 path: Assets/Tests/Terrain/Terrain_VertexSamples.unity guid: e5fb15b7376ecc946ba91920bcdaab80 - - enabled: 1 + - enabled: 0 path: Assets/Tests/TriggerEvents/MultipleGridsTriggerEventsTest.unity guid: aef712909700b57419df90b98ed88add - - enabled: 1 + - enabled: 0 path: Assets/Tests/TriggerEvents/TriggersFromDeactivatedBodies/DeactivatedBodiesTriggerTest - Bodies become active.unity guid: f6555543af8bd0c4280f066a71ff7d01 - - enabled: 1 + - enabled: 0 path: Assets/Tests/TriggerEvents/TriggersFromDeactivatedBodies/DeactivatedBodiesTriggerTest - Bodies deactivate.unity guid: 8d76300c263fe954b9f0661848cbfe0e - - enabled: 1 + - enabled: 0 path: Assets/Tests/TriggerEvents/TriggersFromDeactivatedBodies/DeactivatedBodiesTriggerTest - Bodies enter and leave trigger volume.unity guid: a1378a4525526ef478b5a8fb17b117d4 - - enabled: 1 + - enabled: 0 path: Assets/Tests/TriggerEvents/TriggersFromDeactivatedBodies/DeactivatedBodiesTriggerTest - Bodies get destroyed while inactive.unity guid: fbe54e8835ab35b4aba49d5a2e297409 - - enabled: 1 + - enabled: 0 path: Assets/Tests/TriggerEvents/TriggersFromDeactivatedBodies/DeactivatedBodiesTriggerTest - Dynamic bodies get converted to static inside a trigger.unity guid: a27bc442d3f915445b0a605520c64b92 - - enabled: 1 + - enabled: 0 path: Assets/Tests/TriggerEvents/TriggersFromDeactivatedBodies/DeactivatedBodiesTriggerTest - Static bodies get converted into dynamic inside a trigger.unity guid: bcdb9634211dd844fa8c63f458755d6e - - enabled: 1 + - enabled: 0 path: Assets/Tests/TriggerEvents/TriggersFromDeactivatedBodies/DeactivatedBodiesTriggerTest - Trigger volumes get destroyed.unity guid: 845c22890ef44b54fb3c5c9c253abc12 - - enabled: 1 + - enabled: 0 path: Assets/Tests/Welding/VehicleOverTerrain.unity guid: f7b494ea6852abb45a44ef428a9662ec - - enabled: 1 + - enabled: 0 path: Assets/Tests/JointTest/BreakableJoints.unity guid: 01ee64c366461e8479e7115b73e462d5 - - enabled: 1 + - enabled: 0 path: Assets/Tests/Performance/SphereCollisionPerformanceTest.unity guid: 3cc4192055d9cf047bfd3889a14205d3 - - enabled: 1 + - enabled: 0 path: Assets/Tests/Performance/CubeCollisionPerformanceTest.unity guid: 99fa431d3147467438bc01d84c1d61f8 - - enabled: 1 + - enabled: 0 path: Assets/Tests/Performance/ConvexCollisionPerformanceTest.unity guid: 5a39b5341762ad74bbd46477f6d21cd0 - - enabled: 1 + - enabled: 0 path: Assets/Tests/Performance/RagdollPerformanceTest.unity guid: 3dc421b9d2c813849b6b9da3891c7cf7 m_configObjects: {} diff --git a/PhysicsSamples/ProjectSettings/ProjectSettings.asset b/PhysicsSamples/ProjectSettings/ProjectSettings.asset index 770d8204e..3651f7f41 100644 --- a/PhysicsSamples/ProjectSettings/ProjectSettings.asset +++ b/PhysicsSamples/ProjectSettings/ProjectSettings.asset @@ -17,7 +17,7 @@ PlayerSettings: defaultCursor: {fileID: 0} cursorHotspot: {x: 0, y: 0} m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1} - m_ShowUnitySplashScreen: 0 + m_ShowUnitySplashScreen: 1 m_ShowUnitySplashLogo: 1 m_SplashScreenOverlayOpacity: 1 m_SplashScreenAnimation: 1 @@ -86,6 +86,7 @@ PlayerSettings: hideHomeButton: 0 submitAnalytics: 0 usePlayerLog: 1 + dedicatedServerOptimizations: 0 bakeCollisionMeshes: 0 forceSingleInstance: 0 useFlipModelSwapchain: 1 @@ -125,6 +126,7 @@ PlayerSettings: switchNVNMaxPublicTextureIDCount: 0 switchNVNMaxPublicSamplerIDCount: 0 switchNVNGraphicsFirmwareMemory: 32 + switchMaxWorkerMultiple: 8 stadiaPresentMode: 0 stadiaTargetFramerate: 0 vulkanNumSwapchainBuffers: 2 @@ -166,6 +168,7 @@ PlayerSettings: tvOS: com.Company.ProductName buildNumber: Standalone: 0 + VisionOS: 0 iPhone: 0 tvOS: 0 overrideDefaultApplicationIdentifier: 0 @@ -190,6 +193,8 @@ PlayerSettings: tvOSSdkVersion: 0 tvOSRequireExtendedGameController: 0 tvOSTargetOSVersionString: 12.0 + VisionOSSdkVersion: 0 + VisionOSTargetOSVersionString: 1.0 uIPrerenderedIcon: 0 uIRequiresPersistentWiFi: 0 uIRequiresFullScreen: 1 @@ -237,8 +242,10 @@ PlayerSettings: appleDeveloperTeamID: iOSManualSigningProvisioningProfileID: tvOSManualSigningProvisioningProfileID: + VisionOSManualSigningProvisioningProfileID: iOSManualSigningProvisioningProfileType: 0 tvOSManualSigningProvisioningProfileType: 0 + VisionOSManualSigningProvisioningProfileType: 0 appleEnableAutomaticSigning: 0 iOSRequireARKit: 0 iOSAutomaticallyDetectAndAddCapabilities: 1 @@ -373,6 +380,103 @@ PlayerSettings: m_Height: 36 m_Kind: 1 m_SubKind: + - m_BuildTarget: iPhone + m_Icons: + - m_Textures: [] + m_Width: 180 + m_Height: 180 + m_Kind: 0 + m_SubKind: iPhone + - m_Textures: [] + m_Width: 120 + m_Height: 120 + m_Kind: 0 + m_SubKind: iPhone + - m_Textures: [] + m_Width: 167 + m_Height: 167 + m_Kind: 0 + m_SubKind: iPad + - m_Textures: [] + m_Width: 152 + m_Height: 152 + m_Kind: 0 + m_SubKind: iPad + - m_Textures: [] + m_Width: 76 + m_Height: 76 + m_Kind: 0 + m_SubKind: iPad + - m_Textures: [] + m_Width: 120 + m_Height: 120 + m_Kind: 3 + m_SubKind: iPhone + - m_Textures: [] + m_Width: 80 + m_Height: 80 + m_Kind: 3 + m_SubKind: iPhone + - m_Textures: [] + m_Width: 80 + m_Height: 80 + m_Kind: 3 + m_SubKind: iPad + - m_Textures: [] + m_Width: 40 + m_Height: 40 + m_Kind: 3 + m_SubKind: iPad + - m_Textures: [] + m_Width: 87 + m_Height: 87 + m_Kind: 1 + m_SubKind: iPhone + - m_Textures: [] + m_Width: 58 + m_Height: 58 + m_Kind: 1 + m_SubKind: iPhone + - m_Textures: [] + m_Width: 29 + m_Height: 29 + m_Kind: 1 + m_SubKind: iPhone + - m_Textures: [] + m_Width: 58 + m_Height: 58 + m_Kind: 1 + m_SubKind: iPad + - m_Textures: [] + m_Width: 29 + m_Height: 29 + m_Kind: 1 + m_SubKind: iPad + - m_Textures: [] + m_Width: 60 + m_Height: 60 + m_Kind: 2 + m_SubKind: iPhone + - m_Textures: [] + m_Width: 40 + m_Height: 40 + m_Kind: 2 + m_SubKind: iPhone + - m_Textures: [] + m_Width: 40 + m_Height: 40 + m_Kind: 2 + m_SubKind: iPad + - m_Textures: [] + m_Width: 20 + m_Height: 20 + m_Kind: 2 + m_SubKind: iPad + - m_Textures: [] + m_Width: 1024 + m_Height: 1024 + m_Kind: 4 + m_SubKind: App Store m_BuildTargetBatching: - m_BuildTarget: Standalone m_StaticBatching: 0 @@ -466,6 +570,7 @@ PlayerSettings: switchSocketConcurrencyLimit: 14 switchScreenResolutionBehavior: 2 switchUseCPUProfiler: 0 + switchEnableFileSystemTrace: 0 switchUseGOLDLinker: 0 switchLTOSetting: 0 switchApplicationID: 0x01004b9000490000 @@ -731,7 +836,6 @@ PlayerSettings: suppressCommonWarnings: 1 allowUnsafeCode: 1 useDeterministicCompilation: 1 - selectedPlatform: 0 additionalIl2CppArgs: scriptingRuntimeVersion: 1 gcIncremental: 0 diff --git a/PhysicsSamples/ProjectSettings/ProjectVersion.txt b/PhysicsSamples/ProjectSettings/ProjectVersion.txt index 56ddb83a4..88bb9cf99 100644 --- a/PhysicsSamples/ProjectSettings/ProjectVersion.txt +++ b/PhysicsSamples/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2022.3.0f1 -m_EditorVersionWithRevision: 2022.3.0f1 (fb119bb0b476) +m_EditorVersion: 2022.3.10f1 +m_EditorVersionWithRevision: 2022.3.10f1 (ff3792e53c62)