diff --git a/Content/Character/Allium/Alium_Q_1.uasset b/Content/Character/Allium/Alium_Q_1.uasset new file mode 100644 index 0000000..b02203c --- /dev/null +++ b/Content/Character/Allium/Alium_Q_1.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:39ed79a695a4516283f0ce403537413e1c4fec96e87508fb05c9bea4585dd6a1 +size 32213 diff --git a/Content/Character/Allium/Alium_Skill2.uasset b/Content/Character/Allium/Alium_Skill2.uasset new file mode 100644 index 0000000..4f6810b --- /dev/null +++ b/Content/Character/Allium/Alium_Skill2.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c3c17440b2244b46845119be6679fd4289c1f295952ce3fc96ad1e1efca3a608 +size 23133 diff --git a/Content/Character/Allium/Alium_W.uasset b/Content/Character/Allium/Alium_W.uasset new file mode 100644 index 0000000..e72658d --- /dev/null +++ b/Content/Character/Allium/Alium_W.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:afe807bd7b0aa0fe1ef0659da3cd6f5d27cdaa3154d643e0c74f93b3e0804b75 +size 2709707 diff --git a/Content/Character/Allium/Animation/ABP_Allium.uasset b/Content/Character/Allium/Animation/ABP_Allium.uasset index 473064b..6f7c71b 100644 --- a/Content/Character/Allium/Animation/ABP_Allium.uasset +++ b/Content/Character/Allium/Animation/ABP_Allium.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:563c4fd86466b9763b2c4e748e1abbd2c77f6319120a7d21bbddd415da1d717f -size 92656 +oid sha256:362fd3d6fcfbd0cfb0cc30e6870a2b0280e3fafa508578914a649cfdf9f2f9c2 +size 280416 diff --git a/Content/Character/Allium/Animation/AttackCombo.uasset b/Content/Character/Allium/Animation/AttackCombo.uasset index 7940ec9..6b001d0 100644 --- a/Content/Character/Allium/Animation/AttackCombo.uasset +++ b/Content/Character/Allium/Animation/AttackCombo.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:05f871db620ab63ea1883b0d1dc51bd7bac6aa016cac2982586f2a0a0e34a6e2 -size 10394 +oid sha256:daee87f1d02ae6f6d77481f10a59ee7f61ebb719c019f4c4acb8bf5760c85ced +size 10343 diff --git a/Content/Character/Allium/Animation/Skill1_Anim.uasset b/Content/Character/Allium/Animation/Skill1_Anim.uasset index bdeeca9..c5f3364 100644 --- a/Content/Character/Allium/Animation/Skill1_Anim.uasset +++ b/Content/Character/Allium/Animation/Skill1_Anim.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:62a4b589eba7c075febd5abd5da6b2bd4747b50398a8aad5b1cba0b9f0be1708 -size 148146 +oid sha256:fd556610da0df0a6a16fc09f65567c84ea62db0cfa4197a7902cd1472391384f +size 152237 diff --git a/Content/Character/Allium/Animation/Skill2_Anim.uasset b/Content/Character/Allium/Animation/Skill2_Anim.uasset index d1b8d4c..8163963 100644 --- a/Content/Character/Allium/Animation/Skill2_Anim.uasset +++ b/Content/Character/Allium/Animation/Skill2_Anim.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:63652406246641ac09c0cd9030af0a8cc8a79f12e5853e62711e1679d2b3e0f4 -size 128564 +oid sha256:6539635adc8b24217af1bbc63737c941c084faf30a1ae8c3b25a9082f4a9de0c +size 132678 diff --git a/Content/Character/Allium/Animation/Skill3_Anim.uasset b/Content/Character/Allium/Animation/Skill3_Anim.uasset index 9d48cf4..3a7b785 100644 --- a/Content/Character/Allium/Animation/Skill3_Anim.uasset +++ b/Content/Character/Allium/Animation/Skill3_Anim.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9e4a1b8d3acfa433867675f0802ab72e07bfd3560be2115e6fd950d76e65d9a8 -size 148021 +oid sha256:edfd48e96369cd5c11d4c4bb7cd183881e87126d5ce048e1c7e4fcf75a940337 +size 152144 diff --git a/Content/Character/Allium/Animation/Skill4_2_Anim.uasset b/Content/Character/Allium/Animation/Skill4_2_Anim.uasset index be6d8ad..db038ce 100644 --- a/Content/Character/Allium/Animation/Skill4_2_Anim.uasset +++ b/Content/Character/Allium/Animation/Skill4_2_Anim.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bebee620b94c23ce6d3c4b4e0a0d79b19c5c04b5528f015aea07d704b5fc07b0 -size 178321 +oid sha256:14924dede128da8b50bd7c9793a288d4ad8acbfa014850a9f0e78c5cd5e19985 +size 182598 diff --git a/Content/Character/Allium/BP_Allium.uasset b/Content/Character/Allium/BP_Allium.uasset index d65b310..8af03e5 100644 --- a/Content/Character/Allium/BP_Allium.uasset +++ b/Content/Character/Allium/BP_Allium.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9badfd45987b6bd3b5a305561a5a4f936de41ded9979460ed7c96d84e980ceed -size 42428 +oid sha256:fcb784f0cb24a64149aec72d17cb4247ead004a0b33e9a3b4e35b5df4979ad06 +size 136354 diff --git a/Content/Character/BP_Folder/DefaultClass.uasset b/Content/Character/BP_Folder/DefaultClass.uasset new file mode 100644 index 0000000..290e04d --- /dev/null +++ b/Content/Character/BP_Folder/DefaultClass.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b5ed77da0ce480dc769b0b85a288efb92533d78c89c87e099f1113df2782f898 +size 18108 diff --git a/Content/Character/Lb/Animation/ABP_Lb.uasset b/Content/Character/Lb/Animation/ABP_Lb.uasset index 7608da2..9830bab 100644 --- a/Content/Character/Lb/Animation/ABP_Lb.uasset +++ b/Content/Character/Lb/Animation/ABP_Lb.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:af6cb9237f08342613ad4d82d44cd4691193b8a19a22d6c731ffca4fe3f71a5a -size 288811 +oid sha256:19a595e309286b475f42c5ba91074a9af7f66a42a630a815443662e6389d552f +size 274795 diff --git a/Content/Character/Lb/BP_Lb.uasset b/Content/Character/Lb/BP_Lb.uasset index 592916e..ed5ae7a 100644 --- a/Content/Character/Lb/BP_Lb.uasset +++ b/Content/Character/Lb/BP_Lb.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4333582ec21603e00a3b2e40c45435c9021d66acb90c0aa972003751ae2bc254 -size 105236 +oid sha256:5823f96c3536dcb4e632cd19dfc682a50b9b02d64e73e61f1fecbc0b09e4b4da +size 147586 diff --git a/Content/Character/Lb/LB_Bolla_Throw.uasset b/Content/Character/Lb/LB_Bolla_Throw.uasset new file mode 100644 index 0000000..8328842 --- /dev/null +++ b/Content/Character/Lb/LB_Bolla_Throw.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fb47290031b302262dc6571fe6ff9eaf99f70ad2af232f572e3f711235e94727 +size 31160 diff --git a/Content/Character/Notify/Rotating.uasset b/Content/Character/Notify/Rotating.uasset index 4b501ea..1721fbc 100644 --- a/Content/Character/Notify/Rotating.uasset +++ b/Content/Character/Notify/Rotating.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:91d70510270971c37f2ca062eaaed6a22a7b8ca059724a32ebafcea74d9ecb5e -size 57531 +oid sha256:722e1ba1cb36019a359f0a97fb2e4dd68f1bf9d66e18a5cbf36590126b04b1bf +size 22176 diff --git a/Content/Effect/LB/Bolla_Throw.uasset b/Content/Effect/LB/Bolla_Throw.uasset index f6e65f4..e966422 100644 --- a/Content/Effect/LB/Bolla_Throw.uasset +++ b/Content/Effect/LB/Bolla_Throw.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3032829c1357c6752372b76c11ac8833201290f2bcb5723ce3db19b02c1b8f5e -size 2435 +oid sha256:e67491966cf5cb89fa6f8cc50d80af11e60a1528f62521909418794ac10f3bb6 +size 2450 diff --git a/Source/Promether/GameModeBase/Deathmatch.cpp b/Source/Promether/GameModeBase/Deathmatch.cpp index db8175f..8c6ea7e 100644 --- a/Source/Promether/GameModeBase/Deathmatch.cpp +++ b/Source/Promether/GameModeBase/Deathmatch.cpp @@ -133,7 +133,7 @@ FString ADeathmatch::InitNewPlayer(APlayerController* NewPlayerController, const //DebugPerpose if (Type == CharacterType::Lukriel) { - Type = CharacterType::Lb; + Type = CharacterType::Allium; } if (Team == TeamType::Null) { diff --git a/Source/Promether/PlayerGeneric/DefaultPlayerCharacter.cpp b/Source/Promether/PlayerGeneric/DefaultPlayerCharacter.cpp index 384cfa6..76e1f35 100644 --- a/Source/Promether/PlayerGeneric/DefaultPlayerCharacter.cpp +++ b/Source/Promether/PlayerGeneric/DefaultPlayerCharacter.cpp @@ -16,7 +16,7 @@ ADefaultPlayerCharacter::ADefaultPlayerCharacter() CameraSpringArm = CreateDefaultSubobject(TEXT("SpringArm")); CameraSpringArm->SetRelativeLocationAndRotation(FVector(0.0f, 0.0f, 0.0f), FRotator(-45.0f, 0.0f, 0.0f)); CameraSpringArm->SetAbsolute(false, true, true); - CameraSpringArm->TargetArmLength = 2000.f; + CameraSpringArm->TargetArmLength = 1000.f; CameraSpringArm->bEnableCameraLag = true; CameraSpringArm->bDoCollisionTest = false; CameraSpringArm->CameraLagSpeed = 3.0f;