diff --git a/SwordNGun/Content/Characters/Protagonist/Animations/Locomotion/Roll_RootMotion.uasset b/SwordNGun/Content/Characters/Protagonist/Animations/Locomotion/Roll_RootMotion.uasset new file mode 100644 index 0000000..e0768a4 --- /dev/null +++ b/SwordNGun/Content/Characters/Protagonist/Animations/Locomotion/Roll_RootMotion.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6c3f8395a771e58230a6fed7760c3cd37d816fc82ea01f159970db3ddee780ea +size 174271 diff --git a/SwordNGun/Content/Characters/Protagonist/Animations/Locomotion/Roll_RootMotion_Montage.uasset b/SwordNGun/Content/Characters/Protagonist/Animations/Locomotion/Roll_RootMotion_Montage.uasset new file mode 100644 index 0000000..3c27285 --- /dev/null +++ b/SwordNGun/Content/Characters/Protagonist/Animations/Locomotion/Roll_RootMotion_Montage.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:27d8b0559a39c7eb5ef7c3d37f58f7ed45629b55cb44722d495241fbbb315eb4 +size 97983 diff --git a/SwordNGun/Content/Characters/Protagonist/Animations/Locomotion/ThirdPersonIdle.uasset b/SwordNGun/Content/Characters/Protagonist/Animations/Locomotion/ThirdPersonIdle.uasset new file mode 100644 index 0000000..8c1fa87 --- /dev/null +++ b/SwordNGun/Content/Characters/Protagonist/Animations/Locomotion/ThirdPersonIdle.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:413b5f44668b424ceacc8cc4e39e0b058d64e98713b8f3d433b459aeab2ceeda +size 148423 diff --git a/SwordNGun/Content/Characters/Protagonist/Animations/Locomotion/ThirdPersonJump_Loop.uasset b/SwordNGun/Content/Characters/Protagonist/Animations/Locomotion/ThirdPersonJump_Loop.uasset new file mode 100644 index 0000000..cc3fc82 --- /dev/null +++ b/SwordNGun/Content/Characters/Protagonist/Animations/Locomotion/ThirdPersonJump_Loop.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b5e49a6336cc029f8042acef923edae815322493357407317052fdad3975ec75 +size 121532 diff --git a/SwordNGun/Content/Characters/Protagonist/Animations/Locomotion/ThirdPersonJump_Start.uasset b/SwordNGun/Content/Characters/Protagonist/Animations/Locomotion/ThirdPersonJump_Start.uasset new file mode 100644 index 0000000..30e9c04 --- /dev/null +++ b/SwordNGun/Content/Characters/Protagonist/Animations/Locomotion/ThirdPersonJump_Start.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:91c1da7af24f92b0d5d22d6c5511799e63cc24429a0d1eef3289b961c8119cbb +size 117517 diff --git a/SwordNGun/Content/Characters/Protagonist/Animations/Locomotion/ThirdPersonRun.uasset b/SwordNGun/Content/Characters/Protagonist/Animations/Locomotion/ThirdPersonRun.uasset new file mode 100644 index 0000000..19332df --- /dev/null +++ b/SwordNGun/Content/Characters/Protagonist/Animations/Locomotion/ThirdPersonRun.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4664d78315018afefabd5d48f08413033aa833d44ba3f1f6ed639f38e4f00c8c +size 118934 diff --git a/SwordNGun/Content/Characters/Protagonist/Animations/Locomotion/ThirdPersonWalk.uasset b/SwordNGun/Content/Characters/Protagonist/Animations/Locomotion/ThirdPersonWalk.uasset new file mode 100644 index 0000000..a3307ba --- /dev/null +++ b/SwordNGun/Content/Characters/Protagonist/Animations/Locomotion/ThirdPersonWalk.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:14054c59c2772e384346cc670634d64db15a8057e25255b9bc0534af42597263 +size 128197 diff --git a/SwordNGun/Content/Characters/Protagonist/Animations/Locomotion/ThirdPerson_IdleRun_2D.uasset b/SwordNGun/Content/Characters/Protagonist/Animations/Locomotion/ThirdPerson_IdleRun_2D.uasset new file mode 100644 index 0000000..a5beeb4 --- /dev/null +++ b/SwordNGun/Content/Characters/Protagonist/Animations/Locomotion/ThirdPerson_IdleRun_2D.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:40e3472466fbae856db6dd5402b4f4cc3a2a17fb9c1df5c160f3e2327269445d +size 97796 diff --git a/SwordNGun/Content/Characters/Protagonist/Animations/Locomotion/ThirdPerson_Jump.uasset b/SwordNGun/Content/Characters/Protagonist/Animations/Locomotion/ThirdPerson_Jump.uasset new file mode 100644 index 0000000..07bcc09 --- /dev/null +++ b/SwordNGun/Content/Characters/Protagonist/Animations/Locomotion/ThirdPerson_Jump.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8747960e3b92614f65e77a4b5f025fb0e47f58c24f14208e661ea9e433f414e0 +size 114121 diff --git a/SwordNGun/Content/Characters/Protagonist/Animations/ThirdPersonIdle.uasset b/SwordNGun/Content/Characters/Protagonist/Animations/ThirdPersonIdle.uasset index de66980..27a43f4 100644 --- a/SwordNGun/Content/Characters/Protagonist/Animations/ThirdPersonIdle.uasset +++ b/SwordNGun/Content/Characters/Protagonist/Animations/ThirdPersonIdle.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0900bd310a26dfb5f696e4180a02819739bffc6e94e4a05a4b1aad6efbb55113 -size 141123 +oid sha256:04f91d85219e42cfd3573298a9915ab96f4dcc784a7d5c5e70c3153d35f94157 +size 1427 diff --git a/SwordNGun/Content/Characters/Protagonist/Animations/ThirdPersonJump_Loop.uasset b/SwordNGun/Content/Characters/Protagonist/Animations/ThirdPersonJump_Loop.uasset index 5891721..9361232 100644 --- a/SwordNGun/Content/Characters/Protagonist/Animations/ThirdPersonJump_Loop.uasset +++ b/SwordNGun/Content/Characters/Protagonist/Animations/ThirdPersonJump_Loop.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:76add46da954b01125de046df1ba1a7590f78a20a69e166c32656f32894d8120 -size 113973 +oid sha256:e95969d647e35f27378f107ca12e57c1a89082881f48e1e20210e3d1decf5a1b +size 1462 diff --git a/SwordNGun/Content/Characters/Protagonist/Animations/ThirdPersonJump_Start.uasset b/SwordNGun/Content/Characters/Protagonist/Animations/ThirdPersonJump_Start.uasset index be7b4da..5b7206b 100644 --- a/SwordNGun/Content/Characters/Protagonist/Animations/ThirdPersonJump_Start.uasset +++ b/SwordNGun/Content/Characters/Protagonist/Animations/ThirdPersonJump_Start.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5527a6f88a882434c8a6f196d12149702e3d9b07eecc1de684484eda8bf6d986 -size 109908 +oid sha256:209ae33d7915371d011796aabb8ce7e03592589b483c5183ac5dac0f76b4d8f1 +size 1469 diff --git a/SwordNGun/Content/Characters/Protagonist/Animations/ThirdPersonRun.uasset b/SwordNGun/Content/Characters/Protagonist/Animations/ThirdPersonRun.uasset index 8d0ac8b..2b722f9 100644 --- a/SwordNGun/Content/Characters/Protagonist/Animations/ThirdPersonRun.uasset +++ b/SwordNGun/Content/Characters/Protagonist/Animations/ThirdPersonRun.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2c6ccd3329c182d12ed6302629a52bff10a73523ed966f841fec7b4d56845ed8 -size 111125 +oid sha256:b1aa0d8007ea515c1c59c6865728dd49c0855ea1ed779dd2ed02a75178cf776f +size 1420 diff --git a/SwordNGun/Content/Characters/Protagonist/Animations/ThirdPersonWalk.uasset b/SwordNGun/Content/Characters/Protagonist/Animations/ThirdPersonWalk.uasset index 10e6e3a..0955385 100644 --- a/SwordNGun/Content/Characters/Protagonist/Animations/ThirdPersonWalk.uasset +++ b/SwordNGun/Content/Characters/Protagonist/Animations/ThirdPersonWalk.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f6f9c8890c26bc8793dabfe550cd9a2d406c29c405ea18dfb2ca5d20fcd66e1c -size 121605 +oid sha256:f1f4954c31e937e46a0f3e1cb4c85536addde4306942265791daad6f21d4835a +size 1427 diff --git a/SwordNGun/Content/Characters/Protagonist/Animations/ThirdPerson_AnimBP.uasset b/SwordNGun/Content/Characters/Protagonist/Animations/ThirdPerson_AnimBP.uasset index c1af08e..673d21b 100644 --- a/SwordNGun/Content/Characters/Protagonist/Animations/ThirdPerson_AnimBP.uasset +++ b/SwordNGun/Content/Characters/Protagonist/Animations/ThirdPerson_AnimBP.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:13448251c4fd6bc990f25df6403d4c5c8472b9b956634d4a3eca1d0d500ef16e -size 231713 +oid sha256:c981eb32d12e2cd4c69fef2a151bafcb0fc422e42a97fa81c37f45c56a2b727f +size 243158 diff --git a/SwordNGun/Content/Characters/Protagonist/Animations/ThirdPerson_IdleRun_2D.uasset b/SwordNGun/Content/Characters/Protagonist/Animations/ThirdPerson_IdleRun_2D.uasset index b8035f9..d65c282 100644 --- a/SwordNGun/Content/Characters/Protagonist/Animations/ThirdPerson_IdleRun_2D.uasset +++ b/SwordNGun/Content/Characters/Protagonist/Animations/ThirdPerson_IdleRun_2D.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3a1a47f6193114a4a802ec9aa0d67715aa2f34c7dcc66d72096bb704ede3ea29 -size 90366 +oid sha256:167a46fd2c8165dee25943a21e9cceb14c0076254f6ee040e8317360c55c1048 +size 1476 diff --git a/SwordNGun/Content/Characters/Protagonist/Animations/ThirdPerson_Jump.uasset b/SwordNGun/Content/Characters/Protagonist/Animations/ThirdPerson_Jump.uasset index 8166945..cd07900 100644 --- a/SwordNGun/Content/Characters/Protagonist/Animations/ThirdPerson_Jump.uasset +++ b/SwordNGun/Content/Characters/Protagonist/Animations/ThirdPerson_Jump.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:875ebfaf0a6db414ea62c6cd5031e9c5aa553f288bea744294741aa954593c6c -size 107469 +oid sha256:26fa24f3cb648a8506282d66ce0fc0080673e62bfdbe397ea5b64733a7b2ea25 +size 1434 diff --git a/SwordNGun/Content/Characters/Protagonist/BP_Protagonist.uasset b/SwordNGun/Content/Characters/Protagonist/BP_Protagonist.uasset index e4df0e3..fb72ae9 100644 --- a/SwordNGun/Content/Characters/Protagonist/BP_Protagonist.uasset +++ b/SwordNGun/Content/Characters/Protagonist/BP_Protagonist.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:09f6d216f67d1116b694ac42e7b6f3090144a56a398d026418abfe6c10f770e3 -size 116827 +oid sha256:61d07838aab97f03d905bf9ae5a89e8aae7b52c197a5358545003763ec635667 +size 111642 diff --git a/SwordNGun/Content/Characters/Protagonist/Character/Mesh/UE4_Mannequin_Skeleton.uasset b/SwordNGun/Content/Characters/Protagonist/Character/Mesh/UE4_Mannequin_Skeleton.uasset index 7d846a3..0e3a07f 100644 --- a/SwordNGun/Content/Characters/Protagonist/Character/Mesh/UE4_Mannequin_Skeleton.uasset +++ b/SwordNGun/Content/Characters/Protagonist/Character/Mesh/UE4_Mannequin_Skeleton.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1a39e6f46fb688aed65bf770f55b21de3cbe347d7bea61f2538e6674eb5b9c2f -size 21686 +oid sha256:d026744555f298f14c8b197b12d5dc39832ba0f2049aed590f1e034153478652 +size 22821 diff --git a/SwordNGun/Content/Core/Characters/AN_SetIgnoreCharacterMovement.uasset b/SwordNGun/Content/Core/Characters/AN_SetIgnoreCharacterMovement.uasset new file mode 100644 index 0000000..03ec720 --- /dev/null +++ b/SwordNGun/Content/Core/Characters/AN_SetIgnoreCharacterMovement.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:21566823f7f715298c4634911c102c4535dff8db656f6f3c2cef8259c5d9917d +size 30437 diff --git a/SwordNGun/Content/Maps/Test.umap b/SwordNGun/Content/Maps/Test.umap index 8217bda..8f101e6 100644 --- a/SwordNGun/Content/Maps/Test.umap +++ b/SwordNGun/Content/Maps/Test.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:994d1696304c104fedd354aae03d5274bde8dd5fde5a13af6946cce0848659a8 -size 632757 +oid sha256:29ea516ad4c2a25615067a744718bce9cf2fc6a55da7397ca06b166d617f4cf5 +size 631613 diff --git a/SwordNGun/Content/Maps/Test_BuiltData.uasset b/SwordNGun/Content/Maps/Test_BuiltData.uasset index 17c1053..01f171d 100644 --- a/SwordNGun/Content/Maps/Test_BuiltData.uasset +++ b/SwordNGun/Content/Maps/Test_BuiltData.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c8bf1607db154c698a423ca43a91e03eb74788e9173818f873f8c9cece738957 -size 2329681 +oid sha256:6ed93eb057f79771a397f9597e2f608f52a8fa81998f14209b99833f9903cfdd +size 2330061 diff --git a/SwordNGun/Source/SwordNGun/Private/Characters/SNGCharacterBase.cpp b/SwordNGun/Source/SwordNGun/Private/Characters/SNGCharacterBase.cpp index 4872197..56ee54b 100644 Binary files a/SwordNGun/Source/SwordNGun/Private/Characters/SNGCharacterBase.cpp and b/SwordNGun/Source/SwordNGun/Private/Characters/SNGCharacterBase.cpp differ diff --git a/SwordNGun/Source/SwordNGun/Private/Characters/SNGProtagonist.cpp b/SwordNGun/Source/SwordNGun/Private/Characters/SNGProtagonist.cpp index 71c86f2..cd8b85e 100644 Binary files a/SwordNGun/Source/SwordNGun/Private/Characters/SNGProtagonist.cpp and b/SwordNGun/Source/SwordNGun/Private/Characters/SNGProtagonist.cpp differ diff --git a/SwordNGun/Source/SwordNGun/Public/Characters/SNGCharacterBase.h b/SwordNGun/Source/SwordNGun/Public/Characters/SNGCharacterBase.h index f45c261..52521d5 100644 Binary files a/SwordNGun/Source/SwordNGun/Public/Characters/SNGCharacterBase.h and b/SwordNGun/Source/SwordNGun/Public/Characters/SNGCharacterBase.h differ diff --git a/SwordNGun/Source/SwordNGun/Public/Characters/SNGProtagonist.h b/SwordNGun/Source/SwordNGun/Public/Characters/SNGProtagonist.h index cd23d71..c0e576e 100644 Binary files a/SwordNGun/Source/SwordNGun/Public/Characters/SNGProtagonist.h and b/SwordNGun/Source/SwordNGun/Public/Characters/SNGProtagonist.h differ