Updated project to Unity 2019.1.0f2

Updated project files and fixed warnings. Switched to .NET 4.x
6 years ago · 6a8f6c2a85
11 changed files with 6627 additions and 1489 deletions
--- a/Assets/Fungus/Scripts/Editor/FungusEditorPreferences.cs
+++ b/Assets/Fungus/Scripts/Editor/FungusEditorPreferences.cs
@ -27,26 +27,39 @@ namespace Fungus
                LoadOnScriptLoad();
            }

-            // Add preferences section named "My Preferences" to the Preferences Window
-            [PreferenceItem("Fungus")]
-            public static void PreferencesGUI()
+            [SettingsProvider]
+            public static SettingsProvider CreateFungusSettingsProvider()
            {
-                // Load the preferences
-                if (!prefsLoaded)
+                // First parameter is the path in the Settings window.
+                // Second parameter is the scope of this setting: it only appears in the Project Settings window.
+                var provider = new SettingsProvider("Project/Fungus", SettingsScope.Project)
                {
-                    LoadOnScriptLoad();
-                }
+                    // Create the SettingsProvider and initialize its drawing (IMGUI) function in place:
+                    guiHandler = (searchContext) =>
+                    {
+                        // Load the preferences
+                        if (!prefsLoaded)
+                        {
+                            LoadOnScriptLoad();
+                        }

-                // Preferences GUI
-                hideMushroomInHierarchy = EditorGUILayout.Toggle("Hide Mushroom Flowchart Icon", hideMushroomInHierarchy);
-                useExperimentalMenus = EditorGUILayout.Toggle(new GUIContent("Experimental Searchable Menus", "Experimental menus replace the Event, Add Variable and Add Command menus with a searchable menu more like the Unity AddComponent menu."), useExperimentalMenus);
+                        // Preferences GUI
+                        hideMushroomInHierarchy = EditorGUILayout.Toggle("Hide Mushroom Flowchart Icon", hideMushroomInHierarchy);
+                        useExperimentalMenus = EditorGUILayout.Toggle(new GUIContent("Experimental Searchable Menus", "Experimental menus replace the Event, Add Variable and Add Command menus with a searchable menu more like the Unity AddComponent menu."), useExperimentalMenus);

-                // Save the preferences
-                if (GUI.changed)
-                {
-                    EditorPrefs.SetBool(HIDE_MUSH_KEY, hideMushroomInHierarchy);
-                    EditorPrefs.SetBool(USE_EXP_MENUS, useExperimentalMenus);
-                }
+                        // Save the preferences
+                        if (GUI.changed)
+                        {
+                            EditorPrefs.SetBool(HIDE_MUSH_KEY, hideMushroomInHierarchy);
+                            EditorPrefs.SetBool(USE_EXP_MENUS, useExperimentalMenus);
+                        }
+                    },
+
+                    // // Populate the search keywords to enable smart search filtering and label highlighting:
+                    // keywords = new HashSet<string>(new[] { "Number", "Some String" })
+                };
+
+                return provider;
            }

            public static void LoadOnScriptLoad()
--- a/Assets/Fungus/Scripts/Editor/FungusEditorResources.cs
+++ b/Assets/Fungus/Scripts/Editor/FungusEditorResources.cs
@ -146,6 +146,8 @@ namespace Fungus.EditorUtils
                writer.WriteLine("// This code is part of the Fungus library (http://fungusgames.com) maintained by Chris Gregan (http://twitter.com/gofungus).");
                writer.WriteLine("// It is released for free under the MIT open source license (https://github.com/snozbot/fungus/blob/master/LICENSE)");
                writer.WriteLine("");				
+                writer.WriteLine("#pragma warning disable 0649");
+                writer.WriteLine("");
                writer.WriteLine("using UnityEngine;");
                writer.WriteLine("");
                writer.WriteLine("namespace Fungus.EditorUtils");
--- a/Assets/Fungus/Scripts/Editor/FungusEditorResourcesGenerated.cs
+++ b/Assets/Fungus/Scripts/Editor/FungusEditorResourcesGenerated.cs
@ -1,6 +1,8 @@
 // This code is part of the Fungus library (http://fungusgames.com) maintained by Chris Gregan (http://twitter.com/gofungus).
 // It is released for free under the MIT open source license (https://github.com/snozbot/fungus/blob/master/LICENSE)

+#pragma warning disable 0649
+
 using UnityEngine;

 namespace Fungus.EditorUtils
--- a/Assets/Fungus/Thirdparty/TextMeshPro/Resources/Fonts
+++ b/Assets/Fungus/Thirdparty/TextMeshPro/Resources/Fonts
--- a/Assets/Fungus/Thirdparty/TextMeshPro/Resources/Sprite
+++ b/Assets/Fungus/Thirdparty/TextMeshPro/Resources/Sprite
@ -4,8 +4,9 @@
 Material:
  serializedVersion: 6
  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
  m_Name: TextMeshPro/Sprite
  m_Shader: {fileID: 4800000, guid: cf81c85f95fe47e1a27f6ae460cf182c, type: 3}
  m_ShaderKeywords: UNITY_UI_CLIP_RECT
@ -36,8 +37,9 @@ Material:
 --- !u!114 &11400000
 MonoBehaviour:
  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 0}
  m_Enabled: 1
  m_EditorHideFlags: 0
@ -47,7 +49,346 @@ MonoBehaviour:
  hashCode: -1836805472
  material: {fileID: 2103686}
  materialHashCode: 0
+  m_Version: 1.1.0
  spriteSheet: {fileID: 2800000, guid: dffef66376be4fa480fb02b19edbe903, type: 3}
+  m_SpriteCharacterTable:
+  - m_ElementType: 2
+    m_Unicode: 128522
+    m_GlyphIndex: 0
+    m_Scale: 1
+    m_Name: Smiling face with smiling eyes
+    m_HashCode: -1318250903
+  - m_ElementType: 2
+    m_Unicode: 128523
+    m_GlyphIndex: 1
+    m_Scale: 1
+    m_Name: 1f60b
+    m_HashCode: 57188339
+  - m_ElementType: 2
+    m_Unicode: 128525
+    m_GlyphIndex: 2
+    m_Scale: 1
+    m_Name: 1f60d
+    m_HashCode: 57188341
+  - m_ElementType: 2
+    m_Unicode: 128526
+    m_GlyphIndex: 3
+    m_Scale: 1
+    m_Name: 1f60e
+    m_HashCode: 57188340
+  - m_ElementType: 2
+    m_Unicode: 128512
+    m_GlyphIndex: 4
+    m_Scale: 1
+    m_Name: Grinning face
+    m_HashCode: -95541379
+  - m_ElementType: 2
+    m_Unicode: 128513
+    m_GlyphIndex: 5
+    m_Scale: 1
+    m_Name: 1f601
+    m_HashCode: 57188256
+  - m_ElementType: 2
+    m_Unicode: 128514
+    m_GlyphIndex: 6
+    m_Scale: 1
+    m_Name: Face with tears of joy
+    m_HashCode: 239522663
+  - m_ElementType: 2
+    m_Unicode: 128515
+    m_GlyphIndex: 7
+    m_Scale: 1
+    m_Name: 1f603
+    m_HashCode: 57188258
+  - m_ElementType: 2
+    m_Unicode: 128516
+    m_GlyphIndex: 8
+    m_Scale: 1
+    m_Name: 1f604
+    m_HashCode: 57188261
+  - m_ElementType: 2
+    m_Unicode: 128517
+    m_GlyphIndex: 9
+    m_Scale: 1
+    m_Name: 1f605
+    m_HashCode: 57188260
+  - m_ElementType: 2
+    m_Unicode: 128518
+    m_GlyphIndex: 10
+    m_Scale: 1
+    m_Name: 1f606
+    m_HashCode: 57188263
+  - m_ElementType: 2
+    m_Unicode: 128521
+    m_GlyphIndex: 11
+    m_Scale: 1
+    m_Name: 1f609
+    m_HashCode: 57188264
+  - m_ElementType: 2
+    m_Unicode: 128536
+    m_GlyphIndex: 12
+    m_Scale: 1
+    m_Name: 1f618
+    m_HashCode: 57188168
+  - m_ElementType: 2
+    m_Unicode: 129315
+    m_GlyphIndex: 13
+    m_Scale: 1
+    m_Name: 1f923
+    m_HashCode: 57200239
+  - m_ElementType: 2
+    m_Unicode: 9786
+    m_GlyphIndex: 14
+    m_Scale: 1
+    m_Name: 263a
+    m_HashCode: 1748406
+  - m_ElementType: 2
+    m_Unicode: 9785
+    m_GlyphIndex: 15
+    m_Scale: 1
+    m_Name: 2639
+    m_HashCode: 1748462
+  m_SpriteGlyphTable:
+  - m_Index: 0
+    m_Metrics:
+      m_Width: 128
+      m_Height: 128
+      m_HorizontalBearingX: 0
+      m_HorizontalBearingY: 115.6
+      m_HorizontalAdvance: 128
+    m_GlyphRect:
+      m_X: 0
+      m_Y: 384
+      m_Width: 128
+      m_Height: 128
+    m_Scale: 1
+    m_AtlasIndex: 0
+    sprite: {fileID: 0}
+  - m_Index: 1
+    m_Metrics:
+      m_Width: 128
+      m_Height: 128
+      m_HorizontalBearingX: 0
+      m_HorizontalBearingY: 115.6
+      m_HorizontalAdvance: 128
+    m_GlyphRect:
+      m_X: 128
+      m_Y: 384
+      m_Width: 128
+      m_Height: 128
+    m_Scale: 1
+    m_AtlasIndex: 0
+    sprite: {fileID: 0}
+  - m_Index: 2
+    m_Metrics:
+      m_Width: 128
+      m_Height: 128
+      m_HorizontalBearingX: 0
+      m_HorizontalBearingY: 115.6
+      m_HorizontalAdvance: 128
+    m_GlyphRect:
+      m_X: 256
+      m_Y: 384
+      m_Width: 128
+      m_Height: 128
+    m_Scale: 1
+    m_AtlasIndex: 0
+    sprite: {fileID: 0}
+  - m_Index: 3
+    m_Metrics:
+      m_Width: 128
+      m_Height: 128
+      m_HorizontalBearingX: 0
+      m_HorizontalBearingY: 115.6
+      m_HorizontalAdvance: 128
+    m_GlyphRect:
+      m_X: 384
+      m_Y: 384
+      m_Width: 128
+      m_Height: 128
+    m_Scale: 1
+    m_AtlasIndex: 0
+    sprite: {fileID: 0}
+  - m_Index: 4
+    m_Metrics:
+      m_Width: 128
+      m_Height: 128
+      m_HorizontalBearingX: 0
+      m_HorizontalBearingY: 115.6
+      m_HorizontalAdvance: 128
+    m_GlyphRect:
+      m_X: 0
+      m_Y: 256
+      m_Width: 128
+      m_Height: 128
+    m_Scale: 1
+    m_AtlasIndex: 0
+    sprite: {fileID: 0}
+  - m_Index: 5
+    m_Metrics:
+      m_Width: 128
+      m_Height: 128
+      m_HorizontalBearingX: 0
+      m_HorizontalBearingY: 115.6
+      m_HorizontalAdvance: 128
+    m_GlyphRect:
+      m_X: 128
+      m_Y: 256
+      m_Width: 128
+      m_Height: 128
+    m_Scale: 1
+    m_AtlasIndex: 0
+    sprite: {fileID: 0}
+  - m_Index: 6
+    m_Metrics:
+      m_Width: 128
+      m_Height: 128
+      m_HorizontalBearingX: 0
+      m_HorizontalBearingY: 115.6
+      m_HorizontalAdvance: 128
+    m_GlyphRect:
+      m_X: 256
+      m_Y: 256
+      m_Width: 128
+      m_Height: 128
+    m_Scale: 1
+    m_AtlasIndex: 0
+    sprite: {fileID: 0}
+  - m_Index: 7
+    m_Metrics:
+      m_Width: 128
+      m_Height: 128
+      m_HorizontalBearingX: 0
+      m_HorizontalBearingY: 115.6
+      m_HorizontalAdvance: 128
+    m_GlyphRect:
+      m_X: 384
+      m_Y: 256
+      m_Width: 128
+      m_Height: 128
+    m_Scale: 1
+    m_AtlasIndex: 0
+    sprite: {fileID: 0}
+  - m_Index: 8
+    m_Metrics:
+      m_Width: 128
+      m_Height: 128
+      m_HorizontalBearingX: 0
+      m_HorizontalBearingY: 115.6
+      m_HorizontalAdvance: 128
+    m_GlyphRect:
+      m_X: 0
+      m_Y: 128
+      m_Width: 128
+      m_Height: 128
+    m_Scale: 1
+    m_AtlasIndex: 0
+    sprite: {fileID: 0}
+  - m_Index: 9
+    m_Metrics:
+      m_Width: 128
+      m_Height: 128
+      m_HorizontalBearingX: 0
+      m_HorizontalBearingY: 115.6
+      m_HorizontalAdvance: 128
+    m_GlyphRect:
+      m_X: 128
+      m_Y: 128
+      m_Width: 128
+      m_Height: 128
+    m_Scale: 1
+    m_AtlasIndex: 0
+    sprite: {fileID: 0}
+  - m_Index: 10
+    m_Metrics:
+      m_Width: 128
+      m_Height: 128
+      m_HorizontalBearingX: 0
+      m_HorizontalBearingY: 115.6
+      m_HorizontalAdvance: 128
+    m_GlyphRect:
+      m_X: 256
+      m_Y: 128
+      m_Width: 128
+      m_Height: 128
+    m_Scale: 1
+    m_AtlasIndex: 0
+    sprite: {fileID: 0}
+  - m_Index: 11
+    m_Metrics:
+      m_Width: 128
+      m_Height: 128
+      m_HorizontalBearingX: 0
+      m_HorizontalBearingY: 115.6
+      m_HorizontalAdvance: 128
+    m_GlyphRect:
+      m_X: 384
+      m_Y: 128
+      m_Width: 128
+      m_Height: 128
+    m_Scale: 1
+    m_AtlasIndex: 0
+    sprite: {fileID: 0}
+  - m_Index: 12
+    m_Metrics:
+      m_Width: 128
+      m_Height: 128
+      m_HorizontalBearingX: 0
+      m_HorizontalBearingY: 115.6
+      m_HorizontalAdvance: 128
+    m_GlyphRect:
+      m_X: 0
+      m_Y: 0
+      m_Width: 128
+      m_Height: 128
+    m_Scale: 1
+    m_AtlasIndex: 0
+    sprite: {fileID: 0}
+  - m_Index: 13
+    m_Metrics:
+      m_Width: 128
+      m_Height: 128
+      m_HorizontalBearingX: 0
+      m_HorizontalBearingY: 115.6
+      m_HorizontalAdvance: 128
+    m_GlyphRect:
+      m_X: 128
+      m_Y: 0
+      m_Width: 128
+      m_Height: 128
+    m_Scale: 1
+    m_AtlasIndex: 0
+    sprite: {fileID: 0}
+  - m_Index: 14
+    m_Metrics:
+      m_Width: 128
+      m_Height: 128
+      m_HorizontalBearingX: 0
+      m_HorizontalBearingY: 115.6
+      m_HorizontalAdvance: 128
+    m_GlyphRect:
+      m_X: 256
+      m_Y: 0
+      m_Width: 128
+      m_Height: 128
+    m_Scale: 1
+    m_AtlasIndex: 0
+    sprite: {fileID: 0}
+  - m_Index: 15
+    m_Metrics:
+      m_Width: 128
+      m_Height: 128
+      m_HorizontalBearingX: 0
+      m_HorizontalBearingY: 115.6
+      m_HorizontalAdvance: 128
+    m_GlyphRect:
+      m_X: 384
+      m_Y: 0
+      m_Width: 128
+      m_Height: 128
+    m_Scale: 1
+    m_AtlasIndex: 0
+    sprite: {fileID: 0}
  spriteInfoList:
  - id: 0
    x: 0
@ -278,8 +619,9 @@ MonoBehaviour:
 Material:
  serializedVersion: 6
  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
  m_Name: TextMeshPro/Sprite
  m_Shader: {fileID: 4800000, guid: cf81c85f95fe47e1a27f6ae460cf182c, type: 3}
  m_ShaderKeywords: 
--- a/Assets/Tests/Perf.meta
+++ b/Assets/Tests/Perf.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: e02cb2d24b7c2428d9d4aa9a085b0914
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Logs/Packages-Update.log
+++ b/Logs/Packages-Update.log
@ -0,0 +1,16 @@
+
+=== Fri May  3 22:24:04 2019
+
+Packages were changed.
+Update Mode: updateDependencies
+
+The following packages were added:
+  com.unity.timeline@1.0.0
+  com.unity.multiplayer-hlapi@1.0.2
+  com.unity.xr.legacyinputhelpers@2.0.2
+The following packages were updated:
+  com.unity.analytics from version 3.2.2 to 3.3.2
+  com.unity.collab-proxy from version 1.2.15 to 1.2.16
+  com.unity.package-manager-ui from version 2.0.3 to 2.1.2
+  com.unity.purchasing from version 2.0.3 to 2.0.6
+  com.unity.textmeshpro from version 1.3.0 to 2.0.0
--- a/Packages/manifest.json
+++ b/Packages/manifest.json
@ -1,11 +1,14 @@
 {
  "dependencies": {
    "com.unity.ads": "2.3.1",
-    "com.unity.analytics": "3.2.2",
-    "com.unity.collab-proxy": "1.2.15",
-    "com.unity.package-manager-ui": "2.0.3",
-    "com.unity.purchasing": "2.0.3",
-    "com.unity.textmeshpro": "1.3.0",
+    "com.unity.analytics": "3.3.2",
+    "com.unity.collab-proxy": "1.2.16",
+    "com.unity.multiplayer-hlapi": "1.0.2",
+    "com.unity.package-manager-ui": "2.1.2",
+    "com.unity.purchasing": "2.0.6",
+    "com.unity.textmeshpro": "2.0.0",
+    "com.unity.timeline": "1.0.0",
+    "com.unity.xr.legacyinputhelpers": "2.0.2",
    "com.unity.modules.ai": "1.0.0",
    "com.unity.modules.animation": "1.0.0",
    "com.unity.modules.assetbundle": "1.0.0",
--- a/ProjectSettings/ProjectSettings.asset
+++ b/ProjectSettings/ProjectSettings.asset
@ -3,7 +3,7 @@
 --- !u!129 &1
 PlayerSettings:
  m_ObjectHideFlags: 0
-  serializedVersion: 15
+  serializedVersion: 16
  productGUID: 47d9f350ed27d4ecaa6699f3ebe641c8
  AndroidProfiler: 0
  AndroidFilterTouchesWhenObscured: 0
@ -52,7 +52,6 @@ PlayerSettings:
  m_StackTraceTypes: 010000000100000001000000010000000100000001000000
  iosShowActivityIndicatorOnLoading: -1
  androidShowActivityIndicatorOnLoading: -1
-  tizenShowActivityIndicatorOnLoading: -1
  iosAppInBackgroundBehavior: 0
  displayResolutionDialog: 1
  iosAllowHTTPDownload: 1
@ -64,6 +63,8 @@ PlayerSettings:
  use32BitDisplayBuffer: 1
  preserveFramebufferAlpha: 0
  disableDepthAndStencilBuffers: 0
+  androidStartInFullscreen: 1
+  androidRenderOutsideSafeArea: 1
  androidBlitType: 0
  defaultIsNativeResolution: 1
  macRetinaSupport: 1
@ -97,9 +98,6 @@ PlayerSettings:
  xboxEnableGuest: 0
  xboxEnablePIXSampling: 0
  metalFramebufferOnly: 0
-  n3dsDisableStereoscopicView: 0
-  n3dsEnableSharedListOpt: 1
-  n3dsEnableVSync: 0
  xboxOneResolution: 0
  xboxOneSResolution: 0
  xboxOneXResolution: 3
@ -108,9 +106,12 @@ PlayerSettings:
  xboxOneDisableEsram: 0
  xboxOnePresentImmediateThreshold: 0
  switchQueueCommandMemory: 0
-  videoMemoryForVertexBuffers: 0
-  psp2PowerMode: 0
-  psp2AcquireBGM: 1
+  switchQueueControlMemory: 16384
+  switchQueueComputeMemory: 262144
+  switchNVNShaderPoolsGranularity: 33554432
+  switchNVNDefaultPoolsGranularity: 16777216
+  switchNVNOtherPoolsGranularity: 16777216
+  vulkanEnableSetSRGBWrite: 0
  m_SupportedAspectRatios:
    4:3: 1
    5:4: 1
@ -138,11 +139,19 @@ PlayerSettings:
    hololens:
      depthFormat: 1
      depthBufferSharingEnabled: 0
-    enable360StereoCapture: 0
+    lumin:
+      depthFormat: 0
+      frameTiming: 2
+      enableGLCache: 0
+      glCacheMaxBlobSize: 524288
+      glCacheMaxFileSize: 8388608
    oculus:
      sharedDepthBuffer: 0
      dashSupport: 0
+    enable360StereoCapture: 0
+  isWsaHolographicRemotingEnabled: 0
  protectGraphicsMemory: 0
+  enableFrameTimingStats: 0
  useHDRDisplay: 0
  m_ColorGamuts: 00000000
  targetPixelDensity: 30
@ -153,10 +162,10 @@ PlayerSettings:
    Android: com.fungus.sherlock
    Standalone: unity.Fungus.Sherlock
    Tizen: com.fungus.sherlock
-    iOS: com.fungus.sherlock
+    iPhone: com.fungus.sherlock
    tvOS: com.fungus.sherlock
  buildNumber:
-    iOS: 0
+    iPhone: 0
  AndroidBundleVersionCode: 1
  AndroidMinSdkVersion: 16
  AndroidTargetSdkVersion: 0
@ -173,7 +182,7 @@ PlayerSettings:
  StripUnusedMeshComponents: 0
  VertexChannelCompressionMask: 214
  iPhoneSdkVersion: 988
-  iOSTargetOSVersionString: 8.0
+  iOSTargetOSVersionString: 9.0
  tvOSSdkVersion: 0
  tvOSRequireExtendedGameController: 0
  tvOSTargetOSVersionString: 9.0
@ -195,6 +204,10 @@ PlayerSettings:
  iPadHighResPortraitSplashScreen: {fileID: 0}
  iPadLandscapeSplashScreen: {fileID: 0}
  iPadHighResLandscapeSplashScreen: {fileID: 0}
+  iPhone65inPortraitSplashScreen: {fileID: 0}
+  iPhone65inLandscapeSplashScreen: {fileID: 0}
+  iPhone61inPortraitSplashScreen: {fileID: 0}
+  iPhone61inLandscapeSplashScreen: {fileID: 0}
  appleTVSplashScreen: {fileID: 0}
  appleTVSplashScreen2x: {fileID: 0}
  tvOSSmallIconLayers: []
@ -238,6 +251,7 @@ PlayerSettings:
  tvOSManualSigningProvisioningProfileType: 0
  appleEnableAutomaticSigning: 0
  iOSRequireARKit: 0
+  iOSAutomaticallyDetectAndAddCapabilities: 1
  appleEnableProMotion: 0
  clonedFromGUID: 00000000000000000000000000000000
  templatePackageId: 
@ -245,13 +259,15 @@ PlayerSettings:
  AndroidTargetArchitectures: 5
  AndroidSplashScreenScale: 0
  androidSplashScreen: {fileID: 0}
-  AndroidKeystoreName: 
+  AndroidKeystoreName: '{inproject}: '
  AndroidKeyaliasName: 
+  AndroidBuildApkPerCpuArchitecture: 0
  AndroidTVCompatibility: 1
  AndroidIsGame: 1
  AndroidEnableTango: 0
  androidEnableBanner: 1
  androidUseLowAccuracyLocation: 0
+  androidUseCustomKeystore: 0
  m_AndroidBanners:
  - width: 320
    height: 180
@ -277,7 +293,7 @@ PlayerSettings:
    m_Enabled: 0
    m_Devices:
    - Oculus
-  - m_BuildTarget: Metro
+  - m_BuildTarget: Windows Store Apps
    m_Enabled: 0
    m_Devices: []
  - m_BuildTarget: N3DS
@ -321,7 +337,7 @@ PlayerSettings:
  - m_BuildTarget: XboxOne
    m_Enabled: 0
    m_Devices: []
-  - m_BuildTarget: iOS
+  - m_BuildTarget: iPhone
    m_Enabled: 0
    m_Devices: []
  - m_BuildTarget: tvOS
@ -330,6 +346,7 @@ PlayerSettings:
  m_BuildTargetEnableVuforiaSettings: []
  openGLRequireES31: 0
  openGLRequireES31AEP: 0
+  openGLRequireES32: 0
  m_TemplateCustomTags: {}
  mobileMTRendering:
    iPhone: 1
@ -341,6 +358,7 @@ PlayerSettings:
    m_EncodingQuality: 1
  - m_BuildTarget: PS4
    m_EncodingQuality: 1
+  m_BuildTargetGroupLightmapSettings: []
  playModeTestRunnerEnabled: 0
  runPlayModeTestAsEditModeTest: 0
  actionOnDotNetUnhandledException: 1
@ -462,7 +480,12 @@ PlayerSettings:
  switchAllowsVideoCapturing: 1
  switchAllowsRuntimeAddOnContentInstall: 0
  switchDataLossConfirmation: 0
+  switchUserAccountLockEnabled: 0
+  switchSystemResourceMemory: 16777216
  switchSupportedNpadStyles: 3
+  switchNativeFsCacheSize: 32
+  switchIsHoldTypeHorizontal: 0
+  switchSupportedNpadCount: 8
  switchSocketConfigEnabled: 0
  switchTcpInitialSendBufferSize: 32
  switchTcpInitialReceiveBufferSize: 64
@ -512,6 +535,7 @@ PlayerSettings:
  ps4DownloadDataSize: 0
  ps4GarlicHeapSize: 2048
  ps4ProGarlicHeapSize: 2560
+  playerPrefsMaxSize: 32768
  ps4Passcode: 5PN2qmWqBlQ9wQj99nsQzldVI5ZuGXbE
  ps4pnSessions: 1
  ps4pnPresence: 1
@ -519,6 +543,7 @@ PlayerSettings:
  ps4pnGameCustomData: 1
  playerPrefsSupport: 0
  enableApplicationExit: 0
+  resetTempFolder: 1
  restrictedAudioUsageRights: 0
  ps4UseResolutionFallback: 0
  ps4ReprojectionSupport: 0
@ -542,53 +567,6 @@ PlayerSettings:
  ps4attribEyeToEyeDistanceSettingVR: 0
  ps4IncludedModules: []
  monoEnv: 
-  psp2Splashimage: {fileID: 0}
-  psp2NPTrophyPackPath: 
-  psp2NPSupportGBMorGJP: 0
-  psp2NPAgeRating: 12
-  psp2NPTitleDatPath: 
-  psp2NPCommsID: 
-  psp2NPCommunicationsID: 
-  psp2NPCommsPassphrase: 
-  psp2NPCommsSig: 
-  psp2ParamSfxPath: 
-  psp2ManualPath: 
-  psp2LiveAreaGatePath: 
-  psp2LiveAreaBackroundPath: 
-  psp2LiveAreaPath: 
-  psp2LiveAreaTrialPath: 
-  psp2PatchChangeInfoPath: 
-  psp2PatchOriginalPackage: 
-  psp2PackagePassword: N2qmWqBlQ9wQj99nsQzldVI5ZuGXbEWR
-  psp2KeystoneFile: 
-  psp2MemoryExpansionMode: 0
-  psp2DRMType: 0
-  psp2StorageType: 0
-  psp2MediaCapacity: 0
-  psp2DLCConfigPath: 
-  psp2ThumbnailPath: 
-  psp2BackgroundPath: 
-  psp2SoundPath: 
-  psp2TrophyCommId: 
-  psp2TrophyPackagePath: 
-  psp2PackagedResourcesPath: 
-  psp2SaveDataQuota: 10240
-  psp2ParentalLevel: 1
-  psp2ShortTitle: Not Set
-  psp2ContentID: IV0000-ABCD12345_00-0123456789ABCDEF
-  psp2Category: 0
-  psp2MasterVersion: 01.00
-  psp2AppVersion: 01.00
-  psp2TVBootMode: 0
-  psp2EnterButtonAssignment: 2
-  psp2TVDisableEmu: 0
-  psp2AllowTwitterDialog: 1
-  psp2Upgradable: 0
-  psp2HealthWarning: 0
-  psp2UseLibLocation: 0
-  psp2InfoBarOnStartup: 0
-  psp2InfoBarColor: 0
-  psp2ScriptOptimizationLevel: 0
  splashScreenBackgroundSourceLandscape: {fileID: 0}
  splashScreenBackgroundSourcePortrait: {fileID: 0}
  spritePackerPolicy: 
@ -604,6 +582,8 @@ PlayerSettings:
  webGLUseEmbeddedResources: 0
  webGLCompressionFormat: 1
  webGLLinkerTarget: 0
+  webGLThreadsSupport: 0
+  webGLWasmStreaming: 0
  scriptingDefineSymbols:
    1: CROSS_PLATFORM_INPUT
    4: CROSS_PLATFORM_INPUT;MOBILE_INPUT
@ -611,19 +591,22 @@ PlayerSettings:
    14: MOBILE_INPUT
    17: MOBILE_INPUT
  platformArchitecture:
-    iOS: 2
+    iPhone: 2
  scriptingBackend:
    Android: 0
-    Metro: 2
    Standalone: 0
    WebGL: 1
-    iOS: 0
+    Windows Store Apps: 2
+    iPhone: 0
  il2cppCompilerConfiguration: {}
+  managedStrippingLevel: {}
  incrementalIl2cppBuild:
-    iOS: 0
+    iPhone: 0
  allowUnsafeCode: 0
  additionalIl2CppArgs: 
-  scriptingRuntimeVersion: 0
+  scriptingRuntimeVersion: 1
+  gcIncremental: 0
+  gcWBarrierValidation: 0
  apiCompatibilityLevelPerPlatform: {}
  m_RenderingPath: 1
  m_MobileRenderingPath: 1
@ -637,40 +620,22 @@ PlayerSettings:
  metroApplicationDescription: Fungus
  wsaImages: {}
  metroTileShortName: 
-  metroCommandLineArgsFile: 
  metroTileShowName: 1
  metroMediumTileShowName: 0
  metroLargeTileShowName: 0
  metroWideTileShowName: 0
+  metroSupportStreamingInstall: 0
+  metroLastRequiredScene: 0
  metroDefaultTileSize: 1
  metroTileForegroundText: 1
  metroTileBackgroundColor: {r: 0, g: 0, b: 0, a: 1}
  metroSplashScreenBackgroundColor: {r: 0, g: 0, b: 0, a: 1}
  metroSplashScreenUseBackgroundColor: 0
  platformCapabilities: {}
+  metroTargetDeviceFamilies: {}
  metroFTAName: 
  metroFTAFileTypes: []
  metroProtocolName: 
-  metroCompilationOverrides: 1
-  tizenProductDescription: 
-  tizenProductURL: 
-  tizenSigningProfileName: 
-  tizenGPSPermissions: 0
-  tizenMicrophonePermissions: 0
-  tizenDeploymentTarget: 
-  tizenDeploymentTargetType: -1
-  tizenMinOSVersion: 1
-  n3dsUseExtSaveData: 0
-  n3dsCompressStaticMem: 1
-  n3dsExtSaveDataNumber: 0x12345
-  n3dsStackSize: 131072
-  n3dsTargetPlatform: 2
-  n3dsRegion: 7
-  n3dsMediaSize: 0
-  n3dsLogoStyle: 3
-  n3dsTitle: GameName
-  n3dsProductCode: 
-  n3dsApplicationId: 0xFF3FF
  XboxOneProductId: 
  XboxOneUpdateKey: 
  XboxOneSandboxId: 
@ -680,6 +645,7 @@ PlayerSettings:
  XboxOneGameOsOverridePath: 
  XboxOnePackagingOverridePath: 
  XboxOneAppManifestOverridePath: 
+  XboxOneVersion: 1.0.0.0
  XboxOnePackageEncryption: 0
  XboxOnePackageUpdateGranularity: 2
  XboxOneDescription: 
@ -695,6 +661,7 @@ PlayerSettings:
  XboxOnePersistentLocalStorageSize: 0
  XboxOneXTitleMemory: 8
  xboxOneScriptCompiler: 0
+  XboxOneOverrideIdentityName: 
  vrEditorSettings:
    daydream:
      daydreamIconForeground: {fileID: 0}
@ -709,11 +676,30 @@ PlayerSettings:
    Purchasing: 0
    UNet: 0
    Unity_Ads: 0
+  luminIcon:
+    m_Name: 
+    m_ModelFolderPath: 
+    m_PortalFolderPath: 
+  luminCert:
+    m_CertPath: 
+    m_SignPackage: 1
+  luminIsChannelApp: 0
+  luminVersion:
+    m_VersionCode: 1
+    m_VersionName: 
  facebookSdkVersion: 7.9.1
+  facebookAppId: 
+  facebookCookies: 1
+  facebookLogging: 1
+  facebookStatus: 1
+  facebookXfbml: 0
+  facebookFrictionlessRequests: 1
  apiCompatibilityLevel: 2
  cloudProjectId: 
+  framebufferDepthMemorylessMode: 0
  projectName: 
  organizationId: 
  cloudEnabled: 0
  enableNativePlatformBackendsForNewInputSystem: 0
  disableOldInputManagerSupport: 0
+  legacyClampBlendShapeWeights: 1
--- a/ProjectSettings/ProjectVersion.txt
+++ b/ProjectSettings/ProjectVersion.txt
@ -1 +1,2 @@
-m_EditorVersion: 2018.3.6f1
+m_EditorVersion: 2019.1.0f2
+m_EditorVersionWithRevision: 2019.1.0f2 (292b93d75a2c)
--- a/ProjectSettings/XRSettings.asset
+++ b/ProjectSettings/XRSettings.asset
@ -0,0 +1,10 @@
+{
+    "m_SettingKeys": [
+        "VR Device Disabled",
+        "VR Device User Alert"
+    ],
+    "m_SettingValues": [
+        "False",
+        "False"
+    ]
+}