Merge branch '5.2' into 5.3_dev

Author: pavlicekdominik

ActorInteractionPlugin.uplugin

@@ -1,7 +1,7 @@
 {
 	"FileVersion": 3,
 	"Version": 4,
-	"VersionName": "4.2.3.53",
+	"VersionName": "4.2.4.52",
 	"FriendlyName": "Mountea Interaction System",
 	"Description": "Mountea Interaction System is an Open-source Mountea Framework components-based simple framework providing utilities for smart Actor Interaction with other Actors.\nDeveloped with Game Developers in mind to allow as easy as possible implementation while maintaining high scalability and diverse options to tweak everything.",
 	"Category": "Mountea Framework",
@@ -10,10 +10,8 @@
 	"DocsURL": "https://github.com/Mountea-Framework/MounteaInteractionSystem/wiki",
 	"MarketplaceURL": "com.epicgames.launcher://ue/marketplace/product/ca842c00ec0d4db0b3aad17701e1637b",
 	"SupportURL": "https://bit.ly/DominikPavlicek_SupportServer",
-	"EngineVersion": "5.3.0",
+	"EngineVersion": "5.1.0",
 	"CanContainContent": true,
-	"IsBetaVersion": false,
-	"IsExperimentalVersion": false,
 	"Installed": true,
 	"Modules": [
 		{

CHANGELOG.md

@@ -1,10 +1,38 @@
-Current Version: 4.0.0.52
+Current Version: 4.2.3.52
 
 # Changelog
 
 All notable changes to this project will be documented in this file.
 
-** Version 4.0.2 **
+** Version 4.2.3 **
+### Added 
+> - Toolbar Tutorial button
+
+### Changed
+> - Ribbon Button to Guide Player
+> - - Design now matches `Dialogue System`
+> - Emoji for Content Browser menu
+
+### Fixed
+> - Compilation errors for `HighlightableComponents`
+> - Conflicting `PrintLog` functions with other systems
+> - `SetLifecycleCount` can set count to -1
+> - `SetCooldownPeriod` now really sets Cooldown period
+> - Editor crash for `InteractableBase`
+
+** Version 4.2.1 **
+### Added 
+> - Support for **5.5**
+
+### Changed
+> - Ribbon Button to Guide Player
+> - - Design now matches `Dialogue System`
+> - Events in `Interactor` are now re-arranged to logical order
+
+### Fixed
+> - 
+
+** Version 4.2.0 **
 ### Added 
 > - Auto Gameplay Tags download
 > - - This way default Gameplay Tags will always be present

Resources/FolderIcon.png

@@ -55,7 +55,16 @@ void UActorInteractableComponentMash::OnInteractionCompletedCallback()
 		if (Execute_TriggerCooldown(this)) return;
 	}
 
-	OnInteractionCompleted.Broadcast(GetWorld()->GetTimeSeconds(), Execute_GetInteractor(this));
+	if (ActualMashAmount >= MinMashAmountRequired)
+	{
+		OnInteractionCompleted.Broadcast(GetWorld()->GetTimeSeconds(), Execute_GetInteractor(this));
+	}
+	else
+	{
+		OnInteractionFailed.Broadcast();
+	}
+
+	CleanupComponent();
 }
 
 void UActorInteractableComponentMash::CleanupComponent()
@@ -133,20 +142,6 @@ void UActorInteractableComponentMash::InteractionCanceled_Implementation()
 	CleanupComponent();
 }
 
-void UActorInteractableComponentMash::InteractionCompleted_Implementation(const float& TimeCompleted, const TScriptInterface<IActorInteractorInterface>& CausingInteractor)
-{
-	if (ActualMashAmount >= MinMashAmountRequired)
-	{
-		Super::InteractionCompleted_Implementation(TimeCompleted, CausingInteractor);
-	}
-	else
-	{
-		OnInteractionFailed.Broadcast();
-	}
-
-	CleanupComponent();
-}
-
 int32 UActorInteractableComponentMash::GetMinMashAmountRequired() const
 { return MinMashAmountRequired; }
 

Resources/LevelIcon.png

@@ -249,4 +249,11 @@ bool UMounteaInteractionSystemBFL::IsInputKeyPairSupported(APlayerController* Pl
 	}
 
 	return false;
-}
+}
+
+ENetRole UMounteaInteractionSystemBFL::GetOwnerLocalRole(const AActor* ForActor)
+{
+	if (!IsValid(ForActor))
+		return ROLE_None;
+	return ForActor->GetLocalRole();
+}

Source/ActorInteractionPlugin/Private/Components/Interactable/ActorInteractableComponentMash.cpp

@@ -36,7 +36,6 @@ class ACTORINTERACTIONPLUGIN_API UActorInteractableComponentMash : public UActor
 	virtual void InteractionStarted_Implementation(const float& TimeStarted, const TScriptInterface<IActorInteractorInterface>& CausingInteractor) override;
 	virtual void InteractionStopped_Implementation(const float& TimeStarted, const TScriptInterface<IActorInteractorInterface>& CausingInteractor) override;
 	virtual void InteractionCanceled_Implementation() override;
-	virtual void InteractionCompleted_Implementation(const float& TimeCompleted, const TScriptInterface<IActorInteractorInterface>& CausingInteractor) override;
 
 protected:
 

Source/ActorInteractionPlugin/Private/Helpers/MounteaInteractionSystemBFL.cpp

@@ -89,4 +89,7 @@ class ACTORINTERACTIONPLUGIN_API UMounteaInteractionSystemBFL : public UBlueprin
 
 	UFUNCTION(BlueprintCallable, BlueprintPure, Category="Mountea|Interaction|Helpers")
 	static bool IsInputKeyPairSupported(class APlayerController* PlayerController, const FKey& InputKey, const FString& HardwareDeviceID, TSoftObjectPtr<class UTexture2D>& FoundInputTexture);
+
+	UFUNCTION(BlueprintCallable, BlueprintPure, Category="Mountea|Interaction|Helpers")
+	static ENetRole GetOwnerLocalRole(const AActor* ForActor);
 };

Source/ActorInteractionPlugin/Public/Components/Interactable/ActorInteractableComponentMash.h

@@ -13,8 +13,11 @@
 #include "AssetActions/InteractableComponentAssetActions.h"
 
 #include "AssetToolsModule.h"
+#include "ContentBrowserModule.h"
+#include "FileHelpers.h"
 #include "GameplayTagsManager.h"
 #include "HttpModule.h"
+#include "IContentBrowserSingleton.h"
 #include "HelpButton/AIntPCommands.h"
 #include "HelpButton/AIntPHelpStyle.h"
 #include "Kismet2/KismetEditorUtilities.h"
@@ -28,6 +31,7 @@
 #include "WorkspaceMenuStructure.h"
 #include "WorkspaceMenuStructureModule.h"
 #include "HelpButton/InteractionSystemTutorialPage.h"
+#include "Helpers/MounteaInteractionSystemEditorLog.h"
 #include "Interfaces/IHttpResponse.h"
 
 #include "Interfaces/IMainFrameModule.h"
@@ -36,7 +40,7 @@
 
 DEFINE_LOG_CATEGORY(ActorInteractionPluginEditor);
 
-const FString ChangelogURL = FString("https://raw.githubusercontent.com/Mountea-Framework/MounteaInteractionSystem/5.1/CHANGELOG.md");
+const FString ChangelogURL = FString("https://raw.githubusercontent.com/Mountea-Framework/MounteaInteractionSystem/master/CHANGELOG.md");
 
 #define LOCTEXT_NAMESPACE "FActorInteractionPluginEditor"
 
@@ -519,13 +523,43 @@ TSharedRef<SWidget> FActorInteractionPluginEditor::MakeMounteaMenuWidget() const
 		FSlateIcon(FAIntPHelpStyle::GetStyleSetName(), "AIntPStyleSet.Tutorial"),
 		FUIAction(
 			FExecuteAction::CreateRaw(this, &FActorInteractionPluginEditor::TutorialButtonClicked)
-	)
-);
+			)
+		);
+		
+		MenuBuilder.AddMenuEntry(
+        		LOCTEXT("MounteaSystemEditor_OpenExampleLevel_Label", "Open Example Level"),
+        		LOCTEXT("MounteaSystemEditor_OpenExampleLevel_ToolTip", "🌄 Opens an example level demonstrating Mountea Interaction System"),
+        		FSlateIcon(FAIntPHelpStyle::GetStyleSetName(), "AIntPStyleSet.Level"),
+        		FUIAction(
+        			FExecuteAction::CreateLambda([]()
+        			{
+        				const FString mapPath = TEXT("/ActorInteractionPlugin/Example/M_Example");
+						if (FPackageName::DoesPackageExist(mapPath))
+							FEditorFileUtils::LoadMap(mapPath, false, true);
+        				else
+        					EDITOR_LOG_ERROR(TEXT("Example map not found at:\nContent/Mountea/Maps/ExampleMap.umap"))
+        			})
+        		)
+        	);
 
+		MenuBuilder.AddMenuEntry(
+			LOCTEXT("MounteaSystemEditor_OpenPluginFolder_Label", "Open Plugin Folder"),
+			LOCTEXT("MounteaSystemEditor_OpenPluginFolder_ToolTip", "📂 Open the Mountea plugin's folder on disk"),
+			FSlateIcon(FAIntPHelpStyle::GetStyleSetName(), "AIntPStyleSet.Folder"),
+			FUIAction(
+				FExecuteAction::CreateLambda([]()
+				{
+					const FContentBrowserModule& contentBrowserModule = FModuleManager::LoadModuleChecked<FContentBrowserModule>("ContentBrowser");
+					TArray<FString> folderPaths;
+					folderPaths.Add(TEXT("/ActorInteractionPlugin"));
+					contentBrowserModule.Get().SetSelectedPaths(folderPaths, true);
+				})
+			)
+		);
 	};
 	MenuBuilder.EndSection();
 
-	MenuBuilder.BeginSection("MounteaMenu_Tools", LOCTEXT("MounteaMenuOptions_Settings", "Mountea Interaction Settings"));
+	MenuBuilder.BeginSection("MounteaMenu_Settings", LOCTEXT("MounteaMenuOptions_Settings", "Mountea Interaction Settings"));
 	{
 		MenuBuilder.AddMenuEntry(
 			LOCTEXT("MounteaSystemEditor_SettingsButton_Label", "Mountea Interaction Settings"),

Source/ActorInteractionPlugin/Public/Helpers/MounteaInteractionSystemBFL.h

@@ -88,6 +88,9 @@ TSharedRef<FSlateStyleSet> FAIntPHelpStyle::Create()
 	Style->Set("AIntPStyleSet.Icon.MoneyIcon", new IMAGE_BRUSH(TEXT("MoneyIcon"), Icon16x16));
 
 	Style->Set("AIntPStyleSet.Tutorial", new IMAGE_BRUSH(TEXT("tutorialPage_icon"), Icon40x40));
+
+	Style->Set("AIntPStyleSet.Level", new IMAGE_BRUSH(TEXT("LevelIcon"), Icon40x40));
+	Style->Set("AIntPStyleSet.Folder", new IMAGE_BRUSH(TEXT("FolderIcon"), Icon40x40));
 	return Style;
 }