Merge branch '5.4' into 5.5_dev

Author: pavlicekdominik

.gitignore

@@ -79,3 +79,4 @@ DerivedDataCache/*
 .idea/*
 Config/UpdateConfig.ini
 *.zip
+*.png~

Resources/tutorialPage_icon.png

@@ -972,7 +972,7 @@ void UActorInteractableComponentBase::SetLifecycleCount_Implementation(const int
 	switch (LifecycleMode)
 	{
 		case EInteractableLifecycle::EIL_Cycled:
-			if (NewLifecycleCount < -1)
+			if (NewLifecycleCount <= -1)
 			{
 				LifecycleCount = -1;
 				OnLifecycleCountChanged.Broadcast(LifecycleCount);
@@ -1005,8 +1005,8 @@ void UActorInteractableComponentBase::SetCooldownPeriod_Implementation(const flo
 	switch (LifecycleMode)
 	{
 		case EInteractableLifecycle::EIL_Cycled:
-			LifecycleCount = FMath::Max(0.1f, NewCooldownPeriod);
-			OnLifecycleCountChanged.Broadcast(LifecycleCount);
+			CooldownPeriod = FMath::Max(0.1f, NewCooldownPeriod);
+			OnCooldownPeriodChanged.Broadcast(CooldownPeriod);
 			break;
 		case EInteractableLifecycle::EIL_OnlyOnce:
 		case EInteractableLifecycle::Default:
@@ -2090,7 +2090,7 @@ void UActorInteractableComponentBase::ProcessStartHighlight()
 	{
 		case EHighlightType::EHT_PostProcessing:
 			{
-				for (const auto Itr : HighlightableComponents)
+				for (const auto& Itr : HighlightableComponents)
 				{
 					Itr->SetRenderCustomDepth(bInteractionHighlight);
 					Itr->SetCustomDepthStencilValue(StencilID);
@@ -2099,7 +2099,7 @@ void UActorInteractableComponentBase::ProcessStartHighlight()
 			break;
 		case EHighlightType::EHT_OverlayMaterial:
 			{
-				for (const auto Itr : HighlightableComponents)
+				for (const auto& Itr : HighlightableComponents)
 				{
 					Itr->SetOverlayMaterial(HighlightMaterial);
 				}
@@ -2117,15 +2117,15 @@ void UActorInteractableComponentBase::ProcessStopHighlight()
 	{
 		case EHighlightType::EHT_PostProcessing:
 			{
-				for (const auto Itr : HighlightableComponents)
+				for (const auto& Itr : HighlightableComponents)
 				{
 					Itr->SetCustomDepthStencilValue(0);
 				}
 			}
 			break;
 		case EHighlightType::EHT_OverlayMaterial:
 			{
-				for (const auto Itr : HighlightableComponents)
+				for (const auto& Itr : HighlightableComponents)
 				{
 					Itr->SetOverlayMaterial(nullptr);
 				}
@@ -2219,6 +2219,8 @@ void UActorInteractableComponentBase::ResetDefaults()
 
 void UActorInteractableComponentBase::PostEditChangeChainProperty(FPropertyChangedChainEvent& PropertyChangedEvent)
 {
+	Super::PostEditChangeChainProperty(PropertyChangedEvent);
+	
 	const FName PropertyName = (PropertyChangedEvent.MemberProperty != nullptr) ? PropertyChangedEvent.GetPropertyName() : NAME_None;
 
 	FString interactableName = GetName();

Resources/youtube_icon.png

@@ -10,7 +10,7 @@
 // Log category definition
 DEFINE_LOG_CATEGORY(LogActorInteraction);
 
-void PrintLog(const ELogVerbosity::Type Verbosity, const FString& Message, FLinearColor Color, float Duration)
+void PrintInteractionLog(const ELogVerbosity::Type Verbosity, const FString& Message, FLinearColor Color, float Duration)
 {
 	if (!GWorld) return;
 

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

@@ -8,23 +8,23 @@
 ACTORINTERACTIONPLUGIN_API DECLARE_LOG_CATEGORY_EXTERN(LogActorInteraction, Display, All);
 
 // Forward declaration of the logging function
-void PrintLog(const ELogVerbosity::Type Verbosity, const FString& Message, FLinearColor Color, float Duration);
+void PrintInteractionLog(const ELogVerbosity::Type Verbosity, const FString& Message, FLinearColor Color, float Duration);
 
 // Logging macro definitions
 #define LOG_INFO(Format, ...) \
 { \
 FString FormattedMessage = FString::Printf(Format, ##__VA_ARGS__); \
-PrintLog(ELogVerbosity::Log, FormattedMessage, FLinearColor(0.0f, 1.0f, 0.0f), 5.0f); \
+PrintInteractionLog(ELogVerbosity::Log, FormattedMessage, FLinearColor(0.0f, 1.0f, 0.0f), 5.0f); \
 }
 
 #define LOG_WARNING(Format, ...) \
 { \
 FString FormattedMessage = FString::Printf(Format, ##__VA_ARGS__); \
-PrintLog(ELogVerbosity::Warning, FormattedMessage, FLinearColor(1.0f, 1.0f, 0.0f), 10.0f); \
+PrintInteractionLog(ELogVerbosity::Warning, FormattedMessage, FLinearColor(1.0f, 1.0f, 0.0f), 10.0f); \
 }
 
 #define LOG_ERROR(Format, ...) \
 { \
 FString FormattedMessage = FString::Printf(Format, ##__VA_ARGS__); \
-PrintLog(ELogVerbosity::Error, FormattedMessage, FLinearColor(1.0f, 0.0f, 0.0f), 15.0f); \
+PrintInteractionLog(ELogVerbosity::Error, FormattedMessage, FLinearColor(1.0f, 0.0f, 0.0f), 15.0f); \
 }

Source/ActorInteractionPlugin/Public/Helpers/ActorInteractionPluginLog.cpp

@@ -61,7 +61,9 @@ public ActorInteractionPluginEditor(ReadOnlyTargetRules Target) : base(Target)
 
 				"UMG",
 
-				"GameplayTags"
+				"GameplayTags", 
+				
+				"WorkspaceMenuStructure"
 			}
 		);
 

Source/ActorInteractionPlugin/Public/Helpers/ActorInteractionPluginLog.h

@@ -25,6 +25,9 @@
 #include "AssetActions/InteractionSettingsConfig.h"
 #include "DetailsPanel/MounteaInteractableBase_DetailsPanel.h"
 #include "ISettingsModule.h"
+#include "WorkspaceMenuStructure.h"
+#include "WorkspaceMenuStructureModule.h"
+#include "HelpButton/InteractionSystemTutorialPage.h"
 #include "Interfaces/IHttpResponse.h"
 
 #include "Interfaces/IMainFrameModule.h"
@@ -50,7 +53,7 @@ void FActorInteractionPluginEditor::StartupModule()
 
 	// Register Category
 	{
-		FAssetToolsModule::GetModule().Get().RegisterAdvancedAssetCategory(FName("MounteaInteraction"), FText::FromString(TEXT("\U0001F539 Mountea Interaction")));
+		FAssetToolsModule::GetModule().Get().RegisterAdvancedAssetCategory(FName("MounteaInteraction"), FText::FromString(TEXT("👉🏻 Mountea Interaction")));
 	}
 
 	// Thumbnails and Icons
@@ -180,6 +183,11 @@ void FActorInteractionPluginEditor::StartupModule()
 
 		UToolMenus::RegisterStartupCallback(FSimpleMulticastDelegate::FDelegate::CreateRaw(this, &FActorInteractionPluginEditor::RegisterMenus));
 	}
+
+	// Register Tab Spawner
+	{
+		RegisterTabSpawners(FGlobalTabmanager::Get());
+	}
 }
 
 void FActorInteractionPluginEditor::ShutdownModule()
@@ -421,6 +429,31 @@ void FActorInteractionPluginEditor::LauncherButtonClicked() const
 	}
 }
 
+void FActorInteractionPluginEditor::RegisterTabSpawners(const TSharedRef<FTabManager>& TabManager)
+{
+	TabManager->RegisterTabSpawner("InteractionSystemTutorial", 
+		FOnSpawnTab::CreateRaw(this, &FActorInteractionPluginEditor::OnSpawnInteractionSystemTutorialTab))
+		.SetDisplayName(FText::FromString("Interaction System Tutorial"))
+		.SetTooltipText(FText::FromString("Learn about the Mountea Interaction System"))
+		.SetGroup(WorkspaceMenu::GetMenuStructure().GetDeveloperToolsMiscCategory())
+		.SetIcon(FSlateIcon(FAppStyle::GetAppStyleSetName(), "InputBindingEditor.OutputLog"));
+}
+
+TSharedRef<SDockTab> FActorInteractionPluginEditor::OnSpawnInteractionSystemTutorialTab(const FSpawnTabArgs& SpawnTabArgs)
+{
+	return SNew(SDockTab)
+		.TabRole(ETabRole::NomadTab)
+		.Label(FText::FromString("Interaction System Tutorial"))
+		[
+			SNew(SInteractionSystemTutorialPage)
+		];
+}
+
+void FActorInteractionPluginEditor::TutorialButtonClicked() const
+{
+	FGlobalTabmanager::Get()->TryInvokeTab(FName("InteractionSystemTutorial"));
+}
+
 void FActorInteractionPluginEditor::RegisterMenus()
 {
 	// Owner will be used for cleanup in call to UToolMenus::UnregisterOwner
@@ -478,6 +511,20 @@ void FActorInteractionPluginEditor::RegisterMenus()
 TSharedRef<SWidget> FActorInteractionPluginEditor::MakeMounteaMenuWidget() const
 {
 	FMenuBuilder MenuBuilder(true, PluginCommands);
+	MenuBuilder.BeginSection("MounteaMenu_Tools", LOCTEXT("MounteaMenuOptions_Tutorial", "Mountea Interaction Tutorial"));
+	{
+		MenuBuilder.AddMenuEntry(
+		LOCTEXT("MounteaSystemEditor_TutorialButton_Label", "Interaction System Tutorial"),
+		LOCTEXT("MounteaSystemEditor_TutorialButton_ToolTip", "📖 Open the Mountea Interaction System Tutorial"),
+		FSlateIcon(FAIntPHelpStyle::GetStyleSetName(), "AIntPStyleSet.Tutorial"),
+		FUIAction(
+			FExecuteAction::CreateRaw(this, &FActorInteractionPluginEditor::TutorialButtonClicked)
+	)
+);
+
+	};
+	MenuBuilder.EndSection();
+	
 	MenuBuilder.BeginSection("MounteaMenu_Tools", LOCTEXT("MounteaMenuOptions_Settings", "Mountea Interaction Settings"));
 	{
 		MenuBuilder.AddMenuEntry(

Source/ActorInteractionPluginEditor/ActorInteractionPluginEditor.Build.cs

@@ -87,6 +87,7 @@ TSharedRef<FSlateStyleSet> FAIntPHelpStyle::Create()
 	Style->Set("AIntPStyleSet.Icon.UBIcon", new IMAGE_BRUSH(TEXT("UnrealBucketIcon"), Icon16x16));
 	Style->Set("AIntPStyleSet.Icon.MoneyIcon", new IMAGE_BRUSH(TEXT("MoneyIcon"), Icon16x16));
 
+	Style->Set("AIntPStyleSet.Tutorial", new IMAGE_BRUSH(TEXT("tutorialPage_icon"), Icon40x40));
 	return Style;
 }