Merge branch 'development' into release-3.3.4

Assets/Plugins/Android/Core/AndroidConfig.cs

@@ -22,21 +22,30 @@
 
 namespace PlayEveryWare.EpicOnlineServices
 {
-    // Flags specifically for Android
+    // Flags specifically for Android. Note that labels for the baser
+    // PlatformConfig need to be specified here.
+    [ConfigGroup("Android Config", new[]
+    {
+     "Android-Specific Options",
+     "Deployment",
+     "Flags",
+     "Tick Budgets",
+     "Overlay Options"
+     }, false)]
     public class AndroidConfig : PlatformConfig
     {
         [ConfigField("Google Login Client ID",
             ConfigFieldType.Text,
             "Get your project's Google Login Client ID from the " +
             "Google Cloud dashboard",
-            -1,
+            0,
             "https://console.cloud.google.com/apis/dashboard")]
         public string GoogleLoginClientID;
 
         [ConfigField("Google Login Nonce",
             ConfigFieldType.Text,
             "Use a nonce to improve sign-ing security on Android.",
-            -1,
+            0,
             "https://developer.android.com/google/play/integrity/classic#nonce")]
         public string GoogleLoginNonce;
 

Assets/Plugins/Linux/Core/LinuxConfig.cs

@@ -24,8 +24,17 @@ namespace PlayEveryWare.EpicOnlineServices
 {
     using System;
 
-    // Flags specifically for Linux
+    // Flags specifically for Linux. Note that labels for the baser
+    // PlatformConfig need to be specified here.
     [Serializable]
+    [ConfigGroup("Linux Config", new[]
+    {
+        "Linux-Specific Options",
+        "Deployment",
+        "Flags",
+        "Tick Budgets",
+        "Overlay Options"
+    }, false)]
     public class LinuxConfig : PlatformConfig
     {
         static LinuxConfig()

Assets/Plugins/Source/Editor/ConfigEditors/ConfigEditor.cs

@@ -20,6 +20,8 @@
 * SOFTWARE.
 */
 
+#if !EOS_DISABLE
+
 namespace PlayEveryWare.EpicOnlineServices.Editor
 {
     using System;
@@ -250,4 +252,6 @@ public void Dispose()
             _animExpanded?.valueChanged.RemoveAllListeners();
         }
     }
-}
+}
+
+#endif

Assets/Plugins/Source/Editor/ConfigEditors/PlatformConfigEditor.cs

@@ -19,10 +19,12 @@
 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 * SOFTWARE.
 */
+
+#if !EOS_DISABLE
+
 namespace PlayEveryWare.EpicOnlineServices.Editor
 {
     using System.Linq;
-    using UnityEditor;
     using UnityEngine;
     using Utility;
 
@@ -57,4 +59,6 @@ public override sealed void RenderContents()
             GUIEditorUtility.RenderInputs(ref config);
         }
     }
-}
+}
+
+#endif

Assets/Plugins/Source/Editor/EditorWindows/EOSPluginSettingsWindow.cs

@@ -20,20 +20,18 @@
 * SOFTWARE.
 */
 
-using System;
-using System.IO;
-using UnityEditor;
-using UnityEngine;
-using System.Collections.Generic;
+#if !EOS_DISABLE
 
 namespace PlayEveryWare.EpicOnlineServices.Editor.Windows
 {
+    using System;
+    using System.IO;
+    using UnityEditor;
+    using UnityEngine;
+    using System.Collections.Generic;
     using Config;
     using System.Linq;
     using System.Threading.Tasks;
-    using UnityEditor.AnimatedValues;
-    using Utility;
-    using Config = EpicOnlineServices.Config;
 
     /// <summary>
     /// Creates the view for showing the eos plugin editor config values.
@@ -164,4 +162,6 @@ private void Save()
             AssetDatabase.Refresh();
         }
     }
-}
+}
+
+#endif

Assets/Plugins/Source/Editor/EditorWindows/EOSUnitTestSettingsWindow.cs

@@ -20,6 +20,8 @@
  * SOFTWARE.
  */
 
+#if !EOS_DISABLE
+
 namespace PlayEveryWare.EpicOnlineServices.Tests.Editor
 {
     using EpicOnlineServices.Editor;
@@ -60,3 +62,4 @@ protected async override void RenderWindow()
         }
     }
 }
+#endif

Assets/Plugins/Source/Editor/Platforms/Android/AndroidBuilder.cs

@@ -20,6 +20,8 @@
  * SOFTWARE.
  */
 
+#if !EOS_DISABLE
+
 namespace PlayEveryWare.EpicOnlineServices.Editor.Build
 {
     using Config;
@@ -398,4 +400,6 @@ private static void CopyFromSourceToPluginFolder_Android(string sourcePath, stri
                 Path.Combine(destPath, filename), true);
         }
     }
-}
+}
+
+#endif

Assets/Plugins/Source/Editor/Utility/PackageFileUtility.cs

@@ -28,8 +28,8 @@
 
 namespace PlayEveryWare.EpicOnlineServices.Utility
 {
+    using Common.Extensions;
     using Editor.Build;
-    using Extensions;
     using System.Linq;
     using System.Threading;
     using System.Threading.Tasks;

Assets/Plugins/Windows/Core/WindowsConfig.cs

@@ -26,6 +26,14 @@ namespace PlayEveryWare.EpicOnlineServices
 
     // Flags specifically for Windows
     [Serializable]
+    [ConfigGroup("Windows Config", new[]
+    {
+        "Windows-Specific Options",
+        "Deployment",
+        "Flags",
+        "Tick Budgets",
+        "Overlay Options"
+    }, false)]
     public class WindowsConfig : PlatformConfig
     {
         static WindowsConfig()

Assets/Plugins/iOS/Core/IOSConfig.cs

@@ -24,8 +24,17 @@ namespace PlayEveryWare.EpicOnlineServices
 {
     using System;
 
-    // Flags specifically for iOS
+    // Flags specifically for iOS. Note that labels for the baser
+    // PlatformConfig need to be specified here.
     [Serializable]
+    [ConfigGroup("EOS Config", new[]
+    {
+        "iOS-Specific Options",
+        "Deployment",
+        "Flags",
+        "Tick Budgets",
+        "Overlay Options"
+    }, false)]
     public class IOSConfig : PlatformConfig
     {
         static IOSConfig()

Assets/Plugins/macOS/Core/MacOSConfig.cs

@@ -26,6 +26,14 @@ namespace PlayEveryWare.EpicOnlineServices
 
     // Flags specifically for macOS
     [Serializable]
+    [ConfigGroup("MacOS Config", new[]
+    {
+        "MacOS-Specific Options",
+        "Deployment",
+        "Flags",
+        "Tick Budgets",
+        "Overlay Options"
+    }, false)]
     public class MacOSConfig : PlatformConfig
     {
         static MacOSConfig()

Assets/Scripts/P2PNetcodeSample/UI/P2PNetcode/UIP2PTransportMenu.cs

@@ -434,10 +434,8 @@ private void RemoveJoinListener()
             }
         }
 
-        public override void Hide()
+        protected override void HideInternal()
         {
-            base.Hide();
-
             if (isClient || isHost)
             {
                 DisconnectOnClick();
@@ -454,10 +452,8 @@ public override void Hide()
             RemoveJoinListener();
         }
 
-        public override void Show()
+        protected override void ShowInternal()
         {
-            base.Show();
-
             Background.enabled = false;
 
             SetSessionUIActive(false);

Assets/Scripts/StandardSamples/Oculus/OculusManager.cs

@@ -24,9 +24,12 @@
 #define DISABLEOCULUS
 #endif
 
+#if !DISABLEOCULUS
+    using OculusWrapper = Oculus; // Don't forget to import Oculus.unitypackage from Legacy Oculus SDK
+#endif
+
 namespace PlayEveryWare.EpicOnlineServices.Samples.Oculus
 {
-
     using System.Collections.Generic;
     using UnityEngine;
     using System;
@@ -35,10 +38,6 @@ namespace PlayEveryWare.EpicOnlineServices.Samples.Oculus
     using System.Text;
     using System.Threading.Tasks;
 
-#if !DISABLEOCULUS
-    using OculusWrapper = Oculus; //if erroring Dont forget to import Oculus' .unitypackage
-#endif
-
     [DisallowMultipleComponent]
     public class OculusManager : MonoBehaviour
     {

Assets/Scripts/StandardSamples/Oculus/com.playeveryware.eos.samples.oculus.asmdef

@@ -2,7 +2,7 @@
     "name": "com.playeveryware.eos.samples.oculus",
     "rootNamespace": "",
     "references": [
-        "GUID:8be792bc795f6734c9b03442335cf985"
+        "GUID:e183dfe6fccb38f40bc810cdf9e63215"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],

Assets/Scripts/StandardSamples/UI/Achievements/UIAchievementsMenu.cs

@@ -62,6 +62,12 @@ class AchievementData
 
         protected override void Awake()
         {
+            // Hide the Achievement Locked / Unlocked icons at the start,
+            // only making them active after we've fetched images for them.
+            // Otherwise, there will appear to be white squares in the sample.
+            achievementLockedIcon.gameObject.SetActive(false);
+            achievementUnlockedIcon.gameObject.SetActive(false);
+
             base.Awake();
             AchievementsService.Instance.Updated += OnAchievementDataUpdated;
         }
@@ -212,6 +218,13 @@ public async void OnDefinitionIdButtonClicked(int i)
 
             var achievementData = achievementDataList[i];
             var definition = achievementData.Definition;
+
+            // Set both icons to be hidden
+            achievementLockedIcon.gameObject.SetActive(false);
+            achievementUnlockedIcon.gameObject.SetActive(false);
+
+            // Asynchronously retrieve the icons and set the textures
+            // DisplayPlayerAchievement then will set the appropriate icon to be visible
             achievementUnlockedIcon.texture = await AchievementsService.Instance.GetAchievementUnlockedIconTexture(definition.AchievementId);
             achievementLockedIcon.texture = await AchievementsService.Instance.GetAchievementLockedIconTexture(definition.AchievementId);