Skip to content

Commit e82fbe0

Browse files
pavlicekdominikpavlicekdominik
committed
Merge branch '4.27_dev' into 4.27
2 parents ced2eab + d341e83 commit e82fbe0

File tree

6 files changed

+35
-18
lines changed

6 files changed

+35
-18
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1913,7 +1913,7 @@ void UActorInteractableComponentBase::PostEditChangeChainProperty(FPropertyChang
19131913
(
19141914
interactableName.Append(TEXT(": UI Space changed! Component Scale has been updated. Update 'DrawSize' to match new Widget Space!"))
19151915
);
1916-
FEditorHelper::DisplayEditorNotification(ErrorMessage, SNotificationItem::CS_Fail, 5.f, 2.f, TEXT("Icons.Info"));
1916+
FEditorHelper::DisplayEditorNotification(ErrorMessage, SNotificationItem::CS_Fail, 5.f, 2.f, TEXT("NotificationList.DefaultMessage"));
19171917
}
19181918
}
19191919

@@ -2055,7 +2055,7 @@ bool UActorInteractableComponentBase::Modify(bool bAlwaysMarkDirty)
20552055
(
20562056
interactableName.Append(" from ").Append(ownerName).Append(TEXT(": Interactable Data or Widget Class are not valid! Use 'SetDefaults' to avoid issues!"))
20572057
);
2058-
FEditorHelper::DisplayEditorNotification(ErrorMessage, SNotificationItem::CS_Fail, 5.f, 2.f, TEXT("Icons.Info"));
2058+
FEditorHelper::DisplayEditorNotification(ErrorMessage, SNotificationItem::CS_Fail, 5.f, 2.f, TEXT("NotificationList.DefaultMessage"));
20592059

20602060
}
20612061

‎Source/ActorInteractionPlugin/Private/Components/ActorInteractorComponentBase.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ void UActorInteractorComponentBase::EvaluateInteractable(const TScriptInterface<
152152
}
153153
}
154154

155-
void UActorInteractorComponentBase::StartInteraction(const float StartTime, const FKey& InputKey)
155+
void UActorInteractorComponentBase::StartInteraction(const float StartTime, FKey InputKey)
156156
{
157157
if (CanInteract() && ActiveInteractable.GetInterface())
158158
{
@@ -161,7 +161,7 @@ void UActorInteractorComponentBase::StartInteraction(const float StartTime, cons
161161
}
162162
}
163163

164-
void UActorInteractorComponentBase::StopInteraction(const float StartTime, const FKey& InputKey)
164+
void UActorInteractorComponentBase::StopInteraction(const float StartTime, FKey InputKey)
165165
{
166166
if (CanInteract() && ActiveInteractable.GetInterface())
167167
{

‎Source/ActorInteractionPlugin/Private/Components/ActorInteractorComponentTrace.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -461,7 +461,7 @@ void UActorInteractorComponentTrace::PostEditChangeChainProperty(FPropertyChange
461461
(
462462
InteractorName.Append(TEXT(": TraceInterval is more than 3s! This might be unintentional and cause gameplay issues."))
463463
);
464-
FEditorHelper::DisplayEditorNotification(ErrorMessage, SNotificationItem::CS_Fail, 5.f, 2.f, TEXT("Icons.Warning"));
464+
FEditorHelper::DisplayEditorNotification(ErrorMessage, SNotificationItem::CS_Fail, 5.f, 2.f, TEXT("NotificationList.DefaultMessage"));
465465
}
466466
}
467467

@@ -484,7 +484,7 @@ void UActorInteractorComponentTrace::PostEditChangeChainProperty(FPropertyChange
484484
(
485485
InteractorName.Append(TEXT(": TraceRange is more than 5000cm! This might be unintentional and cause gameplay issues."))
486486
);
487-
FEditorHelper::DisplayEditorNotification(ErrorMessage, SNotificationItem::CS_Fail, 5.f, 2.f, TEXT("Icons.Warning"));
487+
FEditorHelper::DisplayEditorNotification(ErrorMessage, SNotificationItem::CS_Fail, 5.f, 2.f, TEXT("NotificationList.DefaultMessage"));
488488
}
489489
}
490490

@@ -496,7 +496,7 @@ void UActorInteractorComponentTrace::PostEditChangeChainProperty(FPropertyChange
496496
(
497497
InteractorName.Append(TEXT(": TraceShapeHalfSize is more than 25cm! This might be unintentional and cause gameplay issues."))
498498
);
499-
FEditorHelper::DisplayEditorNotification(ErrorMessage, SNotificationItem::CS_Fail, 5.f, 2.f, TEXT("Icons.Warning"));
499+
FEditorHelper::DisplayEditorNotification(ErrorMessage, SNotificationItem::CS_Fail, 5.f, 2.f, TEXT("NotificationList.DefaultMessage"));
500500
}
501501
}
502502
}

‎Source/ActorInteractionPlugin/Public/Components/ActorInteractorComponentBase.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,13 +103,13 @@ class ACTORINTERACTIONPLUGIN_API UActorInteractorComponentBase : public UActorCo
103103
* @param InputKey Optional Key. Some Interactions might require this value to perform checks.
104104
*/
105105
UFUNCTION(BlueprintCallable, Category="Interaction")
106-
virtual void StartInteraction(const float StartTime, const FKey& InputKey) override;
106+
virtual void StartInteraction(const float StartTime, FKey InputKey) override;
107107
/**
108108
* Function to stop interaction.
109109
* No conditions required.
110110
*/
111111
UFUNCTION(BlueprintCallable, Category="Interaction")
112-
virtual void StopInteraction(const float StartTime, const FKey& InputKey) override;
112+
virtual void StopInteraction(const float StartTime, FKey InputKey) override;
113113

114114

115115
/**

‎Source/ActorInteractionPlugin/Public/Interfaces/ActorInteractorInterface.h‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ DECLARE_DYNAMIC_MULTICAST_DELEGATE_OneParam(FInteractableSelected, const TScript
2020
DECLARE_DYNAMIC_MULTICAST_DELEGATE_OneParam(FInteractableFound, const TScriptInterface<IActorInteractableInterface>&, FoundInteractable);
2121
DECLARE_DYNAMIC_MULTICAST_DELEGATE_OneParam(FInteractableLost, const TScriptInterface<IActorInteractableInterface>&, LostInteractable);
2222

23-
DECLARE_DYNAMIC_MULTICAST_DELEGATE_TwoParams(FInteractionKeyPressed, const float&, TimeKeyPressed, const FKey&, PressedKey);
24-
DECLARE_DYNAMIC_MULTICAST_DELEGATE_TwoParams(FInteractionKeyReleased, const float&, TimeKeyReleased, const FKey&, ReleasedKey);
23+
DECLARE_DYNAMIC_MULTICAST_DELEGATE_TwoParams(FInteractionKeyPressed, const float&, TimeKeyPressed, FKey, PressedKey);
24+
DECLARE_DYNAMIC_MULTICAST_DELEGATE_TwoParams(FInteractionKeyReleased, const float&, TimeKeyReleased, FKey, ReleasedKey);
2525

2626
DECLARE_DYNAMIC_MULTICAST_DELEGATE_OneParam(FIgnoredActorAdded, const AActor*, AddedActor);
2727
DECLARE_DYNAMIC_MULTICAST_DELEGATE_OneParam(FIgnoredActorRemoved, const AActor*, RemovedActor);
@@ -80,7 +80,7 @@ class ACTORINTERACTIONPLUGIN_API IActorInteractorInterface
8080
* @param PressedKey Key which was pressed
8181
*/
8282
UFUNCTION(BlueprintNativeEvent, BlueprintCallable, Category="Interaction")
83-
void OnInteractionKeyPressedEvent(const float& TimeKeyPressed, const FKey& PressedKey);
83+
void OnInteractionKeyPressedEvent(const float& TimeKeyPressed, FKey PressedKey);
8484
void OnInteractionKeyPressedEvent_Implementation(const float& TimeKeyPressed, const FKey& PressedKey)
8585
{
8686
StartInteraction(TimeKeyPressed, PressedKey);
@@ -95,7 +95,7 @@ class ACTORINTERACTIONPLUGIN_API IActorInteractorInterface
9595
* @param ReleasedKey Key which was released
9696
*/
9797
UFUNCTION(BlueprintNativeEvent, BlueprintCallable, Category="Interaction")
98-
void OnInteractionKeyReleasedEvent(const float& TimeKeyReleased, const FKey& ReleasedKey);
98+
void OnInteractionKeyReleasedEvent(const float& TimeKeyReleased, FKey ReleasedKey);
9999
void OnInteractionKeyReleasedEvent_Implementation(const float& TimeKeyReleased, const FKey& ReleasedKey)
100100
{
101101
StopInteraction(TimeKeyReleased, ReleasedKey);
@@ -158,8 +158,8 @@ class ACTORINTERACTIONPLUGIN_API IActorInteractorInterface
158158

159159
virtual bool IsValidInteractor() const = 0;
160160

161-
virtual void StartInteraction(const float StartTime, const FKey& InputKey) = 0;
162-
virtual void StopInteraction(const float StartTime, const FKey& InputKey) = 0;
161+
virtual void StartInteraction(const float StartTime, FKey InputKey) = 0;
162+
virtual void StopInteraction(const float StartTime, FKey InputKey) = 0;
163163

164164
virtual bool ActivateInteractor(FString& ErrorMessage) = 0;
165165
virtual bool WakeUpInteractor(FString& ErrorMessage) = 0;

‎Source/ActorInteractionPluginEditor/Private/Popup/AIntPPopup.cpp‎

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ void AIntPPopup::Register()
2020
{
2121
const FString PluginDirectory = IPluginManager::Get().FindPlugin(TEXT("ActorInteractionPlugin"))->GetBaseDir();
2222
const FString UpdatedConfigFile = PluginDirectory + "/Config/UpdateConfig.ini";
23-
const FString CurrentPluginVersion = "3.0";
23+
const FString CurrentPluginVersion = "3.0.1.3";
2424

2525
UAIntPPopupConfig* AIntPPopupConfig = GetMutableDefault<UAIntPPopupConfig>();
2626

@@ -79,7 +79,7 @@ void AIntPPopup::Open()
7979
[
8080
SNew(STextBlock)
8181
.Font(HeadingFont)
82-
.Text(FText::FromString("Actor Interaction Plugin v3.0"))
82+
.Text(FText::FromString("Actor Interaction Plugin v3.1"))
8383
.Justification(ETextJustify::Center)
8484
]
8585
+ SVerticalBox::Slot()
@@ -101,7 +101,22 @@ First thing first, if you've been enjoying using it, it would mean a lot if you
101101
102102
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!
103103
104-
But let's keep it short, here are the cool new features (and bugfixes) of version 3.0!
104+
But let's keep it short, here are the cool new features (and bugfixes) of version 3.1!
105+
106+
<LargeText>Version 3.1</>
107+
108+
<RichTextBlock.Bold>Features</>
109+
110+
* Improved performance for Consoles and Mobile devices
111+
112+
<RichTextBlock.Bold>Bugfixes</>
113+
114+
* Fixed issue when swapping states of Interactable returns to Default state
115+
116+
<RichTextBlock.Bold>Updates</>
117+
* Add <RichTextBlock.Bold>DEPRECATED</> to SnoozeInteractable
118+
* <RichTextBlock.Bold>DEPRECATED</> Interactable State <RichTextBlock.Italic>Asleep</>
119+
* Interactor does not longer require <RichTextBlock.Bold>Key</> input and it has become optional
105120
106121
<LargeText>Version 3.0</>
107122
@@ -118,6 +133,8 @@ But let's keep it short, here are the cool new features (and bugfixes) of versio
118133
<RichTextBlock.Bold>Bugfixes</>
119134
120135
* Fix missed descriptions
136+
137+
<RichTextBlock.Bold>Updates</>
121138
* Add <RichTextBlock.Bold>DEPRECATED</> to old Component Classes
122139
)"))
123140
.TextStyle(FEditorStyle::Get(), "NormalText")

0 commit comments

Comments
 (0)