diff --git a/assets/Data/creatures/human.json b/assets/Data/creatures/human.json index fca7a232..046527c6 100644 --- a/assets/Data/creatures/human.json +++ b/assets/Data/creatures/human.json @@ -334,14 +334,26 @@ }, { "variantId": "block2H", + "windUpAnimation" : { + "nameThirdPerson": "HoldItemR2HBlockStart", + "nameFirstPerson": "HoldItemR2HBlockWindUp", + "priorityCategory": "MOVEMENT_MODIFIER", + "boneGroups" : ["armLeft", "armRight", "handLeft", "handRight"] + }, + "windUpAudio" : { + "audioPath" : "Audio/weapons/swordUnsheath1.ogg" + }, "mainAnimation" : { "nameThirdPerson": "HoldItemR2HBlock", "nameFirstPerson": "HoldItemR2HBlock", "priorityCategory": "MOVEMENT_MODIFIER", "boneGroups" : ["armLeft", "armRight", "handLeft", "handRight"] }, - "windUpAudio" : { - "audioPath" : "Audio/weapons/swordUnsheath1.ogg" + "cooldownAnimation" : { + "nameThirdPerson": "HoldItemR2HBlockCooldown", + "nameFirstPerson": "HoldItemR2HBlockCooldown", + "priorityCategory": "MOVEMENT_MODIFIER", + "boneGroups" : ["armLeft", "armRight", "handLeft", "handRight"] }, "defaults" : [ { @@ -457,7 +469,8 @@ "animation" : { "nameFirstPerson" : "SwordR2HSlash", "nameThirdPerson" : "SwordR2HSlash", - "priorityCategory" : "MOVEMENT_MODIFIER" + "priorityCategory" : "MOVEMENT_MODIFIER", + "boneGroups" : ["armLeft", "armRight", "handLeft", "handRight"] }, "audioData" : { "audioPath" : "Audio/weapons/swoosh-03.ogg" diff --git a/assets/Models/creatures/person2/person2_1.glb b/assets/Models/creatures/person2/person2_1.glb index a3366ca4..e8e59f52 100644 Binary files a/assets/Models/creatures/person2/person2_1.glb and b/assets/Models/creatures/person2/person2_1.glb differ diff --git a/assets/Models/creatures/viewmodel.glb b/assets/Models/creatures/viewmodel.glb index 52be4846..19cccd15 100644 Binary files a/assets/Models/creatures/viewmodel.glb and b/assets/Models/creatures/viewmodel.glb differ diff --git a/docs/src/progress/currenttarget.md b/docs/src/progress/currenttarget.md index 1c098dd8..faa68b2c 100644 --- a/docs/src/progress/currenttarget.md +++ b/docs/src/progress/currenttarget.md @@ -15,7 +15,6 @@ + fix the vibes Stability Movement penalty while swinging weapon - Transition animation for blocking with two hands + bug fixes Fix grass rendering distance diff --git a/docs/src/progress/renderertodo.md b/docs/src/progress/renderertodo.md index 9d09bc9b..edb82ab7 100644 --- a/docs/src/progress/renderertodo.md +++ b/docs/src/progress/renderertodo.md @@ -562,6 +562,8 @@ Fix katana is frustum culled incorrectly (08/14/2024) Fix rendering pipelines being broken when the katana is not drawn +Fix deleting entities on server not properly deleting the whole entity +Windup and Cooldown animations on 2h block # TODO