Merge pull request #961 from PlayEveryWare/integrate/1.16.4

WispyMouse · WispyMouse · commit 8bb82b76d819 · 2024-11-20T13:01:31.000-08:00
integrate/Integrate 1.16.4
diff --git a/Assets/Plugins/Linux/libEOSSDK-Linux-Shipping.so b/Assets/Plugins/Linux/libEOSSDK-Linux-Shipping.so
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:aa2712cc2ae3e8a997803b8a8e31f48c3af027d9a071e0f17cde49e6a7c8df41
-size 28348072
+oid sha256:78c79a46b31919256f415a59080ab8bf3123d1025664a9667dc0f457aff04f75
+size 28413432
diff --git a/Assets/Plugins/Windows/x64/EOSSDK-Win64-Shipping.dll b/Assets/Plugins/Windows/x64/EOSSDK-Win64-Shipping.dll
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:284201afa667e80f3feeeb45200516169467b56765a9adfe55ce5406099c62ab
-size 18104808
+oid sha256:aba8695b971b5e247a03b0269ca0678c3d164d6ac1b15c78f512356ada74d09e
+size 18199528
diff --git a/Assets/Plugins/Windows/x86/EOSSDK-Win32-Shipping.dll b/Assets/Plugins/Windows/x86/EOSSDK-Win32-Shipping.dll
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:63706183da128ef27291e51f0d439dee26d9af8f329ef6fb5a73fbb6842b599e
-size 13922280
+oid sha256:ab1c4bea182420d7c01def7799fd5ce6297df8eb08d8e04ff547888b987a797e
+size 13966312
diff --git a/Assets/Plugins/iOS/EOSSDK.framework/EOSSDK b/Assets/Plugins/iOS/EOSSDK.framework/EOSSDK
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3f7284bd478fbadb5a6f2d0afdaeaa123ef548a4d1ba2bdb6734faf3212fe826
-size 11199424
+oid sha256:0a87e4ab94375970c14de1ccff17d2764e1ab58f9e35546528839a32399d409a
+size 11389408
diff --git a/Assets/Plugins/iOS/EOSSDK.framework/Info.plist b/Assets/Plugins/iOS/EOSSDK.framework/Info.plist
@@ -41,7 +41,7 @@
 	<key>DTXcodeBuild</key>
 	<string>9M174d</string>
 	<key>MinimumOSVersion</key>
-	<string>11.0</string>
+	<string>12.0</string>
 	<key>UIDeviceFamily</key>
 	<array>
 		<integer>1</integer>
diff --git a/Assets/Plugins/macOS/libEOSSDK-Mac-Shipping.dylib b/Assets/Plugins/macOS/libEOSSDK-Mac-Shipping.dylib
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:97c87f87cad5e768ccaef4495c7a9be02deaad49ee69d9134fb70084d1209094
-size 45422800
+oid sha256:d7f6217e9e0ccf306e2a403338f59fc5f26c8625b27f89e7d9ea87b238cacb1a
+size 45687360
diff --git a/com.playeveryware.eos/Runtime/EOS_SDK/Generated/AntiCheatCommon/AntiCheatCommonGameRoundCompetitionType.cs b/com.playeveryware.eos/Runtime/EOS_SDK/Generated/AntiCheatCommon/AntiCheatCommonGameRoundCompetitionType.cs
@@ -0,0 +1,28 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// This file is automatically generated. Changes to this file may be overwritten.
+
+namespace Epic.OnlineServices.AntiCheatCommon
+{
+	/// <summary>
+	/// Flags describing the type of competition taking place
+	/// </summary>
+	public enum AntiCheatCommonGameRoundCompetitionType : int
+	{
+		/// <summary>
+		/// No particular competition type applies
+		/// </summary>
+		None = 0,
+		/// <summary>
+		/// Casual unranked play
+		/// </summary>
+		Casual = 1,
+		/// <summary>
+		/// Ranked play, usually with skill based matchmaking
+		/// </summary>
+		Ranked = 2,
+		/// <summary>
+		/// Organized competitive play like a tournament
+		/// </summary>
+		Competitive = 3
+	}
+}
diff --git a/com.playeveryware.eos/Runtime/EOS_SDK/Generated/AntiCheatCommon/AntiCheatCommonGameRoundCompetitionType.cs.meta b/com.playeveryware.eos/Runtime/EOS_SDK/Generated/AntiCheatCommon/AntiCheatCommonGameRoundCompetitionType.cs.meta
diff --git a/com.playeveryware.eos/Runtime/EOS_SDK/Generated/AntiCheatCommon/AntiCheatCommonInterface.cs b/com.playeveryware.eos/Runtime/EOS_SDK/Generated/AntiCheatCommon/AntiCheatCommonInterface.cs
@@ -11,7 +11,7 @@ public sealed partial class AntiCheatCommonInterface
 
 		public const int LoggameroundendApiLatest = 1;
 
-		public const int LoggameroundstartApiLatest = 1;
+		public const int LoggameroundstartApiLatest = 2;
 
 		public const int LogplayerdespawnApiLatest = 1;
 
diff --git a/com.playeveryware.eos/Runtime/EOS_SDK/Generated/AntiCheatCommon/LogGameRoundStartOptions.cs b/com.playeveryware.eos/Runtime/EOS_SDK/Generated/AntiCheatCommon/LogGameRoundStartOptions.cs
@@ -24,6 +24,11 @@ public struct LogGameRoundStartOptions
 		/// Optional length of the game round to be played, in seconds. If none, use 0.
 		/// </summary>
 		public uint RoundTimeSeconds { get; set; }
+
+		/// <summary>
+		/// Type of competition for this game round
+		/// </summary>
+		public AntiCheatCommonGameRoundCompetitionType CompetitionType { get; set; }
 	}
 
 	[System.Runtime.InteropServices.StructLayout(System.Runtime.InteropServices.LayoutKind.Sequential, Pack = 8)]
@@ -34,6 +39,7 @@ internal struct LogGameRoundStartOptionsInternal : ISettable<LogGameRoundStartOp
 		private System.IntPtr m_LevelName;
 		private System.IntPtr m_ModeName;
 		private uint m_RoundTimeSeconds;
+		private AntiCheatCommonGameRoundCompetitionType m_CompetitionType;
 
 		public Utf8String SessionIdentifier
 		{
@@ -67,13 +73,22 @@ public uint RoundTimeSeconds
 			}
 		}
 
+		public AntiCheatCommonGameRoundCompetitionType CompetitionType
+		{
+			set
+			{
+				m_CompetitionType = value;
+			}
+		}
+
 		public void Set(ref LogGameRoundStartOptions other)
 		{
 			m_ApiVersion = AntiCheatCommonInterface.LoggameroundstartApiLatest;
 			SessionIdentifier = other.SessionIdentifier;
 			LevelName = other.LevelName;
 			ModeName = other.ModeName;
 			RoundTimeSeconds = other.RoundTimeSeconds;
+			CompetitionType = other.CompetitionType;
 		}
 
 		public void Set(ref LogGameRoundStartOptions? other)
@@ -85,6 +100,7 @@ public void Set(ref LogGameRoundStartOptions? other)
 				LevelName = other.Value.LevelName;
 				ModeName = other.Value.ModeName;
 				RoundTimeSeconds = other.Value.RoundTimeSeconds;
+				CompetitionType = other.Value.CompetitionType;
 			}
 		}
 
diff --git a/com.playeveryware.eos/Runtime/EOS_SDK/Generated/ExternalCredentialType.cs b/com.playeveryware.eos/Runtime/EOS_SDK/Generated/ExternalCredentialType.cs
@@ -84,6 +84,8 @@ public enum ExternalCredentialType : int
 		/// This is the common Nintendo account that users login with outside the Nintendo Switch device.
 		/// 
 		/// Supported with <see cref="Auth.AuthInterface.Login" />, <see cref="Connect.ConnectInterface.Login" />.
+		/// 
+		/// Note: <see cref="Auth.AuthInterface.Login" /> usage is restricted to Epic first party products only, attempting to use it will result in authentication failures.
 		/// </summary>
 		NintendoIdToken = 6,
 		/// <summary>
@@ -105,10 +107,14 @@ public enum ExternalCredentialType : int
 		/// progression if it is only associated with this account type.
 		/// 
 		/// Supported with <see cref="Auth.AuthInterface.Login" />, <see cref="Connect.ConnectInterface.Login" />.
+		/// 
+		/// Note: <see cref="Auth.AuthInterface.Login" /> usage is restricted to Epic first party products only, attempting to use it will result in authentication failures.
 		/// </summary>
 		NintendoNsaIdToken = 7,
 		/// <summary>
 		/// Uplay Access Token
+		/// 
+		/// Supported with <see cref="Connect.ConnectInterface.Login" />.
 		/// </summary>
 		UplayAccessToken = 8,
 		/// <summary>
diff --git a/com.playeveryware.eos/Runtime/EOS_SDK/Generated/P2P/ConnectionClosedReason.cs b/com.playeveryware.eos/Runtime/EOS_SDK/Generated/P2P/ConnectionClosedReason.cs
@@ -51,6 +51,10 @@ public enum ConnectionClosedReason : int
 		/// <summary>
 		/// The connection was accepted, but there was an internal error occurred and the connection cannot be created or continue.
 		/// </summary>
-		UnexpectedError = 10
+		UnexpectedError = 10,
+		/// <summary>
+		/// The connection was ignored because no connection listeners were bound.
+		/// </summary>
+		ConnectionIgnored = 11
 	}
 }
diff --git a/com.playeveryware.eos/Runtime/EOS_SDK/Generated/P2P/P2PInterface.cs b/com.playeveryware.eos/Runtime/EOS_SDK/Generated/P2P/P2PInterface.cs
@@ -202,7 +202,7 @@ public ulong AddNotifyIncomingPacketQueueFull(ref AddNotifyIncomingPacketQueueFu
 		}
 
 		/// <summary>
-		/// Listen for when a previously opened connection is closed.
+		/// Listen for when a previously accepted connection that was either open or pending is closed.
 		/// <seealso cref="AddNotifyPeerConnectionEstablished" />
 		/// <seealso cref="AddNotifyPeerConnectionInterrupted" />
 		/// <seealso cref="RemoveNotifyPeerConnectionClosed" />
diff --git a/com.playeveryware.eos/Runtime/EOS_SDK/Generated/P2P/RelayControl.cs b/com.playeveryware.eos/Runtime/EOS_SDK/Generated/P2P/RelayControl.cs
@@ -7,7 +7,8 @@ namespace Epic.OnlineServices.P2P
 	/// Setting for controlling whether relay servers are used.
 	/// 
 	/// Please see the following <see cref="RelayControl" /> value compatibility-chart to better understand how changing this value
-	/// can affect compatibility between clients with different settings.
+	/// can affect compatibility between clients with different settings. Connections between clients using
+	/// Incompatible settings may succeed in limited scenarios but should be treated as though they will consistently fail.
 	/// 
 	/// +------------------------------+---------------------+-------------------------------+---------------------+
 	/// </summary>
diff --git a/com.playeveryware.eos/Runtime/EOS_SDK/Generated/Platform/InitializeThreadAffinity.cs b/com.playeveryware.eos/Runtime/EOS_SDK/Generated/Platform/InitializeThreadAffinity.cs
@@ -39,6 +39,16 @@ public struct InitializeThreadAffinity
 		/// </summary>
 		public ulong RTCIo { get; set; }
 
+		/// <summary>
+		/// Main thread of the external overlay
+		/// </summary>
+		public ulong EmbeddedOverlayMainThread { get; set; }
+
+		/// <summary>
+		/// Worker threads of the external overlay
+		/// </summary>
+		public ulong EmbeddedOverlayWorkerThreads { get; set; }
+
 		internal void Set(ref InitializeThreadAffinityInternal other)
 		{
 			NetworkWork = other.NetworkWork;
@@ -47,6 +57,8 @@ internal void Set(ref InitializeThreadAffinityInternal other)
 			P2PIo = other.P2PIo;
 			HttpRequestIo = other.HttpRequestIo;
 			RTCIo = other.RTCIo;
+			EmbeddedOverlayMainThread = other.EmbeddedOverlayMainThread;
+			EmbeddedOverlayWorkerThreads = other.EmbeddedOverlayWorkerThreads;
 		}
 	}
 
@@ -60,6 +72,8 @@ internal struct InitializeThreadAffinityInternal : IGettable<InitializeThreadAff
 		private ulong m_P2PIo;
 		private ulong m_HttpRequestIo;
 		private ulong m_RTCIo;
+		private ulong m_EmbeddedOverlayMainThread;
+		private ulong m_EmbeddedOverlayWorkerThreads;
 
 		public ulong NetworkWork
 		{
@@ -139,6 +153,32 @@ public ulong RTCIo
 			}
 		}
 
+		public ulong EmbeddedOverlayMainThread
+		{
+			get
+			{
+				return m_EmbeddedOverlayMainThread;
+			}
+
+			set
+			{
+				m_EmbeddedOverlayMainThread = value;
+			}
+		}
+
+		public ulong EmbeddedOverlayWorkerThreads
+		{
+			get
+			{
+				return m_EmbeddedOverlayWorkerThreads;
+			}
+
+			set
+			{
+				m_EmbeddedOverlayWorkerThreads = value;
+			}
+		}
+
 		public void Set(ref InitializeThreadAffinity other)
 		{
 			m_ApiVersion = PlatformInterface.InitializeThreadaffinityApiLatest;
@@ -148,6 +188,8 @@ public void Set(ref InitializeThreadAffinity other)
 			P2PIo = other.P2PIo;
 			HttpRequestIo = other.HttpRequestIo;
 			RTCIo = other.RTCIo;
+			EmbeddedOverlayMainThread = other.EmbeddedOverlayMainThread;
+			EmbeddedOverlayWorkerThreads = other.EmbeddedOverlayWorkerThreads;
 		}
 
 		public void Set(ref InitializeThreadAffinity? other)
@@ -161,6 +203,8 @@ public void Set(ref InitializeThreadAffinity? other)
 				P2PIo = other.Value.P2PIo;
 				HttpRequestIo = other.Value.HttpRequestIo;
 				RTCIo = other.Value.RTCIo;
+				EmbeddedOverlayMainThread = other.Value.EmbeddedOverlayMainThread;
+				EmbeddedOverlayWorkerThreads = other.Value.EmbeddedOverlayWorkerThreads;
 			}
 		}
 
diff --git a/com.playeveryware.eos/Runtime/EOS_SDK/Generated/Platform/PlatformInterface.cs b/com.playeveryware.eos/Runtime/EOS_SDK/Generated/Platform/PlatformInterface.cs
@@ -51,7 +51,7 @@ public PlatformInterface(System.IntPtr innerHandle) : base(innerHandle)
 		/// <summary>
 		/// The most recent version of the <see cref="InitializeThreadAffinity" /> API.
 		/// </summary>
-		public const int InitializeThreadaffinityApiLatest = 2;
+		public const int InitializeThreadaffinityApiLatest = 3;
 
 		/// <summary>
 		/// Max length of a product name, not including the terminating null.
diff --git a/com.playeveryware.eos/Runtime/EOS_SDK/Generated/PlayerDataStorage/PlayerDataStorageInterface.cs b/com.playeveryware.eos/Runtime/EOS_SDK/Generated/PlayerDataStorage/PlayerDataStorageInterface.cs
@@ -103,7 +103,7 @@ public PlayerDataStorageInterface(System.IntPtr innerHandle) : base(innerHandle)
 		/// <summary>
 		/// The most recent version of the <see cref="ReadFile" /> API.
 		/// </summary>
-		public const int ReadfileApiLatest = 1;
+		public const int ReadfileApiLatest = 2;
 
 		/// <summary>
 		/// DEPRECATED! Use <see cref="ReadfileApiLatest" /> instead.
@@ -118,7 +118,7 @@ public PlayerDataStorageInterface(System.IntPtr innerHandle) : base(innerHandle)
 		/// <summary>
 		/// The most recent version of the <see cref="WriteFile" /> API.
 		/// </summary>
-		public const int WritefileApiLatest = 1;
+		public const int WritefileApiLatest = 2;
 
 		/// <summary>
 		/// DEPRECATED! Use <see cref="WritefileApiLatest" /> instead.
diff --git a/com.playeveryware.eos/Runtime/EOS_SDK/Generated/TitleStorage/TitleStorageInterface.cs b/com.playeveryware.eos/Runtime/EOS_SDK/Generated/TitleStorage/TitleStorageInterface.cs
@@ -86,7 +86,7 @@ public TitleStorageInterface(System.IntPtr innerHandle) : base(innerHandle)
 		/// <summary>
 		/// The most recent version of the <see cref="ReadFile" /> API.
 		/// </summary>
-		public const int ReadfileApiLatest = 1;
+		public const int ReadfileApiLatest = 2;
 
 		/// <summary>
 		/// DEPRECATED! Use <see cref="ReadfileApiLatest" /> instead.
diff --git a/com.playeveryware.eos/Runtime/EOS_SDK/Generated/Ui/SetToggleFriendsButtonOptions.cs b/com.playeveryware.eos/Runtime/EOS_SDK/Generated/Ui/SetToggleFriendsButtonOptions.cs
@@ -9,8 +9,16 @@ namespace Epic.OnlineServices.UI
 	public struct SetToggleFriendsButtonOptions
 	{
 		/// <summary>
-		/// The new button which will be used to toggle the friends overlay.
-		/// It can be any combination of buttons.
+		/// The button combination to toggle the friends-list page.
+		/// It can be any combination of the following buttons (which can include the left or right shoulder buttons (<see cref="InputStateButtonFlags.LeftShoulder" /> or <see cref="InputStateButtonFlags.RightShoulder" />)):
+		/// 
+		/// - <see cref="InputStateButtonFlags.LeftTrigger" />
+		/// - <see cref="InputStateButtonFlags.RightTrigger" />
+		/// - <see cref="InputStateButtonFlags.SpecialLeft" />
+		/// - <see cref="InputStateButtonFlags.SpecialRight" />
+		/// - <see cref="InputStateButtonFlags.LeftThumbstick" />
+		/// - <see cref="InputStateButtonFlags.RightThumbstick" />
+		/// 
 		/// The default value is No Button. Set the value to <see cref="InputStateButtonFlags.None" /> to revert to the default.
 		/// </summary>
 		public InputStateButtonFlags ButtonCombination { get; set; }
diff --git a/com.playeveryware.eos/Runtime/EOS_SDK/Generated/Version/VersionInterface.cs b/com.playeveryware.eos/Runtime/EOS_SDK/Generated/Version/VersionInterface.cs
@@ -13,7 +13,7 @@ public sealed partial class VersionInterface
 
 		public const int MinorVersion = 16;
 
-		public const int PatchVersion = 3;
+		public const int PatchVersion = 4;
 
 		public static readonly Utf8String ProductIdentifier = "Epic Online Services SDK";
 
diff --git a/com.playeveryware.eos/Runtime/EOS_SDK/Overrides/GetNextReceivedPacketSizeOptions.cs b/com.playeveryware.eos/Runtime/EOS_SDK/Overrides/GetNextReceivedPacketSizeOptions.cs
diff --git a/com.playeveryware.eos/Runtime/EOS_SDK/Overrides/GetNextReceivedPacketSizeOptions.cs.meta b/com.playeveryware.eos/Runtime/EOS_SDK/Overrides/GetNextReceivedPacketSizeOptions.cs.meta
diff --git a/etc/PlatformSpecificAssets/EOS/Android/dynamic-stdc++/aar/eos-sdk.aar b/etc/PlatformSpecificAssets/EOS/Android/dynamic-stdc++/aar/eos-sdk.aar
diff --git a/etc/PlatformSpecificAssets/EOS/Android/static-stdc++/aar/eos-sdk.aar b/etc/PlatformSpecificAssets/EOS/Android/static-stdc++/aar/eos-sdk.aar
diff --git a/tools/bin/EOSBootstrapper.exe b/tools/bin/EOSBootstrapper.exe
diff --git a/tools/bin/EOSBootstrapperTool.exe b/tools/bin/EOSBootstrapperTool.exe

Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,11 @@ public struct LogGameRoundStartOptions`
`24`	`24`	`/// Optional length of the game round to be played, in seconds. If none, use 0.`
`25`	`25`	`/// </summary>`
`26`	`26`	`public uint RoundTimeSeconds { get; set; }`
	`27`	`+`
	`28`	`+ /// <summary>`
	`29`	`+ /// Type of competition for this game round`
	`30`	`+ /// </summary>`
	`31`	`+ public AntiCheatCommonGameRoundCompetitionType CompetitionType { get; set; }`
`27`	`32`	`}`
`28`	`33`
`29`	`34`	`[System.Runtime.InteropServices.StructLayout(System.Runtime.InteropServices.LayoutKind.Sequential, Pack = 8)]`
`@@ -34,6 +39,7 @@ internal struct LogGameRoundStartOptionsInternal : ISettable<LogGameRoundStartOp`
`34`	`39`	`private System.IntPtr m_LevelName;`
`35`	`40`	`private System.IntPtr m_ModeName;`
`36`	`41`	`private uint m_RoundTimeSeconds;`
	`42`	`+ private AntiCheatCommonGameRoundCompetitionType m_CompetitionType;`
`37`	`43`
`38`	`44`	`public Utf8String SessionIdentifier`
`39`	`45`	`{`
`@@ -67,13 +73,22 @@ public uint RoundTimeSeconds`
`67`	`73`	`}`
`68`	`74`	`}`
`69`	`75`
	`76`	`+ public AntiCheatCommonGameRoundCompetitionType CompetitionType`
	`77`	`+ {`
	`78`	`+ set`
	`79`	`+ {`
	`80`	`+ m_CompetitionType = value;`
	`81`	`+ }`
	`82`	`+ }`
	`83`	`+`
`70`	`84`	`public void Set(ref LogGameRoundStartOptions other)`
`71`	`85`	`{`
`72`	`86`	`m_ApiVersion = AntiCheatCommonInterface.LoggameroundstartApiLatest;`
`73`	`87`	`SessionIdentifier = other.SessionIdentifier;`
`74`	`88`	`LevelName = other.LevelName;`
`75`	`89`	`ModeName = other.ModeName;`
`76`	`90`	`RoundTimeSeconds = other.RoundTimeSeconds;`
	`91`	`+ CompetitionType = other.CompetitionType;`
`77`	`92`	`}`
`78`	`93`
`79`	`94`	`public void Set(ref LogGameRoundStartOptions? other)`
`@@ -85,6 +100,7 @@ public void Set(ref LogGameRoundStartOptions? other)`
`85`	`100`	`LevelName = other.Value.LevelName;`
`86`	`101`	`ModeName = other.Value.ModeName;`
`87`	`102`	`RoundTimeSeconds = other.Value.RoundTimeSeconds;`
	`103`	`+ CompetitionType = other.Value.CompetitionType;`
`88`	`104`	`}`
`89`	`105`	`}`
`90`	`106`