Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update to 5.4 and replace GLUI #3

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
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
Binary file modified .DS_Store
Binary file not shown.
8 changes: 8 additions & 0 deletions Config/FilterPlugin.ini
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
[FilterPlugin]
; This section lists additional files which will be packaged along with your plugin. Paths should be listed relative to the root plugin directory, and
; may include "...", "*", and "?" wildcards to match directories, files, and individual characters respectively.
;
; Examples:
; /README.txt
; /Extras/...
; /Binaries/ThirdParty/*.dll
Binary file modified Content/.DS_Store
Binary file not shown.
12 changes: 7 additions & 5 deletions Openfort.uplugin
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,19 @@
"IsExperimentalVersion": true,
"Installed": true,
"EnabledByDefault": true,
"EngineVersion" : "5.4.0",
"Modules": [
{
"Name": "Openfort",
"Type": "Runtime",
"LoadingPhase": "Default"
"LoadingPhase": "Default",
"WhitelistPlatforms": [ "Win64", "Mac", "IOS", "Android" ]
},
{
"Name": "OpenfortEditor",
"Type": "Editor",
"LoadingPhase": "Default"
"LoadingPhase": "Default",
"WhitelistPlatforms": [ "Win64", "Mac", "IOS", "Android" ]
}
],
"Plugins": [
Expand All @@ -33,9 +36,8 @@
"Enabled": true
},
{
"Name": "BLUI",
"Enabled": true,
"Optional": true
"Name": "OnlineSubsystem",
"Enabled": true
}
]
}
Binary file modified Source/.DS_Store
Binary file not shown.
Binary file modified Source/Openfort/.DS_Store
Binary file not shown.
13 changes: 13 additions & 0 deletions Source/Openfort/.idea/.idea.Openfort.dir/.idea/.gitignore

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

4 changes: 4 additions & 0 deletions Source/Openfort/.idea/.idea.Openfort.dir/.idea/encodings.xml

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

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

49 changes: 16 additions & 33 deletions Source/Openfort/Openfort.Build.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,8 @@ public Openfort(ReadOnlyTargetRules Target) : base(Target)
{
PCHUsage = ModuleRules.PCHUsageMode.UseExplicitOrSharedPCHs;

#if UE_5_1_OR_LATER
IncludeOrderVersion = EngineIncludeOrderVersion.Latest;
#endif

IncludeOrderVersion = EngineIncludeOrderVersion.Latest;

PublicIncludePaths.AddRange(
new string[]
{
Expand All @@ -28,50 +26,35 @@ public Openfort(ReadOnlyTargetRules Target) : base(Target)
// ... add other private include paths required here ...
}
);



PublicDependencyModuleNames.AddRange(
new string[]
{
"Core",
"CoreUObject",
"Engine",
"Slate",
"SlateCore",
"JsonUtilities",
"HTTP"
"HTTP",
"UMG",
"OnlineSubsystem",
"WebBrowser",
"WebBrowserWidget"
}
);



PrivateDependencyModuleNames.AddRange(
new string[]
{
"CoreUObject",
"Engine",
"Slate",
"SlateCore",
"EngineSettings",
"Json",
"UMG",
"Projects",
"Projects"
// ... add private dependencies that you statically link with here ...
}
);

#if UE_5_0_OR_LATER
PublicDependencyModuleNames.Add("WebBrowserWidget");
PrivateDependencyModuleNames.Add("WebBrowser");
PublicDefinitions.Add("USING_BUNDLED_CEF=1");
PublicDefinitions.Add("USING_BLUI_CEF=0");
#else
if (Target.Platform == UnrealTargetPlatform.Win64)
{
PrivateDependencyModuleNames.Add("Blu");
PublicDefinitions.Add("USING_BLUI_CEF=1");
}
else
{
PublicDefinitions.Add("USING_BLUI_CEF=0");
}

PublicDefinitions.Add("USING_BUNDLED_CEF=0");
#endif
PublicDefinitions.Add("USING_BUNDLED_CEF=1");

DynamicallyLoadedModuleNames.AddRange(
new string[]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
// Fill out your copyright notice in the Description page of Project Settings.

#include "Openfort/Actions/OpenfortBlueprintAsyncAction.h"
#include "Engine/World.h"
#include "Engine/GameInstance.h"
#include "Openfort/OpenfortSubsystem.h"

UOpenfortSubsystem *UOpenfortBlueprintAsyncAction::GetSubsystem() const
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
// Fill out your copyright notice in the Description page of Project Settings.

#include "Openfort/Actions/OpenfortOpenfortSDKAuthenticateAsyncAction.h"

#include "Openfort/OpenfortOpenfortSDK.h"
#include "Openfort/OpenfortSubsystem.h"
#include "Openfort/Misc/OpenfortLogging.h"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,8 @@ void UOpenfortOpenfortSDKExecuteTransactionAsyncAction::OnHttpRequestComplete(FH
if (FJsonSerializer::Deserialize(Reader, JsonObject) && JsonObject.IsValid())
{
FString UserOperationHash, TransactionIntentId;
JsonObject->TryGetStringField("userOperationHash", UserOperationHash);
JsonObject->TryGetStringField("transactionIntentId", TransactionIntentId);
JsonObject->TryGetStringField(TEXT("userOperationHash"), UserOperationHash);
JsonObject->TryGetStringField(TEXT("transactionIntentId"), TransactionIntentId);

TransactionSent.Broadcast(TEXT(""), TransactionIntentId, UserOperationHash);
}
Expand Down
180 changes: 0 additions & 180 deletions Source/Openfort/Private/Openfort/OpenfortBlui.cpp

This file was deleted.

Loading