Merge pull request StudioSyndiCatCaius#14 from andreiagmu/main

Fixes for RunUAT BuildPlugin - commit 6f88ac5
andreiagmu · Mar 5, 2024 · a330d76 · a330d76
2 parents dfe3945 + b72a37b
commit a330d76
Show file tree

Hide file tree

Showing 11 changed files with 20 additions and 6 deletions.
diff --git a/OmegaGameFramework/Source/LuaMachine/Public/LuaInterface.h b/OmegaGameFramework/Source/LuaMachine/Public/LuaInterface.h
@@ -3,6 +3,7 @@
 #pragma once
 
 #include "CoreMinimal.h"
+#include "UObject/Interface.h"
 #include "LuaValue.h"
 
 #include "LuaInterface.generated.h"

diff --git a/OmegaGameFramework/Source/LuaMachine/Public/LuaObject.h b/OmegaGameFramework/Source/LuaMachine/Public/LuaObject.h
@@ -6,6 +6,7 @@
 #include "LuaCode.h"
 #include "LuaInterface.h"
 #include "Engine/DataAsset.h"
+#include "Kismet/BlueprintFunctionLibrary.h"
 #include "LuaObject.generated.h"
 
 USTRUCT(BlueprintType)

diff --git a/OmegaGameFramework/Source/LuaMachineEditor/Private/LuaMachineEditor.cpp b/OmegaGameFramework/Source/LuaMachineEditor/Private/LuaMachineEditor.cpp
@@ -5,7 +5,7 @@
 #include "Editor/PropertyEditor/Public/PropertyEditorModule.h"
 #include "EditorStyleSet.h"
 #include "Runtime/Projects/Public/Interfaces/IPluginManager.h"
-#include "SlateCore/Public/Styling/SlateStyleRegistry.h"
+#include "Runtime/SlateCore/Public/Styling/SlateStyleRegistry.h"
 #include "LuaCodeCustomization.h"
 #include "LuaValueCustomization.h"
 #include "Editor/WorkspaceMenuStructure/Public/WorkspaceMenuStructure.h"

diff --git a/OmegaGameFramework/Source/OmegaDemo/OmegaDemo.build.cs b/OmegaGameFramework/Source/OmegaDemo/OmegaDemo.build.cs
@@ -9,6 +9,7 @@ public OmegaDemo(ReadOnlyTargetRules Target) : base(Target)
 		PublicDependencyModuleNames.AddRange(new string[] { 
 			"Core", 
 			"CoreUObject", 
+			"LuaMachine",
 			"Engine", 
 			"GameplayTags", 
 			"UMG",

diff --git a/...ameFramework/Source/OmegaGameFramework/Private/Gameplay/Components/EquipmentComponent.cpp b/...ameFramework/Source/OmegaGameFramework/Private/Gameplay/Components/EquipmentComponent.cpp
@@ -5,6 +5,7 @@
 
 #include "Data/DataAssetCollectionComponent.h"
 #include "Engine/DataAsset.h"
+#include "Engine/GameInstance.h"
 #include "Gameplay/CombatantComponent.h"
 #include "Gameplay/GameplayTagsInterface.h"
 

diff --git a/OmegaGameFramework/Source/OmegaGameFramework/Private/Gameplay/OmegaScriptedTrace.cpp b/OmegaGameFramework/Source/OmegaGameFramework/Private/Gameplay/OmegaScriptedTrace.cpp
@@ -2,6 +2,8 @@
 
 
 #include "Gameplay/OmegaScriptedTrace.h"
+#include "Engine/GameInstance.h"
+#include "Engine/HitResult.h"
 
 
 const FHitResult UOmegaScriptedTraceFunctions::ScriptedTrace_Single(UObject* context, FOmegaScriptedTrace Trace,bool& Success)

diff --git a/OmegaGameFramework/Source/OmegaGameFramework/Private/OmegaFileSubsystem.cpp b/OmegaGameFramework/Source/OmegaGameFramework/Private/OmegaFileSubsystem.cpp
@@ -2,8 +2,11 @@
 
 
 #include "OmegaFileSubsystem.h"
+#include "Engine/GameInstance.h"
+#include "Engine/World.h"
 #include "HAL/FileManager.h"
 #include "Misc/FileHelper.h"
+#include "Misc/Paths.h"
 #include "Kismet/KismetRenderingLibrary.h"
 #include "Kismet/KismetSystemLibrary.h"
 

diff --git a/OmegaGameFramework/Source/OmegaGameFramework/Private/Widget/DataWidget.cpp b/OmegaGameFramework/Source/OmegaGameFramework/Private/Widget/DataWidget.cpp
@@ -15,6 +15,7 @@
 #include "Kismet/KismetMathLibrary.h"
 #include "Player/OmegaPlayerSubsystem.h"
 #include "Widget/DataList.h"
+#include "TimerManager.h"
 
 void UDataWidget::NativePreConstruct()
 {

diff --git a/OmegaGameFramework/Source/OmegaGameFramework/Public/Gameplay/OmegaGameplayCue.h b/OmegaGameFramework/Source/OmegaGameFramework/Public/Gameplay/OmegaGameplayCue.h
@@ -4,6 +4,7 @@
 
 #include "CoreMinimal.h"
 #include "NiagaraSystem.h"
+#include "Engine/HitResult.h"
 #include "GameFramework/Actor.h"
 #include "Gameplay/GameplayTagsInterface.h"
 #include "Kismet/BlueprintFunctionLibrary.h"

diff --git a/OmegaGameFramework/Source/OmegaGameFramework/Public/OmegaFileSubsystem.h b/OmegaGameFramework/Source/OmegaGameFramework/Public/OmegaFileSubsystem.h
@@ -4,6 +4,8 @@
 
 #include "CoreMinimal.h"
 #include "Subsystems/GameInstanceSubsystem.h"
+#include "Kismet/BlueprintFunctionLibrary.h"
+#include "Sound/SoundBase.h"
 #include "OmegaFileSubsystem.generated.h"
 
 /**
@@ -27,18 +29,18 @@ class OMEGAGAMEFRAMEWORK_API UOmegaFileSubsystem : public UGameInstanceSubsystem
 	FString override_audio_path="audio";
 
 public:
-	UFUNCTION(BlueprintPure)
+	UFUNCTION(BlueprintPure, Category="Omega|File")
 	FString GetOverrideDirectory() const;
-	UFUNCTION(BlueprintPure)
+	UFUNCTION(BlueprintPure, Category="Omega|File")
 	FString GetOverrideDirectory_Images() const;
-	UFUNCTION(BlueprintPure)
+	UFUNCTION(BlueprintPure, Category="Omega|File")
 	FString GetOverrideDirectory_Audio() const;
 
 
 
-	UPROPERTY(BlueprintReadOnly)
+	UPROPERTY(BlueprintReadOnly, Category="Omega|File")
 	TMap<FString, UTexture2D*> imported_images;
-	UPROPERTY(BlueprintReadOnly)
+	UPROPERTY(BlueprintReadOnly, Category="Omega|File")
 	TMap<FString, USoundBase*> imported_sounds;
 };
 

diff --git a/OmegaGameFramework/Source/OmegaSequence/OmegaSequence.build.cs b/OmegaGameFramework/Source/OmegaSequence/OmegaSequence.build.cs
@@ -9,6 +9,7 @@ public OmegaSequence(ReadOnlyTargetRules Target) : base(Target)
 
 		PublicDependencyModuleNames.AddRange(new string[] { "Core", 
 			"CoreUObject", 
+			"LuaMachine",
 			"Engine", 
 			"OmegaData",
 			"LuaMachine",