Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Assets/Plugins/Linux/libEOSSDK-Linux-Shipping.so
Git LFS file not shown
4 changes: 2 additions & 2 deletions Assets/Plugins/Windows/x64/EOSSDK-Win64-Shipping.dll
Git LFS file not shown
4 changes: 2 additions & 2 deletions Assets/Plugins/iOS/EOSSDK.framework/EOSSDK
Git LFS file not shown
20 changes: 20 additions & 0 deletions Assets/Plugins/iOS/EOSSDK.framework/Headers/eos_custominvites.h
Original file line number Diff line number Diff line change
Expand Up @@ -292,3 +292,23 @@ EOS_DECLARE_FUNC(void) EOS_CustomInvites_AcceptRequestToJoin(EOS_HCustomInvites
* @see EOS_CustomInvites_OnRejectRequestToJoinCallback
*/
EOS_DECLARE_FUNC(void) EOS_CustomInvites_RejectRequestToJoin(EOS_HCustomInvites Handle, const EOS_CustomInvites_RejectRequestToJoinOptions* Options, void* ClientData, const EOS_CustomInvites_OnRejectRequestToJoinCallback CompletionDelegate);

/**
* Disable the "Request to Join" button in the Social Overlay.
* This is a one-way operation; once disabled, the Request to Join feature cannot be re-enabled
* for the current SDK session.
*
* This API can be called at any time, including before user login.
* The change will take effect in the Social Overlay on the next user login.
*
* @param Options Structure containing information about the request.
*
* @return EOS_EResult containing the result of the operation.
* Possible result codes:
* - EOS_Success if the operation completes successfully
* - EOS_InvalidParameters if any of the options values are incorrect
* - EOS_IncompatibleVersion if the API version passed in is incorrect
*
* @see EOS_CustomInvites_DisableRequestToJoinOptions
*/
EOS_DECLARE_FUNC(EOS_EResult) EOS_CustomInvites_DisableRequestToJoin(EOS_HCustomInvites Handle, const EOS_CustomInvites_DisableRequestToJoinOptions* Options);
Original file line number Diff line number Diff line change
Expand Up @@ -364,6 +364,17 @@ EOS_STRUCT(EOS_CustomInvites_RejectRequestToJoinCallbackInfo, (
*/
EOS_DECLARE_CALLBACK(EOS_CustomInvites_OnRejectRequestToJoinCallback, const EOS_CustomInvites_RejectRequestToJoinCallbackInfo* Data);

/** The most recent version of the EOS_CustomInvites_DisableRequestToJoin API. */
#define EOS_CUSTOMINVITES_DISABLEREQUESTTOJOIN_API_LATEST 1

/**
* Input parameters for the EOS_CustomInvites_DisableRequestToJoin function.
*/
EOS_STRUCT(EOS_CustomInvites_DisableRequestToJoinOptions, (
/** API Version: Set this to EOS_CUSTOMINVITES_DISABLEREQUESTTOJOIN_API_LATEST. */
int32_t ApiVersion;
));

/** The most recent version of the EOS_CustomInvites_AddNotifySendCustomNativeInviteRequested API. */
#define EOS_CUSTOMINVITES_ADDNOTIFYSENDCUSTOMNATIVEINVITEREQUESTED_API_LATEST 1

Expand Down
4 changes: 3 additions & 1 deletion Assets/Plugins/iOS/EOSSDK.framework/Headers/eos_ecom.h
Original file line number Diff line number Diff line change
Expand Up @@ -90,14 +90,16 @@ EOS_DECLARE_FUNC(void) EOS_Ecom_QueryEntitlementToken(EOS_HEcom Handle, const EO
/**
* Query for a list of catalog offers defined with Epic Online Services.
* This data will be cached for a limited time and retrieved again from the backend when necessary.
* When one or more cached offers have an invalid price, the callback returns the result code EOS_EResult::EOS_Ecom_CatalogOfferPriceInvalid.
* Cached offers can be accessed using EOS_Ecom_CopyOfferByIndex and EOS_Ecom_CopyOfferById.
*
* @param Options structure containing filter criteria
* @param ClientData arbitrary data that is passed back to you in the CompletionDelegate
* @param CompletionDelegate a callback that is fired when the async operation completes, either successfully or in error
*
* @see EOS_Ecom_QueryOffersOptions
* @see EOS_Ecom_OnQueryOffersCallback
* @see EOS_Ecom_CopyOfferByIndex
* @see EOS_Ecom_CopyOfferById
*/
EOS_DECLARE_FUNC(void) EOS_Ecom_QueryOffers(EOS_HEcom Handle, const EOS_Ecom_QueryOffersOptions* Options, void* ClientData, const EOS_Ecom_OnQueryOffersCallback CompletionDelegate);

Expand Down
11 changes: 10 additions & 1 deletion Assets/Plugins/iOS/EOSSDK.framework/Headers/eos_ecom_types.h
Original file line number Diff line number Diff line change
Expand Up @@ -634,7 +634,16 @@ EOS_STRUCT(EOS_Ecom_QueryOffersOptions, (
* Output parameters for the EOS_Ecom_QueryOffers Function.
*/
EOS_STRUCT(EOS_Ecom_QueryOffersCallbackInfo, (
/** The EOS_EResult code for the operation. EOS_Success indicates that the operation succeeded; other codes indicate errors. */
/**
* Possible result codes for the operation:
* - EOS_Success: The request was successful.
* - EOS_IncompatibleVersion: The API version passed in is incorrect.
* - EOS_InvalidParameters: An options parameter is incorrect.
* - EOS_InvalidUser: An invalid Product User Id is specified.
* - EOS_InvalidAuth: A valid Product User Id is specified but the local user is not logged in.
* - EOS_TooManyRequests: There are too many requests in progress at this time.
* - EOS_PartialResult: Only part of the backend response was received and processed by the client.
*/
EOS_EResult ResultCode;
/** Context that was passed into EOS_Ecom_QueryOffers */
void* ClientData;
Expand Down
4 changes: 2 additions & 2 deletions Assets/Plugins/iOS/EOSSDK.framework/Headers/eos_version.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
/** The Minor version number */
#define EOS_MINOR_VERSION 19
/** The Patch version number */
#define EOS_PATCH_VERSION 0
#define EOS_PATCH_VERSION 1
/** The Hotfix version number */
#define EOS_HOTFIX_VERSION 3
#define EOS_HOTFIX_VERSION 0

// Macros for encoding strings
#define EOS_VERSION_STRINGIFY_2(x) #x
Expand Down
4 changes: 2 additions & 2 deletions Assets/Plugins/macOS/libEOSSDK-Mac-Shipping.dylib
Git LFS file not shown
15 changes: 15 additions & 0 deletions com.playeveryware.eos/Runtime/EOS_SDK/Generated/Bindings.cs
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,7 @@ public static partial class Bindings
private const string EOS_CustomInvites_AddNotifyRequestToJoinRejectedName = "EOS_CustomInvites_AddNotifyRequestToJoinRejected";
private const string EOS_CustomInvites_AddNotifyRequestToJoinResponseReceivedName = "EOS_CustomInvites_AddNotifyRequestToJoinResponseReceived";
private const string EOS_CustomInvites_AddNotifySendCustomNativeInviteRequestedName = "EOS_CustomInvites_AddNotifySendCustomNativeInviteRequested";
private const string EOS_CustomInvites_DisableRequestToJoinName = "EOS_CustomInvites_DisableRequestToJoin";
private const string EOS_CustomInvites_FinalizeInviteName = "EOS_CustomInvites_FinalizeInvite";
private const string EOS_CustomInvites_RejectRequestToJoinName = "EOS_CustomInvites_RejectRequestToJoin";
private const string EOS_CustomInvites_RemoveNotifyCustomInviteAcceptedName = "EOS_CustomInvites_RemoveNotifyCustomInviteAccepted";
Expand Down Expand Up @@ -813,6 +814,7 @@ public static partial class Bindings
private const string EOS_CustomInvites_AddNotifyRequestToJoinRejectedName = "_EOS_CustomInvites_AddNotifyRequestToJoinRejected";
private const string EOS_CustomInvites_AddNotifyRequestToJoinResponseReceivedName = "_EOS_CustomInvites_AddNotifyRequestToJoinResponseReceived";
private const string EOS_CustomInvites_AddNotifySendCustomNativeInviteRequestedName = "_EOS_CustomInvites_AddNotifySendCustomNativeInviteRequested";
private const string EOS_CustomInvites_DisableRequestToJoinName = "_EOS_CustomInvites_DisableRequestToJoin";
private const string EOS_CustomInvites_FinalizeInviteName = "_EOS_CustomInvites_FinalizeInvite";
private const string EOS_CustomInvites_RejectRequestToJoinName = "_EOS_CustomInvites_RejectRequestToJoin";
private const string EOS_CustomInvites_RemoveNotifyCustomInviteAcceptedName = "_EOS_CustomInvites_RemoveNotifyCustomInviteAccepted";
Expand Down Expand Up @@ -1451,6 +1453,7 @@ public static partial class Bindings
private const string EOS_CustomInvites_AddNotifyRequestToJoinRejectedName = "_EOS_CustomInvites_AddNotifyRequestToJoinRejected@16";
private const string EOS_CustomInvites_AddNotifyRequestToJoinResponseReceivedName = "_EOS_CustomInvites_AddNotifyRequestToJoinResponseReceived@16";
private const string EOS_CustomInvites_AddNotifySendCustomNativeInviteRequestedName = "_EOS_CustomInvites_AddNotifySendCustomNativeInviteRequested@16";
private const string EOS_CustomInvites_DisableRequestToJoinName = "_EOS_CustomInvites_DisableRequestToJoin@8";
private const string EOS_CustomInvites_FinalizeInviteName = "_EOS_CustomInvites_FinalizeInvite@8";
private const string EOS_CustomInvites_RejectRequestToJoinName = "_EOS_CustomInvites_RejectRequestToJoin@16";
private const string EOS_CustomInvites_RemoveNotifyCustomInviteAcceptedName = "_EOS_CustomInvites_RemoveNotifyCustomInviteAccepted@12";
Expand Down Expand Up @@ -2507,6 +2510,10 @@ public static void Hook<TLibraryHandle>(TLibraryHandle libraryHandle, Func<TLibr
if (functionPointer == IntPtr.Zero) throw new DynamicBindingException(EOS_CustomInvites_AddNotifySendCustomNativeInviteRequestedName);
EOS_CustomInvites_AddNotifySendCustomNativeInviteRequested = (EOS_CustomInvites_AddNotifySendCustomNativeInviteRequestedDelegate)Marshal.GetDelegateForFunctionPointer(functionPointer, typeof(EOS_CustomInvites_AddNotifySendCustomNativeInviteRequestedDelegate));

functionPointer = getFunctionPointer(libraryHandle, EOS_CustomInvites_DisableRequestToJoinName);
if (functionPointer == IntPtr.Zero) throw new DynamicBindingException(EOS_CustomInvites_DisableRequestToJoinName);
EOS_CustomInvites_DisableRequestToJoin = (EOS_CustomInvites_DisableRequestToJoinDelegate)Marshal.GetDelegateForFunctionPointer(functionPointer, typeof(EOS_CustomInvites_DisableRequestToJoinDelegate));

functionPointer = getFunctionPointer(libraryHandle, EOS_CustomInvites_FinalizeInviteName);
if (functionPointer == IntPtr.Zero) throw new DynamicBindingException(EOS_CustomInvites_FinalizeInviteName);
EOS_CustomInvites_FinalizeInvite = (EOS_CustomInvites_FinalizeInviteDelegate)Marshal.GetDelegateForFunctionPointer(functionPointer, typeof(EOS_CustomInvites_FinalizeInviteDelegate));
Expand Down Expand Up @@ -4649,6 +4656,7 @@ public static void Unhook()
EOS_CustomInvites_AddNotifyRequestToJoinRejected = null;
EOS_CustomInvites_AddNotifyRequestToJoinResponseReceived = null;
EOS_CustomInvites_AddNotifySendCustomNativeInviteRequested = null;
EOS_CustomInvites_DisableRequestToJoin = null;
EOS_CustomInvites_FinalizeInvite = null;
EOS_CustomInvites_RejectRequestToJoin = null;
EOS_CustomInvites_RemoveNotifyCustomInviteAccepted = null;
Expand Down Expand Up @@ -5695,6 +5703,10 @@ public static void Unhook()
internal delegate ulong EOS_CustomInvites_AddNotifySendCustomNativeInviteRequestedDelegate(IntPtr handle, ref CustomInvites.AddNotifySendCustomNativeInviteRequestedOptionsInternal options, IntPtr clientData, CustomInvites.OnSendCustomNativeInviteRequestedCallbackInternal notificationFn);
internal static EOS_CustomInvites_AddNotifySendCustomNativeInviteRequestedDelegate EOS_CustomInvites_AddNotifySendCustomNativeInviteRequested;

[UnmanagedFunctionPointer(Common.LIBRARY_CALLING_CONVENTION)]
internal delegate Result EOS_CustomInvites_DisableRequestToJoinDelegate(IntPtr handle, ref CustomInvites.DisableRequestToJoinOptionsInternal options);
internal static EOS_CustomInvites_DisableRequestToJoinDelegate EOS_CustomInvites_DisableRequestToJoin;

[UnmanagedFunctionPointer(Common.LIBRARY_CALLING_CONVENTION)]
internal delegate Result EOS_CustomInvites_FinalizeInviteDelegate(IntPtr handle, ref CustomInvites.FinalizeInviteOptionsInternal options);
internal static EOS_CustomInvites_FinalizeInviteDelegate EOS_CustomInvites_FinalizeInvite;
Expand Down Expand Up @@ -8103,6 +8115,9 @@ public static void Unhook()
[DllImport(Common.LIBRARY_NAME, EntryPoint="EOS_CustomInvites_AddNotifySendCustomNativeInviteRequested", CallingConvention=Common.LIBRARY_CALLING_CONVENTION)]
internal static extern ulong EOS_CustomInvites_AddNotifySendCustomNativeInviteRequested(IntPtr handle, ref CustomInvites.AddNotifySendCustomNativeInviteRequestedOptionsInternal options, IntPtr clientData, CustomInvites.OnSendCustomNativeInviteRequestedCallbackInternal notificationFn);

[DllImport(Common.LIBRARY_NAME, EntryPoint="EOS_CustomInvites_DisableRequestToJoin", CallingConvention=Common.LIBRARY_CALLING_CONVENTION)]
internal static extern Result EOS_CustomInvites_DisableRequestToJoin(IntPtr handle, ref CustomInvites.DisableRequestToJoinOptionsInternal options);

[DllImport(Common.LIBRARY_NAME, EntryPoint="EOS_CustomInvites_FinalizeInvite", CallingConvention=Common.LIBRARY_CALLING_CONVENTION)]
internal static extern Result EOS_CustomInvites_FinalizeInvite(IntPtr handle, ref CustomInvites.FinalizeInviteOptionsInternal options);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,10 @@ public CustomInvitesInterface(IntPtr innerHandle) : base(innerHandle)
/// </summary>
public const int ADDNOTIFYSENDCUSTOMNATIVEINVITEREQUESTED_API_LATEST = 1;
/// <summary>
/// The most recent version of the <see cref="DisableRequestToJoin" /> API.
/// </summary>
public const int DISABLEREQUESTTOJOIN_API_LATEST = 1;
/// <summary>
/// The most recent version of the <see cref="FinalizeInvite" /> API.
/// </summary>
public const int FINALIZEINVITE_API_LATEST = 1;
Expand Down Expand Up @@ -452,6 +456,37 @@ public ulong AddNotifySendCustomNativeInviteRequested(ref AddNotifySendCustomNat
return callResult;
}

/// <summary>
/// Disable the "Request to Join" button in the Social Overlay.
/// This is a one-way operation; once disabled, the Request to Join feature cannot be re-enabled
/// for the current SDK session.
///
/// This API can be called at any time, including before user login.
/// The change will take effect in the Social Overlay on the next user login.
/// <see cref="DisableRequestToJoinOptions" />
/// </summary>
/// <param name="options">
/// Structure containing information about the request.
/// </param>
/// <returns>
/// <see cref="Result" /> containing the result of the operation.
/// Possible result codes:
/// - <see cref="Result.Success" /> if the operation completes successfully
/// - <see cref="Result.InvalidParameters" /> if any of the options values are incorrect
/// - <see cref="Result.IncompatibleVersion" /> if the API version passed in is incorrect
/// </returns>
public Result DisableRequestToJoin(ref DisableRequestToJoinOptions options)
{
var optionsInternal = default(DisableRequestToJoinOptionsInternal);
optionsInternal.Set(ref options);

var callResult = Bindings.EOS_CustomInvites_DisableRequestToJoin(InnerHandle, ref optionsInternal);

Helper.Dispose(ref optionsInternal);

return callResult;
}

/// <summary>
/// Signal that the title has completed processing a received Custom Invite, and that it should be cleaned up internally and in the Overlay
/// <see cref="FinalizeInviteOptions" />
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
// Copyright Epic Games, Inc. All Rights Reserved.
// This file is automatically generated. Changes to this file may be overwritten.

using System;
using System.Runtime.InteropServices;

namespace Epic.OnlineServices.CustomInvites
{
/// <summary>
/// Input parameters for the <see cref="CustomInvitesInterface.DisableRequestToJoin" /> function.
/// </summary>
public struct DisableRequestToJoinOptions
{

}

[StructLayout(LayoutKind.Sequential)]
internal struct DisableRequestToJoinOptionsInternal : ISettable<DisableRequestToJoinOptions>
{
private int m_ApiVersion;

public void Set(ref DisableRequestToJoinOptions other)
{
Dispose();

m_ApiVersion = CustomInvitesInterface.DISABLEREQUESTTOJOIN_API_LATEST;
}

public void Dispose()
{
}
}
}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -1135,9 +1135,11 @@ public void QueryEntitlements(ref QueryEntitlementsOptions options, object clien
/// <summary>
/// Query for a list of catalog offers defined with Epic Online Services.
/// This data will be cached for a limited time and retrieved again from the backend when necessary.
/// When one or more cached offers have an invalid price, the callback returns the result code <see cref="Result.EcomCatalogOfferPriceInvalid" />.
/// Cached offers can be accessed using <see cref="CopyOfferByIndex" /> and <see cref="CopyOfferById" />.
/// <see cref="QueryOffersOptions" />
/// <see cref="OnQueryOffersCallback" />
/// <see cref="CopyOfferByIndex" />
/// <see cref="CopyOfferById" />
/// </summary>
/// <param name="options">
/// structure containing filter criteria
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,14 @@ namespace Epic.OnlineServices.Ecom
public struct QueryOffersCallbackInfo : ICallbackInfo
{
/// <summary>
/// The <see cref="Result" /> code for the operation. <see cref="Result.Success" /> indicates that the operation succeeded; other codes indicate errors.
/// Possible result codes for the operation:
/// - <see cref="Result.Success" />: The request was successful.
/// - <see cref="Result.IncompatibleVersion" />: The API version passed in is incorrect.
/// - <see cref="Result.InvalidParameters" />: An options parameter is incorrect.
/// - <see cref="Result.InvalidUser" />: An invalid Product User Id is specified.
/// - <see cref="Result.InvalidAuth" />: A valid Product User Id is specified but the local user is not logged in.
/// - <see cref="Result.TooManyRequests" />: There are too many requests in progress at this time.
/// - <see cref="Result.PartialResult" />: Only part of the backend response was received and processed by the client.
/// </summary>
public Result ResultCode { get; set; }

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ public sealed partial class VersionInterface
/// <summary>
/// The Hotfix version number
/// </summary>
public const int HOTFIX = 3;
public const int HOTFIX = 0;
/// <summary>
/// The Major version number
/// </summary>
Expand All @@ -30,7 +30,7 @@ public sealed partial class VersionInterface
/// <summary>
/// The Patch version number
/// </summary>
public const int PATCH = 0;
public const int PATCH = 1;
/// <summary>
/// The product identifier
/// </summary>
Expand Down
Git LFS file not shown
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,7 @@ launcher_error:
error_deleted_driver = "The driver {0} is loaded but its file is missing. Please reboot your system to unload the driver.";
error_win10_required = "Windows 10 or newer is required. Please upgrade your OS.";
error_winupdate_required = "Your Windows 10 is lacking important updates. Please use Windows Update to install May 2020 Update or newer.";
error_unsigned_driver = "The driver {0} is loaded without valid signature. Please reboot your system to unload the driver.";
};
setup_error:
{
Expand Down
Binary file modified etc/PlatformSpecificAssets/EOS/Linux/eac_launcher
Comment thread
DanF-ApexSystems marked this conversation as resolved.
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,7 @@ launcher_error:
error_deleted_driver = "The driver {0} is loaded but its file is missing. Please reboot your system to unload the driver.";
error_win10_required = "Windows 10 or newer is required. Please upgrade your OS.";
error_winupdate_required = "Your Windows 10 is lacking important updates. Please use Windows Update to install May 2020 Update or newer.";
error_unsigned_driver = "The driver {0} is loaded without valid signature. Please reboot your system to unload the driver.";
};
setup_error:
{
Expand Down
Git LFS file not shown
4 changes: 2 additions & 2 deletions etc/PlatformSpecificAssets/EOS/Windows/EACLauncher.exe
Git LFS file not shown
Git LFS file not shown
Loading