Merge branch '5.3_dev' into 5.3

pavlicekdominik · pavlicekdominik · commit 80a9fb76e9c4 · 2025-06-23T12:06:07.000+02:00
diff --git a/MounteaDialogueSystem.uplugin b/MounteaDialogueSystem.uplugin
@@ -1,7 +1,7 @@
 {
 	"FileVersion": 3,
 	"Version": 3,
-	"VersionName": "3.0.2.53",
+	"VersionName": "3.0.3.53",
 	"FriendlyName": "Mountea Dialogue System",
 	"Description": "Mountea Dialogue System is an Open-source Mountea Framework tool for Unreal Engine for creating (not just) complex dialogues!\nProvides its own Dialogue Tree editor and validation system.",
 	"Category": "Mountea Framework",
@@ -44,5 +44,11 @@
 				"Win64"
 			]
 		}
+	],
+	"Plugins": [
+		{
+			"Name": "CommonUI",
+			"Enabled": true
+		}
 	]
-}
+}
diff --git a/Resources/FolderIcon.png b/Resources/FolderIcon.png
diff --git a/Resources/LevelIcon.png b/Resources/LevelIcon.png
diff --git a/Resources/configIcon.png b/Resources/configIcon.png
diff --git a/Source/MounteaDialogueSystem/Private/Components/MounteaDialogueManager.cpp b/Source/MounteaDialogueSystem/Private/Components/MounteaDialogueManager.cpp
@@ -814,7 +814,7 @@ void UMounteaDialogueManager::NodePrepared_Implementation()
 
 void UMounteaDialogueManager::ProcessNode_Implementation()
 {
-	if (DialogueContext && DialogueContext->ActiveNode)
+	if (DialogueContext && DialogueContext->ActiveNode && DialogueContext->ActiveDialogueParticipant.GetObject())
 	{
 		DialogueContext->ActiveNode->ProcessNode(this);
 
@@ -824,7 +824,7 @@ void UMounteaDialogueManager::ProcessNode_Implementation()
 		Execute_ProcessDialogueRow(this);
 	}
 	else
-		OnDialogueFailed.Broadcast(TEXT("[Process Node] Invalid Context or Active Node!"));
+		OnDialogueFailed.Broadcast(TEXT("[Process Node] Invalid Context or Active Node or Active Dialogue Participant!"));
 }
 
 void UMounteaDialogueManager::NodeProcessed_Implementation()
diff --git a/Source/MounteaDialogueSystem/Public/Interfaces/Core/MounteaDialogueParticipantInterface.h b/Source/MounteaDialogueSystem/Public/Interfaces/Core/MounteaDialogueParticipantInterface.h
@@ -56,7 +56,7 @@ struct FDialogueTraversePath
 	UPROPERTY(VisibleAnywhere, BlueprintReadOnly, Category="Mountea|Dialogue|TraversePath", meta=(IgnoreForMemberInitializationTest))
 	FGuid NodeGuid;
 
-	UPROPERTY(VisibleAnywhere, BlueprintReadOnly, Category="Mountea|Dialogue|TraversePath")
+	UPROPERTY(VisibleAnywhere, BlueprintReadOnly, Category="Mountea|Dialogue|TraversePath", meta=(IgnoreForMemberInitializationTest))
 	FGuid GraphGuid;
 
 	UPROPERTY(VisibleAnywhere, BlueprintReadOnly, Category="Mountea|Dialogue|TraversePath")
diff --git a/Source/MounteaDialogueSystemEditor/Private/EditorStyle/FMounteaDialogueGraphEditorStyle.cpp b/Source/MounteaDialogueSystemEditor/Private/EditorStyle/FMounteaDialogueGraphEditorStyle.cpp
@@ -161,9 +161,13 @@ void FMounteaDialogueGraphEditorStyle::Create()
 	StyleSet->Set("MDSStyleSet.Settings.Small", new IMAGE_BRUSH(TEXT("settings_icon"), Icon16x16));
 	StyleSet->Set("MDSStyleSet.Settings.large", new IMAGE_BRUSH(TEXT("settings_icon"), Icon64x64));
 
+	StyleSet->Set("MDSStyleSet.Config", new IMAGE_BRUSH(TEXT("configIcon"), Icon40x40));
+
 	StyleSet->Set("MDSStyleSet.DialogueSystemIcon", new IMAGE_BRUSH(TEXT("DialogueSystem_Icon"), Icon16x16));
 
 	StyleSet->Set("MDSStyleSet.Tutorial", new IMAGE_BRUSH(TEXT("tutorialPage_icon"), Icon16x16));
+	StyleSet->Set("MDSStyleSet.Folder", new IMAGE_BRUSH(TEXT("FolderIcon"), Icon40x40));
+	StyleSet->Set("MDSStyleSet.Level", new IMAGE_BRUSH(TEXT("LevelIcon"), Icon40x40));
 
 	const FButtonStyle MounteaButtonStyle = FButtonStyle()
 		.SetNormal(BOX_BRUSH("RoundedSelection_16x", 4.0f / 16.0f, FLinearColor(1, 1, 1, 0.1f)))
diff --git a/Source/MounteaDialogueSystemEditor/Private/MounteaDialogueSystemEditor.cpp b/Source/MounteaDialogueSystemEditor/Private/MounteaDialogueSystemEditor.cpp
@@ -4,8 +4,10 @@
 
 #include "AssetToolsModule.h"
 #include "ContentBrowserModule.h"
+#include "FileHelpers.h"
 #include "GameplayTagsManager.h"
 #include "HttpModule.h"
+#include "IContentBrowserSingleton.h"
 #include "ISettingsModule.h"
 
 #include "AssetActions/MounteaDialogueAdditionalDataAssetAction.h"
@@ -43,6 +45,7 @@
 #include "ImportConfig/MounteaDialogueImportConfig.h"
 #include "Interfaces/IMainFrameModule.h"
 #include "Settings/MounteaDialogueGraphEditorSettings.h"
+#include "Settings/MounteaDialogueSystemSettings.h"
 
 const FString ChangelogURL = FString("https://raw.githubusercontent.com/Mountea-Framework/MounteaDialogueSystem/master/CHANGELOG.md");
 
@@ -793,6 +796,19 @@ void FMounteaDialogueSystemEditor::EditorSettingsButtonClicked() const
 	FModuleManager::LoadModuleChecked<ISettingsModule>("Settings").ShowViewer("Project",  TEXT("Mountea Framework"), TEXT("Mountea Dialogue System (Editor)"));
 }
 
+void FMounteaDialogueSystemEditor::ConfigButtonClicked() const
+{
+	auto settings = GetMutableDefault<UMounteaDialogueSystemSettings>();
+	auto config = settings ? settings->GetDialogueConfiguration().LoadSynchronous() : nullptr;
+	if (!IsValid(config))
+	{
+		FMessageDialog::Open(EAppMsgType::Ok, FText::FromString(TEXT("Unable to locate the Mountea Dialogue Config asset.\nPlease, open Mountea Dialogue Settings and select proper Config!")));
+		return;
+	}
+
+	GEditor->GetEditorSubsystem<UAssetEditorSubsystem>()->OpenEditorForAsset(config->GetPathName());
+}
+
 TSharedRef<SWidget> FMounteaDialogueSystemEditor::MakeMounteaMenuWidget() const
 {
 	FMenuBuilder MenuBuilder(true, PluginCommands);
@@ -807,11 +823,51 @@ TSharedRef<SWidget> FMounteaDialogueSystemEditor::MakeMounteaMenuWidget() const
 			FExecuteAction::CreateRaw(this, &FMounteaDialogueSystemEditor::TutorialButtonClicked)
 			)
 		);
+
+		MenuBuilder.AddMenuEntry(
+				LOCTEXT("MounteaSystemEditor_OpenExampleLevel_Label", "Open Example Level"),
+				LOCTEXT("MounteaSystemEditor_OpenExampleLevel_ToolTip", "🌄 Opens an example level demonstrating Mountea Dialogue System"),
+				FSlateIcon(FMounteaDialogueGraphEditorStyle::GetAppStyleSetName(), "MDSStyleSet.Level"),
+				FUIAction(
+					FExecuteAction::CreateLambda([]()
+					{
+						const FString mapPath = TEXT("/MounteaDialogueSystem/Example/M_DialogueExample");
+						if (FPackageName::DoesPackageExist(mapPath))
+							FEditorFileUtils::LoadMap(mapPath, false, true);
+						else
+							EditorLOG_ERROR(TEXT("Example map not found at:\nContent/Mountea/Maps/M_DialogueExample.umap"))
+					})
+				)
+			);
+
+		MenuBuilder.AddMenuEntry(
+			LOCTEXT("MounteaSystemEditor_OpenPluginFolder_Label", "Open Plugin Folder"),
+			LOCTEXT("MounteaSystemEditor_OpenPluginFolder_ToolTip", "📂 Open the Mountea Dialogue plugin's folder"),
+			FSlateIcon(FMounteaDialogueGraphEditorStyle::GetAppStyleSetName(), "MDSStyleSet.Folder"),
+			FUIAction(
+				FExecuteAction::CreateLambda([]()
+				{
+					const FContentBrowserModule& contentBrowserModule = FModuleManager::LoadModuleChecked<FContentBrowserModule>("ContentBrowser");
+					TArray<FString> folderPaths;
+					folderPaths.Add(TEXT("/MounteaDialogueSystem"));
+					contentBrowserModule.Get().SetSelectedPaths(folderPaths, true);
+				})
+			)
+		);
 	};
 	MenuBuilder.EndSection();
 
 	MenuBuilder.BeginSection("MounteaMenu_Tools", LOCTEXT("MounteaMenuOptions_Settings", "Mountea Dialogue Settings"));
 	{
+		MenuBuilder.AddMenuEntry(
+			LOCTEXT("MounteaSystemEditor_ConfigButton_Label", "Mountea Dialogue Config"),
+			LOCTEXT("MounteaSystemEditor_ConfigButton_ToolTip", "📄 Open Mountea Dialogue Configuration\n\n❔ Define dialogue UI, subtitles and important settings behaviors used by the core system."),
+			FSlateIcon(FMounteaDialogueGraphEditorStyle::GetAppStyleSetName(), "MDSStyleSet.Config"),
+			FUIAction(
+				FExecuteAction::CreateRaw(this, &FMounteaDialogueSystemEditor::ConfigButtonClicked)
+			)
+		);
+		
 		MenuBuilder.AddMenuEntry(
 			LOCTEXT("MounteaSystemEditor_SettingsButton_Label", "Mountea Dialogue Settings"),
 			LOCTEXT("MounteaSystemEditor_SettingsButton_ToolTip", "⚙ Open Mountea Dialogue Settings\n\n❔ Configure core dialogue system settings including default behaviors, performance options, and dialogue flow parameters. Customize your dialogue system's foundation here."),
diff --git a/Source/MounteaDialogueSystemEditor/Private/Popups/MDSPopup.cpp b/Source/MounteaDialogueSystemEditor/Private/Popups/MDSPopup.cpp
@@ -137,6 +137,23 @@ FPluginVersion MDSPopup::GetPluginVersion()
 	return FPluginVersion(Version, VersionName);
 }
 
+bool MDSPopup::IsVersionGreater(const FString& NewVersion, const FString& OldVersion)
+{
+	TArray<FString> NewParts, OldParts;
+	NewVersion.ParseIntoArray(NewParts, TEXT("."), true);
+	OldVersion.ParseIntoArray(OldParts, TEXT("."), true);
+	while (NewParts.Num() < 4) NewParts.Add(TEXT("0"));
+	while (OldParts.Num() < 4) OldParts.Add(TEXT("0"));
+	for (int32 i = 0; i < 4; ++i)
+	{
+		int32 NewNum = FCString::Atoi(*NewParts[i]);
+		int32 OldNum = FCString::Atoi(*OldParts[i]);
+		if (NewNum > OldNum) return true;
+		if (NewNum < OldNum) return false;
+	}
+	return false;
+}
+
 void MDSPopup::Register(const FString& Changelog)
 {
 	const FString PluginDirectory = IPluginManager::Get().FindPlugin(TEXT("MounteaDialogueSystem"))->GetBaseDir();
@@ -163,7 +180,7 @@ void MDSPopup::Register(const FString& Changelog)
 		CurrentPluginVersion = ChangelogVersion;
 	}
 
-	if (MDSPopupConfig->PluginVersionUpdate != CurrentPluginVersion)
+	if (IsVersionGreater(CurrentPluginVersion, MDSPopupConfig->PluginVersionUpdate))
 	{
 		MDSPopupConfig->PluginVersionUpdate = CurrentPluginVersion;
 		MDSPopupConfig->SaveConfig(CPF_Config, *NormalizedConfigFilePath);
diff --git a/Source/MounteaDialogueSystemEditor/Private/Popups/MDSPopup.h b/Source/MounteaDialogueSystemEditor/Private/Popups/MDSPopup.h
@@ -23,4 +23,5 @@ class MDSPopup
 	static void	FormatTextWithTags(FString& SourceText, const FString& StartMarker, const FString& EndMarker, const FString& StartTag, const FString& EndTag);
 
 	static FPluginVersion GetPluginVersion();
+	static bool IsVersionGreater(const FString& NewVersion, const FString& OldVersion);
 };
diff --git a/Source/MounteaDialogueSystemEditor/Public/MounteaDialogueSystemEditor.h b/Source/MounteaDialogueSystemEditor/Public/MounteaDialogueSystemEditor.h
@@ -60,6 +60,7 @@ class FMounteaDialogueSystemEditor : public IModuleInterface
 	void RegisterMenus();
 	void SettingsButtonClicked() const;
 	void EditorSettingsButtonClicked() const;
+	void ConfigButtonClicked() const;
 	TSharedRef<SWidget> MakeMounteaMenuWidget() const;
 
 protected:
@@ -84,7 +85,6 @@ class FMounteaDialogueSystemEditor : public IModuleInterface
 	TSharedPtr<struct FGraphPanelNodeFactory> GraphPanelNodeFactory_MounteaDialogueGraph;
 	TArray< TSharedPtr<IAssetTypeActions> > CreatedAssetTypeActions;
 
-	EAssetTypeCategories::Type MounteaDialogueGraphAssetCategoryBit;
 	FHttpModule* Http = nullptr;
 
 	TArray<FName> RegisteredCustomClassLayouts;

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"FileVersion": 3,`
`3`	`3`	`"Version": 3,`
`4`		`- "VersionName": "3.0.2.53",`
	`4`	`+ "VersionName": "3.0.3.53",`
`5`	`5`	`"FriendlyName": "Mountea Dialogue System",`
`6`	`6`	`"Description": "Mountea Dialogue System is an Open-source Mountea Framework tool for Unreal Engine for creating (not just) complex dialogues!\nProvides its own Dialogue Tree editor and validation system.",`
`7`	`7`	`"Category": "Mountea Framework",`
`@@ -44,5 +44,11 @@`
`44`	`44`	`"Win64"`
`45`	`45`	`]`
`46`	`46`	`}`
	`47`	`+ ],`
	`48`	`+ "Plugins": [`
	`49`	`+ {`
	`50`	`+ "Name": "CommonUI",`
	`51`	`+ "Enabled": true`
	`52`	`+ }`
`47`	`53`	`]`
`48`		`-}`
	`54`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -814,7 +814,7 @@ void UMounteaDialogueManager::NodePrepared_Implementation()`
`814`	`814`
`815`	`815`	`void UMounteaDialogueManager::ProcessNode_Implementation()`
`816`	`816`	`{`
`817`		`- if (DialogueContext && DialogueContext->ActiveNode)`
	`817`	`+ if (DialogueContext && DialogueContext->ActiveNode && DialogueContext->ActiveDialogueParticipant.GetObject())`
`818`	`818`	`{`
`819`	`819`	`DialogueContext->ActiveNode->ProcessNode(this);`
`820`	`820`
`@@ -824,7 +824,7 @@ void UMounteaDialogueManager::ProcessNode_Implementation()`
`824`	`824`	`Execute_ProcessDialogueRow(this);`
`825`	`825`	`}`
`826`	`826`	`else`
`827`		`- OnDialogueFailed.Broadcast(TEXT("[Process Node] Invalid Context or Active Node!"));`
	`827`	`+ OnDialogueFailed.Broadcast(TEXT("[Process Node] Invalid Context or Active Node or Active Dialogue Participant!"));`
`828`	`828`	`}`
`829`	`829`
`830`	`830`	`void UMounteaDialogueManager::NodeProcessed_Implementation()`