From 11a022abb3dafd33a9411cf6f257ac1f702dace1 Mon Sep 17 00:00:00 2001 From: Monty Marz Date: Fri, 27 Sep 2019 16:04:22 +0000 Subject: [PATCH] Better stepping sounds (and minor voxel model fixes) --- .../audio/{ => sfx}/footsteps/stepdirt_1.wav | 0 .../audio/{ => sfx}/footsteps/stepdirt_2.wav | 0 .../audio/{ => sfx}/footsteps/stepdirt_3.wav | 0 .../audio/{ => sfx}/footsteps/stepdirt_4.wav | 0 .../audio/{ => sfx}/footsteps/stepdirt_5.wav | 0 .../audio/{ => sfx}/footsteps/stepdirt_6.wav | 0 .../audio/{ => sfx}/footsteps/stepdirt_7.wav | 0 .../audio/{ => sfx}/footsteps/stepdirt_8.wav | 0 .../audio/{ => sfx}/footsteps/stepsnow_1.wav | 0 .../audio/{ => sfx}/footsteps/stepsnow_2.wav | 0 .../audio/{ => sfx}/footsteps/stepstone_1.wav | 0 .../audio/{ => sfx}/footsteps/stepstone_2.wav | 0 .../audio/{ => sfx}/footsteps/stepstone_3.wav | 0 .../audio/{ => sfx}/footsteps/stepstone_4.wav | 0 .../audio/{ => sfx}/footsteps/stepstone_5.wav | 0 .../audio/{ => sfx}/footsteps/stepstone_6.wav | 0 .../audio/{ => sfx}/footsteps/stepstone_7.wav | 0 .../audio/{ => sfx}/footsteps/stepstone_8.wav | 0 .../audio/{ => sfx}/footsteps/stepwater_1.wav | 0 .../audio/{ => sfx}/footsteps/stepwater_2.wav | 0 .../audio/{ => sfx}/footsteps/stepwood_1.wav | 0 .../audio/{ => sfx}/footsteps/stepwood_2.wav | 0 assets/voxygen/audio/sfx/steps/step_1.wav | 3 +++ assets/voxygen/audio/sfx/steps/step_2.wav | 3 +++ assets/voxygen/audio/sfx/steps/step_3.wav | 3 +++ assets/voxygen/audio/sfx/steps/step_4.wav | 3 +++ assets/voxygen/audio/sfx/steps/step_5.wav | 3 +++ .../audio/soundtrack/regional/grasslands.ogg | 3 +++ .../voxel/figure/hair/dwarf/female-0.vox | 4 ++-- .../voxygen/voxel/figure/hair/elf/female-0.vox | 4 ++-- .../voxygen/voxel/figure/hair/elf/female-1.vox | 4 ++-- .../voxel/figure/hair/elf/female-10.vox | 4 ++-- .../voxel/figure/hair/elf/female-11.vox | 4 ++-- .../voxel/figure/hair/elf/female-12.vox | 4 ++-- .../voxel/figure/hair/elf/female-13.vox | 4 ++-- .../voxel/figure/hair/elf/female-14.vox | 4 ++-- .../voxel/figure/hair/elf/female-15.vox | 4 ++-- .../voxel/figure/hair/elf/female-16.vox | 4 ++-- .../voxel/figure/hair/elf/female-17.vox | 4 ++-- .../voxel/figure/hair/elf/female-18.vox | 4 ++-- .../voxel/figure/hair/elf/female-19.vox | 4 ++-- .../voxel/figure/hair/elf/female-20.vox | 4 ++-- .../voxygen/voxel/figure/hair/elf/female-3.vox | 4 ++-- .../voxygen/voxel/figure/hair/elf/female-4.vox | 4 ++-- .../voxygen/voxel/figure/hair/elf/female-5.vox | 4 ++-- .../voxygen/voxel/figure/hair/elf/female-6.vox | 4 ++-- .../voxygen/voxel/figure/hair/elf/female-7.vox | 4 ++-- .../voxygen/voxel/figure/hair/elf/female-8.vox | 4 ++-- .../voxygen/voxel/figure/hair/elf/male-0.vox | 4 ++-- .../voxel/figure/hair/human/female-0.vox | 4 ++-- .../voxel/figure/hair/human/female-1.vox | 4 ++-- .../voxel/figure/hair/human/female-10.vox | 4 ++-- .../voxel/figure/hair/human/female-11.vox | 4 ++-- .../voxel/figure/hair/human/female-12.vox | 4 ++-- .../voxel/figure/hair/human/female-13.vox | 4 ++-- .../voxel/figure/hair/human/female-14.vox | 4 ++-- .../voxel/figure/hair/human/female-15.vox | 4 ++-- .../voxel/figure/hair/human/female-16.vox | 4 ++-- .../voxel/figure/hair/human/female-17.vox | 4 ++-- .../voxel/figure/hair/human/female-18.vox | 4 ++-- .../voxel/figure/hair/human/female-3.vox | 4 ++-- .../voxel/figure/hair/human/female-4.vox | 4 ++-- .../voxel/figure/hair/human/female-5.vox | 4 ++-- .../voxel/figure/hair/human/female-6.vox | 4 ++-- .../voxel/figure/hair/human/female-7.vox | 4 ++-- .../voxel/figure/hair/human/female-8.vox | 4 ++-- .../voxygen/voxel/figure/hair/human/male-0.vox | 4 ++-- .../voxygen/voxel/figure/hair/human/male-1.vox | 4 ++-- .../voxygen/voxel/figure/hair/human/male-2.vox | 4 ++-- .../voxygen/voxel/figure/head/danari/male.vox | 4 ++-- .../voxygen/voxel/figure/head/dwarf/female.vox | 2 +- .../voxygen/voxel/figure/head/dwarf/male.vox | 2 +- .../voxygen/voxel/figure/head/elf/female.vox | 2 +- assets/voxygen/voxel/figure/head/elf/male.vox | 2 +- .../voxygen/voxel/figure/head/human/female.vox | 2 +- .../voxygen/voxel/figure/head/human/male.vox | 4 ++-- common/src/comp/body/humanoid.rs | 18 ++++++------------ voxygen/src/audio/mod.rs | 2 +- voxygen/src/menu/char_selection/scene.rs | 2 +- voxygen/src/scene/sound.rs | 4 ++-- voxygen/src/settings.rs | 4 ++-- 81 files changed, 121 insertions(+), 109 deletions(-) rename assets/voxygen/audio/{ => sfx}/footsteps/stepdirt_1.wav (100%) rename assets/voxygen/audio/{ => sfx}/footsteps/stepdirt_2.wav (100%) rename assets/voxygen/audio/{ => sfx}/footsteps/stepdirt_3.wav (100%) rename assets/voxygen/audio/{ => sfx}/footsteps/stepdirt_4.wav (100%) rename assets/voxygen/audio/{ => sfx}/footsteps/stepdirt_5.wav (100%) rename assets/voxygen/audio/{ => sfx}/footsteps/stepdirt_6.wav (100%) rename assets/voxygen/audio/{ => sfx}/footsteps/stepdirt_7.wav (100%) rename assets/voxygen/audio/{ => sfx}/footsteps/stepdirt_8.wav (100%) rename assets/voxygen/audio/{ => sfx}/footsteps/stepsnow_1.wav (100%) rename assets/voxygen/audio/{ => sfx}/footsteps/stepsnow_2.wav (100%) rename assets/voxygen/audio/{ => sfx}/footsteps/stepstone_1.wav (100%) rename assets/voxygen/audio/{ => sfx}/footsteps/stepstone_2.wav (100%) rename assets/voxygen/audio/{ => sfx}/footsteps/stepstone_3.wav (100%) rename assets/voxygen/audio/{ => sfx}/footsteps/stepstone_4.wav (100%) rename assets/voxygen/audio/{ => sfx}/footsteps/stepstone_5.wav (100%) rename assets/voxygen/audio/{ => sfx}/footsteps/stepstone_6.wav (100%) rename assets/voxygen/audio/{ => sfx}/footsteps/stepstone_7.wav (100%) rename assets/voxygen/audio/{ => sfx}/footsteps/stepstone_8.wav (100%) rename assets/voxygen/audio/{ => sfx}/footsteps/stepwater_1.wav (100%) rename assets/voxygen/audio/{ => sfx}/footsteps/stepwater_2.wav (100%) rename assets/voxygen/audio/{ => sfx}/footsteps/stepwood_1.wav (100%) rename assets/voxygen/audio/{ => sfx}/footsteps/stepwood_2.wav (100%) create mode 100644 assets/voxygen/audio/sfx/steps/step_1.wav create mode 100644 assets/voxygen/audio/sfx/steps/step_2.wav create mode 100644 assets/voxygen/audio/sfx/steps/step_3.wav create mode 100644 assets/voxygen/audio/sfx/steps/step_4.wav create mode 100644 assets/voxygen/audio/sfx/steps/step_5.wav create mode 100644 assets/voxygen/audio/soundtrack/regional/grasslands.ogg diff --git a/assets/voxygen/audio/footsteps/stepdirt_1.wav b/assets/voxygen/audio/sfx/footsteps/stepdirt_1.wav similarity index 100% rename from assets/voxygen/audio/footsteps/stepdirt_1.wav rename to assets/voxygen/audio/sfx/footsteps/stepdirt_1.wav diff --git a/assets/voxygen/audio/footsteps/stepdirt_2.wav b/assets/voxygen/audio/sfx/footsteps/stepdirt_2.wav similarity index 100% rename from assets/voxygen/audio/footsteps/stepdirt_2.wav rename to assets/voxygen/audio/sfx/footsteps/stepdirt_2.wav diff --git a/assets/voxygen/audio/footsteps/stepdirt_3.wav b/assets/voxygen/audio/sfx/footsteps/stepdirt_3.wav similarity index 100% rename from assets/voxygen/audio/footsteps/stepdirt_3.wav rename to assets/voxygen/audio/sfx/footsteps/stepdirt_3.wav diff --git a/assets/voxygen/audio/footsteps/stepdirt_4.wav b/assets/voxygen/audio/sfx/footsteps/stepdirt_4.wav similarity index 100% rename from assets/voxygen/audio/footsteps/stepdirt_4.wav rename to assets/voxygen/audio/sfx/footsteps/stepdirt_4.wav diff --git a/assets/voxygen/audio/footsteps/stepdirt_5.wav b/assets/voxygen/audio/sfx/footsteps/stepdirt_5.wav similarity index 100% rename from assets/voxygen/audio/footsteps/stepdirt_5.wav rename to assets/voxygen/audio/sfx/footsteps/stepdirt_5.wav diff --git a/assets/voxygen/audio/footsteps/stepdirt_6.wav b/assets/voxygen/audio/sfx/footsteps/stepdirt_6.wav similarity index 100% rename from assets/voxygen/audio/footsteps/stepdirt_6.wav rename to assets/voxygen/audio/sfx/footsteps/stepdirt_6.wav diff --git a/assets/voxygen/audio/footsteps/stepdirt_7.wav b/assets/voxygen/audio/sfx/footsteps/stepdirt_7.wav similarity index 100% rename from assets/voxygen/audio/footsteps/stepdirt_7.wav rename to assets/voxygen/audio/sfx/footsteps/stepdirt_7.wav diff --git a/assets/voxygen/audio/footsteps/stepdirt_8.wav b/assets/voxygen/audio/sfx/footsteps/stepdirt_8.wav similarity index 100% rename from assets/voxygen/audio/footsteps/stepdirt_8.wav rename to assets/voxygen/audio/sfx/footsteps/stepdirt_8.wav diff --git a/assets/voxygen/audio/footsteps/stepsnow_1.wav b/assets/voxygen/audio/sfx/footsteps/stepsnow_1.wav similarity index 100% rename from assets/voxygen/audio/footsteps/stepsnow_1.wav rename to assets/voxygen/audio/sfx/footsteps/stepsnow_1.wav diff --git a/assets/voxygen/audio/footsteps/stepsnow_2.wav b/assets/voxygen/audio/sfx/footsteps/stepsnow_2.wav similarity index 100% rename from assets/voxygen/audio/footsteps/stepsnow_2.wav rename to assets/voxygen/audio/sfx/footsteps/stepsnow_2.wav diff --git a/assets/voxygen/audio/footsteps/stepstone_1.wav b/assets/voxygen/audio/sfx/footsteps/stepstone_1.wav similarity index 100% rename from assets/voxygen/audio/footsteps/stepstone_1.wav rename to assets/voxygen/audio/sfx/footsteps/stepstone_1.wav diff --git a/assets/voxygen/audio/footsteps/stepstone_2.wav b/assets/voxygen/audio/sfx/footsteps/stepstone_2.wav similarity index 100% rename from assets/voxygen/audio/footsteps/stepstone_2.wav rename to assets/voxygen/audio/sfx/footsteps/stepstone_2.wav diff --git a/assets/voxygen/audio/footsteps/stepstone_3.wav b/assets/voxygen/audio/sfx/footsteps/stepstone_3.wav similarity index 100% rename from assets/voxygen/audio/footsteps/stepstone_3.wav rename to assets/voxygen/audio/sfx/footsteps/stepstone_3.wav diff --git a/assets/voxygen/audio/footsteps/stepstone_4.wav b/assets/voxygen/audio/sfx/footsteps/stepstone_4.wav similarity index 100% rename from assets/voxygen/audio/footsteps/stepstone_4.wav rename to assets/voxygen/audio/sfx/footsteps/stepstone_4.wav diff --git a/assets/voxygen/audio/footsteps/stepstone_5.wav b/assets/voxygen/audio/sfx/footsteps/stepstone_5.wav similarity index 100% rename from assets/voxygen/audio/footsteps/stepstone_5.wav rename to assets/voxygen/audio/sfx/footsteps/stepstone_5.wav diff --git a/assets/voxygen/audio/footsteps/stepstone_6.wav b/assets/voxygen/audio/sfx/footsteps/stepstone_6.wav similarity index 100% rename from assets/voxygen/audio/footsteps/stepstone_6.wav rename to assets/voxygen/audio/sfx/footsteps/stepstone_6.wav diff --git a/assets/voxygen/audio/footsteps/stepstone_7.wav b/assets/voxygen/audio/sfx/footsteps/stepstone_7.wav similarity index 100% rename from assets/voxygen/audio/footsteps/stepstone_7.wav rename to assets/voxygen/audio/sfx/footsteps/stepstone_7.wav diff --git a/assets/voxygen/audio/footsteps/stepstone_8.wav b/assets/voxygen/audio/sfx/footsteps/stepstone_8.wav similarity index 100% rename from assets/voxygen/audio/footsteps/stepstone_8.wav rename to assets/voxygen/audio/sfx/footsteps/stepstone_8.wav diff --git a/assets/voxygen/audio/footsteps/stepwater_1.wav b/assets/voxygen/audio/sfx/footsteps/stepwater_1.wav similarity index 100% rename from assets/voxygen/audio/footsteps/stepwater_1.wav rename to assets/voxygen/audio/sfx/footsteps/stepwater_1.wav diff --git a/assets/voxygen/audio/footsteps/stepwater_2.wav b/assets/voxygen/audio/sfx/footsteps/stepwater_2.wav similarity index 100% rename from assets/voxygen/audio/footsteps/stepwater_2.wav rename to assets/voxygen/audio/sfx/footsteps/stepwater_2.wav diff --git a/assets/voxygen/audio/footsteps/stepwood_1.wav b/assets/voxygen/audio/sfx/footsteps/stepwood_1.wav similarity index 100% rename from assets/voxygen/audio/footsteps/stepwood_1.wav rename to assets/voxygen/audio/sfx/footsteps/stepwood_1.wav diff --git a/assets/voxygen/audio/footsteps/stepwood_2.wav b/assets/voxygen/audio/sfx/footsteps/stepwood_2.wav similarity index 100% rename from assets/voxygen/audio/footsteps/stepwood_2.wav rename to assets/voxygen/audio/sfx/footsteps/stepwood_2.wav diff --git a/assets/voxygen/audio/sfx/steps/step_1.wav b/assets/voxygen/audio/sfx/steps/step_1.wav new file mode 100644 index 0000000000..4faffebcf8 --- /dev/null +++ b/assets/voxygen/audio/sfx/steps/step_1.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:68f157a8d4fcd87c8950c078c58c0282276c8c37d46dd29e07928bf381dcb770 +size 17954 diff --git a/assets/voxygen/audio/sfx/steps/step_2.wav b/assets/voxygen/audio/sfx/steps/step_2.wav new file mode 100644 index 0000000000..e904398e65 --- /dev/null +++ b/assets/voxygen/audio/sfx/steps/step_2.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fb9d2081fc3017cf9a10ddf7ccdc053ca00ec19f1df3415783544409040ad344 +size 19650 diff --git a/assets/voxygen/audio/sfx/steps/step_3.wav b/assets/voxygen/audio/sfx/steps/step_3.wav new file mode 100644 index 0000000000..660668d921 --- /dev/null +++ b/assets/voxygen/audio/sfx/steps/step_3.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ad42ba5cb1ec2507cdae19f9924e8887aee4d8b73fdfe5d466b66113b5ab46cd +size 16258 diff --git a/assets/voxygen/audio/sfx/steps/step_4.wav b/assets/voxygen/audio/sfx/steps/step_4.wav new file mode 100644 index 0000000000..14db3f680f --- /dev/null +++ b/assets/voxygen/audio/sfx/steps/step_4.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ff2d4e9cf05c34f0ea85ba3656d030668cffe6722b31c299001158ba3cd7644d +size 14562 diff --git a/assets/voxygen/audio/sfx/steps/step_5.wav b/assets/voxygen/audio/sfx/steps/step_5.wav new file mode 100644 index 0000000000..8c907b07e4 --- /dev/null +++ b/assets/voxygen/audio/sfx/steps/step_5.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ae5df59ec8f4d9b9abbe74b8b5709948e97cc7df3938822862a2c1c589302ac1 +size 20498 diff --git a/assets/voxygen/audio/soundtrack/regional/grasslands.ogg b/assets/voxygen/audio/soundtrack/regional/grasslands.ogg new file mode 100644 index 0000000000..b030463a6f --- /dev/null +++ b/assets/voxygen/audio/soundtrack/regional/grasslands.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5c37d637e6dfc0dd539b1bff49c256dd0120140e8f48091bf2591c095ecae37b +size 5458642 diff --git a/assets/voxygen/voxel/figure/hair/dwarf/female-0.vox b/assets/voxygen/voxel/figure/hair/dwarf/female-0.vox index 8be6e982bc..22d938e679 100644 --- a/assets/voxygen/voxel/figure/hair/dwarf/female-0.vox +++ b/assets/voxygen/voxel/figure/hair/dwarf/female-0.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bf986adcf92255b6c6f4d2537dda786adbf7809acb11c3e6539284b90155c9a5 -size 2552 +oid sha256:d500c01c7e83070d76ef4cef09c9071d52749dc510fc4d5e1e9d0b8b0e04fab1 +size 57051 diff --git a/assets/voxygen/voxel/figure/hair/elf/female-0.vox b/assets/voxygen/voxel/figure/hair/elf/female-0.vox index fea1fd5b8d..75989991d2 100644 --- a/assets/voxygen/voxel/figure/hair/elf/female-0.vox +++ b/assets/voxygen/voxel/figure/hair/elf/female-0.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6374a6eb74950e1cba2dd790a841870f4d0801c6dfb54ffb38c20db0c7033a07 -size 57420 +oid sha256:c43639107b475f7918687b478e339ed3308ec44d07ed02ce4932a01ef0fd240f +size 57436 diff --git a/assets/voxygen/voxel/figure/hair/elf/female-1.vox b/assets/voxygen/voxel/figure/hair/elf/female-1.vox index db5e1c48fe..8fe3c18232 100644 --- a/assets/voxygen/voxel/figure/hair/elf/female-1.vox +++ b/assets/voxygen/voxel/figure/hair/elf/female-1.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0a75088b037bfea4f9d8a441a5ee16be3fae05657a0853a7f33602ae22fbf3ef -size 56844 +oid sha256:148b96d1a5c868aceffaf6d8ff8d27cf9827cc7183d538a9a3bfb57505ec0c89 +size 56860 diff --git a/assets/voxygen/voxel/figure/hair/elf/female-10.vox b/assets/voxygen/voxel/figure/hair/elf/female-10.vox index 30df6eff3d..6f562c6893 100644 --- a/assets/voxygen/voxel/figure/hair/elf/female-10.vox +++ b/assets/voxygen/voxel/figure/hair/elf/female-10.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4f2909d32f8852d80cc4f79510d4130c8f9051affbfa031354951624833e8800 -size 58020 +oid sha256:9ffa6ebdea30df3b996af356834a48aacd6e1ad9dfcfb3cae0fb6a4d4c8183b3 +size 58036 diff --git a/assets/voxygen/voxel/figure/hair/elf/female-11.vox b/assets/voxygen/voxel/figure/hair/elf/female-11.vox index a8d99b2b86..401ca43eb1 100644 --- a/assets/voxygen/voxel/figure/hair/elf/female-11.vox +++ b/assets/voxygen/voxel/figure/hair/elf/female-11.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:50b2ab745aebf47deaae82f9d2092cddf6ab471dbe20b82fd69512b42f6b34e1 -size 56560 +oid sha256:986449085be85193f06ccbb42584d92bc6143169f5c63aacc96b4340d85fafd5 +size 56504 diff --git a/assets/voxygen/voxel/figure/hair/elf/female-12.vox b/assets/voxygen/voxel/figure/hair/elf/female-12.vox index 0e469ebcfc..15d2f5a4aa 100644 --- a/assets/voxygen/voxel/figure/hair/elf/female-12.vox +++ b/assets/voxygen/voxel/figure/hair/elf/female-12.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:be2b4f7b1ae74a91bf0d428914572e2a0e5d8c7c5d30071b42b3acad412c32c2 -size 57468 +oid sha256:8ce7fb066bcc8374fa73ef6535df87ea8ee1853621406c4016511bb70d9eaf10 +size 57484 diff --git a/assets/voxygen/voxel/figure/hair/elf/female-13.vox b/assets/voxygen/voxel/figure/hair/elf/female-13.vox index 432e8804e5..e9d02a1b8a 100644 --- a/assets/voxygen/voxel/figure/hair/elf/female-13.vox +++ b/assets/voxygen/voxel/figure/hair/elf/female-13.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:81fc5d6cd6c777f523c1c3785fa04fe406d4926f045c4799856156997e9a1210 -size 57112 +oid sha256:a00ca5d4566a7595dd2212d5f1ac1219aae16078e8fcb05527a5d8098c76d24b +size 57128 diff --git a/assets/voxygen/voxel/figure/hair/elf/female-14.vox b/assets/voxygen/voxel/figure/hair/elf/female-14.vox index 965ae396b5..5c8cfbf5d0 100644 --- a/assets/voxygen/voxel/figure/hair/elf/female-14.vox +++ b/assets/voxygen/voxel/figure/hair/elf/female-14.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fa41528a0dcfd9430c3052ed9172b75a0de4e4343f12bb16cfeca49ec74e88a4 -size 56399 +oid sha256:7ebafbf4ee56f80da3969fa636d6c5535fc3a25c0cfcb2507f21892de9a8d022 +size 56431 diff --git a/assets/voxygen/voxel/figure/hair/elf/female-15.vox b/assets/voxygen/voxel/figure/hair/elf/female-15.vox index da7b49a72c..b1d4ae4d2d 100644 --- a/assets/voxygen/voxel/figure/hair/elf/female-15.vox +++ b/assets/voxygen/voxel/figure/hair/elf/female-15.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4bf937b7d1f26a4d4763f86610b553dab6258bb4c888ed2e93ad9e6f1a772cdf -size 56827 +oid sha256:fc3f4f63f7beea143d7b563f5b0664418e3dfbdbb960db2fdc3462a884d87211 +size 56867 diff --git a/assets/voxygen/voxel/figure/hair/elf/female-16.vox b/assets/voxygen/voxel/figure/hair/elf/female-16.vox index a85bbcf88e..6c3bebfc9a 100644 --- a/assets/voxygen/voxel/figure/hair/elf/female-16.vox +++ b/assets/voxygen/voxel/figure/hair/elf/female-16.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dbb1a776682b7b8958d022206dacb049dfe2c83c333353b76363f8af1b93d3ca -size 56723 +oid sha256:1af0c326187002e7674f4e66881f11f11d878a3c2ce607495b0ba52bf2b19bb0 +size 56731 diff --git a/assets/voxygen/voxel/figure/hair/elf/female-17.vox b/assets/voxygen/voxel/figure/hair/elf/female-17.vox index e9e05a9706..5a95f00c2e 100644 --- a/assets/voxygen/voxel/figure/hair/elf/female-17.vox +++ b/assets/voxygen/voxel/figure/hair/elf/female-17.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:63d023a28547d49e66bf7ddea69643c148fafc9df29bfea70067b79c6c619ecc -size 57407 +oid sha256:e0b4e122316f0c424b45d488c4f282557a644e94da41b2556306f670a0d03f17 +size 57423 diff --git a/assets/voxygen/voxel/figure/hair/elf/female-18.vox b/assets/voxygen/voxel/figure/hair/elf/female-18.vox index 57d548338d..6aff62eaaa 100644 --- a/assets/voxygen/voxel/figure/hair/elf/female-18.vox +++ b/assets/voxygen/voxel/figure/hair/elf/female-18.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7d4603227faf064963a68c2be68e7b4cfe12507f294d5ed4b649d3017c646d80 -size 2736 +oid sha256:f33c01e85f4d6ce8dfe10436c7b3772f97f4a51b392fc53bd19868b4e122b881 +size 57235 diff --git a/assets/voxygen/voxel/figure/hair/elf/female-19.vox b/assets/voxygen/voxel/figure/hair/elf/female-19.vox index ebe526c0f9..b6696b32e9 100644 --- a/assets/voxygen/voxel/figure/hair/elf/female-19.vox +++ b/assets/voxygen/voxel/figure/hair/elf/female-19.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ad56fe39bededbb3ccd9ac48bdadc81f36dc70d22c7a24b7a5866200ba09e1a6 -size 2676 +oid sha256:0bf37d298cd79c6490428b827ba275b06e87024e6a2b863b8a1f96ebda3f3c82 +size 57183 diff --git a/assets/voxygen/voxel/figure/hair/elf/female-20.vox b/assets/voxygen/voxel/figure/hair/elf/female-20.vox index 7abc25c7bc..4be61e58e3 100644 --- a/assets/voxygen/voxel/figure/hair/elf/female-20.vox +++ b/assets/voxygen/voxel/figure/hair/elf/female-20.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e700ee83e6d9d01be386da100d5aab7712e8e8f3102e3e7b2a6d2d789e0352f3 -size 59317 +oid sha256:7f1f2860e3d049050c6f5a2c216b6e515677399ce617bced0aa1419db9b4fb1d +size 59333 diff --git a/assets/voxygen/voxel/figure/hair/elf/female-3.vox b/assets/voxygen/voxel/figure/hair/elf/female-3.vox index 8b2f23d89e..1d1a2de731 100644 --- a/assets/voxygen/voxel/figure/hair/elf/female-3.vox +++ b/assets/voxygen/voxel/figure/hair/elf/female-3.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:217002a6911dcf0d7432efe18b13c00ec607b7d99399311762919be46ab7f136 -size 56848 +oid sha256:1b92cbba8ae9455e12d556b88edda753a6b4e2e66b98b19ada6adbb2840a72b4 +size 56888 diff --git a/assets/voxygen/voxel/figure/hair/elf/female-4.vox b/assets/voxygen/voxel/figure/hair/elf/female-4.vox index 0cfd0b94b6..22f90757b6 100644 --- a/assets/voxygen/voxel/figure/hair/elf/female-4.vox +++ b/assets/voxygen/voxel/figure/hair/elf/female-4.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4ba8fb2a379c94927e08d0160b32757856a51f8d95cae0fefc04ee509e3761de -size 57184 +oid sha256:a858d60f0211d470e71c7c0f57d906f74983c57b4e9ca4b4ec631f399d319eef +size 57192 diff --git a/assets/voxygen/voxel/figure/hair/elf/female-5.vox b/assets/voxygen/voxel/figure/hair/elf/female-5.vox index 4b2c292fad..b5af8b622b 100644 --- a/assets/voxygen/voxel/figure/hair/elf/female-5.vox +++ b/assets/voxygen/voxel/figure/hair/elf/female-5.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6c08e081166b8b2d13ee97c217cb9ecf7183d32c1d240ef0b794f6d123dab88a -size 56756 +oid sha256:c394d60cb4c560685695f46ccd64ea99644fb0b32f2694f5b3fda7b19b752f00 +size 56796 diff --git a/assets/voxygen/voxel/figure/hair/elf/female-6.vox b/assets/voxygen/voxel/figure/hair/elf/female-6.vox index a9d81b5500..1febec93ad 100644 --- a/assets/voxygen/voxel/figure/hair/elf/female-6.vox +++ b/assets/voxygen/voxel/figure/hair/elf/female-6.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d348e650b80dcd3b8cef5b644f4b951818a9b75d344b14d17d0b383a762f963f -size 57208 +oid sha256:78581f1af2b3638be6bd58fa53a3f82fb06eb09aa1ce00c6fa0fc9d172715592 +size 57224 diff --git a/assets/voxygen/voxel/figure/hair/elf/female-7.vox b/assets/voxygen/voxel/figure/hair/elf/female-7.vox index 3424bdfb3f..084e3e2a7a 100644 --- a/assets/voxygen/voxel/figure/hair/elf/female-7.vox +++ b/assets/voxygen/voxel/figure/hair/elf/female-7.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:89edd7f0ea52aad92266004855763de341f13dcbd2659c3ffeb2ea67c5cd828d -size 57124 +oid sha256:f5fc742fc4bbd044db463048d498441b050e91d2caa2215d752b11776a1ec44c +size 57108 diff --git a/assets/voxygen/voxel/figure/hair/elf/female-8.vox b/assets/voxygen/voxel/figure/hair/elf/female-8.vox index aab274272e..da0eae146d 100644 --- a/assets/voxygen/voxel/figure/hair/elf/female-8.vox +++ b/assets/voxygen/voxel/figure/hair/elf/female-8.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5cde92c14e90946bdbb2dd90be99802b004a4e1f4baf5ebf4b978c96105a07ce -size 56720 +oid sha256:f601d9817729e08f0a337ede258c18796dc26b8264395bc42657d032d18596fc +size 56728 diff --git a/assets/voxygen/voxel/figure/hair/elf/male-0.vox b/assets/voxygen/voxel/figure/hair/elf/male-0.vox index 25e9ec10fc..301732b9c1 100644 --- a/assets/voxygen/voxel/figure/hair/elf/male-0.vox +++ b/assets/voxygen/voxel/figure/hair/elf/male-0.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d60740e718f15423d040aaf0e2e077b2fc95a9f357e1c2d2f543569e0a8a997d -size 1880 +oid sha256:bbd2e2b0038a0150e4aaec2477724903a44437ff90609c92122897dd19e60942 +size 56379 diff --git a/assets/voxygen/voxel/figure/hair/human/female-0.vox b/assets/voxygen/voxel/figure/hair/human/female-0.vox index fea1fd5b8d..75989991d2 100644 --- a/assets/voxygen/voxel/figure/hair/human/female-0.vox +++ b/assets/voxygen/voxel/figure/hair/human/female-0.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6374a6eb74950e1cba2dd790a841870f4d0801c6dfb54ffb38c20db0c7033a07 -size 57420 +oid sha256:c43639107b475f7918687b478e339ed3308ec44d07ed02ce4932a01ef0fd240f +size 57436 diff --git a/assets/voxygen/voxel/figure/hair/human/female-1.vox b/assets/voxygen/voxel/figure/hair/human/female-1.vox index db5e1c48fe..8fe3c18232 100644 --- a/assets/voxygen/voxel/figure/hair/human/female-1.vox +++ b/assets/voxygen/voxel/figure/hair/human/female-1.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0a75088b037bfea4f9d8a441a5ee16be3fae05657a0853a7f33602ae22fbf3ef -size 56844 +oid sha256:148b96d1a5c868aceffaf6d8ff8d27cf9827cc7183d538a9a3bfb57505ec0c89 +size 56860 diff --git a/assets/voxygen/voxel/figure/hair/human/female-10.vox b/assets/voxygen/voxel/figure/hair/human/female-10.vox index 30df6eff3d..6f562c6893 100644 --- a/assets/voxygen/voxel/figure/hair/human/female-10.vox +++ b/assets/voxygen/voxel/figure/hair/human/female-10.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4f2909d32f8852d80cc4f79510d4130c8f9051affbfa031354951624833e8800 -size 58020 +oid sha256:9ffa6ebdea30df3b996af356834a48aacd6e1ad9dfcfb3cae0fb6a4d4c8183b3 +size 58036 diff --git a/assets/voxygen/voxel/figure/hair/human/female-11.vox b/assets/voxygen/voxel/figure/hair/human/female-11.vox index 676854ce7b..401ca43eb1 100644 --- a/assets/voxygen/voxel/figure/hair/human/female-11.vox +++ b/assets/voxygen/voxel/figure/hair/human/female-11.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a3b7cd0a2a553f0a60716281cca5459b63fc758fe8ac4a707664ef5da71ba6a6 -size 56472 +oid sha256:986449085be85193f06ccbb42584d92bc6143169f5c63aacc96b4340d85fafd5 +size 56504 diff --git a/assets/voxygen/voxel/figure/hair/human/female-12.vox b/assets/voxygen/voxel/figure/hair/human/female-12.vox index 0e469ebcfc..15d2f5a4aa 100644 --- a/assets/voxygen/voxel/figure/hair/human/female-12.vox +++ b/assets/voxygen/voxel/figure/hair/human/female-12.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:be2b4f7b1ae74a91bf0d428914572e2a0e5d8c7c5d30071b42b3acad412c32c2 -size 57468 +oid sha256:8ce7fb066bcc8374fa73ef6535df87ea8ee1853621406c4016511bb70d9eaf10 +size 57484 diff --git a/assets/voxygen/voxel/figure/hair/human/female-13.vox b/assets/voxygen/voxel/figure/hair/human/female-13.vox index 432e8804e5..e9d02a1b8a 100644 --- a/assets/voxygen/voxel/figure/hair/human/female-13.vox +++ b/assets/voxygen/voxel/figure/hair/human/female-13.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:81fc5d6cd6c777f523c1c3785fa04fe406d4926f045c4799856156997e9a1210 -size 57112 +oid sha256:a00ca5d4566a7595dd2212d5f1ac1219aae16078e8fcb05527a5d8098c76d24b +size 57128 diff --git a/assets/voxygen/voxel/figure/hair/human/female-14.vox b/assets/voxygen/voxel/figure/hair/human/female-14.vox index 120cb66ef4..5c8cfbf5d0 100644 --- a/assets/voxygen/voxel/figure/hair/human/female-14.vox +++ b/assets/voxygen/voxel/figure/hair/human/female-14.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1edf56448b14e8a109c9e25c6aa61ba1b056514cdb55c15b12ef916efa2f57c5 -size 56415 +oid sha256:7ebafbf4ee56f80da3969fa636d6c5535fc3a25c0cfcb2507f21892de9a8d022 +size 56431 diff --git a/assets/voxygen/voxel/figure/hair/human/female-15.vox b/assets/voxygen/voxel/figure/hair/human/female-15.vox index f7c060f666..b1d4ae4d2d 100644 --- a/assets/voxygen/voxel/figure/hair/human/female-15.vox +++ b/assets/voxygen/voxel/figure/hair/human/female-15.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:376d843e3ff21a24978e6d537d040bc937a150669675b3c7ddb7bb073995ea5f -size 56819 +oid sha256:fc3f4f63f7beea143d7b563f5b0664418e3dfbdbb960db2fdc3462a884d87211 +size 56867 diff --git a/assets/voxygen/voxel/figure/hair/human/female-16.vox b/assets/voxygen/voxel/figure/hair/human/female-16.vox index 0b1edcaff3..6c3bebfc9a 100644 --- a/assets/voxygen/voxel/figure/hair/human/female-16.vox +++ b/assets/voxygen/voxel/figure/hair/human/female-16.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4bf053a3ed69d3e4b42fa8e595abce6fdf5c059ef0aa637480aba01fe6537fbd -size 56707 +oid sha256:1af0c326187002e7674f4e66881f11f11d878a3c2ce607495b0ba52bf2b19bb0 +size 56731 diff --git a/assets/voxygen/voxel/figure/hair/human/female-17.vox b/assets/voxygen/voxel/figure/hair/human/female-17.vox index e9e05a9706..5a95f00c2e 100644 --- a/assets/voxygen/voxel/figure/hair/human/female-17.vox +++ b/assets/voxygen/voxel/figure/hair/human/female-17.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:63d023a28547d49e66bf7ddea69643c148fafc9df29bfea70067b79c6c619ecc -size 57407 +oid sha256:e0b4e122316f0c424b45d488c4f282557a644e94da41b2556306f670a0d03f17 +size 57423 diff --git a/assets/voxygen/voxel/figure/hair/human/female-18.vox b/assets/voxygen/voxel/figure/hair/human/female-18.vox index 57d548338d..6aff62eaaa 100644 --- a/assets/voxygen/voxel/figure/hair/human/female-18.vox +++ b/assets/voxygen/voxel/figure/hair/human/female-18.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7d4603227faf064963a68c2be68e7b4cfe12507f294d5ed4b649d3017c646d80 -size 2736 +oid sha256:f33c01e85f4d6ce8dfe10436c7b3772f97f4a51b392fc53bd19868b4e122b881 +size 57235 diff --git a/assets/voxygen/voxel/figure/hair/human/female-3.vox b/assets/voxygen/voxel/figure/hair/human/female-3.vox index 8b2f23d89e..1d1a2de731 100644 --- a/assets/voxygen/voxel/figure/hair/human/female-3.vox +++ b/assets/voxygen/voxel/figure/hair/human/female-3.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:217002a6911dcf0d7432efe18b13c00ec607b7d99399311762919be46ab7f136 -size 56848 +oid sha256:1b92cbba8ae9455e12d556b88edda753a6b4e2e66b98b19ada6adbb2840a72b4 +size 56888 diff --git a/assets/voxygen/voxel/figure/hair/human/female-4.vox b/assets/voxygen/voxel/figure/hair/human/female-4.vox index 0cfd0b94b6..22f90757b6 100644 --- a/assets/voxygen/voxel/figure/hair/human/female-4.vox +++ b/assets/voxygen/voxel/figure/hair/human/female-4.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4ba8fb2a379c94927e08d0160b32757856a51f8d95cae0fefc04ee509e3761de -size 57184 +oid sha256:a858d60f0211d470e71c7c0f57d906f74983c57b4e9ca4b4ec631f399d319eef +size 57192 diff --git a/assets/voxygen/voxel/figure/hair/human/female-5.vox b/assets/voxygen/voxel/figure/hair/human/female-5.vox index a25819f650..b5af8b622b 100644 --- a/assets/voxygen/voxel/figure/hair/human/female-5.vox +++ b/assets/voxygen/voxel/figure/hair/human/female-5.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:771303852cc1593e35229ccf160b96936a48bdf4e67a1c22fd0b21c0f7fc7b57 -size 56748 +oid sha256:c394d60cb4c560685695f46ccd64ea99644fb0b32f2694f5b3fda7b19b752f00 +size 56796 diff --git a/assets/voxygen/voxel/figure/hair/human/female-6.vox b/assets/voxygen/voxel/figure/hair/human/female-6.vox index a9d81b5500..1febec93ad 100644 --- a/assets/voxygen/voxel/figure/hair/human/female-6.vox +++ b/assets/voxygen/voxel/figure/hair/human/female-6.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d348e650b80dcd3b8cef5b644f4b951818a9b75d344b14d17d0b383a762f963f -size 57208 +oid sha256:78581f1af2b3638be6bd58fa53a3f82fb06eb09aa1ce00c6fa0fc9d172715592 +size 57224 diff --git a/assets/voxygen/voxel/figure/hair/human/female-7.vox b/assets/voxygen/voxel/figure/hair/human/female-7.vox index cac45d2ae6..084e3e2a7a 100644 --- a/assets/voxygen/voxel/figure/hair/human/female-7.vox +++ b/assets/voxygen/voxel/figure/hair/human/female-7.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ee4581fb1db0f7cffd327e93676488164473316b228187a879d485c7c5f2cd93 -size 57060 +oid sha256:f5fc742fc4bbd044db463048d498441b050e91d2caa2215d752b11776a1ec44c +size 57108 diff --git a/assets/voxygen/voxel/figure/hair/human/female-8.vox b/assets/voxygen/voxel/figure/hair/human/female-8.vox index aab274272e..da0eae146d 100644 --- a/assets/voxygen/voxel/figure/hair/human/female-8.vox +++ b/assets/voxygen/voxel/figure/hair/human/female-8.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5cde92c14e90946bdbb2dd90be99802b004a4e1f4baf5ebf4b978c96105a07ce -size 56720 +oid sha256:f601d9817729e08f0a337ede258c18796dc26b8264395bc42657d032d18596fc +size 56728 diff --git a/assets/voxygen/voxel/figure/hair/human/male-0.vox b/assets/voxygen/voxel/figure/hair/human/male-0.vox index ab4ac0570e..ee8e0a5a30 100644 --- a/assets/voxygen/voxel/figure/hair/human/male-0.vox +++ b/assets/voxygen/voxel/figure/hair/human/male-0.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7a8727d18e1e8edfec2bb2c84de86d4120226684a3b586906502664212ff9a2e -size 1824 +oid sha256:9c097140e71170f0d4608d2436749492d36b316bbe67e4e18afbf904bbcb8117 +size 56351 diff --git a/assets/voxygen/voxel/figure/hair/human/male-1.vox b/assets/voxygen/voxel/figure/hair/human/male-1.vox index ab4ac0570e..ee8e0a5a30 100644 --- a/assets/voxygen/voxel/figure/hair/human/male-1.vox +++ b/assets/voxygen/voxel/figure/hair/human/male-1.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7a8727d18e1e8edfec2bb2c84de86d4120226684a3b586906502664212ff9a2e -size 1824 +oid sha256:9c097140e71170f0d4608d2436749492d36b316bbe67e4e18afbf904bbcb8117 +size 56351 diff --git a/assets/voxygen/voxel/figure/hair/human/male-2.vox b/assets/voxygen/voxel/figure/hair/human/male-2.vox index 87ec99212b..32934f6105 100644 --- a/assets/voxygen/voxel/figure/hair/human/male-2.vox +++ b/assets/voxygen/voxel/figure/hair/human/male-2.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:090dd10dce94d7fa5a88f89058a0c9fbe90df1359debdf47285f3ba2681563a2 -size 56739 +oid sha256:5a55636d8ea9abd185d161abb15bece85a65fb2706aa86c2486af4592f4561e6 +size 56747 diff --git a/assets/voxygen/voxel/figure/head/danari/male.vox b/assets/voxygen/voxel/figure/head/danari/male.vox index e2b73c0509..a730a5f752 100644 --- a/assets/voxygen/voxel/figure/head/danari/male.vox +++ b/assets/voxygen/voxel/figure/head/danari/male.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8b43e5ef0b4333ec9d4c3ac751681a3c0721c61843dea16782fe7da7c5ef62ab -size 3248 +oid sha256:716e9da74be252e3959011326bc2c5d930e2f069350e3548e1c9604bf8b7b7cc +size 57747 diff --git a/assets/voxygen/voxel/figure/head/dwarf/female.vox b/assets/voxygen/voxel/figure/head/dwarf/female.vox index 9c606ed354..5a4c956fd1 100644 --- a/assets/voxygen/voxel/figure/head/dwarf/female.vox +++ b/assets/voxygen/voxel/figure/head/dwarf/female.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bf2b787245596b9c24585f8e16ad2e35067358ca7d655ced14f47a3181bb41b8 +oid sha256:0021c441c68512b75bfeb72233c63b9b5ff70e3ffaf7f500a1b52de33cfa7da8 size 57521 diff --git a/assets/voxygen/voxel/figure/head/dwarf/male.vox b/assets/voxygen/voxel/figure/head/dwarf/male.vox index d9cbccf102..5a4202ebbe 100644 --- a/assets/voxygen/voxel/figure/head/dwarf/male.vox +++ b/assets/voxygen/voxel/figure/head/dwarf/male.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:644474c2b2bb18929aee8848d3a782e9fac80beedb5912ae191397c99abfeab6 +oid sha256:06895d55dcf042ffb171606846029cc96a9405f15b9796fba964678cda537fb7 size 57541 diff --git a/assets/voxygen/voxel/figure/head/elf/female.vox b/assets/voxygen/voxel/figure/head/elf/female.vox index e1bad84c11..12ca3afda0 100644 --- a/assets/voxygen/voxel/figure/head/elf/female.vox +++ b/assets/voxygen/voxel/figure/head/elf/female.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:239988d13d601603e7c83a1bd7ef8aba00c6e86ae40f255160d11e7320db1ddf +oid sha256:074f467b2da36a17e6289ae8f9903d48f8bd61cb0187bf439fca6218c35e0935 size 57819 diff --git a/assets/voxygen/voxel/figure/head/elf/male.vox b/assets/voxygen/voxel/figure/head/elf/male.vox index ebb00ae05c..6bb4a53ecb 100644 --- a/assets/voxygen/voxel/figure/head/elf/male.vox +++ b/assets/voxygen/voxel/figure/head/elf/male.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0c57e2b5516260bc839ef0575ac7962e7393e143a86e9fbff02f7d968a229e56 +oid sha256:b4c5198e4539d06c21e26d9f1c15e53766c0c6fd75f23f8fc78c81b05dea7e77 size 57819 diff --git a/assets/voxygen/voxel/figure/head/human/female.vox b/assets/voxygen/voxel/figure/head/human/female.vox index 4cc041f670..a1bfdf0697 100644 --- a/assets/voxygen/voxel/figure/head/human/female.vox +++ b/assets/voxygen/voxel/figure/head/human/female.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c336014427f7f9cd3afe88c6aa9db3759b9434abc8005e81210b3c80d8682ca0 +oid sha256:a005b7a3554699fd4106f7cfdeb14a1846eb18bb59c8709f5b59d1faf1a42507 size 57811 diff --git a/assets/voxygen/voxel/figure/head/human/male.vox b/assets/voxygen/voxel/figure/head/human/male.vox index 8e571ea8d2..df9aa26ec9 100644 --- a/assets/voxygen/voxel/figure/head/human/male.vox +++ b/assets/voxygen/voxel/figure/head/human/male.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4268b2c28f9ed5869ff8a9f93fdb9e249306a329dae1dfac7703cab399bea4b4 -size 3328 +oid sha256:bf125e512c4c923ab85709ece8184512df6a7007af2d27abc88b2f1ddef214a9 +size 57811 diff --git a/common/src/comp/body/humanoid.rs b/common/src/comp/body/humanoid.rs index 03a57ef752..4f89afccd8 100644 --- a/common/src/comp/body/humanoid.rs +++ b/common/src/comp/body/humanoid.rs @@ -77,7 +77,7 @@ pub const ALL_RACES: [Race; 6] = [ ]; // Hair Colors -pub const DANARI_HAIR_COLORS: [(u8, u8, u8); 17] = [ +pub const DANARI_HAIR_COLORS: [(u8, u8, u8); 16] = [ (198, 169, 113), // Philosopher's Grey (245, 232, 175), // Cream Blonde (228, 208, 147), // Gold Blonde @@ -91,12 +91,11 @@ pub const DANARI_HAIR_COLORS: [(u8, u8, u8); 17] = [ (101, 83, 95), // Matte Purple (101, 57, 90), // Witch Purple (107, 32, 60), // Grape Purple - (168, 45, 47), // Lobster Red (135, 38, 39), // Dark Red (88, 26, 29), // Wine Red (146, 32, 32), // Autumn Red ]; -pub const DWARF_HAIR_COLORS: [(u8, u8, u8); 21] = [ +pub const DWARF_HAIR_COLORS: [(u8, u8, u8); 20] = [ (245, 232, 175), // Cream Blonde (228, 208, 147), // Gold Blonde (228, 223, 141), // Platinum Blonde @@ -108,7 +107,6 @@ pub const DWARF_HAIR_COLORS: [(u8, u8, u8); 21] = [ (57, 56, 61), // Raven Black (101, 83, 95), // Matte Purple (101, 57, 90), // Witch Purple - (168, 45, 47), // Lobster Red (135, 38, 39), // Dark Red (88, 26, 29), // Wine Red (191, 228, 254), // Ice NobleBlue @@ -119,7 +117,7 @@ pub const DWARF_HAIR_COLORS: [(u8, u8, u8); 21] = [ (84, 139, 107), // Grass Green (48, 61, 52), // Dark Green ]; -pub const ELF_HAIR_COLORS: [(u8, u8, u8); 24] = [ +pub const ELF_HAIR_COLORS: [(u8, u8, u8); 23] = [ (66, 83, 113), // Mysterious Blue (13, 76, 41), // Rainforest Green (245, 232, 175), // Cream Blonde @@ -133,7 +131,6 @@ pub const ELF_HAIR_COLORS: [(u8, u8, u8); 24] = [ (57, 56, 61), // Raven Black (101, 83, 95), // Matte Purple (101, 57, 90), // Witch Purple - (168, 45, 47), // Lobster Red (135, 38, 39), // Dark Red (88, 26, 29), // Wine Red (191, 228, 254), // Ice Blue @@ -145,7 +142,7 @@ pub const ELF_HAIR_COLORS: [(u8, u8, u8); 24] = [ (84, 139, 107), // Grass Green (48, 61, 52), // Dark Green ]; -pub const HUMAN_HAIR_COLORS: [(u8, u8, u8); 22] = [ +pub const HUMAN_HAIR_COLORS: [(u8, u8, u8); 21] = [ (245, 232, 175), // Cream Blonde (228, 208, 147), // Gold Blonde (228, 223, 141), // Platinum Blonde @@ -157,7 +154,6 @@ pub const HUMAN_HAIR_COLORS: [(u8, u8, u8); 22] = [ (57, 56, 61), // Raven Black (101, 83, 95), // Matte Purple (101, 57, 90), // Witch Purple - (168, 45, 47), // Lobster Red (135, 38, 39), // Dark Red (88, 26, 29), // Wine Red (191, 228, 254), // Ice Blue @@ -169,7 +165,7 @@ pub const HUMAN_HAIR_COLORS: [(u8, u8, u8); 22] = [ (84, 139, 107), // Grass Green (48, 61, 52), // Dark Green ]; -pub const ORC_HAIR_COLORS: [(u8, u8, u8); 15] = [ +pub const ORC_HAIR_COLORS: [(u8, u8, u8); 14] = [ (66, 66, 59), // Wise Grey (125, 111, 51), // Muddy Blonde (199, 131, 58), // Summer Blonde @@ -181,12 +177,11 @@ pub const ORC_HAIR_COLORS: [(u8, u8, u8); 15] = [ (57, 56, 61), // Raven Black (101, 83, 95), // Matte Purple (101, 57, 90), // Witch Purple - (168, 45, 47), // Lobster Red (135, 38, 39), // Dark Red (88, 26, 29), // Wine Red (66, 83, 113), // Mysterious Blue ]; -pub const UNDEAD_HAIR_COLORS: [(u8, u8, u8); 25] = [ +pub const UNDEAD_HAIR_COLORS: [(u8, u8, u8); 24] = [ (245, 232, 175), // Cream Blonde (228, 208, 147), // Gold Blonde (228, 223, 141), // Platinum Blonde @@ -199,7 +194,6 @@ pub const UNDEAD_HAIR_COLORS: [(u8, u8, u8); 25] = [ (101, 83, 95), // Matte Purple (101, 57, 90), // Witch Purple (111, 54, 117), // Punky Purple - (168, 45, 47), // Lobster Red (135, 38, 39), // Dark Red (88, 26, 29), // Wine Red (191, 228, 254), // Ice Blue diff --git a/voxygen/src/audio/mod.rs b/voxygen/src/audio/mod.rs index eef00c0e35..50dfd8190e 100644 --- a/voxygen/src/audio/mod.rs +++ b/voxygen/src/audio/mod.rs @@ -221,7 +221,7 @@ pub fn get_default_device() -> String { /// Load the audio file directory selected by genre. pub fn load_soundtracks() -> Vec { - let assets = assets::read_dir("voxygen.audio.soundtrack").unwrap(); + let assets = assets::read_dir("voxygen.audio.soundtrack.regional").unwrap(); let soundtracks = assets .filter_map(|entry| { entry.ok().map(|f| { diff --git a/voxygen/src/menu/char_selection/scene.rs b/voxygen/src/menu/char_selection/scene.rs index 96f7f4594f..08a4610619 100644 --- a/voxygen/src/menu/char_selection/scene.rs +++ b/voxygen/src/menu/char_selection/scene.rs @@ -123,7 +123,7 @@ impl Scene { let (view_mat, proj_mat, cam_pos) = self.camera.compute_dependents(client); const VD: f32 = 115.0; //View Distance - const TIME: f64 = 36000.0; // hours*3600 seconds + const TIME: f64 = 43200.0; // hours*3600 seconds if let Err(err) = renderer.update_consts( &mut self.globals, &[Globals::new( diff --git a/voxygen/src/scene/sound.rs b/voxygen/src/scene/sound.rs index 96776bdf24..c3e66c6663 100644 --- a/voxygen/src/scene/sound.rs +++ b/voxygen/src/scene/sound.rs @@ -54,9 +54,9 @@ impl SoundMgr { if character.movement == Run && state.last_step_sound.elapsed().as_secs_f64() > 0.25 { - let rand_step = (rand::random::() % 7) + 1; + let rand_step = (rand::random::() % 5) + 1; audio.play_sound( - &format!("voxygen.audio.footsteps.stepdirt_{}", rand_step), + &format!("voxygen.audio.sfx.steps.step_{}", rand_step), pos.0, ); state.last_step_sound = Instant::now(); diff --git a/voxygen/src/settings.rs b/voxygen/src/settings.rs index e2603baada..a7b54cde54 100644 --- a/voxygen/src/settings.rs +++ b/voxygen/src/settings.rs @@ -65,8 +65,8 @@ impl Default for ControlSettings { jump: KeyMouse::Key(VirtualKeyCode::Space), sit: KeyMouse::Key(VirtualKeyCode::K), glide: KeyMouse::Key(VirtualKeyCode::LShift), - climb: KeyMouse::Key(VirtualKeyCode::LControl), - climb_down: KeyMouse::Key(VirtualKeyCode::LShift), + climb: KeyMouse::Key(VirtualKeyCode::LShift), + climb_down: KeyMouse::Key(VirtualKeyCode::LControl), wall_leap: KeyMouse::Mouse(MouseButton::Middle), mount: KeyMouse::Key(VirtualKeyCode::F), map: KeyMouse::Key(VirtualKeyCode::M),