Upgrade off of prefab preview build

TBartl · Sep 27, 2018 · 126f3a0 · 126f3a0
1 parent b48fc2e
commit 126f3a0
Show file tree

Hide file tree

Showing 8 changed files with 7,164 additions and 10,369 deletions.
diff --git a/SS5R-Source/Assets/Main.unity b/SS5R-Source/Assets/Main.unity
diff --git a/SS5R-Source/Assets/Player/Controller/Controller.prefab b/SS5R-Source/Assets/Player/Controller/Controller.prefab
@@ -47,6 +47,7 @@ MeshRenderer:
   m_LightProbeUsage: 1
   m_ReflectionProbeUsage: 1
   m_RenderingLayerMask: 4294967295
+  m_RendererPriority: 0
   m_Materials:
   - {fileID: 2100000, guid: a75846281ae42134facd1f2fb6320f7a, type: 2}
   m_StaticBatchInfo:
@@ -305,6 +306,7 @@ MeshRenderer:
   m_LightProbeUsage: 1
   m_ReflectionProbeUsage: 1
   m_RenderingLayerMask: 4294967295
+  m_RendererPriority: 0
   m_Materials:
   - {fileID: 2100000, guid: a75846281ae42134facd1f2fb6320f7a, type: 2}
   m_StaticBatchInfo:
@@ -673,6 +675,7 @@ SkinnedMeshRenderer:
   m_LightProbeUsage: 1
   m_ReflectionProbeUsage: 1
   m_RenderingLayerMask: 4294967295
+  m_RendererPriority: 0
   m_Materials:
   - {fileID: 2100000, guid: f1106d096f6ede349b0d2ce25f733061, type: 2}
   m_StaticBatchInfo:

diff --git a/SS5R-Source/Assets/PostProcessing/Editor/PropertyDrawers/MinDrawer.cs b/SS5R-Source/Assets/PostProcessing/Editor/PropertyDrawers/MinDrawer.cs
@@ -3,12 +3,12 @@
 
 namespace UnityEditor.PostProcessing
 {
-    [CustomPropertyDrawer(typeof(MinAttribute))]
+    [CustomPropertyDrawer(typeof(UnityEngine.PostProcessing.MinAttribute))]
     sealed class MinDrawer : PropertyDrawer
     {
         public override void OnGUI(Rect position, SerializedProperty property, GUIContent label)
         {
-            MinAttribute attribute = (MinAttribute)base.attribute;
+            UnityEngine.PostProcessing.MinAttribute attribute = (UnityEngine.PostProcessing.MinAttribute)base.attribute;
 
             if (property.propertyType == SerializedPropertyType.Integer)
             {

diff --git a/SS5R-Source/Assets/Prefabs/Objects/Base.prefab b/SS5R-Source/Assets/Prefabs/Objects/Base.prefab
@@ -185,6 +185,7 @@ MeshRenderer:
   m_LightProbeUsage: 1
   m_ReflectionProbeUsage: 1
   m_RenderingLayerMask: 4294967295
+  m_RendererPriority: 0
   m_Materials:
   - {fileID: 2100000, guid: 032cc141ef9b7f140b951016fae6959a, type: 2}
   m_StaticBatchInfo:

diff --git a/SS5R-Source/Logs/Packages-Update.log b/SS5R-Source/Logs/Packages-Update.log
@@ -0,0 +1,10 @@
+
+=== Wed Sep 26 23:01:24 2018
+
+Packages were changed.
+Update Mode: updateDependencies
+
+The following packages were updated:
+  com.unity.analytics from version 2.0.16 to 3.0.9
+  com.unity.package-manager-ui from version 1.9.10 to 2.0.0-preview.7
+  com.unity.textmeshpro from version 1.2.1 to 1.3.0
diff --git a/SS5R-Source/Packages/manifest.json b/SS5R-Source/Packages/manifest.json
@@ -1,10 +1,11 @@
 {
   "dependencies": {
     "com.unity.ads": "2.0.8",
-    "com.unity.analytics": "2.0.16",
-    "com.unity.package-manager-ui": "1.9.10",
+    "com.unity.analytics": "3.0.9",
+    "com.unity.package-manager-ui": "2.0.0-preview.7",
     "com.unity.purchasing": "2.0.1",
-    "com.unity.textmeshpro": "1.2.1",
+    "com.unity.textmeshpro": "1.3.0",
+    "com.unity.xr.openvr.standalone": "1.0.1",
     "com.unity.modules.ai": "1.0.0",
     "com.unity.modules.animation": "1.0.0",
     "com.unity.modules.assetbundle": "1.0.0",

diff --git a/SS5R-Source/ProjectSettings/ProjectVersion.txt b/SS5R-Source/ProjectSettings/ProjectVersion.txt
@@ -1 +1 @@
-m_EditorVersion: 2018.2.0x-ImprovedPrefabs
+m_EditorVersion: 2018.3.0b2
diff --git a/SS5R-Source/ProjectSettings/VFXManager.asset b/SS5R-Source/ProjectSettings/VFXManager.asset
@@ -0,0 +1,11 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!937362698 &1
+VFXManager:
+  m_ObjectHideFlags: 0
+  m_IndirectShader: {fileID: 0}
+  m_CopyBufferShader: {fileID: 0}
+  m_SortShader: {fileID: 0}
+  m_RenderPipeSettingsPath: 
+  m_FixedTimeStep: 0.016666668
+  m_MaxDeltaTime: 0.05
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		m_EditorVersion: 2018.2.0x-ImprovedPrefabs
		m_EditorVersion: 2018.3.0b2