Merge branch '4.27_dev' into 4.27

Source/ActorInteractionPlugin/Private/Components/ActorInteractableComponentBase.cpp

@@ -1913,7 +1913,7 @@ void UActorInteractableComponentBase::PostEditChangeChainProperty(FPropertyChang
 		(
 			interactableName.Append(TEXT(": UI Space changed! Component Scale has been updated. Update 'DrawSize' to match new Widget Space!"))
 		);
-		FEditorHelper::DisplayEditorNotification(ErrorMessage, SNotificationItem::CS_Fail, 5.f, 2.f, TEXT("Icons.Info"));
+		FEditorHelper::DisplayEditorNotification(ErrorMessage, SNotificationItem::CS_Fail, 5.f, 2.f, TEXT("NotificationList.DefaultMessage"));
 	}
 }
 
@@ -2055,7 +2055,7 @@ bool UActorInteractableComponentBase::Modify(bool bAlwaysMarkDirty)
 		(
 			interactableName.Append(" from ").Append(ownerName).Append(TEXT(": Interactable Data or Widget Class are not valid! Use 'SetDefaults' to avoid issues!"))
 		);
-		FEditorHelper::DisplayEditorNotification(ErrorMessage, SNotificationItem::CS_Fail, 5.f, 2.f, TEXT("Icons.Info"));
+		FEditorHelper::DisplayEditorNotification(ErrorMessage, SNotificationItem::CS_Fail, 5.f, 2.f, TEXT("NotificationList.DefaultMessage"));
 
 	}
 

Source/ActorInteractionPlugin/Private/Components/ActorInteractorComponentBase.cpp

@@ -152,7 +152,7 @@ void UActorInteractorComponentBase::EvaluateInteractable(const TScriptInterface<
 	}
 }
 
-void UActorInteractorComponentBase::StartInteraction(const float StartTime, const FKey& InputKey)
+void UActorInteractorComponentBase::StartInteraction(const float StartTime, FKey InputKey)
 {
 	if (CanInteract() && ActiveInteractable.GetInterface())
 	{
@@ -161,7 +161,7 @@ void UActorInteractorComponentBase::StartInteraction(const float StartTime, cons
 	}
 }
 
-void UActorInteractorComponentBase::StopInteraction(const float StartTime, const FKey& InputKey)
+void UActorInteractorComponentBase::StopInteraction(const float StartTime, FKey InputKey)
 {
 	if (CanInteract() && ActiveInteractable.GetInterface())
 	{

Source/ActorInteractionPlugin/Private/Components/ActorInteractorComponentTrace.cpp

@@ -461,7 +461,7 @@ void UActorInteractorComponentTrace::PostEditChangeChainProperty(FPropertyChange
 			(
 				InteractorName.Append(TEXT(": TraceInterval is more than 3s! This might be unintentional and cause gameplay issues."))
 			);
-			FEditorHelper::DisplayEditorNotification(ErrorMessage, SNotificationItem::CS_Fail, 5.f, 2.f, TEXT("Icons.Warning"));
+			FEditorHelper::DisplayEditorNotification(ErrorMessage, SNotificationItem::CS_Fail, 5.f, 2.f, TEXT("NotificationList.DefaultMessage"));
 		}
 	}
 
@@ -484,7 +484,7 @@ void UActorInteractorComponentTrace::PostEditChangeChainProperty(FPropertyChange
 			(
 				InteractorName.Append(TEXT(": TraceRange is more than 5000cm! This might be unintentional and cause gameplay issues."))
 			);
-			FEditorHelper::DisplayEditorNotification(ErrorMessage, SNotificationItem::CS_Fail, 5.f, 2.f, TEXT("Icons.Warning"));
+			FEditorHelper::DisplayEditorNotification(ErrorMessage, SNotificationItem::CS_Fail, 5.f, 2.f, TEXT("NotificationList.DefaultMessage"));
 		}
 	}
 
@@ -496,7 +496,7 @@ void UActorInteractorComponentTrace::PostEditChangeChainProperty(FPropertyChange
 			(
 				InteractorName.Append(TEXT(": TraceShapeHalfSize is more than 25cm! This might be unintentional and cause gameplay issues."))
 			);
-			FEditorHelper::DisplayEditorNotification(ErrorMessage, SNotificationItem::CS_Fail, 5.f, 2.f, TEXT("Icons.Warning"));
+			FEditorHelper::DisplayEditorNotification(ErrorMessage, SNotificationItem::CS_Fail, 5.f, 2.f, TEXT("NotificationList.DefaultMessage"));
 		}
 	}
 }

Source/ActorInteractionPlugin/Public/Components/ActorInteractorComponentBase.h

@@ -103,13 +103,13 @@ class ACTORINTERACTIONPLUGIN_API UActorInteractorComponentBase : public UActorCo
 	 * @param InputKey Optional Key. Some Interactions might require this value to perform checks.
 	 */
 	UFUNCTION(BlueprintCallable, Category="Interaction")
-	virtual void StartInteraction(const float StartTime, const FKey& InputKey) override;
+	virtual void StartInteraction(const float StartTime, FKey InputKey) override;
 	/**
 	 * Function to stop interaction.
 	 * No conditions required.
 	 */
 	UFUNCTION(BlueprintCallable, Category="Interaction")
-	virtual void StopInteraction(const float StartTime, const FKey& InputKey) override;
+	virtual void StopInteraction(const float StartTime, FKey InputKey) override;
 
 
 	/**

Source/ActorInteractionPlugin/Public/Interfaces/ActorInteractorInterface.h

@@ -20,8 +20,8 @@ DECLARE_DYNAMIC_MULTICAST_DELEGATE_OneParam(FInteractableSelected, const TScript
 DECLARE_DYNAMIC_MULTICAST_DELEGATE_OneParam(FInteractableFound, const TScriptInterface<IActorInteractableInterface>&, FoundInteractable);
 DECLARE_DYNAMIC_MULTICAST_DELEGATE_OneParam(FInteractableLost, const TScriptInterface<IActorInteractableInterface>&, LostInteractable);
 
-DECLARE_DYNAMIC_MULTICAST_DELEGATE_TwoParams(FInteractionKeyPressed, const float&, TimeKeyPressed, const FKey&, PressedKey);
-DECLARE_DYNAMIC_MULTICAST_DELEGATE_TwoParams(FInteractionKeyReleased, const float&, TimeKeyReleased, const FKey&, ReleasedKey);
+DECLARE_DYNAMIC_MULTICAST_DELEGATE_TwoParams(FInteractionKeyPressed, const float&, TimeKeyPressed,  FKey, PressedKey);
+DECLARE_DYNAMIC_MULTICAST_DELEGATE_TwoParams(FInteractionKeyReleased, const float&, TimeKeyReleased,  FKey, ReleasedKey);
 
 DECLARE_DYNAMIC_MULTICAST_DELEGATE_OneParam(FIgnoredActorAdded, const AActor*, AddedActor);
 DECLARE_DYNAMIC_MULTICAST_DELEGATE_OneParam(FIgnoredActorRemoved, const AActor*, RemovedActor);
@@ -80,7 +80,7 @@ class ACTORINTERACTIONPLUGIN_API IActorInteractorInterface
 	 * @param PressedKey Key which was pressed
 	 */
 	UFUNCTION(BlueprintNativeEvent, BlueprintCallable, Category="Interaction")
-	void OnInteractionKeyPressedEvent(const float& TimeKeyPressed, const FKey& PressedKey);
+	void OnInteractionKeyPressedEvent(const float& TimeKeyPressed, FKey PressedKey);
 	void OnInteractionKeyPressedEvent_Implementation(const float& TimeKeyPressed, const FKey& PressedKey)
 	{
 		StartInteraction(TimeKeyPressed, PressedKey);
@@ -95,7 +95,7 @@ class ACTORINTERACTIONPLUGIN_API IActorInteractorInterface
 	 * @param ReleasedKey Key which was released
 	 */
 	UFUNCTION(BlueprintNativeEvent, BlueprintCallable, Category="Interaction")
-	void OnInteractionKeyReleasedEvent(const float& TimeKeyReleased, const FKey& ReleasedKey);
+	void OnInteractionKeyReleasedEvent(const float& TimeKeyReleased, FKey ReleasedKey);
 	void OnInteractionKeyReleasedEvent_Implementation(const float& TimeKeyReleased, const FKey& ReleasedKey)
 	{
 		StopInteraction(TimeKeyReleased, ReleasedKey);
@@ -158,8 +158,8 @@ class ACTORINTERACTIONPLUGIN_API IActorInteractorInterface
 
 	virtual bool IsValidInteractor() const = 0;
 
-	virtual void StartInteraction(const float StartTime, const FKey& InputKey) = 0;
-	virtual void StopInteraction(const float StartTime, const FKey& InputKey) = 0;
+	virtual void StartInteraction(const float StartTime, FKey InputKey) = 0;
+	virtual void StopInteraction(const float StartTime, FKey InputKey) = 0;
 
 	virtual bool ActivateInteractor(FString& ErrorMessage) = 0;
 	virtual bool WakeUpInteractor(FString& ErrorMessage) = 0;

Source/ActorInteractionPluginEditor/Private/Popup/AIntPPopup.cpp

@@ -20,7 +20,7 @@ void AIntPPopup::Register()
 {
 	const FString PluginDirectory = IPluginManager::Get().FindPlugin(TEXT("ActorInteractionPlugin"))->GetBaseDir();
 	const FString UpdatedConfigFile = PluginDirectory + "/Config/UpdateConfig.ini";
-	const FString CurrentPluginVersion = "3.0";
+	const FString CurrentPluginVersion = "3.0.1.3";
 
 	UAIntPPopupConfig* AIntPPopupConfig = GetMutableDefault<UAIntPPopupConfig>();
 
@@ -79,7 +79,7 @@ void AIntPPopup::Open()
 		[
 			SNew(STextBlock)
 			.Font(HeadingFont)
-			.Text(FText::FromString("Actor Interaction Plugin v3.0"))
+			.Text(FText::FromString("Actor Interaction Plugin v3.1"))
 			.Justification(ETextJustify::Center)
 		]
 		+ SVerticalBox::Slot()
@@ -101,7 +101,22 @@ First thing first, if you've been enjoying using it, it would mean a lot if you
 
 I also made a paid <a id="browser" href="https://bit.ly/ModularSwordsPack_UE4Marketplace">Modular Sword Pack</>. It's a simple yet powerful tool that allows creating thousands upon thousands of unique swords with a simple click, now with a free upgrade of Modular Scabbard System!
 					
-But let's keep it short, here are the cool new features (and bugfixes) of version 3.0!
+But let's keep it short, here are the cool new features (and bugfixes) of version 3.1!
+
+<LargeText>Version 3.1</>
+
+<RichTextBlock.Bold>Features</>
+
+* Improved performance for Consoles and Mobile devices
+
+<RichTextBlock.Bold>Bugfixes</>
+
+* Fixed issue when swapping states of Interactable returns to Default state
+
+<RichTextBlock.Bold>Updates</>
+* Add <RichTextBlock.Bold>DEPRECATED</> to SnoozeInteractable
+* <RichTextBlock.Bold>DEPRECATED</> Interactable State <RichTextBlock.Italic>Asleep</>
+* Interactor does not longer require <RichTextBlock.Bold>Key</> input and it has become optional
 
 <LargeText>Version 3.0</>
 
@@ -118,6 +133,8 @@ But let's keep it short, here are the cool new features (and bugfixes) of versio
 <RichTextBlock.Bold>Bugfixes</>
 
 * Fix missed descriptions
+
+<RichTextBlock.Bold>Updates</>
 * Add <RichTextBlock.Bold>DEPRECATED</> to old Component Classes
 )"))
 					.TextStyle(FEditorStyle::Get(), "NormalText")