diff --git a/Assets/Plugins/Linux/libEOSSDK-Linux-Shipping.so b/Assets/Plugins/Linux/libEOSSDK-Linux-Shipping.so index dbc03b497..76a2e92a2 100755 --- 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:78c79a46b31919256f415a59080ab8bf3123d1025664a9667dc0f457aff04f75 -size 28413432 +oid sha256:f93accfc264dfcf533de33ec7561acaaeb64f489e4143a60d07b4b3a390a272d +size 28487160 diff --git a/Assets/Plugins/Windows/x64/EOSSDK-Win64-Shipping.dll b/Assets/Plugins/Windows/x64/EOSSDK-Win64-Shipping.dll index 20d904eaf..afe08d37f 100644 --- 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:aba8695b971b5e247a03b0269ca0678c3d164d6ac1b15c78f512356ada74d09e -size 18199528 +oid sha256:b0591a96e7daa4a1031fff1fc1ff4332285e1d38d9676c33ab32d9da2ff8f765 +size 18266584 diff --git a/Assets/Plugins/Windows/x86/EOSSDK-Win32-Shipping.dll b/Assets/Plugins/Windows/x86/EOSSDK-Win32-Shipping.dll index 4b5fe7c60..18a17fc6b 100644 --- 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:ab1c4bea182420d7c01def7799fd5ce6297df8eb08d8e04ff547888b987a797e -size 13966312 +oid sha256:bc3750de00a87cdbea01285ba3c4ab46cdc92dbea134638f5de6982bad61a092 +size 14011864 diff --git a/Assets/Plugins/iOS/EOSSDK.framework/EOSSDK b/Assets/Plugins/iOS/EOSSDK.framework/EOSSDK index 109e40c91..56ecd4934 100644 --- 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:0a87e4ab94375970c14de1ccff17d2764e1ab58f9e35546528839a32399d409a -size 11389408 +oid sha256:5403b8753107307a2cf53fef358eae883b6704ef25a37f3888e81b6d254b7755 +size 11597680 diff --git a/Assets/Plugins/macOS/libEOSSDK-Mac-Shipping.dylib b/Assets/Plugins/macOS/libEOSSDK-Mac-Shipping.dylib index cf054ebcf..39b14add7 100755 --- 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:d7f6217e9e0ccf306e2a403338f59fc5f26c8625b27f89e7d9ea87b238cacb1a -size 45687360 +oid sha256:833afa39d22dd170bcb4c0fe9774f315d62b4bf9c7682fa5a68a3f9bf6e7b75e +size 45918384 diff --git a/com.playeveryware.eos/CHANGELOG.md b/com.playeveryware.eos/CHANGELOG.md index cf3100716..0f2722099 100644 --- a/com.playeveryware.eos/CHANGELOG.md +++ b/com.playeveryware.eos/CHANGELOG.md @@ -2,6 +2,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [4.0.0] - 2025-02-14 + +### Changed +- update to EOS SDK 1.17.0 + ## [3.3.6] - 2025-02-03 ### Added diff --git a/com.playeveryware.eos/Runtime/Core/EOSPackageInfo.cs b/com.playeveryware.eos/Runtime/Core/EOSPackageInfo.cs index 2ac53409f..38be02ddc 100644 --- a/com.playeveryware.eos/Runtime/Core/EOSPackageInfo.cs +++ b/com.playeveryware.eos/Runtime/Core/EOSPackageInfo.cs @@ -33,7 +33,7 @@ public static class EOSPackageInfo * not involve editing source code files. */ - public const string Version = "3.3.6"; + public const string Version = "4.0.0"; public const string PackageName = "com.playeveryware.eos"; } diff --git a/com.playeveryware.eos/Runtime/EOS_SDK/Generated/Achievements/AchievementsInterface.cs b/com.playeveryware.eos/Runtime/EOS_SDK/Generated/Achievements/AchievementsInterface.cs index 236425725..d68469ddc 100644 --- a/com.playeveryware.eos/Runtime/EOS_SDK/Generated/Achievements/AchievementsInterface.cs +++ b/com.playeveryware.eos/Runtime/EOS_SDK/Generated/Achievements/AchievementsInterface.cs @@ -554,6 +554,7 @@ public void QueryDefinitions(ref QueryDefinitionsOptions options, object clientD /// /// Query for a list of achievements for a specific player, including progress towards completion for each achievement. + /// Note: By default, this query will not return locked hidden achievements. To return all achievements, call first. /// When the Social Overlay is enabled then this will be called automatically. The Social Overlay is enabled by default (see EOS_PF_DISABLE_SOCIAL_OVERLAY). /// /// Structure containing information about the player whose achievements we're retrieving. diff --git a/com.playeveryware.eos/Runtime/EOS_SDK/Generated/AntiCheatClient/AntiCheatClientInterface.cs b/com.playeveryware.eos/Runtime/EOS_SDK/Generated/AntiCheatClient/AntiCheatClientInterface.cs index 8cd0b9459..0f552de51 100644 --- a/com.playeveryware.eos/Runtime/EOS_SDK/Generated/AntiCheatClient/AntiCheatClientInterface.cs +++ b/com.playeveryware.eos/Runtime/EOS_SDK/Generated/AntiCheatClient/AntiCheatClientInterface.cs @@ -69,6 +69,8 @@ public AntiCheatClientInterface(System.IntPtr innerHandle) : base(innerHandle) /// public const int RegisterpeerMinAuthenticationtimeout = 40; + public const int Reserved01ApiLatest = 1; + public const int UnprotectmessageApiLatest = 1; public const int UnregisterpeerApiLatest = 1; @@ -527,6 +529,28 @@ public void RemoveNotifyPeerAuthStatusChanged(ulong notificationId) Helper.RemoveCallbackByNotificationId(notificationId); } + /// + /// This function is reserved for future use and must not be called. + /// + /// Structure containing input data. + /// Reserved. + /// + /// - Always + /// + public Result Reserved01(ref Reserved01Options options, out int outValue) + { + Reserved01OptionsInternal optionsInternal = new Reserved01OptionsInternal(); + optionsInternal.Set(ref options); + + outValue = Helper.GetDefault(); + + var funcResult = Bindings.EOS_AntiCheatClient_Reserved01(InnerHandle, ref optionsInternal, ref outValue); + + Helper.Dispose(ref optionsInternal); + + return funcResult; + } + /// /// Optional NetProtect feature for game message encryption. /// Decrypts an encrypted message received from the game server. diff --git a/com.playeveryware.eos/Runtime/EOS_SDK/Generated/AntiCheatClient/Reserved01Options.cs b/com.playeveryware.eos/Runtime/EOS_SDK/Generated/AntiCheatClient/Reserved01Options.cs new file mode 100644 index 000000000..6587b6581 --- /dev/null +++ b/com.playeveryware.eos/Runtime/EOS_SDK/Generated/AntiCheatClient/Reserved01Options.cs @@ -0,0 +1,32 @@ +// Copyright Epic Games, Inc. All Rights Reserved. +// This file is automatically generated. Changes to this file may be overwritten. + +namespace Epic.OnlineServices.AntiCheatClient +{ + public struct Reserved01Options + { + } + + [System.Runtime.InteropServices.StructLayout(System.Runtime.InteropServices.LayoutKind.Sequential, Pack = 8)] + internal struct Reserved01OptionsInternal : ISettable, System.IDisposable + { + private int m_ApiVersion; + + public void Set(ref Reserved01Options other) + { + m_ApiVersion = AntiCheatClientInterface.Reserved01ApiLatest; + } + + public void Set(ref Reserved01Options? other) + { + if (other.HasValue) + { + m_ApiVersion = AntiCheatClientInterface.Reserved01ApiLatest; + } + } + + public void Dispose() + { + } + } +} \ No newline at end of file diff --git a/com.playeveryware.eos/Runtime/EOS_SDK/Generated/AntiCheatClient/Reserved01Options.cs.meta b/com.playeveryware.eos/Runtime/EOS_SDK/Generated/AntiCheatClient/Reserved01Options.cs.meta new file mode 100644 index 000000000..b79653d72 --- /dev/null +++ b/com.playeveryware.eos/Runtime/EOS_SDK/Generated/AntiCheatClient/Reserved01Options.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 5b453554dee18e345a5d8469e05cc259 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/com.playeveryware.eos/Runtime/EOS_SDK/Generated/AntiCheatServer/AntiCheatServerInterface.cs b/com.playeveryware.eos/Runtime/EOS_SDK/Generated/AntiCheatServer/AntiCheatServerInterface.cs index b96505253..a9c629b08 100644 --- a/com.playeveryware.eos/Runtime/EOS_SDK/Generated/AntiCheatServer/AntiCheatServerInterface.cs +++ b/com.playeveryware.eos/Runtime/EOS_SDK/Generated/AntiCheatServer/AntiCheatServerInterface.cs @@ -41,7 +41,7 @@ public AntiCheatServerInterface(System.IntPtr innerHandle) : base(innerHandle) public const int ReceivemessagefromclientApiLatest = 1; - public const int RegisterclientApiLatest = 2; + public const int RegisterclientApiLatest = 3; public const int SetclientnetworkstateApiLatest = 1; diff --git a/com.playeveryware.eos/Runtime/EOS_SDK/Generated/AntiCheatServer/RegisterClientOptions.cs b/com.playeveryware.eos/Runtime/EOS_SDK/Generated/AntiCheatServer/RegisterClientOptions.cs index 754f792ad..88f63c7d2 100644 --- a/com.playeveryware.eos/Runtime/EOS_SDK/Generated/AntiCheatServer/RegisterClientOptions.cs +++ b/com.playeveryware.eos/Runtime/EOS_SDK/Generated/AntiCheatServer/RegisterClientOptions.cs @@ -41,6 +41,11 @@ public struct RegisterClientOptions /// The Product User ID for the remote user who is being registered. /// public ProductUserId UserId { get; set; } + + /// + /// Reserved for future use. Must be set to 0. + /// + public int Reserved01 { get; set; } } [System.Runtime.InteropServices.StructLayout(System.Runtime.InteropServices.LayoutKind.Sequential, Pack = 8)] @@ -53,6 +58,7 @@ internal struct RegisterClientOptionsInternal : ISettable private System.IntPtr m_AccountId_DEPRECATED; private System.IntPtr m_IpAddress; private System.IntPtr m_UserId; + private int m_Reserved01; public System.IntPtr ClientHandle { @@ -102,6 +108,14 @@ public ProductUserId UserId } } + public int Reserved01 + { + set + { + m_Reserved01 = value; + } + } + public void Set(ref RegisterClientOptions other) { m_ApiVersion = AntiCheatServerInterface.RegisterclientApiLatest; @@ -111,6 +125,7 @@ public void Set(ref RegisterClientOptions other) AccountId_DEPRECATED = other.AccountId_DEPRECATED; IpAddress = other.IpAddress; UserId = other.UserId; + Reserved01 = other.Reserved01; } public void Set(ref RegisterClientOptions? other) @@ -124,6 +139,7 @@ public void Set(ref RegisterClientOptions? other) AccountId_DEPRECATED = other.Value.AccountId_DEPRECATED; IpAddress = other.Value.IpAddress; UserId = other.Value.UserId; + Reserved01 = other.Value.Reserved01; } } diff --git a/com.playeveryware.eos/Runtime/EOS_SDK/Generated/Auth/LoginCredentialType.cs b/com.playeveryware.eos/Runtime/EOS_SDK/Generated/Auth/LoginCredentialType.cs index fb0ca4e7b..efa44d99b 100644 --- a/com.playeveryware.eos/Runtime/EOS_SDK/Generated/Auth/LoginCredentialType.cs +++ b/com.playeveryware.eos/Runtime/EOS_SDK/Generated/Auth/LoginCredentialType.cs @@ -12,7 +12,8 @@ public enum LoginCredentialType : int { /// /// Login using account email address and password. - /// Use of this login method is restricted and cannot be used in general. + /// + /// Note: This login method is restricted to Epic Games internal use only. Do not use. /// Password = 0, /// diff --git a/com.playeveryware.eos/Runtime/EOS_SDK/Generated/Bindings.cs b/com.playeveryware.eos/Runtime/EOS_SDK/Generated/Bindings.cs index 1c8ebe44a..cf93bb7bf 100644 --- a/com.playeveryware.eos/Runtime/EOS_SDK/Generated/Bindings.cs +++ b/com.playeveryware.eos/Runtime/EOS_SDK/Generated/Bindings.cs @@ -110,6 +110,7 @@ public static partial class Bindings private const string EOS_AntiCheatClient_RemoveNotifyMessageToServerName = "EOS_AntiCheatClient_RemoveNotifyMessageToServer"; private const string EOS_AntiCheatClient_RemoveNotifyPeerActionRequiredName = "EOS_AntiCheatClient_RemoveNotifyPeerActionRequired"; private const string EOS_AntiCheatClient_RemoveNotifyPeerAuthStatusChangedName = "EOS_AntiCheatClient_RemoveNotifyPeerAuthStatusChanged"; + private const string EOS_AntiCheatClient_Reserved01Name = "EOS_AntiCheatClient_Reserved01"; private const string EOS_AntiCheatClient_UnprotectMessageName = "EOS_AntiCheatClient_UnprotectMessage"; private const string EOS_AntiCheatClient_UnregisterPeerName = "EOS_AntiCheatClient_UnregisterPeer"; private const string EOS_AntiCheatServer_AddNotifyClientActionRequiredName = "EOS_AntiCheatServer_AddNotifyClientActionRequired"; @@ -366,8 +367,10 @@ public static partial class Bindings private const string EOS_Lobby_IsRTCRoomConnectedName = "EOS_Lobby_IsRTCRoomConnected"; private const string EOS_Lobby_JoinLobbyName = "EOS_Lobby_JoinLobby"; private const string EOS_Lobby_JoinLobbyByIdName = "EOS_Lobby_JoinLobbyById"; + private const string EOS_Lobby_JoinRTCRoomName = "EOS_Lobby_JoinRTCRoom"; private const string EOS_Lobby_KickMemberName = "EOS_Lobby_KickMember"; private const string EOS_Lobby_LeaveLobbyName = "EOS_Lobby_LeaveLobby"; + private const string EOS_Lobby_LeaveRTCRoomName = "EOS_Lobby_LeaveRTCRoom"; private const string EOS_Lobby_ParseConnectStringName = "EOS_Lobby_ParseConnectString"; private const string EOS_Lobby_PromoteMemberName = "EOS_Lobby_PromoteMember"; private const string EOS_Lobby_QueryInvitesName = "EOS_Lobby_QueryInvites"; @@ -736,6 +739,7 @@ public static partial class Bindings private const string EOS_AntiCheatClient_RemoveNotifyMessageToServerName = "_EOS_AntiCheatClient_RemoveNotifyMessageToServer"; private const string EOS_AntiCheatClient_RemoveNotifyPeerActionRequiredName = "_EOS_AntiCheatClient_RemoveNotifyPeerActionRequired"; private const string EOS_AntiCheatClient_RemoveNotifyPeerAuthStatusChangedName = "_EOS_AntiCheatClient_RemoveNotifyPeerAuthStatusChanged"; + private const string EOS_AntiCheatClient_Reserved01Name = "_EOS_AntiCheatClient_Reserved01"; private const string EOS_AntiCheatClient_UnprotectMessageName = "_EOS_AntiCheatClient_UnprotectMessage"; private const string EOS_AntiCheatClient_UnregisterPeerName = "_EOS_AntiCheatClient_UnregisterPeer"; private const string EOS_AntiCheatServer_AddNotifyClientActionRequiredName = "_EOS_AntiCheatServer_AddNotifyClientActionRequired"; @@ -992,8 +996,10 @@ public static partial class Bindings private const string EOS_Lobby_IsRTCRoomConnectedName = "_EOS_Lobby_IsRTCRoomConnected"; private const string EOS_Lobby_JoinLobbyName = "_EOS_Lobby_JoinLobby"; private const string EOS_Lobby_JoinLobbyByIdName = "_EOS_Lobby_JoinLobbyById"; + private const string EOS_Lobby_JoinRTCRoomName = "_EOS_Lobby_JoinRTCRoom"; private const string EOS_Lobby_KickMemberName = "_EOS_Lobby_KickMember"; private const string EOS_Lobby_LeaveLobbyName = "_EOS_Lobby_LeaveLobby"; + private const string EOS_Lobby_LeaveRTCRoomName = "_EOS_Lobby_LeaveRTCRoom"; private const string EOS_Lobby_ParseConnectStringName = "_EOS_Lobby_ParseConnectString"; private const string EOS_Lobby_PromoteMemberName = "_EOS_Lobby_PromoteMember"; private const string EOS_Lobby_QueryInvitesName = "_EOS_Lobby_QueryInvites"; @@ -1362,6 +1368,7 @@ public static partial class Bindings private const string EOS_AntiCheatClient_RemoveNotifyMessageToServerName = "_EOS_AntiCheatClient_RemoveNotifyMessageToServer@12"; private const string EOS_AntiCheatClient_RemoveNotifyPeerActionRequiredName = "_EOS_AntiCheatClient_RemoveNotifyPeerActionRequired@12"; private const string EOS_AntiCheatClient_RemoveNotifyPeerAuthStatusChangedName = "_EOS_AntiCheatClient_RemoveNotifyPeerAuthStatusChanged@12"; + private const string EOS_AntiCheatClient_Reserved01Name = "_EOS_AntiCheatClient_Reserved01@12"; private const string EOS_AntiCheatClient_UnprotectMessageName = "_EOS_AntiCheatClient_UnprotectMessage@16"; private const string EOS_AntiCheatClient_UnregisterPeerName = "_EOS_AntiCheatClient_UnregisterPeer@8"; private const string EOS_AntiCheatServer_AddNotifyClientActionRequiredName = "_EOS_AntiCheatServer_AddNotifyClientActionRequired@16"; @@ -1618,8 +1625,10 @@ public static partial class Bindings private const string EOS_Lobby_IsRTCRoomConnectedName = "_EOS_Lobby_IsRTCRoomConnected@12"; private const string EOS_Lobby_JoinLobbyName = "_EOS_Lobby_JoinLobby@16"; private const string EOS_Lobby_JoinLobbyByIdName = "_EOS_Lobby_JoinLobbyById@16"; + private const string EOS_Lobby_JoinRTCRoomName = "_EOS_Lobby_JoinRTCRoom@16"; private const string EOS_Lobby_KickMemberName = "_EOS_Lobby_KickMember@16"; private const string EOS_Lobby_LeaveLobbyName = "_EOS_Lobby_LeaveLobby@16"; + private const string EOS_Lobby_LeaveRTCRoomName = "_EOS_Lobby_LeaveRTCRoom@16"; private const string EOS_Lobby_ParseConnectStringName = "_EOS_Lobby_ParseConnectString@16"; private const string EOS_Lobby_PromoteMemberName = "_EOS_Lobby_PromoteMember@16"; private const string EOS_Lobby_QueryInvitesName = "_EOS_Lobby_QueryInvites@16"; @@ -2132,6 +2141,10 @@ public static void Hook(TLibraryHandle libraryHandle, Func(TLibraryHandle libraryHandle, Func(TLibraryHandle libraryHandle, Func Notanyof = 8, /// - /// This one value is a part of a collection + /// This one value is a part of a collection. Supported in only. /// Oneof = 9, /// - /// This one value is NOT part of a collection + /// This one value is NOT part of a collection. Supported in only. /// Notoneof = 10, /// diff --git a/com.playeveryware.eos/Runtime/EOS_SDK/Generated/Ecom/CheckoutOptions.cs b/com.playeveryware.eos/Runtime/EOS_SDK/Generated/Ecom/CheckoutOptions.cs index 65335db13..7dc6a03f1 100644 --- a/com.playeveryware.eos/Runtime/EOS_SDK/Generated/Ecom/CheckoutOptions.cs +++ b/com.playeveryware.eos/Runtime/EOS_SDK/Generated/Ecom/CheckoutOptions.cs @@ -22,6 +22,14 @@ public struct CheckoutOptions /// An array of elements, each containing the details of a single offer /// public CheckoutEntry[] Entries { get; set; } + + /// + /// Preferred device orientation, specifies Default, Portrait or Landscape. + /// This is used only on mobile platforms currently. + /// SDK can use it to optimize how the Checkout page should be displayed. + /// Please check the mobile SDK documentation for additional required setup. + /// + public CheckoutOrientation PreferredOrientation { get; set; } } [System.Runtime.InteropServices.StructLayout(System.Runtime.InteropServices.LayoutKind.Sequential, Pack = 8)] @@ -32,6 +40,7 @@ internal struct CheckoutOptionsInternal : ISettable, System.IDi private System.IntPtr m_OverrideCatalogNamespace; private uint m_EntryCount; private System.IntPtr m_Entries; + private CheckoutOrientation m_PreferredOrientation; public EpicAccountId LocalUserId { @@ -57,12 +66,21 @@ public CheckoutEntry[] Entries } } + public CheckoutOrientation PreferredOrientation + { + set + { + m_PreferredOrientation = value; + } + } + public void Set(ref CheckoutOptions other) { m_ApiVersion = EcomInterface.CheckoutApiLatest; LocalUserId = other.LocalUserId; OverrideCatalogNamespace = other.OverrideCatalogNamespace; Entries = other.Entries; + PreferredOrientation = other.PreferredOrientation; } public void Set(ref CheckoutOptions? other) @@ -73,6 +91,7 @@ public void Set(ref CheckoutOptions? other) LocalUserId = other.Value.LocalUserId; OverrideCatalogNamespace = other.Value.OverrideCatalogNamespace; Entries = other.Value.Entries; + PreferredOrientation = other.Value.PreferredOrientation; } } diff --git a/com.playeveryware.eos/Runtime/EOS_SDK/Generated/Ecom/CheckoutOrientation.cs b/com.playeveryware.eos/Runtime/EOS_SDK/Generated/Ecom/CheckoutOrientation.cs new file mode 100644 index 000000000..c8ddfe512 --- /dev/null +++ b/com.playeveryware.eos/Runtime/EOS_SDK/Generated/Ecom/CheckoutOrientation.cs @@ -0,0 +1,24 @@ +// Copyright Epic Games, Inc. All Rights Reserved. +// This file is automatically generated. Changes to this file may be overwritten. + +namespace Epic.OnlineServices.Ecom +{ + /// + /// An enumeration defining the possible orientation for the checkout page. This will be used on mobile. + /// + public enum CheckoutOrientation : int + { + /// + /// Current orientation will be used + /// + Default = 0, + /// + /// Portrait orientation + /// + Portrait = 1, + /// + /// Landscape orientation + /// + Landscape = 2 + } +} \ No newline at end of file diff --git a/com.playeveryware.eos/Runtime/EOS_SDK/Generated/Ecom/CheckoutOrientation.cs.meta b/com.playeveryware.eos/Runtime/EOS_SDK/Generated/Ecom/CheckoutOrientation.cs.meta new file mode 100644 index 000000000..952af6368 --- /dev/null +++ b/com.playeveryware.eos/Runtime/EOS_SDK/Generated/Ecom/CheckoutOrientation.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 5a132522660ca284695771b5e2660a16 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/com.playeveryware.eos/Runtime/EOS_SDK/Generated/Ecom/EcomInterface.cs b/com.playeveryware.eos/Runtime/EOS_SDK/Generated/Ecom/EcomInterface.cs index 1ea797a92..cff8227f4 100644 --- a/com.playeveryware.eos/Runtime/EOS_SDK/Generated/Ecom/EcomInterface.cs +++ b/com.playeveryware.eos/Runtime/EOS_SDK/Generated/Ecom/EcomInterface.cs @@ -51,7 +51,7 @@ public EcomInterface(System.IntPtr innerHandle) : base(innerHandle) /// /// The most recent version of the API. /// - public const int CheckoutApiLatest = 1; + public const int CheckoutApiLatest = 2; /// /// The maximum number of entries in a single checkout. @@ -201,7 +201,7 @@ public EcomInterface(System.IntPtr innerHandle) : base(innerHandle) /// /// The most recent version of the API. /// - public const int QueryentitlementsApiLatest = 2; + public const int QueryentitlementsApiLatest = 3; /// /// The maximum number of entitlements that may be queried in a single QueryEntitlements API call. diff --git a/com.playeveryware.eos/Runtime/EOS_SDK/Generated/Ecom/QueryEntitlementsOptions.cs b/com.playeveryware.eos/Runtime/EOS_SDK/Generated/Ecom/QueryEntitlementsOptions.cs index 4a259e1fe..d2dcfcf06 100644 --- a/com.playeveryware.eos/Runtime/EOS_SDK/Generated/Ecom/QueryEntitlementsOptions.cs +++ b/com.playeveryware.eos/Runtime/EOS_SDK/Generated/Ecom/QueryEntitlementsOptions.cs @@ -22,6 +22,11 @@ public struct QueryEntitlementsOptions /// If true, Entitlements that have been redeemed will be included in the results. /// public bool IncludeRedeemed { get; set; } + + /// + /// If not provided then the SandboxId is used as the catalog namespace + /// + public Utf8String OverrideCatalogNamespace { get; set; } } [System.Runtime.InteropServices.StructLayout(System.Runtime.InteropServices.LayoutKind.Sequential, Pack = 8)] @@ -32,6 +37,7 @@ internal struct QueryEntitlementsOptionsInternal : ISettable public bool CrossplayOptOut { get; set; } + + /// + /// If bEnableRTCRoom is true, this value indicates the action to take against the RTC Room when joining the lobby. This may be used + /// to indicate the RTCRoom should be joined immediately or manually at a later time. + /// + public LobbyRTCRoomJoinActionType RTCRoomJoinActionType { get; set; } } [System.Runtime.InteropServices.StructLayout(System.Runtime.InteropServices.LayoutKind.Sequential, Pack = 8)] @@ -127,6 +133,7 @@ internal struct CreateLobbyOptionsInternal : ISettable, Syst private System.IntPtr m_AllowedPlatformIds; private uint m_AllowedPlatformIdsCount; private int m_CrossplayOptOut; + private LobbyRTCRoomJoinActionType m_RTCRoomJoinActionType; public ProductUserId LocalUserId { @@ -240,6 +247,14 @@ public bool CrossplayOptOut } } + public LobbyRTCRoomJoinActionType RTCRoomJoinActionType + { + set + { + m_RTCRoomJoinActionType = value; + } + } + public void Set(ref CreateLobbyOptions other) { m_ApiVersion = LobbyInterface.CreatelobbyApiLatest; @@ -257,6 +272,7 @@ public void Set(ref CreateLobbyOptions other) RejoinAfterKickRequiresInvite = other.RejoinAfterKickRequiresInvite; AllowedPlatformIds = other.AllowedPlatformIds; CrossplayOptOut = other.CrossplayOptOut; + RTCRoomJoinActionType = other.RTCRoomJoinActionType; } public void Set(ref CreateLobbyOptions? other) @@ -278,6 +294,7 @@ public void Set(ref CreateLobbyOptions? other) RejoinAfterKickRequiresInvite = other.Value.RejoinAfterKickRequiresInvite; AllowedPlatformIds = other.Value.AllowedPlatformIds; CrossplayOptOut = other.Value.CrossplayOptOut; + RTCRoomJoinActionType = other.Value.RTCRoomJoinActionType; } } diff --git a/com.playeveryware.eos/Runtime/EOS_SDK/Generated/Lobby/JoinLobbyByIdOptions.cs b/com.playeveryware.eos/Runtime/EOS_SDK/Generated/Lobby/JoinLobbyByIdOptions.cs index 0bb0506ee..ba32941c9 100644 --- a/com.playeveryware.eos/Runtime/EOS_SDK/Generated/Lobby/JoinLobbyByIdOptions.cs +++ b/com.playeveryware.eos/Runtime/EOS_SDK/Generated/Lobby/JoinLobbyByIdOptions.cs @@ -46,6 +46,12 @@ public struct JoinLobbyByIdOptions /// will be treated as allowing crossplay. /// public bool CrossplayOptOut { get; set; } + + /// + /// For lobbies with the RTC Room feature enabled, this value indicates the action to take against the RTC Room when joining the lobby. This may be used + /// to indicate the RTCRoom should be joined immediately or manually at a later time. + /// + public LobbyRTCRoomJoinActionType RTCRoomJoinActionType { get; set; } } [System.Runtime.InteropServices.StructLayout(System.Runtime.InteropServices.LayoutKind.Sequential, Pack = 8)] @@ -57,6 +63,7 @@ internal struct JoinLobbyByIdOptionsInternal : ISettable, private int m_PresenceEnabled; private System.IntPtr m_LocalRTCOptions; private int m_CrossplayOptOut; + private LobbyRTCRoomJoinActionType m_RTCRoomJoinActionType; public Utf8String LobbyId { @@ -98,6 +105,14 @@ public bool CrossplayOptOut } } + public LobbyRTCRoomJoinActionType RTCRoomJoinActionType + { + set + { + m_RTCRoomJoinActionType = value; + } + } + public void Set(ref JoinLobbyByIdOptions other) { m_ApiVersion = LobbyInterface.JoinlobbybyidApiLatest; @@ -106,6 +121,7 @@ public void Set(ref JoinLobbyByIdOptions other) PresenceEnabled = other.PresenceEnabled; LocalRTCOptions = other.LocalRTCOptions; CrossplayOptOut = other.CrossplayOptOut; + RTCRoomJoinActionType = other.RTCRoomJoinActionType; } public void Set(ref JoinLobbyByIdOptions? other) @@ -118,6 +134,7 @@ public void Set(ref JoinLobbyByIdOptions? other) PresenceEnabled = other.Value.PresenceEnabled; LocalRTCOptions = other.Value.LocalRTCOptions; CrossplayOptOut = other.Value.CrossplayOptOut; + RTCRoomJoinActionType = other.Value.RTCRoomJoinActionType; } } diff --git a/com.playeveryware.eos/Runtime/EOS_SDK/Generated/Lobby/JoinLobbyOptions.cs b/com.playeveryware.eos/Runtime/EOS_SDK/Generated/Lobby/JoinLobbyOptions.cs index 4c190dbce..7ca176089 100644 --- a/com.playeveryware.eos/Runtime/EOS_SDK/Generated/Lobby/JoinLobbyOptions.cs +++ b/com.playeveryware.eos/Runtime/EOS_SDK/Generated/Lobby/JoinLobbyOptions.cs @@ -45,6 +45,12 @@ public struct JoinLobbyOptions /// will be treated as allowing crossplay. /// public bool CrossplayOptOut { get; set; } + + /// + /// For lobbies with the RTC Room feature enabled, this value indicates the action to take against the RTC Room when joining the lobby. This may be used + /// to indicate the RTCRoom should be joined immediately or manually at a later time. + /// + public LobbyRTCRoomJoinActionType RTCRoomJoinActionType { get; set; } } [System.Runtime.InteropServices.StructLayout(System.Runtime.InteropServices.LayoutKind.Sequential, Pack = 8)] @@ -56,6 +62,7 @@ internal struct JoinLobbyOptionsInternal : ISettable, System.I private int m_PresenceEnabled; private System.IntPtr m_LocalRTCOptions; private int m_CrossplayOptOut; + private LobbyRTCRoomJoinActionType m_RTCRoomJoinActionType; public LobbyDetails LobbyDetailsHandle { @@ -97,6 +104,14 @@ public bool CrossplayOptOut } } + public LobbyRTCRoomJoinActionType RTCRoomJoinActionType + { + set + { + m_RTCRoomJoinActionType = value; + } + } + public void Set(ref JoinLobbyOptions other) { m_ApiVersion = LobbyInterface.JoinlobbyApiLatest; @@ -105,6 +120,7 @@ public void Set(ref JoinLobbyOptions other) PresenceEnabled = other.PresenceEnabled; LocalRTCOptions = other.LocalRTCOptions; CrossplayOptOut = other.CrossplayOptOut; + RTCRoomJoinActionType = other.RTCRoomJoinActionType; } public void Set(ref JoinLobbyOptions? other) @@ -117,6 +133,7 @@ public void Set(ref JoinLobbyOptions? other) PresenceEnabled = other.Value.PresenceEnabled; LocalRTCOptions = other.Value.LocalRTCOptions; CrossplayOptOut = other.Value.CrossplayOptOut; + RTCRoomJoinActionType = other.Value.RTCRoomJoinActionType; } } diff --git a/com.playeveryware.eos/Runtime/EOS_SDK/Generated/Lobby/JoinRTCRoomCallbackInfo.cs b/com.playeveryware.eos/Runtime/EOS_SDK/Generated/Lobby/JoinRTCRoomCallbackInfo.cs new file mode 100644 index 000000000..1036c9255 --- /dev/null +++ b/com.playeveryware.eos/Runtime/EOS_SDK/Generated/Lobby/JoinRTCRoomCallbackInfo.cs @@ -0,0 +1,126 @@ +// Copyright Epic Games, Inc. All Rights Reserved. +// This file is automatically generated. Changes to this file may be overwritten. + +namespace Epic.OnlineServices.Lobby +{ + /// + /// Output parameters for the function. + /// + public struct JoinRTCRoomCallbackInfo : ICallbackInfo + { + /// + /// The code for the operation. indicates that the operation succeeded; other codes indicate errors. + /// + public Result ResultCode { get; set; } + + /// + /// Context that was passed into + /// + public object ClientData { get; set; } + + /// + /// The ID of the lobby + /// + public Utf8String LobbyId { get; set; } + + public Result? GetResultCode() + { + return ResultCode; + } + + internal void Set(ref JoinRTCRoomCallbackInfoInternal other) + { + ResultCode = other.ResultCode; + ClientData = other.ClientData; + LobbyId = other.LobbyId; + } + } + + [System.Runtime.InteropServices.StructLayout(System.Runtime.InteropServices.LayoutKind.Sequential, Pack = 8)] + internal struct JoinRTCRoomCallbackInfoInternal : ICallbackInfoInternal, IGettable, ISettable, System.IDisposable + { + private Result m_ResultCode; + private System.IntPtr m_ClientData; + private System.IntPtr m_LobbyId; + + public Result ResultCode + { + get + { + return m_ResultCode; + } + + set + { + m_ResultCode = value; + } + } + + public object ClientData + { + get + { + object value; + Helper.Get(m_ClientData, out value); + return value; + } + + set + { + Helper.Set(value, ref m_ClientData); + } + } + + public System.IntPtr ClientDataAddress + { + get + { + return m_ClientData; + } + } + + public Utf8String LobbyId + { + get + { + Utf8String value; + Helper.Get(m_LobbyId, out value); + return value; + } + + set + { + Helper.Set(value, ref m_LobbyId); + } + } + + public void Set(ref JoinRTCRoomCallbackInfo other) + { + ResultCode = other.ResultCode; + ClientData = other.ClientData; + LobbyId = other.LobbyId; + } + + public void Set(ref JoinRTCRoomCallbackInfo? other) + { + if (other.HasValue) + { + ResultCode = other.Value.ResultCode; + ClientData = other.Value.ClientData; + LobbyId = other.Value.LobbyId; + } + } + + public void Dispose() + { + Helper.Dispose(ref m_ClientData); + Helper.Dispose(ref m_LobbyId); + } + + public void Get(out JoinRTCRoomCallbackInfo output) + { + output = new JoinRTCRoomCallbackInfo(); + output.Set(ref this); + } + } +} \ No newline at end of file diff --git a/com.playeveryware.eos/Runtime/EOS_SDK/Generated/Lobby/JoinRTCRoomCallbackInfo.cs.meta b/com.playeveryware.eos/Runtime/EOS_SDK/Generated/Lobby/JoinRTCRoomCallbackInfo.cs.meta new file mode 100644 index 000000000..c3ac408b9 --- /dev/null +++ b/com.playeveryware.eos/Runtime/EOS_SDK/Generated/Lobby/JoinRTCRoomCallbackInfo.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: f32b1cc705a65bc4bbf8fc653d0268df +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/com.playeveryware.eos/Runtime/EOS_SDK/Generated/Lobby/JoinRTCRoomOptions.cs b/com.playeveryware.eos/Runtime/EOS_SDK/Generated/Lobby/JoinRTCRoomOptions.cs new file mode 100644 index 000000000..3e323056f --- /dev/null +++ b/com.playeveryware.eos/Runtime/EOS_SDK/Generated/Lobby/JoinRTCRoomOptions.cs @@ -0,0 +1,86 @@ +// Copyright Epic Games, Inc. All Rights Reserved. +// This file is automatically generated. Changes to this file may be overwritten. + +namespace Epic.OnlineServices.Lobby +{ + /// + /// Input parameters for the function. + /// + public struct JoinRTCRoomOptions + { + /// + /// The ID of the lobby to join the RTC Room of + /// + public Utf8String LobbyId { get; set; } + + /// + /// The Product User ID of the local user in the lobby + /// + public ProductUserId LocalUserId { get; set; } + + /// + /// Allows the local application to set local audio options for the RTC Room if it is enabled. + /// Only updates audio options when explicitly set; does not provide defaults. + /// + public LocalRTCOptions? LocalRTCOptions { get; set; } + } + + [System.Runtime.InteropServices.StructLayout(System.Runtime.InteropServices.LayoutKind.Sequential, Pack = 8)] + internal struct JoinRTCRoomOptionsInternal : ISettable, System.IDisposable + { + private int m_ApiVersion; + private System.IntPtr m_LobbyId; + private System.IntPtr m_LocalUserId; + private System.IntPtr m_LocalRTCOptions; + + public Utf8String LobbyId + { + set + { + Helper.Set(value, ref m_LobbyId); + } + } + + public ProductUserId LocalUserId + { + set + { + Helper.Set(value, ref m_LocalUserId); + } + } + + public LocalRTCOptions? LocalRTCOptions + { + set + { + Helper.Set(ref value, ref m_LocalRTCOptions); + } + } + + public void Set(ref JoinRTCRoomOptions other) + { + m_ApiVersion = LobbyInterface.JoinrtcroomApiLatest; + LobbyId = other.LobbyId; + LocalUserId = other.LocalUserId; + LocalRTCOptions = other.LocalRTCOptions; + } + + public void Set(ref JoinRTCRoomOptions? other) + { + if (other.HasValue) + { + m_ApiVersion = LobbyInterface.JoinrtcroomApiLatest; + LobbyId = other.Value.LobbyId; + LocalUserId = other.Value.LocalUserId; + LocalRTCOptions = other.Value.LocalRTCOptions; + } + } + + public void Dispose() + { + Helper.Dispose(ref m_LobbyId); + Helper.Dispose(ref m_LocalUserId); + Helper.Dispose(ref m_LocalRTCOptions); + } + } +} \ No newline at end of file diff --git a/com.playeveryware.eos/Runtime/EOS_SDK/Generated/Lobby/JoinRTCRoomOptions.cs.meta b/com.playeveryware.eos/Runtime/EOS_SDK/Generated/Lobby/JoinRTCRoomOptions.cs.meta new file mode 100644 index 000000000..3554a1cf1 --- /dev/null +++ b/com.playeveryware.eos/Runtime/EOS_SDK/Generated/Lobby/JoinRTCRoomOptions.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: f9aa5c44866dee245aa6dfbf2c55b7c1 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/com.playeveryware.eos/Runtime/EOS_SDK/Generated/Lobby/LeaveRTCRoomCallbackInfo.cs b/com.playeveryware.eos/Runtime/EOS_SDK/Generated/Lobby/LeaveRTCRoomCallbackInfo.cs new file mode 100644 index 000000000..b4c11cb39 --- /dev/null +++ b/com.playeveryware.eos/Runtime/EOS_SDK/Generated/Lobby/LeaveRTCRoomCallbackInfo.cs @@ -0,0 +1,126 @@ +// Copyright Epic Games, Inc. All Rights Reserved. +// This file is automatically generated. Changes to this file may be overwritten. + +namespace Epic.OnlineServices.Lobby +{ + /// + /// Output parameters for the function. + /// + public struct LeaveRTCRoomCallbackInfo : ICallbackInfo + { + /// + /// The code for the operation. indicates that the operation succeeded; other codes indicate errors. + /// + public Result ResultCode { get; set; } + + /// + /// Context that was passed into + /// + public object ClientData { get; set; } + + /// + /// The ID of the lobby + /// + public Utf8String LobbyId { get; set; } + + public Result? GetResultCode() + { + return ResultCode; + } + + internal void Set(ref LeaveRTCRoomCallbackInfoInternal other) + { + ResultCode = other.ResultCode; + ClientData = other.ClientData; + LobbyId = other.LobbyId; + } + } + + [System.Runtime.InteropServices.StructLayout(System.Runtime.InteropServices.LayoutKind.Sequential, Pack = 8)] + internal struct LeaveRTCRoomCallbackInfoInternal : ICallbackInfoInternal, IGettable, ISettable, System.IDisposable + { + private Result m_ResultCode; + private System.IntPtr m_ClientData; + private System.IntPtr m_LobbyId; + + public Result ResultCode + { + get + { + return m_ResultCode; + } + + set + { + m_ResultCode = value; + } + } + + public object ClientData + { + get + { + object value; + Helper.Get(m_ClientData, out value); + return value; + } + + set + { + Helper.Set(value, ref m_ClientData); + } + } + + public System.IntPtr ClientDataAddress + { + get + { + return m_ClientData; + } + } + + public Utf8String LobbyId + { + get + { + Utf8String value; + Helper.Get(m_LobbyId, out value); + return value; + } + + set + { + Helper.Set(value, ref m_LobbyId); + } + } + + public void Set(ref LeaveRTCRoomCallbackInfo other) + { + ResultCode = other.ResultCode; + ClientData = other.ClientData; + LobbyId = other.LobbyId; + } + + public void Set(ref LeaveRTCRoomCallbackInfo? other) + { + if (other.HasValue) + { + ResultCode = other.Value.ResultCode; + ClientData = other.Value.ClientData; + LobbyId = other.Value.LobbyId; + } + } + + public void Dispose() + { + Helper.Dispose(ref m_ClientData); + Helper.Dispose(ref m_LobbyId); + } + + public void Get(out LeaveRTCRoomCallbackInfo output) + { + output = new LeaveRTCRoomCallbackInfo(); + output.Set(ref this); + } + } +} \ No newline at end of file diff --git a/com.playeveryware.eos/Runtime/EOS_SDK/Generated/Lobby/LeaveRTCRoomCallbackInfo.cs.meta b/com.playeveryware.eos/Runtime/EOS_SDK/Generated/Lobby/LeaveRTCRoomCallbackInfo.cs.meta new file mode 100644 index 000000000..d5af8d6b4 --- /dev/null +++ b/com.playeveryware.eos/Runtime/EOS_SDK/Generated/Lobby/LeaveRTCRoomCallbackInfo.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: dd6fe4dc44e7b6242b8032bcba1a256c +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/com.playeveryware.eos/Runtime/EOS_SDK/Generated/Lobby/LeaveRTCRoomOptions.cs b/com.playeveryware.eos/Runtime/EOS_SDK/Generated/Lobby/LeaveRTCRoomOptions.cs new file mode 100644 index 000000000..721380d6e --- /dev/null +++ b/com.playeveryware.eos/Runtime/EOS_SDK/Generated/Lobby/LeaveRTCRoomOptions.cs @@ -0,0 +1,68 @@ +// Copyright Epic Games, Inc. All Rights Reserved. +// This file is automatically generated. Changes to this file may be overwritten. + +namespace Epic.OnlineServices.Lobby +{ + /// + /// Input parameters for the function. + /// + public struct LeaveRTCRoomOptions + { + /// + /// The ID of the lobby owning the RTC Room to leave + /// + public Utf8String LobbyId { get; set; } + + /// + /// The Product User ID of the local user in the lobby + /// + public ProductUserId LocalUserId { get; set; } + } + + [System.Runtime.InteropServices.StructLayout(System.Runtime.InteropServices.LayoutKind.Sequential, Pack = 8)] + internal struct LeaveRTCRoomOptionsInternal : ISettable, System.IDisposable + { + private int m_ApiVersion; + private System.IntPtr m_LobbyId; + private System.IntPtr m_LocalUserId; + + public Utf8String LobbyId + { + set + { + Helper.Set(value, ref m_LobbyId); + } + } + + public ProductUserId LocalUserId + { + set + { + Helper.Set(value, ref m_LocalUserId); + } + } + + public void Set(ref LeaveRTCRoomOptions other) + { + m_ApiVersion = LobbyInterface.LeavertcroomApiLatest; + LobbyId = other.LobbyId; + LocalUserId = other.LocalUserId; + } + + public void Set(ref LeaveRTCRoomOptions? other) + { + if (other.HasValue) + { + m_ApiVersion = LobbyInterface.LeavertcroomApiLatest; + LobbyId = other.Value.LobbyId; + LocalUserId = other.Value.LocalUserId; + } + } + + public void Dispose() + { + Helper.Dispose(ref m_LobbyId); + Helper.Dispose(ref m_LocalUserId); + } + } +} \ No newline at end of file diff --git a/com.playeveryware.eos/Runtime/EOS_SDK/Generated/Lobby/LeaveRTCRoomOptions.cs.meta b/com.playeveryware.eos/Runtime/EOS_SDK/Generated/Lobby/LeaveRTCRoomOptions.cs.meta new file mode 100644 index 000000000..e7935c3a1 --- /dev/null +++ b/com.playeveryware.eos/Runtime/EOS_SDK/Generated/Lobby/LeaveRTCRoomOptions.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 518b98973bd553d4d9de2e748a0a5b82 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/com.playeveryware.eos/Runtime/EOS_SDK/Generated/Lobby/LobbyInterface.cs b/com.playeveryware.eos/Runtime/EOS_SDK/Generated/Lobby/LobbyInterface.cs index 0a840d0ec..239a54e56 100644 --- a/com.playeveryware.eos/Runtime/EOS_SDK/Generated/Lobby/LobbyInterface.cs +++ b/com.playeveryware.eos/Runtime/EOS_SDK/Generated/Lobby/LobbyInterface.cs @@ -91,7 +91,7 @@ public LobbyInterface(System.IntPtr innerHandle) : base(innerHandle) /// /// The most recent version of the API. /// - public const int CreatelobbyApiLatest = 9; + public const int CreatelobbyApiLatest = 10; /// /// The most recent version of the API. @@ -146,12 +146,17 @@ public LobbyInterface(System.IntPtr innerHandle) : base(innerHandle) /// /// The most recent version of the API. /// - public const int JoinlobbyApiLatest = 4; + public const int JoinlobbyApiLatest = 5; /// /// The most recent version of the API. /// - public const int JoinlobbybyidApiLatest = 2; + public const int JoinlobbybyidApiLatest = 3; + + /// + /// The most recent version of the API. + /// + public const int JoinrtcroomApiLatest = 1; /// /// The most recent version of the API. @@ -163,6 +168,11 @@ public LobbyInterface(System.IntPtr innerHandle) : base(innerHandle) /// public const int LeavelobbyApiLatest = 1; + /// + /// The most recent version of the API. + /// + public const int LeavertcroomApiLatest = 1; + /// /// The most recent version of the structure. /// @@ -968,6 +978,38 @@ public void JoinLobbyById(ref JoinLobbyByIdOptions options, object clientData, O Helper.Dispose(ref optionsInternal); } + /// + /// Joins the RTC room associated with a specific lobby a local user belongs to. + /// + /// This function will only succeed when called on a lobby that has the RTC Room feature enabled. + /// Clients may check if the RTC Room feature is enabled by inspecting the value of . + /// + /// Structure containing information about which lobby a local user should join the RTC Room for + /// Arbitrary data that is passed back to you in the CompletionDelegate + /// A callback that is fired when the join RTC Room operation completes, either successfully or in error + /// + /// if creation completes succesfully + /// if the lobby does not exist + /// if the lobby exists, but did not have the RTC Room feature enabled when created + /// if you pass a null pointer on invalid length for any of the parameters + /// if call does not affect the state of the RTC Room + /// if call to join is made when RTC Room state is not disconnected/disconnecting + /// + public void JoinRTCRoom(ref JoinRTCRoomOptions options, object clientData, OnJoinRTCRoomCallback completionDelegate) + { + JoinRTCRoomOptionsInternal optionsInternal = new JoinRTCRoomOptionsInternal(); + optionsInternal.Set(ref options); + + var clientDataAddress = System.IntPtr.Zero; + + var completionDelegateInternal = new OnJoinRTCRoomCallbackInternal(OnJoinRTCRoomCallbackInternalImplementation); + Helper.AddCallback(out clientDataAddress, clientData, completionDelegate, completionDelegateInternal); + + Bindings.EOS_Lobby_JoinRTCRoom(InnerHandle, ref optionsInternal, clientDataAddress, completionDelegateInternal); + + Helper.Dispose(ref optionsInternal); + } + /// /// Kick an existing member from the lobby /// @@ -1024,6 +1066,37 @@ public void LeaveLobby(ref LeaveLobbyOptions options, object clientData, OnLeave Helper.Dispose(ref optionsInternal); } + /// + /// Leaves the RTC room associated with a specific lobby a local user belongs to. + /// + /// This function will only succeed when called on a lobby that has the RTC Room feature enabled. + /// Clients may check if the RTC Room feature is enabled by inspecting the value of . + /// + /// Structure containing information about which lobby a local user should leave the RTC Room for + /// Arbitrary data that is passed back to you in the CompletionDelegate + /// A callback that is fired when the join RTC Room operation completes, either successfully or in error + /// + /// if creation completes succesfully + /// if the lobby does not exist + /// if the lobby exists, but did not have the RTC Room feature enabled when created + /// if you pass a null pointer on invalid length for any of the parameters + /// if call does not affect the state of the RTC Room + /// + public void LeaveRTCRoom(ref LeaveRTCRoomOptions options, object clientData, OnLeaveRTCRoomCallback completionDelegate) + { + LeaveRTCRoomOptionsInternal optionsInternal = new LeaveRTCRoomOptionsInternal(); + optionsInternal.Set(ref options); + + var clientDataAddress = System.IntPtr.Zero; + + var completionDelegateInternal = new OnLeaveRTCRoomCallbackInternal(OnLeaveRTCRoomCallbackInternalImplementation); + Helper.AddCallback(out clientDataAddress, clientData, completionDelegate, completionDelegateInternal); + + Bindings.EOS_Lobby_LeaveRTCRoom(InnerHandle, ref optionsInternal, clientDataAddress, completionDelegateInternal); + + Helper.Dispose(ref optionsInternal); + } + /// /// Parse the ConnectString for an EOS lobby invitation to extract just the lobby ID. /// Used for joining a lobby from a connection string (as generated by GetConnectString) found in a platform invitation or presence. @@ -1390,6 +1463,17 @@ internal static void OnJoinLobbyCallbackInternalImplementation(ref JoinLobbyCall } } + [MonoPInvokeCallback(typeof(OnJoinRTCRoomCallbackInternal))] + internal static void OnJoinRTCRoomCallbackInternalImplementation(ref JoinRTCRoomCallbackInfoInternal data) + { + OnJoinRTCRoomCallback callback; + JoinRTCRoomCallbackInfo callbackInfo; + if (Helper.TryGetAndRemoveCallback(ref data, out callback, out callbackInfo)) + { + callback(ref callbackInfo); + } + } + [MonoPInvokeCallback(typeof(OnKickMemberCallbackInternal))] internal static void OnKickMemberCallbackInternalImplementation(ref KickMemberCallbackInfoInternal data) { @@ -1423,6 +1507,17 @@ internal static void OnLeaveLobbyRequestedCallbackInternalImplementation(ref Lea } } + [MonoPInvokeCallback(typeof(OnLeaveRTCRoomCallbackInternal))] + internal static void OnLeaveRTCRoomCallbackInternalImplementation(ref LeaveRTCRoomCallbackInfoInternal data) + { + OnLeaveRTCRoomCallback callback; + LeaveRTCRoomCallbackInfo callbackInfo; + if (Helper.TryGetAndRemoveCallback(ref data, out callback, out callbackInfo)) + { + callback(ref callbackInfo); + } + } + [MonoPInvokeCallback(typeof(OnLobbyInviteAcceptedCallbackInternal))] internal static void OnLobbyInviteAcceptedCallbackInternalImplementation(ref LobbyInviteAcceptedCallbackInfoInternal data) { diff --git a/com.playeveryware.eos/Runtime/EOS_SDK/Generated/Lobby/LobbyRTCRoomJoinActionType.cs b/com.playeveryware.eos/Runtime/EOS_SDK/Generated/Lobby/LobbyRTCRoomJoinActionType.cs new file mode 100644 index 000000000..60bed798b --- /dev/null +++ b/com.playeveryware.eos/Runtime/EOS_SDK/Generated/Lobby/LobbyRTCRoomJoinActionType.cs @@ -0,0 +1,20 @@ +// Copyright Epic Games, Inc. All Rights Reserved. +// This file is automatically generated. Changes to this file may be overwritten. + +namespace Epic.OnlineServices.Lobby +{ + /// + /// Defines the type of action to take against RTC room when joining a lobby + /// + public enum LobbyRTCRoomJoinActionType : int + { + /// + /// Join RTC Room as soon as user joins the lobby + /// + AutomaticJoin = 0, + /// + /// Do not join RTC Room when joining the lobby. User must manually call Join RTC Room + /// + ManualJoin = 1 + } +} \ No newline at end of file diff --git a/com.playeveryware.eos/Runtime/EOS_SDK/Generated/Lobby/LobbyRTCRoomJoinActionType.cs.meta b/com.playeveryware.eos/Runtime/EOS_SDK/Generated/Lobby/LobbyRTCRoomJoinActionType.cs.meta new file mode 100644 index 000000000..af8d4eeea --- /dev/null +++ b/com.playeveryware.eos/Runtime/EOS_SDK/Generated/Lobby/LobbyRTCRoomJoinActionType.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 43ac56e2630e7704c8fcafcf091dec23 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/com.playeveryware.eos/Runtime/EOS_SDK/Generated/Lobby/OnJoinRTCRoomCallback.cs b/com.playeveryware.eos/Runtime/EOS_SDK/Generated/Lobby/OnJoinRTCRoomCallback.cs new file mode 100644 index 000000000..a95f4ca90 --- /dev/null +++ b/com.playeveryware.eos/Runtime/EOS_SDK/Generated/Lobby/OnJoinRTCRoomCallback.cs @@ -0,0 +1,14 @@ +// Copyright Epic Games, Inc. All Rights Reserved. +// This file is automatically generated. Changes to this file may be overwritten. + +namespace Epic.OnlineServices.Lobby +{ + /// + /// Function prototype definition for callbacks passed to + /// + /// A CallbackInfo containing the output information and result + public delegate void OnJoinRTCRoomCallback(ref JoinRTCRoomCallbackInfo data); + + [System.Runtime.InteropServices.UnmanagedFunctionPointer(Config.LibraryCallingConvention)] + internal delegate void OnJoinRTCRoomCallbackInternal(ref JoinRTCRoomCallbackInfoInternal data); +} \ No newline at end of file diff --git a/com.playeveryware.eos/Runtime/EOS_SDK/Generated/Lobby/OnJoinRTCRoomCallback.cs.meta b/com.playeveryware.eos/Runtime/EOS_SDK/Generated/Lobby/OnJoinRTCRoomCallback.cs.meta new file mode 100644 index 000000000..444a5f0db --- /dev/null +++ b/com.playeveryware.eos/Runtime/EOS_SDK/Generated/Lobby/OnJoinRTCRoomCallback.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: d7f54323455264e4b81ed05373876dbb +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/com.playeveryware.eos/Runtime/EOS_SDK/Generated/Lobby/OnLeaveRTCRoomCallback.cs b/com.playeveryware.eos/Runtime/EOS_SDK/Generated/Lobby/OnLeaveRTCRoomCallback.cs new file mode 100644 index 000000000..c9a7c9590 --- /dev/null +++ b/com.playeveryware.eos/Runtime/EOS_SDK/Generated/Lobby/OnLeaveRTCRoomCallback.cs @@ -0,0 +1,14 @@ +// Copyright Epic Games, Inc. All Rights Reserved. +// This file is automatically generated. Changes to this file may be overwritten. + +namespace Epic.OnlineServices.Lobby +{ + /// + /// Function prototype definition for callbacks passed to + /// + /// A CallbackInfo containing the output information and result + public delegate void OnLeaveRTCRoomCallback(ref LeaveRTCRoomCallbackInfo data); + + [System.Runtime.InteropServices.UnmanagedFunctionPointer(Config.LibraryCallingConvention)] + internal delegate void OnLeaveRTCRoomCallbackInternal(ref LeaveRTCRoomCallbackInfoInternal data); +} \ No newline at end of file diff --git a/com.playeveryware.eos/Runtime/EOS_SDK/Generated/Lobby/OnLeaveRTCRoomCallback.cs.meta b/com.playeveryware.eos/Runtime/EOS_SDK/Generated/Lobby/OnLeaveRTCRoomCallback.cs.meta new file mode 100644 index 000000000..be0a6f5f6 --- /dev/null +++ b/com.playeveryware.eos/Runtime/EOS_SDK/Generated/Lobby/OnLeaveRTCRoomCallback.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 6a94cf9c7f8c8ce4aa7d11443f93c40d +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/com.playeveryware.eos/Runtime/EOS_SDK/Generated/P2P/P2PInterface.cs b/com.playeveryware.eos/Runtime/EOS_SDK/Generated/P2P/P2PInterface.cs index 130eb811e..3bb1cf279 100644 --- a/com.playeveryware.eos/Runtime/EOS_SDK/Generated/P2P/P2PInterface.cs +++ b/com.playeveryware.eos/Runtime/EOS_SDK/Generated/P2P/P2PInterface.cs @@ -235,7 +235,7 @@ public ulong AddNotifyPeerConnectionClosed(ref AddNotifyPeerConnectionClosedOpti /// /// Listen for when a connection is established. This is fired when we first connect to a peer, when we reconnect to a peer after a connection interruption, /// and when our underlying network connection type changes (for example, from a direct connection to relay, or vice versa). Network Connection Type changes - /// will always be broadcast with a connection type, even if the connection was not interrupted. + /// will always be broadcast with a connection type, even if the connection was not interrupted. If the network status changes from offline to online, you must call this function again. /// /// /// @@ -301,7 +301,7 @@ public ulong AddNotifyPeerConnectionInterrupted(ref AddNotifyPeerConnectionInter /// /// Listen for incoming connection requests on a particular Socket ID, or optionally all Socket IDs. The bound function - /// will only be called if the connection has not already been accepted. + /// will only be called if the connection has not already been accepted. If the network status changes from offline to online, you must call this function again. /// /// /// Information about who would like notifications, and (optionally) only for a specific socket diff --git a/com.playeveryware.eos/Runtime/EOS_SDK/Generated/Platform/Options.cs b/com.playeveryware.eos/Runtime/EOS_SDK/Generated/Platform/Options.cs index a792f23e8..b074a54e7 100644 --- a/com.playeveryware.eos/Runtime/EOS_SDK/Generated/Platform/Options.cs +++ b/com.playeveryware.eos/Runtime/EOS_SDK/Generated/Platform/Options.cs @@ -82,7 +82,7 @@ public struct Options public IntegratedPlatform.IntegratedPlatformOptionsContainer IntegratedPlatformOptionsContainerHandle { get; set; } /// - /// Pointer to EOS__SystemSpecificOptions. This structure will be located in /eos_.h + /// Pointer to EOS_"PLATFORM_NAME"_SystemSpecificOptions. This structure will be located in "PLATFORM_NAME"/eos_"PLATFORM_NAME".h /// public System.IntPtr SystemSpecificOptions { get; set; } diff --git a/com.playeveryware.eos/Runtime/EOS_SDK/Generated/Platform/RTCOptions.cs b/com.playeveryware.eos/Runtime/EOS_SDK/Generated/Platform/RTCOptions.cs index 4741da625..f88257505 100644 --- a/com.playeveryware.eos/Runtime/EOS_SDK/Generated/Platform/RTCOptions.cs +++ b/com.playeveryware.eos/Runtime/EOS_SDK/Generated/Platform/RTCOptions.cs @@ -11,8 +11,8 @@ public struct RTCOptions /// /// This field is for platform specific initialization if any. /// - /// If provided then the structure will be located in /eos_.h. - /// The structure will be named EOS__RTCOptions. + /// If provided then the structure will be located in "PLATFORM_NAME"/eos_"PLATFORM_NAME".h. + /// The structure will be named EOS_"PLATFORM_NAME"_RTCOptions. /// public System.IntPtr PlatformSpecificOptions { 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 index aab807898..6821f9c96 100644 --- a/com.playeveryware.eos/Runtime/EOS_SDK/Generated/Version/VersionInterface.cs +++ b/com.playeveryware.eos/Runtime/EOS_SDK/Generated/Version/VersionInterface.cs @@ -11,9 +11,9 @@ public sealed partial class VersionInterface public const int MajorVersion = 1; - public const int MinorVersion = 16; + public const int MinorVersion = 17; - public const int PatchVersion = 4; + public const int PatchVersion = 0; public static readonly Utf8String ProductIdentifier = "Epic Online Services SDK"; diff --git a/com.playeveryware.eos/Runtime/EOS_SDK/Generated/Windows/Platform/WindowsOptions.cs b/com.playeveryware.eos/Runtime/EOS_SDK/Generated/Windows/Platform/WindowsOptions.cs index 43833c0b5..888cb8c71 100644 --- a/com.playeveryware.eos/Runtime/EOS_SDK/Generated/Windows/Platform/WindowsOptions.cs +++ b/com.playeveryware.eos/Runtime/EOS_SDK/Generated/Windows/Platform/WindowsOptions.cs @@ -82,7 +82,7 @@ public struct WindowsOptions public IntegratedPlatform.IntegratedPlatformOptionsContainer IntegratedPlatformOptionsContainerHandle { get; set; } /// - /// Pointer to EOS__SystemSpecificOptions. This structure will be located in /eos_.h + /// Pointer to EOS_"PLATFORM_NAME"_SystemSpecificOptions. This structure will be located in "PLATFORM_NAME"/eos_"PLATFORM_NAME".h /// public System.IntPtr SystemSpecificOptions { get; set; } diff --git a/com.playeveryware.eos/Runtime/EOS_SDK/Generated/Windows/Platform/WindowsRTCOptions.cs b/com.playeveryware.eos/Runtime/EOS_SDK/Generated/Windows/Platform/WindowsRTCOptions.cs index ffdde89ac..6f40e98b3 100644 --- a/com.playeveryware.eos/Runtime/EOS_SDK/Generated/Windows/Platform/WindowsRTCOptions.cs +++ b/com.playeveryware.eos/Runtime/EOS_SDK/Generated/Windows/Platform/WindowsRTCOptions.cs @@ -11,8 +11,8 @@ public struct WindowsRTCOptions /// /// This field is for platform specific initialization if any. /// - /// If provided then the structure will be located in /eos_.h. - /// The structure will be named EOS__RTCOptions. + /// If provided then the structure will be located in "PLATFORM_NAME"/eos_"PLATFORM_NAME".h. + /// The structure will be named EOS_"PLATFORM_NAME"_RTCOptions. /// public WindowsRTCOptionsPlatformSpecificOptions? PlatformSpecificOptions { get; set; } diff --git a/com.playeveryware.eos/package.json b/com.playeveryware.eos/package.json index f7e92c962..6dacff009 100644 --- a/com.playeveryware.eos/package.json +++ b/com.playeveryware.eos/package.json @@ -1,6 +1,6 @@ { "name": "com.playeveryware.eos", - "version": "3.3.6", + "version": "4.0.0", "unity": "2021.3", "unityRelease": "16f1", "author": { @@ -9,7 +9,7 @@ "url": "https://playeveryware.com" }, "displayName": "Epic Online Services Plugin for Unity", - "description": "Friendly Plugin for Epic Online Services\n Unity 2021.3.16f1\n EOS SDK 1.16.4\n\n Dependencies for Extra Packs:\n P2P Netcode Sample : [com.unity.netcode.gameobjects] \n Performance Stress Test Sample : [com.unity.postprocessing]", + "description": "Friendly Plugin for Epic Online Services\n Unity 2021.3.16f1\n EOS SDK 1.17.0\n\n Dependencies for Extra Packs:\n P2P Netcode Sample : [com.unity.netcode.gameobjects] \n Performance Stress Test Sample : [com.unity.postprocessing]", "documentationUrl": "https://eospluginforunity.playeveryware.com", "dependencies": { "com.unity.nuget.newtonsoft-json": "3.0.2", diff --git a/etc/PlatformSpecificAssets/EOS/Android/dynamic-stdc++/aar/eos-sdk.aar b/etc/PlatformSpecificAssets/EOS/Android/dynamic-stdc++/aar/eos-sdk.aar index 7f9bd7d2a..d9fad80d0 100644 --- a/etc/PlatformSpecificAssets/EOS/Android/dynamic-stdc++/aar/eos-sdk.aar +++ b/etc/PlatformSpecificAssets/EOS/Android/dynamic-stdc++/aar/eos-sdk.aar @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0737c59c91c2936f7dde970fb5465a1cd65cd5ab2cb57098bbf39043083e8923 -size 33796121 +oid sha256:c2bb8ba24ad22da5db267af416591357aaf867e923756fed96df9bc9872814ce +size 34258848 diff --git a/etc/PlatformSpecificAssets/EOS/Android/static-stdc++/aar/eos-sdk.aar b/etc/PlatformSpecificAssets/EOS/Android/static-stdc++/aar/eos-sdk.aar index 86dc97b71..46c661162 100644 --- a/etc/PlatformSpecificAssets/EOS/Android/static-stdc++/aar/eos-sdk.aar +++ b/etc/PlatformSpecificAssets/EOS/Android/static-stdc++/aar/eos-sdk.aar @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ab9361e5037b6fc55bb5053f042965cfc1af402b635209f50e5ac84351f8d201 -size 34094062 +oid sha256:661a01fd8057bbfd2d2b1fc316c50650e91767b9b95b7edfe0b7f72c1fe72cd1 +size 34563601 diff --git a/lib/NativeCode/third_party/eos_sdk/include/eos_achievements.h b/lib/NativeCode/third_party/eos_sdk/include/eos_achievements.h index 15c483f91..2a109e56e 100644 --- a/lib/NativeCode/third_party/eos_sdk/include/eos_achievements.h +++ b/lib/NativeCode/third_party/eos_sdk/include/eos_achievements.h @@ -67,6 +67,7 @@ EOS_DECLARE_FUNC(EOS_EResult) EOS_Achievements_CopyAchievementDefinitionV2ByAchi /** * Query for a list of achievements for a specific player, including progress towards completion for each achievement. + * Note: By default, this query will not return locked hidden achievements. To return all achievements, call EOS_Achievements_QueryDefinitions first. * * @note When the Social Overlay is enabled then this will be called automatically. The Social Overlay is enabled by default (see EOS_PF_DISABLE_SOCIAL_OVERLAY). * diff --git a/lib/NativeCode/third_party/eos_sdk/include/eos_anticheatclient.h b/lib/NativeCode/third_party/eos_sdk/include/eos_anticheatclient.h index 098b0a215..750481c62 100644 --- a/lib/NativeCode/third_party/eos_sdk/include/eos_anticheatclient.h +++ b/lib/NativeCode/third_party/eos_sdk/include/eos_anticheatclient.h @@ -158,6 +158,16 @@ EOS_DECLARE_FUNC(EOS_EResult) EOS_AntiCheatClient_EndSession(EOS_HAntiCheatClien */ EOS_DECLARE_FUNC(EOS_EResult) EOS_AntiCheatClient_PollStatus(EOS_HAntiCheatClient Handle, const EOS_AntiCheatClient_PollStatusOptions* Options, EOS_EAntiCheatClientViolationType* OutViolationType, char* OutMessage); +/** + * This function is reserved for future use and must not be called. + * + * @param Options Structure containing input data. + * @param OutValue Reserved. + * + * @return EOS_NotImplemented - Always + */ +EOS_DECLARE_FUNC(EOS_EResult) EOS_AntiCheatClient_Reserved01(EOS_HAntiCheatClient Handle, const EOS_AntiCheatClient_Reserved01Options* Options, int32_t* OutValue); + /** * Optional. Adds an integrity catalog and certificate pair from outside the game directory, * for example to support mods that load from elsewhere. diff --git a/lib/NativeCode/third_party/eos_sdk/include/eos_anticheatclient_types.h b/lib/NativeCode/third_party/eos_sdk/include/eos_anticheatclient_types.h index aafb488ff..de094784f 100644 --- a/lib/NativeCode/third_party/eos_sdk/include/eos_anticheatclient_types.h +++ b/lib/NativeCode/third_party/eos_sdk/include/eos_anticheatclient_types.h @@ -181,6 +181,12 @@ EOS_STRUCT(EOS_AntiCheatClient_EndSessionOptions, ( int32_t ApiVersion; )); +#define EOS_ANTICHEATCLIENT_RESERVED01_API_LATEST 1 +EOS_STRUCT(EOS_AntiCheatClient_Reserved01Options, ( + /** API Version: Set this to EOS_ANTICHEATCLIENT_RESERVED01_API_LATEST. */ + int32_t ApiVersion; +)); + #define EOS_ANTICHEATCLIENT_ADDEXTERNALINTEGRITYCATALOG_API_LATEST 1 EOS_STRUCT(EOS_AntiCheatClient_AddExternalIntegrityCatalogOptions, ( /** API Version: Set this to EOS_ANTICHEATCLIENT_ADDEXTERNALINTEGRITYCATALOG_API_LATEST. */ diff --git a/lib/NativeCode/third_party/eos_sdk/include/eos_anticheatcommon_types.h b/lib/NativeCode/third_party/eos_sdk/include/eos_anticheatcommon_types.h index 0c650cf79..cd68e1858 100644 --- a/lib/NativeCode/third_party/eos_sdk/include/eos_anticheatcommon_types.h +++ b/lib/NativeCode/third_party/eos_sdk/include/eos_anticheatcommon_types.h @@ -326,7 +326,7 @@ EOS_STRUCT(EOS_AntiCheatCommon_RegisterEventOptions, ( const char* EventName; /** Type of the custom event */ EOS_EAntiCheatCommonEventType EventType; - /** Number of parameters described in ParamDefs. Must be <= EOS_ANTICHEATCOMMON_REGISTEREVENT_MAX_PARAMDEFSCOUNT. */ + /** Number of parameters described in ParamDefs. Must be equal to or less than EOS_ANTICHEATCOMMON_REGISTEREVENT_MAX_PARAMDEFSCOUNT. */ uint32_t ParamDefsCount; /** Pointer to an array of EOS_AntiCheatCommon_RegisterEventParamDef with ParamDefsCount elements */ const EOS_AntiCheatCommon_RegisterEventParamDef* ParamDefs; diff --git a/lib/NativeCode/third_party/eos_sdk/include/eos_anticheatserver_types.h b/lib/NativeCode/third_party/eos_sdk/include/eos_anticheatserver_types.h index 762102dcc..e5719e48f 100644 --- a/lib/NativeCode/third_party/eos_sdk/include/eos_anticheatserver_types.h +++ b/lib/NativeCode/third_party/eos_sdk/include/eos_anticheatserver_types.h @@ -85,7 +85,7 @@ EOS_STRUCT(EOS_AntiCheatServer_EndSessionOptions, ( int32_t ApiVersion; )); -#define EOS_ANTICHEATSERVER_REGISTERCLIENT_API_LATEST 2 +#define EOS_ANTICHEATSERVER_REGISTERCLIENT_API_LATEST 3 EOS_STRUCT(EOS_AntiCheatServer_RegisterClientOptions, ( /** API Version: Set this to EOS_ANTICHEATSERVER_REGISTERCLIENT_API_LATEST. */ int32_t ApiVersion; @@ -112,6 +112,8 @@ EOS_STRUCT(EOS_AntiCheatServer_RegisterClientOptions, ( const char* IpAddress; /** The Product User ID for the remote user who is being registered. */ EOS_ProductUserId UserId; + /** Reserved for future use. Must be set to 0. */ + int32_t Reserved01; )); #define EOS_ANTICHEATSERVER_UNREGISTERCLIENT_API_LATEST 1 diff --git a/lib/NativeCode/third_party/eos_sdk/include/eos_auth_types.h b/lib/NativeCode/third_party/eos_sdk/include/eos_auth_types.h index d8e73fc2b..455dcdcdf 100644 --- a/lib/NativeCode/third_party/eos_sdk/include/eos_auth_types.h +++ b/lib/NativeCode/third_party/eos_sdk/include/eos_auth_types.h @@ -18,7 +18,7 @@ EOS_ENUM(EOS_ELoginCredentialType, /** * Login using account email address and password. * - * @note Use of this login method is restricted and cannot be used in general. + * Note: This login method is restricted to Epic Games internal use only. Do not use. */ EOS_LCT_Password = 0, /** diff --git a/lib/NativeCode/third_party/eos_sdk/include/eos_common.h b/lib/NativeCode/third_party/eos_sdk/include/eos_common.h index 66e67a612..33663fa3a 100644 --- a/lib/NativeCode/third_party/eos_sdk/include/eos_common.h +++ b/lib/NativeCode/third_party/eos_sdk/include/eos_common.h @@ -273,9 +273,9 @@ EOS_ENUM(EOS_EComparisonOp, EOS_CO_ANYOF = 7, /** Value stored on the lobby/session may NOT be any from a specified list */ EOS_CO_NOTANYOF = 8, - /** This one value is a part of a collection */ + /** This one value is a part of a collection. Supported in EOS_SessionSearch_SetParameter only. */ EOS_CO_ONEOF = 9, - /** This one value is NOT part of a collection */ + /** This one value is NOT part of a collection. Supported in EOS_SessionSearch_SetParameter only. */ EOS_CO_NOTONEOF = 10, /** This value is a CASE SENSITIVE substring of an attribute stored on the lobby/session */ EOS_CO_CONTAINS = 11 diff --git a/lib/NativeCode/third_party/eos_sdk/include/eos_ecom_types.h b/lib/NativeCode/third_party/eos_sdk/include/eos_ecom_types.h index aae447cb9..707a66cb5 100644 --- a/lib/NativeCode/third_party/eos_sdk/include/eos_ecom_types.h +++ b/lib/NativeCode/third_party/eos_sdk/include/eos_ecom_types.h @@ -88,6 +88,18 @@ EOS_ENUM(EOS_EEcomItemType, EOS_EIT_Other = 2 ); +/** + * An enumeration defining the possible orientation for the checkout page. This will be used on mobile. + */ +EOS_ENUM(EOS_ECheckoutOrientation, + /** Current orientation will be used */ + EOS_ECO_Default = 0, + /** Portrait orientation */ + EOS_ECO_Portrait = 1, + /** Landscape orientation */ + EOS_ECO_Landscape = 2 +); + /** The most recent version of the EOS_Ecom_Entitlement struct. */ #define EOS_ECOM_ENTITLEMENT_API_LATEST 2 @@ -514,7 +526,7 @@ EOS_STRUCT(EOS_Ecom_QueryOwnershipTokenCallbackInfo, ( EOS_DECLARE_CALLBACK(EOS_Ecom_OnQueryOwnershipTokenCallback, const EOS_Ecom_QueryOwnershipTokenCallbackInfo* Data); /** The most recent version of the EOS_Ecom_QueryEntitlements API. */ -#define EOS_ECOM_QUERYENTITLEMENTS_API_LATEST 2 +#define EOS_ECOM_QUERYENTITLEMENTS_API_LATEST 3 /** * The maximum number of entitlements that may be queried in a single QueryEntitlements API call. @@ -535,6 +547,8 @@ EOS_STRUCT(EOS_Ecom_QueryEntitlementsOptions, ( uint32_t EntitlementNameCount; /** If true, Entitlements that have been redeemed will be included in the results. */ EOS_Bool bIncludeRedeemed; + /** If not provided then the SandboxId is used as the catalog namespace */ + const char* OverrideCatalogNamespace; )); /** @@ -629,7 +643,7 @@ EOS_DECLARE_CALLBACK(EOS_Ecom_OnQueryOffersCallback, const EOS_Ecom_QueryOffersC /** The most recent version of the EOS_Ecom_Checkout API. */ -#define EOS_ECOM_CHECKOUT_API_LATEST 1 +#define EOS_ECOM_CHECKOUT_API_LATEST 2 /** The maximum number of entries in a single checkout. */ #define EOS_ECOM_CHECKOUT_MAX_ENTRIES 10 @@ -650,6 +664,13 @@ EOS_STRUCT(EOS_Ecom_CheckoutOptions, ( uint32_t EntryCount; /** An array of EOS_Ecom_CheckoutEntry elements, each containing the details of a single offer */ const EOS_Ecom_CheckoutEntry* Entries; + /** + * Preferred device orientation, specifies Default, Portrait or Landscape. + * This is used only on mobile platforms currently. + * SDK can use it to optimize how the Checkout page should be displayed. + * Please check the mobile SDK documentation for additional required setup. + */ + EOS_ECheckoutOrientation PreferredOrientation; )); /** diff --git a/lib/NativeCode/third_party/eos_sdk/include/eos_lobby.h b/lib/NativeCode/third_party/eos_sdk/include/eos_lobby.h index 3ff111012..1ce6b92e9 100644 --- a/lib/NativeCode/third_party/eos_sdk/include/eos_lobby.h +++ b/lib/NativeCode/third_party/eos_sdk/include/eos_lobby.h @@ -472,6 +472,42 @@ EOS_DECLARE_FUNC(EOS_EResult) EOS_Lobby_CopyLobbyDetailsHandle(EOS_HLobby Handle */ EOS_DECLARE_FUNC(EOS_EResult) EOS_Lobby_GetRTCRoomName(EOS_HLobby Handle, const EOS_Lobby_GetRTCRoomNameOptions* Options, char* OutBuffer, uint32_t* InOutBufferLength); +/** + * Joins the RTC room associated with a specific lobby a local user belongs to. + * + * This function will only succeed when called on a lobby that has the RTC Room feature enabled. + * Clients may check if the RTC Room feature is enabled by inspecting the value of EOS_LobbyDetails_Info::bRTCRoomEnabled. + * + * @param Options Structure containing information about which lobby a local user should join the RTC Room for + * @param ClientData Arbitrary data that is passed back to you in the CompletionDelegate + * @param CompletionDelegate A callback that is fired when the join RTC Room operation completes, either successfully or in error + * + * @return EOS_Success if creation completes succesfully + * EOS_NotFound if the lobby does not exist + * EOS_Disabled if the lobby exists, but did not have the RTC Room feature enabled when created + * EOS_InvalidParameters if you pass a null pointer on invalid length for any of the parameters + * EOS_NoChange if call does not affect the state of the RTC Room + * EOS_InvalidState if call to join is made when RTC Room state is not disconnected/disconnecting + */ +EOS_DECLARE_FUNC(void) EOS_Lobby_JoinRTCRoom(EOS_HLobby Handle, const EOS_Lobby_JoinRTCRoomOptions* Options, void* ClientData, const EOS_Lobby_OnJoinRTCRoomCallback CompletionDelegate); + +/** + * Leaves the RTC room associated with a specific lobby a local user belongs to. + * + * This function will only succeed when called on a lobby that has the RTC Room feature enabled. + * Clients may check if the RTC Room feature is enabled by inspecting the value of EOS_LobbyDetails_Info::bRTCRoomEnabled. + * + * @param Options Structure containing information about which lobby a local user should leave the RTC Room for + * @param ClientData Arbitrary data that is passed back to you in the CompletionDelegate + * @param CompletionDelegate A callback that is fired when the join RTC Room operation completes, either successfully or in error + * @return EOS_Success if creation completes succesfully + * EOS_NotFound if the lobby does not exist + * EOS_Disabled if the lobby exists, but did not have the RTC Room feature enabled when created + * EOS_InvalidParameters if you pass a null pointer on invalid length for any of the parameters + * EOS_NoChange if call does not affect the state of the RTC Room + */ +EOS_DECLARE_FUNC(void) EOS_Lobby_LeaveRTCRoom(EOS_HLobby Handle, const EOS_Lobby_LeaveRTCRoomOptions* Options, void* ClientData, const EOS_Lobby_OnLeaveRTCRoomCallback CompletionDelegate); + /** * Get the current connection status of the RTC Room for a lobby. * diff --git a/lib/NativeCode/third_party/eos_sdk/include/eos_lobby_types.h b/lib/NativeCode/third_party/eos_sdk/include/eos_lobby_types.h index 5dec7565e..fe102d380 100644 --- a/lib/NativeCode/third_party/eos_sdk/include/eos_lobby_types.h +++ b/lib/NativeCode/third_party/eos_sdk/include/eos_lobby_types.h @@ -85,6 +85,13 @@ EOS_ENUM(EOS_ELobbyMemberStatus, /** The lobby has been closed and user has been removed */ EOS_LMS_CLOSED = 5 ); +/** Defines the type of action to take against RTC room when joining a lobby */ +EOS_ENUM(EOS_ELobbyRTCRoomJoinActionType, + /** Join RTC Room as soon as user joins the lobby */ + EOS_LRRJAT_AutomaticJoin = 0, + /** Do not join RTC Room when joining the lobby. User must manually call Join RTC Room */ + EOS_LRRJAT_ManualJoin = 1 +); #define EOS_LOBBYDETAILS_INFO_API_LATEST 3 @@ -159,7 +166,7 @@ EOS_STRUCT(EOS_Lobby_LocalRTCOptions, ( )); /** The most recent version of the EOS_Lobby_CreateLobby API. */ -#define EOS_LOBBY_CREATELOBBY_API_LATEST 9 +#define EOS_LOBBY_CREATELOBBY_API_LATEST 10 /** * Input parameters for the EOS_Lobby_CreateLobby function. @@ -247,6 +254,11 @@ EOS_STRUCT(EOS_Lobby_CreateLobbyOptions, ( * the platform of the lobby owner. */ EOS_Bool bCrossplayOptOut; + /** + * If bEnableRTCRoom is true, this value indicates the action to take against the RTC Room when joining the lobby. This may be used + * to indicate the RTCRoom should be joined immediately or manually at a later time. + */ + EOS_ELobbyRTCRoomJoinActionType RTCRoomJoinActionType; )); /** @@ -302,7 +314,7 @@ EOS_DECLARE_CALLBACK(EOS_Lobby_OnDestroyLobbyCallback, const EOS_Lobby_DestroyLo /** The most recent version of the EOS_Lobby_JoinLobby API. */ -#define EOS_LOBBY_JOINLOBBY_API_LATEST 4 +#define EOS_LOBBY_JOINLOBBY_API_LATEST 5 /** * Input parameters for the EOS_Lobby_JoinLobby function. @@ -341,6 +353,11 @@ EOS_STRUCT(EOS_Lobby_JoinLobbyOptions, ( * will be treated as allowing crossplay. */ EOS_Bool bCrossplayOptOut; + /** + * For lobbies with the RTC Room feature enabled, this value indicates the action to take against the RTC Room when joining the lobby. This may be used + * to indicate the RTCRoom should be joined immediately or manually at a later time. + */ + EOS_ELobbyRTCRoomJoinActionType RTCRoomJoinActionType; )); /** @@ -362,7 +379,7 @@ EOS_STRUCT(EOS_Lobby_JoinLobbyCallbackInfo, ( EOS_DECLARE_CALLBACK(EOS_Lobby_OnJoinLobbyCallback, const EOS_Lobby_JoinLobbyCallbackInfo* Data); /** The most recent version of the EOS_Lobby_JoinLobbyById API. */ -#define EOS_LOBBY_JOINLOBBYBYID_API_LATEST 2 +#define EOS_LOBBY_JOINLOBBYBYID_API_LATEST 3 /** * Input parameters for the EOS_Lobby_JoinLobbyById function. @@ -401,6 +418,11 @@ EOS_STRUCT(EOS_Lobby_JoinLobbyByIdOptions, ( * will be treated as allowing crossplay. */ EOS_Bool bCrossplayOptOut; + /** + * For lobbies with the RTC Room feature enabled, this value indicates the action to take against the RTC Room when joining the lobby. This may be used + * to indicate the RTCRoom should be joined immediately or manually at a later time. + */ + EOS_ELobbyRTCRoomJoinActionType RTCRoomJoinActionType; )); /** @@ -500,6 +522,75 @@ EOS_STRUCT(EOS_Lobby_UpdateLobbyCallbackInfo, ( */ EOS_DECLARE_CALLBACK(EOS_Lobby_OnUpdateLobbyCallback, const EOS_Lobby_UpdateLobbyCallbackInfo* Data); +/** The most recent version of the EOS_Lobby_JoinRTCRoom API. */ +#define EOS_LOBBY_JOINRTCROOM_API_LATEST 1 + +/** + * Input parameters for the EOS_Lobby_JoinRTCRoom function. + */ +EOS_STRUCT(EOS_Lobby_JoinRTCRoomOptions, ( + /** API Version: Set this to EOS_LOBBY_JOINRTCROOM_API_LATEST. */ + int32_t ApiVersion; + /** The ID of the lobby to join the RTC Room of */ + EOS_LobbyId LobbyId; + /** The Product User ID of the local user in the lobby */ + EOS_ProductUserId LocalUserId; + /** + * Allows the local application to set local audio options for the RTC Room if it is enabled. + * Only updates audio options when explicitly set; does not provide defaults. + */ + const EOS_Lobby_LocalRTCOptions* LocalRTCOptions; +)); + +/** + * Output parameters for the EOS_Lobby_JoinRTCRoom function. + */ +EOS_STRUCT(EOS_Lobby_JoinRTCRoomCallbackInfo, ( + /** The EOS_EResult code for the operation. EOS_Success indicates that the operation succeeded; other codes indicate errors. */ + EOS_EResult ResultCode; + /** Context that was passed into EOS_Lobby_JoinRTCRoom */ + void* ClientData; + /** The ID of the lobby */ + EOS_LobbyId LobbyId; +)); + +/** +* Function prototype definition for callbacks passed to EOS_Lobby_JoinRTCRoom +* @param Data A EOS_Lobby_JoinRTCRoom CallbackInfo containing the output information and result +*/ +EOS_DECLARE_CALLBACK(EOS_Lobby_OnJoinRTCRoomCallback, const EOS_Lobby_JoinRTCRoomCallbackInfo* Data); +/** The most recent version of the EOS_Lobby_LeaveRTCRoom API. */ +#define EOS_LOBBY_LEAVERTCROOM_API_LATEST 1 + +/** + * Input parameters for the EOS_Lobby_LeaveRTCRoom function. + */ +EOS_STRUCT(EOS_Lobby_LeaveRTCRoomOptions, ( + /** API Version: Set this to EOS_LOBBY_LEAVERTCROOM_API_LATEST. */ + int32_t ApiVersion; + /** The ID of the lobby owning the RTC Room to leave */ + EOS_LobbyId LobbyId; + /** The Product User ID of the local user in the lobby */ + EOS_ProductUserId LocalUserId; +)); +/** + * Output parameters for the EOS_Lobby_LeaveRTCRoom function. + */ +EOS_STRUCT(EOS_Lobby_LeaveRTCRoomCallbackInfo, ( + /** The EOS_EResult code for the operation. EOS_Success indicates that the operation succeeded; other codes indicate errors. */ + EOS_EResult ResultCode; + /** Context that was passed into EOS_Lobby_LeaveRTCRoom */ + void* ClientData; + /** The ID of the lobby */ + EOS_LobbyId LobbyId; +)); + +/** + * Function prototype definition for callbacks passed to EOS_Lobby_LeaveRTCRoom + * @param Data A EOS_Lobby_LeaveRTCRoom CallbackInfo containing the output information and result + */ +EOS_DECLARE_CALLBACK(EOS_Lobby_OnLeaveRTCRoomCallback, const EOS_Lobby_LeaveRTCRoomCallbackInfo* Data); + /** The most recent version of the EOS_Lobby_PromoteMember API. */ #define EOS_LOBBY_PROMOTEMEMBER_API_LATEST 1 diff --git a/lib/NativeCode/third_party/eos_sdk/include/eos_p2p.h b/lib/NativeCode/third_party/eos_sdk/include/eos_p2p.h index 34aa48861..a2785d310 100644 --- a/lib/NativeCode/third_party/eos_sdk/include/eos_p2p.h +++ b/lib/NativeCode/third_party/eos_sdk/include/eos_p2p.h @@ -53,7 +53,7 @@ EOS_DECLARE_FUNC(EOS_EResult) EOS_P2P_ReceivePacket(EOS_HP2P Handle, const EOS_P /** * Listen for incoming connection requests on a particular Socket ID, or optionally all Socket IDs. The bound function - * will only be called if the connection has not already been accepted. + * will only be called if the connection has not already been accepted. If the network status changes from offline to online, you must call this function again. * * @param Options Information about who would like notifications, and (optionally) only for a specific socket * @param ClientData This value is returned to the caller when ConnectionRequestHandler is invoked @@ -76,7 +76,7 @@ EOS_DECLARE_FUNC(void) EOS_P2P_RemoveNotifyPeerConnectionRequest(EOS_HP2P Handle /** * Listen for when a connection is established. This is fired when we first connect to a peer, when we reconnect to a peer after a connection interruption, * and when our underlying network connection type changes (for example, from a direct connection to relay, or vice versa). Network Connection Type changes - * will always be broadcast with a EOS_CET_Reconnection connection type, even if the connection was not interrupted. + * will always be broadcast with a EOS_CET_Reconnection connection type, even if the connection was not interrupted. If the network status changes from offline to online, you must call this function again. * * @param Options Information about who would like notifications about established connections, and for which socket * @param ClientData This value is returned to the caller when ConnectionEstablishedHandler is invoked diff --git a/lib/NativeCode/third_party/eos_sdk/include/eos_types.h b/lib/NativeCode/third_party/eos_sdk/include/eos_types.h index 8cacc375d..0052b6779 100644 --- a/lib/NativeCode/third_party/eos_sdk/include/eos_types.h +++ b/lib/NativeCode/third_party/eos_sdk/include/eos_types.h @@ -46,8 +46,8 @@ EOS_STRUCT(EOS_Platform_RTCOptions, ( /** * This field is for platform specific initialization if any. * - * If provided then the structure will be located in /eos_.h. - * The structure will be named EOS__RTCOptions. + * If provided then the structure will be located in "PLATFORM_NAME"/eos_"PLATFORM_NAME".h. + * The structure will be named EOS_"PLATFORM_NAME"_RTCOptions. */ void* PlatformSpecificOptions; /** Configures RTC behavior upon entering to any background application statuses */ @@ -131,7 +131,7 @@ EOS_STRUCT(EOS_Platform_Options, ( * When set to NULL, the EOS Integrated Platform behavior for the host platform will be disabled. */ EOS_HIntegratedPlatformOptionsContainer IntegratedPlatformOptionsContainerHandle; - /** Pointer to EOS__SystemSpecificOptions. This structure will be located in /eos_.h */ + /** Pointer to EOS_"PLATFORM_NAME"_SystemSpecificOptions. This structure will be located in "PLATFORM_NAME"/eos_"PLATFORM_NAME".h */ const void* SystemSpecificOptions; /** * Number of seconds for a task to wait for the network to become available before timing out with an EOS_TimedOut error. diff --git a/lib/NativeCode/third_party/eos_sdk/include/eos_version.h b/lib/NativeCode/third_party/eos_sdk/include/eos_version.h index d536acfb3..dbc72a624 100644 --- a/lib/NativeCode/third_party/eos_sdk/include/eos_version.h +++ b/lib/NativeCode/third_party/eos_sdk/include/eos_version.h @@ -6,8 +6,8 @@ // These numbers define the banner SDK version, and are the most significant numbers when ordering two engine versions (that is, a 4.12.* version is always // newer than a 4.11.* version, regardless of the changelist that it was built with) #define EOS_MAJOR_VERSION 1 -#define EOS_MINOR_VERSION 16 -#define EOS_PATCH_VERSION 4 +#define EOS_MINOR_VERSION 17 +#define EOS_PATCH_VERSION 0 // Macros for encoding strings #define EOS_VERSION_STRINGIFY_2(x) #x @@ -19,9 +19,9 @@ #define EOS_PRODUCT_NAME "Epic Online Services SDK" #define EOS_PRODUCT_IDENTIFIER "Epic Online Services SDK" -#define EOS_VERSION_STRING_BASE \ - EOS_VERSION_STRINGIFY(EOS_MAJOR_VERSION) "." \ - EOS_VERSION_STRINGIFY(EOS_MINOR_VERSION) "." \ +#define EOS_VERSION_STRING_BASE \ + EOS_VERSION_STRINGIFY(EOS_MAJOR_VERSION) "." \ + EOS_VERSION_STRINGIFY(EOS_MINOR_VERSION) "." \ EOS_VERSION_STRINGIFY(EOS_PATCH_VERSION) #if defined(BUILT_FROM_CHANGELIST) diff --git a/tools/bin/EOSBootstrapper.exe b/tools/bin/EOSBootstrapper.exe index c34385df5..9c3110a61 100644 --- a/tools/bin/EOSBootstrapper.exe +++ b/tools/bin/EOSBootstrapper.exe @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ee3ff3ca4625706bd105212fcc90823d85aa70f723b060b1d3b7e572cd5ec93d +oid sha256:87bfd7ed2334fd1dab0e1cc9a0fe3cc53afbc29d8ba4a602dba633a533fa8ccf size 2632704 diff --git a/tools/bin/EOSBootstrapperTool.exe b/tools/bin/EOSBootstrapperTool.exe index b42296ad7..8e65d5d7c 100644 --- a/tools/bin/EOSBootstrapperTool.exe +++ b/tools/bin/EOSBootstrapperTool.exe @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e7726d6a8a3716afd22e5d50938c307ac44dc96f2b0bee85b341574d52e0b90e -size 5288424 +oid sha256:6bead8900ab1644bfb818843c47a2cd90446a4df7ce0e54e980cfb1279bd4702 +size 5288408