Merge pull request #82 from dyanikoglu/dev

Release v4.10
ShadowfallStudios · Nov 4, 2020 · a352350 · a352350
2 parents 8ff783e + f4c11f6
commit a352350
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 23 deletions.
diff --git a/ALSV4_CPP.uplugin b/ALSV4_CPP.uplugin
@@ -1,7 +1,7 @@
 {
 	"FileVersion": 3,
 	"Version": 1,
-	"VersionName": "4.9",
+	"VersionName": "4.10",
 	"FriendlyName": "Advanced Locomotion System V4 on C++",
 	"Description": "Performance optimized C++ port 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
@@ -1017,7 +1017,7 @@ void AALSBaseCharacter::UpdateDynamicMovementSettingsStandalone(EALSGait Allowed
 	const FVector CurveVec = CurrentMovementSettings.MovementCurve->GetVectorValue(MappedSpeed);
 
 	// Update the Character Max Walk Speed to the configured speeds based on the currently Allowed Gait.
-	GetCharacterMovement()->MaxWalkSpeed = NewMaxSpeed;
+	MyCharacterMovementComponent->SetMaxWalkingSpeed(NewMaxSpeed);
 	GetCharacterMovement()->MaxAcceleration = CurveVec.X;
 	GetCharacterMovement()->BrakingDecelerationWalking = CurveVec.Y;
 	GetCharacterMovement()->GroundFriction = CurveVec.Z;

diff --git a/Source/ALSV4_CPP/Private/Character/ALSCharacterMovementComponent.cpp b/Source/ALSV4_CPP/Private/Character/ALSCharacterMovementComponent.cpp
@@ -71,18 +71,6 @@ uint8 UALSCharacterMovementComponent::FSavedMove_My::GetCompressedFlags() const
 	return Result;
 }
 
-bool UALSCharacterMovementComponent::FSavedMove_My::CanCombineWith(const FSavedMovePtr& NewMove, ACharacter* Character,
-                                                                   float MaxDelta) const
-{
-	// Set which moves can be combined together. This will depend on the bit flags that are used.
-	if (bSavedRequestMovementSettingsChange != ((FSavedMove_My*)&NewMove)->bSavedRequestMovementSettingsChange)
-	{
-		return false;
-	}
-
-	return Super::CanCombineWith(NewMove, Character, MaxDelta);
-}
-
 void UALSCharacterMovementComponent::FSavedMove_My::SetMoveFor(ACharacter* Character, float InDeltaTime, FVector const& NewAccel,
                                                                class FNetworkPredictionData_Client_Character& ClientData)
 {
@@ -106,12 +94,6 @@ FSavedMovePtr UALSCharacterMovementComponent::FNetworkPredictionData_Client_My::
 	return MakeShared<FSavedMove_My>();
 }
 
-// Set Movement Settings RPC to transfer the current Movement Settings from the Owning Client to the Server
-bool UALSCharacterMovementComponent::Server_SetMaxWalkingSpeed_Validate(const float NewMaxWalkSpeed)
-{
-	return NewMaxWalkSpeed >= 0.f && NewMaxWalkSpeed <= 2000.f;
-}
-
 void UALSCharacterMovementComponent::Server_SetMaxWalkingSpeed_Implementation(const float NewMaxWalkSpeed)
 {
 	MyNewMaxWalkSpeed = NewMaxWalkSpeed;

diff --git a/Source/ALSV4_CPP/Public/Character/ALSBaseCharacter.h b/Source/ALSV4_CPP/Public/Character/ALSBaseCharacter.h
@@ -22,6 +22,7 @@ class UTimelineComponent;
 class UAnimInstance;
 class UAnimMontage;
 class UALSCharacterAnimInstance;
+enum class EVisibilityBasedAnimTickOption : uint8;
 
 /*
  * Base character class
@@ -654,7 +655,7 @@ class ALSV4_CPP_API AALSBaseCharacter : public ACharacter
 	float ServerRagdollPull = 0.0f;
 
 	/* Dedicated server mesh default visibility based anim tick option*/
-	EVisibilityBasedAnimTickOption DefVisBasedTickOp = EVisibilityBasedAnimTickOption::AlwaysTickPoseAndRefreshBones;
+	EVisibilityBasedAnimTickOption DefVisBasedTickOp;
 
 	/** Cached Variables */
 

diff --git a/Source/ALSV4_CPP/Public/Character/ALSCharacterMovementComponent.h b/Source/ALSV4_CPP/Public/Character/ALSCharacterMovementComponent.h
@@ -23,7 +23,6 @@ class ALSV4_CPP_API UALSCharacterMovementComponent : public UCharacterMovementCo
 
 		typedef FSavedMove_Character Super;
 
-		virtual bool CanCombineWith(const FSavedMovePtr& NewMove, ACharacter* Character, float MaxDelta) const override;
 		virtual void Clear() override;
 		virtual uint8 GetCompressedFlags() const override;
 		virtual void SetMoveFor(ACharacter* Character, float InDeltaTime, FVector const& NewAccel,
@@ -59,6 +58,6 @@ class ALSV4_CPP_API UALSCharacterMovementComponent : public UCharacterMovementCo
 	UFUNCTION(BlueprintCallable, Category = "Movement Settings")
 	void SetMaxWalkingSpeed(float NewMaxWalkSpeed);
 
-	UFUNCTION(reliable, Server, WithValidation)
+	UFUNCTION(Reliable, Server)
 	void Server_SetMaxWalkingSpeed(float NewMaxWalkSpeed);
 };