From 57e7e4303ad64476db82bb3140920458b8d552ac Mon Sep 17 00:00:00 2001 From: Robert Cupisz Date: Tue, 4 Apr 2017 12:27:05 +0200 Subject: [PATCH] Upgrade to Unity 5.6 --- Assets/VolumetricFog/Shaders/Shadowmap.shader | 2 +- ProjectSettings/GraphicsSettings.asset | 24 ++++++++----------- ProjectSettings/ProjectSettings.asset | 11 ++++++++- ProjectSettings/ProjectVersion.txt | 3 +-- ProjectSettings/UnityAdsSettings.asset | 11 --------- ProjectSettings/UnityConnectSettings.asset | 8 +++++++ 6 files changed, 30 insertions(+), 29 deletions(-) delete mode 100644 ProjectSettings/UnityAdsSettings.asset diff --git a/Assets/VolumetricFog/Shaders/Shadowmap.shader b/Assets/VolumetricFog/Shaders/Shadowmap.shader index 8595c32..178a7f2 100644 --- a/Assets/VolumetricFog/Shaders/Shadowmap.shader +++ b/Assets/VolumetricFog/Shaders/Shadowmap.shader @@ -18,7 +18,7 @@ Pass v2f vert (appdata_base v) { v2f o; - o.pos = mul (UNITY_MATRIX_MVP, v.vertex); + o.pos = UnityObjectToClipPos (v.vertex); return o; } diff --git a/ProjectSettings/GraphicsSettings.asset b/ProjectSettings/GraphicsSettings.asset index 325937c..6eca8e3 100644 --- a/ProjectSettings/GraphicsSettings.asset +++ b/ProjectSettings/GraphicsSettings.asset @@ -3,7 +3,7 @@ --- !u!30 &1 GraphicsSettings: m_ObjectHideFlags: 0 - serializedVersion: 7 + serializedVersion: 9 m_Deferred: m_Mode: 1 m_Shader: {fileID: 69, guid: 0000000000000000f000000000000000, type: 0} @@ -39,22 +39,18 @@ GraphicsSettings: m_PreloadedShaders: [] m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderSettings_Tier1: + m_TierSettings_Tier1: + renderingPath: 3 useCascadedShadowMaps: 1 - standardShaderQuality: 2 - useReflectionProbeBoxProjection: 1 - useReflectionProbeBlending: 1 - m_ShaderSettings_Tier2: + m_TierSettings_Tier2: + renderingPath: 3 useCascadedShadowMaps: 1 - standardShaderQuality: 2 - useReflectionProbeBoxProjection: 1 - useReflectionProbeBlending: 1 - m_ShaderSettings_Tier3: + m_TierSettings_Tier3: + renderingPath: 3 useCascadedShadowMaps: 1 - standardShaderQuality: 2 - useReflectionProbeBoxProjection: 1 - useReflectionProbeBlending: 1 - m_BuildTargetShaderSettings: [] + m_DefaultRenderingPath: 3 + m_DefaultMobileRenderingPath: 1 + m_TierSettings: [] m_LightmapStripping: 0 m_FogStripping: 0 m_LightmapKeepPlain: 1 diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index cffccf5..aa02137 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -123,6 +123,7 @@ PlayerSettings: iPhoneTargetOSVersion: 24 tvOSSdkVersion: 0 tvOSTargetOSVersion: 900 + tvOSRequireExtendedGameController: 0 uIPrerenderedIcon: 0 uIRequiresPersistentWiFi: 0 uIRequiresFullScreen: 1 @@ -162,6 +163,7 @@ PlayerSettings: iOSLaunchScreeniPadCustomXibPath: iOSDeviceRequirements: [] iOSURLSchemes: [] + appleDeveloperTeamID: AndroidTargetDevice: 0 AndroidSplashScreenScale: 0 androidSplashScreen: {fileID: 0} @@ -206,12 +208,15 @@ PlayerSettings: wiiUSystemHeapSize: 128 wiiUTVStartupScreen: {fileID: 0} wiiUGamePadStartupScreen: {fileID: 0} + wiiUDrcBufferDisabled: 0 wiiUProfilerLibPath: actionOnDotNetUnhandledException: 1 enableInternalProfiler: 0 logObjCUncaughtExceptions: 1 enableCrashReportAPI: 0 + cameraUsageDescription: locationUsageDescription: + microphoneUsageDescription: XboxTitleId: XboxImageXexPath: XboxSpaPath: @@ -251,7 +256,8 @@ PlayerSettings: ps4AppType: 0 ps4ParamSfxPath: ps4VideoOutPixelFormat: 0 - ps4VideoOutResolution: 4 + ps4VideoOutInitialWidth: 1920 + ps4VideoOutReprojectionRate: 120 ps4PronunciationXMLPath: ps4PronunciationSIGPath: ps4BackgroundImagePath: @@ -280,9 +286,12 @@ PlayerSettings: ps4pnFriends: 1 ps4pnGameCustomData: 1 playerPrefsSupport: 0 + ps4UseResolutionFallback: 0 + restrictedAudioUsageRights: 0 ps4ReprojectionSupport: 0 ps4UseAudio3dBackend: 0 ps4SocialScreenEnabled: 0 + ps4ScriptOptimizationLevel: 3 ps4Audio3dVirtualSpeakerCount: 14 ps4attribCpuUsage: 0 ps4PatchPkgPath: diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index 96b25e7..66e05aa 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1 @@ -m_EditorVersion: 5.4.1f1 -m_StandardAssetsVersion: 0 +m_EditorVersion: 5.5.0f3 diff --git a/ProjectSettings/UnityAdsSettings.asset b/ProjectSettings/UnityAdsSettings.asset deleted file mode 100644 index 224050c..0000000 --- a/ProjectSettings/UnityAdsSettings.asset +++ /dev/null @@ -1,11 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!292 &1 -UnityAdsSettings: - m_ObjectHideFlags: 0 - m_Enabled: 0 - m_InitializeOnStartup: 1 - m_TestMode: 0 - m_EnabledPlatforms: 4294967295 - m_IosGameId: - m_AndroidGameId: diff --git a/ProjectSettings/UnityConnectSettings.asset b/ProjectSettings/UnityConnectSettings.asset index 11bfae5..2943e44 100644 --- a/ProjectSettings/UnityConnectSettings.asset +++ b/ProjectSettings/UnityConnectSettings.asset @@ -10,6 +10,7 @@ UnityConnectSettings: CrashReportingSettings: m_EventUrl: https://perf-events.cloud.unity3d.com/api/events/crashes m_Enabled: 0 + m_CaptureEditorExceptions: 1 UnityPurchasingSettings: m_Enabled: 0 m_TestMode: 0 @@ -19,3 +20,10 @@ UnityConnectSettings: m_TestMode: 0 m_TestEventUrl: m_TestConfigUrl: + UnityAdsSettings: + m_Enabled: 0 + m_InitializeOnStartup: 1 + m_TestMode: 0 + m_EnabledPlatforms: 4294967295 + m_IosGameId: + m_AndroidGameId: