Merge branch '5.3_dev' into 5.3

pavlicekdominik · pavlicekdominik · commit 6899169a819f · 2025-07-27T13:41:47.000+02:00
diff --git a/MounteaDialogueSystem.uplugin b/MounteaDialogueSystem.uplugin
@@ -7,9 +7,9 @@
 	"Category": "Mountea Framework",
 	"CreatedBy": "Dominik (Pavlicek) Morse",
 	"CreatedByURL": "https://github.com/Mountea-Framework",
-	"DocsURL": "https://github.com/Mountea-Framework/MounteaDialogueSystem/wiki",
+	"DocsURL": "https://mountea.tools/docs/dialoguesystem/gettingstarted/firststeps/",
 	"MarketplaceURL": "com.epicgames.launcher://ue/marketplace/product/ea38ae1f87b24807a66fdf4fa65ef521",
-	"SupportURL": "https://bit.ly/DominikPavlicek_SupportServer",
+	"SupportURL": "https://discord.gg/c2WQ658V44",
 	"EngineVersion": "5.3.0",
 	"CanContainContent": true,
 	"Installed": true,
diff --git a/Source/MounteaDialogueSystem/Private/Nodes/MounteaDialogueGraphNode.cpp b/Source/MounteaDialogueSystem/Private/Nodes/MounteaDialogueGraphNode.cpp
@@ -217,7 +217,7 @@ FText UMounteaDialogueGraphNode::GetNodeCategory_Implementation() const
 
 FString UMounteaDialogueGraphNode::GetNodeDocumentationLink_Implementation() const
 {
-	return TEXT("https://github.com/Mountea-Framework/MounteaDialogueSystem/wiki/Dialogue-Nodes");
+	return TEXT("https://mountea.tools/docs/DialogueSystem/DialogueNodes/DialogueNode/");
 }
 
 FText UMounteaDialogueGraphNode::GetNodeTooltipText_Implementation() const
diff --git a/Source/MounteaDialogueSystem/Private/Nodes/MounteaDialogueGraphNode_ReturnToNode.cpp b/Source/MounteaDialogueSystem/Private/Nodes/MounteaDialogueGraphNode_ReturnToNode.cpp
@@ -7,6 +7,7 @@
 #include "Helpers/MounteaDialogueSystemBFC.h"
 #include "Misc/DataValidation.h"
 #include "TimerManager.h"
+#include "Algo/AnyOf.h"
 #include "Nodes/MounteaDialogueGraphNode_CompleteNode.h"
 #include "Nodes/MounteaDialogueGraphNode_StartNode.h"
 
@@ -87,6 +88,50 @@ void UMounteaDialogueGraphNode_ReturnToNode::OnDelayDurationExpired(const TScrip
 	}
 }
 
+TArray<FString> UMounteaDialogueGraphNode_ReturnToNode::GetRowNames() const
+{
+	if (!Graph)
+		return {};
+
+	const auto AllNodes = Graph->GetAllNodes();
+	const int32 NumNodes = AllNodes.Num();
+
+	TArray<int32> Indices;
+	Indices.Reserve(NumNodes);
+	
+	for (int32 i = 0; i < NumNodes; ++i)
+	{
+		Indices.Add(i);
+	}
+
+	TArray<FString> NodeNames;
+	NodeNames.Reserve(NumNodes);
+
+	Algo::TransformIf(
+		Indices,
+		NodeNames,
+		[&](const int32 Index)
+		{
+			const auto Node = AllNodes[Index];
+			if (!Node)
+				return false;
+			return !Algo::AnyOf(
+				AllowedNodesFilter,
+				[Node](const TSubclassOf<UMounteaDialogueGraphNode>& FilterClass)
+				{
+					return Node->IsA(FilterClass);
+				}
+			);
+		},
+		[](int32 Index)
+		{
+			return FString::FromInt(Index);
+		}
+	);
+
+	return NodeNames;
+}
+
 #if WITH_EDITOR
 
 FText UMounteaDialogueGraphNode_ReturnToNode::GetNodeCategory_Implementation() const
diff --git a/Source/MounteaDialogueSystem/Public/Decorators/MounteaDialogueDecoratorBase.h b/Source/MounteaDialogueSystem/Public/Decorators/MounteaDialogueDecoratorBase.h
@@ -69,7 +69,7 @@ class MOUNTEADIALOGUESYSTEM_API UMounteaDialogueDecoratorBase : public UObject,
 	FString GetDecoratorDocumentationLink() const;
 	virtual FString GetDecoratorDocumentationLink_Implementation() const
 	{
-		return TEXT("https://github.com/Mountea-Framework/MounteaDialogueSystem/wiki/Dialogue-Decorators");
+		return TEXT("https://mountea.tools/docs/DialogueSystem/DialogueDecorators/DialogueDecorator");
 	}
 
 public:
diff --git a/Source/MounteaDialogueSystem/Public/Decorators/MounteaDialogueDecorator_OnlyFirstTime.h b/Source/MounteaDialogueSystem/Public/Decorators/MounteaDialogueDecorator_OnlyFirstTime.h
@@ -36,7 +36,7 @@ class MOUNTEADIALOGUESYSTEM_API  UMounteaDialogueDecorator_OnlyFirstTime : publi
 	virtual bool IsDecoratorAllowedForGraph_Implementation() const override {  return false;  };
 
 	virtual  FString GetDecoratorDocumentationLink_Implementation() const override
-	{ return TEXT("https://github.com/Mountea-Framework/MounteaDialogueSystem/wiki/Decorator:-Only-First-Time-Base"); }
+	{ return TEXT("https://mountea.tools/docs/DialogueSystem/DialogueDecorators/OnlyFirstTimeBase"); }
 
 	// Returns whether Owning Node has never been called before.
 	UFUNCTION(BlueprintCallable, BlueprintPure, Category="Mountea|Dialogue|Decorator", meta=(CustomTag="MounteaK2Validate"))
diff --git a/Source/MounteaDialogueSystem/Public/Decorators/MounteaDialogueDecorator_OverrideDialogue.h b/Source/MounteaDialogueSystem/Public/Decorators/MounteaDialogueDecorator_OverrideDialogue.h
@@ -27,7 +27,7 @@ class MOUNTEADIALOGUESYSTEM_API UMounteaDialogueDecorator_OverrideDialogue : pub
 	virtual bool IsDecoratorAllowedForGraph_Implementation() const override {  return false;  };
 
 	virtual  FString GetDecoratorDocumentationLink_Implementation() const override
-	{ return TEXT("https://github.com/Mountea-Framework/MounteaDialogueSystem/wiki/Decorator:-Override-Dialogue-Row-Data"); }
+	{ return TEXT("https://mountea.tools/docs/DialogueSystem/DialogueDecorators/OverrideDialogueRowData"); }
 
 protected:
 
diff --git a/Source/MounteaDialogueSystem/Public/Decorators/MounteaDialogueDecorator_OverrideOnlyFirstTime.h b/Source/MounteaDialogueSystem/Public/Decorators/MounteaDialogueDecorator_OverrideOnlyFirstTime.h
@@ -28,16 +28,20 @@ class MOUNTEADIALOGUESYSTEM_API  UMounteaDialogueDecorator_OverrideOnlyFirstTime
 	virtual bool IsDecoratorAllowedForGraph_Implementation() const override {  return false;  };
 
 	virtual  FString GetDecoratorDocumentationLink_Implementation() const override
-	{ return TEXT("https://github.com/Mountea-Framework/MounteaDialogueSystem/wiki/Decorator:-Override-Only-Frist-Time"); }
+	{ return TEXT("https://mountea.tools/docs/DialogueSystem/DialogueDecorators/OverrideOnlyFristTime"); }
 
 
 protected:
 
-	UPROPERTY(Category="Override", EditAnywhere, BlueprintReadOnly, meta=(DisplayThumbnail=false, NoResetToDefault, RequiredAssetDataTags = "RowStructure=/Script/MounteaDialogueSystem.DialogueRow"))
+	UPROPERTY(Category="Override", EditAnywhere, BlueprintReadOnly,
+		meta=(DisplayThumbnail=false, NoResetToDefault,
+			RequiredAssetDataTags = "RowStructure=/Script/MounteaDialogueSystem.DialogueRow"))
 	TObjectPtr<UDataTable> DataTable;
 
 	/** Name of row in the table that we want */
-	UPROPERTY(Category="Override", EditAnywhere, BlueprintReadOnly, meta=(GetOptions ="GetRowNames", NoResetToDefault, EditCondition="DataTable!=nullptr"))
+	UPROPERTY(Category="Override", EditAnywhere, BlueprintReadOnly,
+		meta=(GetOptions ="GetRowNames", NoResetToDefault,
+			EditCondition="DataTable!=nullptr"))
 	FName RowName;
 	
 private:
@@ -46,9 +50,7 @@ class MOUNTEADIALOGUESYSTEM_API  UMounteaDialogueDecorator_OverrideOnlyFirstTime
 	TArray<FName> GetRowNames() const
 	{
 		if (DataTable)
-		{
 			return DataTable->GetRowNames();
-		}
 
 		return TArray<FName>();
 	}
diff --git a/Source/MounteaDialogueSystem/Public/Decorators/MounteaDialogueDecorator_OverrideParticipants.h b/Source/MounteaDialogueSystem/Public/Decorators/MounteaDialogueDecorator_OverrideParticipants.h
@@ -30,27 +30,32 @@ class MOUNTEADIALOGUESYSTEM_API  UMounteaDialogueDecorator_OverrideParticipants
 	virtual void ExecuteDecorator_Implementation() override;
 
 	virtual  FString GetDecoratorDocumentationLink_Implementation() const override
-	{ return TEXT("https://github.com/Mountea-Framework/MounteaDialogueSystem/wiki/Decorator:-Override-Dialogue-Participants"); }
+	{ return TEXT("https://mountea.tools/docs/DialogueSystem/DialogueDecorators/OverrideDialogueParticipants"); }
 
 protected:
 
 	// Enables setting NewPlayerParticipant to a value
 	UPROPERTY(SaveGame, Category="Override", EditAnywhere, BlueprintReadOnly, meta=(NoResetToDefault, InlineEditConditionToggle))
 	bool bOverridePlayerParticipant;
+	
 	// Non-nullable reference to Actor from Level. Either must implement 'MounteaDialogueParticipantInterface' or must contain at least 1 component which implements such interface.
 	UPROPERTY(SaveGame, Category="Override", EditAnywhere, BlueprintReadOnly, meta=(DisplayThumbnail=false, NoResetToDefault, EditCondition="bOverridePlayerParticipant"))
 	TSoftObjectPtr<AActor>NewPlayerParticipant;
 
+	
 	// Enables setting NewDialogueParticipant to a value
 	UPROPERTY(SaveGame, Category="Override", EditAnywhere, BlueprintReadOnly, meta=(NoResetToDefault, InlineEditConditionToggle))
 	bool bOverrideDialogueParticipant;
+	
 	// Non-nullable reference to Actor from Level. Either must implement 'MounteaDialogueParticipantInterface' or must contain at least 1 component which implements such interface.
 	UPROPERTY(SaveGame, Category="Override", EditAnywhere, BlueprintReadOnly, meta=(DisplayThumbnail=false, NoResetToDefault, EditCondition="bOverrideDialogueParticipant"))
 	TSoftObjectPtr<AActor>NewDialogueParticipant;
 
+	
 	// Enables setting NewActiveParticipant to a value
 	UPROPERTY(SaveGame, Category="Override", EditAnywhere, BlueprintReadOnly, meta=(NoResetToDefault, InlineEditConditionToggle))
 	bool bOverrideActiveParticipant;
+	
 	// Non-nullable reference to Actor from Level. Either must implement 'MounteaDialogueParticipantInterface' or must contain at least 1 component which implements such interface.
 	UPROPERTY(SaveGame, Category="Override", EditAnywhere, BlueprintReadOnly, meta=(DisplayThumbnail=false, NoResetToDefault, EditCondition="bOverrideActiveParticipant"))
 	TSoftObjectPtr<AActor>NewActiveParticipant;
diff --git a/Source/MounteaDialogueSystem/Public/Decorators/MounteaDialogueDecorator_SaveNodeAsStart.h b/Source/MounteaDialogueSystem/Public/Decorators/MounteaDialogueDecorator_SaveNodeAsStart.h
@@ -26,7 +26,7 @@ class MOUNTEADIALOGUESYSTEM_API UMounteaDialogueDecorator_SaveNodeAsStart : publ
 	virtual bool IsDecoratorAllowedForGraph_Implementation() const override {  return false;  };
 
 	virtual  FString GetDecoratorDocumentationLink_Implementation() const override
-	{ return TEXT("https://github.com/Mountea-Framework/MounteaDialogueSystem/wiki/Decorator:-Set-Node-as-Start"); }
+	{ return TEXT("https://mountea.tools/docs/DialogueSystem/DialogueDecorators/SetNodeAsStart"); }
 
 private:
 	
diff --git a/Source/MounteaDialogueSystem/Public/Decorators/MounteaDialogueDecorator_SelectRandomDialogueRow.h b/Source/MounteaDialogueSystem/Public/Decorators/MounteaDialogueDecorator_SelectRandomDialogueRow.h
@@ -25,17 +25,17 @@ class MOUNTEADIALOGUESYSTEM_API UMounteaDialogueDecorator_SelectRandomDialogueRo
 	virtual void ExecuteDecorator_Implementation() override;
 
 	virtual  FString GetDecoratorDocumentationLink_Implementation() const override
-	{ return TEXT("https://github.com/Mountea-Framework/MounteaDialogueSystem/wiki/Decorator:-Override-Dialogue-Row-Data"); }
+	{ return TEXT("https://mountea.tools/docs/DialogueSystem/DialogueDecorators/SelectRandomDialogueRow"); }
 
 protected:
 
 	UPROPERTY(SaveGame, Category="Random", EditAnywhere, BlueprintReadOnly, meta=(NoResetToDefault, InlineEditConditionToggle))
-	bool			bUseRange;
+	bool bUseRange;
 
 	/**
 	 * Allows select random number from given Range.
 	 * If range exceeds or is invalid, first valid random index is used.
 	 */
 	UPROPERTY(SaveGame, Category="Random", EditAnywhere, BlueprintReadOnly, meta=(NoResetToDefault, EditCondition="bUseRange"))
-	FIntPoint		RandomRange;
+	FIntPoint RandomRange;
 };
diff --git a/Source/MounteaDialogueSystem/Public/Decorators/MounteaDialogueDecorator_SendCommand.h b/Source/MounteaDialogueSystem/Public/Decorators/MounteaDialogueDecorator_SendCommand.h
@@ -24,7 +24,7 @@ class MOUNTEADIALOGUESYSTEM_API UMounteaDialogueDecorator_SendCommand : public U
 	virtual bool IsDecoratorStackable_Implementation() const override {return true; };
 
 	virtual  FString GetDecoratorDocumentationLink_Implementation() const override
-	{ return TEXT("https://github.com/Mountea-Framework/MounteaDialogueSystem/wiki/Decorator:-Send-Command"); }
+	{ return TEXT("https://mountea.tools/docs/DialogueSystem/DialogueDecorators/SendCommand"); }
 
 protected:
 
diff --git a/Source/MounteaDialogueSystem/Public/Decorators/MounteaIDialogueDecorator_SwapParticipants.h b/Source/MounteaDialogueSystem/Public/Decorators/MounteaIDialogueDecorator_SwapParticipants.h
@@ -26,7 +26,7 @@ class MOUNTEADIALOGUESYSTEM_API UMounteaDialogueDecorator_SwapParticipants : pub
 	virtual void ExecuteDecorator_Implementation() override;
 
 	virtual  FString GetDecoratorDocumentationLink_Implementation() const override
-	{ return TEXT("https://github.com/Mountea-Framework/MounteaDialogueSystem/wiki/Decorator:-Swap-Participants"); }
+	{ return TEXT("https://mountea.tools/docs/DialogueSystem/DialogueDecorators/SwapParticipants"); }
 
 protected:
 
diff --git a/Source/MounteaDialogueSystem/Public/Nodes/MounteaDialogueGraphNode_ReturnToNode.h b/Source/MounteaDialogueSystem/Public/Nodes/MounteaDialogueGraphNode_ReturnToNode.h
@@ -75,48 +75,12 @@ class MOUNTEADIALOGUESYSTEM_API UMounteaDialogueGraphNode_ReturnToNode : public
 	virtual void PostEditChangeProperty(FPropertyChangedEvent& PropertyChangedEvent) override;
 	virtual FText GetDescription_Implementation() const override;
 	virtual FString GetNodeDocumentationLink_Implementation() const override
-	{ return TEXT("https://github.com/Mountea-Framework/MounteaDialogueSystem/wiki/Return-To-Node"); };
+	{ return TEXT("https://mountea.tools/docs/DialogueSystem/DialogueNodes/ReturnToNode/"); };
 
 #endif
 
 private:
 
 	UFUNCTION()
-	TArray<FString> GetRowNames() const
-	{
-		TArray<FString> nodeNames;
-		if (!Graph)
-		{
-			return nodeNames;
-		}
-		for (const auto& Itr : Graph->GetAllNodes())
-		{
-			if (!Itr)
-			{
-				continue;
-			}
-			
-			// Check if this is allowed class
-			bool bIsAllowed = true;
-			for (auto& ItrClass : AllowedNodesFilter)
-			{
-				if (Itr->IsA(ItrClass))
-				{
-					bIsAllowed = false;
-					break;
-				}
-			}
-
-			if (!bIsAllowed)
-			{
-				continue;
-			}
-			
-			// Show only those allowed
-			FString AllowedIndex = FString::FromInt(Graph->AllNodes.Find(Itr));
-			nodeNames.Add(AllowedIndex);
-		}
-
-		return nodeNames;
-	}
+	TArray<FString> GetRowNames() const;
 };
diff --git a/Source/MounteaDialogueSystemEditor/Private/AssetEditor/AssetEditor_MounteaDialogueGraph.cpp b/Source/MounteaDialogueSystemEditor/Private/AssetEditor/AssetEditor_MounteaDialogueGraph.cpp
@@ -247,7 +247,7 @@ FString FAssetEditor_MounteaDialogueGraph::GetWorldCentricTabPrefix() const
 
 FString FAssetEditor_MounteaDialogueGraph::GetDocumentationLink() const
 {
-	return TEXT("https://github.com/Mountea-Framework/MounteaDialogueSystem/wiki/Dialogue-Tree-Editor");
+	return TEXT("https://mountea.tools/docs/dialoguesystem/gettingstarted/createdialogueasset/");
 }
 
 void FAssetEditor_MounteaDialogueGraph::SaveAsset_Execute()
diff --git a/Source/MounteaDialogueSystemEditor/Private/HelpButton/DialogueSystemTutorialPage.cpp b/Source/MounteaDialogueSystemEditor/Private/HelpButton/DialogueSystemTutorialPage.cpp
@@ -96,23 +96,23 @@ If you are feeling lost, you can simply take a look at the <a id="folder" href="
 	FString PlayerPawnTitle = TEXT("Player Pawn");
 	FString PlayerPawnMessage = FString(R"(
 Player Pawn must have <RichTextBlock.BoldHighlight>Dialogue Participant</> component.
-)") + bookEmoji + FString(R"( <a id="browser" href="https://github.com/Mountea-Framework/MounteaDialogueSystem/wiki/Getting-Started#7-dialogue-participant-component-">Wiki setup</> if you need help.
+)") + bookEmoji + FString(R"( <a id="browser" href="https://mountea.tools/docs/dialoguesystem/gettingstarted/setupdialogueparticipant/">Wiki setup</> if you need help.
 )");
 
 	FString HUDClassTitle= TEXT("HUD Class");
 	FString HUDClassMessage = FString(R"(
 HUD Class is very important and Dialogue system is using a custom one! This is to ensure there is a single place that manages all UI elements. 
 Without HUD Class your UI won't show.
 Default HUD Class is <a id="folder" href="/MounteaDialogueSystem/Blueprints/Core">in this folder</>. It comes with code to handle multiple full-screen Widgets at once to ensure proper layering (Dialogue will not overlap over Health etc.).
-)") + graduationEmoji + FString(R"( To learn more join our <a id="browser" href="https://discord.gg/2vXWEEN">free Discord server</>, as this is a fairly <RichTextBlock.BoldHighlight>advanced</> topic.
+)") + graduationEmoji + FString(R"( To learn more join our <a id="browser" href="https://discord.gg/c2WQ658V44">free Discord server</>, as this is a fairly <RichTextBlock.BoldHighlight>advanced</> topic.
 )");
 
 	FString PlayerControllerTitle = TEXT("Player Controller");
 	FString PlayerControllerMessage = FString(R"(
 Default Player Controller Class is <a id="folder" href="/MounteaDialogueSystem/Blueprints/Core">in this folder</>.
 I would strongly suggest using the default one as your parent class!
 For multiplayer purposes, the Player Controller contains <RichTextBlock.BoldHighlight>Dialogue Manager Net Sync</> component.
-)") + graduationEmoji + FString(R"( To learn more join our <a id="browser" href="https://discord.gg/2vXWEEN">free Discord server</>, as this is a fairly <RichTextBlock.BoldHighlight>advanced</> topic.
+)") + graduationEmoji + FString(R"( To learn more join our <a id="browser" href="https://discord.gg/c2WQ658V44">free Discord server</>, as this is a fairly <RichTextBlock.BoldHighlight>advanced</> topic.
 )");
 
 	FString PlayerStateTitle = TEXT("Player State");
@@ -164,7 +164,7 @@ Then simply drag-and-drop to any folder, and Dialogue will be created for you, i
 	FString HaveFunTitle = TEXT("Have Fun!");
 
 	FString HaveFunContent = FString(R"(
-If you need anything, feel free to join <a id="browser" href="https://discord.gg/2vXWEEN">free Discord server</> and read <a id="browser" href="https://github.com/Mountea-Framework/MounteaDialogueSystem/wiki/Getting-Started">online Documentation</>.
+If you need anything, feel free to join <a id="browser" href="https://discord.gg/2vXWEEN">free Discord server</> and read <a id="browser" href="https://mountea.tools/docs/dialoguesystem/gettingstarted/firststeps/">online Documentation</>.
 )");
 	
 	ChildSlot
diff --git a/Source/MounteaDialogueSystemEditor/Private/MounteaDialogueSystemEditor.cpp b/Source/MounteaDialogueSystemEditor/Private/MounteaDialogueSystemEditor.cpp
@@ -574,7 +574,7 @@ void FMounteaDialogueSystemEditor::YoutubeButtonClicked() const
 
 void FMounteaDialogueSystemEditor::WikiButtonClicked() const
 {
-	const FString URL = "https://github.com/Mountea-Framework/MounteaDialogueSystem/wiki/Getting-Started";
+	const FString URL = "https://mountea.tools/docs/dialoguesystem/gettingstarted/firststeps/";
 
 	if (!URL.IsEmpty())
 	{
@@ -584,7 +584,7 @@ void FMounteaDialogueSystemEditor::WikiButtonClicked() const
 
 void FMounteaDialogueSystemEditor::PluginButtonClicked() const
 {
-	const FString URL = "https://discord.gg/2vXWEEN";
+	const FString URL = "https://discord.gg/c2WQ658V44";
 
 	if (!URL.IsEmpty())
 	{

Original file line number	Diff line number	Diff line change
`@@ -217,7 +217,7 @@ FText UMounteaDialogueGraphNode::GetNodeCategory_Implementation() const`
`217`	`217`
`218`	`218`	`FString UMounteaDialogueGraphNode::GetNodeDocumentationLink_Implementation() const`
`219`	`219`	`{`
`220`		`- return TEXT("https://github.com/Mountea-Framework/MounteaDialogueSystem/wiki/Dialogue-Nodes");`
	`220`	`+ return TEXT("https://mountea.tools/docs/DialogueSystem/DialogueNodes/DialogueNode/");`
`221`	`221`	`}`
`222`	`222`
`223`	`223`	`FText UMounteaDialogueGraphNode::GetNodeTooltipText_Implementation() const`
Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ class MOUNTEADIALOGUESYSTEM_API UMounteaDialogueDecoratorBase : public UObject,`
`69`	`69`	`FString GetDecoratorDocumentationLink() const;`
`70`	`70`	`virtual FString GetDecoratorDocumentationLink_Implementation() const`
`71`	`71`	`{`
`72`		`- return TEXT("https://github.com/Mountea-Framework/MounteaDialogueSystem/wiki/Dialogue-Decorators");`
	`72`	`+ return TEXT("https://mountea.tools/docs/DialogueSystem/DialogueDecorators/DialogueDecorator");`
`73`	`73`	`}`
`74`	`74`
`75`	`75`	`public:`