Skip to content

Commit

Permalink
Merge branch 'release/4.27/2.0.0' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
olga-salina committed May 17, 2024
2 parents 2650e0b + 77f3512 commit 1aba4a0
Show file tree
Hide file tree
Showing 125 changed files with 152 additions and 128 deletions.
24 changes: 24 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,29 @@
# Changelog

## [2.0.0] - 2024-05-17

### Added
- Game engine analytics to API requests (for mobile and desktop builds)
- Minor demo improvements

### Changed
- `PurchaseStoreItem` and `PurchaseCurrencyPackage` SDK methods. Added `AuthToken` parameter. Renamed `PaymentTokenRequestPayload` parameter to `PurchaseParams`
- `FetchPaymentToken` and `FetchCartPaymentToken` SDK methods. Added `PurchaseParams` parameter. Parameters `Currency`, `Country`, `Locale`, `CustomParameters`, `Quantity` and `ExternalId` moved to the `PurchaseParams`
- `GetSubscriptionPurchaseUrl`, `GetSubscriptionManagementUrl` and `GetSubscriptionRenewalUrl` SDK methods. Added `bShowCloseButton` optional parameter
- `AuthWithXsollaWidget` SDK method. Added `Locale`, `State` and `ErrorCallback` parameters. This method uses OAuth2.0 authorization now
- `LaunchPaymentConsole` SDK method. Added `PayStationVersion` optional parameter, uses `V4` by default
- Methods for working with catalog (`UXsollaStoreSubsystem` class). The `has_more` parameter added in response
- Default Pay Station version was changed to 4
- Xsolla Pay Station UI settings. Removed `PaymentInterfaceSize` and `PaymentInterfaceVersion` parameters
- Updated iOS and Android libraries
- `FXsollaPaymentTokenRequestPayload` structure. Added the following parameters tgat are used in purchase methods:
- `bShowCloseButton`
- `PayStationVersion`

### Fixed
- Сleanup of the `SuccessTokenUpdate` local variable by garbage collector in `UXsollaStoreSubsystem` and `UXsollaInventorySubsystem` classes methods
- `CheckPendingOrder` method uses only passed `AccessToken` parameter

## [1.6.0] - 2023-09-13

### Added
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2023 Xsolla Inc. All Rights Reserved.
// Copyright 2024 Xsolla Inc. All Rights Reserved.


#include "Widgets/XsollaGenericPrimitive.h"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2023 Xsolla Inc. All Rights Reserved.
// Copyright 2024 Xsolla Inc. All Rights Reserved.

#include "Widgets/XsollaGenericWrapper.h"

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2023 Xsolla Inc. All Rights Reserved.
// Copyright 2024 Xsolla Inc. All Rights Reserved.

#pragma once

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2023 Xsolla Inc. All Rights Reserved.
// Copyright 2024 Xsolla Inc. All Rights Reserved.

#include "XsollaUIBuilderLibrary.h"
#include "XsollaUIBuilderModule.h"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2023 Xsolla Inc. All Rights Reserved.
// Copyright 2024 Xsolla Inc. All Rights Reserved.

#include "XsollaUIBuilderModule.h"
#include "XsollaUIBuilderDefines.h"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2023 Xsolla Inc. All Rights Reserved.
// Copyright 2024 Xsolla Inc. All Rights Reserved.

#include "XsollaUIBuilderSettings.h"

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2023 Xsolla Inc. All Rights Reserved.
// Copyright 2024 Xsolla Inc. All Rights Reserved.

#include "XsollaUIBuilderTheme.h"

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2023 Xsolla Inc. All Rights Reserved.
// Copyright 2024 Xsolla Inc. All Rights Reserved.

#include "XsollaUIBuilderWidgetsLibrary.h"

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2023 Xsolla Inc. All Rights Reserved.
// Copyright 2024 Xsolla Inc. All Rights Reserved.

#pragma once

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2023 Xsolla Inc. All Rights Reserved.
// Copyright 2024 Xsolla Inc. All Rights Reserved.

#pragma once

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2023 Xsolla Inc. All Rights Reserved.
// Copyright 2024 Xsolla Inc. All Rights Reserved.

#pragma once

Expand Down
2 changes: 1 addition & 1 deletion Source/Demo/XsollaUIBuilder/Public/XsollaUIBuilderModule.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2023 Xsolla Inc. All Rights Reserved.
// Copyright 2024 Xsolla Inc. All Rights Reserved.

#pragma once

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2023 Xsolla Inc. All Rights Reserved.
// Copyright 2024 Xsolla Inc. All Rights Reserved.

#pragma once

Expand Down
2 changes: 1 addition & 1 deletion Source/Demo/XsollaUIBuilder/Public/XsollaUIBuilderTheme.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2023 Xsolla Inc. All Rights Reserved.
// Copyright 2024 Xsolla Inc. All Rights Reserved.

#pragma once

Expand Down
2 changes: 1 addition & 1 deletion Source/Demo/XsollaUIBuilder/Public/XsollaUIBuilderTypes.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2023 Xsolla Inc. All Rights Reserved.
// Copyright 2024 Xsolla Inc. All Rights Reserved.

#pragma once

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2023 Xsolla Inc. All Rights Reserved.
// Copyright 2024 Xsolla Inc. All Rights Reserved.

#pragma once

Expand Down
2 changes: 1 addition & 1 deletion Source/Demo/XsollaUIBuilder/XsollaUIBuilder.Build.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2023 Xsolla Inc. All Rights Reserved.
// Copyright 2024 Xsolla Inc. All Rights Reserved.

using System.IO;
using UnrealBuildTool;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2023 Xsolla Inc. All Rights Reserved.
// Copyright 2024 Xsolla Inc. All Rights Reserved.

#include "SXsollaEntityTypeEditBox.h"

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2023 Xsolla Inc. All Rights Reserved.
// Copyright 2024 Xsolla Inc. All Rights Reserved.

#pragma once
#include "Widgets/Input/SEditableTextBox.h"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2023 Xsolla Inc. All Rights Reserved.
// Copyright 2024 Xsolla Inc. All Rights Reserved.

#include "XsollaEntityTypeList.h"
#include "DetailLayoutBuilder.h"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2023 Xsolla Inc. All Rights Reserved.
// Copyright 2024 Xsolla Inc. All Rights Reserved.

#pragma once
#include "DetailLayoutBuilder.h"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2023 Xsolla Inc. All Rights Reserved.
// Copyright 2024 Xsolla Inc. All Rights Reserved.

#include "XsollaGenericWrapperDetails.h"

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2023 Xsolla Inc. All Rights Reserved.
// Copyright 2024 Xsolla Inc. All Rights Reserved.

#pragma once

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2023 Xsolla Inc. All Rights Reserved.
// Copyright 2024 Xsolla Inc. All Rights Reserved.

#include "XsollaUIBuilderEditorModule.h"
#include "XsollaUIBuilderSettingsDetails.h"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2023 Xsolla Inc. All Rights Reserved.
// Copyright 2024 Xsolla Inc. All Rights Reserved.

#include "XsollaUIBuilderSettingsDetails.h"

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2023 Xsolla Inc. All Rights Reserved.
// Copyright 2024 Xsolla Inc. All Rights Reserved.

#pragma once

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2023 Xsolla Inc. All Rights Reserved.
// Copyright 2024 Xsolla Inc. All Rights Reserved.

#pragma once

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2023 Xsolla Inc. All Rights Reserved.
// Copyright 2024 Xsolla Inc. All Rights Reserved.

#pragma once

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2023 Xsolla Inc. All Rights Reserved.
// Copyright 2024 Xsolla Inc. All Rights Reserved.

using System.IO;
using UnrealBuildTool;
Expand Down
2 changes: 1 addition & 1 deletion Source/XsollaInventory/Private/XsollaInventory.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2023 Xsolla Inc. All Rights Reserved.
// Copyright 2024 Xsolla Inc. All Rights Reserved.

#include "XsollaInventory.h"

Expand Down
4 changes: 2 additions & 2 deletions Source/XsollaInventory/Private/XsollaInventoryDefines.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2023 Xsolla Inc. All Rights Reserved.
// Copyright 2024 Xsolla Inc. All Rights Reserved.

#pragma once

Expand All @@ -13,4 +13,4 @@ DECLARE_LOG_CATEGORY_EXTERN(LogXsollaInventory, Log, All);
#define VA_LINE (FString::FromInt(__LINE__)) // Current Line Number in the code where this is called
#define VA_FUNC_LINE (VA_FUNC + "(" + VA_LINE + ")") // Current Class and Line Number where this is called!

#define XSOLLA_INVENTORY_VERSION TEXT("1.6.0")
#define XSOLLA_INVENTORY_VERSION TEXT("2.0.0")
2 changes: 1 addition & 1 deletion Source/XsollaInventory/Private/XsollaInventoryLibrary.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2023 Xsolla Inc. All Rights Reserved.
// Copyright 2024 Xsolla Inc. All Rights Reserved.

#include "XsollaInventoryLibrary.h"

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2023 Xsolla Inc. All Rights Reserved.
// Copyright 2024 Xsolla Inc. All Rights Reserved.

#include "XsollaInventorySubsystem.h"

Expand Down
2 changes: 1 addition & 1 deletion Source/XsollaInventory/Public/XsollaInventory.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2023 Xsolla Inc. All Rights Reserved.
// Copyright 2024 Xsolla Inc. All Rights Reserved.

#pragma once

Expand Down
2 changes: 1 addition & 1 deletion Source/XsollaInventory/Public/XsollaInventoryDataModel.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2023 Xsolla Inc. All Rights Reserved.
// Copyright 2024 Xsolla Inc. All Rights Reserved.

#pragma once

Expand Down
2 changes: 1 addition & 1 deletion Source/XsollaInventory/Public/XsollaInventoryLibrary.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2023 Xsolla Inc. All Rights Reserved.
// Copyright 2024 Xsolla Inc. All Rights Reserved.

#pragma once

Expand Down
2 changes: 1 addition & 1 deletion Source/XsollaInventory/Public/XsollaInventorySubsystem.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2023 Xsolla Inc. All Rights Reserved.
// Copyright 2024 Xsolla Inc. All Rights Reserved.

#pragma once

Expand Down
2 changes: 1 addition & 1 deletion Source/XsollaInventory/XsollaInventory.Build.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2023 Xsolla Inc. All Rights Reserved.
// Copyright 2024 Xsolla Inc. All Rights Reserved.

using System.IO;
using UnrealBuildTool;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2023 Xsolla Inc. All Rights Reserved.
// Copyright 2024 Xsolla Inc. All Rights Reserved.

package com.xsolla.login;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2023 Xsolla Inc. All Rights Reserved.
// Copyright 2024 Xsolla Inc. All Rights Reserved.

package com.xsolla.login;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2023 Xsolla Inc. All Rights Reserved.
// Copyright 2024 Xsolla Inc. All Rights Reserved.

package com.xsolla.login;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2023 Xsolla Inc. All Rights Reserved.
// Copyright 2024 Xsolla Inc. All Rights Reserved.

package com.xsolla.login;

Expand Down
2 changes: 1 addition & 1 deletion Source/XsollaLogin/Private/Android/XsollaJavaConvertor.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2023 Xsolla Inc. All Rights Reserved.
// Copyright 2024 Xsolla Inc. All Rights Reserved.

#include "XsollaJavaConvertor.h"

Expand Down
2 changes: 1 addition & 1 deletion Source/XsollaLogin/Private/Android/XsollaJavaConvertor.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2023 Xsolla Inc. All Rights Reserved.
// Copyright 2024 Xsolla Inc. All Rights Reserved.

#pragma once

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2023 Xsolla Inc. All Rights Reserved.
// Copyright 2024 Xsolla Inc. All Rights Reserved.

#include "XsollaMethodCallUtils.h"

Expand Down
2 changes: 1 addition & 1 deletion Source/XsollaLogin/Private/Android/XsollaMethodCallUtils.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2023 Xsolla Inc. All Rights Reserved.
// Copyright 2024 Xsolla Inc. All Rights Reserved.

#pragma once

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2023 Xsolla Inc. All Rights Reserved.
// Copyright 2024 Xsolla Inc. All Rights Reserved.

#include "XsollaNativeAuthCallback.h"

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2023 Xsolla Inc. All Rights Reserved.
// Copyright 2024 Xsolla Inc. All Rights Reserved.

#pragma once

Expand Down
2 changes: 1 addition & 1 deletion Source/XsollaLogin/Private/XsollaLogin.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2023 Xsolla Inc. All Rights Reserved.
// Copyright 2024 Xsolla Inc. All Rights Reserved.

#include "XsollaLogin.h"

Expand Down
2 changes: 1 addition & 1 deletion Source/XsollaLogin/Private/XsollaLoginBrowserWrapper.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2023 Xsolla Inc. All Rights Reserved.
// Copyright 2024 Xsolla Inc. All Rights Reserved.


#include "XsollaLoginBrowserWrapper.h"
Expand Down
4 changes: 2 additions & 2 deletions Source/XsollaLogin/Private/XsollaLoginDefines.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2023 Xsolla Inc. All Rights Reserved.
// Copyright 2024 Xsolla Inc. All Rights Reserved.

#pragma once

Expand All @@ -13,4 +13,4 @@ DECLARE_LOG_CATEGORY_EXTERN(LogXsollaLogin, Log, All);
#define VA_LINE (FString::FromInt(__LINE__)) // Current Line Number in the code where this is called
#define VA_FUNC_LINE (VA_FUNC + "(" + VA_LINE + ")") // Current Class and Line Number where this is called!

#define XSOLLA_LOGIN_VERSION TEXT("1.6.0")
#define XSOLLA_LOGIN_VERSION TEXT("2.0.0")
2 changes: 1 addition & 1 deletion Source/XsollaLogin/Private/XsollaLoginLibrary.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2023 Xsolla Inc. All Rights Reserved.
// Copyright 2024 Xsolla Inc. All Rights Reserved.

#include "XsollaLoginLibrary.h"

Expand Down
2 changes: 1 addition & 1 deletion Source/XsollaLogin/Private/XsollaLoginSave.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2023 Xsolla Inc. All Rights Reserved.
// Copyright 2024 Xsolla Inc. All Rights Reserved.

#include "XsollaLoginSave.h"
#include "XsollaLogin.h"
Expand Down
2 changes: 1 addition & 1 deletion Source/XsollaLogin/Private/XsollaLoginSubsystem.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2023 Xsolla Inc. All Rights Reserved.
// Copyright 2024 Xsolla Inc. All Rights Reserved.

#include "XsollaLoginSubsystem.h"

Expand Down
2 changes: 1 addition & 1 deletion Source/XsollaLogin/Public/XsollaLogin.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2023 Xsolla Inc. All Rights Reserved.
// Copyright 2024 Xsolla Inc. All Rights Reserved.

#pragma once

Expand Down
2 changes: 1 addition & 1 deletion Source/XsollaLogin/Public/XsollaLoginBrowserWrapper.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2023 Xsolla Inc. All Rights Reserved.
// Copyright 2024 Xsolla Inc. All Rights Reserved.

#pragma once

Expand Down
2 changes: 1 addition & 1 deletion Source/XsollaLogin/Public/XsollaLoginLibrary.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2023 Xsolla Inc. All Rights Reserved.
// Copyright 2024 Xsolla Inc. All Rights Reserved.

#pragma once

Expand Down
2 changes: 1 addition & 1 deletion Source/XsollaLogin/Public/XsollaLoginSave.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2023 Xsolla Inc. All Rights Reserved.
// Copyright 2024 Xsolla Inc. All Rights Reserved.

#pragma once

Expand Down
2 changes: 1 addition & 1 deletion Source/XsollaLogin/Public/XsollaLoginSubsystem.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2023 Xsolla Inc. All Rights Reserved.
// Copyright 2024 Xsolla Inc. All Rights Reserved.

#pragma once

Expand Down
Loading

0 comments on commit 1aba4a0

Please sign in to comment.