From 5ef6026283d6b5621b3d08a36f357c4ac8d4e4d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Do=C4=9Fa=20Can=20Yan=C4=B1ko=C4=9Flu?= Date: Thu, 5 Nov 2020 01:05:24 +0300 Subject: [PATCH 1/5] Crouch speed fix for single player mode --- Source/ALSV4_CPP/Private/Character/ALSBaseCharacter.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/ALSV4_CPP/Private/Character/ALSBaseCharacter.cpp b/Source/ALSV4_CPP/Private/Character/ALSBaseCharacter.cpp index 1176fe2e..ae9015e4 100644 --- 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; From 170c7bc18461b2b60c19170a484bbc2a2217762f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Do=C4=9Fa=20Can=20Yan=C4=B1ko=C4=9Flu?= Date: Thu, 5 Nov 2020 01:05:56 +0300 Subject: [PATCH 2/5] Nuke faulty CanCombineWith override --- .../ALSCharacterMovementComponent.cpp | 18 ------------------ .../Character/ALSCharacterMovementComponent.h | 3 +-- 2 files changed, 1 insertion(+), 20 deletions(-) diff --git a/Source/ALSV4_CPP/Private/Character/ALSCharacterMovementComponent.cpp b/Source/ALSV4_CPP/Private/Character/ALSCharacterMovementComponent.cpp index 48b71b8d..7fa749ac 100644 --- 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(); } -// 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/ALSCharacterMovementComponent.h b/Source/ALSV4_CPP/Public/Character/ALSCharacterMovementComponent.h index 7b341769..1bb70f2a 100644 --- 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); }; From c64366a570aabdfe4de815867d30f0c14e6ad08b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Do=C4=9Fa=20Can=20Yan=C4=B1ko=C4=9Flu?= Date: Thu, 5 Nov 2020 01:10:12 +0300 Subject: [PATCH 3/5] Update version to 4.10 --- ALSV4_CPP.uplugin | 2 +- .../Blueprints/UI/ALS_HUD.uasset | Bin 573140 -> 573141 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/ALSV4_CPP.uplugin b/ALSV4_CPP.uplugin index 51155d5b..41e01911 100644 --- 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 index 90c46a79b86267594e24fecff90062b75961c4b9..8d1346559705229d54df6d291c66ad2245b0f284 100644 GIT binary patch delta 2210 zcmZXUZET%o8OQgOo~PXlv>RQwv5=mTnM@4xet$7x+x;pIWQ{LtqGrxStTNdq8895C zGYgInBAt-lA|EzFLL3mc5b+p+uxa#*CTxi${k8=~5DYEhi<02{KRu^~XmZYZPJVfE z{qO7gU;q0rAKviVhc`@rF#L)8KNH@*@xJ(*na_Rl&6n2wqx|s3R(s|`tN+oh)t>6& zv4^Y9!&SAjuVQ8Ps_H=BZ+AZWMKwq9%KtlsSZpi2$9z05c0$esmsW)SGka&8dl-`^-FmRGyW)N-)# zGQGT-tS&c?iLz@2&~(|m0du0{S zY`M^|qu=hbN3I6jQchhBcHui+_VsHPsvW!rY-C@TeR>G&rLtoP?3>>$ZV2_RG;CEF z9tQixU0wF-FxYsx+^~P`@3NDt!A_O4tHEwL*kuRSfX$bqYruZ?y)N5+E!d7Sel6Hr zcX!#)2-tLKkARs&U3RHqm&<&^9=fN?&a4F^<=k4Z*?YTeY832fnH~k(a=4rr#hG`l z1KVHruEV583t5jzjjadzTJwLh`coIpHE8wB29OE-PLx+R09+{-K>D6I0=s-Ua$U6< z)}Oi#=$#iEbo|zh6~2A=Ue&pEWB=JTZ6#&OJX%3?Vv2GnvLwk7XQD_t`_9I#{SU5f z>lkH}fe0gH@K%NxoWqA&sd>)k__@&EITu<#pKJ@_Xs|2_qn(a{1ureN)|uoYRgreS z|7`0^YuYli%w0^vYn?Q=$xs(?4kHZJD*4X4FSp+KWjoW9BMCxqV+?0JaV>~&S_EQj zG_tel@%px^Y~Nqs)27B{tAi7qlN7RLnJ{H7Nx~TK3@z{dxE|^3_-VbZRmS(#*O$2m zYuPz`sHRoh86%}}O87`{GNpr7RvS&ZhW?Vy+WVkmy$FHQB$)MqCE2u)jn_^Q3&pgg z^VL?lYab+T|3M?cHKp2_Af%33x#YdoIeU_Ih|!b9R^FL{git>6l(eA2SV;}@Of%sb zmoi6_)RM$>tF!q>O?4}x@_}$+bM(?>!J;C;S`42hrD<#@Xyio|2#q9!zHZF0)eYDcMXEOy$D*T1XUIWmzL<$|G9O3pZ} z1U4b%kb?GlsUqCny9MqpjQ;6U&B+N1Lh<0yvW}Sx8Ny+|CaABPuI1RxuA5$_+JE5gdQ8@27vC0}w zc&3~;Eq%T!8=k|YG!My0wBjQ=LnD%VSRFay)0pxxnO{F&AFJ9-q5-RjAP5ZtgVhi+ z8l}C&-za*`%>4?*Gl`0GZ7?*RBGbu7ndcW1vE{{PW?7mb;j$1J zlhTPI$}!j!kzq}>?#cY&WynOvB920YN|Hs`n|R=81Dj$dYDM~+J`T2Clr1W`@iV4)N;pk?RcrTRR26*&k?mB=nb6x+d5 z@K{6TmCB-9vf%!kJO0A!b?1fG2mX3Td1Q3ZmW#IxZdx(0Y}vB*Zn2e;;%*xJd)f83 XfgNT3?fzCdGd_5%b9(3Crw;uW^`~zA delta 2213 zcmYk6TZ~;*8OOV)bM{PW=}a$ETB^)}G(tjX*ZuNfr|Sw7Wf~=I0s(6bj--}WEkdYf zNGgsGVq2SZS$t@Xi3B7vA=Vw!5L%5q7?YMnLVX&8s7XnjF~(?!fd75Y%+QnU%lT#P z@BiK3`rx)desJ4~_ecM??oThA|Hi-Xow;ReoL%_Dr^>n?b-JgobOujtuO6wc9DA;6 zo~x?e0~IY-S5}7xe!ctDPyV&HoE@x2t8SSctfmIWCVS{m2gsLaIzZ&}Jv31RJzVzG zKo9Kep^+h=cT0B&=-~%@Xs$({EekDr`jH-bWfXYKG>unh`PxQZUpu|YT4>CItuo} z!9Ke@3N~5(+_L{X-e+gmft@Y0>%i_l+-HZ@gUy#`)`OL=_1VM*u!*u~1K8ic-e)5l z!H$>iMlgM(&*oY-R~A|}^F*J$G6uGzTpR;?`y$Ni(oY(|*`%~rQCipyg6WGDB z|0ZN=tdPyf)c9tghuZh4>i2y#-=fjeTR`^WzOTH#1>nPS1!Um)qbQdzM{lmSq4ei& z2D)~kMKkwpt#A$CTG`yUb#QilR~nXG5>zBjnNCa_;qW6q+AKVy&DQOM&yIB&Wu7{j zgv>H}!L+j63ZHCD#z&H8E{4J8V(2_S)isiPO0yO?z>?8cXc42!PA4V3_07{i?>w-+ z%e7%PN+q&!fiQ1`up!wbxO652*8JnO&R>7gP2-a2q%=On4bcc8qEk0Nq{PX+u#%9+K>z$pl=Rp0*GXHEXo2QP{ zwCY-|j4{@TL>$eD<>V}vK59$hkmidzV^2bdhsYR@LFgom&PM1!oiTz(=MpD$S?8fn zId}jP_kX*U$c~zz85K6`pa~;M`Am&=fd^(NS(JEh8WN5WEqkFLfyOvxl+D)i6qEPH z#AS&Soo3s2Tk9-PAGjtW!0!}z64CKsjYYCtaBR`~rSHMIP&!2Fgg~JT5sU}zl=6xZ zukj}>TVD#`{U5Xv(paTcv_g^Kf)G+64a#{Dxz36#1yD{xf(cIGfEA9*)@+K#5aI+A zxCO74B`($DisEyoy+F`ROAfn1w%%t{l(MFKrv6RU6J#jGjn)oWBF*h-d2wOwB9+6 zPn>Gw#0jpsNmS)%(4pQbn?BCcl3=f$zV%`&s0huDWFg=i!i`R5>#ZSK!f%t7s+?FVm2`&7;;M~fo~u8>dwyTSC>ZOjtjk{siaLNNLMf<3dNZ-j98gb zZ!2wHl=4hA7YvOb4a0g|16eZ@Qbaf2hA)-C{$QHV7kF zmV#>KFxQr%^aSwW$ktVT;=utdn*8U@?lNYT7GS6@OhU0_UPhr##gSrW4LSQ-u+ zJ#!uVCJWZz{LJ}x>gN1ALw|X+Onj$aTh?3~y0g4_&+x6Q>J=+iboYwwwz#{7|5hg7 X9okhEt_^m|?4IFc%}cw7?>zE Date: Thu, 5 Nov 2020 01:15:58 +0300 Subject: [PATCH 4/5] Fix packaging compile issue --- Source/ALSV4_CPP/Public/Character/ALSBaseCharacter.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/ALSV4_CPP/Public/Character/ALSBaseCharacter.h b/Source/ALSV4_CPP/Public/Character/ALSBaseCharacter.h index 055b20b6..4b983820 100644 --- a/Source/ALSV4_CPP/Public/Character/ALSBaseCharacter.h +++ b/Source/ALSV4_CPP/Public/Character/ALSBaseCharacter.h @@ -654,7 +654,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 */ From f4c11f61fdf277d47bc16836f2b1cfb9c0686ad5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Do=C4=9Fa=20Can=20Yan=C4=B1ko=C4=9Flu?= Date: Thu, 5 Nov 2020 01:18:06 +0300 Subject: [PATCH 5/5] Forward declare EVisibilityBasedAnimTickOption instead of including related header --- Source/ALSV4_CPP/Public/Character/ALSBaseCharacter.h | 1 + 1 file changed, 1 insertion(+) diff --git a/Source/ALSV4_CPP/Public/Character/ALSBaseCharacter.h b/Source/ALSV4_CPP/Public/Character/ALSBaseCharacter.h index 4b983820..d17eda14 100644 --- 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