diff --git a/assets/voxygen/element/icons/orc_f.png b/assets/voxygen/element/icons/orc_f.png index bd155430df..15ecba956f 100644 --- a/assets/voxygen/element/icons/orc_f.png +++ b/assets/voxygen/element/icons/orc_f.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:73efdffea6355bcebce5c4e5380d77cfe764b4765dde3b3a484cead7ff2ba2d9 -size 17556 +oid sha256:5efae53235c444df2b8002b82bb10bd9df2d9473c82f2018dd5715c7bdffa96b +size 18594 diff --git a/assets/voxygen/element/icons/orc_m.png b/assets/voxygen/element/icons/orc_m.png index 846dd9a672..2036e0e2fb 100644 --- a/assets/voxygen/element/icons/orc_m.png +++ b/assets/voxygen/element/icons/orc_m.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1f68b55eabff3fcdd914e07dbb6db112cbe019a814d536bab1be456cfbc69bae -size 19128 +oid sha256:e6dd5c5dc7a04233a70b55ba6f48b0e062aebbc1fcaf7ebde1edeeac366cd3d4 +size 15053 diff --git a/assets/voxygen/voxel/figure/head/head_dwarf_female.vox b/assets/voxygen/voxel/figure/head/head_dwarf_female.vox index 3a2f18e355..27c0fbd36f 100644 --- a/assets/voxygen/voxel/figure/head/head_dwarf_female.vox +++ b/assets/voxygen/voxel/figure/head/head_dwarf_female.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:70424ea32cc20f5101ce5d6877a37ceb67a1ae47509ef2710cab2c29b15c3109 -size 4392 +oid sha256:4140c55f76e6dad281b7bbe76037e0b0951caf375098892a1d1e59521e2d0514 +size 47499 diff --git a/assets/voxygen/voxel/figure/head/head_human_female.vox b/assets/voxygen/voxel/figure/head/head_human_female.vox index 9a33854f2d..9efc0277a4 100644 --- a/assets/voxygen/voxel/figure/head/head_human_female.vox +++ b/assets/voxygen/voxel/figure/head/head_human_female.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:808c77d7ed81aab362bc92a3d5273d1f836043127e3c0d8db7a5864aa58f44b7 -size 5168 +oid sha256:16c2d3311840711fbcacb9db74e1c2fba9c18703112e63717160be4d7ed85be1 +size 48275 diff --git a/assets/voxygen/voxel/figure/head/head_human_male.vox b/assets/voxygen/voxel/figure/head/head_human_male.vox index 8e42300a24..8b2d8c9dd9 100644 --- a/assets/voxygen/voxel/figure/head/head_human_male.vox +++ b/assets/voxygen/voxel/figure/head/head_human_male.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2ec795ccc978ba4ea8e35b0c585673dd89fe5b609f4b639808118fe7720203a9 -size 47244 +oid sha256:feb06650ac93a63318391a930fa6d6e2a07bec7300d8b9d76731259613cc4e65 +size 47204 diff --git a/assets/voxygen/voxel/figure/head/head_orc_female.vox b/assets/voxygen/voxel/figure/head/head_orc_female.vox index 31eb6b37b9..ffd88e1bf4 100644 --- a/assets/voxygen/voxel/figure/head/head_orc_female.vox +++ b/assets/voxygen/voxel/figure/head/head_orc_female.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cca256ad0e5e99dc97b5d6a0e3ad65f5a55a97417be4686a31122ca7539b988a -size 46891 +oid sha256:cb6052b4aff4df32ac57192332229ad0b740346e654c0d663d11fe4c6306dbb1 +size 47209 diff --git a/assets/voxygen/voxel/figure/head/head_orc_male.vox b/assets/voxygen/voxel/figure/head/head_orc_male.vox index 49e36869b0..98c1daa965 100644 --- a/assets/voxygen/voxel/figure/head/head_orc_male.vox +++ b/assets/voxygen/voxel/figure/head/head_orc_male.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:de5333722f1c5e018f6cffa3abd40283fd4dda574e50a5e8a7851a3a344633ae -size 46831 +oid sha256:88da79a8e2c9086e116721b23e823e75aae72ed05dceaa125177332f3836b2ae +size 46680 diff --git a/voxygen/src/anim/mod.rs b/voxygen/src/anim/mod.rs index 43fcb38fca..cb756fea9e 100644 --- a/voxygen/src/anim/mod.rs +++ b/voxygen/src/anim/mod.rs @@ -104,10 +104,10 @@ impl<'a> From<&'a comp::humanoid::Body> for SkeletonAttr { }, neck_height: match (body.race, body.body_type) { (Orc, Male) => -2.0, - (Orc, Female) => -2.0, - (Human, Male) => -0.5, + (Orc, Female) => 0.0, + (Human, Male) => -0.75, (Human, Female) => -2.0, - (Elf, Male) => -0.5, + (Elf, Male) => -0.75, (Elf, Female) => -1.25, (Dwarf, Male) => -0.0, (Dwarf, Female) => -1.0, @@ -117,11 +117,11 @@ impl<'a> From<&'a comp::humanoid::Body> for SkeletonAttr { (Danari, Female) => -0.5, }, neck_forward: match (body.race, body.body_type) { - (Orc, Male) => 1.0, - (Orc, Female) => -1.0, + (Orc, Male) => 0.0, + (Orc, Female) => -2.0, (Human, Male) => 0.0, (Human, Female) => -1.0, - (Elf, Male) => 1.25, + (Elf, Male) => 0.0, (Elf, Female) => -0.5, (Dwarf, Male) => 2.0, (Dwarf, Female) => 0.0, diff --git a/voxygen/src/scene/figure.rs b/voxygen/src/scene/figure.rs index 22a657da71..3107744615 100644 --- a/voxygen/src/scene/figure.rs +++ b/voxygen/src/scene/figure.rs @@ -153,7 +153,7 @@ impl FigureModelCache { let (name, offset) = match (race, body_type) { (Human, Male) => ( "figure/head/head_human_male.vox", - Vec3::new(-7.0, -5.5, -2.25), + Vec3::new(-7.0, -5.0, -2.25), ), (Human, Female) => ( "figure/head/head_human_female.vox", @@ -177,11 +177,11 @@ impl FigureModelCache { ), (Orc, Male) => ( "figure/head/head_orc_male.vox", - Vec3::new(-8.0, -6.0, -2.75), + Vec3::new(-8.0, -5.0, -2.50), ), (Orc, Female) => ( "figure/head/head_orc_female.vox", - Vec3::new(-8.0, -5.5, -2.75), + Vec3::new(-8.0, -8.0, -3.5), ), (Undead, Male) => ( "figure/head/head_undead_male.vox",