From 3877efec508df2a06523f9d1dbf2138ce9aec183 Mon Sep 17 00:00:00 2001 From: Justin Shipsey Date: Mon, 1 Jun 2020 00:33:24 +0000 Subject: [PATCH] optimization and tails --- CHANGELOG.md | 2 + .../audio/soundtrack/between_the_fairies.ogg | 4 +- .../audio/soundtrack/campfire_stories.ogg | 4 +- .../audio/soundtrack/down_the_rabbit_hole.ogg | 4 +- .../audio/soundtrack/field_grazing.ogg | 4 +- .../audio/soundtrack/just_the_beginning.ogg | 4 +- assets/voxygen/audio/soundtrack/limits.ogg | 4 +- .../audio/soundtrack/mineral_deposits.ogg | 4 +- assets/voxygen/audio/soundtrack/moonbeams.ogg | 4 +- .../voxygen/audio/soundtrack/rest_assured.ogg | 4 +- .../audio/soundtrack/serene_meadows.ogg | 4 +- .../audio/soundtrack/snowtop_volume.ogg | 4 +- .../audio/soundtrack/veloren_title_tune.ogg | 4 +- .../audio/soundtrack/wandering_voices.ogg | 4 +- assets/voxygen/background/bg_1.png | 4 +- assets/voxygen/background/bg_10.png | 4 +- assets/voxygen/background/bg_11.png | 4 +- assets/voxygen/background/bg_12.png | 4 +- assets/voxygen/background/bg_13.png | 4 +- assets/voxygen/background/bg_14.png | 4 +- assets/voxygen/background/bg_15.png | 4 +- assets/voxygen/background/bg_2.png | 4 +- assets/voxygen/background/bg_3.png | 4 +- assets/voxygen/background/bg_4.png | 4 +- assets/voxygen/background/bg_5.png | 4 +- assets/voxygen/background/bg_6.png | 4 +- assets/voxygen/background/bg_7.png | 4 +- assets/voxygen/background/bg_8.png | 4 +- assets/voxygen/background/bg_9.png | 4 +- assets/voxygen/background/bg_main.png | 4 +- assets/voxygen/background/death.png | 4 +- assets/voxygen/background/hurt.png | 4 +- .../voxygen/voxel/armor/belt/cloth_black.vox | 4 +- .../voxygen/voxel/armor/belt/cloth_grey.vox | 4 +- assets/voxygen/voxel/armor/belt/dark.vox | 4 +- .../voxel/armor/chest/cloth_red_kimono.vox | 4 +- .../voxygen/voxel/armor/chest/grayscale.vox | 4 +- .../voxygen/voxel/armor/chest/leather-0.vox | 4 +- .../voxygen/voxel/armor/chest/leather-2.vox | 4 +- .../voxel/armor/chest/plate_green-0.vox | 4 +- assets/voxygen/voxel/armor/empty.vox | 4 +- assets/voxygen/voxel/armor/foot/assa.vox | 4 +- assets/voxygen/voxel/armor/foot/dark-0.vox | 4 +- .../voxel/armor/foot/dark_jester-elf_shoe.vox | 4 +- assets/voxygen/voxel/armor/foot/foot_none.vox | 4 +- .../voxygen/voxel/armor/hand/assa_right.vox | 4 +- assets/voxygen/voxel/armor/hand/bare_left.vox | 4 +- .../voxygen/voxel/armor/hand/bare_right.vox | 4 +- .../voxel/armor/hand/cloth_basic_left.vox | 4 +- .../voxel/armor/hand/cloth_basic_right.vox | 4 +- .../voxel/armor/hand/cloth_blue_left-0.vox | 4 +- .../voxel/armor/hand/cloth_green_left-0.vox | 4 +- .../voxel/armor/hand/cloth_green_right-0.vox | 4 +- .../voxel/armor/hand/cloth_purple_left-0.vox | 4 +- .../voxel/armor/hand/cloth_purple_right-0.vox | 4 +- .../voxel/armor/hand/plate_right-0.vox | 4 +- .../voxel/armor/shoulder/chain_left-1.vox | 4 +- .../voxel/armor/shoulder/chain_left.vox | 4 +- .../voxel/armor/shoulder/chain_right-1.vox | 4 +- .../voxel/armor/shoulder/chain_right.vox | 4 +- .../armor/shoulder/cloth_purple_left-0.vox | 4 +- .../voxel/armor/shoulder/leather_left-0.vox | 4 +- .../voxel/armor/shoulder/leather_right-0.vox | 4 +- .../voxel/armor/shoulder/leather_right-1.vox | 4 +- .../voxel/armor/shoulder/plate_right-0.vox | 4 +- assets/voxygen/voxel/lantern/black-0.vox | 4 +- assets/voxygen/voxel/lantern/green-0.vox | 4 +- .../voxygen/voxel/npc/boar/female/chest.vox | 4 +- assets/voxygen/voxel/npc/boar/female/tail.vox | 3 + assets/voxygen/voxel/npc/boar/male/chest.vox | 4 +- assets/voxygen/voxel/npc/boar/male/tail.vox | 3 + assets/voxygen/voxel/npc/cat/female/chest.vox | 4 +- assets/voxygen/voxel/npc/cat/female/tail.vox | 3 + assets/voxygen/voxel/npc/cat/male/chest.vox | 4 +- assets/voxygen/voxel/npc/cat/male/tail.vox | 3 + assets/voxygen/voxel/npc/duck/male/tail.vox | 4 +- .../voxygen/voxel/npc/eagle/female/head.vox | 4 +- .../voxygen/voxel/npc/eagle/female/leg_l.vox | 4 +- .../voxygen/voxel/npc/eagle/female/leg_r.vox | 4 +- .../voxygen/voxel/npc/eagle/female/tail.vox | 4 +- .../voxygen/voxel/npc/eagle/female/torso.vox | 4 +- .../voxygen/voxel/npc/eagle/female/wing_l.vox | 4 +- .../voxygen/voxel/npc/eagle/female/wing_r.vox | 4 +- assets/voxygen/voxel/npc/eagle/male/head.vox | 4 +- assets/voxygen/voxel/npc/eagle/male/leg_l.vox | 4 +- assets/voxygen/voxel/npc/eagle/male/leg_r.vox | 4 +- assets/voxygen/voxel/npc/eagle/male/tail.vox | 4 +- assets/voxygen/voxel/npc/eagle/male/torso.vox | 4 +- .../voxygen/voxel/npc/eagle/male/wing_l.vox | 4 +- .../voxygen/voxel/npc/eagle/male/wing_r.vox | 4 +- assets/voxygen/voxel/npc/fox/female/chest.vox | 4 +- assets/voxygen/voxel/npc/fox/female/tail.vox | 3 + assets/voxygen/voxel/npc/fox/male/chest.vox | 4 +- assets/voxygen/voxel/npc/fox/male/tail.vox | 3 + .../voxygen/voxel/npc/hyena/female/chest.vox | 4 +- .../voxel/npc/hyena/female/foot_bl.vox | 4 +- .../voxel/npc/hyena/female/foot_br.vox | 4 +- .../voxel/npc/hyena/female/foot_fl.vox | 4 +- .../voxel/npc/hyena/female/foot_fr.vox | 4 +- .../voxygen/voxel/npc/hyena/female/head.vox | 4 +- .../voxygen/voxel/npc/hyena/female/tail.vox | 3 + assets/voxygen/voxel/npc/hyena/male/chest.vox | 4 +- .../voxygen/voxel/npc/hyena/male/foot_bl.vox | 4 +- .../voxygen/voxel/npc/hyena/male/foot_br.vox | 4 +- .../voxygen/voxel/npc/hyena/male/foot_fl.vox | 4 +- .../voxygen/voxel/npc/hyena/male/foot_fr.vox | 4 +- assets/voxygen/voxel/npc/hyena/male/head.vox | 4 +- assets/voxygen/voxel/npc/hyena/male/tail.vox | 3 + .../voxygen/voxel/npc/parrot/female/head.vox | 4 +- .../voxygen/voxel/npc/parrot/female/leg_l.vox | 4 +- .../voxygen/voxel/npc/parrot/female/leg_r.vox | 4 +- .../voxygen/voxel/npc/parrot/female/tail.vox | 4 +- .../voxygen/voxel/npc/parrot/female/torso.vox | 4 +- .../voxygen/voxel/npc/parrot/female/wing.vox | 4 +- assets/voxygen/voxel/npc/parrot/male/head.vox | 4 +- .../voxygen/voxel/npc/parrot/male/leg_l.vox | 4 +- .../voxygen/voxel/npc/parrot/male/leg_r.vox | 4 +- assets/voxygen/voxel/npc/parrot/male/tail.vox | 4 +- .../voxygen/voxel/npc/parrot/male/torso.vox | 4 +- assets/voxygen/voxel/npc/parrot/male/wing.vox | 4 +- assets/voxygen/voxel/npc/pig/female/chest.vox | 4 +- assets/voxygen/voxel/npc/pig/female/tail.vox | 3 + assets/voxygen/voxel/npc/pig/male/chest.vox | 4 +- assets/voxygen/voxel/npc/pig/male/tail.vox | 3 + .../voxel/npc/raccoon/female/chest.vox | 4 +- .../voxygen/voxel/npc/raccoon/female/tail.vox | 3 + .../voxygen/voxel/npc/raccoon/male/chest.vox | 4 +- .../voxygen/voxel/npc/raccoon/male/tail.vox | 3 + .../voxygen/voxel/npc/sheep/female/chest.vox | 4 +- .../voxygen/voxel/npc/sheep/female/tail.vox | 3 + assets/voxygen/voxel/npc/sheep/male/chest.vox | 4 +- assets/voxygen/voxel/npc/sheep/male/head.vox | 4 +- assets/voxygen/voxel/npc/sheep/male/tail.vox | 3 + .../voxygen/voxel/npc/skunk/female/chest.vox | 4 +- .../voxygen/voxel/npc/skunk/female/tail.vox | 3 + assets/voxygen/voxel/npc/skunk/male/chest.vox | 4 +- assets/voxygen/voxel/npc/skunk/male/tail.vox | 3 + .../voxel/npc/snowyowl/female/head.vox | 4 +- .../voxel/npc/snowyowl/female/leg_l.vox | 4 +- .../voxel/npc/snowyowl/female/leg_r.vox | 4 +- .../voxel/npc/snowyowl/female/tail.vox | 4 +- .../voxel/npc/snowyowl/female/torso.vox | 4 +- .../voxel/npc/snowyowl/female/wing_l.vox | 4 +- .../voxel/npc/snowyowl/female/wing_r.vox | 4 +- .../voxygen/voxel/npc/snowyowl/male/head.vox | 4 +- .../voxygen/voxel/npc/snowyowl/male/leg_l.vox | 4 +- .../voxygen/voxel/npc/snowyowl/male/leg_r.vox | 4 +- .../voxygen/voxel/npc/snowyowl/male/tail.vox | 4 +- .../voxygen/voxel/npc/snowyowl/male/torso.vox | 4 +- .../voxel/npc/snowyowl/male/wing_l.vox | 4 +- .../voxel/npc/snowyowl/male/wing_r.vox | 4 +- assets/voxygen/voxel/object/lantern0.vox | 4 +- .../quadruped_small_central_manifest.ron | 137 ++++++++++++++++-- assets/voxygen/voxel/weapon/axe/rusty_2h.vox | 4 +- .../voxygen/voxel/weapon/bow/rare_bow-0.vox | 4 +- assets/voxygen/voxel/weapon/debug_wand-0.vox | 4 +- assets/voxygen/voxel/weapon/debug_wand-1.vox | 4 +- assets/voxygen/voxel/weapon/debug_wand.vox | 4 +- .../voxel/weapon/hammer/hammer_1_2h.vox | 4 +- assets/voxygen/voxel/weapon/shield/wood-0.vox | 4 +- .../voxygen/voxel/weapon/staff/wood-fire.vox | 4 +- .../voxel/weapon/staff/wood-nature.vox | 4 +- .../voxel/weapon/staff/wood-simple.vox | 4 +- .../voxygen/voxel/weapon/sword/short_2h-0.vox | 4 +- assets/voxygen/voxel/weapon/sword/wood_2h.vox | 4 +- .../voxel/weapon/sword/zweihander_2h-0.vox | 4 +- voxygen/src/anim/quadruped_small/idle.rs | 8 +- voxygen/src/anim/quadruped_small/jump.rs | 3 + voxygen/src/anim/quadruped_small/mod.rs | 38 +++-- voxygen/src/anim/quadruped_small/run.rs | 3 + voxygen/src/scene/figure/cache.rs | 6 +- voxygen/src/scene/figure/load.rs | 22 +++ 172 files changed, 536 insertions(+), 323 deletions(-) create mode 100644 assets/voxygen/voxel/npc/boar/female/tail.vox create mode 100644 assets/voxygen/voxel/npc/boar/male/tail.vox create mode 100644 assets/voxygen/voxel/npc/cat/female/tail.vox create mode 100644 assets/voxygen/voxel/npc/cat/male/tail.vox create mode 100644 assets/voxygen/voxel/npc/fox/female/tail.vox create mode 100644 assets/voxygen/voxel/npc/fox/male/tail.vox create mode 100644 assets/voxygen/voxel/npc/hyena/female/tail.vox create mode 100644 assets/voxygen/voxel/npc/hyena/male/tail.vox create mode 100644 assets/voxygen/voxel/npc/pig/female/tail.vox create mode 100644 assets/voxygen/voxel/npc/pig/male/tail.vox create mode 100644 assets/voxygen/voxel/npc/raccoon/female/tail.vox create mode 100644 assets/voxygen/voxel/npc/raccoon/male/tail.vox create mode 100644 assets/voxygen/voxel/npc/sheep/female/tail.vox create mode 100644 assets/voxygen/voxel/npc/sheep/male/tail.vox create mode 100644 assets/voxygen/voxel/npc/skunk/female/tail.vox create mode 100644 assets/voxygen/voxel/npc/skunk/male/tail.vox diff --git a/CHANGELOG.md b/CHANGELOG.md index 14463b8eef..372ff1f3b0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,6 +21,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Improved camera aiming - Made civsim, sites, etc. deterministic from the same seed. - Improved animations by adding orientation variation +- new tail bone for quad_small body +- slim the game size through lossless asset optimization ### Removed diff --git a/assets/voxygen/audio/soundtrack/between_the_fairies.ogg b/assets/voxygen/audio/soundtrack/between_the_fairies.ogg index 014c9e9b13..268ae9ac9d 100644 --- a/assets/voxygen/audio/soundtrack/between_the_fairies.ogg +++ b/assets/voxygen/audio/soundtrack/between_the_fairies.ogg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b1ffa266d056e23b980ca5a18970a77376f001c407d0290c95bbfe5e1461dbc3 -size 3935072 +oid sha256:de8949c0e815d5f9811a93d97198a7d92460f3cc50d7222f5972f5c12c16c949 +size 3812226 diff --git a/assets/voxygen/audio/soundtrack/campfire_stories.ogg b/assets/voxygen/audio/soundtrack/campfire_stories.ogg index bc90d1166c..4b6bf49c6c 100644 --- a/assets/voxygen/audio/soundtrack/campfire_stories.ogg +++ b/assets/voxygen/audio/soundtrack/campfire_stories.ogg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0f98af47d74e6e38e9fd00d19554f3666bf5bee22e71b039ac28d8a3b3e79b5b -size 2201901 +oid sha256:8c635e91c3e2cef6e42c529ee52a03e59b606d37cbd242c77a6e77e9e6170b54 +size 2120441 diff --git a/assets/voxygen/audio/soundtrack/down_the_rabbit_hole.ogg b/assets/voxygen/audio/soundtrack/down_the_rabbit_hole.ogg index b99bc8f4ae..3a4e0cb140 100644 --- a/assets/voxygen/audio/soundtrack/down_the_rabbit_hole.ogg +++ b/assets/voxygen/audio/soundtrack/down_the_rabbit_hole.ogg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6cc60e9717a9e07a0b40788502f42036b8e01f9f4aae66ad1ab5cf78f9ad976b -size 4685453 +oid sha256:b1dc958d540b0f7127599f8e715a316ebfb8b58dc15792a6e6512ca297df3446 +size 4538935 diff --git a/assets/voxygen/audio/soundtrack/field_grazing.ogg b/assets/voxygen/audio/soundtrack/field_grazing.ogg index b3b1115318..a41f231a5b 100644 --- a/assets/voxygen/audio/soundtrack/field_grazing.ogg +++ b/assets/voxygen/audio/soundtrack/field_grazing.ogg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:31abe12210d7eaea3fbdd9e52102f63711b8227c31985dac9cf2da319e24fed0 -size 8645063 +oid sha256:af0f5a347fcd788f602b8d8988bac5c8faf32b44576721723f2b196f6b7474c3 +size 8438062 diff --git a/assets/voxygen/audio/soundtrack/just_the_beginning.ogg b/assets/voxygen/audio/soundtrack/just_the_beginning.ogg index cfe059c28c..7468492ba1 100644 --- a/assets/voxygen/audio/soundtrack/just_the_beginning.ogg +++ b/assets/voxygen/audio/soundtrack/just_the_beginning.ogg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c59c8a95fd07283a028c09010ad05d44d3a620a12f202b52c59f22a66411f9e8 -size 4772973 +oid sha256:194e5f3ad9b2826c6ff188b248d7ab12c5ac6554d41acf1c25a4480745a98509 +size 4674700 diff --git a/assets/voxygen/audio/soundtrack/limits.ogg b/assets/voxygen/audio/soundtrack/limits.ogg index 3d00d86ffd..5f96e7d0ff 100644 --- a/assets/voxygen/audio/soundtrack/limits.ogg +++ b/assets/voxygen/audio/soundtrack/limits.ogg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:943e4199b3a23623150c8e58c7de432ff0c3b2f4634efef807a8f1e6fddfc865 -size 3641997 +oid sha256:9a7fb11c0b881746f574589d951ea5f2c2d0fb0ab18a80ec4931d4f090b58a57 +size 3507541 diff --git a/assets/voxygen/audio/soundtrack/mineral_deposits.ogg b/assets/voxygen/audio/soundtrack/mineral_deposits.ogg index 42c1da0905..65158dedcb 100644 --- a/assets/voxygen/audio/soundtrack/mineral_deposits.ogg +++ b/assets/voxygen/audio/soundtrack/mineral_deposits.ogg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d2261a1229682f1aecc9776eb8eee46c774bdff75a2a2a2e897bfa09c4217532 -size 8395603 +oid sha256:8b6ea514983932b234b5284b3a9358efa9e3d154aa6cdd634e9a9aec889c9bfd +size 8149944 diff --git a/assets/voxygen/audio/soundtrack/moonbeams.ogg b/assets/voxygen/audio/soundtrack/moonbeams.ogg index 6674a865ac..bc72aa8fc6 100644 --- a/assets/voxygen/audio/soundtrack/moonbeams.ogg +++ b/assets/voxygen/audio/soundtrack/moonbeams.ogg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d33106ef431382e26151dc9072b7d2195c1ce6641ed7c156f53cb6a1129a4c44 -size 3131296 +oid sha256:0c0c563ca638d52ce801b439bb04c5244fd722fe2184497ac7476cc5eebbffd1 +size 2995303 diff --git a/assets/voxygen/audio/soundtrack/rest_assured.ogg b/assets/voxygen/audio/soundtrack/rest_assured.ogg index b256b58a50..aff9541289 100644 --- a/assets/voxygen/audio/soundtrack/rest_assured.ogg +++ b/assets/voxygen/audio/soundtrack/rest_assured.ogg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:853a0eeb0d6195a92ee9a33115483ab2d221af9733e91c9588bc80b42c0805a3 -size 2741191 +oid sha256:80c606b50aa26100591252ed2d573539faeb301f9d2fdf12ad417812dc074c0c +size 2609469 diff --git a/assets/voxygen/audio/soundtrack/serene_meadows.ogg b/assets/voxygen/audio/soundtrack/serene_meadows.ogg index 4e58c3ba5e..20419cca99 100644 --- a/assets/voxygen/audio/soundtrack/serene_meadows.ogg +++ b/assets/voxygen/audio/soundtrack/serene_meadows.ogg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ddf39d22d6b6d4ebcd8102726c80624f9ba532ae277d13e51edba19cd4e5400e -size 3450218 +oid sha256:0c38089f9c89fa66cefd89a174239efc24469ff607cb27f297a09931b64798d1 +size 3354481 diff --git a/assets/voxygen/audio/soundtrack/snowtop_volume.ogg b/assets/voxygen/audio/soundtrack/snowtop_volume.ogg index 46e5fe08ac..46fa77d3c0 100644 --- a/assets/voxygen/audio/soundtrack/snowtop_volume.ogg +++ b/assets/voxygen/audio/soundtrack/snowtop_volume.ogg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b581be43adaea478f2949811e2b0dc9852f0c311dd6f7423c201c6c025c144e4 -size 5039853 +oid sha256:a1b85a9cc03e0d8862afe6a0b1428a81c75e31e1fda506d21c5cabbffdd02c83 +size 4722298 diff --git a/assets/voxygen/audio/soundtrack/veloren_title_tune.ogg b/assets/voxygen/audio/soundtrack/veloren_title_tune.ogg index e82338c902..e51dcda733 100644 --- a/assets/voxygen/audio/soundtrack/veloren_title_tune.ogg +++ b/assets/voxygen/audio/soundtrack/veloren_title_tune.ogg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:beafff717eb70b2dbfa0273f8b51a0dbeced8fab9479179328a73127609f989b -size 2589963 +oid sha256:86f5a2d8172203fe8eca0032789b3b4e461f282c1a1443d47056127a590fbbfc +size 2506549 diff --git a/assets/voxygen/audio/soundtrack/wandering_voices.ogg b/assets/voxygen/audio/soundtrack/wandering_voices.ogg index 1a053e0df0..19ec0e8c6a 100644 --- a/assets/voxygen/audio/soundtrack/wandering_voices.ogg +++ b/assets/voxygen/audio/soundtrack/wandering_voices.ogg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:01460c772f4a03ad2762be220d18d6e73a563a1a1d2136f2e605aad952b4c3a7 -size 7795278 +oid sha256:78ea14808af79b14e25ca59f5b241cb70ec22903984c0cecc9d6ba75cfcf14cd +size 7598477 diff --git a/assets/voxygen/background/bg_1.png b/assets/voxygen/background/bg_1.png index 6bc31b7d43..0ade800464 100644 --- a/assets/voxygen/background/bg_1.png +++ b/assets/voxygen/background/bg_1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d46d73da8104b2de1dbe21ea3f0057669e1c0d53ac090697992fd38a15036cd1 -size 3430223 +oid sha256:36133b21b44d1bc04e817745cf7cb6b12a813c79005334f9e25c2cfff685f08d +size 2702645 diff --git a/assets/voxygen/background/bg_10.png b/assets/voxygen/background/bg_10.png index 8d27d84d83..fb46999de2 100644 --- a/assets/voxygen/background/bg_10.png +++ b/assets/voxygen/background/bg_10.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5d34cd8aa7655efae1ab92b86dfa6916560eeed22d60e7ce45de6ff4d77e4340 -size 1175394 +oid sha256:131c9a7d037b67b97f96684f731e59fae3e619269e99ed9348ab4c741f5ee797 +size 871200 diff --git a/assets/voxygen/background/bg_11.png b/assets/voxygen/background/bg_11.png index 3aa49f8c2d..cfbf15131d 100644 --- a/assets/voxygen/background/bg_11.png +++ b/assets/voxygen/background/bg_11.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5cc0e614d52708cba30d71f658f0c290395371d4333f2f6a866c207a8f471878 -size 1301002 +oid sha256:82d4838eb1c728c546fb288e9c5062a3a3431392e9cdc1a85485938c3a0c277d +size 762106 diff --git a/assets/voxygen/background/bg_12.png b/assets/voxygen/background/bg_12.png index 4aacac4cc1..6f20655897 100644 --- a/assets/voxygen/background/bg_12.png +++ b/assets/voxygen/background/bg_12.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1f8220ddae73f94071e7309d751c894897775ac241dc2b8da2de64346f4ec083 -size 1972446 +oid sha256:eff360df1328124265f582c06254ae6c0a6e2064f44bb6ec783c764d9468a137 +size 1877999 diff --git a/assets/voxygen/background/bg_13.png b/assets/voxygen/background/bg_13.png index 4b202994e1..d8a885f612 100644 --- a/assets/voxygen/background/bg_13.png +++ b/assets/voxygen/background/bg_13.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e39f4a18494b701196cc53010d59598edbc75f8ccef612c844db404e2b6459b1 -size 1262163 +oid sha256:88506d5e8b001bf00b5665236c8bdece4eda41072a088034beb09cda2cc0f1e1 +size 816886 diff --git a/assets/voxygen/background/bg_14.png b/assets/voxygen/background/bg_14.png index 6e8115e589..069d622e27 100644 --- a/assets/voxygen/background/bg_14.png +++ b/assets/voxygen/background/bg_14.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:89f8098a7b87c6ebc2d6a68d26eb992f5725a98777ac02b27f229845a678cadc -size 1396925 +oid sha256:ec6e5436545376c016611a43d605fece2f9f4da2fc1a240f4dc53efd2b7aba60 +size 758761 diff --git a/assets/voxygen/background/bg_15.png b/assets/voxygen/background/bg_15.png index 1c632480e6..70b34c8cd8 100644 --- a/assets/voxygen/background/bg_15.png +++ b/assets/voxygen/background/bg_15.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1c33bc2e9f3bd4f9fde7224091f26df10f85bfd8b7671399e0a2356db8bb77c1 -size 2241789 +oid sha256:6577cb5d2d3108952e21790636ad723dc799e54694ff0f83e1297aec71a6ab82 +size 1505151 diff --git a/assets/voxygen/background/bg_2.png b/assets/voxygen/background/bg_2.png index dd7475b803..559f262ab2 100644 --- a/assets/voxygen/background/bg_2.png +++ b/assets/voxygen/background/bg_2.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3f921e77caaec26473711e39ecf421248b87d9d597fbdeab28a2433c5d9ff0fd -size 1064297 +oid sha256:0a0b11ef4d5dafe8dc0fc02cacd918730ccff332d9216298c96fc0385142b014 +size 887064 diff --git a/assets/voxygen/background/bg_3.png b/assets/voxygen/background/bg_3.png index dd76f50f53..62b26c92f2 100644 --- a/assets/voxygen/background/bg_3.png +++ b/assets/voxygen/background/bg_3.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:502cdc6396350b9e5ae28b213166f15376319223b5abc72f749a79cd6be12f4d -size 2224952 +oid sha256:ec76b848d8efda3e4657007845e2fa43b2e7ede3a5abe7878aab50f68e8f9391 +size 1237841 diff --git a/assets/voxygen/background/bg_4.png b/assets/voxygen/background/bg_4.png index ec2995123f..6a520a0314 100644 --- a/assets/voxygen/background/bg_4.png +++ b/assets/voxygen/background/bg_4.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:94a252fcec90d115b26f64eaf92a539ecd5db52e9974a42758280dc6e25296dc -size 2179461 +oid sha256:0d418fad088df3cf64c1fd230aa38d7ef79e74c09acd74b8c32fad5fecc47555 +size 1451725 diff --git a/assets/voxygen/background/bg_5.png b/assets/voxygen/background/bg_5.png index 40818d7056..5146feee13 100644 --- a/assets/voxygen/background/bg_5.png +++ b/assets/voxygen/background/bg_5.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2ccd718e84b59b156d97788f1bea39d38ff34e7cfc3aacf5380b28586e1403ef -size 1205008 +oid sha256:0def91b6d685aa0faf319329849963b6ba3b3f0dffe62f270e98580c80c48096 +size 769966 diff --git a/assets/voxygen/background/bg_6.png b/assets/voxygen/background/bg_6.png index 41250ee39d..1d9a33ec41 100644 --- a/assets/voxygen/background/bg_6.png +++ b/assets/voxygen/background/bg_6.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d4785086ec9941d7a159c47c5475d01d0a13b3b73ef1952f869a9c31fa1739d2 -size 793666 +oid sha256:18c6c7fc107512b418256017742c021817ea95089775ec77cbd3499d2676f32f +size 436663 diff --git a/assets/voxygen/background/bg_7.png b/assets/voxygen/background/bg_7.png index 40e86c134e..59d8cee4ba 100644 --- a/assets/voxygen/background/bg_7.png +++ b/assets/voxygen/background/bg_7.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fe436e2811629b57c47af449949dedbd0ff9a3a63136e196636e072a3b8bc320 -size 1244674 +oid sha256:d93f1346f6d8dc272d0cc32a39bf47cecc8d686a95a0f919142df88856520384 +size 692461 diff --git a/assets/voxygen/background/bg_8.png b/assets/voxygen/background/bg_8.png index 47c19d7db9..1688dee237 100644 --- a/assets/voxygen/background/bg_8.png +++ b/assets/voxygen/background/bg_8.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8096f8a7b94e49cfe2cfba3ad6f9bd152078bca834ea7ea7af9e9889bcf99ceb -size 710326 +oid sha256:74e8aab0abd64fe190607c87a6e70a3d3b4409947d8698754ff3c31e0e6debc9 +size 403497 diff --git a/assets/voxygen/background/bg_9.png b/assets/voxygen/background/bg_9.png index 9b1b455d0c..dd6e2ac5b6 100644 --- a/assets/voxygen/background/bg_9.png +++ b/assets/voxygen/background/bg_9.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:192ecc3b4f6d746d6033d1960b3a67ebea770fd8fb7e609633f2773ba62a576a -size 1518647 +oid sha256:9ab7a56d699fc98ebb01d553d6c1d1736fea3ca639fee3fecf48e8a98947247c +size 899468 diff --git a/assets/voxygen/background/bg_main.png b/assets/voxygen/background/bg_main.png index a649a21218..54b67e18d8 100644 --- a/assets/voxygen/background/bg_main.png +++ b/assets/voxygen/background/bg_main.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c3f7cc1b6f4b93eaf101c83f1fb34a48a67957250905c829cf79487dae27bfff -size 2894214 +oid sha256:6abf95dd5069525eaf35437efa09c0ba7c9bcb65ab50bba7a006fff825a2d675 +size 2782437 diff --git a/assets/voxygen/background/death.png b/assets/voxygen/background/death.png index 3852c5424b..ca2fc0be33 100644 --- a/assets/voxygen/background/death.png +++ b/assets/voxygen/background/death.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a24fc708b5c3fee34fdad50cc4be002f6df12f358522af413098ddb150b24ced -size 143395 +oid sha256:22577fd1bc3fd6c9e26452dc2a0ca6c24bf6a119b8930e3b1b4e0badc2faed89 +size 105749 diff --git a/assets/voxygen/background/hurt.png b/assets/voxygen/background/hurt.png index 91e6fef724..40b32f109d 100644 --- a/assets/voxygen/background/hurt.png +++ b/assets/voxygen/background/hurt.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fdab32e2b5443e930f7fe4d3e188b51c6dc26f0729ae8763696386024dc6bed1 -size 260584 +oid sha256:4b0d7b564b361d5c343ff457d68f6e9846e1ac8168d4b7cd049103fe0b35d7a6 +size 168911 diff --git a/assets/voxygen/voxel/armor/belt/cloth_black.vox b/assets/voxygen/voxel/armor/belt/cloth_black.vox index 025abd9ab0..d2333544a4 100644 --- a/assets/voxygen/voxel/armor/belt/cloth_black.vox +++ b/assets/voxygen/voxel/armor/belt/cloth_black.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e8900d6dc56512d531de0a31330d6f8e98a7982300e859a759c6d50221d48d58 -size 56019 +oid sha256:aeda7c161a8353a54b2a2c7a8187d2d95883281919573ec747252fe0d8e75f27 +size 1536 diff --git a/assets/voxygen/voxel/armor/belt/cloth_grey.vox b/assets/voxygen/voxel/armor/belt/cloth_grey.vox index 74eaecfe80..ec1cae8028 100644 --- a/assets/voxygen/voxel/armor/belt/cloth_grey.vox +++ b/assets/voxygen/voxel/armor/belt/cloth_grey.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c789fb9004477fe3e1c18821d276e5461d0959375908d59c4ce043dc642cb64b -size 56019 +oid sha256:2f4f4587e7085ea739022297aa337690dca56f6fef9893206d189a89b78a35b2 +size 1536 diff --git a/assets/voxygen/voxel/armor/belt/dark.vox b/assets/voxygen/voxel/armor/belt/dark.vox index c42963357f..f9ff9077e1 100644 --- a/assets/voxygen/voxel/armor/belt/dark.vox +++ b/assets/voxygen/voxel/armor/belt/dark.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8cb1a643a088e13dc0c970f109c03803f51efd0f5305aafaee9d2d9b7cab0b20 -size 56027 +oid sha256:9847871490b398a5266495c3df5ca776145548a3e7f68c4d394a1d95f2bed808 +size 1544 diff --git a/assets/voxygen/voxel/armor/chest/cloth_red_kimono.vox b/assets/voxygen/voxel/armor/chest/cloth_red_kimono.vox index bb0100ab29..41838cb132 100644 --- a/assets/voxygen/voxel/armor/chest/cloth_red_kimono.vox +++ b/assets/voxygen/voxel/armor/chest/cloth_red_kimono.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1824488fb915a5e99eb2bc30ccf91906c7a09e6d7820c0ffa30dc56cd491bde9 -size 57167 +oid sha256:8dec615c1140ad445847d8ecbb6e1930dbb37d04b7898056bbcc8845e351aec7 +size 2684 diff --git a/assets/voxygen/voxel/armor/chest/grayscale.vox b/assets/voxygen/voxel/armor/chest/grayscale.vox index c6d1631a95..0211cdd522 100644 --- a/assets/voxygen/voxel/armor/chest/grayscale.vox +++ b/assets/voxygen/voxel/armor/chest/grayscale.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4102234d1a0e06d0fbc91dad6e74265d613b272d6fb53dafecf043f58da18659 -size 57195 +oid sha256:66b912c68ee331a4d86c10a472855254bcffea1c62fef8daedf37231245a0280 +size 2712 diff --git a/assets/voxygen/voxel/armor/chest/leather-0.vox b/assets/voxygen/voxel/armor/chest/leather-0.vox index 0b7da039d2..fc3a7153e0 100644 --- a/assets/voxygen/voxel/armor/chest/leather-0.vox +++ b/assets/voxygen/voxel/armor/chest/leather-0.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:942cd835b41b31f24848381a0e77df29aeb149fd90d6ef6835949964ede8bab7 -size 57211 +oid sha256:f26e9bf035c95beecd5e66a38c3e10d60e4a1c54656cb885c164d2728599c1b3 +size 2728 diff --git a/assets/voxygen/voxel/armor/chest/leather-2.vox b/assets/voxygen/voxel/armor/chest/leather-2.vox index 3e9934b4db..59492cfef7 100644 --- a/assets/voxygen/voxel/armor/chest/leather-2.vox +++ b/assets/voxygen/voxel/armor/chest/leather-2.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0baf9a404264a425c5bdf11ee4e637c11e793b32ae03ea683d3d512dc61a0954 -size 57240 +oid sha256:54efbd7b698edffb1dc217ea4cf7cbddefc7b861e4ca6d104e451fe207c6b409 +size 2720 diff --git a/assets/voxygen/voxel/armor/chest/plate_green-0.vox b/assets/voxygen/voxel/armor/chest/plate_green-0.vox index 79466f4172..25d6545f45 100644 --- a/assets/voxygen/voxel/armor/chest/plate_green-0.vox +++ b/assets/voxygen/voxel/armor/chest/plate_green-0.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2d91415da84dba3e5a7c1c321b9728d80f1a9ca05ec8707bf39003b8b13033a1 -size 57227 +oid sha256:d49f753a562f0e0879609685afa3134eddcb72cf54861e56aade904caf48d159 +size 2744 diff --git a/assets/voxygen/voxel/armor/empty.vox b/assets/voxygen/voxel/armor/empty.vox index 1a1abf7284..f04b7224f0 100644 --- a/assets/voxygen/voxel/armor/empty.vox +++ b/assets/voxygen/voxel/armor/empty.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:499a484c3a2ca13d9704455fb6aa246de3ea67e7764bbed599ab6211b81f2433 -size 55579 +oid sha256:65c035d525a19cf76b7bf8d5ec0352f4b56cb8f4b3c2356459d919776a9a774c +size 1096 diff --git a/assets/voxygen/voxel/armor/foot/assa.vox b/assets/voxygen/voxel/armor/foot/assa.vox index 48dfb84f1a..63aeba7491 100644 --- a/assets/voxygen/voxel/armor/foot/assa.vox +++ b/assets/voxygen/voxel/armor/foot/assa.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8596adda7d5f16aced46959050ee8135f72123a1943531fdda11c816a86db380 -size 55963 +oid sha256:0a8769e4e2163215a425fc2797b056f34df4c9e4a768b67657af7958277f52e1 +size 1480 diff --git a/assets/voxygen/voxel/armor/foot/dark-0.vox b/assets/voxygen/voxel/armor/foot/dark-0.vox index 1229d26a39..3626421b8e 100644 --- a/assets/voxygen/voxel/armor/foot/dark-0.vox +++ b/assets/voxygen/voxel/armor/foot/dark-0.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2dce3cb7a08ce32955b41ba6f19e6e008c46a2947b2818a4ca5eda1dddf10727 -size 55963 +oid sha256:f3455ff634ecc5b09d9c459296e2b9d08aa091b9579547517cceb7f392669f5c +size 1480 diff --git a/assets/voxygen/voxel/armor/foot/dark_jester-elf_shoe.vox b/assets/voxygen/voxel/armor/foot/dark_jester-elf_shoe.vox index 89e61880f9..d8582620ed 100644 --- a/assets/voxygen/voxel/armor/foot/dark_jester-elf_shoe.vox +++ b/assets/voxygen/voxel/armor/foot/dark_jester-elf_shoe.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:394b1bcc76384dc6427ca52dbaf84bce61687ad4b5a02cc350ec791287b0f319 -size 55899 +oid sha256:ff27592de52e9813eedd643b62f38a6b7f434f42da027c8ab0c06145248c1ae1 +size 1416 diff --git a/assets/voxygen/voxel/armor/foot/foot_none.vox b/assets/voxygen/voxel/armor/foot/foot_none.vox index 8bb8442d00..2350b59ec5 100644 --- a/assets/voxygen/voxel/armor/foot/foot_none.vox +++ b/assets/voxygen/voxel/armor/foot/foot_none.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e7c2c8e06095499d1b72c17433fc401969166a7634e815965568b4c5326d63ea -size 55899 +oid sha256:a8e7ad7e56e1219c4dc65947f058451e71bf1458b99a4cdaeb8ed74f2c89bea2 +size 1416 diff --git a/assets/voxygen/voxel/armor/hand/assa_right.vox b/assets/voxygen/voxel/armor/hand/assa_right.vox index 5bd9116e8c..b49f8070f4 100644 --- a/assets/voxygen/voxel/armor/hand/assa_right.vox +++ b/assets/voxygen/voxel/armor/hand/assa_right.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b9e41c15237da8a886002d03f1d01558672212de1e8f57b5df207db2d1dd0566 -size 55723 +oid sha256:0411134dcb233228303936ce0b5ea79871adcc8f96167521d8dad7992e69be66 +size 1240 diff --git a/assets/voxygen/voxel/armor/hand/bare_left.vox b/assets/voxygen/voxel/armor/hand/bare_left.vox index d5ef19b67a..50259fcb4c 100644 --- a/assets/voxygen/voxel/armor/hand/bare_left.vox +++ b/assets/voxygen/voxel/armor/hand/bare_left.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a40fc12d9471e1607ed1e4a246b029b5576334953645a5b1f21c41dc9b311e81 -size 55723 +oid sha256:0012ef273164328bad4e0ed68a600801f17196c3ad29b485fe296657a498540d +size 1240 diff --git a/assets/voxygen/voxel/armor/hand/bare_right.vox b/assets/voxygen/voxel/armor/hand/bare_right.vox index 2b61eda65f..0b88424cc1 100644 --- a/assets/voxygen/voxel/armor/hand/bare_right.vox +++ b/assets/voxygen/voxel/armor/hand/bare_right.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6f105809b23f3aa97aa0705fd85911bf9f10e75a7610281d2f2575a8e0a16dc0 -size 55723 +oid sha256:fef94817efaff9bb0faf1ab71fead96d7912537e4f0a5115bf19a751914a3087 +size 1240 diff --git a/assets/voxygen/voxel/armor/hand/cloth_basic_left.vox b/assets/voxygen/voxel/armor/hand/cloth_basic_left.vox index f6f8d3af4d..6caad4a74f 100644 --- a/assets/voxygen/voxel/armor/hand/cloth_basic_left.vox +++ b/assets/voxygen/voxel/armor/hand/cloth_basic_left.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dde3bbdb1f078bfe01406802b9e7e83997b2f138a35a97cc0459542e3baeb5bc -size 55723 +oid sha256:ec752df333cb6cdcf7a180f7e4d8365dd38fc4c94ee75ea2365ab19c6ad342a8 +size 1240 diff --git a/assets/voxygen/voxel/armor/hand/cloth_basic_right.vox b/assets/voxygen/voxel/armor/hand/cloth_basic_right.vox index c9bff363d1..ecc084d940 100644 --- a/assets/voxygen/voxel/armor/hand/cloth_basic_right.vox +++ b/assets/voxygen/voxel/armor/hand/cloth_basic_right.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f57864f9417fac27dda30c7e85e17c1f844952767f93d6e1978ebb87837f69bf -size 55723 +oid sha256:f0cda5b7ec5a0915d1da6b2e330f45c12707179f872f744c5be1f317cb87472f +size 1240 diff --git a/assets/voxygen/voxel/armor/hand/cloth_blue_left-0.vox b/assets/voxygen/voxel/armor/hand/cloth_blue_left-0.vox index 0f13f1967e..94db99996f 100644 --- a/assets/voxygen/voxel/armor/hand/cloth_blue_left-0.vox +++ b/assets/voxygen/voxel/armor/hand/cloth_blue_left-0.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2facf25e29008eff1e95b7e2943ff96a776d8d8cff74c0fb9b68506a76c8b291 -size 55723 +oid sha256:a9778605e9bd050a5fd79c553ee4ae1a0d6dcdc68c582b22090cfef609cc0b2c +size 1240 diff --git a/assets/voxygen/voxel/armor/hand/cloth_green_left-0.vox b/assets/voxygen/voxel/armor/hand/cloth_green_left-0.vox index 23653e83c1..8f9d915fb1 100644 --- a/assets/voxygen/voxel/armor/hand/cloth_green_left-0.vox +++ b/assets/voxygen/voxel/armor/hand/cloth_green_left-0.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:961948a44f60d0422d340e03e8328271f28bd653342d1d49ad2db8c2f7d93de1 -size 55723 +oid sha256:baef33510c17fde1e74057f8e3c4fa244331ba25f18753cbb258abd585de35c5 +size 1240 diff --git a/assets/voxygen/voxel/armor/hand/cloth_green_right-0.vox b/assets/voxygen/voxel/armor/hand/cloth_green_right-0.vox index 83da1d86f6..a1c8088001 100644 --- a/assets/voxygen/voxel/armor/hand/cloth_green_right-0.vox +++ b/assets/voxygen/voxel/armor/hand/cloth_green_right-0.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:de77fef40a136ed944b050fc0cff59dc78f043839f335ad4d578478b73d5b847 -size 55723 +oid sha256:ff71fe166c43b58ed22f0d49e0b51e2cba5391a91a02b97518c8de15149a71ca +size 1240 diff --git a/assets/voxygen/voxel/armor/hand/cloth_purple_left-0.vox b/assets/voxygen/voxel/armor/hand/cloth_purple_left-0.vox index 8ffef537eb..38ed520aee 100644 --- a/assets/voxygen/voxel/armor/hand/cloth_purple_left-0.vox +++ b/assets/voxygen/voxel/armor/hand/cloth_purple_left-0.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:93dd0d8050e30b1349218efb63c2e669fa750da83156a6eded1395731b8e057d -size 55723 +oid sha256:ca25a9218f7aa4a79729e1aeabcd14158ac46c089d6954555ace7308eed50c03 +size 1240 diff --git a/assets/voxygen/voxel/armor/hand/cloth_purple_right-0.vox b/assets/voxygen/voxel/armor/hand/cloth_purple_right-0.vox index 8ffef537eb..38ed520aee 100644 --- a/assets/voxygen/voxel/armor/hand/cloth_purple_right-0.vox +++ b/assets/voxygen/voxel/armor/hand/cloth_purple_right-0.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:93dd0d8050e30b1349218efb63c2e669fa750da83156a6eded1395731b8e057d -size 55723 +oid sha256:ca25a9218f7aa4a79729e1aeabcd14158ac46c089d6954555ace7308eed50c03 +size 1240 diff --git a/assets/voxygen/voxel/armor/hand/plate_right-0.vox b/assets/voxygen/voxel/armor/hand/plate_right-0.vox index 9db01e9dc7..8f462e46a6 100644 --- a/assets/voxygen/voxel/armor/hand/plate_right-0.vox +++ b/assets/voxygen/voxel/armor/hand/plate_right-0.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:58457547228410c17d04ad5b60329aa282b02888217e6d840806448120b47d6b -size 55723 +oid sha256:0a73c4a4a86d5c1535923d3b59ad9ad2c94738dc3c9729805cc55f7c0e462480 +size 1240 diff --git a/assets/voxygen/voxel/armor/shoulder/chain_left-1.vox b/assets/voxygen/voxel/armor/shoulder/chain_left-1.vox index f466ab58d8..3eb378c8b3 100644 --- a/assets/voxygen/voxel/armor/shoulder/chain_left-1.vox +++ b/assets/voxygen/voxel/armor/shoulder/chain_left-1.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8fe7849d3ddf97b366a299f245092aa5b6e553f495dab9063c2828e69178afbe -size 55919 +oid sha256:b5e3369406bcca23c62a50dce37516b85aed4958d05b6f9b6716b40a0bde4c83 +size 1436 diff --git a/assets/voxygen/voxel/armor/shoulder/chain_left.vox b/assets/voxygen/voxel/armor/shoulder/chain_left.vox index 9851e97945..e834b22f32 100644 --- a/assets/voxygen/voxel/armor/shoulder/chain_left.vox +++ b/assets/voxygen/voxel/armor/shoulder/chain_left.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d8a1eeb10881522926e870caf19c87907bfdf056c704ddbbc3887c01acc356f8 -size 56079 +oid sha256:f8250776e9e35542ceb13583775e91097a354ca110272cf99255da97bdf3d31b +size 1596 diff --git a/assets/voxygen/voxel/armor/shoulder/chain_right-1.vox b/assets/voxygen/voxel/armor/shoulder/chain_right-1.vox index dc9aa323b8..3503bfef40 100644 --- a/assets/voxygen/voxel/armor/shoulder/chain_right-1.vox +++ b/assets/voxygen/voxel/armor/shoulder/chain_right-1.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b42511f351db39032b2f75c344453366cad6d14da3da3bdd8fb3e0e05cc6ec55 -size 55919 +oid sha256:4a6648a831b327d65f54f343642246359548cb59e81ce1a0c0582513156b6d08 +size 1436 diff --git a/assets/voxygen/voxel/armor/shoulder/chain_right.vox b/assets/voxygen/voxel/armor/shoulder/chain_right.vox index 5be4eab3bb..240aab3241 100644 --- a/assets/voxygen/voxel/armor/shoulder/chain_right.vox +++ b/assets/voxygen/voxel/armor/shoulder/chain_right.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2cdcd9ba491b07db6a6051f78bb3fdd42edeef0aa76b2c6198df2daa67a0bc1b -size 56079 +oid sha256:2a41f7c6dd8d9004d5c3712a469346fc8fce86818509d72eaad5e51050ad9f0f +size 1596 diff --git a/assets/voxygen/voxel/armor/shoulder/cloth_purple_left-0.vox b/assets/voxygen/voxel/armor/shoulder/cloth_purple_left-0.vox index 19a1ee8e9b..718e8f83ad 100644 --- a/assets/voxygen/voxel/armor/shoulder/cloth_purple_left-0.vox +++ b/assets/voxygen/voxel/armor/shoulder/cloth_purple_left-0.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3a386f52040323fb01893607aa815c45037143aa84e4b5c504175c0311bf2c45 -size 55823 +oid sha256:6d79565685516a1fe5a9804cfe5633575dd7b27c86017ec8d168ac7acc5bd941 +size 1340 diff --git a/assets/voxygen/voxel/armor/shoulder/leather_left-0.vox b/assets/voxygen/voxel/armor/shoulder/leather_left-0.vox index 4c121396ee..fcbc875a9e 100644 --- a/assets/voxygen/voxel/armor/shoulder/leather_left-0.vox +++ b/assets/voxygen/voxel/armor/shoulder/leather_left-0.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:726bf0209351c8b809ecfdf4259c4822f9856310a32df1a7635c358af6d1bf25 -size 55899 +oid sha256:db2a200245c1c4674e4d2a22d244d92655376bbfe230d38eac79f5efe2e8b31c +size 1416 diff --git a/assets/voxygen/voxel/armor/shoulder/leather_right-0.vox b/assets/voxygen/voxel/armor/shoulder/leather_right-0.vox index 8d3c7ce8dc..6feffbc034 100644 --- a/assets/voxygen/voxel/armor/shoulder/leather_right-0.vox +++ b/assets/voxygen/voxel/armor/shoulder/leather_right-0.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0890764abbb0f10064c719c8917f7760710c9bb0d87833ec0768b8d9af6e2b10 -size 55899 +oid sha256:599981717f9721276d1277a0153f99a5e93c852ac10598cbc711850a259b15de +size 1416 diff --git a/assets/voxygen/voxel/armor/shoulder/leather_right-1.vox b/assets/voxygen/voxel/armor/shoulder/leather_right-1.vox index 4dec6634ce..f71a869b52 100644 --- a/assets/voxygen/voxel/armor/shoulder/leather_right-1.vox +++ b/assets/voxygen/voxel/armor/shoulder/leather_right-1.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e8146c73f046f71bc9f501f1400ae8e9ee2702b5c746ebce54344b66b4a78255 -size 55955 +oid sha256:ae45c34b79a82c97fd8910d22e515df574416f6fd489cfc9e0b3779e1a683b04 +size 1472 diff --git a/assets/voxygen/voxel/armor/shoulder/plate_right-0.vox b/assets/voxygen/voxel/armor/shoulder/plate_right-0.vox index 45022728e4..133f46b364 100644 --- a/assets/voxygen/voxel/armor/shoulder/plate_right-0.vox +++ b/assets/voxygen/voxel/armor/shoulder/plate_right-0.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:44710553f64bdea121df4c2be97ae700d2216cde30623099517f2ea06121c29f -size 55943 +oid sha256:1ac70c920c336afa85a06ee839b94cb715ad2bac8927d95560a5b7ccf68a5882 +size 1460 diff --git a/assets/voxygen/voxel/lantern/black-0.vox b/assets/voxygen/voxel/lantern/black-0.vox index 2251bf2726..b71db60214 100644 --- a/assets/voxygen/voxel/lantern/black-0.vox +++ b/assets/voxygen/voxel/lantern/black-0.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3fa40e891c67261cae80c21223f6ec1ef7d02b0e2546396e07547c2e19079857 -size 56375 +oid sha256:6843626fd5bcb745ecfdc6e1c4341c89a3f84ad9a2d173ce38bc9786304e6402 +size 1892 diff --git a/assets/voxygen/voxel/lantern/green-0.vox b/assets/voxygen/voxel/lantern/green-0.vox index a3ab8e8da7..fa5e2c601f 100644 --- a/assets/voxygen/voxel/lantern/green-0.vox +++ b/assets/voxygen/voxel/lantern/green-0.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e218a41ce27b3dd7af39c67d657881f304d39a5cda0fffe1f0958222a35d577b -size 44999 +oid sha256:ec0492756972b9c934e660757f7ecdb2dbe5b6e99dddae42f178dd0e6c328bbb +size 1892 diff --git a/assets/voxygen/voxel/npc/boar/female/chest.vox b/assets/voxygen/voxel/npc/boar/female/chest.vox index 33ef872233..660ecc950e 100644 --- a/assets/voxygen/voxel/npc/boar/female/chest.vox +++ b/assets/voxygen/voxel/npc/boar/female/chest.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3468a809fdb58edfbaf12d085993e10b100210f3b2e605cd19afc29d263de97c -size 2884 +oid sha256:0060a57e3e3f2a08811f4aaea754cd9f336ee0e36fc10d20ed5b34d5ddd648a5 +size 2836 diff --git a/assets/voxygen/voxel/npc/boar/female/tail.vox b/assets/voxygen/voxel/npc/boar/female/tail.vox new file mode 100644 index 0000000000..d264ccae47 --- /dev/null +++ b/assets/voxygen/voxel/npc/boar/female/tail.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cfa0bb01aedde2ede23f359e77e03212a3c850e2939487c2417693fc65b2665f +size 1144 diff --git a/assets/voxygen/voxel/npc/boar/male/chest.vox b/assets/voxygen/voxel/npc/boar/male/chest.vox index 622266f2be..92252a14c1 100644 --- a/assets/voxygen/voxel/npc/boar/male/chest.vox +++ b/assets/voxygen/voxel/npc/boar/male/chest.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bb2f0ea4e177e150504d81e3661c07c0dfeffbbfe47618a630688dab4a41cca0 -size 2924 +oid sha256:81e6d0dc56e79ef24e608615d7294174c024d94a5744560fb2fc3a03ad1ed022 +size 2876 diff --git a/assets/voxygen/voxel/npc/boar/male/tail.vox b/assets/voxygen/voxel/npc/boar/male/tail.vox new file mode 100644 index 0000000000..a5d9fb159d --- /dev/null +++ b/assets/voxygen/voxel/npc/boar/male/tail.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ef70b16cbf8bf6800456afeeddb4315345018903172ffd0b58afb67d0e2004d9 +size 1144 diff --git a/assets/voxygen/voxel/npc/cat/female/chest.vox b/assets/voxygen/voxel/npc/cat/female/chest.vox index 1bc63d191a..83ab2066d7 100644 --- a/assets/voxygen/voxel/npc/cat/female/chest.vox +++ b/assets/voxygen/voxel/npc/cat/female/chest.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b9178fe1351af01b688d786def9f88f5304c701119b4206242c8a88c3aa2bd86 -size 1504 +oid sha256:5e630fde2861dbc46916398a6478931c16bac43bda1e3119e40e321b7423c9b4 +size 1480 diff --git a/assets/voxygen/voxel/npc/cat/female/tail.vox b/assets/voxygen/voxel/npc/cat/female/tail.vox new file mode 100644 index 0000000000..a1c44ae308 --- /dev/null +++ b/assets/voxygen/voxel/npc/cat/female/tail.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:58a6a70e62fd1b88f32f780bb33f1ca565e71bca32dfbc7eca3de19b3bdedfa1 +size 1120 diff --git a/assets/voxygen/voxel/npc/cat/male/chest.vox b/assets/voxygen/voxel/npc/cat/male/chest.vox index f9735d4a8c..eeefa51f4d 100644 --- a/assets/voxygen/voxel/npc/cat/male/chest.vox +++ b/assets/voxygen/voxel/npc/cat/male/chest.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:787dcfa25802523b7fff86d0bd9550244c109992990aab92baec550dd7c625ec -size 1504 +oid sha256:0bc8779d489cf33ca7fa47cb8068aa51c5da7a07f5aa1d76df848a2a4cc88215 +size 1480 diff --git a/assets/voxygen/voxel/npc/cat/male/tail.vox b/assets/voxygen/voxel/npc/cat/male/tail.vox new file mode 100644 index 0000000000..82a86cbcd3 --- /dev/null +++ b/assets/voxygen/voxel/npc/cat/male/tail.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6d97c77e754998ac3e3bf8afdf0533a76f19d801655fcb65114a02dd3cc8582b +size 1120 diff --git a/assets/voxygen/voxel/npc/duck/male/tail.vox b/assets/voxygen/voxel/npc/duck/male/tail.vox index 62d1a47a18..fc79b8de2a 100644 --- a/assets/voxygen/voxel/npc/duck/male/tail.vox +++ b/assets/voxygen/voxel/npc/duck/male/tail.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:29b27c5210140ece6e914c356b7c92e2cdf118c46a520ee06ec21be6490c988e -size 55643 +oid sha256:a3503b0c9cdb6d847a3c5eaf8e256be3a9e1042108074450c3d7738394f5a966 +size 1156 diff --git a/assets/voxygen/voxel/npc/eagle/female/head.vox b/assets/voxygen/voxel/npc/eagle/female/head.vox index 7e9b90a8bb..00d3657bf6 100644 --- a/assets/voxygen/voxel/npc/eagle/female/head.vox +++ b/assets/voxygen/voxel/npc/eagle/female/head.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ffd195f8da588b1e0820fa1a485f3eb614cf333db8d23c4196bf5d37704b4d9b -size 56359 +oid sha256:3d8e1904720e459a71eb7ded89513a3ec0708c6b141ebd62229107d107288ce6 +size 1608 diff --git a/assets/voxygen/voxel/npc/eagle/female/leg_l.vox b/assets/voxygen/voxel/npc/eagle/female/leg_l.vox index 9af164237c..75b733724e 100644 --- a/assets/voxygen/voxel/npc/eagle/female/leg_l.vox +++ b/assets/voxygen/voxel/npc/eagle/female/leg_l.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3320d3347b0985ed30004d006a1af88560e2e72ba9240782bb3063318237a8fb -size 55935 +oid sha256:1e9418f1a58d17a4a94603c0bae688969a6d23fdd72671de7cb7ebc45c25d1aa +size 1184 diff --git a/assets/voxygen/voxel/npc/eagle/female/leg_r.vox b/assets/voxygen/voxel/npc/eagle/female/leg_r.vox index 5cc9a0d963..fc8ecbed40 100644 --- a/assets/voxygen/voxel/npc/eagle/female/leg_r.vox +++ b/assets/voxygen/voxel/npc/eagle/female/leg_r.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e5a13d38921242ff84e2c0b4c57dfa5b411edbb33f45f0030bcde460c9c30f5d -size 55935 +oid sha256:7b28e677fcaff5da57f5d81aa5780d75b4901203792579cbf4553d970467076a +size 1184 diff --git a/assets/voxygen/voxel/npc/eagle/female/tail.vox b/assets/voxygen/voxel/npc/eagle/female/tail.vox index 3d5781c99d..09fbda28d0 100644 --- a/assets/voxygen/voxel/npc/eagle/female/tail.vox +++ b/assets/voxygen/voxel/npc/eagle/female/tail.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7ba93bbb5eea8ed012ddff0a6b41183250dc185e4f5525a30424932b32d6c765 -size 55959 +oid sha256:bc27b6dbb9ff3fdb4d2a899ab35099019f199ef7f29304971ef262a483059440 +size 1208 diff --git a/assets/voxygen/voxel/npc/eagle/female/torso.vox b/assets/voxygen/voxel/npc/eagle/female/torso.vox index 99a75779b2..4cbbc5e952 100644 --- a/assets/voxygen/voxel/npc/eagle/female/torso.vox +++ b/assets/voxygen/voxel/npc/eagle/female/torso.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8069c0886888fa3dc741ff0eb7c4701ffe93f3cff5017a6c7c4fff248ea4da1d -size 56911 +oid sha256:4b09fc5a76eb9e3eadfc52e8679fa3398d64d49f491ebfbd8a74ab1f6fae4a55 +size 2160 diff --git a/assets/voxygen/voxel/npc/eagle/female/wing_l.vox b/assets/voxygen/voxel/npc/eagle/female/wing_l.vox index 945571cf36..ee5cf52c55 100644 --- a/assets/voxygen/voxel/npc/eagle/female/wing_l.vox +++ b/assets/voxygen/voxel/npc/eagle/female/wing_l.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d7be8776a3f86210e4154384ef5511151192b189dcfd752dc19e2b4870be3472 -size 56295 +oid sha256:027480e91a012c37628a576c32156e8e64e3b9e8ad6cb3a3b800810d2ce4f69d +size 1532 diff --git a/assets/voxygen/voxel/npc/eagle/female/wing_r.vox b/assets/voxygen/voxel/npc/eagle/female/wing_r.vox index d229ec73eb..a439d7b65d 100644 --- a/assets/voxygen/voxel/npc/eagle/female/wing_r.vox +++ b/assets/voxygen/voxel/npc/eagle/female/wing_r.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:579a144b10cefe371fcc16f60625887f4ad99cc8433fc0fc9e3c6bc4361d41eb -size 56295 +oid sha256:33a9e33832a19e572592e4b1be449b5986d2e6367980837c7f6ec931009a82eb +size 1532 diff --git a/assets/voxygen/voxel/npc/eagle/male/head.vox b/assets/voxygen/voxel/npc/eagle/male/head.vox index 7e9b90a8bb..00d3657bf6 100644 --- a/assets/voxygen/voxel/npc/eagle/male/head.vox +++ b/assets/voxygen/voxel/npc/eagle/male/head.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ffd195f8da588b1e0820fa1a485f3eb614cf333db8d23c4196bf5d37704b4d9b -size 56359 +oid sha256:3d8e1904720e459a71eb7ded89513a3ec0708c6b141ebd62229107d107288ce6 +size 1608 diff --git a/assets/voxygen/voxel/npc/eagle/male/leg_l.vox b/assets/voxygen/voxel/npc/eagle/male/leg_l.vox index 9af164237c..75b733724e 100644 --- a/assets/voxygen/voxel/npc/eagle/male/leg_l.vox +++ b/assets/voxygen/voxel/npc/eagle/male/leg_l.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3320d3347b0985ed30004d006a1af88560e2e72ba9240782bb3063318237a8fb -size 55935 +oid sha256:1e9418f1a58d17a4a94603c0bae688969a6d23fdd72671de7cb7ebc45c25d1aa +size 1184 diff --git a/assets/voxygen/voxel/npc/eagle/male/leg_r.vox b/assets/voxygen/voxel/npc/eagle/male/leg_r.vox index 5cc9a0d963..fc8ecbed40 100644 --- a/assets/voxygen/voxel/npc/eagle/male/leg_r.vox +++ b/assets/voxygen/voxel/npc/eagle/male/leg_r.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e5a13d38921242ff84e2c0b4c57dfa5b411edbb33f45f0030bcde460c9c30f5d -size 55935 +oid sha256:7b28e677fcaff5da57f5d81aa5780d75b4901203792579cbf4553d970467076a +size 1184 diff --git a/assets/voxygen/voxel/npc/eagle/male/tail.vox b/assets/voxygen/voxel/npc/eagle/male/tail.vox index 89de841150..09fbda28d0 100644 --- a/assets/voxygen/voxel/npc/eagle/male/tail.vox +++ b/assets/voxygen/voxel/npc/eagle/male/tail.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:04378f81b5f5cce6ad5d6126217e5ad0ce3b1c59095b154d957cbf3dddc38fd4 -size 55959 +oid sha256:bc27b6dbb9ff3fdb4d2a899ab35099019f199ef7f29304971ef262a483059440 +size 1208 diff --git a/assets/voxygen/voxel/npc/eagle/male/torso.vox b/assets/voxygen/voxel/npc/eagle/male/torso.vox index 99a75779b2..4cbbc5e952 100644 --- a/assets/voxygen/voxel/npc/eagle/male/torso.vox +++ b/assets/voxygen/voxel/npc/eagle/male/torso.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8069c0886888fa3dc741ff0eb7c4701ffe93f3cff5017a6c7c4fff248ea4da1d -size 56911 +oid sha256:4b09fc5a76eb9e3eadfc52e8679fa3398d64d49f491ebfbd8a74ab1f6fae4a55 +size 2160 diff --git a/assets/voxygen/voxel/npc/eagle/male/wing_l.vox b/assets/voxygen/voxel/npc/eagle/male/wing_l.vox index 945571cf36..ee5cf52c55 100644 --- a/assets/voxygen/voxel/npc/eagle/male/wing_l.vox +++ b/assets/voxygen/voxel/npc/eagle/male/wing_l.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d7be8776a3f86210e4154384ef5511151192b189dcfd752dc19e2b4870be3472 -size 56295 +oid sha256:027480e91a012c37628a576c32156e8e64e3b9e8ad6cb3a3b800810d2ce4f69d +size 1532 diff --git a/assets/voxygen/voxel/npc/eagle/male/wing_r.vox b/assets/voxygen/voxel/npc/eagle/male/wing_r.vox index d229ec73eb..a439d7b65d 100644 --- a/assets/voxygen/voxel/npc/eagle/male/wing_r.vox +++ b/assets/voxygen/voxel/npc/eagle/male/wing_r.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:579a144b10cefe371fcc16f60625887f4ad99cc8433fc0fc9e3c6bc4361d41eb -size 56295 +oid sha256:33a9e33832a19e572592e4b1be449b5986d2e6367980837c7f6ec931009a82eb +size 1532 diff --git a/assets/voxygen/voxel/npc/fox/female/chest.vox b/assets/voxygen/voxel/npc/fox/female/chest.vox index 55145d81a7..f422564504 100644 --- a/assets/voxygen/voxel/npc/fox/female/chest.vox +++ b/assets/voxygen/voxel/npc/fox/female/chest.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b79636274948a21c8ba2365308df7bdf9528e616e2c8d5ebf2705bc5b8657a48 -size 1632 +oid sha256:0bb520b57096709fcb3ae1006ae80d49805544292e7a4dae22965d010db7f8c0 +size 1464 diff --git a/assets/voxygen/voxel/npc/fox/female/tail.vox b/assets/voxygen/voxel/npc/fox/female/tail.vox new file mode 100644 index 0000000000..6d6422540e --- /dev/null +++ b/assets/voxygen/voxel/npc/fox/female/tail.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c651753367d96ac3ec2f921923697fffd69b7ba357d22509d1241f378853ae37 +size 1264 diff --git a/assets/voxygen/voxel/npc/fox/male/chest.vox b/assets/voxygen/voxel/npc/fox/male/chest.vox index 5a741a7200..592aac3dc9 100644 --- a/assets/voxygen/voxel/npc/fox/male/chest.vox +++ b/assets/voxygen/voxel/npc/fox/male/chest.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ac890c4817b8c6bee3429b63dcbffddec3b58a7ac93f94bd3cbd5ce12d5d5663 -size 1632 +oid sha256:bbccd9c68b9ef04717d15e2ba98f74a74b1ab578664df0ab28ae114c66c2a90a +size 1464 diff --git a/assets/voxygen/voxel/npc/fox/male/tail.vox b/assets/voxygen/voxel/npc/fox/male/tail.vox new file mode 100644 index 0000000000..f70316f75a --- /dev/null +++ b/assets/voxygen/voxel/npc/fox/male/tail.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a51ba48f622afb0447e6e16893b79dac5d34fc85076373f3e41b5b07d30b17ac +size 1264 diff --git a/assets/voxygen/voxel/npc/hyena/female/chest.vox b/assets/voxygen/voxel/npc/hyena/female/chest.vox index b17066fdc7..4f1b98929f 100644 --- a/assets/voxygen/voxel/npc/hyena/female/chest.vox +++ b/assets/voxygen/voxel/npc/hyena/female/chest.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:637e62b0a5d3eeb9d029c177cfebf5d756770f4c328e12123d938a82c6347455 -size 57259 +oid sha256:0f69811441014a42ce4fb5f70e2d86db8081038f191baa982d8c3ee6edd56153 +size 2704 diff --git a/assets/voxygen/voxel/npc/hyena/female/foot_bl.vox b/assets/voxygen/voxel/npc/hyena/female/foot_bl.vox index b878edabf2..6042e19d34 100644 --- a/assets/voxygen/voxel/npc/hyena/female/foot_bl.vox +++ b/assets/voxygen/voxel/npc/hyena/female/foot_bl.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:177489285a01e175402ec4c2fc12cc01446ba36ad4abc7c5e843b1a9c157d176 -size 55727 +oid sha256:275c8b8d5a083f64fbde416df87547d0d9606cf602816d478e0af55aeac0bb7c +size 1244 diff --git a/assets/voxygen/voxel/npc/hyena/female/foot_br.vox b/assets/voxygen/voxel/npc/hyena/female/foot_br.vox index 75a40b49bd..097ab61953 100644 --- a/assets/voxygen/voxel/npc/hyena/female/foot_br.vox +++ b/assets/voxygen/voxel/npc/hyena/female/foot_br.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:63a1228b6a3d021b58cb38f10ada645352fc51523703f965c026e432f847ab8f -size 55727 +oid sha256:cb678cfb93421a60a6f8858a7c79a4cfdfcdd279d24b044b01b9dcd4cb899ea8 +size 1244 diff --git a/assets/voxygen/voxel/npc/hyena/female/foot_fl.vox b/assets/voxygen/voxel/npc/hyena/female/foot_fl.vox index 4dbda92c7e..06237aeedd 100644 --- a/assets/voxygen/voxel/npc/hyena/female/foot_fl.vox +++ b/assets/voxygen/voxel/npc/hyena/female/foot_fl.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2cc757e64f3b5f7109df888d1549eac48555251aa03d69884ffa3bfe41eaac5d -size 55755 +oid sha256:e51c5791f3322f02b62b1acf269a4d9338255cf2d74a6476fa8b4ea3eef48d94 +size 1272 diff --git a/assets/voxygen/voxel/npc/hyena/female/foot_fr.vox b/assets/voxygen/voxel/npc/hyena/female/foot_fr.vox index f9c83ee8ed..53e6a5754c 100644 --- a/assets/voxygen/voxel/npc/hyena/female/foot_fr.vox +++ b/assets/voxygen/voxel/npc/hyena/female/foot_fr.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a545bd32088e335ec2ab921098110ae41522ae7d4d815803f005bd2440689d03 -size 55755 +oid sha256:5a668bc6325d38faf2ca0bd1a969ee3d255cafccf11c5f544a19ac72cfb83e19 +size 1272 diff --git a/assets/voxygen/voxel/npc/hyena/female/head.vox b/assets/voxygen/voxel/npc/hyena/female/head.vox index 6dd7361de0..8ea905996a 100644 --- a/assets/voxygen/voxel/npc/hyena/female/head.vox +++ b/assets/voxygen/voxel/npc/hyena/female/head.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:640a8b9d79048abe27f5dedbbb8c13eb1fd388ffcfe432cf0146ac4dd7c98617 -size 56011 +oid sha256:3948a5ef12beff539ff08a6a202d70fb0bda075ffa5ec596b32b6497fa882017 +size 1528 diff --git a/assets/voxygen/voxel/npc/hyena/female/tail.vox b/assets/voxygen/voxel/npc/hyena/female/tail.vox new file mode 100644 index 0000000000..0758e9cf3b --- /dev/null +++ b/assets/voxygen/voxel/npc/hyena/female/tail.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bf057bd10925867cbc89706abfbeece5f677ed6c8f961e1910f32ddd3c3aa067 +size 1176 diff --git a/assets/voxygen/voxel/npc/hyena/male/chest.vox b/assets/voxygen/voxel/npc/hyena/male/chest.vox index b17066fdc7..4f1b98929f 100644 --- a/assets/voxygen/voxel/npc/hyena/male/chest.vox +++ b/assets/voxygen/voxel/npc/hyena/male/chest.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:637e62b0a5d3eeb9d029c177cfebf5d756770f4c328e12123d938a82c6347455 -size 57259 +oid sha256:0f69811441014a42ce4fb5f70e2d86db8081038f191baa982d8c3ee6edd56153 +size 2704 diff --git a/assets/voxygen/voxel/npc/hyena/male/foot_bl.vox b/assets/voxygen/voxel/npc/hyena/male/foot_bl.vox index b878edabf2..6042e19d34 100644 --- a/assets/voxygen/voxel/npc/hyena/male/foot_bl.vox +++ b/assets/voxygen/voxel/npc/hyena/male/foot_bl.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:177489285a01e175402ec4c2fc12cc01446ba36ad4abc7c5e843b1a9c157d176 -size 55727 +oid sha256:275c8b8d5a083f64fbde416df87547d0d9606cf602816d478e0af55aeac0bb7c +size 1244 diff --git a/assets/voxygen/voxel/npc/hyena/male/foot_br.vox b/assets/voxygen/voxel/npc/hyena/male/foot_br.vox index 75a40b49bd..097ab61953 100644 --- a/assets/voxygen/voxel/npc/hyena/male/foot_br.vox +++ b/assets/voxygen/voxel/npc/hyena/male/foot_br.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:63a1228b6a3d021b58cb38f10ada645352fc51523703f965c026e432f847ab8f -size 55727 +oid sha256:cb678cfb93421a60a6f8858a7c79a4cfdfcdd279d24b044b01b9dcd4cb899ea8 +size 1244 diff --git a/assets/voxygen/voxel/npc/hyena/male/foot_fl.vox b/assets/voxygen/voxel/npc/hyena/male/foot_fl.vox index 4dbda92c7e..06237aeedd 100644 --- a/assets/voxygen/voxel/npc/hyena/male/foot_fl.vox +++ b/assets/voxygen/voxel/npc/hyena/male/foot_fl.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2cc757e64f3b5f7109df888d1549eac48555251aa03d69884ffa3bfe41eaac5d -size 55755 +oid sha256:e51c5791f3322f02b62b1acf269a4d9338255cf2d74a6476fa8b4ea3eef48d94 +size 1272 diff --git a/assets/voxygen/voxel/npc/hyena/male/foot_fr.vox b/assets/voxygen/voxel/npc/hyena/male/foot_fr.vox index f9c83ee8ed..53e6a5754c 100644 --- a/assets/voxygen/voxel/npc/hyena/male/foot_fr.vox +++ b/assets/voxygen/voxel/npc/hyena/male/foot_fr.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a545bd32088e335ec2ab921098110ae41522ae7d4d815803f005bd2440689d03 -size 55755 +oid sha256:5a668bc6325d38faf2ca0bd1a969ee3d255cafccf11c5f544a19ac72cfb83e19 +size 1272 diff --git a/assets/voxygen/voxel/npc/hyena/male/head.vox b/assets/voxygen/voxel/npc/hyena/male/head.vox index 6dd7361de0..8ea905996a 100644 --- a/assets/voxygen/voxel/npc/hyena/male/head.vox +++ b/assets/voxygen/voxel/npc/hyena/male/head.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:640a8b9d79048abe27f5dedbbb8c13eb1fd388ffcfe432cf0146ac4dd7c98617 -size 56011 +oid sha256:3948a5ef12beff539ff08a6a202d70fb0bda075ffa5ec596b32b6497fa882017 +size 1528 diff --git a/assets/voxygen/voxel/npc/hyena/male/tail.vox b/assets/voxygen/voxel/npc/hyena/male/tail.vox new file mode 100644 index 0000000000..0758e9cf3b --- /dev/null +++ b/assets/voxygen/voxel/npc/hyena/male/tail.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bf057bd10925867cbc89706abfbeece5f677ed6c8f961e1910f32ddd3c3aa067 +size 1176 diff --git a/assets/voxygen/voxel/npc/parrot/female/head.vox b/assets/voxygen/voxel/npc/parrot/female/head.vox index 5d7c990133..48f8f03ab8 100644 --- a/assets/voxygen/voxel/npc/parrot/female/head.vox +++ b/assets/voxygen/voxel/npc/parrot/female/head.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:66c365bb5e8149927759c82af7eb881228a49abb04243021800fd2be29ca5c4b -size 55827 +oid sha256:0bf5ccf89342db3c78a4b647fc1baea8599a3441bf29bbe20a5997a48e7fa3e7 +size 1344 diff --git a/assets/voxygen/voxel/npc/parrot/female/leg_l.vox b/assets/voxygen/voxel/npc/parrot/female/leg_l.vox index d977d83d76..62494431ad 100644 --- a/assets/voxygen/voxel/npc/parrot/female/leg_l.vox +++ b/assets/voxygen/voxel/npc/parrot/female/leg_l.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:844daecb446b9e9d12521c5b56a6040e1e3cd0e494391a5fddfb4369dd50e97f -size 55599 +oid sha256:f14c1d4f83db3461e7a77c53b632e05fbfd251c8683db7731107f190a1487362 +size 1116 diff --git a/assets/voxygen/voxel/npc/parrot/female/leg_r.vox b/assets/voxygen/voxel/npc/parrot/female/leg_r.vox index 3fec4b1c02..8bdac7c3ad 100644 --- a/assets/voxygen/voxel/npc/parrot/female/leg_r.vox +++ b/assets/voxygen/voxel/npc/parrot/female/leg_r.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:949103f9884dc1ed422037e616a310e9b577515aa9075879591465a3c076b11e -size 55599 +oid sha256:b50af5feface97003171b70598ad35bf0974a81c7e2f1d6c14ff1ae045f41e18 +size 1116 diff --git a/assets/voxygen/voxel/npc/parrot/female/tail.vox b/assets/voxygen/voxel/npc/parrot/female/tail.vox index 78fa5607cd..08003d23bb 100644 --- a/assets/voxygen/voxel/npc/parrot/female/tail.vox +++ b/assets/voxygen/voxel/npc/parrot/female/tail.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8ca097a4bf6730a3585944f368a67a6aa751a620d909548ec78a167f273a4d95 -size 55711 +oid sha256:ea654cae2ec4ff8eb6c6a5401496bf9c14dedac64c6dc38fa492f738fa32d405 +size 1228 diff --git a/assets/voxygen/voxel/npc/parrot/female/torso.vox b/assets/voxygen/voxel/npc/parrot/female/torso.vox index 9bfa6d80aa..36fa8f1ecd 100644 --- a/assets/voxygen/voxel/npc/parrot/female/torso.vox +++ b/assets/voxygen/voxel/npc/parrot/female/torso.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1ff169f4873e685cf808d265ccb8da38f5fe2c04bd0e38cb0c8e4e650cbde606 -size 55887 +oid sha256:8a3b842b3390de14b575b262a7a3edfb62dffb811d59906b2ef960e08e26d727 +size 1404 diff --git a/assets/voxygen/voxel/npc/parrot/female/wing.vox b/assets/voxygen/voxel/npc/parrot/female/wing.vox index e3e9bae821..cf39a415bc 100644 --- a/assets/voxygen/voxel/npc/parrot/female/wing.vox +++ b/assets/voxygen/voxel/npc/parrot/female/wing.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4f7358b05929a0825d3bb9ef3fd91e47cd8e646cb50a19c9902885623a39c702 -size 55707 +oid sha256:7999ee135201c15c40bffdc00bcf9c357b976b5bd91393b176c023db50b01199 +size 1224 diff --git a/assets/voxygen/voxel/npc/parrot/male/head.vox b/assets/voxygen/voxel/npc/parrot/male/head.vox index 5d7c990133..48f8f03ab8 100644 --- a/assets/voxygen/voxel/npc/parrot/male/head.vox +++ b/assets/voxygen/voxel/npc/parrot/male/head.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:66c365bb5e8149927759c82af7eb881228a49abb04243021800fd2be29ca5c4b -size 55827 +oid sha256:0bf5ccf89342db3c78a4b647fc1baea8599a3441bf29bbe20a5997a48e7fa3e7 +size 1344 diff --git a/assets/voxygen/voxel/npc/parrot/male/leg_l.vox b/assets/voxygen/voxel/npc/parrot/male/leg_l.vox index d977d83d76..62494431ad 100644 --- a/assets/voxygen/voxel/npc/parrot/male/leg_l.vox +++ b/assets/voxygen/voxel/npc/parrot/male/leg_l.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:844daecb446b9e9d12521c5b56a6040e1e3cd0e494391a5fddfb4369dd50e97f -size 55599 +oid sha256:f14c1d4f83db3461e7a77c53b632e05fbfd251c8683db7731107f190a1487362 +size 1116 diff --git a/assets/voxygen/voxel/npc/parrot/male/leg_r.vox b/assets/voxygen/voxel/npc/parrot/male/leg_r.vox index 3fec4b1c02..8bdac7c3ad 100644 --- a/assets/voxygen/voxel/npc/parrot/male/leg_r.vox +++ b/assets/voxygen/voxel/npc/parrot/male/leg_r.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:949103f9884dc1ed422037e616a310e9b577515aa9075879591465a3c076b11e -size 55599 +oid sha256:b50af5feface97003171b70598ad35bf0974a81c7e2f1d6c14ff1ae045f41e18 +size 1116 diff --git a/assets/voxygen/voxel/npc/parrot/male/tail.vox b/assets/voxygen/voxel/npc/parrot/male/tail.vox index 78fa5607cd..08003d23bb 100644 --- a/assets/voxygen/voxel/npc/parrot/male/tail.vox +++ b/assets/voxygen/voxel/npc/parrot/male/tail.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8ca097a4bf6730a3585944f368a67a6aa751a620d909548ec78a167f273a4d95 -size 55711 +oid sha256:ea654cae2ec4ff8eb6c6a5401496bf9c14dedac64c6dc38fa492f738fa32d405 +size 1228 diff --git a/assets/voxygen/voxel/npc/parrot/male/torso.vox b/assets/voxygen/voxel/npc/parrot/male/torso.vox index 9bfa6d80aa..36fa8f1ecd 100644 --- a/assets/voxygen/voxel/npc/parrot/male/torso.vox +++ b/assets/voxygen/voxel/npc/parrot/male/torso.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1ff169f4873e685cf808d265ccb8da38f5fe2c04bd0e38cb0c8e4e650cbde606 -size 55887 +oid sha256:8a3b842b3390de14b575b262a7a3edfb62dffb811d59906b2ef960e08e26d727 +size 1404 diff --git a/assets/voxygen/voxel/npc/parrot/male/wing.vox b/assets/voxygen/voxel/npc/parrot/male/wing.vox index e3e9bae821..cf39a415bc 100644 --- a/assets/voxygen/voxel/npc/parrot/male/wing.vox +++ b/assets/voxygen/voxel/npc/parrot/male/wing.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4f7358b05929a0825d3bb9ef3fd91e47cd8e646cb50a19c9902885623a39c702 -size 55707 +oid sha256:7999ee135201c15c40bffdc00bcf9c357b976b5bd91393b176c023db50b01199 +size 1224 diff --git a/assets/voxygen/voxel/npc/pig/female/chest.vox b/assets/voxygen/voxel/npc/pig/female/chest.vox index f06dbf7e7c..da66786e5e 100644 --- a/assets/voxygen/voxel/npc/pig/female/chest.vox +++ b/assets/voxygen/voxel/npc/pig/female/chest.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d01ebd49961130923af7c50a975e4a1050ce6906e46a8af7330898a27ce6e3a1 -size 2752 +oid sha256:febe5a7a2959574cf9873db2fcd2dd61644cb1a1fac818b0d157fb8f8abf8e2e +size 2728 diff --git a/assets/voxygen/voxel/npc/pig/female/tail.vox b/assets/voxygen/voxel/npc/pig/female/tail.vox new file mode 100644 index 0000000000..18bd5abd07 --- /dev/null +++ b/assets/voxygen/voxel/npc/pig/female/tail.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d9cf49f35b190575852475f5b6105c387c9ce06a2e96ae822d930b7269945c1b +size 1120 diff --git a/assets/voxygen/voxel/npc/pig/male/chest.vox b/assets/voxygen/voxel/npc/pig/male/chest.vox index 4bff8ba86c..5e73b2d591 100644 --- a/assets/voxygen/voxel/npc/pig/male/chest.vox +++ b/assets/voxygen/voxel/npc/pig/male/chest.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:326da92dc4af851d907d674ce07cd63cc032477eae901c57dc5f4742cc215954 -size 2752 +oid sha256:6d66ecfd9935a08918afce0182d1ba683670b385a4eb83517987f01b43fe9dc9 +size 2728 diff --git a/assets/voxygen/voxel/npc/pig/male/tail.vox b/assets/voxygen/voxel/npc/pig/male/tail.vox new file mode 100644 index 0000000000..bd318d8f38 --- /dev/null +++ b/assets/voxygen/voxel/npc/pig/male/tail.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a0585aaeca7f094336d38c62ff0d58dca4ff38c1787abd00fd11c600bc2d297f +size 1120 diff --git a/assets/voxygen/voxel/npc/raccoon/female/chest.vox b/assets/voxygen/voxel/npc/raccoon/female/chest.vox index f7e114e232..b0cdf8a660 100644 --- a/assets/voxygen/voxel/npc/raccoon/female/chest.vox +++ b/assets/voxygen/voxel/npc/raccoon/female/chest.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:239e3588e6e949ebe139366cc622c72ed1266cb54364be8ea9c614d7feb7d22a -size 2080 +oid sha256:0e830b8ee0aa6fd45ccff1ebd5f993479bb0bf534439d5b41ce0f2820b56c423 +size 2000 diff --git a/assets/voxygen/voxel/npc/raccoon/female/tail.vox b/assets/voxygen/voxel/npc/raccoon/female/tail.vox new file mode 100644 index 0000000000..965be345fe --- /dev/null +++ b/assets/voxygen/voxel/npc/raccoon/female/tail.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ea46f72233e2865256adf71d8cf9a16a1ccca87fa19c4673431975bb02905731 +size 1176 diff --git a/assets/voxygen/voxel/npc/raccoon/male/chest.vox b/assets/voxygen/voxel/npc/raccoon/male/chest.vox index f7e114e232..660dd88009 100644 --- a/assets/voxygen/voxel/npc/raccoon/male/chest.vox +++ b/assets/voxygen/voxel/npc/raccoon/male/chest.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:239e3588e6e949ebe139366cc622c72ed1266cb54364be8ea9c614d7feb7d22a -size 2080 +oid sha256:1c23b2de4e28c1d7037bd7d2bc29dde4bebe0fb423afd05176432f25d73fe1d2 +size 2000 diff --git a/assets/voxygen/voxel/npc/raccoon/male/tail.vox b/assets/voxygen/voxel/npc/raccoon/male/tail.vox new file mode 100644 index 0000000000..8efdc25588 --- /dev/null +++ b/assets/voxygen/voxel/npc/raccoon/male/tail.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7a9ae036b292c7ca32aa8111fd512ebbd281f79f99009a5340ce2bd2800f32d0 +size 1176 diff --git a/assets/voxygen/voxel/npc/sheep/female/chest.vox b/assets/voxygen/voxel/npc/sheep/female/chest.vox index 44cc47df63..58fdfc22c0 100644 --- a/assets/voxygen/voxel/npc/sheep/female/chest.vox +++ b/assets/voxygen/voxel/npc/sheep/female/chest.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a7df5790855c6f01b3a5f72436d9682ca5d2f5c22cb202cc9c4527cc264fe69b -size 3384 +oid sha256:d28768d19e54b8e396588e97cafab4f3ccf1e417c8f292380588062067798c92 +size 3336 diff --git a/assets/voxygen/voxel/npc/sheep/female/tail.vox b/assets/voxygen/voxel/npc/sheep/female/tail.vox new file mode 100644 index 0000000000..df12c4bc11 --- /dev/null +++ b/assets/voxygen/voxel/npc/sheep/female/tail.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f690746eb2c6821df59e5d297583d21374e5764bcc43c2ecfdedc7b9e67d8740 +size 1144 diff --git a/assets/voxygen/voxel/npc/sheep/male/chest.vox b/assets/voxygen/voxel/npc/sheep/male/chest.vox index 44cc47df63..58fdfc22c0 100644 --- a/assets/voxygen/voxel/npc/sheep/male/chest.vox +++ b/assets/voxygen/voxel/npc/sheep/male/chest.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a7df5790855c6f01b3a5f72436d9682ca5d2f5c22cb202cc9c4527cc264fe69b -size 3384 +oid sha256:d28768d19e54b8e396588e97cafab4f3ccf1e417c8f292380588062067798c92 +size 3336 diff --git a/assets/voxygen/voxel/npc/sheep/male/head.vox b/assets/voxygen/voxel/npc/sheep/male/head.vox index 81eacd37ea..cb211c0131 100644 --- a/assets/voxygen/voxel/npc/sheep/male/head.vox +++ b/assets/voxygen/voxel/npc/sheep/male/head.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bafb91f085e9328bc9432855165cab42b26aee02ebc23d3deff48ef77df5cbb0 -size 56403 +oid sha256:b75c4cb4644689cef72262e9e5ebf2e975c05ee349a8fa90320149ef314e851b +size 1920 diff --git a/assets/voxygen/voxel/npc/sheep/male/tail.vox b/assets/voxygen/voxel/npc/sheep/male/tail.vox new file mode 100644 index 0000000000..df12c4bc11 --- /dev/null +++ b/assets/voxygen/voxel/npc/sheep/male/tail.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f690746eb2c6821df59e5d297583d21374e5764bcc43c2ecfdedc7b9e67d8740 +size 1144 diff --git a/assets/voxygen/voxel/npc/skunk/female/chest.vox b/assets/voxygen/voxel/npc/skunk/female/chest.vox index 4ea55206b4..3d24ecc8dc 100644 --- a/assets/voxygen/voxel/npc/skunk/female/chest.vox +++ b/assets/voxygen/voxel/npc/skunk/female/chest.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:68717cbc5bacc6345f37f95ed2fc5d59f3c50e796e9d2ec732190a275c9d7900 -size 2992 +oid sha256:740dfac589c9bdf53e4c096dee5ed4d414e398881d2a05aeb7cd801f975d6633 +size 2280 diff --git a/assets/voxygen/voxel/npc/skunk/female/tail.vox b/assets/voxygen/voxel/npc/skunk/female/tail.vox new file mode 100644 index 0000000000..98ea32f6c2 --- /dev/null +++ b/assets/voxygen/voxel/npc/skunk/female/tail.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:86d9dcdaef52097e199314c4bfde626a7b2e35ee772e20df6c8f93239a8fa8b8 +size 1808 diff --git a/assets/voxygen/voxel/npc/skunk/male/chest.vox b/assets/voxygen/voxel/npc/skunk/male/chest.vox index 4ea55206b4..3d24ecc8dc 100644 --- a/assets/voxygen/voxel/npc/skunk/male/chest.vox +++ b/assets/voxygen/voxel/npc/skunk/male/chest.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:68717cbc5bacc6345f37f95ed2fc5d59f3c50e796e9d2ec732190a275c9d7900 -size 2992 +oid sha256:740dfac589c9bdf53e4c096dee5ed4d414e398881d2a05aeb7cd801f975d6633 +size 2280 diff --git a/assets/voxygen/voxel/npc/skunk/male/tail.vox b/assets/voxygen/voxel/npc/skunk/male/tail.vox new file mode 100644 index 0000000000..5bc867817c --- /dev/null +++ b/assets/voxygen/voxel/npc/skunk/male/tail.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:26a1388485abf8fda1a8c44628e7dc7d85c7ade4c95bccbdf4175579f07fe153 +size 1808 diff --git a/assets/voxygen/voxel/npc/snowyowl/female/head.vox b/assets/voxygen/voxel/npc/snowyowl/female/head.vox index 5233239b84..d9623ee174 100644 --- a/assets/voxygen/voxel/npc/snowyowl/female/head.vox +++ b/assets/voxygen/voxel/npc/snowyowl/female/head.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:566aa6781dd74473afc16d3ff16f77427c69f3725f1aca5596371c2b03a97390 -size 56655 +oid sha256:0b121d9adf0c72f6e0680b3a7e5564e741616131da3054de56324f966c9473bf +size 2172 diff --git a/assets/voxygen/voxel/npc/snowyowl/female/leg_l.vox b/assets/voxygen/voxel/npc/snowyowl/female/leg_l.vox index c6f0c929ec..cabeb0a0ed 100644 --- a/assets/voxygen/voxel/npc/snowyowl/female/leg_l.vox +++ b/assets/voxygen/voxel/npc/snowyowl/female/leg_l.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ed574df7ee18a8c146347449442a1a5bd78915d35a69059fd56257a32e3d512f -size 55679 +oid sha256:d2efdd54f19e4467e781c3068ef3079f11cf7932076bb4f2d554044106e97bf1 +size 1196 diff --git a/assets/voxygen/voxel/npc/snowyowl/female/leg_r.vox b/assets/voxygen/voxel/npc/snowyowl/female/leg_r.vox index bae9b62566..8a079c0167 100644 --- a/assets/voxygen/voxel/npc/snowyowl/female/leg_r.vox +++ b/assets/voxygen/voxel/npc/snowyowl/female/leg_r.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1775296d1871876b2d45afc759964f135bab071e92d27984b6a3b5a4495cc05f -size 55679 +oid sha256:3fd8c1ec36d1937e321cc4359f63bebf0b0642357d85aa4c88845137bc126603 +size 1196 diff --git a/assets/voxygen/voxel/npc/snowyowl/female/tail.vox b/assets/voxygen/voxel/npc/snowyowl/female/tail.vox index 3052142f41..265bac5897 100644 --- a/assets/voxygen/voxel/npc/snowyowl/female/tail.vox +++ b/assets/voxygen/voxel/npc/snowyowl/female/tail.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7ad90ce412f238f4ccba6c6f178a60292414795d0bf1c8a785df5bade6e9f587 -size 55787 +oid sha256:066051c9ce3eac6b014b1eaef48f6b169073fc95438bff0b3756ce4029815d08 +size 1304 diff --git a/assets/voxygen/voxel/npc/snowyowl/female/torso.vox b/assets/voxygen/voxel/npc/snowyowl/female/torso.vox index d8ea6b7177..169192a932 100644 --- a/assets/voxygen/voxel/npc/snowyowl/female/torso.vox +++ b/assets/voxygen/voxel/npc/snowyowl/female/torso.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3c27bab60f306c074147bb7ddd32c51b51f9fd132997d4911c60696bd9fb45d3 -size 56611 +oid sha256:9b1f1c3951dfbcc3b11e98a9c98ed07c556b672b1d9c51de01c6cbb0ee355f03 +size 2128 diff --git a/assets/voxygen/voxel/npc/snowyowl/female/wing_l.vox b/assets/voxygen/voxel/npc/snowyowl/female/wing_l.vox index 743fb4dbba..353efa5c63 100644 --- a/assets/voxygen/voxel/npc/snowyowl/female/wing_l.vox +++ b/assets/voxygen/voxel/npc/snowyowl/female/wing_l.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cabfd81ba0a052193a41b534589cf1fb5a3eae68a6d491ac778b72d3fb3e25e2 -size 55843 +oid sha256:5e52d0f4ede8e25c98eff9ce8692f44d466205faea7b01a11395eb31426ad914 +size 1360 diff --git a/assets/voxygen/voxel/npc/snowyowl/female/wing_r.vox b/assets/voxygen/voxel/npc/snowyowl/female/wing_r.vox index 1d39ae0be4..33fe244ac1 100644 --- a/assets/voxygen/voxel/npc/snowyowl/female/wing_r.vox +++ b/assets/voxygen/voxel/npc/snowyowl/female/wing_r.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8272e4d9d53d60af121fe9a2f4499e8c269e107b0c04a24fd52f1305ac222158 -size 55843 +oid sha256:aeb88a9c4bb42139b3a624df3f4112e792b06d227f868a2db08ab76635455728 +size 1360 diff --git a/assets/voxygen/voxel/npc/snowyowl/male/head.vox b/assets/voxygen/voxel/npc/snowyowl/male/head.vox index 5233239b84..d9623ee174 100644 --- a/assets/voxygen/voxel/npc/snowyowl/male/head.vox +++ b/assets/voxygen/voxel/npc/snowyowl/male/head.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:566aa6781dd74473afc16d3ff16f77427c69f3725f1aca5596371c2b03a97390 -size 56655 +oid sha256:0b121d9adf0c72f6e0680b3a7e5564e741616131da3054de56324f966c9473bf +size 2172 diff --git a/assets/voxygen/voxel/npc/snowyowl/male/leg_l.vox b/assets/voxygen/voxel/npc/snowyowl/male/leg_l.vox index c6f0c929ec..cabeb0a0ed 100644 --- a/assets/voxygen/voxel/npc/snowyowl/male/leg_l.vox +++ b/assets/voxygen/voxel/npc/snowyowl/male/leg_l.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ed574df7ee18a8c146347449442a1a5bd78915d35a69059fd56257a32e3d512f -size 55679 +oid sha256:d2efdd54f19e4467e781c3068ef3079f11cf7932076bb4f2d554044106e97bf1 +size 1196 diff --git a/assets/voxygen/voxel/npc/snowyowl/male/leg_r.vox b/assets/voxygen/voxel/npc/snowyowl/male/leg_r.vox index bae9b62566..8a079c0167 100644 --- a/assets/voxygen/voxel/npc/snowyowl/male/leg_r.vox +++ b/assets/voxygen/voxel/npc/snowyowl/male/leg_r.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1775296d1871876b2d45afc759964f135bab071e92d27984b6a3b5a4495cc05f -size 55679 +oid sha256:3fd8c1ec36d1937e321cc4359f63bebf0b0642357d85aa4c88845137bc126603 +size 1196 diff --git a/assets/voxygen/voxel/npc/snowyowl/male/tail.vox b/assets/voxygen/voxel/npc/snowyowl/male/tail.vox index 3052142f41..265bac5897 100644 --- a/assets/voxygen/voxel/npc/snowyowl/male/tail.vox +++ b/assets/voxygen/voxel/npc/snowyowl/male/tail.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7ad90ce412f238f4ccba6c6f178a60292414795d0bf1c8a785df5bade6e9f587 -size 55787 +oid sha256:066051c9ce3eac6b014b1eaef48f6b169073fc95438bff0b3756ce4029815d08 +size 1304 diff --git a/assets/voxygen/voxel/npc/snowyowl/male/torso.vox b/assets/voxygen/voxel/npc/snowyowl/male/torso.vox index d8ea6b7177..169192a932 100644 --- a/assets/voxygen/voxel/npc/snowyowl/male/torso.vox +++ b/assets/voxygen/voxel/npc/snowyowl/male/torso.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3c27bab60f306c074147bb7ddd32c51b51f9fd132997d4911c60696bd9fb45d3 -size 56611 +oid sha256:9b1f1c3951dfbcc3b11e98a9c98ed07c556b672b1d9c51de01c6cbb0ee355f03 +size 2128 diff --git a/assets/voxygen/voxel/npc/snowyowl/male/wing_l.vox b/assets/voxygen/voxel/npc/snowyowl/male/wing_l.vox index 743fb4dbba..353efa5c63 100644 --- a/assets/voxygen/voxel/npc/snowyowl/male/wing_l.vox +++ b/assets/voxygen/voxel/npc/snowyowl/male/wing_l.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cabfd81ba0a052193a41b534589cf1fb5a3eae68a6d491ac778b72d3fb3e25e2 -size 55843 +oid sha256:5e52d0f4ede8e25c98eff9ce8692f44d466205faea7b01a11395eb31426ad914 +size 1360 diff --git a/assets/voxygen/voxel/npc/snowyowl/male/wing_r.vox b/assets/voxygen/voxel/npc/snowyowl/male/wing_r.vox index 1d39ae0be4..33fe244ac1 100644 --- a/assets/voxygen/voxel/npc/snowyowl/male/wing_r.vox +++ b/assets/voxygen/voxel/npc/snowyowl/male/wing_r.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8272e4d9d53d60af121fe9a2f4499e8c269e107b0c04a24fd52f1305ac222158 -size 55843 +oid sha256:aeb88a9c4bb42139b3a624df3f4112e792b06d227f868a2db08ab76635455728 +size 1360 diff --git a/assets/voxygen/voxel/object/lantern0.vox b/assets/voxygen/voxel/object/lantern0.vox index 2251bf2726..b71db60214 100644 --- a/assets/voxygen/voxel/object/lantern0.vox +++ b/assets/voxygen/voxel/object/lantern0.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3fa40e891c67261cae80c21223f6ec1ef7d02b0e2546396e07547c2e19079857 -size 56375 +oid sha256:6843626fd5bcb745ecfdc6e1c4341c89a3f84ad9a2d173ce38bc9786304e6402 +size 1892 diff --git a/assets/voxygen/voxel/quadruped_small_central_manifest.ron b/assets/voxygen/voxel/quadruped_small_central_manifest.ron index 90cd011fdd..e8c6798c3b 100644 --- a/assets/voxygen/voxel/quadruped_small_central_manifest.ron +++ b/assets/voxygen/voxel/quadruped_small_central_manifest.ron @@ -5,9 +5,13 @@ central: ("npc.pig.male.head"), ), chest: ( - offset: (-5.0, -4.5, -5.5), + offset: (-5.0, -4.5, -4.5), central: ("npc.pig.male.chest"), ), + tail: ( + offset: (-2.0, -1.0, -2.0), + central: ("npc.pig.male.tail"), + ), ), (Pig, Female):( head: ( @@ -15,9 +19,13 @@ central: ("npc.pig.female.head"), ), chest: ( - offset: (-5.0, -4.5, -5.5), + offset: (-5.0, -4.5, -4.5), central: ("npc.pig.female.chest"), ), + tail: ( + offset: (-2.0, -1.0, -2.0), + central: ("npc.pig.female.tail"), + ), ), (Fox, Male):( @@ -26,9 +34,13 @@ central: ("npc.fox.male.head"), ), chest: ( - offset: (-1.5, -8.0, -2.5), + offset: (-1.5, -4.5, -2.5), central: ("npc.fox.male.chest"), ), + tail: ( + offset: (-2.0, -7.0, -1.5), + central: ("npc.fox.male.tail"), + ), ), (Fox, Female):( @@ -37,9 +49,13 @@ central: ("npc.fox.female.head"), ), chest: ( - offset: (-1.5, -8.0, -2.5), + offset: (-1.5, -4.5, -2.5), central: ("npc.fox.female.chest"), ), + tail: ( + offset: (-1.5, -7.0, -1.5), + central: ("npc.fox.female.tail"), + ), ), (Sheep, Male):( @@ -48,9 +64,13 @@ central: ("npc.sheep.male.head"), ), chest: ( - offset: (-5.0, -6.5, -3.5), + offset: (-5.0, -5.5, -3.5), central: ("npc.sheep.male.chest"), ), + tail: ( + offset: (-2.0, -2.0, -1.5), + central: ("npc.sheep.male.tail"), + ), ), (Sheep, Female):( @@ -59,9 +79,13 @@ central: ("npc.sheep.female.head"), ), chest: ( - offset: (-5.0, -6.5, -3.5), + offset: (-5.0, -5.5, -3.5), central: ("npc.sheep.female.chest"), ), + tail: ( + offset: (-2.0, -2.0, -1.5), + central: ("npc.sheep.female.tail"), + ), ), (Boar, Male):( head: ( @@ -69,9 +93,13 @@ central: ("npc.boar.male.head"), ), chest: ( - offset: (-3.5, -9.5, -4.5), + offset: (-3.5, -8.0, -4.0), central: ("npc.boar.male.chest"), ), + tail: ( + offset: (-1.5, -2.0, -6.0), + central: ("npc.boar.male.tail"), + ), ), (Boar, Female):( head: ( @@ -79,9 +107,13 @@ central: ("npc.boar.female.head"), ), chest: ( - offset: (-3.5, -9.5, -4.5), + offset: (-3.5, -8.0, -4.0), central: ("npc.boar.female.chest"), ), + tail: ( + offset: (-1.5, -2.0, -6.0), + central: ("npc.boar.female.tail"), + ), ), (Jackalope, Male):( head: ( @@ -92,6 +124,10 @@ offset: (-1.5, -7.5, -2.5), central: ("npc.jackalope.male.chest"), ), + tail: ( + offset: (-1.5, -7.5, -2.5), + central: ("armor.empty"), + ), ), (Jackalope, Female):( head: ( @@ -102,6 +138,10 @@ offset: (-1.5, -7.5, -2.5), central: ("npc.jackalope.female.chest"), ), + tail: ( + offset: (-1.5, -7.5, -2.5), + central: ("armor.empty"), + ), ), (Skunk, Male):( head: ( @@ -109,9 +149,13 @@ central: ("npc.skunk.male.head"), ), chest: ( - offset: (-4.0, -10.5, -4.5), + offset: (-3.0, -4.5, -2.5), central: ("npc.skunk.male.chest"), ), + tail: ( + offset: (-3.0, -10.0, -4.5), + central: ("npc.skunk.male.tail"), + ), ), (Skunk, Female):( head: ( @@ -119,9 +163,13 @@ central: ("npc.skunk.female.head"), ), chest: ( - offset: (-4.0, -10.5, -4.5), + offset: (-3.0, -4.5, -2.5), central: ("npc.skunk.female.chest"), ), + tail: ( + offset: (-3.0, -10.0, -4.5), + central: ("npc.skunk.female.tail"), + ), ), (Cat, Male):( head: ( @@ -129,9 +177,13 @@ central: ("npc.cat.male.head"), ), chest: ( - offset: (-1.5, -5.5, -2.5), + offset: (-0.5, -3.0, -4.0), central: ("npc.cat.male.chest"), ), + tail: ( + offset: (-0.5, -3.0, -4.0), + central: ("npc.cat.male.tail"), + ), ), (Cat, Female):( head: ( @@ -139,9 +191,13 @@ central: ("npc.cat.female.head"), ), chest: ( - offset: (-1.5, -5.5, -2.5), + offset: (-1.5, -4.0, -2.0), central: ("npc.cat.female.chest"), ), + tail: ( + offset: (-0.5, -3.0, -4.0), + central: ("npc.cat.female.tail"), + ), ), (Batfox, Male):( head: ( @@ -152,6 +208,10 @@ offset: (-1.5, -7.5, -2.5), central: ("npc.batfox.male.chest"), ), + tail: ( + offset: (-1.5, -7.5, -2.5), + central: ("armor.empty"), + ), ), (Batfox, Female):( @@ -163,6 +223,10 @@ offset: (-1.5, -7.5, -2.5), central: ("npc.batfox.female.chest"), ), + tail: ( + offset: (-1.5, -7.5, -2.5), + central: ("armor.empty"), + ), ), (Raccoon, Male):( @@ -171,9 +235,13 @@ central: ("npc.raccoon.male.head"), ), chest: ( - offset: (-3.0, -7.5, -3.0), + offset: (-3.0, -5.5, -3.0), central: ("npc.raccoon.male.chest"), ), + tail: ( + offset: (-1.0, -5.0, -1.5), + central: ("npc.raccoon.male.tail"), + ), ), (Raccoon, Female):( @@ -182,9 +250,13 @@ central: ("npc.raccoon.female.head"), ), chest: ( - offset: (-3.0, -7.5, -3.0), + offset: (-3.0, -5.5, -3.0), central: ("npc.raccoon.female.chest"), ), + tail: ( + offset: (-1.0, -5.0, -1.5), + central: ("npc.raccoon.female.tail"), + ), ), (Quokka, Male):( @@ -196,6 +268,10 @@ offset: (-5.0, -7.5, -4.0), central: ("npc.quokka.male.chest"), ), + tail: ( + offset: (-1.5, -7.5, -2.5), + central: ("armor.empty"), + ), ), (Quokka, Female):( @@ -207,6 +283,10 @@ offset: (-5.0, -7.5, -4.0), central: ("npc.quokka.female.chest"), ), + tail: ( + offset: (-1.5, -7.5, -2.5), + central: ("armor.empty"), + ), ), (Dodarock, Male):( @@ -218,6 +298,10 @@ offset: (-5.0, -7.5, -4.5), central: ("npc.dodarock.male.chest"), ), + tail: ( + offset: (-1.5, -7.5, -2.5), + central: ("armor.empty"), + ), ), (Dodarock, Female):( @@ -229,6 +313,11 @@ offset: (-5.0, -7.5, -4.5), central: ("npc.dodarock.female.chest"), ), + tail: ( + offset: (-1.5, -7.5, -2.5), + central: ("armor.empty"), + ), + ), (Holladon, Male):( head: ( @@ -239,6 +328,10 @@ offset: (-3.0, -7.5, -3.0), central: ("npc.holladon.male.chest"), ), + tail: ( + offset: (-1.5, -7.5, -2.5), + central: ("armor.empty"), + ), ), (Holladon, Female):( @@ -250,6 +343,10 @@ offset: (-3.0, -7.5, -3.0), central: ("npc.holladon.female.chest"), ), + tail: ( + offset: (-1.5, -7.5, -2.5), + central: ("armor.empty"), + ), ), (Hyena, Male):( @@ -258,9 +355,13 @@ central: ("npc.hyena.male.head"), ), chest: ( - offset: (-3.0, -9.0, -5.0), + offset: (-3.0, -8.0, -4.0), central: ("npc.hyena.male.chest"), ), + tail: ( + offset: (-1.0, -3.0, -6.0), + central: ("npc.hyena.male.tail"), + ), ), (Hyena, Female):( @@ -269,8 +370,12 @@ central: ("npc.hyena.female.head"), ), chest: ( - offset: (-3.0, -9.0, -5.0), + offset: (-3.0, -8.0, -4.0), central: ("npc.hyena.female.chest"), ), + tail: ( + offset: (-1.0, -3.0, -6.0), + central: ("npc.hyena.female.tail"), + ), ), }) \ No newline at end of file diff --git a/assets/voxygen/voxel/weapon/axe/rusty_2h.vox b/assets/voxygen/voxel/weapon/axe/rusty_2h.vox index 867645362a..6c88590b64 100644 --- a/assets/voxygen/voxel/weapon/axe/rusty_2h.vox +++ b/assets/voxygen/voxel/weapon/axe/rusty_2h.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9414e08063d300516d2c8c1fbadae776a9bccbd8e81af02a50c217b2516a5d48 -size 56258 +oid sha256:32f582124883285583904f940e6ee84c79972fc20202c4c12f57cc718758c9ff +size 1752 diff --git a/assets/voxygen/voxel/weapon/bow/rare_bow-0.vox b/assets/voxygen/voxel/weapon/bow/rare_bow-0.vox index 0f80a4d007..90ae46e2f0 100644 --- a/assets/voxygen/voxel/weapon/bow/rare_bow-0.vox +++ b/assets/voxygen/voxel/weapon/bow/rare_bow-0.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:758753476c3d81f0fb81acbfe469cf1c349ac2a24f9626f2a74675e414ba04c4 -size 55928 +oid sha256:2c979e132b7b49338fbc74a0576be925fe08df7c04196feee298549c209d8237 +size 1444 diff --git a/assets/voxygen/voxel/weapon/debug_wand-0.vox b/assets/voxygen/voxel/weapon/debug_wand-0.vox index 205ee34d8e..3fe07e270d 100644 --- a/assets/voxygen/voxel/weapon/debug_wand-0.vox +++ b/assets/voxygen/voxel/weapon/debug_wand-0.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ac49a07298e92bb37e01a981efaa8d822b4e3fbd6131b564dca3366f5bccd995 -size 45980 +oid sha256:4f2d8be716c2918fa9fe2042ab455f9b773dd7e723e35d5b7f6281ba4faa807f +size 2852 diff --git a/assets/voxygen/voxel/weapon/debug_wand-1.vox b/assets/voxygen/voxel/weapon/debug_wand-1.vox index 54c1715085..b8d0ac2d4d 100644 --- a/assets/voxygen/voxel/weapon/debug_wand-1.vox +++ b/assets/voxygen/voxel/weapon/debug_wand-1.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a8fa8370c4aa2abe9485ef48d7c435ad4ba104c93c5954319fc4cb844f7f35d6 -size 57356 +oid sha256:45a05cdc6acf298a15835d5e0f0fa0368bd3ccdda706171c085788b8727cc072 +size 2852 diff --git a/assets/voxygen/voxel/weapon/debug_wand.vox b/assets/voxygen/voxel/weapon/debug_wand.vox index 205ee34d8e..3fe07e270d 100644 --- a/assets/voxygen/voxel/weapon/debug_wand.vox +++ b/assets/voxygen/voxel/weapon/debug_wand.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ac49a07298e92bb37e01a981efaa8d822b4e3fbd6131b564dca3366f5bccd995 -size 45980 +oid sha256:4f2d8be716c2918fa9fe2042ab455f9b773dd7e723e35d5b7f6281ba4faa807f +size 2852 diff --git a/assets/voxygen/voxel/weapon/hammer/hammer_1_2h.vox b/assets/voxygen/voxel/weapon/hammer/hammer_1_2h.vox index cb72e2bf45..7180d6445c 100644 --- a/assets/voxygen/voxel/weapon/hammer/hammer_1_2h.vox +++ b/assets/voxygen/voxel/weapon/hammer/hammer_1_2h.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:192c79add7e4fb06f635176fd1324fd8b95df85f5a58428cf71d0235cf378ef4 -size 58028 +oid sha256:6a615b33108126643ca4adb0e8d1c7f5c2e5ceba8c349efccc48c6602288c0c8 +size 3544 diff --git a/assets/voxygen/voxel/weapon/shield/wood-0.vox b/assets/voxygen/voxel/weapon/shield/wood-0.vox index 8eab0484ac..97b680f9db 100644 --- a/assets/voxygen/voxel/weapon/shield/wood-0.vox +++ b/assets/voxygen/voxel/weapon/shield/wood-0.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f506b9322ecad51e4d40b9b77c8cc48d6a464c0901728f0b057b89460ff83e8b -size 55996 +oid sha256:9b9998d51ca74bd59fbd3d402ebbdec5545db4208baa88accf179fa9330eda2f +size 1512 diff --git a/assets/voxygen/voxel/weapon/staff/wood-fire.vox b/assets/voxygen/voxel/weapon/staff/wood-fire.vox index 786e5c5b61..5ea4ad7a88 100644 --- a/assets/voxygen/voxel/weapon/staff/wood-fire.vox +++ b/assets/voxygen/voxel/weapon/staff/wood-fire.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ca53aff493ec6c10c0b53cabf2661c524f041f3e28ca978d9ca6df6a3ebd9c38 -size 55948 +oid sha256:6dc6d05c1067f2af69684f5120815684f8dadc6af0ad75b2e36d7fd3739c9a7e +size 1464 diff --git a/assets/voxygen/voxel/weapon/staff/wood-nature.vox b/assets/voxygen/voxel/weapon/staff/wood-nature.vox index 10780882bd..cfb29487b3 100644 --- a/assets/voxygen/voxel/weapon/staff/wood-nature.vox +++ b/assets/voxygen/voxel/weapon/staff/wood-nature.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:598648ac2c20b51c3497e93ea093c542390e45866150a18cb16a0ca7731ce5b8 -size 55932 +oid sha256:7d170f609ca3ec724429acdefb3c076f334265a9bed58d644bfb4e202e91ca94 +size 1448 diff --git a/assets/voxygen/voxel/weapon/staff/wood-simple.vox b/assets/voxygen/voxel/weapon/staff/wood-simple.vox index 7e69534fda..88047f09b1 100644 --- a/assets/voxygen/voxel/weapon/staff/wood-simple.vox +++ b/assets/voxygen/voxel/weapon/staff/wood-simple.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7b3fe2dfa4d4e9505762e70bd86c1719cfa0b579b0050211a30f769492c77898 -size 55932 +oid sha256:3df078fd1320d72e06702ef16cf0ff9ce03c4f644f04c2ec52215e922ac96282 +size 1448 diff --git a/assets/voxygen/voxel/weapon/sword/short_2h-0.vox b/assets/voxygen/voxel/weapon/sword/short_2h-0.vox index 291ca561c8..ef89183839 100644 --- a/assets/voxygen/voxel/weapon/sword/short_2h-0.vox +++ b/assets/voxygen/voxel/weapon/sword/short_2h-0.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:df2356d9eea495f7d2975a664eaab89bbfd2cd2c04bd3c7cd8de87c59416eb5d -size 55992 +oid sha256:51153a3f8c32d10a7d51ef72e84f545de84da0de7033c977fd1fbc7256383cf8 +size 1508 diff --git a/assets/voxygen/voxel/weapon/sword/wood_2h.vox b/assets/voxygen/voxel/weapon/sword/wood_2h.vox index 784e4666e0..32267ca3fe 100644 --- a/assets/voxygen/voxel/weapon/sword/wood_2h.vox +++ b/assets/voxygen/voxel/weapon/sword/wood_2h.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ea1fe735a3a065068b803dc9a323ef88c4402467d60d31c0bb9a2c7c663abdeb -size 44628 +oid sha256:70ee307de7d45c31cb8b1cb0bbe06146564f884e2e909967f929915415e529c7 +size 1520 diff --git a/assets/voxygen/voxel/weapon/sword/zweihander_2h-0.vox b/assets/voxygen/voxel/weapon/sword/zweihander_2h-0.vox index 7acfb86743..e9ad1aaebb 100644 --- a/assets/voxygen/voxel/weapon/sword/zweihander_2h-0.vox +++ b/assets/voxygen/voxel/weapon/sword/zweihander_2h-0.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:91758f07ca6dcae9089f42ec14a37a47ba9dfa1f3bf862a3faf62602dfd6dffe -size 56049 +oid sha256:8676b2e4513262bba1faacf3facb1ae71e528dc69004d43114052c53c78b7864 +size 1452 diff --git a/voxygen/src/anim/quadruped_small/idle.rs b/voxygen/src/anim/quadruped_small/idle.rs index 59a3c2fc0c..38706e65c7 100644 --- a/voxygen/src/anim/quadruped_small/idle.rs +++ b/voxygen/src/anim/quadruped_small/idle.rs @@ -18,6 +18,8 @@ impl Animation for IdleAnimation { let mut next = (*skeleton).clone(); let slow = (anim_time as f32 * 3.5).sin(); + let slowa = (anim_time as f32 * 3.5 + PI / 2.0).sin(); + let slow_alt = (anim_time as f32 * 3.5 + PI).sin(); let head_look = Vec2::new( @@ -42,7 +44,7 @@ impl Animation for IdleAnimation { next.chest.offset = Vec3::new( slow * 0.05, skeleton_attr.chest.0, - skeleton_attr.chest.1 + slow_alt * 0.2, + skeleton_attr.chest.1 + slowa * 0.2, ) / 11.0; next.chest.ori = Quaternion::rotation_y(slow * 0.05); next.chest.scale = Vec3::one() / 11.0; @@ -79,6 +81,10 @@ impl Animation for IdleAnimation { next.leg_rb.ori = Quaternion::rotation_x(slow * 0.08); next.leg_rb.scale = Vec3::one() / 11.0; + next.tail.offset = Vec3::new(0.0, skeleton_attr.tail.0, skeleton_attr.tail.1); + next.tail.ori = Quaternion::rotation_z(slow * 0.4); + next.tail.scale = Vec3::one(); + next } } diff --git a/voxygen/src/anim/quadruped_small/jump.rs b/voxygen/src/anim/quadruped_small/jump.rs index 60552badfa..9ad8c16499 100644 --- a/voxygen/src/anim/quadruped_small/jump.rs +++ b/voxygen/src/anim/quadruped_small/jump.rs @@ -56,6 +56,9 @@ impl Animation for JumpAnimation { next.leg_rb.ori = Quaternion::rotation_x(0.0); next.leg_rb.scale = Vec3::one() / 11.0; + next.tail.offset = Vec3::new(0.0, skeleton_attr.tail.0, skeleton_attr.tail.1); + next.tail.ori = Quaternion::rotation_x(-0.3); + next.tail.scale = Vec3::one(); next } } diff --git a/voxygen/src/anim/quadruped_small/mod.rs b/voxygen/src/anim/quadruped_small/mod.rs index 7b2770c077..3254412fb7 100644 --- a/voxygen/src/anim/quadruped_small/mod.rs +++ b/voxygen/src/anim/quadruped_small/mod.rs @@ -18,6 +18,7 @@ pub struct QuadrupedSmallSkeleton { leg_rf: Bone, leg_lb: Bone, leg_rb: Bone, + tail: Bone, } impl QuadrupedSmallSkeleton { @@ -27,18 +28,19 @@ impl QuadrupedSmallSkeleton { impl Skeleton for QuadrupedSmallSkeleton { type Attr = SkeletonAttr; - fn bone_count(&self) -> usize { 6 } + fn bone_count(&self) -> usize { 7 } fn compute_matrices(&self) -> ([FigureBoneData; 16], Vec3) { + let chest_mat = self.chest.compute_base_matrix(); ( [ FigureBoneData::new(self.head.compute_base_matrix()), - FigureBoneData::new(self.chest.compute_base_matrix()), + FigureBoneData::new(chest_mat), FigureBoneData::new(self.leg_lf.compute_base_matrix()), FigureBoneData::new(self.leg_rf.compute_base_matrix()), FigureBoneData::new(self.leg_lb.compute_base_matrix()), FigureBoneData::new(self.leg_rb.compute_base_matrix()), - FigureBoneData::default(), + FigureBoneData::new(chest_mat * self.tail.compute_base_matrix()), FigureBoneData::default(), FigureBoneData::default(), FigureBoneData::default(), @@ -60,6 +62,7 @@ impl Skeleton for QuadrupedSmallSkeleton { self.leg_rf.interpolate(&target.leg_rf, dt); self.leg_lb.interpolate(&target.leg_lb, dt); self.leg_rb.interpolate(&target.leg_rb, dt); + self.tail.interpolate(&target.tail, dt); } } @@ -68,6 +71,7 @@ pub struct SkeletonAttr { chest: (f32, f32), feet_f: (f32, f32, f32), feet_b: (f32, f32, f32), + tail: (f32, f32), } impl<'a> std::convert::TryFrom<&'a comp::Body> for SkeletonAttr { type Error = (); @@ -87,6 +91,7 @@ impl Default for SkeletonAttr { chest: (0.0, 0.0), feet_f: (0.0, 0.0, 0.0), feet_b: (0.0, 0.0, 0.0), + tail: (0.0, 0.0), } } } @@ -112,14 +117,14 @@ impl<'a> From<&'a comp::quadruped_small::Body> for SkeletonAttr { }, chest: match (body.species, body.body_type) { (Pig, _) => (0.0, 8.0), - (Fox, _) => (-2.0, 5.0), - (Sheep, _) => (-2.0, 6.0), - (Boar, _) => (-2.0, 7.0), + (Fox, _) => (1.0, 5.0), + (Sheep, _) => (-1.0, 6.0), + (Boar, _) => (0.0, 7.0), (Jackalope, _) => (-2.0, 6.0), - (Skunk, _) => (-5.0, 6.0), - (Cat, _) => (-2.0, 6.0), + (Skunk, _) => (0.0, 6.0), + (Cat, _) => (0.0, 6.0), (Batfox, _) => (-2.0, 6.0), - (Raccoon, _) => (-2.0, 6.0), + (Raccoon, _) => (0.0, 6.0), (Quokka, _) => (2.0, 8.0), (Dodarock, _) => (-2.0, 8.0), (Holladon, _) => (-2.0, 6.0), @@ -155,6 +160,21 @@ impl<'a> From<&'a comp::quadruped_small::Body> for SkeletonAttr { (Holladon, _) => (4.0, -4.0, 3.0), (Hyena, _) => (2.5, -7.0, 6.0), }, + tail: match (body.species, body.body_type) { + (Pig, _) => (-4.0, 3.0), + (Fox, _) => (-3.5, 1.0), + (Sheep, _) => (-5.0, 0.0), + (Boar, _) => (-8.5, 2.0), + (Jackalope, _) => (0.0, 5.0), + (Skunk, _) => (-3.0, 1.5), + (Cat, _) => (-3.0, 2.0), + (Batfox, _) => (0.0, 5.0), + (Raccoon, _) => (-4.0, 1.0), + (Quokka, _) => (0.0, 6.0), + (Dodarock, _) => (0.0, 5.0), + (Holladon, _) => (0.0, 4.0), + (Hyena, _) => (-8.0, 1.0), + }, } } } diff --git a/voxygen/src/anim/quadruped_small/run.rs b/voxygen/src/anim/quadruped_small/run.rs index 801c66ddb4..7e6daa30a1 100644 --- a/voxygen/src/anim/quadruped_small/run.rs +++ b/voxygen/src/anim/quadruped_small/run.rs @@ -68,6 +68,9 @@ impl Animation for RunAnimation { next.leg_rb.ori = Quaternion::rotation_x(fast * 0.3); next.leg_rb.scale = Vec3::one() / 11.0; + next.tail.offset = Vec3::new(0.0, skeleton_attr.tail.0, skeleton_attr.tail.1); + next.tail.ori = Quaternion::rotation_z(0.0); + next.tail.scale = Vec3::one(); next } } diff --git a/voxygen/src/scene/figure/cache.rs b/voxygen/src/scene/figure/cache.rs index 3ab463ffdd..0460279033 100644 --- a/voxygen/src/scene/figure/cache.rs +++ b/voxygen/src/scene/figure/cache.rs @@ -221,7 +221,11 @@ impl FigureModelCache { body.body_type, generate_mesh, )), - None, + Some(quadruped_small_central_spec.mesh_tail( + body.species, + body.body_type, + generate_mesh, + )), None, None, None, diff --git a/voxygen/src/scene/figure/load.rs b/voxygen/src/scene/figure/load.rs index d52636752c..7128a4fd73 100644 --- a/voxygen/src/scene/figure/load.rs +++ b/voxygen/src/scene/figure/load.rs @@ -972,6 +972,7 @@ pub struct QuadrupedSmallCentralSpec(HashMap<(QSSpecies, QSBodyType), SidedQSCen struct SidedQSCentralVoxSpec { head: QuadrupedSmallCentralSubSpec, chest: QuadrupedSmallCentralSubSpec, + tail: QuadrupedSmallCentralSubSpec, } #[derive(Serialize, Deserialize)] struct QuadrupedSmallCentralSubSpec { @@ -1058,6 +1059,27 @@ impl QuadrupedSmallCentralSpec { generate_mesh(¢ral, Vec3::from(spec.chest.offset)) } + + pub fn mesh_tail( + &self, + species: QSSpecies, + body_type: QSBodyType, + generate_mesh: impl FnOnce(&Segment, Vec3) -> Mesh, + ) -> Mesh { + let spec = match self.0.get(&(species, body_type)) { + Some(spec) => spec, + None => { + error!( + "No tail specification exists for the combination of {:?} and {:?}", + species, body_type + ); + return load_mesh("not_found", Vec3::new(-5.0, -5.0, -2.5), generate_mesh); + }, + }; + let central = graceful_load_segment(&spec.tail.central.0); + + generate_mesh(¢ral, Vec3::from(spec.tail.offset)) + } } impl QuadrupedSmallLateralSpec {