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..0a911700b7 Binary files /dev/null and b/assets/voxygen/audio/sfx/steps/step_1.wav differ 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..b485df31d2 Binary files /dev/null and b/assets/voxygen/audio/sfx/steps/step_2.wav differ 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..13eb6679e6 Binary files /dev/null and b/assets/voxygen/audio/sfx/steps/step_3.wav differ 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..786a042e8d Binary files /dev/null and b/assets/voxygen/audio/sfx/steps/step_4.wav differ 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..e4a23dbb6c Binary files /dev/null and b/assets/voxygen/audio/sfx/steps/step_5.wav differ diff --git a/assets/voxygen/audio/soundtrack/regional/grasslands.ogg b/assets/voxygen/audio/soundtrack/regional/grasslands.ogg new file mode 100644 index 0000000000..be7381593c Binary files /dev/null and b/assets/voxygen/audio/soundtrack/regional/grasslands.ogg differ diff --git a/assets/voxygen/voxel/figure/hair/dwarf/female-0.vox b/assets/voxygen/voxel/figure/hair/dwarf/female-0.vox index 707596f780..78f223e28b 100644 Binary files a/assets/voxygen/voxel/figure/hair/dwarf/female-0.vox and b/assets/voxygen/voxel/figure/hair/dwarf/female-0.vox differ diff --git a/assets/voxygen/voxel/figure/hair/elf/female-0.vox b/assets/voxygen/voxel/figure/hair/elf/female-0.vox index 5e6ea080da..92142a680a 100644 Binary files a/assets/voxygen/voxel/figure/hair/elf/female-0.vox and b/assets/voxygen/voxel/figure/hair/elf/female-0.vox differ diff --git a/assets/voxygen/voxel/figure/hair/elf/female-1.vox b/assets/voxygen/voxel/figure/hair/elf/female-1.vox index b2c12e2cc3..f4e7dab43a 100644 Binary files a/assets/voxygen/voxel/figure/hair/elf/female-1.vox and b/assets/voxygen/voxel/figure/hair/elf/female-1.vox differ diff --git a/assets/voxygen/voxel/figure/hair/elf/female-10.vox b/assets/voxygen/voxel/figure/hair/elf/female-10.vox index b4d58318ea..5dfcf81276 100644 Binary files a/assets/voxygen/voxel/figure/hair/elf/female-10.vox and b/assets/voxygen/voxel/figure/hair/elf/female-10.vox differ diff --git a/assets/voxygen/voxel/figure/hair/elf/female-11.vox b/assets/voxygen/voxel/figure/hair/elf/female-11.vox index 28ab0682e9..cef196f1dc 100644 Binary files a/assets/voxygen/voxel/figure/hair/elf/female-11.vox and b/assets/voxygen/voxel/figure/hair/elf/female-11.vox differ diff --git a/assets/voxygen/voxel/figure/hair/elf/female-12.vox b/assets/voxygen/voxel/figure/hair/elf/female-12.vox index 4da3b77de7..63cabc6bfe 100644 Binary files a/assets/voxygen/voxel/figure/hair/elf/female-12.vox and b/assets/voxygen/voxel/figure/hair/elf/female-12.vox differ diff --git a/assets/voxygen/voxel/figure/hair/elf/female-13.vox b/assets/voxygen/voxel/figure/hair/elf/female-13.vox index a2c8e658e4..b2220641a4 100644 Binary files a/assets/voxygen/voxel/figure/hair/elf/female-13.vox and b/assets/voxygen/voxel/figure/hair/elf/female-13.vox differ diff --git a/assets/voxygen/voxel/figure/hair/elf/female-14.vox b/assets/voxygen/voxel/figure/hair/elf/female-14.vox index 23ee7583ec..3ceaaff3a2 100644 Binary files a/assets/voxygen/voxel/figure/hair/elf/female-14.vox and b/assets/voxygen/voxel/figure/hair/elf/female-14.vox differ diff --git a/assets/voxygen/voxel/figure/hair/elf/female-15.vox b/assets/voxygen/voxel/figure/hair/elf/female-15.vox index 6f0eba125d..188a41ff97 100644 Binary files a/assets/voxygen/voxel/figure/hair/elf/female-15.vox and b/assets/voxygen/voxel/figure/hair/elf/female-15.vox differ diff --git a/assets/voxygen/voxel/figure/hair/elf/female-16.vox b/assets/voxygen/voxel/figure/hair/elf/female-16.vox index dae68db911..d68b488c2e 100644 Binary files a/assets/voxygen/voxel/figure/hair/elf/female-16.vox and b/assets/voxygen/voxel/figure/hair/elf/female-16.vox differ diff --git a/assets/voxygen/voxel/figure/hair/elf/female-17.vox b/assets/voxygen/voxel/figure/hair/elf/female-17.vox index 5df36834ee..31cb9f7ce0 100644 Binary files a/assets/voxygen/voxel/figure/hair/elf/female-17.vox and b/assets/voxygen/voxel/figure/hair/elf/female-17.vox differ diff --git a/assets/voxygen/voxel/figure/hair/elf/female-18.vox b/assets/voxygen/voxel/figure/hair/elf/female-18.vox index 90959f17dc..109bd40522 100644 Binary files a/assets/voxygen/voxel/figure/hair/elf/female-18.vox and b/assets/voxygen/voxel/figure/hair/elf/female-18.vox differ diff --git a/assets/voxygen/voxel/figure/hair/elf/female-19.vox b/assets/voxygen/voxel/figure/hair/elf/female-19.vox index 0fed423f75..e3e826ab49 100644 Binary files a/assets/voxygen/voxel/figure/hair/elf/female-19.vox and b/assets/voxygen/voxel/figure/hair/elf/female-19.vox differ diff --git a/assets/voxygen/voxel/figure/hair/elf/female-20.vox b/assets/voxygen/voxel/figure/hair/elf/female-20.vox index d7f7a67d71..648f024f0b 100644 Binary files a/assets/voxygen/voxel/figure/hair/elf/female-20.vox and b/assets/voxygen/voxel/figure/hair/elf/female-20.vox differ diff --git a/assets/voxygen/voxel/figure/hair/elf/female-3.vox b/assets/voxygen/voxel/figure/hair/elf/female-3.vox index 24e262d763..53505ad6f0 100644 Binary files a/assets/voxygen/voxel/figure/hair/elf/female-3.vox and b/assets/voxygen/voxel/figure/hair/elf/female-3.vox differ diff --git a/assets/voxygen/voxel/figure/hair/elf/female-4.vox b/assets/voxygen/voxel/figure/hair/elf/female-4.vox index 95cdfc5e43..0beac7cd12 100644 Binary files a/assets/voxygen/voxel/figure/hair/elf/female-4.vox and b/assets/voxygen/voxel/figure/hair/elf/female-4.vox differ diff --git a/assets/voxygen/voxel/figure/hair/elf/female-5.vox b/assets/voxygen/voxel/figure/hair/elf/female-5.vox index 247d55c06b..25f412906a 100644 Binary files a/assets/voxygen/voxel/figure/hair/elf/female-5.vox and b/assets/voxygen/voxel/figure/hair/elf/female-5.vox differ diff --git a/assets/voxygen/voxel/figure/hair/elf/female-6.vox b/assets/voxygen/voxel/figure/hair/elf/female-6.vox index fc537a9a68..4d3b207782 100644 Binary files a/assets/voxygen/voxel/figure/hair/elf/female-6.vox and b/assets/voxygen/voxel/figure/hair/elf/female-6.vox differ diff --git a/assets/voxygen/voxel/figure/hair/elf/female-7.vox b/assets/voxygen/voxel/figure/hair/elf/female-7.vox index a8378d824c..dc1ac5d03a 100644 Binary files a/assets/voxygen/voxel/figure/hair/elf/female-7.vox and b/assets/voxygen/voxel/figure/hair/elf/female-7.vox differ diff --git a/assets/voxygen/voxel/figure/hair/elf/female-8.vox b/assets/voxygen/voxel/figure/hair/elf/female-8.vox index 0b51216fd3..368ce6dda9 100644 Binary files a/assets/voxygen/voxel/figure/hair/elf/female-8.vox and b/assets/voxygen/voxel/figure/hair/elf/female-8.vox differ diff --git a/assets/voxygen/voxel/figure/hair/elf/male-0.vox b/assets/voxygen/voxel/figure/hair/elf/male-0.vox index c54c03ab97..8ac9fd20c4 100644 Binary files a/assets/voxygen/voxel/figure/hair/elf/male-0.vox and b/assets/voxygen/voxel/figure/hair/elf/male-0.vox differ diff --git a/assets/voxygen/voxel/figure/hair/human/female-0.vox b/assets/voxygen/voxel/figure/hair/human/female-0.vox index 5e6ea080da..92142a680a 100644 Binary files a/assets/voxygen/voxel/figure/hair/human/female-0.vox and b/assets/voxygen/voxel/figure/hair/human/female-0.vox differ diff --git a/assets/voxygen/voxel/figure/hair/human/female-1.vox b/assets/voxygen/voxel/figure/hair/human/female-1.vox index b2c12e2cc3..f4e7dab43a 100644 Binary files a/assets/voxygen/voxel/figure/hair/human/female-1.vox and b/assets/voxygen/voxel/figure/hair/human/female-1.vox differ diff --git a/assets/voxygen/voxel/figure/hair/human/female-10.vox b/assets/voxygen/voxel/figure/hair/human/female-10.vox index b4d58318ea..5dfcf81276 100644 Binary files a/assets/voxygen/voxel/figure/hair/human/female-10.vox and b/assets/voxygen/voxel/figure/hair/human/female-10.vox differ diff --git a/assets/voxygen/voxel/figure/hair/human/female-11.vox b/assets/voxygen/voxel/figure/hair/human/female-11.vox index 420c28df2b..cef196f1dc 100644 Binary files a/assets/voxygen/voxel/figure/hair/human/female-11.vox and b/assets/voxygen/voxel/figure/hair/human/female-11.vox differ diff --git a/assets/voxygen/voxel/figure/hair/human/female-12.vox b/assets/voxygen/voxel/figure/hair/human/female-12.vox index 4da3b77de7..63cabc6bfe 100644 Binary files a/assets/voxygen/voxel/figure/hair/human/female-12.vox and b/assets/voxygen/voxel/figure/hair/human/female-12.vox differ diff --git a/assets/voxygen/voxel/figure/hair/human/female-13.vox b/assets/voxygen/voxel/figure/hair/human/female-13.vox index a2c8e658e4..b2220641a4 100644 Binary files a/assets/voxygen/voxel/figure/hair/human/female-13.vox and b/assets/voxygen/voxel/figure/hair/human/female-13.vox differ diff --git a/assets/voxygen/voxel/figure/hair/human/female-14.vox b/assets/voxygen/voxel/figure/hair/human/female-14.vox index 8109d34792..3ceaaff3a2 100644 Binary files a/assets/voxygen/voxel/figure/hair/human/female-14.vox and b/assets/voxygen/voxel/figure/hair/human/female-14.vox differ diff --git a/assets/voxygen/voxel/figure/hair/human/female-15.vox b/assets/voxygen/voxel/figure/hair/human/female-15.vox index 540b38c094..188a41ff97 100644 Binary files a/assets/voxygen/voxel/figure/hair/human/female-15.vox and b/assets/voxygen/voxel/figure/hair/human/female-15.vox differ diff --git a/assets/voxygen/voxel/figure/hair/human/female-16.vox b/assets/voxygen/voxel/figure/hair/human/female-16.vox index dc07b06341..d68b488c2e 100644 Binary files a/assets/voxygen/voxel/figure/hair/human/female-16.vox and b/assets/voxygen/voxel/figure/hair/human/female-16.vox differ diff --git a/assets/voxygen/voxel/figure/hair/human/female-17.vox b/assets/voxygen/voxel/figure/hair/human/female-17.vox index 5df36834ee..31cb9f7ce0 100644 Binary files a/assets/voxygen/voxel/figure/hair/human/female-17.vox and b/assets/voxygen/voxel/figure/hair/human/female-17.vox differ diff --git a/assets/voxygen/voxel/figure/hair/human/female-18.vox b/assets/voxygen/voxel/figure/hair/human/female-18.vox index 90959f17dc..109bd40522 100644 Binary files a/assets/voxygen/voxel/figure/hair/human/female-18.vox and b/assets/voxygen/voxel/figure/hair/human/female-18.vox differ diff --git a/assets/voxygen/voxel/figure/hair/human/female-3.vox b/assets/voxygen/voxel/figure/hair/human/female-3.vox index 24e262d763..53505ad6f0 100644 Binary files a/assets/voxygen/voxel/figure/hair/human/female-3.vox and b/assets/voxygen/voxel/figure/hair/human/female-3.vox differ diff --git a/assets/voxygen/voxel/figure/hair/human/female-4.vox b/assets/voxygen/voxel/figure/hair/human/female-4.vox index 95cdfc5e43..0beac7cd12 100644 Binary files a/assets/voxygen/voxel/figure/hair/human/female-4.vox and b/assets/voxygen/voxel/figure/hair/human/female-4.vox differ diff --git a/assets/voxygen/voxel/figure/hair/human/female-5.vox b/assets/voxygen/voxel/figure/hair/human/female-5.vox index 2290a07e57..25f412906a 100644 Binary files a/assets/voxygen/voxel/figure/hair/human/female-5.vox and b/assets/voxygen/voxel/figure/hair/human/female-5.vox differ diff --git a/assets/voxygen/voxel/figure/hair/human/female-6.vox b/assets/voxygen/voxel/figure/hair/human/female-6.vox index fc537a9a68..4d3b207782 100644 Binary files a/assets/voxygen/voxel/figure/hair/human/female-6.vox and b/assets/voxygen/voxel/figure/hair/human/female-6.vox differ diff --git a/assets/voxygen/voxel/figure/hair/human/female-7.vox b/assets/voxygen/voxel/figure/hair/human/female-7.vox index 84d8f5ad71..dc1ac5d03a 100644 Binary files a/assets/voxygen/voxel/figure/hair/human/female-7.vox and b/assets/voxygen/voxel/figure/hair/human/female-7.vox differ diff --git a/assets/voxygen/voxel/figure/hair/human/female-8.vox b/assets/voxygen/voxel/figure/hair/human/female-8.vox index 0b51216fd3..368ce6dda9 100644 Binary files a/assets/voxygen/voxel/figure/hair/human/female-8.vox and b/assets/voxygen/voxel/figure/hair/human/female-8.vox differ diff --git a/assets/voxygen/voxel/figure/hair/human/male-0.vox b/assets/voxygen/voxel/figure/hair/human/male-0.vox index 807e008c88..64e6cc5dfa 100644 Binary files a/assets/voxygen/voxel/figure/hair/human/male-0.vox and b/assets/voxygen/voxel/figure/hair/human/male-0.vox differ diff --git a/assets/voxygen/voxel/figure/hair/human/male-1.vox b/assets/voxygen/voxel/figure/hair/human/male-1.vox index 807e008c88..64e6cc5dfa 100644 Binary files a/assets/voxygen/voxel/figure/hair/human/male-1.vox and b/assets/voxygen/voxel/figure/hair/human/male-1.vox differ diff --git a/assets/voxygen/voxel/figure/hair/human/male-2.vox b/assets/voxygen/voxel/figure/hair/human/male-2.vox index eb5bddd9fb..f000da528e 100644 Binary files a/assets/voxygen/voxel/figure/hair/human/male-2.vox and b/assets/voxygen/voxel/figure/hair/human/male-2.vox differ diff --git a/assets/voxygen/voxel/figure/head/danari/male.vox b/assets/voxygen/voxel/figure/head/danari/male.vox index a20fb48507..a85843ee7b 100644 Binary files a/assets/voxygen/voxel/figure/head/danari/male.vox and b/assets/voxygen/voxel/figure/head/danari/male.vox differ diff --git a/assets/voxygen/voxel/figure/head/dwarf/female.vox b/assets/voxygen/voxel/figure/head/dwarf/female.vox index d5d1ba3e1f..8522807c82 100644 Binary files a/assets/voxygen/voxel/figure/head/dwarf/female.vox and b/assets/voxygen/voxel/figure/head/dwarf/female.vox differ diff --git a/assets/voxygen/voxel/figure/head/dwarf/male.vox b/assets/voxygen/voxel/figure/head/dwarf/male.vox index c15952a249..4c29808e78 100644 Binary files a/assets/voxygen/voxel/figure/head/dwarf/male.vox and b/assets/voxygen/voxel/figure/head/dwarf/male.vox differ diff --git a/assets/voxygen/voxel/figure/head/elf/female.vox b/assets/voxygen/voxel/figure/head/elf/female.vox index 3db9b37179..6e1d935020 100644 Binary files a/assets/voxygen/voxel/figure/head/elf/female.vox and b/assets/voxygen/voxel/figure/head/elf/female.vox differ diff --git a/assets/voxygen/voxel/figure/head/elf/male.vox b/assets/voxygen/voxel/figure/head/elf/male.vox index 8d2f080607..8b48d6f14b 100644 Binary files a/assets/voxygen/voxel/figure/head/elf/male.vox and b/assets/voxygen/voxel/figure/head/elf/male.vox differ diff --git a/assets/voxygen/voxel/figure/head/human/female.vox b/assets/voxygen/voxel/figure/head/human/female.vox index 20fc5b9415..157b7cebfb 100644 Binary files a/assets/voxygen/voxel/figure/head/human/female.vox and b/assets/voxygen/voxel/figure/head/human/female.vox differ diff --git a/assets/voxygen/voxel/figure/head/human/male.vox b/assets/voxygen/voxel/figure/head/human/male.vox index cf50ee0995..c086971c20 100644 Binary files a/assets/voxygen/voxel/figure/head/human/male.vox and b/assets/voxygen/voxel/figure/head/human/male.vox differ 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),