Merge pull request #221 from dyanikoglu/dev

Hotfix v4.20.1
ShadowfallStudios · May 19, 2021 · 81014e8 · 81014e8
2 parents 86d606c + 06613da
commit 81014e8
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 23 deletions.
diff --git a/ALSV4_CPP.uplugin b/ALSV4_CPP.uplugin
@@ -1,7 +1,7 @@
 {
 	"FileVersion": 3,
 	"Version": 1,
-	"VersionName": "4.20",
+	"VersionName": "4.20.1",
 	"FriendlyName": "Advanced Locomotion System Community",
 	"Description": "Performance optimized community version of LongmireLocomotion's Advanced Locomotion System V4",
 	"Category": "Animation",

diff --git a/Content/AdvancedLocomotionV4/Blueprints/UI/ALS_HUD.uasset b/Content/AdvancedLocomotionV4/Blueprints/UI/ALS_HUD.uasset
diff --git a/Source/ALSV4_CPP/Private/Character/ALSBaseCharacter.cpp b/Source/ALSV4_CPP/Private/Character/ALSBaseCharacter.cpp
@@ -154,6 +154,8 @@ void AALSBaseCharacter::BeginPlay()
 		MainAnimInstance->SetRootMotionMode(ERootMotionMode::IgnoreRootMotion);
 	}
 
+	MyCharacterMovementComponent->SetMovementSettings(GetTargetMovementSettings());
+
 	DebugComponent = FindComponentByClass<UALSDebugComponent>();
 }
 
@@ -877,6 +879,8 @@ void AALSBaseCharacter::OnStanceChanged(const EALSStance PreviousStance)
 	{
 		CameraBehavior->Stance = Stance;
 	}
+
+	MyCharacterMovementComponent->SetMovementSettings(GetTargetMovementSettings());
 }
 
 void AALSBaseCharacter::OnRotationModeChanged(EALSRotationMode PreviousRotationMode)
@@ -893,6 +897,8 @@ void AALSBaseCharacter::OnRotationModeChanged(EALSRotationMode PreviousRotationM
 	{
 		CameraBehavior->SetRotationMode(RotationMode);
 	}
+
+	MyCharacterMovementComponent->SetMovementSettings(GetTargetMovementSettings());
 }
 
 void AALSBaseCharacter::OnGaitChanged(const EALSGait PreviousGait)
@@ -1074,9 +1080,6 @@ void AALSBaseCharacter::UpdateCharacterMovement()
 		SetGait(ActualGait);
 	}
 
-	// Get the Current Movement Settings and pass it through to the movement component.
-	MyCharacterMovementComponent->SetMovementSettings(GetTargetMovementSettings());
-
 	// Update the Character Max Walk Speed to the configured speeds based on the currently Allowed Gait.
 	MyCharacterMovementComponent->SetAllowedGait(AllowedGait);
 }

diff --git a/Source/ALSV4_CPP/Private/Character/ALSCharacterMovementComponent.cpp b/Source/ALSV4_CPP/Private/Character/ALSCharacterMovementComponent.cpp
@@ -183,6 +183,7 @@ void UALSCharacterMovementComponent::SetMovementSettings(FALSMovementSettings Ne
 {
 	// Set the current movement settings from the owner
 	CurrentMovementSettings = NewMovementSettings;
+	bRequestMovementSettingsChange = true;
 }
 
 void UALSCharacterMovementComponent::SetAllowedGait(EALSGait NewAllowedGait)

diff --git a/Source/ALSV4_CPP/Private/Character/Animation/Notify/ALSAnimNotifyFootstep.cpp b/Source/ALSV4_CPP/Private/Character/Animation/Notify/ALSAnimNotifyFootstep.cpp
@@ -10,6 +10,7 @@
 
 #include "Components/AudioComponent.h"
 #include "Engine/DataTable.h"
+#include "Kismet/KismetSystemLibrary.h"
 #include "Library/ALSCharacterStructLibrary.h"
 #include "PhysicalMaterials/PhysicalMaterial.h"
 #include "NiagaraSystem.h"
@@ -46,25 +47,8 @@ void UALSAnimNotifyFootstep::Notify(USkeletalMeshComponent* MeshComp, UAnimSeque
 
 		FHitResult Hit;
 
-		ECollisionChannel CollisionChannel = UEngineTypes::ConvertToCollisionChannel(TraceChannel);
-
-		FCollisionQueryParams Params(SCENE_QUERY_STAT(ALSFootstep), true /*bTraceComplex*/, MeshOwner);
-		Params.bReturnPhysicalMaterial = true;
-		for (auto& Child : MeshOwner->Children)
-		{
-			Params.AddIgnoredActor(Child);
-		}
-
-		bool const bHit = MeshComp->GetWorld() ? World->LineTraceSingleByChannel(Hit, FootLocation, TraceEnd, CollisionChannel, Params) : false;
-
-#if ENABLE_DRAW_DEBUG
-		if (MeshComp->GetWorld())
-		{
-			DrawDebugLineTraceSingle(MeshComp->GetWorld(), FootLocation, TraceEnd, DrawDebugType, bHit, Hit, TraceColor, TraceHitColor, DrawTime);
-		}
-#endif
-
-		if (bHit)
+		if (UKismetSystemLibrary::LineTraceSingle(MeshOwner /*used by bIgnoreSelf*/, FootLocation, TraceEnd, TraceChannel, true /*bTraceComplex*/, MeshOwner->Children,
+		                                          DrawDebugType, Hit, true /*bIgnoreSelf*/))
 		{
 			if (!Hit.PhysMaterial.Get())
 			{