From a02ef46282dec371da2bd8761c3979808f9f38d7 Mon Sep 17 00:00:00 2001 From: chrisgregan Date: Tue, 4 Aug 2015 11:15:20 +0100 Subject: [PATCH] Updated project to Unity 5.1.2 --- ProjectSettings/ProjectSettings.asset | 16 +++--- ProjectSettings/ProjectVersion.txt | 2 +- ProjectSettings/TagManager.asset | 73 ++++++++++++++------------- 3 files changed, 47 insertions(+), 44 deletions(-) diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 4a87f05b..2d8f5033 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -77,6 +77,7 @@ PlayerSettings: metroEnableIndependentInputSource: 0 metroEnableLowLatencyPresentationAPI: 0 xboxOneDisableKinectGpuReservation: 0 + virtualRealitySupported: 0 productGUID: 47d9f350ed27d4ecaa6699f3ebe641c8 AndroidBundleVersionCode: 1 AndroidMinSdkVersion: 9 @@ -140,13 +141,7 @@ PlayerSettings: - m_BuildTarget: Android m_StaticBatching: 1 m_DynamicBatching: 1 - m_BuildTargetGraphicsAPIs: - - m_BuildTarget: WindowsStandaloneSupport - m_APIs: 01000000 - m_Automatic: 0 - - m_BuildTarget: AndroidPlayer - m_APIs: 08000000 - m_Automatic: 0 + m_BuildTargetGraphicsAPIs: [] webPlayerTemplate: APPLICATION:Default m_TemplateCustomTags: {} actionOnDotNetUnhandledException: 1 @@ -263,7 +258,6 @@ PlayerSettings: psp2InfoBarOnStartup: 0 psp2InfoBarColor: 0 psmSplashimage: {fileID: 0} - virtualRealitySupported: 0 spritePackerPolicy: scriptingDefineSymbols: {} metroPackageName: Fungus @@ -380,12 +374,14 @@ PlayerSettings: XboxOneAllowedProductIds: [] XboxOnePersistentLocalStorageSize: 0 intPropertyNames: + - Standalone::ScriptingBackend - WebGL::ScriptingBackend - WebGL::audioCompressionFormat - WebGL::exceptionSupport - WebGL::memorySize - iOS::Architecture - iOS::ScriptingBackend + Standalone::ScriptingBackend: 0 WebGL::ScriptingBackend: 1 WebGL::audioCompressionFormat: 4 WebGL::exceptionSupport: 0 @@ -395,13 +391,17 @@ PlayerSettings: boolPropertyNames: - WebGL::analyzeBuildSize - WebGL::dataCaching + - WebGL::useEmbeddedResources WebGL::analyzeBuildSize: 0 WebGL::dataCaching: 0 + WebGL::useEmbeddedResources: 0 stringPropertyNames: - WebGL::emscriptenArgs - WebGL::template + - additionalIl2CppArgs::additionalIl2CppArgs WebGL::emscriptenArgs: WebGL::template: APPLICATION:Default + additionalIl2CppArgs::additionalIl2CppArgs: firstStreamedSceneWithResources: 0 cloudProjectId: projectId: diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index 2a285ebf..8c353d89 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 5.1.0f3 +m_EditorVersion: 5.1.2f1 m_StandardAssetsVersion: 0 diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index e9039913..bfb533b4 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -2,42 +2,45 @@ %TAG !u! tag:unity3d.com,2011: --- !u!78 &1 TagManager: - tags: - - - Builtin Layer 0: Default - Builtin Layer 1: TransparentFX - Builtin Layer 2: Ignore Raycast - Builtin Layer 3: - Builtin Layer 4: Water - Builtin Layer 5: UI - Builtin Layer 6: - Builtin Layer 7: - User Layer 8: - User Layer 9: - User Layer 10: - User Layer 11: - User Layer 12: - User Layer 13: - User Layer 14: - User Layer 15: - User Layer 16: - User Layer 17: - User Layer 18: - User Layer 19: - User Layer 20: - User Layer 21: - User Layer 22: - User Layer 23: - User Layer 24: - User Layer 25: - User Layer 26: - User Layer 27: - User Layer 28: - User Layer 29: - User Layer 30: - User Layer 31: + serializedVersion: 2 + tags: [] + layers: + - Default + - TransparentFX + - Ignore Raycast + - + - Water + - UI + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - m_SortingLayers: - name: Default - userID: 0 uniqueID: 0 locked: 0 + - name: Top + uniqueID: 1778415005 + locked: 0