diff --git a/Config/DefaultGameplayTags.ini b/Config/DefaultGameplayTags.ini index b00f782..9a68c91 100644 --- a/Config/DefaultGameplayTags.ini +++ b/Config/DefaultGameplayTags.ini @@ -10,6 +10,9 @@ bDynamicReplication=False InvalidTagCharacters="\"\'," NumBitsForContainerSize=6 NetIndexFirstBitSegment=16 ++GameplayTagList=(Tag="Gameplay.Action.Camera.Move",DevComment="") ++GameplayTagList=(Tag="Gameplay.Action.Camera.Rotate",DevComment="") ++GameplayTagList=(Tag="Gameplay.Action.Camera.Zoom",DevComment="") +GameplayTagList=(Tag="Gameplay.Action.Move",DevComment="") +GameplayTagList=(Tag="Gameplay.Action.Run",DevComment="") diff --git a/Content/Blueprints/BP_NewChar.uasset b/Content/Blueprints/BP_NewChar.uasset index f8af0ec..7c58a98 100644 --- a/Content/Blueprints/BP_NewChar.uasset +++ b/Content/Blueprints/BP_NewChar.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a5b25f0dadfbc5c684d3db6aec760a13f359f288b21e1a2cd3651d937b97e6e0 -size 37257 +oid sha256:58b20bb1ddd3313979988db6ed5c9c230cd77288e678b9827a8d28ee913d0ced +size 38021 diff --git a/Content/Blueprints/BP_TestCtl.uasset b/Content/Blueprints/BP_TestCtl.uasset index 1c8d2e7..ab4bb7d 100644 --- a/Content/Blueprints/BP_TestCtl.uasset +++ b/Content/Blueprints/BP_TestCtl.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4ba150f2991cf1e91b9e76be44400a31c41ada90e11c96811690b1985ed711f3 -size 54202 +oid sha256:0cb3704d8914b33bfbbaa4ceda1f8382753e5b46b595c01b3dc0516154e82a7a +size 66777 diff --git a/Content/Blueprints/Component/BP_Controller.uasset b/Content/Blueprints/Component/BP_Controller.uasset new file mode 100644 index 0000000..abf797f --- /dev/null +++ b/Content/Blueprints/Component/BP_Controller.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b4d6f68289a97a8ff9d86f92e6a77c962ab6c32aa056fab73e0e6fbfba771af9 +size 93823 diff --git a/Content/Data/DA_InputCommands.uasset b/Content/Data/DA_InputCommands.uasset index 70436a7..606a571 100644 --- a/Content/Data/DA_InputCommands.uasset +++ b/Content/Data/DA_InputCommands.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:db42db5eceb11ef842fd29a9483172da200900186d58acd433a88c70840a9425 -size 2926 +oid sha256:dca7044280c1ea9807a6a8f02a053a33892d9a2d842baa474008b5621915002e +size 3742 diff --git a/Content/Inputs/IA/IA_CameraLeft.uasset b/Content/Inputs/IA/IA_CameraLeft.uasset new file mode 100644 index 0000000..72d8675 --- /dev/null +++ b/Content/Inputs/IA/IA_CameraLeft.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e02b377388a5aedf1c1c5a2f13bcc9630f928c80e861401e48c3820b0dc283bc +size 1172 diff --git a/Content/Inputs/IA/IA_CameraRight.uasset b/Content/Inputs/IA/IA_CameraRight.uasset new file mode 100644 index 0000000..039bcd2 --- /dev/null +++ b/Content/Inputs/IA/IA_CameraRight.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bca07c3562925612b178b07ed4a532bff27f4dcbce6ea9644d89a67611a4d684 +size 1177 diff --git a/Content/Inputs/IA/IA_CameraRotateAction.uasset b/Content/Inputs/IA/IA_CameraRotateAction.uasset index cc6ee67..9068ba3 100644 --- a/Content/Inputs/IA/IA_CameraRotateAction.uasset +++ b/Content/Inputs/IA/IA_CameraRotateAction.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:637ee74171478765d6a85ea16d0e041980afb867dc139ff79847b16ce4995c73 -size 1212 +oid sha256:3616ba22b4458af7b834080182252b5537e1bc37c64bb6504c3110099fe981a9 +size 1408 diff --git a/Content/Inputs/IMC/IMC_Context.uasset b/Content/Inputs/IMC/IMC_Context.uasset index cbb6cf2..30a7dc1 100644 --- a/Content/Inputs/IMC/IMC_Context.uasset +++ b/Content/Inputs/IMC/IMC_Context.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:185d3d5ea8d60f08f919003d85e587d15685d4d85732d9ccab8bd9bb082ee55b -size 10031 +oid sha256:a8bdf9e5204a761e8e5a6dd2503278ed89f08369a02de4db8906eeaee1b2f8c1 +size 7750 diff --git a/Plugins/CharacterControl b/Plugins/CharacterControl index 14cdc63..8eb8cde 160000 --- a/Plugins/CharacterControl +++ b/Plugins/CharacterControl @@ -1 +1 @@ -Subproject commit 14cdc6324d244a3334f6b490c915d118d8acb730 +Subproject commit 8eb8cde913ac768abe09a5664610f69dbba83e19 diff --git a/Plugins/Dialog b/Plugins/Dialog index 6e3136b..5196b06 160000 --- a/Plugins/Dialog +++ b/Plugins/Dialog @@ -1 +1 @@ -Subproject commit 6e3136b10cd17b598c442338f5666481e7f6ca05 +Subproject commit 5196b064807839d84b4894f093bd08b7c07acd5d diff --git a/Source/lonese/MyPlayerController.cpp b/Source/lonese/MyPlayerController.cpp index bfa3d48..658a704 100644 --- a/Source/lonese/MyPlayerController.cpp +++ b/Source/lonese/MyPlayerController.cpp @@ -11,4 +11,9 @@ APawn* AMyPlayerController::GetOwnedPawn() void AMyPlayerController::BeginPlay() { Super::BeginPlay(); -} \ No newline at end of file +} + +void AMyPlayerController::CalcCamera(float DeltaTime, FMinimalViewInfo& OutResult) +{ + AActor::CalcCamera(DeltaTime, OutResult); +} diff --git a/Source/lonese/MyPlayerController.h b/Source/lonese/MyPlayerController.h index e8d9691..311b90d 100644 --- a/Source/lonese/MyPlayerController.h +++ b/Source/lonese/MyPlayerController.h @@ -20,6 +20,6 @@ public: protected: virtual void BeginPlay() override; - + virtual void CalcCamera(float DeltaTime, FMinimalViewInfo& OutResult) override; private: };