Merge branch 'beta'

Author: keithbradner

Assets/SteamVR/Editor/SteamVR_AutoEnableVR.cs

@@ -23,7 +23,7 @@ static SteamVR_AutoEnableVR()
         protected const string openVRString = "OpenVR";
         protected const string openVRPackageString = "com.unity.xr.openvr.standalone";
 
-#if UNITY_2018_1_OR_NEWER
+#if UNITY_2018_2_OR_NEWER
         private enum PackageStates
         {
             None,
@@ -91,7 +91,7 @@ public static void Update()
                     Debug.Log("<b>[SteamVR Setup]</b> Added OpenVR to supported VR SDKs list.");
                 }
 
-#if UNITY_2018_1_OR_NEWER
+#if UNITY_2018_2_OR_NEWER
                 //2018+ requires us to manually add the OpenVR package
 
                 switch (packageState)

Assets/SteamVR/Editor/SteamVR_UnitySettingsWindow.cs

@@ -92,8 +92,10 @@ static void Update()
                     PlayerSettings.defaultScreenHeight != recommended_DefaultScreenHeight)) ||
                 (!EditorPrefs.HasKey(ignore + runInBackground) &&
                     PlayerSettings.runInBackground != recommended_RunInBackground) ||
+#if !UNITY_2019_1_OR_NEWER
                 (!EditorPrefs.HasKey(ignore + displayResolutionDialog) &&
                     PlayerSettings.displayResolutionDialog != recommended_DisplayResolutionDialog) ||
+#endif
                 (!EditorPrefs.HasKey(ignore + resizableWindow) &&
                     PlayerSettings.resizableWindow != recommended_ResizableWindow) ||
                 (!EditorPrefs.HasKey(ignore + visibleInBackground) &&
@@ -320,6 +322,7 @@ public void OnGUI()
                 GUILayout.EndHorizontal();
             }
 
+#if !UNITY_2019_1_OR_NEWER
             if (!EditorPrefs.HasKey(ignore + displayResolutionDialog) &&
                 PlayerSettings.displayResolutionDialog != recommended_DisplayResolutionDialog)
             {
@@ -343,6 +346,7 @@ public void OnGUI()
 
                 GUILayout.EndHorizontal();
             }
+#endif
 
             if (!EditorPrefs.HasKey(ignore + resizableWindow) &&
                 PlayerSettings.resizableWindow != recommended_ResizableWindow)
@@ -593,8 +597,10 @@ public void OnGUI()
                     }
                     if (!EditorPrefs.HasKey(ignore + runInBackground))
                         PlayerSettings.runInBackground = recommended_RunInBackground;
+#if !UNITY_2019_1_OR_NEWER
                     if (!EditorPrefs.HasKey(ignore + displayResolutionDialog))
                         PlayerSettings.displayResolutionDialog = recommended_DisplayResolutionDialog;
+#endif
                     if (!EditorPrefs.HasKey(ignore + resizableWindow))
                         PlayerSettings.resizableWindow = recommended_ResizableWindow;
                     if (!EditorPrefs.HasKey(ignore + visibleInBackground))
@@ -648,8 +654,10 @@ public void OnGUI()
                             EditorPrefs.SetBool(ignore + defaultScreenSize, true);
                         if (PlayerSettings.runInBackground != recommended_RunInBackground)
                             EditorPrefs.SetBool(ignore + runInBackground, true);
+#if !UNITY_2019_1_OR_NEWER
                         if (PlayerSettings.displayResolutionDialog != recommended_DisplayResolutionDialog)
                             EditorPrefs.SetBool(ignore + displayResolutionDialog, true);
+#endif
                         if (PlayerSettings.resizableWindow != recommended_ResizableWindow)
                             EditorPrefs.SetBool(ignore + resizableWindow, true);
                         if (PlayerSettings.visibleInBackground != recommended_VisibleInBackground)