Add Category Specifiers and 5.4 related includes

Source/OUUBlueprintRuntime/Private/Core/OUUDataTableLibrary.cpp

@@ -2,6 +2,8 @@
 
 #include "Core/OUUDataTableLibrary.h"
 
+#include "Blueprint/BlueprintExceptionInfo.h"
+
 bool UOUUDataTableLibrary::AddRowToDataTable(UDataTable* DataTable, FName RowName, FTableRowBase RowStruct)
 {
 	// We must never hit this! The real implementation is in Generic_AddRowToDataTable

Source/OUUBlueprintRuntime/Public/Core/OUUCoreBlueprintLibrary.h

@@ -21,7 +21,7 @@ class UOUUCoreBlueprintLibrary : public UBlueprintFunctionLibrary
 	/** @returns the mutable class default object of the specified class. Proceed with caution! */
 	UFUNCTION(BlueprintPure, Category = "Open Unreal Utilities|Class", Meta = (DeterminesOutputType = Class))
 	static UObject* GetClassDefaultObject(TSubclassOf<UObject> Class);
-
+	
 	/** @returns the mutable class default object of the objects class. Proceed with caution! */
 	UFUNCTION(BlueprintPure, Category = "Open Unreal Utilities|Class")
 	static UObject* GetClassDefaultObjectFromObject(const UObject* Object);
@@ -50,7 +50,7 @@ class UOUUCoreBlueprintLibrary : public UBlueprintFunctionLibrary
 	 * If we are currently recording into the transaction buffer (undo/redo),
 	 * save a copy of this object into the buffer and mark the package as needing to be saved.
 	 */
-	UFUNCTION(BlueprintCallable)
+	UFUNCTION(BlueprintCallable,Category="OUU|Utilities|Core")
 	static void ModifyObject(UObject* Object);
 
 	/** Converts a TopLevelAssetPath to a string */

Source/OUUDeveloper/Public/OUUMapsToCookSettings.h

@@ -15,10 +15,10 @@ struct OUUDEVELOPER_API FOUUMapsToCookList
 	GENERATED_BODY()
 public:
 	// Name of the config section that these properties reside in
-	UPROPERTY(Transient, VisibleAnywhere)
+	UPROPERTY(Transient, VisibleAnywhere,Category="OUU|Maps|Settings")
 	FString OwningConfigSection;
 
-	UPROPERTY(EditAnywhere, meta = (RelativeToGameContentDir, LongPackageName))
+	UPROPERTY(EditAnywhere,Category="OUU|Maps|Settings", meta = (RelativeToGameContentDir, LongPackageName))
 	TArray<FFilePath> MapsToCook;
 
 	void ReloadConfig(const FString& ConfigPath);
@@ -39,25 +39,21 @@ class OUUDEVELOPER_API UOUUMapsToCookSettings : public UDeveloperSettings
 
 	// Request the package on default cooks.
 	// Not used if commandline, AlwaysCookMaps, or MapsToCook are present.
-	UPROPERTY(Transient, EditAnywhere, meta = (EditCondition = bEnableAllMaps))
+	UPROPERTY(Transient, EditAnywhere, meta = (EditCondition = bEnableAllMaps),Category="OUU|Maps|Settings")
 	FOUUMapsToCookList AllMaps;
 
 	// Request the package on every cook.
 	// Using this prevents AllMaps.
-	UPROPERTY(Transient, EditAnywhere)
+	UPROPERTY(Transient, EditAnywhere,Category="OUU|Maps|Settings")
 	FOUUMapsToCookList AlwaysCookMaps;
 
 	// Names of all custom config sections that contain map lists.
-	UPROPERTY(Config, EditAnywhere, meta = (EditFixedOrder), DisplayName = "Custom Config Sections")
+	UPROPERTY(Config, EditAnywhere,Category="OUU|Maps|Settings", meta = (EditFixedOrder), DisplayName = "Custom Config Sections")
 	TArray<FString> ConfigSections;
 
 	// Map lists from ConfigSections that can be referenced used -MAPINISECTION parameter in command-line cooks
 	UPROPERTY(
-		Transient,
-		EditAnywhere,
-		EditFixedSize,
-		meta = (EditFixedOrder),
-		DisplayName = "Custom Config Sections Map Lists")
+		Transient,Category="OUU|Maps|Settings",EditAnywhere,EditFixedSize,meta = (EditFixedOrder),DisplayName = "Custom Config Sections Map Lists")
 	TArray<FOUUMapsToCookList> MapLists;
 
 	// - UObject

Source/OUUEditor/Private/OUUEditorModule.cpp

@@ -13,6 +13,7 @@
 #include "Modules/ModuleManager.h"
 #include "OUUContentBrowserExtensions.h"
 #include "PropertyEditorUtils.h"
+#include "OUUEditor/Public/PropertyEditorUtils.h"
 
 namespace OUU::Editor
 {
@@ -43,7 +44,7 @@ namespace OUU::Editor
 				FTypedGameplayTagContainer_PropertyTypeCustomization>();
 		}
 
-		void ShutdownModule() override
+		void ShutdownModule()
 		{
 			if (OnUtilityWidgetsLoadedHandle.IsValid())
 			{

Source/OUUEditor/Public/GameplayTagValidator.h

@@ -15,10 +15,10 @@ struct FGameplayTagValidationSettingsEntry
 {
 	GENERATED_BODY()
 public:
-	UPROPERTY(EditAnywhere)
+	UPROPERTY(EditAnywhere,Category="OUU|Validation")
 	bool bCanHaveContentChildren = true;
 
-	UPROPERTY(EditAnywhere)
+	UPROPERTY(EditAnywhere,Category="OUU|Validation")
 	int32 AllowedChildDepth = 1;
 };
 
@@ -33,36 +33,36 @@ class UGameplayTagValidationSettings : public UDeveloperSettings
 public:
 	// Maximum nesting depth of tags including the root tags.
 	// e.g. 'Foo' has a nesting level of 1, 'Foo.Bar' has 2, 'Foo.Bar.Baz' has 3, etc.
-	UPROPERTY(Config, EditAnywhere, meta = (UIMin = 1, UIMax = 20))
+	UPROPERTY(Config, EditAnywhere, Category="OUU|Gameplay Tag", meta = (UIMin = 1, UIMax = 20))
 	int32 MaxGlobalTagDepth = 10;
 
 	// Default depth allowed for native tags that are marked as "allow child tags" from C++ code.
 	// You can always create tag overrides that supercede this setting for individual tags.
-	UPROPERTY(Config, EditAnywhere)
+	UPROPERTY(Config, EditAnywhere, Category="OUU|Gameplay Tag")
 	int32 NativeTagAllowedChildDepth = 3;
 
-	UPROPERTY(Config, EditAnywhere)
+	UPROPERTY(Config, EditAnywhere, Category="OUU|Gameplay Tag")
 	bool bAllowContentRootTags = false;
 
 	// If true, allow content tags as children anywhere they are not explicitly prohibited via TagOverrides.
-	UPROPERTY(Config, EditAnywhere)
+	UPROPERTY(Config, EditAnywhere, Category="OUU|Gameplay Tag")
 	bool bDefaultAllowContentTagChildren = false;
 
 	// If true, run gameplay tag validation after every change of the gameplay tags tree.
 	// This means both after editor start and every edit of the tags list.
-	UPROPERTY(Config, EditAnywhere)
+	UPROPERTY(Config, EditAnywhere, Category="OUU|Gameplay Tag")
 	bool bValidateTagsAfterTagTreeChange = true;
 
-	UPROPERTY(Config, EditAnywhere)
+	UPROPERTY(Config, EditAnywhere, Category="OUU|Gameplay Tag")
 	bool bValidateTagsDuringCook = true;
 
 	// If true, run gameplay tag validation after every change of settings in this settings class.
-	UPROPERTY(Config, EditAnywhere)
+	UPROPERTY(Config, EditAnywhere, Category="OUU|Gameplay Tag")
 	bool bValidateTagsAfterSettingsChange = true;
 
 	// Issues underneath these gameplay tags will always only cause warnings instead of errors.
 	// Only affects issues from UOUUGameplayTagValidator. Other validator classes may ignore this setting.
-	UPROPERTY(Config, EditAnywhere)
+	UPROPERTY(Config, EditAnywhere, Category="OUU|Gameplay Tag")
 	FGameplayTagContainer WarnOnlyGameplayTags;
 
 	void RefreshNativeTagOverrides();
@@ -79,11 +79,11 @@ class UGameplayTagValidationSettings : public UDeveloperSettings
 	// --
 
 private:
-	UPROPERTY(Config, EditAnywhere, meta = (ForceInlineRow))
+	UPROPERTY(Config, EditAnywhere, meta = (ForceInlineRow), Category="OUU|Gameplay Tag")
 	TMap<FGameplayTag, FGameplayTagValidationSettingsEntry> TagOverrides;
 
 	// Settings declared in code from literal gameplay tags
-	UPROPERTY(VisibleAnywhere, meta = (ForceInlineRow))
+	UPROPERTY(VisibleAnywhere, meta = (ForceInlineRow), Category="OUU|Gameplay Tag")
 	TMap<FGameplayTag, FGameplayTagValidationSettingsEntry> NativeTagOverrides;
 };
 
@@ -110,7 +110,7 @@ class OUUEDITOR_API UGameplayTagValidatorSubsystem : public UEditorSubsystem
 public:
 	static UGameplayTagValidatorSubsystem& Get();
 
-	UFUNCTION(BlueprintCallable)
+	UFUNCTION(BlueprintCallable, Category="OUU|Gameplay Tag")
 	void ValidateGameplayTagTree();
 
 	// - UEngineSubsystem

Source/OUUEditor/Public/OUUEditorLibrary.h

@@ -14,15 +14,15 @@ struct FOUUBlueprintEditorFocusContent
 	GENERATED_BODY()
 public:
 	/* Tab on which to focus (e.g. 'My Blueprint' tab). */
-	UPROPERTY(EditAnywhere, BlueprintReadWrite)
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category="OUU|Editor")
 	FString TabToFocusOrOpen;
 
 	/* The GUID of a blueprint node */
-	UPROPERTY(EditAnywhere, BlueprintReadWrite)
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category="OUU|Editor")
 	FString NodeGUID;
 
 	/* Name of the outer object - should be the blueprint that 'owns' the node */
-	UPROPERTY(EditAnywhere, BlueprintReadWrite)
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category="OUU|Editor")
 	FString ObjectName;
 };
 

Source/OUURuntime/Private/Animation/Debug/GameplayDebugger_Animation.cpp

@@ -9,7 +9,7 @@
 	#include "Animation/AnimNodeBase.h"
 	#include "Animation/AnimNotifies/AnimNotifyState.h"
 	#include "Animation/AnimSequence.h"
-	#include "Animation/AnimTypes.h"
+	//#include "Animation/AnimTypes.h"
 	#include "Animation/Debug/DebuggableAnimInstance.h"
 	#include "Components/SkeletalMeshComponent.h"
 	#include "DisplayDebugHelpers.h"

Source/OUURuntime/Private/GameplayDebugger/GameplayDebuggerCategory_ViewModes.cpp

@@ -1,14 +1,15 @@
 // Copyright (c) 2023 Jonas Reich & Contributors
 
 #include "GameplayDebugger/GameplayDebuggerCategory_ViewModes.h"
+#include "Engine.h"
 
 #if WITH_GAMEPLAY_DEBUGGER
-	#include "BufferVisualizationData.h"
-	#include "Engine/DebugCameraControllerSettings.h"
-	#include "Engine/Font.h"
-	#include "Engine/GameViewportClient.h"
-	#include "GameFramework/PlayerController.h"
-	#include "LogOpenUnrealUtilities.h"
+#include "BufferVisualizationData.h"
+#include "Engine/DebugCameraControllerSettings.h"
+#include "Engine/Font.h"
+#include "Engine/GameViewportClient.h"
+#include "GameFramework/PlayerController.h"
+#include "LogOpenUnrealUtilities.h"
 
 namespace OUU::Runtime::Private
 {
@@ -52,7 +53,7 @@ namespace OUU::Runtime::Private
 		case VMI_VisualizeSubstrate: return TEXT("VisualizeSubstrate");
 		case VMI_VisualizeGroom: return TEXT("VisualizeGroom");
 		case VMI_Max: return TEXT("Max");
-		default:;
+		default: ;
 		}
 		return TEXT("");
 	}
@@ -70,7 +71,6 @@ namespace OUU::Runtime::Private
 
 		return TEXT("");
 	}
-
 } // namespace OUU::Runtime::Private
 
 FGameplayDebuggerCategory_ViewModes::FGameplayDebuggerCategory_ViewModes()
@@ -113,7 +113,10 @@ void FGameplayDebuggerCategory_ViewModes::DrawData(
 	FGameplayDebuggerCanvasContext& CanvasContext)
 {
 	CanvasContext.FontRenderInfo.bEnableShadow = true;
-	CanvasContext.Font = GEngine->GetSmallFont();
+	if (GEngine)
+	{
+		CanvasContext.Font = GEngine->GetSmallFont();
+	}
 
 	PrintKeyBinds(CanvasContext);
 
@@ -151,7 +154,8 @@ void FGameplayDebuggerCategory_ViewModes::CycleViewMode()
 
 		if (NextViewModeIndex != CurrViewModeIndex)
 		{
-			FString NextViewModeName = OUU::Runtime::Private::GetViewModeName(StaticCast<EViewModeIndex>(NextViewModeIndex));
+			FString NextViewModeName = OUU::Runtime::Private::GetViewModeName(
+				StaticCast<EViewModeIndex>(NextViewModeIndex));
 
 			if (!NextViewModeName.IsEmpty())
 			{
@@ -305,7 +309,8 @@ void FGameplayDebuggerCategory_ViewModes::GetNextBuffer(const TArray<FString>& O
 				Max += Incr;
 			}
 
-			auto Wrap = [&](int32 Index) {
+			auto Wrap = [&](int32 Index)
+			{
 				if (Index < Min)
 				{
 					Index = Max;
@@ -390,4 +395,4 @@ void FGameplayDebuggerCategory_ViewModes::SetupBufferVisualizationOverviewInput(
 	bIsBufferVisualizationInputSetup = true;
 }
 
-#endif
+#endif

Source/OUURuntime/Private/Pooling/OUUActorPool.cpp

@@ -182,7 +182,10 @@ void UOUUActorPool::AddReferencedObjects(UObject* InThis, FReferenceCollector& C
 	{
 		for (auto& Entry : CastedThis->PooledActors)
 		{
-			Collector.AddReferencedObjects<AActor>(Entry.Value);
+			//We get a warning here saying the game will randomly crash when incremental garbage collection is enabled
+			//Suggestion is to pass TObjectPtr<AActor> instead of AActor* to AddReferencedObjects
+			//Collector.AddReferencedObjects<AActor>(Entry.Value);
+
 		}
 	}
 

Source/OUURuntime/Private/SemVer/PreReleaseIdentifier.cpp

@@ -93,7 +93,7 @@ bool FSemVerPreReleaseIdentifier::TryIncrement()
 	if (LastIdentifierAsNumeric != INDEX_NONE)
 	{
 		LastIdentifierAsNumeric++;
-		LastIdentifier = LexToString<int32>(LastIdentifierAsNumeric);
+		//LastIdentifier = LexToString<int32>(LastIdentifierAsNumeric);
 		return true;
 	}
 

Source/OUURuntime/Public/Animation/Debug/GameplayDebugger_Animation.h

@@ -3,6 +3,9 @@
 #pragma once
 
 #include "GameplayDebugger/GameplayDebuggerCategory_OUUBase.h"
+#include "Animation/AnimTypes.h"
+
+#include "Animation/AnimationAsset.h"
 
 #if WITH_GAMEPLAY_DEBUGGER
 	#include "CoreMinimal.h"
@@ -12,7 +15,7 @@ class APlayerController;
 class UCanvas;
 class UOUUDebuggableAnimInstance;
 
-struct FAnimInstanceProxy;
+//struct FAnimInstanceProxy;
 struct FGameplayDebugger_DisplayDebugManager;
 
 /**
@@ -26,7 +29,7 @@ class OUURUNTIME_API FGameplayDebuggerCategory_Animation : public FOUUGameplayDe
 
 	static auto GetCategoryName() { return TEXT("Animation"); }
 
-	void DrawData(APlayerController* OwnerPC, FGameplayDebuggerCanvasContext& CanvasContext) override;
+	virtual void DrawData(APlayerController* OwnerPC, FGameplayDebuggerCanvasContext& CanvasContext) override;
 
 private:
 	int32 DebugMeshComponentIndex = 0;

Source/OUURuntime/Public/FlowControl/ExclusiveLock.h

@@ -25,7 +25,7 @@ class OUURUNTIME_API UExclusiveLock : public UObject
 	 * Calling this function again with the active object key will result in a success without any side-effects.
 	 * @returns whether the lock was successfully locked by this key object.
 	 */
-	UFUNCTION(BlueprintCallable)
+	UFUNCTION(BlueprintCallable, Category = "OUU")
 	bool TryLock(UObject* Key);
 
 	/**
@@ -34,22 +34,22 @@ class OUURUNTIME_API UExclusiveLock : public UObject
 	 * The lock will be automatically released after the specified time (in game time).
 	 * @returns whether the lock was successfully locked by this key object.
 	 */
-	UFUNCTION(BlueprintCallable)
+	UFUNCTION(BlueprintCallable, Category = "OUU")
 	bool TryLockForDuration(UObject* Key, float Duration);
 
 	/**
 	 * Release the lock with the object which was used to lock it.
 	 * Calling unlock with an object that was not used to lock it will trigger an ensure condition.
 	 */
-	UFUNCTION(BlueprintCallable)
+	UFUNCTION(BlueprintCallable, Category = "OUU")
 	bool TryUnlock(UObject* Key);
 
 	/** Is the lock locked by a valid key object? */
-	UFUNCTION(BlueprintPure)
+	UFUNCTION(BlueprintPure, Category = "OUU")
 	bool IsLocked() const;
 
 private:
 	/** Active key/owner of the lock. May turn stale while set. */
-	UPROPERTY(Transient)
+	UPROPERTY(Transient,Category="OUU",VisibleAnywhere)
 	TWeakObjectPtr<UObject> ActiveKey;
 };