Skip to content

Commit 9ef3e67

Browse files
pavlicekdominikpavlicekdominik
committed
Merge branch '5.1' into 5.2_dev
2 parents f4632ee + 9b3f4cb commit 9ef3e67

18 files changed

+311
-149
lines changed

‎CHANGELOG.md

+23-3
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,27 @@ Current Version: 4.0.0.52
44

55
All notable changes to this project will be documented in this file.
66

7-
** Version 4.0 **
7+
** Version 4.0.2 **
8+
### Added
9+
> - Auto Gameplay Tags download
10+
> - - This way default Gameplay Tags will always be present
11+
12+
### Changed
13+
> - *Participant* now has button in Details panel to *Load Defaults*
14+
> - - This button is available for instances in Level as well as for base Blueprint classes
15+
> - Right-click menu updated
16+
> - - Menu is now on top
17+
> - Toolbar Ribbon buttons reworked
18+
> - - Dropdown menu now offers more links with better descriptions
19+
> - Updated welcome screen
20+
21+
### Fixed
22+
> - Fixed build issues with default data
23+
> - Fixed editor issues with changing properties using code
24+
> - Fixed *WBP_InteractableBase* icons loading issues
25+
> - Fixed broken Input Actions and Mappings
26+
27+
** Version 4.0.0 **
828
### Changed
929
> - Interfaces are now much more exposed to blueprints
1030
> - - almost all functions are now Blueprint Native Events, therefore allows BP overriding
@@ -28,7 +48,7 @@ All notable changes to this project will be documented in this file.
2848
> - Fixed many small issues
2949
> - Fixed loosing interactor after pausing interaction
3050
31-
** Version 3.1 **
51+
** Version 3.0.1 **
3252
### Added
3353
> - Added: Improved performance for Consoles and Mobile devices
3454
### Fixed
@@ -37,7 +57,7 @@ All notable changes to this project will be documented in this file.
3757
> - Changed: Deprecated *SnoozeInteractable* functions
3858
> - Changed: Depreacted *Asleep* Interactable State
3959
40-
** Version 3.0 **
60+
** Version 3.0.0 **
4161
### Added
4262
> - Added: New Interactor Component Base Class implementing IActorInteractorInterface
4363
> - Added: Child Classes for this new Interactor Base class, replacing existing monolithic ActorInteractorComponent solution

‎Content/Materials/OverlayMaterial/MI_OverlayMaterial_Glowing.uasset

1008 Bytes
Binary file not shown.

‎Content/Materials/OverlayMaterial/M_OverlayMaterial_Glowing.uasset

-459 Bytes
Binary file not shown.

‎Resources/MPLIcon.png

2.2 KB
Loading

‎Resources/settings_icon.png

4.84 KB
Loading

‎Resources/youtube_icon.png

15.7 KB
Loading

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

+38-38
Original file line numberDiff line numberDiff line change
@@ -74,75 +74,75 @@ void UActorInteractableComponentBase::BeginPlay()
7474

7575
// Interaction Events
7676
{
77-
OnInteractableSelected. AddUniqueDynamic(this, &UActorInteractableComponentBase::OnInteractableSelectedEvent);
78-
OnInteractorFound. AddUniqueDynamic(this, &UActorInteractableComponentBase::InteractorFound);
79-
OnInteractorLost. AddUniqueDynamic(this, &UActorInteractableComponentBase::InteractorLost);
80-
81-
OnInteractorOverlapped. AddUniqueDynamic(this, &UActorInteractableComponentBase::OnInteractableBeginOverlapEvent);
82-
OnInteractorStopOverlap. AddUniqueDynamic(this, &UActorInteractableComponentBase::OnInteractableStopOverlapEvent);
83-
OnInteractorTraced. AddUniqueDynamic(this, &UActorInteractableComponentBase::OnInteractableTraced);
84-
85-
OnInteractionCompleted. AddUniqueDynamic(this, &UActorInteractableComponentBase::InteractionCompleted);
86-
OnInteractionCycleCompleted. AddUniqueDynamic(this, &UActorInteractableComponentBase::InteractionCycleCompleted);
87-
OnInteractionStarted. AddUniqueDynamic(this, &UActorInteractableComponentBase::InteractionStarted);
88-
OnInteractionStopped. AddUniqueDynamic(this, &UActorInteractableComponentBase::InteractionStopped);
89-
OnInteractionCanceled. AddUniqueDynamic(this, &UActorInteractableComponentBase::InteractionCanceled);
90-
OnLifecycleCompleted. AddUniqueDynamic(this, &UActorInteractableComponentBase::InteractionLifecycleCompleted);
91-
OnCooldownCompleted. AddUniqueDynamic(this, &UActorInteractableComponentBase::InteractionCooldownCompleted);
77+
OnInteractableSelected.AddUniqueDynamic(this, &UActorInteractableComponentBase::OnInteractableSelectedEvent);
78+
OnInteractorFound.AddUniqueDynamic(this, &UActorInteractableComponentBase::InteractorFound);
79+
OnInteractorLost.AddUniqueDynamic(this, &UActorInteractableComponentBase::InteractorLost);
80+
81+
OnInteractorOverlapped.AddUniqueDynamic(this, &UActorInteractableComponentBase::OnInteractableBeginOverlapEvent);
82+
OnInteractorStopOverlap.AddUniqueDynamic(this, &UActorInteractableComponentBase::OnInteractableStopOverlapEvent);
83+
OnInteractorTraced.AddUniqueDynamic(this, &UActorInteractableComponentBase::OnInteractableTraced);
84+
85+
OnInteractionCompleted.AddUniqueDynamic(this, &UActorInteractableComponentBase::InteractionCompleted);
86+
OnInteractionCycleCompleted.AddUniqueDynamic(this, &UActorInteractableComponentBase::InteractionCycleCompleted);
87+
OnInteractionStarted.AddUniqueDynamic(this, &UActorInteractableComponentBase::InteractionStarted);
88+
OnInteractionStopped.AddUniqueDynamic(this, &UActorInteractableComponentBase::InteractionStopped);
89+
OnInteractionCanceled.AddUniqueDynamic(this, &UActorInteractableComponentBase::InteractionCanceled);
90+
OnLifecycleCompleted.AddUniqueDynamic(this, &UActorInteractableComponentBase::InteractionLifecycleCompleted);
91+
OnCooldownCompleted.AddUniqueDynamic(this, &UActorInteractableComponentBase::InteractionCooldownCompleted);
9292
}
9393

9494
// Attributes Events
9595
{
96-
OnInteractableDependencyChanged. AddUniqueDynamic(this, &UActorInteractableComponentBase::OnInteractableDependencyChangedEvent);
97-
OnInteractableAutoSetupChanged. AddUniqueDynamic(this, &UActorInteractableComponentBase::OnInteractableAutoSetupChangedEvent);
98-
OnInteractableWeightChanged. AddUniqueDynamic(this, &UActorInteractableComponentBase::OnInteractableWeightChangedEvent);
99-
OnInteractableStateChanged. AddUniqueDynamic(this, &UActorInteractableComponentBase::OnInteractableStateChangedEvent);
100-
OnInteractableOwnerChanged. AddUniqueDynamic(this, &UActorInteractableComponentBase::OnInteractableOwnerChangedEvent);
101-
OnInteractableCollisionChannelChanged. AddUniqueDynamic(this, &UActorInteractableComponentBase::OnInteractableCollisionChannelChangedEvent);
102-
OnLifecycleModeChanged. AddUniqueDynamic(this, &UActorInteractableComponentBase::OnLifecycleModeChangedEvent);
103-
OnLifecycleCountChanged. AddUniqueDynamic(this, &UActorInteractableComponentBase::OnLifecycleCountChangedEvent);
104-
OnCooldownPeriodChanged. AddUniqueDynamic(this, &UActorInteractableComponentBase::OnCooldownPeriodChangedEvent);
105-
OnInteractorChanged. AddUniqueDynamic(this, &UActorInteractableComponentBase::OnInteractorChangedEvent);
96+
OnInteractableDependencyChanged.AddUniqueDynamic(this, &UActorInteractableComponentBase::OnInteractableDependencyChangedEvent);
97+
OnInteractableAutoSetupChanged.AddUniqueDynamic(this, &UActorInteractableComponentBase::OnInteractableAutoSetupChangedEvent);
98+
OnInteractableWeightChanged.AddUniqueDynamic(this, &UActorInteractableComponentBase::OnInteractableWeightChangedEvent);
99+
OnInteractableStateChanged.AddUniqueDynamic(this, &UActorInteractableComponentBase::OnInteractableStateChangedEvent);
100+
OnInteractableOwnerChanged.AddUniqueDynamic(this, &UActorInteractableComponentBase::OnInteractableOwnerChangedEvent);
101+
OnInteractableCollisionChannelChanged.AddUniqueDynamic(this, &UActorInteractableComponentBase::OnInteractableCollisionChannelChangedEvent);
102+
OnLifecycleModeChanged.AddUniqueDynamic(this, &UActorInteractableComponentBase::OnLifecycleModeChangedEvent);
103+
OnLifecycleCountChanged.AddUniqueDynamic(this, &UActorInteractableComponentBase::OnLifecycleCountChangedEvent);
104+
OnCooldownPeriodChanged.AddUniqueDynamic(this, &UActorInteractableComponentBase::OnCooldownPeriodChangedEvent);
105+
OnInteractorChanged.AddUniqueDynamic(this, &UActorInteractableComponentBase::OnInteractorChangedEvent);
106106
}
107107

108108
// Ignored Classes Events
109109
{
110-
OnIgnoredInteractorClassAdded. AddUniqueDynamic(this, &UActorInteractableComponentBase::OnIgnoredClassAdded);
111-
OnIgnoredInteractorClassRemoved. AddUniqueDynamic(this, &UActorInteractableComponentBase::OnIgnoredClassRemoved);
110+
OnIgnoredInteractorClassAdded.AddUniqueDynamic(this, &UActorInteractableComponentBase::OnIgnoredClassAdded);
111+
OnIgnoredInteractorClassRemoved.AddUniqueDynamic(this, &UActorInteractableComponentBase::OnIgnoredClassRemoved);
112112
}
113113

114114
// Highlight Events
115115
{
116-
OnHighlightableComponentAdded. AddUniqueDynamic(this, &UActorInteractableComponentBase::OnHighlightableComponentAddedEvent);
117-
OnHighlightableComponentRemoved. AddUniqueDynamic(this, &UActorInteractableComponentBase::OnHighlightableComponentRemovedEvent);
116+
OnHighlightableComponentAdded.AddUniqueDynamic(this, &UActorInteractableComponentBase::OnHighlightableComponentAddedEvent);
117+
OnHighlightableComponentRemoved.AddUniqueDynamic(this, &UActorInteractableComponentBase::OnHighlightableComponentRemovedEvent);
118118
}
119119

120120
// Collision Events
121121
{
122-
OnCollisionComponentAdded. AddUniqueDynamic(this, &UActorInteractableComponentBase::OnCollisionComponentAddedEvent);
123-
OnCollisionComponentRemoved. AddUniqueDynamic(this, &UActorInteractableComponentBase::OnCollisionComponentRemovedEvent);
122+
OnCollisionComponentAdded.AddUniqueDynamic(this, &UActorInteractableComponentBase::OnCollisionComponentAddedEvent);
123+
OnCollisionComponentRemoved.AddUniqueDynamic(this, &UActorInteractableComponentBase::OnCollisionComponentRemovedEvent);
124124
}
125125

126126
// Widget
127127
{
128-
OnWidgetUpdated. AddUniqueDynamic(this, &UActorInteractableComponentBase::OnWidgetUpdatedEvent);
128+
OnWidgetUpdated.AddUniqueDynamic(this, &UActorInteractableComponentBase::OnWidgetUpdatedEvent);
129129
}
130130

131131
// Highlight
132132
{
133-
OnHighlightTypeChanged. AddUniqueDynamic(this, &UActorInteractableComponentBase::OnHighlightTypeChangedEvent);
134-
OnHighlightMaterialChanged. AddUniqueDynamic(this, &UActorInteractableComponentBase::OnHighlightMaterialChangedEvent);
133+
OnHighlightTypeChanged.AddUniqueDynamic(this, &UActorInteractableComponentBase::OnHighlightTypeChangedEvent);
134+
OnHighlightMaterialChanged.AddUniqueDynamic(this, &UActorInteractableComponentBase::OnHighlightMaterialChangedEvent);
135135
}
136136

137137
// Dependency
138138
{
139-
InteractableDependencyStarted. AddUniqueDynamic(this, &UActorInteractableComponentBase::InteractableDependencyStartedCallback);
140-
InteractableDependencyStopped. AddUniqueDynamic(this, &UActorInteractableComponentBase::InteractableDependencyStoppedCallback);
139+
InteractableDependencyStarted.AddUniqueDynamic(this, &UActorInteractableComponentBase::InteractableDependencyStartedCallback);
140+
InteractableDependencyStopped.AddUniqueDynamic(this, &UActorInteractableComponentBase::InteractableDependencyStoppedCallback);
141141
}
142142

143143
// Activation
144144
{
145-
OnComponentActivated. AddUniqueDynamic(this, &UActorInteractableComponentBase::InteractableComponentActivated);
145+
OnComponentActivated.AddUniqueDynamic(this, &UActorInteractableComponentBase::InteractableComponentActivated);
146146
}
147147

148148
// Bind Changing Input Devices
@@ -158,7 +158,7 @@ void UActorInteractableComponentBase::BeginPlay()
158158
}
159159
}
160160

161-
OnInteractionDeviceChanged. AddUniqueDynamic(this, &UActorInteractableComponentBase::OnInputDeviceChanged);
161+
OnInteractionDeviceChanged.AddUniqueDynamic(this, &UActorInteractableComponentBase::OnInputDeviceChanged);
162162
}
163163

164164
RemainingLifecycleCount = LifecycleCount;

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@ void UActorInteractorComponentTrace::ProcessTrace_Implementation()
257257

258258
if (InteractorTag.IsValid() && !localInteractable->Execute_GetInteractableCompatibleTags(Itr).HasTag(InteractorTag))
259259
{
260-
LOG_INFO(TEXT("[ProcessTrace] Interactor Tag %s is not compatible with %s Interactable on %s Actor"), *InteractorTag.ToString(), *localInteractable->Execute_GetInteractableName(Itr).ToString(), *HitActor->GetName())
260+
LOG_WARNING(TEXT("[ProcessTrace] Interactor Tag %s is not compatible with %s Interactable on %s Actor"), *InteractorTag.ToString(), *localInteractable->Execute_GetInteractableName(Itr).ToString(), *HitActor->GetName())
261261
continue;
262262
}
263263

‎Source/ActorInteractionPlugin/Private/Helpers/ActorInteractionPluginSettings.cpp

+7-2
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
#include "Helpers/ActorInteractionPluginSettings.h"
44

55
#include "InputMappingContext.h"
6-
#include "Helpers/ActorInteractionPluginLog.h"
76
#include "Helpers/MounteaInteractionSettingsConfig.h"
87
#include "Materials/MaterialInterface.h"
98

109
UActorInteractionPluginSettings::UActorInteractionPluginSettings() :
1110
bEditorDebugEnabled(true),
11+
LogVerbosity(14),
1212
WidgetUpdateFrequency(0.1f)
1313
{
1414
CategoryName = TEXT("Mountea Framework");
@@ -32,4 +32,9 @@ UMaterialInterface* UActorInteractionPluginSettings::GetDefaultHighlightMaterial
3232
UInputMappingContext* UActorInteractionPluginSettings::GetDefaultInputMappingContext() const
3333
{
3434
return InteractionInputMapping.LoadSynchronous();
35-
};
35+
}
36+
37+
EMounteaInteractionLoggingVerbosity UActorInteractionPluginSettings::GetAllowedLoggVerbosity() const
38+
{
39+
return static_cast<EMounteaInteractionLoggingVerbosity>(LogVerbosity);
40+
}

0 commit comments

Comments
 (0)