From 91c85dea22fbc3fb1a2bb8d5ce3735b52feae280 Mon Sep 17 00:00:00 2001 From: Youssef Fahmy Date: Sat, 16 Jul 2022 11:13:24 +0000 Subject: [PATCH] Humanoid Model Overhaul --- assets/common/npc_names.ron | 6 +- assets/voxygen/i18n/be_BY/common.ron | 2 +- assets/voxygen/i18n/ca_CA/common.ron | 2 +- assets/voxygen/i18n/cz_CZ/common.ron | 2 +- assets/voxygen/i18n/de_DE/common.ron | 2 +- assets/voxygen/i18n/en/common.ron | 2 +- assets/voxygen/i18n/es_ES/common.ron | 2 +- assets/voxygen/i18n/es_LA/common.ron | 2 +- assets/voxygen/i18n/eu/common.ron | 2 +- assets/voxygen/i18n/fr_FR/common.ron | 2 +- assets/voxygen/i18n/hu_HU/common.ron | 2 +- assets/voxygen/i18n/it_IT/common.ron | 2 +- assets/voxygen/i18n/ja_JP/common.ron | 2 +- assets/voxygen/i18n/nl_NL/common.ron | 2 +- assets/voxygen/i18n/no_NB/common.ron | 2 +- assets/voxygen/i18n/pl_PL/common.ron | 2 +- assets/voxygen/i18n/pt_BR/common.ron | 2 +- assets/voxygen/i18n/pt_PT/common.ron | 2 +- assets/voxygen/i18n/ru_RU/common.ron | 2 +- assets/voxygen/i18n/sr_SR/common.ron | 2 +- assets/voxygen/i18n/sv_SE/common.ron | 2 +- assets/voxygen/i18n/th_TH/common.ron | 2 +- assets/voxygen/i18n/tr_TR/common.ron | 2 +- assets/voxygen/i18n/uk_UA/common.ron | 2 +- assets/voxygen/i18n/vi_VI/common.ron | 2 +- assets/voxygen/i18n/zh_CN/common.ron | 2 +- assets/voxygen/i18n/zh_TW/common.ron | 2 +- .../voxel/figure/accessory/danari/horns-0.vox | 2 +- .../voxel/figure/accessory/danari/horns-1.vox | 4 +- .../voxel/figure/accessory/danari/horns-2.vox | 4 +- .../voxel/figure/accessory/danari/horns-3.vox | 2 +- .../voxel/figure/accessory/danari/horns-4.vox | 4 +- .../voxel/figure/accessory/danari/horns-5.vox | 4 +- .../voxel/figure/accessory/danari/horns-6.vox | 4 +- .../accessory/draugr/female_eyepatch.vox | 3 + .../figure/accessory/draugr/male_eyepatch.vox | 3 + .../voxel/figure/accessory/elf/earrings-0.vox | 3 + .../voxel/figure/accessory/elf/earrings-1.vox | 3 + .../voxel/figure/accessory/elf/earrings-2.vox | 3 + .../voxel/figure/accessory/elf/earrings-3.vox | 3 + .../figure/accessory/orc/earring-female-0.vox | 2 +- .../figure/accessory/orc/earring-female-1.vox | 3 + .../figure/accessory/orc/earring-female-2.vox | 3 + .../figure/accessory/orc/earring-female-3.vox | 3 + .../figure/accessory/orc/earring-male-1.vox | 3 + .../figure/accessory/orc/earring-male-2.vox | 3 + .../voxel/figure/accessory/orc/teeth-3.vox | 3 + .../accessory/orc/warpaint-female-0.vox | 2 +- .../accessory/orc/warpaint-female-1.vox | 2 +- .../accessory/orc/warpaint-female-2.vox | 3 + .../accessory/orc/warpaint-female-3.vox | 3 + .../figure/accessory/orc/warpaint-male-0.vox | 4 +- .../figure/accessory/orc/warpaint-male-1.vox | 3 + .../figure/accessory/orc/warpaint-male-2.vox | 3 + .../figure/accessory/orc/warpaint-male-3.vox | 3 + .../accessory/undead/female_eyepatch.vox | 3 - .../figure/accessory/undead/male_eyepatch.vox | 3 - .../voxel/figure/beard/danari/danari-0.vox | 4 +- .../voxel/figure/beard/danari/danari-1.vox | 4 +- .../voxel/figure/beard/danari/danari-10.vox | 4 +- .../voxel/figure/beard/danari/danari-11.vox | 4 +- .../voxel/figure/beard/danari/danari-12.vox | 2 +- .../voxel/figure/beard/danari/danari-13.vox | 4 +- .../voxel/figure/beard/danari/danari-14.vox | 4 +- .../voxel/figure/beard/danari/danari-2.vox | 4 +- .../voxel/figure/beard/danari/danari-3.vox | 4 +- .../voxel/figure/beard/danari/danari-4.vox | 4 +- .../voxel/figure/beard/danari/danari-5.vox | 4 +- .../voxel/figure/beard/danari/danari-6.vox | 4 +- .../voxel/figure/beard/danari/danari-7.vox | 4 +- .../voxel/figure/beard/danari/danari-8.vox | 4 +- .../voxel/figure/beard/danari/danari-9.vox | 4 +- .../voxel/figure/beard/draugr/male-0.vox | 3 + .../voxel/figure/beard/draugr/male-1.vox | 3 + .../voxel/figure/beard/draugr/male-2.vox | 3 + .../voxel/figure/beard/draugr/male-3.vox | 3 + .../voxel/figure/beard/draugr/male-4.vox | 3 + .../voxel/figure/beard/dwarf/dwarf-0.vox | 4 +- .../voxel/figure/beard/dwarf/dwarf-1.vox | 4 +- .../voxel/figure/beard/dwarf/dwarf-10.vox | 4 +- .../voxel/figure/beard/dwarf/dwarf-11.vox | 4 +- .../voxel/figure/beard/dwarf/dwarf-12.vox | 4 +- .../voxel/figure/beard/dwarf/dwarf-13.vox | 4 +- .../voxel/figure/beard/dwarf/dwarf-14.vox | 4 +- .../voxel/figure/beard/dwarf/dwarf-15.vox | 4 +- .../voxel/figure/beard/dwarf/dwarf-16.vox | 4 +- .../voxel/figure/beard/dwarf/dwarf-17.vox | 4 +- .../voxel/figure/beard/dwarf/dwarf-18.vox | 4 +- .../voxel/figure/beard/dwarf/dwarf-19.vox | 4 +- .../voxel/figure/beard/dwarf/dwarf-2.vox | 4 +- .../voxel/figure/beard/dwarf/dwarf-20.vox | 4 +- .../voxel/figure/beard/dwarf/dwarf-21.vox | 4 +- .../voxel/figure/beard/dwarf/dwarf-22.vox | 4 +- .../voxel/figure/beard/dwarf/dwarf-3.vox | 4 +- .../voxel/figure/beard/dwarf/dwarf-4.vox | 4 +- .../voxel/figure/beard/dwarf/dwarf-5.vox | 4 +- .../voxel/figure/beard/dwarf/dwarf-6.vox | 4 +- .../voxel/figure/beard/dwarf/dwarf-7.vox | 4 +- .../voxel/figure/beard/dwarf/dwarf-8.vox | 4 +- .../voxel/figure/beard/dwarf/dwarf-9.vox | 4 +- .../voxygen/voxel/figure/beard/elf/elf-0.vox | 3 + .../voxygen/voxel/figure/beard/elf/elf-1.vox | 3 + .../voxygen/voxel/figure/beard/elf/elf-2.vox | 3 + .../voxygen/voxel/figure/beard/elf/elf-3.vox | 3 + .../voxygen/voxel/figure/beard/elf/elf-4.vox | 3 + .../voxygen/voxel/figure/beard/elf/elf-5.vox | 3 + .../voxygen/voxel/figure/beard/elf/elf-6.vox | 3 + .../voxel/figure/beard/human/human-0.vox | 2 +- .../voxel/figure/beard/human/human-1.vox | 2 +- .../voxel/figure/beard/human/human-2.vox | 2 +- .../voxel/figure/beard/human/human-3.vox | 3 + .../voxel/figure/beard/human/human-4.vox | 3 + .../voxel/figure/beard/human/human-5.vox | 3 + .../voxel/figure/beard/human/human-6.vox | 3 + .../voxel/figure/beard/human/human-7.vox | 3 + .../voxel/figure/beard/human/human-8.vox | 3 + assets/voxygen/voxel/figure/beard/orc/1.vox | 3 - assets/voxygen/voxel/figure/beard/orc/2.vox | 3 - .../voxygen/voxel/figure/beard/orc/orc-0.vox | 3 + .../voxygen/voxel/figure/beard/orc/orc-1.vox | 3 + .../voxygen/voxel/figure/beard/orc/orc-2.vox | 3 + .../voxygen/voxel/figure/beard/orc/orc-3.vox | 3 + .../voxygen/voxel/figure/beard/orc/orc-4.vox | 3 + .../voxygen/voxel/figure/beard/orc/orc-5.vox | 3 + .../voxel/figure/eyes/draugr/female-0.vox | 3 + .../voxel/figure/eyes/draugr/female-1.vox | 3 + .../voxel/figure/eyes/draugr/female-2.vox | 3 + .../voxel/figure/eyes/draugr/male-0.vox | 3 + .../voxel/figure/eyes/draugr/male-1.vox | 3 + .../voxel/figure/eyes/draugr/male-2.vox | 3 + .../voxel/figure/eyes/draugr/male-3.vox | 3 + .../voxel/figure/eyes/draugr/male-4.vox | 3 + .../voxel/figure/eyes/draugr/male-5.vox | 3 + .../voxel/figure/eyes/draugr/male-6.vox | 3 + .../voxel/figure/eyes/draugr/male-7.vox | 3 + .../figure/eyes/general/male_bushy-0.vox | 2 +- .../figure/eyes/general/male_bushy-1.vox | 3 + .../voxel/figure/eyes/general/male_old.vox | 2 +- .../figure/eyes/general/male_old_blind.vox | 2 +- .../voxel/figure/eyes/undead/female-0.vox | 3 - .../voxel/figure/eyes/undead/female-1.vox | 3 - .../voxel/figure/eyes/undead/female-2.vox | 3 - .../voxel/figure/eyes/undead/male-0.vox | 3 - .../voxel/figure/eyes/undead/male-1.vox | 3 - .../voxel/figure/eyes/undead/male-2.vox | 3 - .../voxel/figure/eyes/undead/male-3.vox | 3 - .../voxygen/voxel/figure/hair/danari/bald.vox | 3 + .../voxel/figure/hair/danari/female-0.vox | 4 +- .../voxel/figure/hair/danari/female-1.vox | 4 +- .../voxel/figure/hair/danari/female-10.vox | 3 + .../voxel/figure/hair/danari/female-11.vox | 3 + .../voxel/figure/hair/danari/female-12.vox | 3 + .../voxel/figure/hair/danari/female-13.vox | 3 + .../voxel/figure/hair/danari/female-14.vox | 3 + .../voxel/figure/hair/danari/female-2.vox | 4 +- .../voxel/figure/hair/danari/female-3.vox | 4 +- .../voxel/figure/hair/danari/female-4.vox | 3 + .../voxel/figure/hair/danari/female-5.vox | 3 + .../voxel/figure/hair/danari/female-6.vox | 3 + .../voxel/figure/hair/danari/female-7.vox | 3 + .../voxel/figure/hair/danari/female-8.vox | 3 + .../voxel/figure/hair/danari/female-9.vox | 3 + .../voxel/figure/hair/danari/male-0.vox | 4 +- .../voxel/figure/hair/danari/male-1.vox | 4 +- .../voxel/figure/hair/danari/male-10.vox | 3 + .../voxel/figure/hair/danari/male-11.vox | 3 + .../voxel/figure/hair/danari/male-12.vox | 3 + .../voxel/figure/hair/danari/male-13.vox | 3 + .../voxel/figure/hair/danari/male-2.vox | 4 +- .../voxel/figure/hair/danari/male-3.vox | 4 +- .../voxel/figure/hair/danari/male-4.vox | 3 + .../voxel/figure/hair/danari/male-5.vox | 3 + .../voxel/figure/hair/danari/male-6.vox | 3 + .../voxel/figure/hair/danari/male-7.vox | 3 + .../voxel/figure/hair/danari/male-8.vox | 3 + .../voxel/figure/hair/danari/male-9.vox | 3 + .../voxygen/voxel/figure/hair/draugr/bald.vox | 3 + .../voxel/figure/hair/draugr/female-0.vox | 3 + .../voxel/figure/hair/draugr/female-1.vox | 3 + .../voxel/figure/hair/draugr/female-10.vox | 3 + .../voxel/figure/hair/draugr/female-11.vox | 3 + .../voxel/figure/hair/draugr/female-12.vox | 3 + .../voxel/figure/hair/draugr/female-13.vox | 3 + .../voxel/figure/hair/draugr/female-2.vox | 3 + .../voxel/figure/hair/draugr/female-3.vox | 3 + .../voxel/figure/hair/draugr/female-4.vox | 3 + .../voxel/figure/hair/draugr/female-5.vox | 3 + .../voxel/figure/hair/draugr/female-6.vox | 3 + .../voxel/figure/hair/draugr/female-7.vox | 3 + .../voxel/figure/hair/draugr/female-8.vox | 3 + .../voxel/figure/hair/draugr/female-9.vox | 3 + .../voxel/figure/hair/draugr/male-0.vox | 3 + .../voxel/figure/hair/draugr/male-1.vox | 3 + .../voxel/figure/hair/draugr/male-10.vox | 3 + .../voxel/figure/hair/draugr/male-11.vox | 3 + .../voxel/figure/hair/draugr/male-12.vox | 3 + .../voxel/figure/hair/draugr/male-13.vox | 3 + .../voxel/figure/hair/draugr/male-2.vox | 3 + .../voxel/figure/hair/draugr/male-3.vox | 3 + .../voxel/figure/hair/draugr/male-4.vox | 3 + .../voxel/figure/hair/draugr/male-5.vox | 3 + .../voxel/figure/hair/draugr/male-6.vox | 3 + .../voxel/figure/hair/draugr/male-7.vox | 3 + .../voxel/figure/hair/draugr/male-8.vox | 3 + .../voxel/figure/hair/draugr/male-9.vox | 3 + .../voxygen/voxel/figure/hair/dwarf/bald.vox | 0 .../voxel/figure/hair/dwarf/female-0.vox | 4 +- .../voxel/figure/hair/dwarf/female-1.vox | 4 +- .../voxel/figure/hair/dwarf/female-10.vox | 3 + .../voxel/figure/hair/dwarf/female-11.vox | 3 + .../voxel/figure/hair/dwarf/female-12.vox | 3 + .../voxel/figure/hair/dwarf/female-13.vox | 3 + .../voxel/figure/hair/dwarf/female-14.vox | 3 + .../voxel/figure/hair/dwarf/female-2.vox | 4 +- .../voxel/figure/hair/dwarf/female-3.vox | 4 +- .../voxel/figure/hair/dwarf/female-4.vox | 4 +- .../voxel/figure/hair/dwarf/female-5.vox | 4 +- .../voxel/figure/hair/dwarf/female-6.vox | 4 +- .../voxel/figure/hair/dwarf/female-7.vox | 4 +- .../voxel/figure/hair/dwarf/female-8.vox | 3 + .../voxel/figure/hair/dwarf/female-9.vox | 3 + .../voxel/figure/hair/dwarf/male-0.vox | 4 +- .../voxel/figure/hair/dwarf/male-1.vox | 4 +- .../voxel/figure/hair/dwarf/male-10.vox | 3 + .../voxel/figure/hair/dwarf/male-11.vox | 3 + .../voxel/figure/hair/dwarf/male-12.vox | 3 + .../voxel/figure/hair/dwarf/male-13.vox | 3 + .../voxel/figure/hair/dwarf/male-2.vox | 4 +- .../voxel/figure/hair/dwarf/male-3.vox | 4 +- .../voxel/figure/hair/dwarf/male-4.vox | 4 +- .../voxel/figure/hair/dwarf/male-5.vox | 4 +- .../voxel/figure/hair/dwarf/male-6.vox | 4 +- .../voxel/figure/hair/dwarf/male-7.vox | 4 +- .../voxel/figure/hair/dwarf/male-8.vox | 3 + .../voxel/figure/hair/dwarf/male-9.vox | 3 + .../voxel/figure/hair/elf/female-0.vox | 4 +- .../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-2.vox | 4 +- .../voxel/figure/hair/elf/female-20.vox | 4 +- .../voxel/figure/hair/elf/female-21.vox | 4 +- .../voxel/figure/hair/elf/female-3.vox | 4 +- .../voxel/figure/hair/elf/female-4.vox | 4 +- .../voxel/figure/hair/elf/female-5.vox | 4 +- .../voxel/figure/hair/elf/female-6.vox | 4 +- .../voxel/figure/hair/elf/female-7.vox | 4 +- .../voxel/figure/hair/elf/female-8.vox | 4 +- .../voxel/figure/hair/elf/female-9.vox | 4 +- .../voxygen/voxel/figure/hair/elf/male-0.vox | 4 +- .../voxygen/voxel/figure/hair/elf/male-1.vox | 4 +- .../voxygen/voxel/figure/hair/elf/male-10.vox | 3 + .../voxygen/voxel/figure/hair/elf/male-11.vox | 3 + .../voxygen/voxel/figure/hair/elf/male-12.vox | 3 + .../voxygen/voxel/figure/hair/elf/male-13.vox | 3 + .../voxygen/voxel/figure/hair/elf/male-14.vox | 3 + .../voxygen/voxel/figure/hair/elf/male-2.vox | 4 +- .../voxygen/voxel/figure/hair/elf/male-3.vox | 4 +- .../voxygen/voxel/figure/hair/elf/male-4.vox | 3 + .../voxygen/voxel/figure/hair/elf/male-5.vox | 3 + .../voxygen/voxel/figure/hair/elf/male-6.vox | 3 + .../voxygen/voxel/figure/hair/elf/male-7.vox | 3 + .../voxygen/voxel/figure/hair/elf/male-8.vox | 3 + .../voxygen/voxel/figure/hair/elf/male-9.vox | 3 + .../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-19.vox | 4 +- .../voxel/figure/hair/human/female-2.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 +- .../voxel/figure/hair/human/female-9.vox | 4 +- .../voxel/figure/hair/human/male-0.vox | 4 +- .../voxel/figure/hair/human/male-1.vox | 4 +- .../voxel/figure/hair/human/male-10.vox | 4 +- .../voxel/figure/hair/human/male-11.vox | 4 +- .../voxel/figure/hair/human/male-12.vox | 4 +- .../voxel/figure/hair/human/male-13.vox | 4 +- .../voxel/figure/hair/human/male-14.vox | 4 +- .../voxel/figure/hair/human/male-15.vox | 4 +- .../voxel/figure/hair/human/male-16.vox | 4 +- .../voxel/figure/hair/human/male-17.vox | 4 +- .../voxel/figure/hair/human/male-18.vox | 4 +- .../voxel/figure/hair/human/male-19.vox | 4 +- .../voxel/figure/hair/human/male-2.vox | 4 +- .../voxel/figure/hair/human/male-20.vox | 4 +- .../voxel/figure/hair/human/male-3.vox | 4 +- .../voxel/figure/hair/human/male-4.vox | 2 +- .../voxel/figure/hair/human/male-5.vox | 4 +- .../voxel/figure/hair/human/male-6.vox | 4 +- .../voxel/figure/hair/human/male-7.vox | 4 +- .../voxel/figure/hair/human/male-8.vox | 4 +- .../voxel/figure/hair/human/male-9.vox | 4 +- assets/voxygen/voxel/figure/hair/orc/bald.vox | 3 + .../voxel/figure/hair/orc/female-0.vox | 4 +- .../voxel/figure/hair/orc/female-1.vox | 4 +- .../voxel/figure/hair/orc/female-10.vox | 3 + .../voxel/figure/hair/orc/female-11.vox | 3 + .../voxel/figure/hair/orc/female-12.vox | 3 + .../voxel/figure/hair/orc/female-13.vox | 3 + .../voxel/figure/hair/orc/female-14.vox | 3 + .../voxel/figure/hair/orc/female-2.vox | 4 +- .../voxel/figure/hair/orc/female-3.vox | 4 +- .../voxel/figure/hair/orc/female-4.vox | 4 +- .../voxel/figure/hair/orc/female-5.vox | 4 +- .../voxel/figure/hair/orc/female-6.vox | 4 +- .../voxel/figure/hair/orc/female-7.vox | 3 + .../voxel/figure/hair/orc/female-8.vox | 3 + .../voxel/figure/hair/orc/female-9.vox | 3 + .../voxygen/voxel/figure/hair/orc/male-0.vox | 4 +- .../voxygen/voxel/figure/hair/orc/male-1.vox | 4 +- .../voxygen/voxel/figure/hair/orc/male-10.vox | 3 + .../voxygen/voxel/figure/hair/orc/male-11.vox | 3 + .../voxygen/voxel/figure/hair/orc/male-12.vox | 3 + .../voxygen/voxel/figure/hair/orc/male-13.vox | 3 + .../voxygen/voxel/figure/hair/orc/male-2.vox | 4 +- .../voxygen/voxel/figure/hair/orc/male-3.vox | 2 +- .../voxygen/voxel/figure/hair/orc/male-4.vox | 4 +- .../voxygen/voxel/figure/hair/orc/male-5.vox | 4 +- .../voxygen/voxel/figure/hair/orc/male-6.vox | 4 +- .../voxygen/voxel/figure/hair/orc/male-7.vox | 3 + .../voxygen/voxel/figure/hair/orc/male-8.vox | 3 + .../voxygen/voxel/figure/hair/orc/male-9.vox | 3 + .../voxel/figure/hair/undead/female-0.vox | 3 - .../voxel/figure/hair/undead/female-1.vox | 3 - .../voxel/figure/hair/undead/female-2.vox | 3 - .../voxel/figure/hair/undead/female-3.vox | 3 - .../voxel/figure/hair/undead/female-4.vox | 3 - .../voxel/figure/hair/undead/female-5.vox | 3 - .../voxel/figure/hair/undead/male-0.vox | 3 - .../voxel/figure/hair/undead/male-1.vox | 3 - .../voxel/figure/hair/undead/male-2.vox | 3 - .../voxel/figure/hair/undead/male-3.vox | 3 - .../voxel/figure/head/danari/female.vox | 4 +- .../voxygen/voxel/figure/head/danari/male.vox | 4 +- .../voxel/figure/head/draugr/female.vox | 3 + .../voxygen/voxel/figure/head/draugr/male.vox | 3 + .../voxygen/voxel/figure/head/orc/female.vox | 4 +- .../voxel/figure/head/undead/female.vox | 3 - .../voxygen/voxel/figure/head/undead/male.vox | 3 - .../voxel/humanoid_armor_head_manifest.ron | 98 +-- .../voxygen/voxel/humanoid_color_manifest.ron | 635 +++++++++++------- .../voxygen/voxel/humanoid_head_manifest.ron | 504 ++++++++------ common/src/comp/agent.rs | 2 +- common/src/comp/body/humanoid.rs | 409 ++++++----- voxygen/anim/src/character/mod.rs | 8 +- voxygen/src/menu/char_selection/ui/mod.rs | 24 +- 367 files changed, 1806 insertions(+), 1063 deletions(-) mode change 100644 => 100755 assets/voxygen/voxel/figure/accessory/danari/horns-0.vox mode change 100644 => 100755 assets/voxygen/voxel/figure/accessory/danari/horns-1.vox mode change 100644 => 100755 assets/voxygen/voxel/figure/accessory/danari/horns-2.vox mode change 100644 => 100755 assets/voxygen/voxel/figure/accessory/danari/horns-3.vox mode change 100644 => 100755 assets/voxygen/voxel/figure/accessory/danari/horns-4.vox mode change 100644 => 100755 assets/voxygen/voxel/figure/accessory/danari/horns-5.vox mode change 100644 => 100755 assets/voxygen/voxel/figure/accessory/danari/horns-6.vox create mode 100755 assets/voxygen/voxel/figure/accessory/draugr/female_eyepatch.vox create mode 100755 assets/voxygen/voxel/figure/accessory/draugr/male_eyepatch.vox create mode 100755 assets/voxygen/voxel/figure/accessory/elf/earrings-0.vox create mode 100755 assets/voxygen/voxel/figure/accessory/elf/earrings-1.vox create mode 100755 assets/voxygen/voxel/figure/accessory/elf/earrings-2.vox create mode 100755 assets/voxygen/voxel/figure/accessory/elf/earrings-3.vox mode change 100644 => 100755 assets/voxygen/voxel/figure/accessory/orc/earring-female-0.vox create mode 100755 assets/voxygen/voxel/figure/accessory/orc/earring-female-1.vox create mode 100755 assets/voxygen/voxel/figure/accessory/orc/earring-female-2.vox create mode 100755 assets/voxygen/voxel/figure/accessory/orc/earring-female-3.vox create mode 100755 assets/voxygen/voxel/figure/accessory/orc/earring-male-1.vox create mode 100755 assets/voxygen/voxel/figure/accessory/orc/earring-male-2.vox create mode 100755 assets/voxygen/voxel/figure/accessory/orc/teeth-3.vox mode change 100644 => 100755 assets/voxygen/voxel/figure/accessory/orc/warpaint-female-0.vox mode change 100644 => 100755 assets/voxygen/voxel/figure/accessory/orc/warpaint-female-1.vox create mode 100644 assets/voxygen/voxel/figure/accessory/orc/warpaint-female-2.vox create mode 100755 assets/voxygen/voxel/figure/accessory/orc/warpaint-female-3.vox mode change 100644 => 100755 assets/voxygen/voxel/figure/accessory/orc/warpaint-male-0.vox create mode 100755 assets/voxygen/voxel/figure/accessory/orc/warpaint-male-1.vox create mode 100755 assets/voxygen/voxel/figure/accessory/orc/warpaint-male-2.vox create mode 100755 assets/voxygen/voxel/figure/accessory/orc/warpaint-male-3.vox delete mode 100644 assets/voxygen/voxel/figure/accessory/undead/female_eyepatch.vox delete mode 100644 assets/voxygen/voxel/figure/accessory/undead/male_eyepatch.vox mode change 100644 => 100755 assets/voxygen/voxel/figure/beard/danari/danari-0.vox mode change 100644 => 100755 assets/voxygen/voxel/figure/beard/danari/danari-1.vox mode change 100644 => 100755 assets/voxygen/voxel/figure/beard/danari/danari-10.vox mode change 100644 => 100755 assets/voxygen/voxel/figure/beard/danari/danari-11.vox mode change 100644 => 100755 assets/voxygen/voxel/figure/beard/danari/danari-12.vox mode change 100644 => 100755 assets/voxygen/voxel/figure/beard/danari/danari-13.vox mode change 100644 => 100755 assets/voxygen/voxel/figure/beard/danari/danari-14.vox mode change 100644 => 100755 assets/voxygen/voxel/figure/beard/danari/danari-2.vox mode change 100644 => 100755 assets/voxygen/voxel/figure/beard/danari/danari-3.vox mode change 100644 => 100755 assets/voxygen/voxel/figure/beard/danari/danari-4.vox mode change 100644 => 100755 assets/voxygen/voxel/figure/beard/danari/danari-5.vox mode change 100644 => 100755 assets/voxygen/voxel/figure/beard/danari/danari-6.vox mode change 100644 => 100755 assets/voxygen/voxel/figure/beard/danari/danari-7.vox mode change 100644 => 100755 assets/voxygen/voxel/figure/beard/danari/danari-8.vox mode change 100644 => 100755 assets/voxygen/voxel/figure/beard/danari/danari-9.vox create mode 100755 assets/voxygen/voxel/figure/beard/draugr/male-0.vox create mode 100755 assets/voxygen/voxel/figure/beard/draugr/male-1.vox create mode 100755 assets/voxygen/voxel/figure/beard/draugr/male-2.vox create mode 100755 assets/voxygen/voxel/figure/beard/draugr/male-3.vox create mode 100755 assets/voxygen/voxel/figure/beard/draugr/male-4.vox mode change 100644 => 100755 assets/voxygen/voxel/figure/beard/dwarf/dwarf-0.vox mode change 100644 => 100755 assets/voxygen/voxel/figure/beard/dwarf/dwarf-1.vox mode change 100644 => 100755 assets/voxygen/voxel/figure/beard/dwarf/dwarf-10.vox mode change 100644 => 100755 assets/voxygen/voxel/figure/beard/dwarf/dwarf-11.vox mode change 100644 => 100755 assets/voxygen/voxel/figure/beard/dwarf/dwarf-12.vox mode change 100644 => 100755 assets/voxygen/voxel/figure/beard/dwarf/dwarf-13.vox mode change 100644 => 100755 assets/voxygen/voxel/figure/beard/dwarf/dwarf-14.vox mode change 100644 => 100755 assets/voxygen/voxel/figure/beard/dwarf/dwarf-15.vox mode change 100644 => 100755 assets/voxygen/voxel/figure/beard/dwarf/dwarf-16.vox mode change 100644 => 100755 assets/voxygen/voxel/figure/beard/dwarf/dwarf-17.vox mode change 100644 => 100755 assets/voxygen/voxel/figure/beard/dwarf/dwarf-18.vox mode change 100644 => 100755 assets/voxygen/voxel/figure/beard/dwarf/dwarf-19.vox mode change 100644 => 100755 assets/voxygen/voxel/figure/beard/dwarf/dwarf-2.vox mode change 100644 => 100755 assets/voxygen/voxel/figure/beard/dwarf/dwarf-20.vox mode change 100644 => 100755 assets/voxygen/voxel/figure/beard/dwarf/dwarf-21.vox mode change 100644 => 100755 assets/voxygen/voxel/figure/beard/dwarf/dwarf-22.vox mode change 100644 => 100755 assets/voxygen/voxel/figure/beard/dwarf/dwarf-3.vox mode change 100644 => 100755 assets/voxygen/voxel/figure/beard/dwarf/dwarf-4.vox mode change 100644 => 100755 assets/voxygen/voxel/figure/beard/dwarf/dwarf-5.vox mode change 100644 => 100755 assets/voxygen/voxel/figure/beard/dwarf/dwarf-6.vox mode change 100644 => 100755 assets/voxygen/voxel/figure/beard/dwarf/dwarf-7.vox mode change 100644 => 100755 assets/voxygen/voxel/figure/beard/dwarf/dwarf-8.vox mode change 100644 => 100755 assets/voxygen/voxel/figure/beard/dwarf/dwarf-9.vox create mode 100755 assets/voxygen/voxel/figure/beard/elf/elf-0.vox create mode 100755 assets/voxygen/voxel/figure/beard/elf/elf-1.vox create mode 100755 assets/voxygen/voxel/figure/beard/elf/elf-2.vox create mode 100755 assets/voxygen/voxel/figure/beard/elf/elf-3.vox create mode 100755 assets/voxygen/voxel/figure/beard/elf/elf-4.vox create mode 100755 assets/voxygen/voxel/figure/beard/elf/elf-5.vox create mode 100755 assets/voxygen/voxel/figure/beard/elf/elf-6.vox mode change 100644 => 100755 assets/voxygen/voxel/figure/beard/human/human-0.vox mode change 100644 => 100755 assets/voxygen/voxel/figure/beard/human/human-1.vox mode change 100644 => 100755 assets/voxygen/voxel/figure/beard/human/human-2.vox create mode 100644 assets/voxygen/voxel/figure/beard/human/human-3.vox create mode 100755 assets/voxygen/voxel/figure/beard/human/human-4.vox create mode 100644 assets/voxygen/voxel/figure/beard/human/human-5.vox create mode 100755 assets/voxygen/voxel/figure/beard/human/human-6.vox create mode 100644 assets/voxygen/voxel/figure/beard/human/human-7.vox create mode 100755 assets/voxygen/voxel/figure/beard/human/human-8.vox delete mode 100644 assets/voxygen/voxel/figure/beard/orc/1.vox delete mode 100644 assets/voxygen/voxel/figure/beard/orc/2.vox create mode 100755 assets/voxygen/voxel/figure/beard/orc/orc-0.vox create mode 100644 assets/voxygen/voxel/figure/beard/orc/orc-1.vox create mode 100755 assets/voxygen/voxel/figure/beard/orc/orc-2.vox create mode 100644 assets/voxygen/voxel/figure/beard/orc/orc-3.vox create mode 100755 assets/voxygen/voxel/figure/beard/orc/orc-4.vox create mode 100755 assets/voxygen/voxel/figure/beard/orc/orc-5.vox create mode 100644 assets/voxygen/voxel/figure/eyes/draugr/female-0.vox create mode 100644 assets/voxygen/voxel/figure/eyes/draugr/female-1.vox create mode 100644 assets/voxygen/voxel/figure/eyes/draugr/female-2.vox create mode 100755 assets/voxygen/voxel/figure/eyes/draugr/male-0.vox create mode 100755 assets/voxygen/voxel/figure/eyes/draugr/male-1.vox create mode 100755 assets/voxygen/voxel/figure/eyes/draugr/male-2.vox create mode 100755 assets/voxygen/voxel/figure/eyes/draugr/male-3.vox create mode 100755 assets/voxygen/voxel/figure/eyes/draugr/male-4.vox create mode 100755 assets/voxygen/voxel/figure/eyes/draugr/male-5.vox create mode 100755 assets/voxygen/voxel/figure/eyes/draugr/male-6.vox create mode 100755 assets/voxygen/voxel/figure/eyes/draugr/male-7.vox create mode 100755 assets/voxygen/voxel/figure/eyes/general/male_bushy-1.vox delete mode 100644 assets/voxygen/voxel/figure/eyes/undead/female-0.vox delete mode 100644 assets/voxygen/voxel/figure/eyes/undead/female-1.vox delete mode 100644 assets/voxygen/voxel/figure/eyes/undead/female-2.vox delete mode 100644 assets/voxygen/voxel/figure/eyes/undead/male-0.vox delete mode 100644 assets/voxygen/voxel/figure/eyes/undead/male-1.vox delete mode 100644 assets/voxygen/voxel/figure/eyes/undead/male-2.vox delete mode 100644 assets/voxygen/voxel/figure/eyes/undead/male-3.vox create mode 100755 assets/voxygen/voxel/figure/hair/danari/bald.vox mode change 100644 => 100755 assets/voxygen/voxel/figure/hair/danari/female-0.vox mode change 100644 => 100755 assets/voxygen/voxel/figure/hair/danari/female-1.vox create mode 100755 assets/voxygen/voxel/figure/hair/danari/female-10.vox create mode 100755 assets/voxygen/voxel/figure/hair/danari/female-11.vox create mode 100755 assets/voxygen/voxel/figure/hair/danari/female-12.vox create mode 100755 assets/voxygen/voxel/figure/hair/danari/female-13.vox create mode 100755 assets/voxygen/voxel/figure/hair/danari/female-14.vox mode change 100644 => 100755 assets/voxygen/voxel/figure/hair/danari/female-2.vox mode change 100644 => 100755 assets/voxygen/voxel/figure/hair/danari/female-3.vox create mode 100755 assets/voxygen/voxel/figure/hair/danari/female-4.vox create mode 100644 assets/voxygen/voxel/figure/hair/danari/female-5.vox create mode 100755 assets/voxygen/voxel/figure/hair/danari/female-6.vox create mode 100644 assets/voxygen/voxel/figure/hair/danari/female-7.vox create mode 100755 assets/voxygen/voxel/figure/hair/danari/female-8.vox create mode 100755 assets/voxygen/voxel/figure/hair/danari/female-9.vox mode change 100644 => 100755 assets/voxygen/voxel/figure/hair/danari/male-0.vox create mode 100755 assets/voxygen/voxel/figure/hair/danari/male-10.vox create mode 100755 assets/voxygen/voxel/figure/hair/danari/male-11.vox create mode 100755 assets/voxygen/voxel/figure/hair/danari/male-12.vox create mode 100755 assets/voxygen/voxel/figure/hair/danari/male-13.vox mode change 100644 => 100755 assets/voxygen/voxel/figure/hair/danari/male-2.vox mode change 100644 => 100755 assets/voxygen/voxel/figure/hair/danari/male-3.vox create mode 100755 assets/voxygen/voxel/figure/hair/danari/male-4.vox create mode 100755 assets/voxygen/voxel/figure/hair/danari/male-5.vox create mode 100755 assets/voxygen/voxel/figure/hair/danari/male-6.vox create mode 100755 assets/voxygen/voxel/figure/hair/danari/male-7.vox create mode 100755 assets/voxygen/voxel/figure/hair/danari/male-8.vox create mode 100755 assets/voxygen/voxel/figure/hair/danari/male-9.vox create mode 100755 assets/voxygen/voxel/figure/hair/draugr/bald.vox create mode 100755 assets/voxygen/voxel/figure/hair/draugr/female-0.vox create mode 100755 assets/voxygen/voxel/figure/hair/draugr/female-1.vox create mode 100755 assets/voxygen/voxel/figure/hair/draugr/female-10.vox create mode 100755 assets/voxygen/voxel/figure/hair/draugr/female-11.vox create mode 100755 assets/voxygen/voxel/figure/hair/draugr/female-12.vox create mode 100755 assets/voxygen/voxel/figure/hair/draugr/female-13.vox create mode 100755 assets/voxygen/voxel/figure/hair/draugr/female-2.vox create mode 100755 assets/voxygen/voxel/figure/hair/draugr/female-3.vox create mode 100755 assets/voxygen/voxel/figure/hair/draugr/female-4.vox create mode 100755 assets/voxygen/voxel/figure/hair/draugr/female-5.vox create mode 100755 assets/voxygen/voxel/figure/hair/draugr/female-6.vox create mode 100755 assets/voxygen/voxel/figure/hair/draugr/female-7.vox create mode 100755 assets/voxygen/voxel/figure/hair/draugr/female-8.vox create mode 100755 assets/voxygen/voxel/figure/hair/draugr/female-9.vox create mode 100755 assets/voxygen/voxel/figure/hair/draugr/male-0.vox create mode 100755 assets/voxygen/voxel/figure/hair/draugr/male-1.vox create mode 100755 assets/voxygen/voxel/figure/hair/draugr/male-10.vox create mode 100755 assets/voxygen/voxel/figure/hair/draugr/male-11.vox create mode 100755 assets/voxygen/voxel/figure/hair/draugr/male-12.vox create mode 100755 assets/voxygen/voxel/figure/hair/draugr/male-13.vox create mode 100755 assets/voxygen/voxel/figure/hair/draugr/male-2.vox create mode 100755 assets/voxygen/voxel/figure/hair/draugr/male-3.vox create mode 100755 assets/voxygen/voxel/figure/hair/draugr/male-4.vox create mode 100755 assets/voxygen/voxel/figure/hair/draugr/male-5.vox create mode 100755 assets/voxygen/voxel/figure/hair/draugr/male-6.vox create mode 100755 assets/voxygen/voxel/figure/hair/draugr/male-7.vox create mode 100755 assets/voxygen/voxel/figure/hair/draugr/male-8.vox create mode 100755 assets/voxygen/voxel/figure/hair/draugr/male-9.vox mode change 100644 => 100755 assets/voxygen/voxel/figure/hair/dwarf/bald.vox mode change 100644 => 100755 assets/voxygen/voxel/figure/hair/dwarf/female-0.vox mode change 100644 => 100755 assets/voxygen/voxel/figure/hair/dwarf/female-1.vox create mode 100755 assets/voxygen/voxel/figure/hair/dwarf/female-10.vox create mode 100755 assets/voxygen/voxel/figure/hair/dwarf/female-11.vox create mode 100755 assets/voxygen/voxel/figure/hair/dwarf/female-12.vox create mode 100755 assets/voxygen/voxel/figure/hair/dwarf/female-13.vox create mode 100755 assets/voxygen/voxel/figure/hair/dwarf/female-14.vox mode change 100644 => 100755 assets/voxygen/voxel/figure/hair/dwarf/female-2.vox mode change 100644 => 100755 assets/voxygen/voxel/figure/hair/dwarf/female-3.vox mode change 100644 => 100755 assets/voxygen/voxel/figure/hair/dwarf/female-4.vox mode change 100644 => 100755 assets/voxygen/voxel/figure/hair/dwarf/female-5.vox create mode 100755 assets/voxygen/voxel/figure/hair/dwarf/female-8.vox create mode 100755 assets/voxygen/voxel/figure/hair/dwarf/female-9.vox mode change 100644 => 100755 assets/voxygen/voxel/figure/hair/dwarf/male-0.vox mode change 100644 => 100755 assets/voxygen/voxel/figure/hair/dwarf/male-1.vox create mode 100755 assets/voxygen/voxel/figure/hair/dwarf/male-10.vox create mode 100755 assets/voxygen/voxel/figure/hair/dwarf/male-11.vox create mode 100755 assets/voxygen/voxel/figure/hair/dwarf/male-12.vox create mode 100755 assets/voxygen/voxel/figure/hair/dwarf/male-13.vox mode change 100644 => 100755 assets/voxygen/voxel/figure/hair/dwarf/male-2.vox mode change 100644 => 100755 assets/voxygen/voxel/figure/hair/dwarf/male-3.vox mode change 100644 => 100755 assets/voxygen/voxel/figure/hair/dwarf/male-4.vox mode change 100644 => 100755 assets/voxygen/voxel/figure/hair/dwarf/male-5.vox mode change 100644 => 100755 assets/voxygen/voxel/figure/hair/dwarf/male-6.vox mode change 100644 => 100755 assets/voxygen/voxel/figure/hair/dwarf/male-7.vox create mode 100755 assets/voxygen/voxel/figure/hair/dwarf/male-8.vox create mode 100755 assets/voxygen/voxel/figure/hair/dwarf/male-9.vox mode change 100644 => 100755 assets/voxygen/voxel/figure/hair/elf/female-0.vox mode change 100644 => 100755 assets/voxygen/voxel/figure/hair/elf/female-1.vox mode change 100644 => 100755 assets/voxygen/voxel/figure/hair/elf/female-10.vox mode change 100644 => 100755 assets/voxygen/voxel/figure/hair/elf/female-11.vox mode change 100644 => 100755 assets/voxygen/voxel/figure/hair/elf/female-12.vox mode change 100644 => 100755 assets/voxygen/voxel/figure/hair/elf/female-13.vox mode change 100644 => 100755 assets/voxygen/voxel/figure/hair/elf/female-16.vox mode change 100644 => 100755 assets/voxygen/voxel/figure/hair/elf/female-17.vox mode change 100644 => 100755 assets/voxygen/voxel/figure/hair/elf/female-18.vox mode change 100644 => 100755 assets/voxygen/voxel/figure/hair/elf/female-19.vox mode change 100644 => 100755 assets/voxygen/voxel/figure/hair/elf/female-2.vox mode change 100644 => 100755 assets/voxygen/voxel/figure/hair/elf/female-20.vox mode change 100644 => 100755 assets/voxygen/voxel/figure/hair/elf/female-21.vox mode change 100644 => 100755 assets/voxygen/voxel/figure/hair/elf/female-3.vox mode change 100644 => 100755 assets/voxygen/voxel/figure/hair/elf/female-6.vox mode change 100644 => 100755 assets/voxygen/voxel/figure/hair/elf/female-7.vox mode change 100644 => 100755 assets/voxygen/voxel/figure/hair/elf/female-9.vox mode change 100644 => 100755 assets/voxygen/voxel/figure/hair/elf/male-0.vox mode change 100644 => 100755 assets/voxygen/voxel/figure/hair/elf/male-1.vox create mode 100755 assets/voxygen/voxel/figure/hair/elf/male-10.vox create mode 100755 assets/voxygen/voxel/figure/hair/elf/male-11.vox create mode 100755 assets/voxygen/voxel/figure/hair/elf/male-12.vox create mode 100755 assets/voxygen/voxel/figure/hair/elf/male-13.vox create mode 100755 assets/voxygen/voxel/figure/hair/elf/male-14.vox mode change 100644 => 100755 assets/voxygen/voxel/figure/hair/elf/male-2.vox mode change 100644 => 100755 assets/voxygen/voxel/figure/hair/elf/male-3.vox create mode 100755 assets/voxygen/voxel/figure/hair/elf/male-4.vox create mode 100644 assets/voxygen/voxel/figure/hair/elf/male-5.vox create mode 100755 assets/voxygen/voxel/figure/hair/elf/male-6.vox create mode 100755 assets/voxygen/voxel/figure/hair/elf/male-7.vox create mode 100755 assets/voxygen/voxel/figure/hair/elf/male-8.vox create mode 100755 assets/voxygen/voxel/figure/hair/elf/male-9.vox mode change 100644 => 100755 assets/voxygen/voxel/figure/hair/human/female-0.vox mode change 100644 => 100755 assets/voxygen/voxel/figure/hair/human/female-1.vox mode change 100644 => 100755 assets/voxygen/voxel/figure/hair/human/female-10.vox mode change 100644 => 100755 assets/voxygen/voxel/figure/hair/human/female-11.vox mode change 100644 => 100755 assets/voxygen/voxel/figure/hair/human/female-12.vox mode change 100644 => 100755 assets/voxygen/voxel/figure/hair/human/female-13.vox mode change 100644 => 100755 assets/voxygen/voxel/figure/hair/human/female-14.vox mode change 100644 => 100755 assets/voxygen/voxel/figure/hair/human/female-15.vox mode change 100644 => 100755 assets/voxygen/voxel/figure/hair/human/female-16.vox mode change 100644 => 100755 assets/voxygen/voxel/figure/hair/human/female-17.vox mode change 100644 => 100755 assets/voxygen/voxel/figure/hair/human/female-18.vox mode change 100644 => 100755 assets/voxygen/voxel/figure/hair/human/female-19.vox mode change 100644 => 100755 assets/voxygen/voxel/figure/hair/human/female-2.vox mode change 100644 => 100755 assets/voxygen/voxel/figure/hair/human/female-3.vox mode change 100644 => 100755 assets/voxygen/voxel/figure/hair/human/female-4.vox mode change 100644 => 100755 assets/voxygen/voxel/figure/hair/human/female-5.vox mode change 100644 => 100755 assets/voxygen/voxel/figure/hair/human/female-6.vox mode change 100644 => 100755 assets/voxygen/voxel/figure/hair/human/female-7.vox mode change 100644 => 100755 assets/voxygen/voxel/figure/hair/human/female-8.vox mode change 100644 => 100755 assets/voxygen/voxel/figure/hair/human/male-0.vox mode change 100644 => 100755 assets/voxygen/voxel/figure/hair/human/male-10.vox mode change 100644 => 100755 assets/voxygen/voxel/figure/hair/human/male-11.vox mode change 100644 => 100755 assets/voxygen/voxel/figure/hair/human/male-17.vox mode change 100644 => 100755 assets/voxygen/voxel/figure/hair/human/male-18.vox mode change 100644 => 100755 assets/voxygen/voxel/figure/hair/human/male-2.vox mode change 100644 => 100755 assets/voxygen/voxel/figure/hair/human/male-20.vox mode change 100644 => 100755 assets/voxygen/voxel/figure/hair/human/male-3.vox mode change 100644 => 100755 assets/voxygen/voxel/figure/hair/human/male-4.vox mode change 100644 => 100755 assets/voxygen/voxel/figure/hair/human/male-5.vox mode change 100644 => 100755 assets/voxygen/voxel/figure/hair/human/male-7.vox mode change 100644 => 100755 assets/voxygen/voxel/figure/hair/human/male-8.vox mode change 100644 => 100755 assets/voxygen/voxel/figure/hair/human/male-9.vox create mode 100755 assets/voxygen/voxel/figure/hair/orc/bald.vox mode change 100644 => 100755 assets/voxygen/voxel/figure/hair/orc/female-0.vox mode change 100644 => 100755 assets/voxygen/voxel/figure/hair/orc/female-1.vox create mode 100755 assets/voxygen/voxel/figure/hair/orc/female-10.vox create mode 100755 assets/voxygen/voxel/figure/hair/orc/female-11.vox create mode 100644 assets/voxygen/voxel/figure/hair/orc/female-12.vox create mode 100755 assets/voxygen/voxel/figure/hair/orc/female-13.vox create mode 100755 assets/voxygen/voxel/figure/hair/orc/female-14.vox mode change 100644 => 100755 assets/voxygen/voxel/figure/hair/orc/female-2.vox mode change 100644 => 100755 assets/voxygen/voxel/figure/hair/orc/female-3.vox mode change 100644 => 100755 assets/voxygen/voxel/figure/hair/orc/female-4.vox mode change 100644 => 100755 assets/voxygen/voxel/figure/hair/orc/female-5.vox mode change 100644 => 100755 assets/voxygen/voxel/figure/hair/orc/female-6.vox create mode 100755 assets/voxygen/voxel/figure/hair/orc/female-7.vox create mode 100755 assets/voxygen/voxel/figure/hair/orc/female-8.vox create mode 100755 assets/voxygen/voxel/figure/hair/orc/female-9.vox mode change 100644 => 100755 assets/voxygen/voxel/figure/hair/orc/male-1.vox create mode 100755 assets/voxygen/voxel/figure/hair/orc/male-10.vox create mode 100644 assets/voxygen/voxel/figure/hair/orc/male-11.vox create mode 100755 assets/voxygen/voxel/figure/hair/orc/male-12.vox create mode 100755 assets/voxygen/voxel/figure/hair/orc/male-13.vox mode change 100644 => 100755 assets/voxygen/voxel/figure/hair/orc/male-2.vox mode change 100644 => 100755 assets/voxygen/voxel/figure/hair/orc/male-3.vox mode change 100644 => 100755 assets/voxygen/voxel/figure/hair/orc/male-4.vox mode change 100644 => 100755 assets/voxygen/voxel/figure/hair/orc/male-5.vox mode change 100644 => 100755 assets/voxygen/voxel/figure/hair/orc/male-6.vox create mode 100755 assets/voxygen/voxel/figure/hair/orc/male-7.vox create mode 100755 assets/voxygen/voxel/figure/hair/orc/male-8.vox create mode 100755 assets/voxygen/voxel/figure/hair/orc/male-9.vox delete mode 100644 assets/voxygen/voxel/figure/hair/undead/female-0.vox delete mode 100644 assets/voxygen/voxel/figure/hair/undead/female-1.vox delete mode 100644 assets/voxygen/voxel/figure/hair/undead/female-2.vox delete mode 100644 assets/voxygen/voxel/figure/hair/undead/female-3.vox delete mode 100644 assets/voxygen/voxel/figure/hair/undead/female-4.vox delete mode 100644 assets/voxygen/voxel/figure/hair/undead/female-5.vox delete mode 100644 assets/voxygen/voxel/figure/hair/undead/male-0.vox delete mode 100644 assets/voxygen/voxel/figure/hair/undead/male-1.vox delete mode 100644 assets/voxygen/voxel/figure/hair/undead/male-2.vox delete mode 100644 assets/voxygen/voxel/figure/hair/undead/male-3.vox mode change 100644 => 100755 assets/voxygen/voxel/figure/head/danari/female.vox mode change 100644 => 100755 assets/voxygen/voxel/figure/head/danari/male.vox create mode 100755 assets/voxygen/voxel/figure/head/draugr/female.vox create mode 100644 assets/voxygen/voxel/figure/head/draugr/male.vox delete mode 100644 assets/voxygen/voxel/figure/head/undead/female.vox delete mode 100644 assets/voxygen/voxel/figure/head/undead/male.vox diff --git a/assets/common/npc_names.ron b/assets/common/npc_names.ron index 249e546dd1..5d3394342e 100644 --- a/assets/common/npc_names.ron +++ b/assets/common/npc_names.ron @@ -311,9 +311,9 @@ keyword: "orc", generic: "Orc" ), - undead: ( - keyword: "undead", - generic: "Undead" + draugr: ( + keyword: "draugr", + generic: "Draugr" ) ) ), diff --git a/assets/voxygen/i18n/be_BY/common.ron b/assets/voxygen/i18n/be_BY/common.ron index 9ea77cbf3b..c0f4a6846b 100644 --- a/assets/voxygen/i18n/be_BY/common.ron +++ b/assets/voxygen/i18n/be_BY/common.ron @@ -59,7 +59,7 @@ "common.species.human": "Чалавек", "common.species.dwarf": "Дварф", "common.species.elf": "Эльф", - "common.species.undead": "Нежыць", + "common.species.draugr": "Нежыць", "common.species.danari": "Данары", "common.weapons.axe": "Сякера", diff --git a/assets/voxygen/i18n/ca_CA/common.ron b/assets/voxygen/i18n/ca_CA/common.ron index 58ea624ebc..4dfae867b1 100644 --- a/assets/voxygen/i18n/ca_CA/common.ron +++ b/assets/voxygen/i18n/ca_CA/common.ron @@ -59,7 +59,7 @@ Està el client actualitzat?"#, "common.species.human": "Humà", "common.species.dwarf": "Nan", "common.species.elf": "Elf", - "common.species.undead": "No-mort", + "common.species.draugr": "No-mort", "common.species.danari": "Danari", "common.weapons.axe": "Destral", diff --git a/assets/voxygen/i18n/cz_CZ/common.ron b/assets/voxygen/i18n/cz_CZ/common.ron index 2eb4999760..b0b61f4b86 100644 --- a/assets/voxygen/i18n/cz_CZ/common.ron +++ b/assets/voxygen/i18n/cz_CZ/common.ron @@ -57,7 +57,7 @@ "common.species.human": "Člověk", "common.species.dwarf": "Trpaslík", "common.species.elf": "Elf", - "common.species.undead": "Nemrtvý", + "common.species.draugr": "Nemrtvý", "common.species.danari": "Danari", "common.weapons.axe": "Sekera", diff --git a/assets/voxygen/i18n/de_DE/common.ron b/assets/voxygen/i18n/de_DE/common.ron index c5ba3b1472..ad0c579d1a 100644 --- a/assets/voxygen/i18n/de_DE/common.ron +++ b/assets/voxygen/i18n/de_DE/common.ron @@ -57,7 +57,7 @@ Ist das Spiel auf dem neusten Stand?"#, "common.species.human": "Mensch", "common.species.dwarf": "Zwerg", "common.species.elf": "Elf", - "common.species.undead": "Untoter", + "common.species.draugr": "Untoter", "common.species.danari": "Danari", "common.weapons.axe": "Axt", diff --git a/assets/voxygen/i18n/en/common.ron b/assets/voxygen/i18n/en/common.ron index 7ebd14770e..5736ac36bf 100644 --- a/assets/voxygen/i18n/en/common.ron +++ b/assets/voxygen/i18n/en/common.ron @@ -59,7 +59,7 @@ Is the client up to date?"#, "common.species.human": "Human", "common.species.dwarf": "Dwarf", "common.species.elf": "Elf", - "common.species.undead": "Undead", + "common.species.draugr": "Draugr", "common.species.danari": "Danari", "common.weapons.axe": "Axe", diff --git a/assets/voxygen/i18n/es_ES/common.ron b/assets/voxygen/i18n/es_ES/common.ron index 43ad02a658..ce0b9276d7 100644 --- a/assets/voxygen/i18n/es_ES/common.ron +++ b/assets/voxygen/i18n/es_ES/common.ron @@ -58,7 +58,7 @@ "common.species.human": "Humano", "common.species.dwarf": "Enano", "common.species.elf": "Elfo", - "common.species.undead": "No muerto", + "common.species.draugr": "No muerto", "common.species.danari": "Danari", "common.weapons.axe": "Hacha", diff --git a/assets/voxygen/i18n/es_LA/common.ron b/assets/voxygen/i18n/es_LA/common.ron index c85ec804cd..7592fcb392 100644 --- a/assets/voxygen/i18n/es_LA/common.ron +++ b/assets/voxygen/i18n/es_LA/common.ron @@ -59,7 +59,7 @@ "common.species.human": "Humano", "common.species.dwarf": "Enano", "common.species.elf": "Elfo", - "common.species.undead": "No-Muerto", + "common.species.draugr": "No-Muerto", "common.species.danari": "Danari", "common.weapons.axe": "Hacha", diff --git a/assets/voxygen/i18n/eu/common.ron b/assets/voxygen/i18n/eu/common.ron index 1fecf84cd0..51a0c2dd4f 100644 --- a/assets/voxygen/i18n/eu/common.ron +++ b/assets/voxygen/i18n/eu/common.ron @@ -57,7 +57,7 @@ Jokoa eguneratuta duzu?"#, "common.species.human": "Gizakia", "common.species.dwarf": "Dwarf", "common.species.elf": "Elfoa", - "common.species.undead": "Ez-hila", + "common.species.draugr": "Ez-hila", "common.species.danari": "Danari", "common.weapons.axe": "Aizkora", diff --git a/assets/voxygen/i18n/fr_FR/common.ron b/assets/voxygen/i18n/fr_FR/common.ron index 2e09380387..d659bd3c1f 100644 --- a/assets/voxygen/i18n/fr_FR/common.ron +++ b/assets/voxygen/i18n/fr_FR/common.ron @@ -58,7 +58,7 @@ Le client est-il à jour ?"#, "common.species.human": "Humain", "common.species.dwarf": "Nain", "common.species.elf": "Elfe", - "common.species.undead": "Mort-vivant", + "common.species.draugr": "Mort-vivant", "common.species.danari": "Danari", "common.weapons.axe": "Hâche", diff --git a/assets/voxygen/i18n/hu_HU/common.ron b/assets/voxygen/i18n/hu_HU/common.ron index e42f35733d..37572fb98e 100644 --- a/assets/voxygen/i18n/hu_HU/common.ron +++ b/assets/voxygen/i18n/hu_HU/common.ron @@ -57,7 +57,7 @@ Naprakész a kliens?"#, "common.species.human": "Ember", "common.species.dwarf": "Törpe", "common.species.elf": "Tünde", - "common.species.undead": "Élőhalott", + "common.species.draugr": "Élőhalott", "common.species.danari": "Danari", "common.weapons.axe": "Fejsze", diff --git a/assets/voxygen/i18n/it_IT/common.ron b/assets/voxygen/i18n/it_IT/common.ron index 385bb35b3f..b2e7f64ede 100644 --- a/assets/voxygen/i18n/it_IT/common.ron +++ b/assets/voxygen/i18n/it_IT/common.ron @@ -59,7 +59,7 @@ Il client è aggiornato?"#, "common.species.human": "Umano", "common.species.dwarf": "Nano", "common.species.elf": "Elfo", - "common.species.undead": "Non-Morto", + "common.species.draugr": "Non-Morto", "common.species.danari": "Danari", "common.weapons.axe": "Ascia", diff --git a/assets/voxygen/i18n/ja_JP/common.ron b/assets/voxygen/i18n/ja_JP/common.ron index 81cff85b44..42c6c4925a 100644 --- a/assets/voxygen/i18n/ja_JP/common.ron +++ b/assets/voxygen/i18n/ja_JP/common.ron @@ -55,7 +55,7 @@ "common.species.human": "人間", "common.species.dwarf": "ドワーフ", "common.species.elf": "エルフ", - "common.species.undead": "アンデッド", + "common.species.draugr": "アンデッド", "common.species.danari": "デナリ", "common.weapons.axe": "斧", diff --git a/assets/voxygen/i18n/nl_NL/common.ron b/assets/voxygen/i18n/nl_NL/common.ron index 26433554a5..cbbe894bf4 100644 --- a/assets/voxygen/i18n/nl_NL/common.ron +++ b/assets/voxygen/i18n/nl_NL/common.ron @@ -53,7 +53,7 @@ Is je client nog up to date?"#, "common.species.human": "Mens", "common.species.dwarf": "Dwerg", "common.species.elf": "Elf", - "common.species.undead": "Ondood", + "common.species.draugr": "Ondood", "common.species.danari": "Danari", "common.weapons.axe": "Bijl", diff --git a/assets/voxygen/i18n/no_NB/common.ron b/assets/voxygen/i18n/no_NB/common.ron index aec357f32a..c8bfeffe64 100644 --- a/assets/voxygen/i18n/no_NB/common.ron +++ b/assets/voxygen/i18n/no_NB/common.ron @@ -53,7 +53,7 @@ Har det kommet nye oppdateringer?"#, "common.species.human": "Menneske", "common.species.dwarf": "Dverg", "common.species.elf": "Alv", - "common.species.undead": "Udødelig", + "common.species.draugr": "Udødelig", "common.species.danari": "Danari", "common.weapons.axe": "Øks", diff --git a/assets/voxygen/i18n/pl_PL/common.ron b/assets/voxygen/i18n/pl_PL/common.ron index d5a10d4c41..a173eee77a 100644 --- a/assets/voxygen/i18n/pl_PL/common.ron +++ b/assets/voxygen/i18n/pl_PL/common.ron @@ -59,7 +59,7 @@ Czy masz aktualną wersję gry?"#, "common.species.human": "Człowiek", "common.species.dwarf": "Krasnolud", "common.species.elf": "Elf", - "common.species.undead": "Nieumarły", + "common.species.draugr": "Nieumarły", "common.species.danari": "Danari", "common.weapons.axe": "Siekiera", diff --git a/assets/voxygen/i18n/pt_BR/common.ron b/assets/voxygen/i18n/pt_BR/common.ron index 2c3ae76ce4..24f153f9e3 100644 --- a/assets/voxygen/i18n/pt_BR/common.ron +++ b/assets/voxygen/i18n/pt_BR/common.ron @@ -59,7 +59,7 @@ O cliente está atualizado?"#, "common.species.human": "Humano", "common.species.dwarf": "Anão", "common.species.elf": "Elfo", - "common.species.undead": "Morto-vivo", + "common.species.draugr": "Morto-vivo", "common.species.danari": "Danari", "common.weapons.axe": "Machado", diff --git a/assets/voxygen/i18n/pt_PT/common.ron b/assets/voxygen/i18n/pt_PT/common.ron index e9848f546a..e20033a113 100644 --- a/assets/voxygen/i18n/pt_PT/common.ron +++ b/assets/voxygen/i18n/pt_PT/common.ron @@ -41,7 +41,7 @@ O cliente está atualizado?"#, "common.species.human": "Humano", "common.species.dwarf": "Anão", "common.species.elf": "Elfo", - "common.species.undead": "Morto-vivo", + "common.species.draugr": "Morto-vivo", "common.species.danari": "Danari", "common.weapons.axe": "Machado", diff --git a/assets/voxygen/i18n/ru_RU/common.ron b/assets/voxygen/i18n/ru_RU/common.ron index ad308f0957..501cb5c674 100644 --- a/assets/voxygen/i18n/ru_RU/common.ron +++ b/assets/voxygen/i18n/ru_RU/common.ron @@ -59,7 +59,7 @@ "common.species.human": "Человек", "common.species.dwarf": "Дворф", "common.species.elf": "Эльф", - "common.species.undead": "Нежить", + "common.species.draugr": "Нежить", "common.species.danari": "Данари", "common.weapons.axe": "Топор", diff --git a/assets/voxygen/i18n/sr_SR/common.ron b/assets/voxygen/i18n/sr_SR/common.ron index 544d10ea43..9ad9ce5bed 100644 --- a/assets/voxygen/i18n/sr_SR/common.ron +++ b/assets/voxygen/i18n/sr_SR/common.ron @@ -57,7 +57,7 @@ "common.species.human": "Човек", "common.species.dwarf": "патуљак", "common.species.elf": "Вилењак", - "common.species.undead": "Мртвац", + "common.species.draugr": "Мртвац", "common.species.danari": "Данари", "common.weapons.axe": "Секира", diff --git a/assets/voxygen/i18n/sv_SE/common.ron b/assets/voxygen/i18n/sv_SE/common.ron index c3d5c05ca8..44520bcefc 100644 --- a/assets/voxygen/i18n/sv_SE/common.ron +++ b/assets/voxygen/i18n/sv_SE/common.ron @@ -59,7 +59,7 @@ Startade servern om? "common.species.human": "Människa", "common.species.dwarf": "Dvärg", "common.species.elf": "Alv", - "common.species.undead": "Odöd", + "common.species.draugr": "Odöd", "common.species.danari": "Danari", "common.weapons.axe": "Yxa", diff --git a/assets/voxygen/i18n/th_TH/common.ron b/assets/voxygen/i18n/th_TH/common.ron index 913fb126e4..cbcf706f22 100644 --- a/assets/voxygen/i18n/th_TH/common.ron +++ b/assets/voxygen/i18n/th_TH/common.ron @@ -59,7 +59,7 @@ "common.species.human": "มนุษย์", "common.species.dwarf": "คนแคระ", "common.species.elf": "เอลฟ์", - "common.species.undead": "ภูตผี", + "common.species.draugr": "ภูตผี", "common.species.danari": "ดานาริ", "common.weapons.axe": "ขวาน", diff --git a/assets/voxygen/i18n/tr_TR/common.ron b/assets/voxygen/i18n/tr_TR/common.ron index c30b4e22b0..7e61bfb44d 100644 --- a/assets/voxygen/i18n/tr_TR/common.ron +++ b/assets/voxygen/i18n/tr_TR/common.ron @@ -57,7 +57,7 @@ Sunucu yeniden mi başladı? "common.species.human": "İnsan", "common.species.dwarf": "Cüce", "common.species.elf": "Elf", - "common.species.undead": "Hortlak", + "common.species.draugr": "Hortlak", "common.species.danari": "Danari", "common.weapons.axe": "Balta", diff --git a/assets/voxygen/i18n/uk_UA/common.ron b/assets/voxygen/i18n/uk_UA/common.ron index 2ddc16c2dd..291db2ecb5 100644 --- a/assets/voxygen/i18n/uk_UA/common.ron +++ b/assets/voxygen/i18n/uk_UA/common.ron @@ -96,7 +96,7 @@ "common.species.human": "Людина", "common.species.dwarf": "Дварф", "common.species.elf": "Ельф", - "common.species.undead": "Нежить", + "common.species.draugr": "Нежить", "common.species.danari": "Данарі", // Stats diff --git a/assets/voxygen/i18n/vi_VI/common.ron b/assets/voxygen/i18n/vi_VI/common.ron index fa0ef9c8cd..28997dd7ef 100644 --- a/assets/voxygen/i18n/vi_VI/common.ron +++ b/assets/voxygen/i18n/vi_VI/common.ron @@ -57,7 +57,7 @@ Trò chơi có được cập nhật không?"#, "common.species.human": "Loài người", "common.species.dwarf": "Người lùn", "common.species.elf": "Yêu tinh", - "common.species.undead": "Xác sống", + "common.species.draugr": "Xác sống", "common.species.danari": "Loài Danari", "common.weapons.axe": "Rìu", diff --git a/assets/voxygen/i18n/zh_CN/common.ron b/assets/voxygen/i18n/zh_CN/common.ron index f84afd5f59..d4af06041c 100644 --- a/assets/voxygen/i18n/zh_CN/common.ron +++ b/assets/voxygen/i18n/zh_CN/common.ron @@ -55,7 +55,7 @@ "common.species.human": "人类", "common.species.dwarf": "矮人", "common.species.elf": "精灵", - "common.species.undead": "亡灵", + "common.species.draugr": "亡灵", "common.species.danari": "丹那利", "common.weapons.axe": "斧", diff --git a/assets/voxygen/i18n/zh_TW/common.ron b/assets/voxygen/i18n/zh_TW/common.ron index f1c412f57d..935c2e67f5 100644 --- a/assets/voxygen/i18n/zh_TW/common.ron +++ b/assets/voxygen/i18n/zh_TW/common.ron @@ -41,7 +41,7 @@ "common.races.human": "人類", "common.races.dwarf": "矮人", "common.races.elf": "精靈", - "common.races.undead": "不死族", + "common.races.draugr": "不死族", "common.races.danari": "丹那利", "common.weapons.axe": "斧", diff --git a/assets/voxygen/voxel/figure/accessory/danari/horns-0.vox b/assets/voxygen/voxel/figure/accessory/danari/horns-0.vox old mode 100644 new mode 100755 index 8b74f40935..7cc9f2aa1c --- a/assets/voxygen/voxel/figure/accessory/danari/horns-0.vox +++ b/assets/voxygen/voxel/figure/accessory/danari/horns-0.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e27bd3211ad3c0fca466a16297e37cd35b7118f8da2299e4b01ac36a5ad5f888 +oid sha256:d05e74f45fda88dbc33a763816a84725fa68903c0bd56c2cd48a712c7da1f805 size 1136 diff --git a/assets/voxygen/voxel/figure/accessory/danari/horns-1.vox b/assets/voxygen/voxel/figure/accessory/danari/horns-1.vox old mode 100644 new mode 100755 index a6163f3f26..06893d41d4 --- a/assets/voxygen/voxel/figure/accessory/danari/horns-1.vox +++ b/assets/voxygen/voxel/figure/accessory/danari/horns-1.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:470bf81884e9fd52cd9c03596aeedcccc40865e068d3d88a5f2dba8e6c29af45 -size 1144 +oid sha256:2625fedbc3f4b7a37a417f0bb328784858d311c490839975718bb75542fc2af2 +size 1184 diff --git a/assets/voxygen/voxel/figure/accessory/danari/horns-2.vox b/assets/voxygen/voxel/figure/accessory/danari/horns-2.vox old mode 100644 new mode 100755 index ca5b2f4027..8ae8de37b9 --- a/assets/voxygen/voxel/figure/accessory/danari/horns-2.vox +++ b/assets/voxygen/voxel/figure/accessory/danari/horns-2.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6587e8c401fc4c24eef6a887e88a63a47f73b88d1165bdbab22fc9b26d4d6f41 -size 1248 +oid sha256:8f79472525f4bfd67e195428cdd33bc796452d42686dfaeb853f4638438f53df +size 1280 diff --git a/assets/voxygen/voxel/figure/accessory/danari/horns-3.vox b/assets/voxygen/voxel/figure/accessory/danari/horns-3.vox old mode 100644 new mode 100755 index dee31bb785..2cab7b242a --- a/assets/voxygen/voxel/figure/accessory/danari/horns-3.vox +++ b/assets/voxygen/voxel/figure/accessory/danari/horns-3.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d3e40e28fc82e16a88063336263b97e63d8b8c1209236253c6c025ed47a00577 +oid sha256:d8a67251a68d6df92e7014f83b9522afc4dac489b200cbcb908e5637dc3384fc size 1104 diff --git a/assets/voxygen/voxel/figure/accessory/danari/horns-4.vox b/assets/voxygen/voxel/figure/accessory/danari/horns-4.vox old mode 100644 new mode 100755 index 9c040cf8fb..0e363ff89e --- a/assets/voxygen/voxel/figure/accessory/danari/horns-4.vox +++ b/assets/voxygen/voxel/figure/accessory/danari/horns-4.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0c7d185488018d870907d28fd9875e71dcdef84860c51e1d0776a09773dbdca5 -size 1136 +oid sha256:2c484f7087af31f35fe5d1b7bfc6f184282ef9749baa08c07e57a37a66de4486 +size 1208 diff --git a/assets/voxygen/voxel/figure/accessory/danari/horns-5.vox b/assets/voxygen/voxel/figure/accessory/danari/horns-5.vox old mode 100644 new mode 100755 index 1d8abafc6b..f9f04a5c90 --- a/assets/voxygen/voxel/figure/accessory/danari/horns-5.vox +++ b/assets/voxygen/voxel/figure/accessory/danari/horns-5.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:24aef6d558e7715b495fb682a2fa477bc13fb1182c1751677afd4fc2c726676c -size 1224 +oid sha256:d47abd943566e1bad883d5116baac92be332dbbcf016a822526015586addeb35 +size 1248 diff --git a/assets/voxygen/voxel/figure/accessory/danari/horns-6.vox b/assets/voxygen/voxel/figure/accessory/danari/horns-6.vox old mode 100644 new mode 100755 index 0c40d35715..7d7562ac5e --- a/assets/voxygen/voxel/figure/accessory/danari/horns-6.vox +++ b/assets/voxygen/voxel/figure/accessory/danari/horns-6.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1ee0a26c27208bac2df6e0f56897683ac448e13c78f00594eab9ff1391505c73 -size 1152 +oid sha256:2d0cfb3503ee7529acad066e3b6520709a14a56388cb41c013e427ab3c23bdfb +size 1176 diff --git a/assets/voxygen/voxel/figure/accessory/draugr/female_eyepatch.vox b/assets/voxygen/voxel/figure/accessory/draugr/female_eyepatch.vox new file mode 100755 index 0000000000..e35e8e95f6 --- /dev/null +++ b/assets/voxygen/voxel/figure/accessory/draugr/female_eyepatch.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:959a4f73e090b907f8f5e57fe4b94f12ec60d56f0a3dfbdc9bea16eb641ba6c7 +size 1216 diff --git a/assets/voxygen/voxel/figure/accessory/draugr/male_eyepatch.vox b/assets/voxygen/voxel/figure/accessory/draugr/male_eyepatch.vox new file mode 100755 index 0000000000..f4bb642ef8 --- /dev/null +++ b/assets/voxygen/voxel/figure/accessory/draugr/male_eyepatch.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:65fd8bac869ec2937b287674c3e820272c5062397797a141275862e198fb0882 +size 1216 diff --git a/assets/voxygen/voxel/figure/accessory/elf/earrings-0.vox b/assets/voxygen/voxel/figure/accessory/elf/earrings-0.vox new file mode 100755 index 0000000000..77324b38a4 --- /dev/null +++ b/assets/voxygen/voxel/figure/accessory/elf/earrings-0.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5cb40b772249e685d7823379daeabab2b21e424de89f05ff1e8d3ff480879b9b +size 1112 diff --git a/assets/voxygen/voxel/figure/accessory/elf/earrings-1.vox b/assets/voxygen/voxel/figure/accessory/elf/earrings-1.vox new file mode 100755 index 0000000000..5b1001f234 --- /dev/null +++ b/assets/voxygen/voxel/figure/accessory/elf/earrings-1.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3fe7dfbacf79827dd346003de23e8f81d61998101f05db8c0f1c58c3ab7bc6be +size 1112 diff --git a/assets/voxygen/voxel/figure/accessory/elf/earrings-2.vox b/assets/voxygen/voxel/figure/accessory/elf/earrings-2.vox new file mode 100755 index 0000000000..404c161385 --- /dev/null +++ b/assets/voxygen/voxel/figure/accessory/elf/earrings-2.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e2e7aadeca3e64b54bbcd15f5be38d72f027f0a927d550be4aa643575e32a578 +size 1112 diff --git a/assets/voxygen/voxel/figure/accessory/elf/earrings-3.vox b/assets/voxygen/voxel/figure/accessory/elf/earrings-3.vox new file mode 100755 index 0000000000..40b1bf814a --- /dev/null +++ b/assets/voxygen/voxel/figure/accessory/elf/earrings-3.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4ceabf5a49b19ad79243bdf2e15914da76e207b427ab636cbe5a381e9a4b4af0 +size 1120 diff --git a/assets/voxygen/voxel/figure/accessory/orc/earring-female-0.vox b/assets/voxygen/voxel/figure/accessory/orc/earring-female-0.vox old mode 100644 new mode 100755 index 23615fc3f8..b183565e94 --- a/assets/voxygen/voxel/figure/accessory/orc/earring-female-0.vox +++ b/assets/voxygen/voxel/figure/accessory/orc/earring-female-0.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6355cd59e15dab5e9f634faa080562cdd7397239f04c2a9b575bd6b856843ac8 +oid sha256:3ed6752009f9cfe437189218b3ab56a87ea2e3e33f2fb9843a3dcf75cf06e8ce size 1100 diff --git a/assets/voxygen/voxel/figure/accessory/orc/earring-female-1.vox b/assets/voxygen/voxel/figure/accessory/orc/earring-female-1.vox new file mode 100755 index 0000000000..cf79f16999 --- /dev/null +++ b/assets/voxygen/voxel/figure/accessory/orc/earring-female-1.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cc47fe1db0870af73c2d2137fe6ba5deb699d1c4945ab835295767434c075fa6 +size 1104 diff --git a/assets/voxygen/voxel/figure/accessory/orc/earring-female-2.vox b/assets/voxygen/voxel/figure/accessory/orc/earring-female-2.vox new file mode 100755 index 0000000000..fdc9750930 --- /dev/null +++ b/assets/voxygen/voxel/figure/accessory/orc/earring-female-2.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9d385045a6e5e375cdc71cf3c38fee94701b8ec1dc74e1c3af078a89f556fc5b +size 1120 diff --git a/assets/voxygen/voxel/figure/accessory/orc/earring-female-3.vox b/assets/voxygen/voxel/figure/accessory/orc/earring-female-3.vox new file mode 100755 index 0000000000..87ed4057a9 --- /dev/null +++ b/assets/voxygen/voxel/figure/accessory/orc/earring-female-3.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d147c960a8e12af0546cab3948babe46e5b2088ceb00eb4d2a9e58e464c9f6b1 +size 1128 diff --git a/assets/voxygen/voxel/figure/accessory/orc/earring-male-1.vox b/assets/voxygen/voxel/figure/accessory/orc/earring-male-1.vox new file mode 100755 index 0000000000..b91a6f3dbe --- /dev/null +++ b/assets/voxygen/voxel/figure/accessory/orc/earring-male-1.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c9a3236a0b78282da6c86ae561deeecd9bf0ab1bcb2704dae747e9b4d58febd7 +size 1112 diff --git a/assets/voxygen/voxel/figure/accessory/orc/earring-male-2.vox b/assets/voxygen/voxel/figure/accessory/orc/earring-male-2.vox new file mode 100755 index 0000000000..b8278d46e5 --- /dev/null +++ b/assets/voxygen/voxel/figure/accessory/orc/earring-male-2.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7009804e24cbb180981ff78bc4b6e1bfb157a84d7eda6dbaf45a6b0e64f6a516 +size 1128 diff --git a/assets/voxygen/voxel/figure/accessory/orc/teeth-3.vox b/assets/voxygen/voxel/figure/accessory/orc/teeth-3.vox new file mode 100755 index 0000000000..eba84170ff --- /dev/null +++ b/assets/voxygen/voxel/figure/accessory/orc/teeth-3.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f8837bb17c49dfd2899a977d563b4bfc2f2c53ae0ad0c445553497f265df7b2f +size 1120 diff --git a/assets/voxygen/voxel/figure/accessory/orc/warpaint-female-0.vox b/assets/voxygen/voxel/figure/accessory/orc/warpaint-female-0.vox old mode 100644 new mode 100755 index 5199d3841b..14d1b230a8 --- a/assets/voxygen/voxel/figure/accessory/orc/warpaint-female-0.vox +++ b/assets/voxygen/voxel/figure/accessory/orc/warpaint-female-0.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:635b1dfa3868c780910d235aa467ce821a78fd0c04e116089cd33ba86ad80e65 +oid sha256:edee573319fea1f591d5df34596e7db4c1526b7f46c1a8a0929c9e92f824749d size 1164 diff --git a/assets/voxygen/voxel/figure/accessory/orc/warpaint-female-1.vox b/assets/voxygen/voxel/figure/accessory/orc/warpaint-female-1.vox old mode 100644 new mode 100755 index 2cfe197670..22d033231e --- a/assets/voxygen/voxel/figure/accessory/orc/warpaint-female-1.vox +++ b/assets/voxygen/voxel/figure/accessory/orc/warpaint-female-1.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:eed5f71dde24d04a5584c3d8103515a897c2bbf6fdfcfd00646d99337a2524f2 +oid sha256:65ce3058ce41586448afe35362a83939693128e2fa00ae9f9271e21a2d837957 size 1120 diff --git a/assets/voxygen/voxel/figure/accessory/orc/warpaint-female-2.vox b/assets/voxygen/voxel/figure/accessory/orc/warpaint-female-2.vox new file mode 100644 index 0000000000..a44cda50e8 --- /dev/null +++ b/assets/voxygen/voxel/figure/accessory/orc/warpaint-female-2.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ea95f5e06a3bf3302b79d3963f96b348649777b6b71ffd0fe91b462dde9b2fcd +size 1208 diff --git a/assets/voxygen/voxel/figure/accessory/orc/warpaint-female-3.vox b/assets/voxygen/voxel/figure/accessory/orc/warpaint-female-3.vox new file mode 100755 index 0000000000..cc51039df7 --- /dev/null +++ b/assets/voxygen/voxel/figure/accessory/orc/warpaint-female-3.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:89972b0ac9091e8d47cc6697fa757c6460206a206009c399f9caca35a10664ef +size 1192 diff --git a/assets/voxygen/voxel/figure/accessory/orc/warpaint-male-0.vox b/assets/voxygen/voxel/figure/accessory/orc/warpaint-male-0.vox old mode 100644 new mode 100755 index e21855128a..ce1da6c969 --- a/assets/voxygen/voxel/figure/accessory/orc/warpaint-male-0.vox +++ b/assets/voxygen/voxel/figure/accessory/orc/warpaint-male-0.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:aaac3c35679745cb25a918857779379df8d800041f2803f72fbef08b65a584b5 -size 1264 +oid sha256:8eb200c4ffcdb5ef06be271109af61a9b8b61479a1fc16631d9a1191b26637b4 +size 1244 diff --git a/assets/voxygen/voxel/figure/accessory/orc/warpaint-male-1.vox b/assets/voxygen/voxel/figure/accessory/orc/warpaint-male-1.vox new file mode 100755 index 0000000000..d7114645a4 --- /dev/null +++ b/assets/voxygen/voxel/figure/accessory/orc/warpaint-male-1.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7e284f902c0cf12c3ec238280d0a18042a43e445a3e1be64314f822ef413b52e +size 1296 diff --git a/assets/voxygen/voxel/figure/accessory/orc/warpaint-male-2.vox b/assets/voxygen/voxel/figure/accessory/orc/warpaint-male-2.vox new file mode 100755 index 0000000000..6f5ba45c79 --- /dev/null +++ b/assets/voxygen/voxel/figure/accessory/orc/warpaint-male-2.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fca14bd51b11fd04dd3681c48134c171e3a5889145588382008889b23e9df853 +size 1260 diff --git a/assets/voxygen/voxel/figure/accessory/orc/warpaint-male-3.vox b/assets/voxygen/voxel/figure/accessory/orc/warpaint-male-3.vox new file mode 100755 index 0000000000..122c017bc6 --- /dev/null +++ b/assets/voxygen/voxel/figure/accessory/orc/warpaint-male-3.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:aa2f0d12cfa90549e7e465aaa3e489757f64b843171d4c225ac86b8b60afbf08 +size 1272 diff --git a/assets/voxygen/voxel/figure/accessory/undead/female_eyepatch.vox b/assets/voxygen/voxel/figure/accessory/undead/female_eyepatch.vox deleted file mode 100644 index ea5af4024e..0000000000 --- a/assets/voxygen/voxel/figure/accessory/undead/female_eyepatch.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7729c594f1f83fa8952827dfea766a6052ef191ee1c36fb30a01b1375ebab540 -size 1224 diff --git a/assets/voxygen/voxel/figure/accessory/undead/male_eyepatch.vox b/assets/voxygen/voxel/figure/accessory/undead/male_eyepatch.vox deleted file mode 100644 index 5ed9d52354..0000000000 --- a/assets/voxygen/voxel/figure/accessory/undead/male_eyepatch.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:922d12840831ac4976e5c1fd6445f67625a39cdf9320961935c3d83dcb94afa1 -size 1192 diff --git a/assets/voxygen/voxel/figure/beard/danari/danari-0.vox b/assets/voxygen/voxel/figure/beard/danari/danari-0.vox old mode 100644 new mode 100755 index 349356722f..7ed225ea65 --- a/assets/voxygen/voxel/figure/beard/danari/danari-0.vox +++ b/assets/voxygen/voxel/figure/beard/danari/danari-0.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:89121d3f2158974a75bc8f8264272bfa7756f7f0b1cc3805cd62c349a4a0110f -size 1304 +oid sha256:82a2ed00c3874cdfa14e26e70d1df9a007bd53d533b16d9fe1c03a24df167bf3 +size 1312 diff --git a/assets/voxygen/voxel/figure/beard/danari/danari-1.vox b/assets/voxygen/voxel/figure/beard/danari/danari-1.vox old mode 100644 new mode 100755 index b94aa29f2a..73d34d15d7 --- a/assets/voxygen/voxel/figure/beard/danari/danari-1.vox +++ b/assets/voxygen/voxel/figure/beard/danari/danari-1.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0b005ed22896af3c07b323253ad3944fd925f19f019119f287f15944dcfe8331 -size 1376 +oid sha256:f1055380ee8cb55cbb4807039f92f7a12ef19d30a24ac7a67a6681c1f845cc83 +size 1304 diff --git a/assets/voxygen/voxel/figure/beard/danari/danari-10.vox b/assets/voxygen/voxel/figure/beard/danari/danari-10.vox old mode 100644 new mode 100755 index 5a774ab499..e4b1251869 --- a/assets/voxygen/voxel/figure/beard/danari/danari-10.vox +++ b/assets/voxygen/voxel/figure/beard/danari/danari-10.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:90b2c6b1c92691454f9fb491255f600a4e740872b110207b687a6f628c15f745 -size 1504 +oid sha256:58f67ecf1e69d17b4b5df64248f6219b801f23ebea4108e759b90915e8c21b71 +size 1528 diff --git a/assets/voxygen/voxel/figure/beard/danari/danari-11.vox b/assets/voxygen/voxel/figure/beard/danari/danari-11.vox old mode 100644 new mode 100755 index f51fa6ee5b..2a2682508f --- a/assets/voxygen/voxel/figure/beard/danari/danari-11.vox +++ b/assets/voxygen/voxel/figure/beard/danari/danari-11.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ab857cffd5f157ca5e443af2877c2fabd3ee2f95b1df870f061a8e788bb04ee9 -size 1640 +oid sha256:fa93a9f73b17edfc88f5eab203be40fd0c60a5b85a0c82c6f4c65c197f5be625 +size 1464 diff --git a/assets/voxygen/voxel/figure/beard/danari/danari-12.vox b/assets/voxygen/voxel/figure/beard/danari/danari-12.vox old mode 100644 new mode 100755 index 31db774e58..67c747546c --- a/assets/voxygen/voxel/figure/beard/danari/danari-12.vox +++ b/assets/voxygen/voxel/figure/beard/danari/danari-12.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9e0a3b287e0248ac91080ebf5de54918571c8cfb1b81fc9db2bd861c15c10e8d +oid sha256:108df7563dea85bdfcfe03ee81a20b711017655ebe2bade259757ebe9ae98345 size 1240 diff --git a/assets/voxygen/voxel/figure/beard/danari/danari-13.vox b/assets/voxygen/voxel/figure/beard/danari/danari-13.vox old mode 100644 new mode 100755 index 53e8761f90..7ec208fb22 --- a/assets/voxygen/voxel/figure/beard/danari/danari-13.vox +++ b/assets/voxygen/voxel/figure/beard/danari/danari-13.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a0068f185e10373f7ea1d5a859c225f76df6b0286d2b26227f030004f6838818 -size 1136 +oid sha256:61391162bdcf3e4a70e945868b85a863937f73f632d47215d3ec076076a3e2cd +size 1160 diff --git a/assets/voxygen/voxel/figure/beard/danari/danari-14.vox b/assets/voxygen/voxel/figure/beard/danari/danari-14.vox old mode 100644 new mode 100755 index 4340553061..dee944ea7c --- a/assets/voxygen/voxel/figure/beard/danari/danari-14.vox +++ b/assets/voxygen/voxel/figure/beard/danari/danari-14.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:447634647c2a3df55b91a052d5a6f1ebc733dcbf974ae4400774c0be5acac2ed -size 1280 +oid sha256:b4e225834e3a47355707923190a6da81c10387200f56e94d86801036c642d289 +size 1128 diff --git a/assets/voxygen/voxel/figure/beard/danari/danari-2.vox b/assets/voxygen/voxel/figure/beard/danari/danari-2.vox old mode 100644 new mode 100755 index 8fdfd5a782..33e07df624 --- a/assets/voxygen/voxel/figure/beard/danari/danari-2.vox +++ b/assets/voxygen/voxel/figure/beard/danari/danari-2.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d16cf4dfc97b7e3443cc04782aa0e2289955c5e8775b8a2c86ec024bea0103f4 -size 1156 +oid sha256:573cb3acc85bf9cf1085065ee4d8be52cdb660d4a581e49ab909a53247151c34 +size 1176 diff --git a/assets/voxygen/voxel/figure/beard/danari/danari-3.vox b/assets/voxygen/voxel/figure/beard/danari/danari-3.vox old mode 100644 new mode 100755 index ead51c9c56..a6be8f011b --- a/assets/voxygen/voxel/figure/beard/danari/danari-3.vox +++ b/assets/voxygen/voxel/figure/beard/danari/danari-3.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:524901dd96aefaecbc687273407d4cd3fc26a9be5de41eb326071793aa56e193 -size 1592 +oid sha256:3c2c4ca0776ab17a8bbfd4ed62911b7c101fef5884d4ace0c62dc7171d477be3 +size 1456 diff --git a/assets/voxygen/voxel/figure/beard/danari/danari-4.vox b/assets/voxygen/voxel/figure/beard/danari/danari-4.vox old mode 100644 new mode 100755 index 38e960015c..29f0839fc0 --- a/assets/voxygen/voxel/figure/beard/danari/danari-4.vox +++ b/assets/voxygen/voxel/figure/beard/danari/danari-4.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d2e96b0c543ca3c14c0511073b3ce384bd8ceb41557a44fc2c960b1b1b6f9ed0 -size 1680 +oid sha256:c3b42277dae024874d0f1164902b3a63e22fa80103ef918d02117fd980737311 +size 1424 diff --git a/assets/voxygen/voxel/figure/beard/danari/danari-5.vox b/assets/voxygen/voxel/figure/beard/danari/danari-5.vox old mode 100644 new mode 100755 index 37e30b75a6..5a8f1316e9 --- a/assets/voxygen/voxel/figure/beard/danari/danari-5.vox +++ b/assets/voxygen/voxel/figure/beard/danari/danari-5.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1224a5567a1350e8f9c7320e7d6764ce6e7a895dc3cb1b2364c85e66e6d035ec -size 1160 +oid sha256:a94b15b8f84dace60140bfeb22371fc675707fd8721895aebcfda216da648c3b +size 1248 diff --git a/assets/voxygen/voxel/figure/beard/danari/danari-6.vox b/assets/voxygen/voxel/figure/beard/danari/danari-6.vox old mode 100644 new mode 100755 index 82408242a1..fd18df54ad --- a/assets/voxygen/voxel/figure/beard/danari/danari-6.vox +++ b/assets/voxygen/voxel/figure/beard/danari/danari-6.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d702178d25d04a4c2610eabf74c5e242578ae15b403539df0740c39ec01b798b -size 1232 +oid sha256:ff11d3e5bae0640d45131ef18b1c4501a387b1462479b9cf5b473f1ccb2850bb +size 1216 diff --git a/assets/voxygen/voxel/figure/beard/danari/danari-7.vox b/assets/voxygen/voxel/figure/beard/danari/danari-7.vox old mode 100644 new mode 100755 index 0b69eb7f13..1eb63dc902 --- a/assets/voxygen/voxel/figure/beard/danari/danari-7.vox +++ b/assets/voxygen/voxel/figure/beard/danari/danari-7.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:97b5dfd7d3ec6b4d59ee475d3144d5bf4d69c5fefcf1c6051abcdfae739df512 -size 1512 +oid sha256:1f5bf4ead86eeb24b8e7e39bcb2af1cb0ce227b7d6cb1177bfbce3612972c636 +size 1472 diff --git a/assets/voxygen/voxel/figure/beard/danari/danari-8.vox b/assets/voxygen/voxel/figure/beard/danari/danari-8.vox old mode 100644 new mode 100755 index 9a4455a927..4c123bd8db --- a/assets/voxygen/voxel/figure/beard/danari/danari-8.vox +++ b/assets/voxygen/voxel/figure/beard/danari/danari-8.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b2e909af2704b63f26d88849307ce3f0ee4ba8bf74304169296ff1653c2ae7ac -size 1744 +oid sha256:e66299c8f0b3bd19eb94e937dbfc6fecb37c08cf50318a621391bcfb12e69d3c +size 1536 diff --git a/assets/voxygen/voxel/figure/beard/danari/danari-9.vox b/assets/voxygen/voxel/figure/beard/danari/danari-9.vox old mode 100644 new mode 100755 index a9bd87f839..9e93b94b75 --- a/assets/voxygen/voxel/figure/beard/danari/danari-9.vox +++ b/assets/voxygen/voxel/figure/beard/danari/danari-9.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:31da18b778397f4cd0d978588c9ccceebf5e194205235ebbd83d9f741662cacd -size 1808 +oid sha256:bc1c0302d1fb4a73b64f629d9070f891e7b9564b994903d7a082e27dc80bfc73 +size 1584 diff --git a/assets/voxygen/voxel/figure/beard/draugr/male-0.vox b/assets/voxygen/voxel/figure/beard/draugr/male-0.vox new file mode 100755 index 0000000000..3d393abefa --- /dev/null +++ b/assets/voxygen/voxel/figure/beard/draugr/male-0.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7d2a6ed93c348ccdd2ece9a88d0f7af3e4baf4af93694ec8f91f2e226b11aa7c +size 1196 diff --git a/assets/voxygen/voxel/figure/beard/draugr/male-1.vox b/assets/voxygen/voxel/figure/beard/draugr/male-1.vox new file mode 100755 index 0000000000..8430773cf6 --- /dev/null +++ b/assets/voxygen/voxel/figure/beard/draugr/male-1.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8f50a816fa2be74a6f53e354c2ec642b552ded469b0db17c42238e4867a81205 +size 1276 diff --git a/assets/voxygen/voxel/figure/beard/draugr/male-2.vox b/assets/voxygen/voxel/figure/beard/draugr/male-2.vox new file mode 100755 index 0000000000..496eb62913 --- /dev/null +++ b/assets/voxygen/voxel/figure/beard/draugr/male-2.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9864e415ca9eba26e5c9b76bceceb78f93498fca7612606acb879347f003fb0b +size 1116 diff --git a/assets/voxygen/voxel/figure/beard/draugr/male-3.vox b/assets/voxygen/voxel/figure/beard/draugr/male-3.vox new file mode 100755 index 0000000000..5c04fce51a --- /dev/null +++ b/assets/voxygen/voxel/figure/beard/draugr/male-3.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8d6b759bea8768d3dcfc75d5854d76d873cef2c67d4fd1378caa001d3769e339 +size 1360 diff --git a/assets/voxygen/voxel/figure/beard/draugr/male-4.vox b/assets/voxygen/voxel/figure/beard/draugr/male-4.vox new file mode 100755 index 0000000000..4b511c4795 --- /dev/null +++ b/assets/voxygen/voxel/figure/beard/draugr/male-4.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e48cee32db9c611db77c030a3cd1109e751ed615ed900f97a65130afa79cb58f +size 1176 diff --git a/assets/voxygen/voxel/figure/beard/dwarf/dwarf-0.vox b/assets/voxygen/voxel/figure/beard/dwarf/dwarf-0.vox old mode 100644 new mode 100755 index 06e48e1dd7..726b1917ae --- a/assets/voxygen/voxel/figure/beard/dwarf/dwarf-0.vox +++ b/assets/voxygen/voxel/figure/beard/dwarf/dwarf-0.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5a78f9c73a5de56e1eab202b448737cd9ac1b6450a23285d83b59d0065395340 -size 1152 +oid sha256:069cc92294c4b4d0e3e9fa0541dbc6a7b7db1f9b6b854912419f07e53dd2af1e +size 1168 diff --git a/assets/voxygen/voxel/figure/beard/dwarf/dwarf-1.vox b/assets/voxygen/voxel/figure/beard/dwarf/dwarf-1.vox old mode 100644 new mode 100755 index 1077c4311f..594aaa1d65 --- a/assets/voxygen/voxel/figure/beard/dwarf/dwarf-1.vox +++ b/assets/voxygen/voxel/figure/beard/dwarf/dwarf-1.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1b9f2e9facd32e4270d604b6fbd060dde7f94c53ef481a28a6817400d1888fc4 -size 1384 +oid sha256:bc13561cfa6b10fa25269b9058cccde9f1fed321dd4c5214b42bd5ed2069e569 +size 1400 diff --git a/assets/voxygen/voxel/figure/beard/dwarf/dwarf-10.vox b/assets/voxygen/voxel/figure/beard/dwarf/dwarf-10.vox old mode 100644 new mode 100755 index fee7e6aeb7..15a892b338 --- a/assets/voxygen/voxel/figure/beard/dwarf/dwarf-10.vox +++ b/assets/voxygen/voxel/figure/beard/dwarf/dwarf-10.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:58e8369fcf98d22b1008eaf53ca9151041bfbd5d1a9ed9782cb3db769d1464cd -size 1216 +oid sha256:08c5b0e1c9a40a0b5f24a3eedf4f4bd9494dfe8904b23a58d4108117a46d8eff +size 1352 diff --git a/assets/voxygen/voxel/figure/beard/dwarf/dwarf-11.vox b/assets/voxygen/voxel/figure/beard/dwarf/dwarf-11.vox old mode 100644 new mode 100755 index d7e7cba495..cffb8322f9 --- a/assets/voxygen/voxel/figure/beard/dwarf/dwarf-11.vox +++ b/assets/voxygen/voxel/figure/beard/dwarf/dwarf-11.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c9e5060691cd8aa7cf6fcb7f15ea4e349eb63b9f2c8969ecf3a1e84fc1988e8b -size 1112 +oid sha256:389e0508882603b5efd80acdccd8e5e92b49f515e17ad48071d2387e052167ca +size 1416 diff --git a/assets/voxygen/voxel/figure/beard/dwarf/dwarf-12.vox b/assets/voxygen/voxel/figure/beard/dwarf/dwarf-12.vox old mode 100644 new mode 100755 index b1acab0aae..686f5f80b8 --- a/assets/voxygen/voxel/figure/beard/dwarf/dwarf-12.vox +++ b/assets/voxygen/voxel/figure/beard/dwarf/dwarf-12.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ea2e1e778a36f554b8cad25919baaee70685641079b479b28fe122dd86419f7e -size 1248 +oid sha256:c70e93b729b76fa582a0c3d1c2e520be1a14167acadb43326878e5656b1569a7 +size 1280 diff --git a/assets/voxygen/voxel/figure/beard/dwarf/dwarf-13.vox b/assets/voxygen/voxel/figure/beard/dwarf/dwarf-13.vox old mode 100644 new mode 100755 index 81974f0b84..b2cfa3f4c3 --- a/assets/voxygen/voxel/figure/beard/dwarf/dwarf-13.vox +++ b/assets/voxygen/voxel/figure/beard/dwarf/dwarf-13.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5ed9973b3f2d2b7e659aaa49d474df061571a5f7986c83de0a671d8946ba0c95 -size 1272 +oid sha256:7f511ac3beea586e2593c1d5bfd17bc5576fd4317cc22d36ddd5c551ce3cc10a +size 1392 diff --git a/assets/voxygen/voxel/figure/beard/dwarf/dwarf-14.vox b/assets/voxygen/voxel/figure/beard/dwarf/dwarf-14.vox old mode 100644 new mode 100755 index 5658855d85..17d5f354a2 --- a/assets/voxygen/voxel/figure/beard/dwarf/dwarf-14.vox +++ b/assets/voxygen/voxel/figure/beard/dwarf/dwarf-14.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6bb5ced957dd009b77338c6c9a377c54e74bc80829f987778ea358d1ad298148 -size 1536 +oid sha256:fd26322b09fb6b6cad4b5b02ce84dd713014e594e1a6dd7bfb8d50f8bd6da637 +size 1572 diff --git a/assets/voxygen/voxel/figure/beard/dwarf/dwarf-15.vox b/assets/voxygen/voxel/figure/beard/dwarf/dwarf-15.vox old mode 100644 new mode 100755 index f0e147b81b..86feadb57c --- a/assets/voxygen/voxel/figure/beard/dwarf/dwarf-15.vox +++ b/assets/voxygen/voxel/figure/beard/dwarf/dwarf-15.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d7c213d67cd905119d6a24d58be1f629ddd5a784a7bd741c5de9b5c01bdd26e2 -size 1760 +oid sha256:7a8488a8dfadec56c0e313eac3291db514c6ac56fbaa7d314453718ccc6c40bf +size 1776 diff --git a/assets/voxygen/voxel/figure/beard/dwarf/dwarf-16.vox b/assets/voxygen/voxel/figure/beard/dwarf/dwarf-16.vox old mode 100644 new mode 100755 index 88a55ebdd2..d58aa3a971 --- a/assets/voxygen/voxel/figure/beard/dwarf/dwarf-16.vox +++ b/assets/voxygen/voxel/figure/beard/dwarf/dwarf-16.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9094a2b9035efa5b8253f64df9b30b79cb1a485bfc247dc9119915750d488c8e -size 1824 +oid sha256:5f05e49fbbce8b5c0c2a54fb74116d3f9edf2bb4ba53448efb688756242512ec +size 1940 diff --git a/assets/voxygen/voxel/figure/beard/dwarf/dwarf-17.vox b/assets/voxygen/voxel/figure/beard/dwarf/dwarf-17.vox old mode 100644 new mode 100755 index 4d35630ce4..7cb99573d2 --- a/assets/voxygen/voxel/figure/beard/dwarf/dwarf-17.vox +++ b/assets/voxygen/voxel/figure/beard/dwarf/dwarf-17.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d2d41a2736dda2f7fbcfc11ff2937b8f908bb6e33b45d18a8360f47296386684 -size 1520 +oid sha256:a4f76711545bbf40508e83343151d2e03eea0d40c921949ed6e91e52b5a341aa +size 1592 diff --git a/assets/voxygen/voxel/figure/beard/dwarf/dwarf-18.vox b/assets/voxygen/voxel/figure/beard/dwarf/dwarf-18.vox old mode 100644 new mode 100755 index 5ece4b7bdb..191ac96472 --- a/assets/voxygen/voxel/figure/beard/dwarf/dwarf-18.vox +++ b/assets/voxygen/voxel/figure/beard/dwarf/dwarf-18.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fae60c3dbcda4404ef89e6fbc09e12c80c85c968ccba1f29e91f14cf4e0665e6 -size 1288 +oid sha256:5b8ba886b4d7240fcce558ca2589f78b842f7c8389ebdc74f50d040fded20a4a +size 1464 diff --git a/assets/voxygen/voxel/figure/beard/dwarf/dwarf-19.vox b/assets/voxygen/voxel/figure/beard/dwarf/dwarf-19.vox old mode 100644 new mode 100755 index f51fa6ee5b..dcf45910bf --- a/assets/voxygen/voxel/figure/beard/dwarf/dwarf-19.vox +++ b/assets/voxygen/voxel/figure/beard/dwarf/dwarf-19.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ab857cffd5f157ca5e443af2877c2fabd3ee2f95b1df870f061a8e788bb04ee9 -size 1640 +oid sha256:00ccd6f98f7e79c17cae64e7841191ad298cba3f6219b394accaf9d0116eb831 +size 1672 diff --git a/assets/voxygen/voxel/figure/beard/dwarf/dwarf-2.vox b/assets/voxygen/voxel/figure/beard/dwarf/dwarf-2.vox old mode 100644 new mode 100755 index d2c6af0edc..e224658329 --- a/assets/voxygen/voxel/figure/beard/dwarf/dwarf-2.vox +++ b/assets/voxygen/voxel/figure/beard/dwarf/dwarf-2.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f03e0d1762b49e99d350c25420822b5c5916888bc3d0783e7f38b610002acbd4 -size 1108 +oid sha256:79969e03b37a6489ac3ec5e49f225f3387a2a8cc1d97a71e03ca5830a6894d25 +size 1608 diff --git a/assets/voxygen/voxel/figure/beard/dwarf/dwarf-20.vox b/assets/voxygen/voxel/figure/beard/dwarf/dwarf-20.vox old mode 100644 new mode 100755 index 6ab4ce661f..3df0f3a4eb --- a/assets/voxygen/voxel/figure/beard/dwarf/dwarf-20.vox +++ b/assets/voxygen/voxel/figure/beard/dwarf/dwarf-20.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ef7b0909e5d665b64d2e8ee28c10b93ad8a0e3bb066df5a1772bfc5dd9919336 -size 1328 +oid sha256:f1a33eed7b95f45b47898c8823fd8b634b77445d2832ae63a906c641f57c16d5 +size 1752 diff --git a/assets/voxygen/voxel/figure/beard/dwarf/dwarf-21.vox b/assets/voxygen/voxel/figure/beard/dwarf/dwarf-21.vox old mode 100644 new mode 100755 index a764717075..feb2f122e7 --- a/assets/voxygen/voxel/figure/beard/dwarf/dwarf-21.vox +++ b/assets/voxygen/voxel/figure/beard/dwarf/dwarf-21.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:033c11472aa720a441b245b191ac07143d4c99162d19e24018cb63b2187e8a33 -size 1416 +oid sha256:5cadaa48b1b8fe86a19eb0d93c2e402d5ddb406899b489196dd1d84db797de4f +size 1392 diff --git a/assets/voxygen/voxel/figure/beard/dwarf/dwarf-22.vox b/assets/voxygen/voxel/figure/beard/dwarf/dwarf-22.vox old mode 100644 new mode 100755 index 439eee57fd..88b693ca22 --- a/assets/voxygen/voxel/figure/beard/dwarf/dwarf-22.vox +++ b/assets/voxygen/voxel/figure/beard/dwarf/dwarf-22.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b9d8750c52704a078f7557a5b6948d83a4d3810a596533d06f628482f1dbac1a -size 1640 +oid sha256:b43906690cfbacc752e769d03603ae971ee9beae879b65e36e7e49ac81851a0f +size 1576 diff --git a/assets/voxygen/voxel/figure/beard/dwarf/dwarf-3.vox b/assets/voxygen/voxel/figure/beard/dwarf/dwarf-3.vox old mode 100644 new mode 100755 index dbc5f5d671..ab69ca88fc --- a/assets/voxygen/voxel/figure/beard/dwarf/dwarf-3.vox +++ b/assets/voxygen/voxel/figure/beard/dwarf/dwarf-3.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a31013e7a8f584cfff875e730a66d525e81b777ef0a1d32e8e1d461b8913d785 -size 1248 +oid sha256:cea0bbae30ca31017c83650434efdd83a80903b2856962f6aeb3f16e60abb945 +size 1312 diff --git a/assets/voxygen/voxel/figure/beard/dwarf/dwarf-4.vox b/assets/voxygen/voxel/figure/beard/dwarf/dwarf-4.vox old mode 100644 new mode 100755 index 3d6f017615..3467afee5b --- a/assets/voxygen/voxel/figure/beard/dwarf/dwarf-4.vox +++ b/assets/voxygen/voxel/figure/beard/dwarf/dwarf-4.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1a997e3ce8d0e4f0b98ad12c036fcc8af05a362aef46e618bf6fd5942b406b86 -size 1164 +oid sha256:3393fd4e6d71b2a951fc800bb2e98db9eb4463aec0bdbf9b46d8b90759841cc8 +size 1180 diff --git a/assets/voxygen/voxel/figure/beard/dwarf/dwarf-5.vox b/assets/voxygen/voxel/figure/beard/dwarf/dwarf-5.vox old mode 100644 new mode 100755 index 05532071cb..0c2d2a1b43 --- a/assets/voxygen/voxel/figure/beard/dwarf/dwarf-5.vox +++ b/assets/voxygen/voxel/figure/beard/dwarf/dwarf-5.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:79fe47c2e1a0827d3fa5ee43c2f20f56d483d2440a350ff6bac397953af54b95 -size 1608 +oid sha256:fe133802b0e106945e0fd260066a9e704a59161c65b25873456c8ddd708d6d0a +size 1656 diff --git a/assets/voxygen/voxel/figure/beard/dwarf/dwarf-6.vox b/assets/voxygen/voxel/figure/beard/dwarf/dwarf-6.vox old mode 100644 new mode 100755 index d63c068df7..645e1840b3 --- a/assets/voxygen/voxel/figure/beard/dwarf/dwarf-6.vox +++ b/assets/voxygen/voxel/figure/beard/dwarf/dwarf-6.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:de5c2b852f9310f62f94aafab0bfd711e129352ae5c9617ed3cb539dcc453c6e -size 1688 +oid sha256:ae293af97ec217ff6863e6bbd08dfffb3350bced80f591f92fa3f1140515a039 +size 1752 diff --git a/assets/voxygen/voxel/figure/beard/dwarf/dwarf-7.vox b/assets/voxygen/voxel/figure/beard/dwarf/dwarf-7.vox old mode 100644 new mode 100755 index d925d23530..ffcea28c66 --- a/assets/voxygen/voxel/figure/beard/dwarf/dwarf-7.vox +++ b/assets/voxygen/voxel/figure/beard/dwarf/dwarf-7.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9b97cb3ddb387ee38614b1b42c90b7dca0c0c36bd4351bc39fa7907abf915578 -size 1152 +oid sha256:6c845dd35ecc2a88a3379119d45bf74055325f596fb16f1b58f309480c04d234 +size 1256 diff --git a/assets/voxygen/voxel/figure/beard/dwarf/dwarf-8.vox b/assets/voxygen/voxel/figure/beard/dwarf/dwarf-8.vox old mode 100644 new mode 100755 index d419959b79..5be7bfe64b --- a/assets/voxygen/voxel/figure/beard/dwarf/dwarf-8.vox +++ b/assets/voxygen/voxel/figure/beard/dwarf/dwarf-8.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:28b6ebde1c0dabe2d40ee75b5fb9d5a601331efbfa135dd3f33d139cdb8b522c -size 1172 +oid sha256:07fd6e8945a5b8ea0b60addd422be7b4054cadc15c0fbc6e29249b2ccdc91603 +size 1532 diff --git a/assets/voxygen/voxel/figure/beard/dwarf/dwarf-9.vox b/assets/voxygen/voxel/figure/beard/dwarf/dwarf-9.vox old mode 100644 new mode 100755 index 37e30b75a6..090c2aa8e5 --- a/assets/voxygen/voxel/figure/beard/dwarf/dwarf-9.vox +++ b/assets/voxygen/voxel/figure/beard/dwarf/dwarf-9.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1224a5567a1350e8f9c7320e7d6764ce6e7a895dc3cb1b2364c85e66e6d035ec -size 1160 +oid sha256:77d467ad9c7f57147f8bc72d123fc1e8aec840266a4acd0f1ec08c33ff347345 +size 1320 diff --git a/assets/voxygen/voxel/figure/beard/elf/elf-0.vox b/assets/voxygen/voxel/figure/beard/elf/elf-0.vox new file mode 100755 index 0000000000..1da0935c98 --- /dev/null +++ b/assets/voxygen/voxel/figure/beard/elf/elf-0.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f66acb9c778ff789cae309584a85d5dc028cfd6f734220641f234d92616f9bb6 +size 1112 diff --git a/assets/voxygen/voxel/figure/beard/elf/elf-1.vox b/assets/voxygen/voxel/figure/beard/elf/elf-1.vox new file mode 100755 index 0000000000..8f6fb7effd --- /dev/null +++ b/assets/voxygen/voxel/figure/beard/elf/elf-1.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c819cc6fa67e374cb8809197c6af3719cb7b0c03d4fd917e233c4dd07ca371f7 +size 1136 diff --git a/assets/voxygen/voxel/figure/beard/elf/elf-2.vox b/assets/voxygen/voxel/figure/beard/elf/elf-2.vox new file mode 100755 index 0000000000..d89f003b1b --- /dev/null +++ b/assets/voxygen/voxel/figure/beard/elf/elf-2.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:337e9e10ce828c9beca97b0316f6e19d0c8aac447603d2e2cf7e4621ccfd83b8 +size 1132 diff --git a/assets/voxygen/voxel/figure/beard/elf/elf-3.vox b/assets/voxygen/voxel/figure/beard/elf/elf-3.vox new file mode 100755 index 0000000000..2412f4e564 --- /dev/null +++ b/assets/voxygen/voxel/figure/beard/elf/elf-3.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1ab1f4a7dcce35b9c108b26c76876c1136ef2eb8cf5ca32b5e9dbef97e7aa8a1 +size 1116 diff --git a/assets/voxygen/voxel/figure/beard/elf/elf-4.vox b/assets/voxygen/voxel/figure/beard/elf/elf-4.vox new file mode 100755 index 0000000000..ca78d7bf91 --- /dev/null +++ b/assets/voxygen/voxel/figure/beard/elf/elf-4.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:161a9528b410c90245a91555cb4c551940c322e02d8c0e65843e7cac583d20f4 +size 1260 diff --git a/assets/voxygen/voxel/figure/beard/elf/elf-5.vox b/assets/voxygen/voxel/figure/beard/elf/elf-5.vox new file mode 100755 index 0000000000..e2a57a2da5 --- /dev/null +++ b/assets/voxygen/voxel/figure/beard/elf/elf-5.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:38efc5d21215dfe05c845353f6db0c0988311881b6994a1623643ba7b491b2b6 +size 1280 diff --git a/assets/voxygen/voxel/figure/beard/elf/elf-6.vox b/assets/voxygen/voxel/figure/beard/elf/elf-6.vox new file mode 100755 index 0000000000..8808ef77d4 --- /dev/null +++ b/assets/voxygen/voxel/figure/beard/elf/elf-6.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:14a6658834c37962dde5e863490885ee68aecbe552cf098120bcae7fcfc394c7 +size 1172 diff --git a/assets/voxygen/voxel/figure/beard/human/human-0.vox b/assets/voxygen/voxel/figure/beard/human/human-0.vox old mode 100644 new mode 100755 index 31db774e58..5b579d0607 --- a/assets/voxygen/voxel/figure/beard/human/human-0.vox +++ b/assets/voxygen/voxel/figure/beard/human/human-0.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9e0a3b287e0248ac91080ebf5de54918571c8cfb1b81fc9db2bd861c15c10e8d +oid sha256:5316a5ffeeaff91438da4992319afa9e6e4c1984096e5bcc12f4979c97d93e61 size 1240 diff --git a/assets/voxygen/voxel/figure/beard/human/human-1.vox b/assets/voxygen/voxel/figure/beard/human/human-1.vox old mode 100644 new mode 100755 index 53e8761f90..6f97d0ab1c --- a/assets/voxygen/voxel/figure/beard/human/human-1.vox +++ b/assets/voxygen/voxel/figure/beard/human/human-1.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a0068f185e10373f7ea1d5a859c225f76df6b0286d2b26227f030004f6838818 +oid sha256:14a5a8991bf54b784d2c838e44e24d0182c4bb25d8177cdc32044d03af0caf8b size 1136 diff --git a/assets/voxygen/voxel/figure/beard/human/human-2.vox b/assets/voxygen/voxel/figure/beard/human/human-2.vox old mode 100644 new mode 100755 index 5ece4b7bdb..ffc40404cb --- a/assets/voxygen/voxel/figure/beard/human/human-2.vox +++ b/assets/voxygen/voxel/figure/beard/human/human-2.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fae60c3dbcda4404ef89e6fbc09e12c80c85c968ccba1f29e91f14cf4e0665e6 +oid sha256:0ed4c5a06d0509080c1fff4cee367d165d4406d34e3397844e07122260cbf252 size 1288 diff --git a/assets/voxygen/voxel/figure/beard/human/human-3.vox b/assets/voxygen/voxel/figure/beard/human/human-3.vox new file mode 100644 index 0000000000..2265aca353 --- /dev/null +++ b/assets/voxygen/voxel/figure/beard/human/human-3.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:71d734ea5763d3cf82bce3ba89f878ad393b3ac491df566f0424605011e83bd3 +size 1320 diff --git a/assets/voxygen/voxel/figure/beard/human/human-4.vox b/assets/voxygen/voxel/figure/beard/human/human-4.vox new file mode 100755 index 0000000000..290e40ed07 --- /dev/null +++ b/assets/voxygen/voxel/figure/beard/human/human-4.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a5e8da9634a5d6e0e760748e1934bce227fdb31ba6c6d0dacba34c1b07eac5db +size 1136 diff --git a/assets/voxygen/voxel/figure/beard/human/human-5.vox b/assets/voxygen/voxel/figure/beard/human/human-5.vox new file mode 100644 index 0000000000..62683bb3c8 --- /dev/null +++ b/assets/voxygen/voxel/figure/beard/human/human-5.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5bef394e06c99e6b889f9399edfa935f004dd0095e2bf232b06a7f38da015b8b +size 1320 diff --git a/assets/voxygen/voxel/figure/beard/human/human-6.vox b/assets/voxygen/voxel/figure/beard/human/human-6.vox new file mode 100755 index 0000000000..a95cc80ab4 --- /dev/null +++ b/assets/voxygen/voxel/figure/beard/human/human-6.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f62dc0d47e7f4d7ab595983bdcbf6a53ff8da8ea1e2150fe2cc6c5c8f2c70518 +size 1136 diff --git a/assets/voxygen/voxel/figure/beard/human/human-7.vox b/assets/voxygen/voxel/figure/beard/human/human-7.vox new file mode 100644 index 0000000000..535648697d --- /dev/null +++ b/assets/voxygen/voxel/figure/beard/human/human-7.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6c7505ccdf47ab4e448e39737898ecf6ca7cc89518ba8c2ee818726a26f36f89 +size 1240 diff --git a/assets/voxygen/voxel/figure/beard/human/human-8.vox b/assets/voxygen/voxel/figure/beard/human/human-8.vox new file mode 100755 index 0000000000..49658d489a --- /dev/null +++ b/assets/voxygen/voxel/figure/beard/human/human-8.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2cce89926b52eda2f44a5ecd401ba07320327c02f7946af11090f29ae198024e +size 1144 diff --git a/assets/voxygen/voxel/figure/beard/orc/1.vox b/assets/voxygen/voxel/figure/beard/orc/1.vox deleted file mode 100644 index 2f8e9b3303..0000000000 --- a/assets/voxygen/voxel/figure/beard/orc/1.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:78d06c8b04feefdb1c179c30c42118972cbf1dfaae4d14f2d329ac9f67bd1ae9 -size 1104 diff --git a/assets/voxygen/voxel/figure/beard/orc/2.vox b/assets/voxygen/voxel/figure/beard/orc/2.vox deleted file mode 100644 index 522f6333c8..0000000000 --- a/assets/voxygen/voxel/figure/beard/orc/2.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:180950b3bba713f3c43a8b038e8904feff4f3eb1c16f6f3a651329eccc53d5e7 -size 23014 diff --git a/assets/voxygen/voxel/figure/beard/orc/orc-0.vox b/assets/voxygen/voxel/figure/beard/orc/orc-0.vox new file mode 100755 index 0000000000..12c7ec99be --- /dev/null +++ b/assets/voxygen/voxel/figure/beard/orc/orc-0.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2c9b26a926d6a76d43c27f2f5a8c8fb56766a1476462b5b980c1a9038be2aedb +size 1104 diff --git a/assets/voxygen/voxel/figure/beard/orc/orc-1.vox b/assets/voxygen/voxel/figure/beard/orc/orc-1.vox new file mode 100644 index 0000000000..2fa5a03377 --- /dev/null +++ b/assets/voxygen/voxel/figure/beard/orc/orc-1.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f9a94f3dd692b35fb55b7db875a2dc1bca0e55bf18a9cdf05f0af832c21855fc +size 1484 diff --git a/assets/voxygen/voxel/figure/beard/orc/orc-2.vox b/assets/voxygen/voxel/figure/beard/orc/orc-2.vox new file mode 100755 index 0000000000..1988f5dbb8 --- /dev/null +++ b/assets/voxygen/voxel/figure/beard/orc/orc-2.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5889d8e6aeabb8025b09a1f56f6c8c475247fff3f71a511fae12851c62e78469 +size 1120 diff --git a/assets/voxygen/voxel/figure/beard/orc/orc-3.vox b/assets/voxygen/voxel/figure/beard/orc/orc-3.vox new file mode 100644 index 0000000000..6d54aabcc3 --- /dev/null +++ b/assets/voxygen/voxel/figure/beard/orc/orc-3.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:77a5e636a1071a47191be29009004879d563bdd73db6f3a1b53eb0663b1283a3 +size 1224 diff --git a/assets/voxygen/voxel/figure/beard/orc/orc-4.vox b/assets/voxygen/voxel/figure/beard/orc/orc-4.vox new file mode 100755 index 0000000000..0e247a4bbe --- /dev/null +++ b/assets/voxygen/voxel/figure/beard/orc/orc-4.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b066f27f20740053c546328d54bbc17c485c6c779886e62caf1ed08510fafd67 +size 1296 diff --git a/assets/voxygen/voxel/figure/beard/orc/orc-5.vox b/assets/voxygen/voxel/figure/beard/orc/orc-5.vox new file mode 100755 index 0000000000..e8bc1a9a54 --- /dev/null +++ b/assets/voxygen/voxel/figure/beard/orc/orc-5.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:93da691019a2d82e97021f1027bdeaf9044b29df9fbd3976d6cc061a0dae1d35 +size 1256 diff --git a/assets/voxygen/voxel/figure/eyes/draugr/female-0.vox b/assets/voxygen/voxel/figure/eyes/draugr/female-0.vox new file mode 100644 index 0000000000..ce23f43b37 --- /dev/null +++ b/assets/voxygen/voxel/figure/eyes/draugr/female-0.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:14c22c2ed6c2da26ed692942d8fc9a108394d07a5377f84c1d2611367e2713c4 +size 1112 diff --git a/assets/voxygen/voxel/figure/eyes/draugr/female-1.vox b/assets/voxygen/voxel/figure/eyes/draugr/female-1.vox new file mode 100644 index 0000000000..a697bbb83f --- /dev/null +++ b/assets/voxygen/voxel/figure/eyes/draugr/female-1.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:376c4ff502674a7ad94a2f9e20cd31499673f23c3cde5fac66fc8b00f143162d +size 1112 diff --git a/assets/voxygen/voxel/figure/eyes/draugr/female-2.vox b/assets/voxygen/voxel/figure/eyes/draugr/female-2.vox new file mode 100644 index 0000000000..c5fbec35cd --- /dev/null +++ b/assets/voxygen/voxel/figure/eyes/draugr/female-2.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bb96e2ddccb8219dbdf98e15f5f06777faafed09c8b57e44f1a71b5b9a7193c7 +size 1112 diff --git a/assets/voxygen/voxel/figure/eyes/draugr/male-0.vox b/assets/voxygen/voxel/figure/eyes/draugr/male-0.vox new file mode 100755 index 0000000000..3946324311 --- /dev/null +++ b/assets/voxygen/voxel/figure/eyes/draugr/male-0.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5d8caf6a67706bad96153a183e0151ba5cbf9e81e63ff18d4cfe08ca071466df +size 1120 diff --git a/assets/voxygen/voxel/figure/eyes/draugr/male-1.vox b/assets/voxygen/voxel/figure/eyes/draugr/male-1.vox new file mode 100755 index 0000000000..26544e0224 --- /dev/null +++ b/assets/voxygen/voxel/figure/eyes/draugr/male-1.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d280bb3bdaf79bad2b5ac70627acf1af5721c81a8def9dd179730a346e48e7f8 +size 1120 diff --git a/assets/voxygen/voxel/figure/eyes/draugr/male-2.vox b/assets/voxygen/voxel/figure/eyes/draugr/male-2.vox new file mode 100755 index 0000000000..b8aa86c4a9 --- /dev/null +++ b/assets/voxygen/voxel/figure/eyes/draugr/male-2.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:178b77782c083b969fb5689e23a8c2636af1c0cb3f9833322646595752beb934 +size 1120 diff --git a/assets/voxygen/voxel/figure/eyes/draugr/male-3.vox b/assets/voxygen/voxel/figure/eyes/draugr/male-3.vox new file mode 100755 index 0000000000..1915c240b6 --- /dev/null +++ b/assets/voxygen/voxel/figure/eyes/draugr/male-3.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b6da497ab4740641ad6d53e6fafe8019170c791f8c004a17f66ba7cab0e2960e +size 1120 diff --git a/assets/voxygen/voxel/figure/eyes/draugr/male-4.vox b/assets/voxygen/voxel/figure/eyes/draugr/male-4.vox new file mode 100755 index 0000000000..a606845525 --- /dev/null +++ b/assets/voxygen/voxel/figure/eyes/draugr/male-4.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f9551ddd38d919b4a7d51f30ee246c06720e5cd367027bb64c9668589fdc6a98 +size 1112 diff --git a/assets/voxygen/voxel/figure/eyes/draugr/male-5.vox b/assets/voxygen/voxel/figure/eyes/draugr/male-5.vox new file mode 100755 index 0000000000..b0b26d1e22 --- /dev/null +++ b/assets/voxygen/voxel/figure/eyes/draugr/male-5.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3855deaa600d16ccc25a5809568c66165165e6e87209dfe1b466bd941331a097 +size 1112 diff --git a/assets/voxygen/voxel/figure/eyes/draugr/male-6.vox b/assets/voxygen/voxel/figure/eyes/draugr/male-6.vox new file mode 100755 index 0000000000..5746b29c4d --- /dev/null +++ b/assets/voxygen/voxel/figure/eyes/draugr/male-6.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6e10f57c03627bb27db7bc969c53c3312b122c713894ff69e0210d39bc99be08 +size 1112 diff --git a/assets/voxygen/voxel/figure/eyes/draugr/male-7.vox b/assets/voxygen/voxel/figure/eyes/draugr/male-7.vox new file mode 100755 index 0000000000..caebd88acf --- /dev/null +++ b/assets/voxygen/voxel/figure/eyes/draugr/male-7.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d73cbb2e21134efd67ed1b4963b5f1d42c9e6ad650b8e1bb66df0c86121dcdb9 +size 1112 diff --git a/assets/voxygen/voxel/figure/eyes/general/male_bushy-0.vox b/assets/voxygen/voxel/figure/eyes/general/male_bushy-0.vox index 5f32d0a872..2a799d409c 100644 --- a/assets/voxygen/voxel/figure/eyes/general/male_bushy-0.vox +++ b/assets/voxygen/voxel/figure/eyes/general/male_bushy-0.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ff1ac798ca93a041195e3efee2c1166670a3f13c2fc907a432f1c7b44c381c4c +oid sha256:4eb00e2b0bb139f310cfa445ffc5a8c12539310b8a9b43e748ba4881c3d95771 size 1176 diff --git a/assets/voxygen/voxel/figure/eyes/general/male_bushy-1.vox b/assets/voxygen/voxel/figure/eyes/general/male_bushy-1.vox new file mode 100755 index 0000000000..2d68d363eb --- /dev/null +++ b/assets/voxygen/voxel/figure/eyes/general/male_bushy-1.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:34fd9b8839f52d57630ea300613e7f1341d7d4d0bddce2f5de317d27751d3c3b +size 1160 diff --git a/assets/voxygen/voxel/figure/eyes/general/male_old.vox b/assets/voxygen/voxel/figure/eyes/general/male_old.vox index edf3309004..ccd9a0914e 100644 --- a/assets/voxygen/voxel/figure/eyes/general/male_old.vox +++ b/assets/voxygen/voxel/figure/eyes/general/male_old.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:39c55d37bac17f7a1411d921446c9a3c775f9a84d9435705a0844e8ceb56a82f +oid sha256:6599475a4ed0e0ee2a41d3b9c07a3116321256fa97c1d8738d97003ccefcfc0f size 1184 diff --git a/assets/voxygen/voxel/figure/eyes/general/male_old_blind.vox b/assets/voxygen/voxel/figure/eyes/general/male_old_blind.vox index 69528e2110..bfd516c6fb 100644 --- a/assets/voxygen/voxel/figure/eyes/general/male_old_blind.vox +++ b/assets/voxygen/voxel/figure/eyes/general/male_old_blind.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:02486a50a7485adb666e77488dc7c3f1bc0e92a3d7e3ba493abde2242d76764f +oid sha256:69d82736e23f5ac98960843a4e30a1caa7a6545323240561de9f6110510038cd size 1176 diff --git a/assets/voxygen/voxel/figure/eyes/undead/female-0.vox b/assets/voxygen/voxel/figure/eyes/undead/female-0.vox deleted file mode 100644 index ed58911c67..0000000000 --- a/assets/voxygen/voxel/figure/eyes/undead/female-0.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:10289af4d395cd4a55183b3398295c1b468c996a7aad05474ed3aaf39161f1ef -size 1112 diff --git a/assets/voxygen/voxel/figure/eyes/undead/female-1.vox b/assets/voxygen/voxel/figure/eyes/undead/female-1.vox deleted file mode 100644 index 208a3abc08..0000000000 --- a/assets/voxygen/voxel/figure/eyes/undead/female-1.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d58b83f7285bb96c1f63db7ee6f0d3e2e843a7da4ce747ba03d361434d422193 -size 1144 diff --git a/assets/voxygen/voxel/figure/eyes/undead/female-2.vox b/assets/voxygen/voxel/figure/eyes/undead/female-2.vox deleted file mode 100644 index 6cb33ed379..0000000000 --- a/assets/voxygen/voxel/figure/eyes/undead/female-2.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:63c0392403c912d975c66e584528043b368e31f4833610b1a829ca20630a174f -size 1144 diff --git a/assets/voxygen/voxel/figure/eyes/undead/male-0.vox b/assets/voxygen/voxel/figure/eyes/undead/male-0.vox deleted file mode 100644 index a42ef18611..0000000000 --- a/assets/voxygen/voxel/figure/eyes/undead/male-0.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c1a84d7a62081ecf7bc5e3eb35f5537263889f3974b2261e4b7c11a682238c95 -size 1112 diff --git a/assets/voxygen/voxel/figure/eyes/undead/male-1.vox b/assets/voxygen/voxel/figure/eyes/undead/male-1.vox deleted file mode 100644 index ed5f17373b..0000000000 --- a/assets/voxygen/voxel/figure/eyes/undead/male-1.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f77a0d0e28b84b7f37bb6fe150252a6d2adf55895bc0f7b034ed98264ada8595 -size 1112 diff --git a/assets/voxygen/voxel/figure/eyes/undead/male-2.vox b/assets/voxygen/voxel/figure/eyes/undead/male-2.vox deleted file mode 100644 index 6dd0a05ac3..0000000000 --- a/assets/voxygen/voxel/figure/eyes/undead/male-2.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0248c911ec7d509e5a6a86f7b636b08137d7920bf7edf7e7d613205791c195b6 -size 1112 diff --git a/assets/voxygen/voxel/figure/eyes/undead/male-3.vox b/assets/voxygen/voxel/figure/eyes/undead/male-3.vox deleted file mode 100644 index b55f9ef05a..0000000000 --- a/assets/voxygen/voxel/figure/eyes/undead/male-3.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:870fe83897319c3f43fc448b8f9e0c09cc4daaf5afbd6be712d04ee1038dc82b -size 1112 diff --git a/assets/voxygen/voxel/figure/hair/danari/bald.vox b/assets/voxygen/voxel/figure/hair/danari/bald.vox new file mode 100755 index 0000000000..104a12eeff --- /dev/null +++ b/assets/voxygen/voxel/figure/hair/danari/bald.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b523cb4cff180484cb9ba2eedc82d1592c4aca91072d66eda2fd39c692384f78 +size 1096 diff --git a/assets/voxygen/voxel/figure/hair/danari/female-0.vox b/assets/voxygen/voxel/figure/hair/danari/female-0.vox old mode 100644 new mode 100755 index c1758ba726..4eab3705eb --- a/assets/voxygen/voxel/figure/hair/danari/female-0.vox +++ b/assets/voxygen/voxel/figure/hair/danari/female-0.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d70d8bbc0ed7ebcaffc14154d6542e77be28897366da42374eed19f67fe8e194 -size 2364 +oid sha256:2e141c9cfbf682c9acccba30a5d97a8031f1da8b673725fef7812faf8313d611 +size 2620 diff --git a/assets/voxygen/voxel/figure/hair/danari/female-1.vox b/assets/voxygen/voxel/figure/hair/danari/female-1.vox old mode 100644 new mode 100755 index 9ce7a1d23d..680148fb4f --- a/assets/voxygen/voxel/figure/hair/danari/female-1.vox +++ b/assets/voxygen/voxel/figure/hair/danari/female-1.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3acd240b2dc5f68b4ace9a14b42bc7bb7d91e9f3f67ae409785ef0639aa0360e -size 2328 +oid sha256:5b7a2b132b411a95cd47b182dc501ea49eac5b824a45bdd0e7d9f5d9ec71893b +size 2776 diff --git a/assets/voxygen/voxel/figure/hair/danari/female-10.vox b/assets/voxygen/voxel/figure/hair/danari/female-10.vox new file mode 100755 index 0000000000..331556aa64 --- /dev/null +++ b/assets/voxygen/voxel/figure/hair/danari/female-10.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:afa1f37178b7d68097a06608f07ab6334fd6360810070699c55da7c0f48665b7 +size 2120 diff --git a/assets/voxygen/voxel/figure/hair/danari/female-11.vox b/assets/voxygen/voxel/figure/hair/danari/female-11.vox new file mode 100755 index 0000000000..68cad7699d --- /dev/null +++ b/assets/voxygen/voxel/figure/hair/danari/female-11.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3691a6be57c44414ac493825cb08156c1464e8244e4bdb6afa26c113ea4de6a1 +size 2368 diff --git a/assets/voxygen/voxel/figure/hair/danari/female-12.vox b/assets/voxygen/voxel/figure/hair/danari/female-12.vox new file mode 100755 index 0000000000..e2ed606405 --- /dev/null +++ b/assets/voxygen/voxel/figure/hair/danari/female-12.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0b72be796a68062ca31d7fe4a27f34e638ecfc1531525d54b2e405e7651e7043 +size 2408 diff --git a/assets/voxygen/voxel/figure/hair/danari/female-13.vox b/assets/voxygen/voxel/figure/hair/danari/female-13.vox new file mode 100755 index 0000000000..d1d3e0d947 --- /dev/null +++ b/assets/voxygen/voxel/figure/hair/danari/female-13.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f0bd447f9947d801e8ea497bca94a647ce8e9cbb3e5eaa8ce034d5cdf1f41355 +size 2264 diff --git a/assets/voxygen/voxel/figure/hair/danari/female-14.vox b/assets/voxygen/voxel/figure/hair/danari/female-14.vox new file mode 100755 index 0000000000..e8eaf5798a --- /dev/null +++ b/assets/voxygen/voxel/figure/hair/danari/female-14.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:72548bb8fbe31e798518451494e96882d54995e3ba8a0d942e6ff2de45f62a7e +size 2404 diff --git a/assets/voxygen/voxel/figure/hair/danari/female-2.vox b/assets/voxygen/voxel/figure/hair/danari/female-2.vox old mode 100644 new mode 100755 index d23bfd5f60..af6b1233a8 --- a/assets/voxygen/voxel/figure/hair/danari/female-2.vox +++ b/assets/voxygen/voxel/figure/hair/danari/female-2.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:923accdb7f3405e7f7cd45a86eddd9bbfa555e8116240458a0d6beef28477d19 -size 1960 +oid sha256:3aaf9141562e3ce9eef0b9c05d80f4c00264a9c61c4e8ae94275c0eae4b5184b +size 1972 diff --git a/assets/voxygen/voxel/figure/hair/danari/female-3.vox b/assets/voxygen/voxel/figure/hair/danari/female-3.vox old mode 100644 new mode 100755 index 3663f7e752..3bc4377741 --- a/assets/voxygen/voxel/figure/hair/danari/female-3.vox +++ b/assets/voxygen/voxel/figure/hair/danari/female-3.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:de5c1d8f7a3fc9a7cfc1e39b6b3f1247e4741eed6f6bccd88ee2902ec71d359b -size 2192 +oid sha256:362ad04e351170918c6f6d5ccef54f2f8ac57fd4e3f488bbdcc4f1454f82bd22 +size 2320 diff --git a/assets/voxygen/voxel/figure/hair/danari/female-4.vox b/assets/voxygen/voxel/figure/hair/danari/female-4.vox new file mode 100755 index 0000000000..a00b0d140a --- /dev/null +++ b/assets/voxygen/voxel/figure/hair/danari/female-4.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6a6b4c56c8b46dfb8f26caf9f83bf8afa6716144f2aca58b9a5930dbd73541bf +size 2416 diff --git a/assets/voxygen/voxel/figure/hair/danari/female-5.vox b/assets/voxygen/voxel/figure/hair/danari/female-5.vox new file mode 100644 index 0000000000..1bd94e4086 --- /dev/null +++ b/assets/voxygen/voxel/figure/hair/danari/female-5.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0c9b8d2bfd04b78430e8fd0ceb70cc0c3771cc9ee94f80ed9d8edc98461975ea +size 2212 diff --git a/assets/voxygen/voxel/figure/hair/danari/female-6.vox b/assets/voxygen/voxel/figure/hair/danari/female-6.vox new file mode 100755 index 0000000000..2bb81e58ca --- /dev/null +++ b/assets/voxygen/voxel/figure/hair/danari/female-6.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9055c4b3fc3fc499e1306e9a00f8eda239514fe96fa2ec8fcdffbe27fe12ed01 +size 2712 diff --git a/assets/voxygen/voxel/figure/hair/danari/female-7.vox b/assets/voxygen/voxel/figure/hair/danari/female-7.vox new file mode 100644 index 0000000000..9631c587ea --- /dev/null +++ b/assets/voxygen/voxel/figure/hair/danari/female-7.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:aa5066c0fb467e353b9bcc244a3f376baf70f803fabaf7f590b78cf9d80df0f5 +size 2140 diff --git a/assets/voxygen/voxel/figure/hair/danari/female-8.vox b/assets/voxygen/voxel/figure/hair/danari/female-8.vox new file mode 100755 index 0000000000..785f75f881 --- /dev/null +++ b/assets/voxygen/voxel/figure/hair/danari/female-8.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f687b185df9e9dc7657fcd18b56ca66519097441e6e70a4b9dd8a826ee17963d +size 2276 diff --git a/assets/voxygen/voxel/figure/hair/danari/female-9.vox b/assets/voxygen/voxel/figure/hair/danari/female-9.vox new file mode 100755 index 0000000000..f632d7347e --- /dev/null +++ b/assets/voxygen/voxel/figure/hair/danari/female-9.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:361c304442971747d812384aacdda6f10a7a45bd17d603e162428377523ec048 +size 2084 diff --git a/assets/voxygen/voxel/figure/hair/danari/male-0.vox b/assets/voxygen/voxel/figure/hair/danari/male-0.vox old mode 100644 new mode 100755 index ca50e3c597..b50c12f42d --- a/assets/voxygen/voxel/figure/hair/danari/male-0.vox +++ b/assets/voxygen/voxel/figure/hair/danari/male-0.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:39b3c62cff1db93bc3f07ce166d9a9ccd0e7370de9a2ed75be5bcc3fd536d218 -size 1816 +oid sha256:a2a4796e73b8c8c44e06d0990387305b6e240e586fb96fa357c14044479869b8 +size 1960 diff --git a/assets/voxygen/voxel/figure/hair/danari/male-1.vox b/assets/voxygen/voxel/figure/hair/danari/male-1.vox index 36cef568f0..6070d90971 100644 --- a/assets/voxygen/voxel/figure/hair/danari/male-1.vox +++ b/assets/voxygen/voxel/figure/hair/danari/male-1.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c329e3ca026ff35f2574fac8d48af4f3b7f65951a491399de1001a527f471a1c -size 1792 +oid sha256:012c1adbd8cbe5800abc958ae26fc710bf659b0d17747b4e5b3991f4abf52ee9 +size 1852 diff --git a/assets/voxygen/voxel/figure/hair/danari/male-10.vox b/assets/voxygen/voxel/figure/hair/danari/male-10.vox new file mode 100755 index 0000000000..a30e98f2c6 --- /dev/null +++ b/assets/voxygen/voxel/figure/hair/danari/male-10.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:51f1ca773298df99bccfe046cc06e654d94528863c843fb979d40343913503b9 +size 2272 diff --git a/assets/voxygen/voxel/figure/hair/danari/male-11.vox b/assets/voxygen/voxel/figure/hair/danari/male-11.vox new file mode 100755 index 0000000000..2b8ba66e09 --- /dev/null +++ b/assets/voxygen/voxel/figure/hair/danari/male-11.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6a30a0ba884e7412b814acefbacf0e95856ac2ecc1f4a472568b24963d9e77b1 +size 1992 diff --git a/assets/voxygen/voxel/figure/hair/danari/male-12.vox b/assets/voxygen/voxel/figure/hair/danari/male-12.vox new file mode 100755 index 0000000000..8d9f24e881 --- /dev/null +++ b/assets/voxygen/voxel/figure/hair/danari/male-12.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2e585f961be1fd191c7711600489d77600d416c08a94cdcb84af467160116629 +size 2320 diff --git a/assets/voxygen/voxel/figure/hair/danari/male-13.vox b/assets/voxygen/voxel/figure/hair/danari/male-13.vox new file mode 100755 index 0000000000..3e5e2a1233 --- /dev/null +++ b/assets/voxygen/voxel/figure/hair/danari/male-13.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:38130c32658fefb98e1c61ca86e7beed2fff189835646859a02258b2c711bfa5 +size 2184 diff --git a/assets/voxygen/voxel/figure/hair/danari/male-2.vox b/assets/voxygen/voxel/figure/hair/danari/male-2.vox old mode 100644 new mode 100755 index 89301f528c..eec22141b8 --- a/assets/voxygen/voxel/figure/hair/danari/male-2.vox +++ b/assets/voxygen/voxel/figure/hair/danari/male-2.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9a42e4d6d2839a04443ce1c9ad1a8a433a34bcd2596f85ab49cd775b5bd0fdac -size 1776 +oid sha256:f840301e722b9660b4c048e42dc10794cbf3246b842111d3c92e52fd25deb588 +size 2144 diff --git a/assets/voxygen/voxel/figure/hair/danari/male-3.vox b/assets/voxygen/voxel/figure/hair/danari/male-3.vox old mode 100644 new mode 100755 index 402a3fac52..156a061026 --- a/assets/voxygen/voxel/figure/hair/danari/male-3.vox +++ b/assets/voxygen/voxel/figure/hair/danari/male-3.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6a63dcb525c4fadbc674ca2bdee8eecae2308b726348cd90e0fc15b343e73adb -size 2232 +oid sha256:8fc39be0c7ac40274b83a34ea98d96632db32029aa43b7788f03e5661ab68a55 +size 2600 diff --git a/assets/voxygen/voxel/figure/hair/danari/male-4.vox b/assets/voxygen/voxel/figure/hair/danari/male-4.vox new file mode 100755 index 0000000000..e111fd6394 --- /dev/null +++ b/assets/voxygen/voxel/figure/hair/danari/male-4.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b7926fd877636a972281f7603782f006bbb225cd8979f6de0c3ff17bb89e4252 +size 2308 diff --git a/assets/voxygen/voxel/figure/hair/danari/male-5.vox b/assets/voxygen/voxel/figure/hair/danari/male-5.vox new file mode 100755 index 0000000000..4cfc80af44 --- /dev/null +++ b/assets/voxygen/voxel/figure/hair/danari/male-5.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:efb929d73f857000bcf2f89ca33efd57b5ca760ebfa2df44e8774b9c6e75c3e6 +size 2068 diff --git a/assets/voxygen/voxel/figure/hair/danari/male-6.vox b/assets/voxygen/voxel/figure/hair/danari/male-6.vox new file mode 100755 index 0000000000..b8eec73b2a --- /dev/null +++ b/assets/voxygen/voxel/figure/hair/danari/male-6.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7f0994917142e40058d71be27e8ca974868ff274b732d5dbb6f96a5a310da414 +size 2344 diff --git a/assets/voxygen/voxel/figure/hair/danari/male-7.vox b/assets/voxygen/voxel/figure/hair/danari/male-7.vox new file mode 100755 index 0000000000..aba5a7559f --- /dev/null +++ b/assets/voxygen/voxel/figure/hair/danari/male-7.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cd309128eea49f0b24001031f791e07a9157bd019065c26a71f965dac3a6483d +size 2836 diff --git a/assets/voxygen/voxel/figure/hair/danari/male-8.vox b/assets/voxygen/voxel/figure/hair/danari/male-8.vox new file mode 100755 index 0000000000..518db2ed73 --- /dev/null +++ b/assets/voxygen/voxel/figure/hair/danari/male-8.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:43386ae0d3fadb6168fe9eeed3955656a2b708b5753bfe05ddbb29e523ef379e +size 2728 diff --git a/assets/voxygen/voxel/figure/hair/danari/male-9.vox b/assets/voxygen/voxel/figure/hair/danari/male-9.vox new file mode 100755 index 0000000000..ee1a4ea693 --- /dev/null +++ b/assets/voxygen/voxel/figure/hair/danari/male-9.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b352de102a1cf2462f82537169f8fd3982b07479757b9eb9025c5b0bd346c1ad +size 2356 diff --git a/assets/voxygen/voxel/figure/hair/draugr/bald.vox b/assets/voxygen/voxel/figure/hair/draugr/bald.vox new file mode 100755 index 0000000000..40a415285c --- /dev/null +++ b/assets/voxygen/voxel/figure/hair/draugr/bald.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ee9b62b569b6c92d361bf5e20997bc3e20f45f542353cb8f04a1e07541ae8351 +size 1096 diff --git a/assets/voxygen/voxel/figure/hair/draugr/female-0.vox b/assets/voxygen/voxel/figure/hair/draugr/female-0.vox new file mode 100755 index 0000000000..25bb730946 --- /dev/null +++ b/assets/voxygen/voxel/figure/hair/draugr/female-0.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cd2825fa1b22c9615a9dbed5d1cc76532bd30393809d7167a90439c9bdf7f8b0 +size 1900 diff --git a/assets/voxygen/voxel/figure/hair/draugr/female-1.vox b/assets/voxygen/voxel/figure/hair/draugr/female-1.vox new file mode 100755 index 0000000000..cd5fb44844 --- /dev/null +++ b/assets/voxygen/voxel/figure/hair/draugr/female-1.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bcfa348c46a26c17fd6f71745d9af2e2be39eb038bd077d12a2bfba10b4bcc8c +size 3008 diff --git a/assets/voxygen/voxel/figure/hair/draugr/female-10.vox b/assets/voxygen/voxel/figure/hair/draugr/female-10.vox new file mode 100755 index 0000000000..33ae4a6291 --- /dev/null +++ b/assets/voxygen/voxel/figure/hair/draugr/female-10.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f9da370041adc678f7df5008b84742cc30af92b749f16d5da026a73ce4093453 +size 2436 diff --git a/assets/voxygen/voxel/figure/hair/draugr/female-11.vox b/assets/voxygen/voxel/figure/hair/draugr/female-11.vox new file mode 100755 index 0000000000..40a7da7767 --- /dev/null +++ b/assets/voxygen/voxel/figure/hair/draugr/female-11.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:11c0d2699dad911957d8512acb09b12dc3bad937a30ecbcf89298ea8fa53c496 +size 2508 diff --git a/assets/voxygen/voxel/figure/hair/draugr/female-12.vox b/assets/voxygen/voxel/figure/hair/draugr/female-12.vox new file mode 100755 index 0000000000..051b6c4bdb --- /dev/null +++ b/assets/voxygen/voxel/figure/hair/draugr/female-12.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2c5ce717be930c0bacd80eb1ea0235c00bea3279f2068aa2080411db18f634d6 +size 3292 diff --git a/assets/voxygen/voxel/figure/hair/draugr/female-13.vox b/assets/voxygen/voxel/figure/hair/draugr/female-13.vox new file mode 100755 index 0000000000..086c9125f1 --- /dev/null +++ b/assets/voxygen/voxel/figure/hair/draugr/female-13.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c933b4c8e2b4ea70783f6a48da3c5ee9282e56200fb01b43c4f5366598cd66c4 +size 3076 diff --git a/assets/voxygen/voxel/figure/hair/draugr/female-2.vox b/assets/voxygen/voxel/figure/hair/draugr/female-2.vox new file mode 100755 index 0000000000..9aabb5bfb0 --- /dev/null +++ b/assets/voxygen/voxel/figure/hair/draugr/female-2.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7a05de0cb4cdc75d81dec35d7294fd1b42ca2874a67bf5f9f0bfb9521b4ea55b +size 2044 diff --git a/assets/voxygen/voxel/figure/hair/draugr/female-3.vox b/assets/voxygen/voxel/figure/hair/draugr/female-3.vox new file mode 100755 index 0000000000..7b4191342b --- /dev/null +++ b/assets/voxygen/voxel/figure/hair/draugr/female-3.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:25fe2c8077c400cf42917bd100def8caa7349d43140b18e9f96d93ea596d8ff6 +size 2068 diff --git a/assets/voxygen/voxel/figure/hair/draugr/female-4.vox b/assets/voxygen/voxel/figure/hair/draugr/female-4.vox new file mode 100755 index 0000000000..a3222bf680 --- /dev/null +++ b/assets/voxygen/voxel/figure/hair/draugr/female-4.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e591f9eda6c33d59aaa32aa3791318da9e7f9c063b4b7b8c83506de37636ba76 +size 2148 diff --git a/assets/voxygen/voxel/figure/hair/draugr/female-5.vox b/assets/voxygen/voxel/figure/hair/draugr/female-5.vox new file mode 100755 index 0000000000..ca3ec3b6dc --- /dev/null +++ b/assets/voxygen/voxel/figure/hair/draugr/female-5.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9360fe6e82cbdeccd2d4e074ddd42fd6ddd4248661ba46c6ef5ccc465b574a1f +size 2264 diff --git a/assets/voxygen/voxel/figure/hair/draugr/female-6.vox b/assets/voxygen/voxel/figure/hair/draugr/female-6.vox new file mode 100755 index 0000000000..f887b2d252 --- /dev/null +++ b/assets/voxygen/voxel/figure/hair/draugr/female-6.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:85051e974ebcae6bc8d5318582fbd5c57cdf62985cbf7514b310496da14641a4 +size 2600 diff --git a/assets/voxygen/voxel/figure/hair/draugr/female-7.vox b/assets/voxygen/voxel/figure/hair/draugr/female-7.vox new file mode 100755 index 0000000000..805ad0811f --- /dev/null +++ b/assets/voxygen/voxel/figure/hair/draugr/female-7.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:92ef420db571df01c51a02075150f1c0a9d8373d3e318fd4c01cf7c15ea9993d +size 2940 diff --git a/assets/voxygen/voxel/figure/hair/draugr/female-8.vox b/assets/voxygen/voxel/figure/hair/draugr/female-8.vox new file mode 100755 index 0000000000..5ce3aafded --- /dev/null +++ b/assets/voxygen/voxel/figure/hair/draugr/female-8.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1127cb4ffd6873e464b5a50c957a79e06d43324dab3178e37ab4d4bd533c8e91 +size 2576 diff --git a/assets/voxygen/voxel/figure/hair/draugr/female-9.vox b/assets/voxygen/voxel/figure/hair/draugr/female-9.vox new file mode 100755 index 0000000000..6575954e24 --- /dev/null +++ b/assets/voxygen/voxel/figure/hair/draugr/female-9.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d8daad9d87a1c33082d42f3f9a7e8696795931f5319bd7cdd6301f43d2f741f8 +size 1520 diff --git a/assets/voxygen/voxel/figure/hair/draugr/male-0.vox b/assets/voxygen/voxel/figure/hair/draugr/male-0.vox new file mode 100755 index 0000000000..e868475391 --- /dev/null +++ b/assets/voxygen/voxel/figure/hair/draugr/male-0.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:96aa12e48c1dad51d872ba4f7a00457308963ef34ca821191b7e593f9220b4de +size 1924 diff --git a/assets/voxygen/voxel/figure/hair/draugr/male-1.vox b/assets/voxygen/voxel/figure/hair/draugr/male-1.vox new file mode 100755 index 0000000000..a65cb79c5a --- /dev/null +++ b/assets/voxygen/voxel/figure/hair/draugr/male-1.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:543d0afddf5a069d4981a8e96b9de4037df3cf97832b19bdd4e99e46acc324e3 +size 1460 diff --git a/assets/voxygen/voxel/figure/hair/draugr/male-10.vox b/assets/voxygen/voxel/figure/hair/draugr/male-10.vox new file mode 100755 index 0000000000..c9fe2b9553 --- /dev/null +++ b/assets/voxygen/voxel/figure/hair/draugr/male-10.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c7b7a55dc19874018063ca1cad66e7f186149d6e8b4fee5da2c9b3389510c591 +size 2364 diff --git a/assets/voxygen/voxel/figure/hair/draugr/male-11.vox b/assets/voxygen/voxel/figure/hair/draugr/male-11.vox new file mode 100755 index 0000000000..631274b465 --- /dev/null +++ b/assets/voxygen/voxel/figure/hair/draugr/male-11.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:888e904f2c339756ca4f589899fcac052f9bea3b8481006ec36e7c3f8f7a74ed +size 1692 diff --git a/assets/voxygen/voxel/figure/hair/draugr/male-12.vox b/assets/voxygen/voxel/figure/hair/draugr/male-12.vox new file mode 100755 index 0000000000..fd0f885990 --- /dev/null +++ b/assets/voxygen/voxel/figure/hair/draugr/male-12.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3d9abb65cc96dc33574fa9449530421640d48e6dc8c0c7dca6abfd83b6a1bb4c +size 2108 diff --git a/assets/voxygen/voxel/figure/hair/draugr/male-13.vox b/assets/voxygen/voxel/figure/hair/draugr/male-13.vox new file mode 100755 index 0000000000..cf1dc7061e --- /dev/null +++ b/assets/voxygen/voxel/figure/hair/draugr/male-13.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dbd4b798b8029eba762db28d109ca3eb5e19145b74647178feb03cff137581e6 +size 1528 diff --git a/assets/voxygen/voxel/figure/hair/draugr/male-2.vox b/assets/voxygen/voxel/figure/hair/draugr/male-2.vox new file mode 100755 index 0000000000..4409e12897 --- /dev/null +++ b/assets/voxygen/voxel/figure/hair/draugr/male-2.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3e32c93b2a06cc2da6dd1cee7d76126378f467d311c74bd0cbc86dfd831db427 +size 1464 diff --git a/assets/voxygen/voxel/figure/hair/draugr/male-3.vox b/assets/voxygen/voxel/figure/hair/draugr/male-3.vox new file mode 100755 index 0000000000..2f0df16feb --- /dev/null +++ b/assets/voxygen/voxel/figure/hair/draugr/male-3.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:65e8340deca536cc341380bd69e1354712d5cdc5df1bb1ac0da596cf2caa52e7 +size 1916 diff --git a/assets/voxygen/voxel/figure/hair/draugr/male-4.vox b/assets/voxygen/voxel/figure/hair/draugr/male-4.vox new file mode 100755 index 0000000000..1ef73b56e1 --- /dev/null +++ b/assets/voxygen/voxel/figure/hair/draugr/male-4.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cfe3ba4fac31a0ed1cbf1d7499aa0359feacf9cac8ecb345f3e9ca534f5bdef6 +size 2312 diff --git a/assets/voxygen/voxel/figure/hair/draugr/male-5.vox b/assets/voxygen/voxel/figure/hair/draugr/male-5.vox new file mode 100755 index 0000000000..85215d186e --- /dev/null +++ b/assets/voxygen/voxel/figure/hair/draugr/male-5.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:62691b990b87fbc026f80356ed62f4a52547df18a6c0164b4b68cedd2bbf728a +size 2316 diff --git a/assets/voxygen/voxel/figure/hair/draugr/male-6.vox b/assets/voxygen/voxel/figure/hair/draugr/male-6.vox new file mode 100755 index 0000000000..b0b95dd0f4 --- /dev/null +++ b/assets/voxygen/voxel/figure/hair/draugr/male-6.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cfe3916b56191b8c89a769c96a9388ebc6429c2fbe28663a67c54dce68b1931b +size 1868 diff --git a/assets/voxygen/voxel/figure/hair/draugr/male-7.vox b/assets/voxygen/voxel/figure/hair/draugr/male-7.vox new file mode 100755 index 0000000000..909bfa4b58 --- /dev/null +++ b/assets/voxygen/voxel/figure/hair/draugr/male-7.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:33281bf35c9fdbe75edefccab10050bfd8a5d7125888ab75b8edb180c3bdedb0 +size 2388 diff --git a/assets/voxygen/voxel/figure/hair/draugr/male-8.vox b/assets/voxygen/voxel/figure/hair/draugr/male-8.vox new file mode 100755 index 0000000000..24f3d7cb82 --- /dev/null +++ b/assets/voxygen/voxel/figure/hair/draugr/male-8.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e6c3e5244bfc917ce0fcccc9a61ccc3fbff0c6b3a888323f3847ad5382da3a64 +size 1972 diff --git a/assets/voxygen/voxel/figure/hair/draugr/male-9.vox b/assets/voxygen/voxel/figure/hair/draugr/male-9.vox new file mode 100755 index 0000000000..15f2798451 --- /dev/null +++ b/assets/voxygen/voxel/figure/hair/draugr/male-9.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7a3c76cce63909ee0b6278cd5ad62aaeb5b6b8d44721203c78434928d1c964fd +size 2132 diff --git a/assets/voxygen/voxel/figure/hair/dwarf/bald.vox b/assets/voxygen/voxel/figure/hair/dwarf/bald.vox old mode 100644 new mode 100755 diff --git a/assets/voxygen/voxel/figure/hair/dwarf/female-0.vox b/assets/voxygen/voxel/figure/hair/dwarf/female-0.vox old mode 100644 new mode 100755 index 8e9df08c4f..6be92695f3 --- 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:ddab65fcb39e2334262844464777012623ecf9dfc310b82a84e3c680460fa671 -size 2560 +oid sha256:071216404d6da3f09c8110a2c8e46106decbfe18628741bd96260fd042544b9c +size 2604 diff --git a/assets/voxygen/voxel/figure/hair/dwarf/female-1.vox b/assets/voxygen/voxel/figure/hair/dwarf/female-1.vox old mode 100644 new mode 100755 index 854ddbe942..788ce61c8e --- a/assets/voxygen/voxel/figure/hair/dwarf/female-1.vox +++ b/assets/voxygen/voxel/figure/hair/dwarf/female-1.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a70fb875fbc7f6beddbedf9b3d208c53d495ee6a9e6f78c32ecc2e62e54f4c09 -size 2688 +oid sha256:066d8d9c94853fcdc8b14800084ef06ff06ce7170713effc85e3da37fb9cab72 +size 2780 diff --git a/assets/voxygen/voxel/figure/hair/dwarf/female-10.vox b/assets/voxygen/voxel/figure/hair/dwarf/female-10.vox new file mode 100755 index 0000000000..6dc2f56870 --- /dev/null +++ b/assets/voxygen/voxel/figure/hair/dwarf/female-10.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:876c3308e16f9a438f09914267a7e11350abd70071a130cac414cf02f5f7d324 +size 2624 diff --git a/assets/voxygen/voxel/figure/hair/dwarf/female-11.vox b/assets/voxygen/voxel/figure/hair/dwarf/female-11.vox new file mode 100755 index 0000000000..c31e51bcff --- /dev/null +++ b/assets/voxygen/voxel/figure/hair/dwarf/female-11.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:726c06e11da17ee6ea86294cb6d48630e6c4a767f4719e113044701688000879 +size 2904 diff --git a/assets/voxygen/voxel/figure/hair/dwarf/female-12.vox b/assets/voxygen/voxel/figure/hair/dwarf/female-12.vox new file mode 100755 index 0000000000..fa776bcafb --- /dev/null +++ b/assets/voxygen/voxel/figure/hair/dwarf/female-12.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:91e1225d8192580f5f3ea7fc9c8a20e0c1a7b6bcc48426976d6ee80cc8fd98ad +size 3400 diff --git a/assets/voxygen/voxel/figure/hair/dwarf/female-13.vox b/assets/voxygen/voxel/figure/hair/dwarf/female-13.vox new file mode 100755 index 0000000000..06c9aade11 --- /dev/null +++ b/assets/voxygen/voxel/figure/hair/dwarf/female-13.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d24c836f1548b0a8ca3764e682f4402db4be5334d01a0947583a7f14bc7917a9 +size 3164 diff --git a/assets/voxygen/voxel/figure/hair/dwarf/female-14.vox b/assets/voxygen/voxel/figure/hair/dwarf/female-14.vox new file mode 100755 index 0000000000..cdec0b42ec --- /dev/null +++ b/assets/voxygen/voxel/figure/hair/dwarf/female-14.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:31efe23ecc734c44ddd661261a68d2779c4222b012eac8d8ffc4f64211e0499e +size 2888 diff --git a/assets/voxygen/voxel/figure/hair/dwarf/female-2.vox b/assets/voxygen/voxel/figure/hair/dwarf/female-2.vox old mode 100644 new mode 100755 index 76afb1902f..df74663606 --- a/assets/voxygen/voxel/figure/hair/dwarf/female-2.vox +++ b/assets/voxygen/voxel/figure/hair/dwarf/female-2.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:abaeca010745185c37dc46892814e2656ec4bc5a8901db3d505b94e7fdb3e8a6 -size 2496 +oid sha256:7db43ba3640e0305f20d3d0f15beb1dd9c9f113e591b7afd7f3d28ca6a2f143a +size 2572 diff --git a/assets/voxygen/voxel/figure/hair/dwarf/female-3.vox b/assets/voxygen/voxel/figure/hair/dwarf/female-3.vox old mode 100644 new mode 100755 index 04d0412377..09c4157c74 --- a/assets/voxygen/voxel/figure/hair/dwarf/female-3.vox +++ b/assets/voxygen/voxel/figure/hair/dwarf/female-3.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:aa7efc315dd97840102aed60ae7caaf7ab42bc6d46d1a3103794ddbed6696e62 -size 2924 +oid sha256:fab9c7d98193ebe18b74926c1b59358b9061acfcf8fba2d7a5bff9d9a84b0a9a +size 2900 diff --git a/assets/voxygen/voxel/figure/hair/dwarf/female-4.vox b/assets/voxygen/voxel/figure/hair/dwarf/female-4.vox old mode 100644 new mode 100755 index e20c2a6b7d..2b2d633282 --- a/assets/voxygen/voxel/figure/hair/dwarf/female-4.vox +++ b/assets/voxygen/voxel/figure/hair/dwarf/female-4.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c2930b901eb0c3ffb0693b47bdf0b0754e2e82323e0a34cab237da78918b27c4 -size 2640 +oid sha256:bae345fc8151cb1fcef2417e1c610f9206d458280c8530ae4fa0b3ed46ce0803 +size 2496 diff --git a/assets/voxygen/voxel/figure/hair/dwarf/female-5.vox b/assets/voxygen/voxel/figure/hair/dwarf/female-5.vox old mode 100644 new mode 100755 index c497cdd6ef..e48943aae0 --- a/assets/voxygen/voxel/figure/hair/dwarf/female-5.vox +++ b/assets/voxygen/voxel/figure/hair/dwarf/female-5.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9e05d91233210406564d557467f7a37b8de9f0687d261eec143d2408dac79973 -size 2296 +oid sha256:0a25b69118791fde05882dd4f6f65871ad4d346da905ad8b74a55b7193fe2dd7 +size 2272 diff --git a/assets/voxygen/voxel/figure/hair/dwarf/female-6.vox b/assets/voxygen/voxel/figure/hair/dwarf/female-6.vox index 357fc810f4..0e7698e046 100644 --- a/assets/voxygen/voxel/figure/hair/dwarf/female-6.vox +++ b/assets/voxygen/voxel/figure/hair/dwarf/female-6.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:27e53effbe09fc668d36b14a09ddc2727e0db57f3cf481d04c42a2d6c26a2e13 -size 2928 +oid sha256:9944996a7bd14ae341ee0ab4524cafc25c0ea7bff0a4b8978792388d69d057ac +size 3048 diff --git a/assets/voxygen/voxel/figure/hair/dwarf/female-7.vox b/assets/voxygen/voxel/figure/hair/dwarf/female-7.vox index b20f0ad3b3..0068982a72 100644 --- a/assets/voxygen/voxel/figure/hair/dwarf/female-7.vox +++ b/assets/voxygen/voxel/figure/hair/dwarf/female-7.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d2055c87773d61874494353560f7f194a9678d77c389877f05ade8116243ff8a -size 3368 +oid sha256:b1dd4eb0b4c9123b06403a9bec6838396145214dcf98c48e3d55393d34c78664 +size 3392 diff --git a/assets/voxygen/voxel/figure/hair/dwarf/female-8.vox b/assets/voxygen/voxel/figure/hair/dwarf/female-8.vox new file mode 100755 index 0000000000..3f3cc59c35 --- /dev/null +++ b/assets/voxygen/voxel/figure/hair/dwarf/female-8.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8f5ebc21ac3ea96b199fddd771b878b57fc17d4f9a220b71d713ea69912b3b33 +size 2732 diff --git a/assets/voxygen/voxel/figure/hair/dwarf/female-9.vox b/assets/voxygen/voxel/figure/hair/dwarf/female-9.vox new file mode 100755 index 0000000000..3dbcbbc514 --- /dev/null +++ b/assets/voxygen/voxel/figure/hair/dwarf/female-9.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:103d086d80c8b638d535dcdfcf717a5fe9548edf3b8fc72d111170702999d3af +size 2832 diff --git a/assets/voxygen/voxel/figure/hair/dwarf/male-0.vox b/assets/voxygen/voxel/figure/hair/dwarf/male-0.vox old mode 100644 new mode 100755 index 3c4fb074bf..5e685eaa4d --- a/assets/voxygen/voxel/figure/hair/dwarf/male-0.vox +++ b/assets/voxygen/voxel/figure/hair/dwarf/male-0.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2eddaa5ffb8b5f0abfd9769147b7168fc35157666ad98bd874d64333969b161d -size 2520 +oid sha256:944f6bcd88a80b3729ed2a66b4e56450b800e6c0c56bb11e3be7123168f786d2 +size 2416 diff --git a/assets/voxygen/voxel/figure/hair/dwarf/male-1.vox b/assets/voxygen/voxel/figure/hair/dwarf/male-1.vox old mode 100644 new mode 100755 index ed4196bb8b..ecfd909820 --- a/assets/voxygen/voxel/figure/hair/dwarf/male-1.vox +++ b/assets/voxygen/voxel/figure/hair/dwarf/male-1.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c60ed073ac070de5faf8e83b8ec41160cada993e8747f9192a03d8f345b4b5d3 -size 1800 +oid sha256:0ac543140e741c89f6d9c882753775d7d847153a8c56cb59e45b757a8ebeb1b9 +size 1884 diff --git a/assets/voxygen/voxel/figure/hair/dwarf/male-10.vox b/assets/voxygen/voxel/figure/hair/dwarf/male-10.vox new file mode 100755 index 0000000000..e5a6ed1259 --- /dev/null +++ b/assets/voxygen/voxel/figure/hair/dwarf/male-10.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:49f49c0060806857794402db19b8e5c9dd07bd4723ece6483a3bacb07122857b +size 2420 diff --git a/assets/voxygen/voxel/figure/hair/dwarf/male-11.vox b/assets/voxygen/voxel/figure/hair/dwarf/male-11.vox new file mode 100755 index 0000000000..07add14e25 --- /dev/null +++ b/assets/voxygen/voxel/figure/hair/dwarf/male-11.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:732215c09bbecaf198234bcad6013f4712dff2982996b5284deb1c365eaac251 +size 2532 diff --git a/assets/voxygen/voxel/figure/hair/dwarf/male-12.vox b/assets/voxygen/voxel/figure/hair/dwarf/male-12.vox new file mode 100755 index 0000000000..a570e21b00 --- /dev/null +++ b/assets/voxygen/voxel/figure/hair/dwarf/male-12.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:200c702896e993f9cefb3f3ff873129811d56ccfaff1e8578b691df8d6fc42d9 +size 2916 diff --git a/assets/voxygen/voxel/figure/hair/dwarf/male-13.vox b/assets/voxygen/voxel/figure/hair/dwarf/male-13.vox new file mode 100755 index 0000000000..43c735c4ca --- /dev/null +++ b/assets/voxygen/voxel/figure/hair/dwarf/male-13.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ce4da4c385b664314f1ef4c20dbabee628eff08a704efbf4ae3eb4c2e3e316c4 +size 2136 diff --git a/assets/voxygen/voxel/figure/hair/dwarf/male-2.vox b/assets/voxygen/voxel/figure/hair/dwarf/male-2.vox old mode 100644 new mode 100755 index f5b5bf2b6d..7314c77524 --- a/assets/voxygen/voxel/figure/hair/dwarf/male-2.vox +++ b/assets/voxygen/voxel/figure/hair/dwarf/male-2.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:878d3b7653e21ad451636e3186acd7268ac61d6b7487c9fe272ffbf97907a5b1 -size 2592 +oid sha256:2eac27f1115141bafe29b44c6f44517a4388f3a37ea5dadb8b67e167205b26e9 +size 2544 diff --git a/assets/voxygen/voxel/figure/hair/dwarf/male-3.vox b/assets/voxygen/voxel/figure/hair/dwarf/male-3.vox old mode 100644 new mode 100755 index eb87250590..7dcd48bf46 --- a/assets/voxygen/voxel/figure/hair/dwarf/male-3.vox +++ b/assets/voxygen/voxel/figure/hair/dwarf/male-3.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:de0f665ce04df0d9e92c639b725b5b4f4c4029dbdcc7f7e115510eb895fb020d -size 1944 +oid sha256:5c59f5a2b794ec7a81c69cd441bd60bd5844acc2f8fb04b874799f5860526494 +size 2320 diff --git a/assets/voxygen/voxel/figure/hair/dwarf/male-4.vox b/assets/voxygen/voxel/figure/hair/dwarf/male-4.vox old mode 100644 new mode 100755 index 5217522841..b83faf802f --- a/assets/voxygen/voxel/figure/hair/dwarf/male-4.vox +++ b/assets/voxygen/voxel/figure/hair/dwarf/male-4.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:813bcf7f1ed691ec2268a76161aa03ea45734351c8ba192b5830c10bf2071349 -size 1692 +oid sha256:38c3e7d7a79cab40632fa02dcd0a688dd80af31efebb1d9850e1880abd3c8490 +size 1724 diff --git a/assets/voxygen/voxel/figure/hair/dwarf/male-5.vox b/assets/voxygen/voxel/figure/hair/dwarf/male-5.vox old mode 100644 new mode 100755 index 03983032ef..f5279b0c6b --- a/assets/voxygen/voxel/figure/hair/dwarf/male-5.vox +++ b/assets/voxygen/voxel/figure/hair/dwarf/male-5.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e37cb9e96ac340b26e59ed2434ce1cb92d8f53670f3f9fe5337ff29409ff648e -size 1904 +oid sha256:894cc72f062056a882a5d989c538f8bc56442276d839b2796e2ea6d2fc5d9bf6 +size 1840 diff --git a/assets/voxygen/voxel/figure/hair/dwarf/male-6.vox b/assets/voxygen/voxel/figure/hair/dwarf/male-6.vox old mode 100644 new mode 100755 index ae7a9af907..ef2a83674a --- a/assets/voxygen/voxel/figure/hair/dwarf/male-6.vox +++ b/assets/voxygen/voxel/figure/hair/dwarf/male-6.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6131cfb0ea74af86cab91c7c59de55bc36fbf74b592a17b7f0c036ce235248cd -size 2640 +oid sha256:75594c58f5a1d909e846dbd820954839b8e8589e0f8c73e3c8fbd865316c94d1 +size 2668 diff --git a/assets/voxygen/voxel/figure/hair/dwarf/male-7.vox b/assets/voxygen/voxel/figure/hair/dwarf/male-7.vox old mode 100644 new mode 100755 index d68a4d07ed..6b011b7459 --- a/assets/voxygen/voxel/figure/hair/dwarf/male-7.vox +++ b/assets/voxygen/voxel/figure/hair/dwarf/male-7.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:baada06f31322d58ccf5efa839af0a1e5d80969c7360ae35fecc3af15bbe0ca5 -size 3048 +oid sha256:affff3518a7feb91905299b6acc685707b2643c099c18a286d407d285fb2051e +size 2760 diff --git a/assets/voxygen/voxel/figure/hair/dwarf/male-8.vox b/assets/voxygen/voxel/figure/hair/dwarf/male-8.vox new file mode 100755 index 0000000000..e4c54d3fa7 --- /dev/null +++ b/assets/voxygen/voxel/figure/hair/dwarf/male-8.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0647a6ac700e74ed7c107d1cd52506a2ce5796a365b4c6ec64ae1f305f874799 +size 2524 diff --git a/assets/voxygen/voxel/figure/hair/dwarf/male-9.vox b/assets/voxygen/voxel/figure/hair/dwarf/male-9.vox new file mode 100755 index 0000000000..c564feb97f --- /dev/null +++ b/assets/voxygen/voxel/figure/hair/dwarf/male-9.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2bb9f3c2d050666162b1b1e66406fdfaf482cb060723c5950470b063538e4373 +size 2412 diff --git a/assets/voxygen/voxel/figure/hair/elf/female-0.vox b/assets/voxygen/voxel/figure/hair/elf/female-0.vox old mode 100644 new mode 100755 index cd30bb6c38..71b09b42c1 --- 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:affe57e1e04764bf002ff027719799dad1b8f3df1629f3f3bfec13b9e430fa33 -size 2952 +oid sha256:bc68bcd64b371b9fd9bbea2c4056bed4252a15c475fad984c8ba05abadf8e304 +size 2920 diff --git a/assets/voxygen/voxel/figure/hair/elf/female-1.vox b/assets/voxygen/voxel/figure/hair/elf/female-1.vox old mode 100644 new mode 100755 index 4259d071cd..c9e694f87e --- 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:2f6fcbe925ecd7a8249cbe81c7b394a32e14f2aeb031e69bae522f0bc7dc2954 -size 2376 +oid sha256:790f8cce65752a4255e77f5a1db9a1a461987f9fc3673823848285c04eec934f +size 2560 diff --git a/assets/voxygen/voxel/figure/hair/elf/female-10.vox b/assets/voxygen/voxel/figure/hair/elf/female-10.vox old mode 100644 new mode 100755 index 8c2670d908..91805fd92b --- 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:d83728287cc2caa9cfa02cc0d6295879a08c2b6a90e1a8c922d636aa289fcd10 -size 3552 +oid sha256:6f11e721dc32ccd8d64597b25c653d7aad2b72bbcf95edd1acf062b7b54531fa +size 3584 diff --git a/assets/voxygen/voxel/figure/hair/elf/female-11.vox b/assets/voxygen/voxel/figure/hair/elf/female-11.vox old mode 100644 new mode 100755 index db849748bb..45c7f99cd9 --- 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:f1bdd7fc7cf521b96758442e1772a651726a4285537326e146b454bea602bdc7 -size 2020 +oid sha256:ef5f866315070807f68113f4e6d04df665135f2a174888f52936daa231152482 +size 3124 diff --git a/assets/voxygen/voxel/figure/hair/elf/female-12.vox b/assets/voxygen/voxel/figure/hair/elf/female-12.vox old mode 100644 new mode 100755 index d64aac0dc6..6eee8a5525 --- 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:8be51f26eea7f5d9742d669bf0c0799f3619c21456e177bb1af45b55b76f16fc -size 3000 +oid sha256:72aaaf4ccf3d611ca399e2b0c32a9bd50f8de85ecfa80c3dffc4ba106cb277f9 +size 3296 diff --git a/assets/voxygen/voxel/figure/hair/elf/female-13.vox b/assets/voxygen/voxel/figure/hair/elf/female-13.vox old mode 100644 new mode 100755 index d744df025f..d7f0eca2da --- 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:1c266fa848e7f1690c6fc8e0e8004ea8f8db18c43cc4351aec526b4544c56273 -size 2644 +oid sha256:0e3e4d52eb08a540d2f465594973ee095646c4c3c8b5836a85408ebe6acc55d0 +size 2904 diff --git a/assets/voxygen/voxel/figure/hair/elf/female-14.vox b/assets/voxygen/voxel/figure/hair/elf/female-14.vox index f3d513f8e1..a42767d807 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:35d5cf15aa12c8f107ce2ce66f7fba062ce38ed095d34940b4044c2a99b11c5a -size 1948 +oid sha256:93420b1544774145922d348a12ced7df47aa4ae5835c8841fceaef4dd3cac9fa +size 3008 diff --git a/assets/voxygen/voxel/figure/hair/elf/female-15.vox b/assets/voxygen/voxel/figure/hair/elf/female-15.vox index 2ac6422691..cffd53ad8e 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:8ce506e01c04f50a67199f914dff5b2cbd9340c24eb81553e8672747809f6331 -size 2384 +oid sha256:9926926e8c10442c604d287748c97910f38ffd0f3f85b50f3df15f661cf8dfac +size 3032 diff --git a/assets/voxygen/voxel/figure/hair/elf/female-16.vox b/assets/voxygen/voxel/figure/hair/elf/female-16.vox old mode 100644 new mode 100755 index 76de90d5d8..116b8fa19c --- 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:da6c1d63dd85c570c104b8573b23aedbe7d4d44d7e14b7ab05e1a5c1ff8ad7d8 -size 2356 +oid sha256:82a3bb6bc8bac465e88d93832258bde06a53cd13c140636bf23bd1292c3aedd4 +size 3340 diff --git a/assets/voxygen/voxel/figure/hair/elf/female-17.vox b/assets/voxygen/voxel/figure/hair/elf/female-17.vox old mode 100644 new mode 100755 index dd1360f8e6..a604d15062 --- 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:3b557e1912c92e2163fd060c005f0fd6167a3ca41c616f13af14e36680b58336 -size 2940 +oid sha256:bba9b75b534933c7eb8593537cc25030c1327288a1ccd75500d9d1836b105b55 +size 2632 diff --git a/assets/voxygen/voxel/figure/hair/elf/female-18.vox b/assets/voxygen/voxel/figure/hair/elf/female-18.vox old mode 100644 new mode 100755 index 844d2454fa..27f487dd14 --- 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:7e85e4cfd2cd14dde11bd9d13acb38366036b585a4ba85efaebb3d61a00dedde -size 2752 +oid sha256:9405026a345ae82d400610b24ff7b8b29b98106ea5b30d9161d7b41643cbd524 +size 3000 diff --git a/assets/voxygen/voxel/figure/hair/elf/female-19.vox b/assets/voxygen/voxel/figure/hair/elf/female-19.vox old mode 100644 new mode 100755 index c055b9f51b..c0d43cc999 --- 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:b55cd9e8ac02fdf51b2b92d45545fad23af631ab735655e3572cc4f2b6835dab -size 2700 +oid sha256:7ddef0a62d465e34c19caa268110d042f87f8aa6559ce04e8c218bf184569c89 +size 3116 diff --git a/assets/voxygen/voxel/figure/hair/elf/female-2.vox b/assets/voxygen/voxel/figure/hair/elf/female-2.vox old mode 100644 new mode 100755 index 0f8d61b1be..c8feb898f1 --- a/assets/voxygen/voxel/figure/hair/elf/female-2.vox +++ b/assets/voxygen/voxel/figure/hair/elf/female-2.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e511587486c499d79b532961d1bfd13f313b0e28620f152a0b82dd5443fda4b1 -size 2632 +oid sha256:1d740d8730ab189296456a7830d5f6dd66cbe75eb6e1e4b8cf0fb74808dc35a5 +size 2952 diff --git a/assets/voxygen/voxel/figure/hair/elf/female-20.vox b/assets/voxygen/voxel/figure/hair/elf/female-20.vox old mode 100644 new mode 100755 index 5a022cde25..0f67fe6bad --- 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:29e78db470fb10298b53b5cb85a25ae42fe2421dec68c675d823b957ab09b9dd -size 2460 +oid sha256:0d2838cf6ac74cc93e4419b20592bc116a666c2d2094806a93d62b94b0dbb135 +size 3136 diff --git a/assets/voxygen/voxel/figure/hair/elf/female-21.vox b/assets/voxygen/voxel/figure/hair/elf/female-21.vox old mode 100644 new mode 100755 index 48cd890ad4..60dd5b2820 --- a/assets/voxygen/voxel/figure/hair/elf/female-21.vox +++ b/assets/voxygen/voxel/figure/hair/elf/female-21.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bdb7bbafc77b1549167c0b9198357b3ed787b8e8aa59d6b8cf25ef31ff50f371 -size 3716 +oid sha256:d6bbbe6fff3219520816e5677492f7e12a10605479af2014dc5d92ed2295961e +size 2840 diff --git a/assets/voxygen/voxel/figure/hair/elf/female-3.vox b/assets/voxygen/voxel/figure/hair/elf/female-3.vox old mode 100644 new mode 100755 index 67c6de95fb..b4c12e5df7 --- 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:1ae29cf0c8b365d0358bc9ab175a90c85fc5f616a5d8fd66382503c1257f3b9b -size 2404 +oid sha256:c8e7be5d080225d60e0ccf830704b0b74a270413509f8f89502af867308b1b30 +size 2596 diff --git a/assets/voxygen/voxel/figure/hair/elf/female-4.vox b/assets/voxygen/voxel/figure/hair/elf/female-4.vox index 2d6b695a7c..8e8d5c67e3 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:95d2a6279a3adf51cf35cb5fde792d8a38538ef0edb5c137138392370ce01f1d -size 2708 +oid sha256:c32fe09c2f1681e42ce639a431281e58609dafa106226f480febcacff1c07adf +size 2816 diff --git a/assets/voxygen/voxel/figure/hair/elf/female-5.vox b/assets/voxygen/voxel/figure/hair/elf/female-5.vox index 20d231ded1..bd4b996e59 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:7f705e19f9e0d6b2535f22b97424ef29cba6ec319202647fbc05a241ac217bea -size 2312 +oid sha256:8116ddb000dbda1a618823326c0ee05ec3cbaa0c27e18eacc7009620c8e1cbe3 +size 2824 diff --git a/assets/voxygen/voxel/figure/hair/elf/female-6.vox b/assets/voxygen/voxel/figure/hair/elf/female-6.vox old mode 100644 new mode 100755 index b1097c2c66..d7e7f9c08e --- 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:7c558008dc134f8c056270186e3bcf5c14a55f02f2eecf8bedb3218b01a4e180 -size 2752 +oid sha256:78c3fd5c9cee91b22d641ed62f7faa9d5c86324c20d0e8979a2871060998f387 +size 2896 diff --git a/assets/voxygen/voxel/figure/hair/elf/female-7.vox b/assets/voxygen/voxel/figure/hair/elf/female-7.vox old mode 100644 new mode 100755 index 67aefec497..4593b29626 --- 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:f0b1c1e57101215c679058304ee7047114dcfed6e5a8618c73a8b4f26377e9ac -size 2624 +oid sha256:b08085469e7bb1004d77b523371fb42f807dfa63233b6412d1c239eefb981d5d +size 2896 diff --git a/assets/voxygen/voxel/figure/hair/elf/female-8.vox b/assets/voxygen/voxel/figure/hair/elf/female-8.vox index fb06e14504..b7a47dd0a2 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:3613c4c7bfd6018592f19376dd1f676928b6e603e7ee4c03483bc2466a5ec0a7 -size 2984 +oid sha256:da27b83be37d12eb7749fa8f619dd091cd1d86cef650266c22bb8b28d5199e30 +size 3312 diff --git a/assets/voxygen/voxel/figure/hair/elf/female-9.vox b/assets/voxygen/voxel/figure/hair/elf/female-9.vox old mode 100644 new mode 100755 index c83dfeea5a..59fe281e0f --- a/assets/voxygen/voxel/figure/hair/elf/female-9.vox +++ b/assets/voxygen/voxel/figure/hair/elf/female-9.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fca6cc008ca885f98a78194ca58210d1f6697faa686d158ca1f0bd8029e1a987 -size 3168 +oid sha256:9f006cb4a028c1fc3ceafe491daa06669abaa134e4e4a307d04f08394dcb9446 +size 3632 diff --git a/assets/voxygen/voxel/figure/hair/elf/male-0.vox b/assets/voxygen/voxel/figure/hair/elf/male-0.vox old mode 100644 new mode 100755 index a3de59ccc9..9f9729f16d --- 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:d6d6b9f6e4bdfa5ce5e1cae102803d59e42b1c1ac9778a72181459547355adf9 -size 1896 +oid sha256:eaa4755076ad9e80982ef6bb29852d62888a510a2bf5ad4efd64d04988f0b7f2 +size 2616 diff --git a/assets/voxygen/voxel/figure/hair/elf/male-1.vox b/assets/voxygen/voxel/figure/hair/elf/male-1.vox old mode 100644 new mode 100755 index fb06e14504..10b8b041ef --- a/assets/voxygen/voxel/figure/hair/elf/male-1.vox +++ b/assets/voxygen/voxel/figure/hair/elf/male-1.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3613c4c7bfd6018592f19376dd1f676928b6e603e7ee4c03483bc2466a5ec0a7 -size 2984 +oid sha256:2124639907b40e8077e563f5c8eec536c81c0d4331aa0814ed49c4d04ac7a3c9 +size 3396 diff --git a/assets/voxygen/voxel/figure/hair/elf/male-10.vox b/assets/voxygen/voxel/figure/hair/elf/male-10.vox new file mode 100755 index 0000000000..0aa7e044d8 --- /dev/null +++ b/assets/voxygen/voxel/figure/hair/elf/male-10.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c210cc2d89c3d78d43a8cc2251842ca7f076fbff22cc30a1f6c2c5123d4bbc42 +size 3360 diff --git a/assets/voxygen/voxel/figure/hair/elf/male-11.vox b/assets/voxygen/voxel/figure/hair/elf/male-11.vox new file mode 100755 index 0000000000..1ffb0f5470 --- /dev/null +++ b/assets/voxygen/voxel/figure/hair/elf/male-11.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1ce2a779747699c39fa2e73ea5956adc5d22f0f827de17e110d8f5942bf75c99 +size 2912 diff --git a/assets/voxygen/voxel/figure/hair/elf/male-12.vox b/assets/voxygen/voxel/figure/hair/elf/male-12.vox new file mode 100755 index 0000000000..122d84acd3 --- /dev/null +++ b/assets/voxygen/voxel/figure/hair/elf/male-12.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:21ed5c850a786b9fe0e3f9a0118596cbf29b95629eeae4b8ab89dbf836b66ad3 +size 3064 diff --git a/assets/voxygen/voxel/figure/hair/elf/male-13.vox b/assets/voxygen/voxel/figure/hair/elf/male-13.vox new file mode 100755 index 0000000000..15014ad874 --- /dev/null +++ b/assets/voxygen/voxel/figure/hair/elf/male-13.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2a85b59980302a2b77eaffdb7173ad65b0dbc37cc427d2f34b7b53e07a604b7a +size 2716 diff --git a/assets/voxygen/voxel/figure/hair/elf/male-14.vox b/assets/voxygen/voxel/figure/hair/elf/male-14.vox new file mode 100755 index 0000000000..3b1b5d4cc3 --- /dev/null +++ b/assets/voxygen/voxel/figure/hair/elf/male-14.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5ce4c5000eba99f01a80a169bf31d3a0636b026930643a8c2a94c8ed80c928c4 +size 3196 diff --git a/assets/voxygen/voxel/figure/hair/elf/male-2.vox b/assets/voxygen/voxel/figure/hair/elf/male-2.vox old mode 100644 new mode 100755 index 1da5dee387..0d6dc8c44c --- a/assets/voxygen/voxel/figure/hair/elf/male-2.vox +++ b/assets/voxygen/voxel/figure/hair/elf/male-2.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ef37ee588aa533263b94c0ccf0f81d303769530c4f606af4008928cf5b7331aa -size 2548 +oid sha256:713fe5f78ca3970f0611abafc71d5dd7a694745c31b30fa535b9eea7e74655dd +size 3020 diff --git a/assets/voxygen/voxel/figure/hair/elf/male-3.vox b/assets/voxygen/voxel/figure/hair/elf/male-3.vox old mode 100644 new mode 100755 index 8afc3c4e99..3412634b5e --- a/assets/voxygen/voxel/figure/hair/elf/male-3.vox +++ b/assets/voxygen/voxel/figure/hair/elf/male-3.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b2cd7e4a007367a45c73ade5c4f2b549e8b15abcb0b5b0befafa4a4b39a9f0d2 -size 2296 +oid sha256:66bb51af12324bc3777d787a8d27c42816b2c9582efe44fe59b39de63eecf434 +size 2944 diff --git a/assets/voxygen/voxel/figure/hair/elf/male-4.vox b/assets/voxygen/voxel/figure/hair/elf/male-4.vox new file mode 100755 index 0000000000..ab07ad76ec --- /dev/null +++ b/assets/voxygen/voxel/figure/hair/elf/male-4.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0c03845b745b8e599d1db7e7ea85647d7efcc48522c55f149fee1d6527755a88 +size 2976 diff --git a/assets/voxygen/voxel/figure/hair/elf/male-5.vox b/assets/voxygen/voxel/figure/hair/elf/male-5.vox new file mode 100644 index 0000000000..d0377263fb --- /dev/null +++ b/assets/voxygen/voxel/figure/hair/elf/male-5.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:daac65754b1546f1f228e784ab0cbeac3d02840ea9d3f263460d8eae9310c8c0 +size 2900 diff --git a/assets/voxygen/voxel/figure/hair/elf/male-6.vox b/assets/voxygen/voxel/figure/hair/elf/male-6.vox new file mode 100755 index 0000000000..7ae6600e6a --- /dev/null +++ b/assets/voxygen/voxel/figure/hair/elf/male-6.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6fb4cd032e4b9fa5e5051a17cc56eb4f3b8cfeb32e7d62f77223dd903d9ab810 +size 2968 diff --git a/assets/voxygen/voxel/figure/hair/elf/male-7.vox b/assets/voxygen/voxel/figure/hair/elf/male-7.vox new file mode 100755 index 0000000000..5b6d4dcfd1 --- /dev/null +++ b/assets/voxygen/voxel/figure/hair/elf/male-7.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8365c0a79e0a9df88ea1b77fae503ae1aacbdec0da4256194add9989118777df +size 2880 diff --git a/assets/voxygen/voxel/figure/hair/elf/male-8.vox b/assets/voxygen/voxel/figure/hair/elf/male-8.vox new file mode 100755 index 0000000000..7090505d16 --- /dev/null +++ b/assets/voxygen/voxel/figure/hair/elf/male-8.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bbcb94726222169b778814b51725907d81734e78a9378ac9918db8347942ca6f +size 2604 diff --git a/assets/voxygen/voxel/figure/hair/elf/male-9.vox b/assets/voxygen/voxel/figure/hair/elf/male-9.vox new file mode 100755 index 0000000000..e1ef4ff079 --- /dev/null +++ b/assets/voxygen/voxel/figure/hair/elf/male-9.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a81dbb1a4aaa9b4418440c171393872d72f084723a24ef64d5d24424dab51129 +size 2764 diff --git a/assets/voxygen/voxel/figure/hair/human/female-0.vox b/assets/voxygen/voxel/figure/hair/human/female-0.vox old mode 100644 new mode 100755 index cd30bb6c38..161d2cf172 --- 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:affe57e1e04764bf002ff027719799dad1b8f3df1629f3f3bfec13b9e430fa33 -size 2952 +oid sha256:458da2b182004c5559e759a0f180635494525eb432f1b4c0b0f774e8f563a691 +size 3052 diff --git a/assets/voxygen/voxel/figure/hair/human/female-1.vox b/assets/voxygen/voxel/figure/hair/human/female-1.vox old mode 100644 new mode 100755 index 480d525b91..0bd1b74825 --- 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:951038ce277d6194b8a11061312e0199c2df9f36a5d59d6193181307a99e56c6 -size 2376 +oid sha256:f2a2f8d1ac214610034a2cce438dada55ca6a34246a0aac4f7730c83d58661cf +size 2520 diff --git a/assets/voxygen/voxel/figure/hair/human/female-10.vox b/assets/voxygen/voxel/figure/hair/human/female-10.vox old mode 100644 new mode 100755 index 8c2670d908..1006507a41 --- 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:d83728287cc2caa9cfa02cc0d6295879a08c2b6a90e1a8c922d636aa289fcd10 -size 3552 +oid sha256:66ced27ea4e59f43901184de68b8ab49edb1f1431fab4227805db4a2ef6c403b +size 3576 diff --git a/assets/voxygen/voxel/figure/hair/human/female-11.vox b/assets/voxygen/voxel/figure/hair/human/female-11.vox old mode 100644 new mode 100755 index db849748bb..939d7cb838 --- 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:f1bdd7fc7cf521b96758442e1772a651726a4285537326e146b454bea602bdc7 -size 2020 +oid sha256:d6a2a4d189d3952d8eed0d80d2d1e0698ff2eea247b36ff241b9715ceb83eaac +size 3636 diff --git a/assets/voxygen/voxel/figure/hair/human/female-12.vox b/assets/voxygen/voxel/figure/hair/human/female-12.vox old mode 100644 new mode 100755 index d64aac0dc6..09d20c57fd --- 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:8be51f26eea7f5d9742d669bf0c0799f3619c21456e177bb1af45b55b76f16fc -size 3000 +oid sha256:6c5819c66c62b29ea3bb560b4caacfc82f30269f63fa0c6dbaa829479ca711b6 +size 3208 diff --git a/assets/voxygen/voxel/figure/hair/human/female-13.vox b/assets/voxygen/voxel/figure/hair/human/female-13.vox old mode 100644 new mode 100755 index d744df025f..ae93569b9a --- 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:1c266fa848e7f1690c6fc8e0e8004ea8f8db18c43cc4351aec526b4544c56273 -size 2644 +oid sha256:c867c3f3bfee49ea0081df2625dc0e40f4739f2fd8337d428ecb0031dcadaa79 +size 2856 diff --git a/assets/voxygen/voxel/figure/hair/human/female-14.vox b/assets/voxygen/voxel/figure/hair/human/female-14.vox old mode 100644 new mode 100755 index f3d513f8e1..f7f1924eba --- 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:35d5cf15aa12c8f107ce2ce66f7fba062ce38ed095d34940b4044c2a99b11c5a -size 1948 +oid sha256:9277dbe32588c18ee73d62ea7489aa2ef3e97740e53d3e309c19f06b8a9f5a05 +size 3096 diff --git a/assets/voxygen/voxel/figure/hair/human/female-15.vox b/assets/voxygen/voxel/figure/hair/human/female-15.vox old mode 100644 new mode 100755 index 23848ed252..fd151df33a --- 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:02fa7137248fc3e27300214ab845dd1fcdeb2707f123cf9d2f3fbc23ad3a954c -size 2388 +oid sha256:0e96c494f8dcb1ee992ee61a156d9df2c6bdaaa82f2a285322937c6bdc3b4495 +size 3292 diff --git a/assets/voxygen/voxel/figure/hair/human/female-16.vox b/assets/voxygen/voxel/figure/hair/human/female-16.vox old mode 100644 new mode 100755 index 76de90d5d8..08ada07edb --- 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:da6c1d63dd85c570c104b8573b23aedbe7d4d44d7e14b7ab05e1a5c1ff8ad7d8 -size 2356 +oid sha256:3d554a8550ead295b973cbeb9a0f2738b62a0f9c1b2f05ebd76a57abe56bcdac +size 2920 diff --git a/assets/voxygen/voxel/figure/hair/human/female-17.vox b/assets/voxygen/voxel/figure/hair/human/female-17.vox old mode 100644 new mode 100755 index dd1360f8e6..4e77c8d009 --- 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:3b557e1912c92e2163fd060c005f0fd6167a3ca41c616f13af14e36680b58336 -size 2940 +oid sha256:0908b88d0ab1dd0d352c56edf7f29420f966b11fce7a2a82015ccef4b46fc78b +size 3380 diff --git a/assets/voxygen/voxel/figure/hair/human/female-18.vox b/assets/voxygen/voxel/figure/hair/human/female-18.vox old mode 100644 new mode 100755 index 844d2454fa..db2abc7ddc --- 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:7e85e4cfd2cd14dde11bd9d13acb38366036b585a4ba85efaebb3d61a00dedde -size 2752 +oid sha256:0854f482b7f71c9f808b3399d894bad6f2a7fd5096e01b73bd8b145f34f2a434 +size 4268 diff --git a/assets/voxygen/voxel/figure/hair/human/female-19.vox b/assets/voxygen/voxel/figure/hair/human/female-19.vox old mode 100644 new mode 100755 index 48cd890ad4..e40b7ba87b --- a/assets/voxygen/voxel/figure/hair/human/female-19.vox +++ b/assets/voxygen/voxel/figure/hair/human/female-19.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bdb7bbafc77b1549167c0b9198357b3ed787b8e8aa59d6b8cf25ef31ff50f371 -size 3716 +oid sha256:486ff7e69b926823eb016e553a6f156228ab1cf95b347ad1616507b3075ede00 +size 3784 diff --git a/assets/voxygen/voxel/figure/hair/human/female-2.vox b/assets/voxygen/voxel/figure/hair/human/female-2.vox old mode 100644 new mode 100755 index 2d8a57854a..0e249c190a --- a/assets/voxygen/voxel/figure/hair/human/female-2.vox +++ b/assets/voxygen/voxel/figure/hair/human/female-2.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fad884bcd7ebd56c18df9717af7a40c00a7e3fd8c2a3d8a0f8da2b302d3d982e -size 2632 +oid sha256:f3a77b40c6811639aaf27f9ef9c0ba76bf757317dc07796c7371766d9ff5ba06 +size 2956 diff --git a/assets/voxygen/voxel/figure/hair/human/female-3.vox b/assets/voxygen/voxel/figure/hair/human/female-3.vox old mode 100644 new mode 100755 index 2f8f0d2d2a..72608d0d0c --- 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:cf159dfe30389760438ce06ed05c66e911f93f86cb0fd9bc7a00ce6a35f7ed54 -size 2404 +oid sha256:f28e058f6f05b2f4a1b83be316aed64c75867f966bec58a8c0a924b9802aeba0 +size 2512 diff --git a/assets/voxygen/voxel/figure/hair/human/female-4.vox b/assets/voxygen/voxel/figure/hair/human/female-4.vox old mode 100644 new mode 100755 index 2d6b695a7c..ef1bc8eead --- 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:95d2a6279a3adf51cf35cb5fde792d8a38538ef0edb5c137138392370ce01f1d -size 2708 +oid sha256:6649f011eff0b2bcab34181e06b06ff68d416bc306f23b8cc31e3a8ba38b0e7e +size 2768 diff --git a/assets/voxygen/voxel/figure/hair/human/female-5.vox b/assets/voxygen/voxel/figure/hair/human/female-5.vox old mode 100644 new mode 100755 index 20d231ded1..e37ab19f23 --- 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:7f705e19f9e0d6b2535f22b97424ef29cba6ec319202647fbc05a241ac217bea -size 2312 +oid sha256:7047b3f8d20cd5620fa1fdbb60269d8f3a08925012d337b7a04baf69f06e15ac +size 3052 diff --git a/assets/voxygen/voxel/figure/hair/human/female-6.vox b/assets/voxygen/voxel/figure/hair/human/female-6.vox old mode 100644 new mode 100755 index 22a75844b4..2aacc25e0d --- 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:be1836233f2b17b03e11f0c4644e03d21e5a76648cfef69e0a3546c62156141f -size 2752 +oid sha256:6428e5d924ca71e5a1db373a51ab2249d45048d1e71300d7682bb6c4bfb7aae1 +size 3392 diff --git a/assets/voxygen/voxel/figure/hair/human/female-7.vox b/assets/voxygen/voxel/figure/hair/human/female-7.vox old mode 100644 new mode 100755 index 67aefec497..ab3a84eb8a --- 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:f0b1c1e57101215c679058304ee7047114dcfed6e5a8618c73a8b4f26377e9ac -size 2624 +oid sha256:147d2cecd1c43791e9f228bc5ea371dac30f6b48a51d1ccd05c9ceefd9f876e9 +size 2904 diff --git a/assets/voxygen/voxel/figure/hair/human/female-8.vox b/assets/voxygen/voxel/figure/hair/human/female-8.vox old mode 100644 new mode 100755 index fb06e14504..dcf405804f --- 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:3613c4c7bfd6018592f19376dd1f676928b6e603e7ee4c03483bc2466a5ec0a7 -size 2984 +oid sha256:12fc1f1b9adc573630693b89caaf318bba4f7c0260f79712d4aaecc05ff7d7a9 +size 3208 diff --git a/assets/voxygen/voxel/figure/hair/human/female-9.vox b/assets/voxygen/voxel/figure/hair/human/female-9.vox index c83dfeea5a..d5b8daaafb 100644 --- a/assets/voxygen/voxel/figure/hair/human/female-9.vox +++ b/assets/voxygen/voxel/figure/hair/human/female-9.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fca6cc008ca885f98a78194ca58210d1f6697faa686d158ca1f0bd8029e1a987 -size 3168 +oid sha256:e23d354971a84989318cf689edcabcf6374d660d6f8a4202ba2e8115ba13aff0 +size 3616 diff --git a/assets/voxygen/voxel/figure/hair/human/male-0.vox b/assets/voxygen/voxel/figure/hair/human/male-0.vox old mode 100644 new mode 100755 index 456fda8663..b9361efa0b --- 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:2024f688a627847d713274522b18d6b8a8159fe89bdad49f53082086e3b79998 -size 1868 +oid sha256:0425dccfc46c7b1a8bd0bddb0e9ef5d5dd3dce4cccef2a1aff96e9bc3752c3ec +size 1872 diff --git a/assets/voxygen/voxel/figure/hair/human/male-1.vox b/assets/voxygen/voxel/figure/hair/human/male-1.vox index 456fda8663..0ea8785c9d 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:2024f688a627847d713274522b18d6b8a8159fe89bdad49f53082086e3b79998 -size 1868 +oid sha256:764af85a91d77d937f736804abb18fe2bd15cafab1f6100bb06143173859071a +size 2160 diff --git a/assets/voxygen/voxel/figure/hair/human/male-10.vox b/assets/voxygen/voxel/figure/hair/human/male-10.vox old mode 100644 new mode 100755 index 526f3e9f41..b495c1673e --- a/assets/voxygen/voxel/figure/hair/human/male-10.vox +++ b/assets/voxygen/voxel/figure/hair/human/male-10.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cd6bb8be7c2972ac967afd8029a69b38ef62251c24d23c9444b6bc612334432d -size 1688 +oid sha256:8f4af8ae4af894902394e7d08080c91b1ef21e3cb7a6a703fd9bdd05c0522ba9 +size 1904 diff --git a/assets/voxygen/voxel/figure/hair/human/male-11.vox b/assets/voxygen/voxel/figure/hair/human/male-11.vox old mode 100644 new mode 100755 index a421eefd11..e79679ccfe --- a/assets/voxygen/voxel/figure/hair/human/male-11.vox +++ b/assets/voxygen/voxel/figure/hair/human/male-11.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:22533597f6d8f7a81a1281084fe3a9b4c337a9d14ef71031cabab45474985cf8 -size 2184 +oid sha256:81b2b19e69b3ed89d4a080f6d33b2fa5b5d7f5565824474d70a3e278c6368d55 +size 2424 diff --git a/assets/voxygen/voxel/figure/hair/human/male-12.vox b/assets/voxygen/voxel/figure/hair/human/male-12.vox index ab45703d72..1a7bcd186a 100644 --- a/assets/voxygen/voxel/figure/hair/human/male-12.vox +++ b/assets/voxygen/voxel/figure/hair/human/male-12.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:17a177635a44cce26bbd3200fcfc2a9b01a49b3fc7b5e3b781bb95f719ae63c8 -size 1160 +oid sha256:ee28fa0d6afd36e58b5867fde9da8d570b77a7346d1510d43ce9cd16da9d696e +size 1368 diff --git a/assets/voxygen/voxel/figure/hair/human/male-13.vox b/assets/voxygen/voxel/figure/hair/human/male-13.vox index c7f08044da..752faad423 100644 --- a/assets/voxygen/voxel/figure/hair/human/male-13.vox +++ b/assets/voxygen/voxel/figure/hair/human/male-13.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5df340fbade4cee1999fb1dbf3f60328eaa4315479e087776addf965a1b575a0 -size 2248 +oid sha256:efcb18dbc333c45fda93e8ed38c60d4e17710e7c77bb06da35882369466bdb5e +size 2272 diff --git a/assets/voxygen/voxel/figure/hair/human/male-14.vox b/assets/voxygen/voxel/figure/hair/human/male-14.vox index 4f3dab2ae6..ecf74bd7ec 100644 --- a/assets/voxygen/voxel/figure/hair/human/male-14.vox +++ b/assets/voxygen/voxel/figure/hair/human/male-14.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d17cedccc90f82b10157c26ca774b554057167224b91a94c548b87ee80fc0319 -size 1936 +oid sha256:cad2b857d352922dd8037c8fc8494a2471a6104a6ae0750c5895ea70f42bfde9 +size 2272 diff --git a/assets/voxygen/voxel/figure/hair/human/male-15.vox b/assets/voxygen/voxel/figure/hair/human/male-15.vox index cbff54ebfc..0e8e7aa4b7 100644 --- a/assets/voxygen/voxel/figure/hair/human/male-15.vox +++ b/assets/voxygen/voxel/figure/hair/human/male-15.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:95d6ba20b2c395413694f8604e91211245d560d95ef5bf818e73c134fe616a00 -size 1948 +oid sha256:c6186ffea8df4512ba4fd5e143253e9be00517ed0955fffd4bde145d5c157753 +size 2824 diff --git a/assets/voxygen/voxel/figure/hair/human/male-16.vox b/assets/voxygen/voxel/figure/hair/human/male-16.vox index 9661760017..3a079522fe 100644 --- a/assets/voxygen/voxel/figure/hair/human/male-16.vox +++ b/assets/voxygen/voxel/figure/hair/human/male-16.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:028a3a431f30b44c5b2dc95642952deb898b9c1ff0204de1c8ee450e567203df -size 3200 +oid sha256:77897532ed18965bd87828858bf741b91ba3bae0244e201b09ddd3fb907c5920 +size 4288 diff --git a/assets/voxygen/voxel/figure/hair/human/male-17.vox b/assets/voxygen/voxel/figure/hair/human/male-17.vox old mode 100644 new mode 100755 index b449189faf..8f42b0e406 --- a/assets/voxygen/voxel/figure/hair/human/male-17.vox +++ b/assets/voxygen/voxel/figure/hair/human/male-17.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bd16b5c78c667715b5d1ee4fe0776af5b329c53cc9f4432cfc9261ae8e8e0c3c -size 2104 +oid sha256:a1e80e502e677abf8abf95179f8b4956df00b0552551cd84ace7794c191c60ee +size 2456 diff --git a/assets/voxygen/voxel/figure/hair/human/male-18.vox b/assets/voxygen/voxel/figure/hair/human/male-18.vox old mode 100644 new mode 100755 index d503e69072..e4e08bde36 --- a/assets/voxygen/voxel/figure/hair/human/male-18.vox +++ b/assets/voxygen/voxel/figure/hair/human/male-18.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dc75510d200c794c7b2729002a16079c0337298176fcbd8ebf6010cc274f95be -size 2208 +oid sha256:3080598f135d885d408bca14935e36c8f9469e9534cdd608a3a60cb802cd3ef2 +size 2464 diff --git a/assets/voxygen/voxel/figure/hair/human/male-19.vox b/assets/voxygen/voxel/figure/hair/human/male-19.vox index 22725d666e..3987f04441 100644 --- a/assets/voxygen/voxel/figure/hair/human/male-19.vox +++ b/assets/voxygen/voxel/figure/hair/human/male-19.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:37febb8aa41738ff001853e76afd683d1346aa595986cdcf2b762fb7b5d39a9c -size 1936 +oid sha256:a21e1c388bb0ce2cf8247ec3dffaa701f72361d6fe3ac8d767fbc2ed726a8ded +size 2824 diff --git a/assets/voxygen/voxel/figure/hair/human/male-2.vox b/assets/voxygen/voxel/figure/hair/human/male-2.vox old mode 100644 new mode 100755 index 017b950f0f..9348b1f11e --- 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:70ca7e4970b59b537f2e01ff0b8ca353edbf6eecfe09cae977687491fb3f618b -size 2264 +oid sha256:db3838171b47da49c9d7cfddcdbbc53d1576b791cecd8d7dcef7d47c7de14985 +size 2272 diff --git a/assets/voxygen/voxel/figure/hair/human/male-20.vox b/assets/voxygen/voxel/figure/hair/human/male-20.vox old mode 100644 new mode 100755 index 1da5dee387..78bd9b65bf --- a/assets/voxygen/voxel/figure/hair/human/male-20.vox +++ b/assets/voxygen/voxel/figure/hair/human/male-20.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ef37ee588aa533263b94c0ccf0f81d303769530c4f606af4008928cf5b7331aa -size 2548 +oid sha256:0e76fad0cd79f349ebed0d6b2c57ccdc7bc2600279d52a5e2038e16efd0e79e7 +size 2620 diff --git a/assets/voxygen/voxel/figure/hair/human/male-3.vox b/assets/voxygen/voxel/figure/hair/human/male-3.vox old mode 100644 new mode 100755 index fb06e14504..6b28462da0 --- a/assets/voxygen/voxel/figure/hair/human/male-3.vox +++ b/assets/voxygen/voxel/figure/hair/human/male-3.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3613c4c7bfd6018592f19376dd1f676928b6e603e7ee4c03483bc2466a5ec0a7 -size 2984 +oid sha256:54a1d0c1978063dd402b7b7e848044ff1db78e946dce730d6d91a59a86a31759 +size 2976 diff --git a/assets/voxygen/voxel/figure/hair/human/male-4.vox b/assets/voxygen/voxel/figure/hair/human/male-4.vox old mode 100644 new mode 100755 index 2aca26fc08..58f3b345e5 --- a/assets/voxygen/voxel/figure/hair/human/male-4.vox +++ b/assets/voxygen/voxel/figure/hair/human/male-4.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f32db1626a76cad31ac5f6fd2434ba72dcae52951db6cb82bda903e849d82c06 +oid sha256:3ba8ba35a7901cd4d22c15f514b2d9e2b6edaf185d28515f5585dd39d781d694 size 1568 diff --git a/assets/voxygen/voxel/figure/hair/human/male-5.vox b/assets/voxygen/voxel/figure/hair/human/male-5.vox old mode 100644 new mode 100755 index 648933841f..3268ca8a86 --- a/assets/voxygen/voxel/figure/hair/human/male-5.vox +++ b/assets/voxygen/voxel/figure/hair/human/male-5.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:65875c093e8b3a74b519f914d4e2f309f1e29dda003ae54c10eee21f5f1d1b7b -size 2008 +oid sha256:6b48a8a58a2a36b7042252d6adbc4297152c5db07d90f543a3c70fd9b7b5615c +size 2040 diff --git a/assets/voxygen/voxel/figure/hair/human/male-6.vox b/assets/voxygen/voxel/figure/hair/human/male-6.vox index 72297429b2..5671fc81f6 100644 --- a/assets/voxygen/voxel/figure/hair/human/male-6.vox +++ b/assets/voxygen/voxel/figure/hair/human/male-6.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:12632fd6ca5195b45aa9c4239adbf467a4db0d558cfd9b5120ee5d70d90c8da8 -size 1884 +oid sha256:574252e4f27740556e06d0be4255af890a51e9d95f2b606408c385a0e2eaf0dd +size 2504 diff --git a/assets/voxygen/voxel/figure/hair/human/male-7.vox b/assets/voxygen/voxel/figure/hair/human/male-7.vox old mode 100644 new mode 100755 index f628b67325..77bc569620 --- a/assets/voxygen/voxel/figure/hair/human/male-7.vox +++ b/assets/voxygen/voxel/figure/hair/human/male-7.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5bb469b98425dd33c26d9be23f13105b1fb14db595989df049e537d2ced6376c -size 1940 +oid sha256:8d1806b1328a8fcfa2466cd8ec9899e26c3804e9c9e79963b029eb8678ba1a7f +size 2372 diff --git a/assets/voxygen/voxel/figure/hair/human/male-8.vox b/assets/voxygen/voxel/figure/hair/human/male-8.vox old mode 100644 new mode 100755 index ce47363876..57938b2e01 --- a/assets/voxygen/voxel/figure/hair/human/male-8.vox +++ b/assets/voxygen/voxel/figure/hair/human/male-8.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4c71bbdda80e344851d8ac8fc6287ff59160b24eefcff63d4b04309ac868cc3d -size 2064 +oid sha256:a21df7b878d488974d8d6b304574ee8995255bc8cb003025164a3b63baea7c2d +size 2088 diff --git a/assets/voxygen/voxel/figure/hair/human/male-9.vox b/assets/voxygen/voxel/figure/hair/human/male-9.vox old mode 100644 new mode 100755 index 7004e8d0c2..e14f3d3f42 --- a/assets/voxygen/voxel/figure/hair/human/male-9.vox +++ b/assets/voxygen/voxel/figure/hair/human/male-9.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2ceb3f931065997603972c458252fc7790cc6bf9c6cb2cebff572c5aedc0c5c2 -size 1736 +oid sha256:dba4d99e8c7d35417c4375093321b1812c41982dd6e71d30829b7b3a3ae319a9 +size 2052 diff --git a/assets/voxygen/voxel/figure/hair/orc/bald.vox b/assets/voxygen/voxel/figure/hair/orc/bald.vox new file mode 100755 index 0000000000..46b1d36567 --- /dev/null +++ b/assets/voxygen/voxel/figure/hair/orc/bald.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:15f1cc8bf98a04e90d729c6904880727ac429428705897fbae9c97f407616368 +size 1096 diff --git a/assets/voxygen/voxel/figure/hair/orc/female-0.vox b/assets/voxygen/voxel/figure/hair/orc/female-0.vox old mode 100644 new mode 100755 index 8a0b886359..64e0efe7a9 --- a/assets/voxygen/voxel/figure/hair/orc/female-0.vox +++ b/assets/voxygen/voxel/figure/hair/orc/female-0.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6e8513b0166f1b666b3f30387b698a36cdc4f0e8f1b40ffe08e66bb1f8a067ba -size 1840 +oid sha256:6b694a63fa2dcc6f633d3ca8bab535f05ffa87138a413a3305fa33a4e0832e30 +size 2908 diff --git a/assets/voxygen/voxel/figure/hair/orc/female-1.vox b/assets/voxygen/voxel/figure/hair/orc/female-1.vox old mode 100644 new mode 100755 index 1d8151a08e..e9ed7449fa --- a/assets/voxygen/voxel/figure/hair/orc/female-1.vox +++ b/assets/voxygen/voxel/figure/hair/orc/female-1.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:77c1d8c6dfa1fa87c7cc55fa09770805d13bde44e20504eb0d0eb0fadd607964 -size 1464 +oid sha256:fc4f78026020d13eaf47962aa9e22e05493df2fc9bcaa6d98a159301a0eccf50 +size 2956 diff --git a/assets/voxygen/voxel/figure/hair/orc/female-10.vox b/assets/voxygen/voxel/figure/hair/orc/female-10.vox new file mode 100755 index 0000000000..9a199d6b31 --- /dev/null +++ b/assets/voxygen/voxel/figure/hair/orc/female-10.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:542a8124ca69e00992eaf04729c3fe56269202542b1c34229f36ad649824d870 +size 3056 diff --git a/assets/voxygen/voxel/figure/hair/orc/female-11.vox b/assets/voxygen/voxel/figure/hair/orc/female-11.vox new file mode 100755 index 0000000000..d97498c368 --- /dev/null +++ b/assets/voxygen/voxel/figure/hair/orc/female-11.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0f1bbc2fd1ed6332e75dae6a87291523eecb023f0bf21129bde69d74d20bc796 +size 3308 diff --git a/assets/voxygen/voxel/figure/hair/orc/female-12.vox b/assets/voxygen/voxel/figure/hair/orc/female-12.vox new file mode 100644 index 0000000000..deb6b48cd6 --- /dev/null +++ b/assets/voxygen/voxel/figure/hair/orc/female-12.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d47cecc749e5c59059da6a45119e441609e9785658a0eb64b344406db84e3889 +size 3312 diff --git a/assets/voxygen/voxel/figure/hair/orc/female-13.vox b/assets/voxygen/voxel/figure/hair/orc/female-13.vox new file mode 100755 index 0000000000..131daea4a2 --- /dev/null +++ b/assets/voxygen/voxel/figure/hair/orc/female-13.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:51631576d71d4129f6c0be2d9e84cbc875eeab5c28e511ed03eddaab3724fb7b +size 2744 diff --git a/assets/voxygen/voxel/figure/hair/orc/female-14.vox b/assets/voxygen/voxel/figure/hair/orc/female-14.vox new file mode 100755 index 0000000000..897e5e81cb --- /dev/null +++ b/assets/voxygen/voxel/figure/hair/orc/female-14.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0aee5228455d6048ff29a0f3468b467e11fb6d8a6e1dce74f800e68ede98e016 +size 2752 diff --git a/assets/voxygen/voxel/figure/hair/orc/female-2.vox b/assets/voxygen/voxel/figure/hair/orc/female-2.vox old mode 100644 new mode 100755 index f345a4f5ec..c200e67875 --- a/assets/voxygen/voxel/figure/hair/orc/female-2.vox +++ b/assets/voxygen/voxel/figure/hair/orc/female-2.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b827cbf9db4d3d32ff41ac5d8b59e167075f17f645637de3b18a19464927bbc9 -size 2008 +oid sha256:1d9959917b760dda7c6809236391c328ef5fdc9b2d3c87892554ce5357c39302 +size 2868 diff --git a/assets/voxygen/voxel/figure/hair/orc/female-3.vox b/assets/voxygen/voxel/figure/hair/orc/female-3.vox old mode 100644 new mode 100755 index 4c6003d01e..548c7e91f1 --- a/assets/voxygen/voxel/figure/hair/orc/female-3.vox +++ b/assets/voxygen/voxel/figure/hair/orc/female-3.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0a75131b529cffd94b2e8c805c12bbf1bd3192a869dae0aef2cdafa94375a79d -size 3136 +oid sha256:23da3125c1269e9ae3d2a5d4db9d9ac599d8da360fe4583835f24d3f77e408ad +size 3032 diff --git a/assets/voxygen/voxel/figure/hair/orc/female-4.vox b/assets/voxygen/voxel/figure/hair/orc/female-4.vox old mode 100644 new mode 100755 index e4d645dbe3..c846bde3a2 --- a/assets/voxygen/voxel/figure/hair/orc/female-4.vox +++ b/assets/voxygen/voxel/figure/hair/orc/female-4.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6a44e8d31745129f38735413e272e40add8962d1255abd0d0ca73b6f046b8401 -size 1576 +oid sha256:31baedde7da9dc6cb72d44924638007011bc0c7fca9b320fa2cdefc42f50fdd1 +size 3040 diff --git a/assets/voxygen/voxel/figure/hair/orc/female-5.vox b/assets/voxygen/voxel/figure/hair/orc/female-5.vox old mode 100644 new mode 100755 index c3f9b229d6..257a8912e7 --- a/assets/voxygen/voxel/figure/hair/orc/female-5.vox +++ b/assets/voxygen/voxel/figure/hair/orc/female-5.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b22d1657dcbf09109168c8ac565aa049a2cc00b529c39840fa7f452e1e54ba91 -size 3348 +oid sha256:73a7ea514f10f1ca85930bf46c44b02759c10fe1bc78bc04322d385565f9de92 +size 2828 diff --git a/assets/voxygen/voxel/figure/hair/orc/female-6.vox b/assets/voxygen/voxel/figure/hair/orc/female-6.vox old mode 100644 new mode 100755 index 362af34643..561018140d --- a/assets/voxygen/voxel/figure/hair/orc/female-6.vox +++ b/assets/voxygen/voxel/figure/hair/orc/female-6.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e35d4a7a3f12e59cc16cbfa36c1f07ee34beaae66ed3a3ef22408a16b0aebc97 -size 2756 +oid sha256:8fed85e57d20f3a71fccab78b8594500ed60c485f432ee273ddb438ccb46bc38 +size 2988 diff --git a/assets/voxygen/voxel/figure/hair/orc/female-7.vox b/assets/voxygen/voxel/figure/hair/orc/female-7.vox new file mode 100755 index 0000000000..46ce56d87a --- /dev/null +++ b/assets/voxygen/voxel/figure/hair/orc/female-7.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4ff0948981fc181d2a325f98bab38aa84d3bd393e72d8ba2791680aa3e25d70a +size 2800 diff --git a/assets/voxygen/voxel/figure/hair/orc/female-8.vox b/assets/voxygen/voxel/figure/hair/orc/female-8.vox new file mode 100755 index 0000000000..30c0b90e22 --- /dev/null +++ b/assets/voxygen/voxel/figure/hair/orc/female-8.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:40a93142abfa2036a72ca20dbb27c3240e022849a24b00ead72473bf00a53dfe +size 3520 diff --git a/assets/voxygen/voxel/figure/hair/orc/female-9.vox b/assets/voxygen/voxel/figure/hair/orc/female-9.vox new file mode 100755 index 0000000000..cfb6aafc10 --- /dev/null +++ b/assets/voxygen/voxel/figure/hair/orc/female-9.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:08320db07cd6afd3b049a6e1d0664f027a9afd223b8ab9da0882d51c1d4c55b8 +size 2624 diff --git a/assets/voxygen/voxel/figure/hair/orc/male-0.vox b/assets/voxygen/voxel/figure/hair/orc/male-0.vox index b2f875cbae..57e0d5ddb2 100644 --- a/assets/voxygen/voxel/figure/hair/orc/male-0.vox +++ b/assets/voxygen/voxel/figure/hair/orc/male-0.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2e1d5544f54b8ca06619965bc3ef8142a8c140024a2c38bc6ccf6a61d2d1dc5c -size 1584 +oid sha256:b86fec81e9ceffdc831e6fae198c5b53cf4a749a1790d2c48db495bcd7728282 +size 1676 diff --git a/assets/voxygen/voxel/figure/hair/orc/male-1.vox b/assets/voxygen/voxel/figure/hair/orc/male-1.vox old mode 100644 new mode 100755 index 3f56d06ddf..8995daeb1d --- a/assets/voxygen/voxel/figure/hair/orc/male-1.vox +++ b/assets/voxygen/voxel/figure/hair/orc/male-1.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ecf277433dd8023f2e8d48a6d792597a37d0ec556122c55d2747a828fe42580d -size 2032 +oid sha256:de65c90e426184ab5e52b1a44c759efddf19826f3a3a8c5a528daff7c9b7abd4 +size 2144 diff --git a/assets/voxygen/voxel/figure/hair/orc/male-10.vox b/assets/voxygen/voxel/figure/hair/orc/male-10.vox new file mode 100755 index 0000000000..d1ffaf84f4 --- /dev/null +++ b/assets/voxygen/voxel/figure/hair/orc/male-10.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:86525b84a44e6cc3d17d6400d6fea17213782214c7f89c5cc093eeca3edb083f +size 2480 diff --git a/assets/voxygen/voxel/figure/hair/orc/male-11.vox b/assets/voxygen/voxel/figure/hair/orc/male-11.vox new file mode 100644 index 0000000000..a57051c084 --- /dev/null +++ b/assets/voxygen/voxel/figure/hair/orc/male-11.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c8bc7497ff9df6eeb642ace452f7bfa7c7142d60bf2eb5f3a542191b7eaaa4f8 +size 2116 diff --git a/assets/voxygen/voxel/figure/hair/orc/male-12.vox b/assets/voxygen/voxel/figure/hair/orc/male-12.vox new file mode 100755 index 0000000000..b118958f68 --- /dev/null +++ b/assets/voxygen/voxel/figure/hair/orc/male-12.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:eae1265d130b134071cf27140ce47c210d4e1c1e75593ab5130b8c5b4ec6e5cc +size 2132 diff --git a/assets/voxygen/voxel/figure/hair/orc/male-13.vox b/assets/voxygen/voxel/figure/hair/orc/male-13.vox new file mode 100755 index 0000000000..74cfa39bd3 --- /dev/null +++ b/assets/voxygen/voxel/figure/hair/orc/male-13.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b11dcac430020aed48e1b04555ac9158871177b53aa625a23be384e32665a562 +size 1760 diff --git a/assets/voxygen/voxel/figure/hair/orc/male-2.vox b/assets/voxygen/voxel/figure/hair/orc/male-2.vox old mode 100644 new mode 100755 index 82a8db4dab..7beab44d9c --- a/assets/voxygen/voxel/figure/hair/orc/male-2.vox +++ b/assets/voxygen/voxel/figure/hair/orc/male-2.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6f492d4568ebcffb8ddc6e9dc2ad4d60a2fb26da07dedc074ab5c5a8ad1b6d18 -size 1876 +oid sha256:ce0ff1fea444b9226d08504fc482c0bb59509a4490343e7635b0dc10de42e778 +size 1944 diff --git a/assets/voxygen/voxel/figure/hair/orc/male-3.vox b/assets/voxygen/voxel/figure/hair/orc/male-3.vox old mode 100644 new mode 100755 index b01b5a0035..3b61136908 --- a/assets/voxygen/voxel/figure/hair/orc/male-3.vox +++ b/assets/voxygen/voxel/figure/hair/orc/male-3.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:598472d24ee293ec70eacf044b858ade57bc463ea0686bb3e624e655427f76b6 +oid sha256:14e0937e413b691b44957f459004107f02b5b65bea8d74a088bdcbfbd610d99a size 2004 diff --git a/assets/voxygen/voxel/figure/hair/orc/male-4.vox b/assets/voxygen/voxel/figure/hair/orc/male-4.vox old mode 100644 new mode 100755 index eeb3a067ea..c140f57f9f --- a/assets/voxygen/voxel/figure/hair/orc/male-4.vox +++ b/assets/voxygen/voxel/figure/hair/orc/male-4.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3aa93b8d72347f767e7ac426031588cb8dcb2ac1783a01fef229586e55b23810 -size 1560 +oid sha256:07f3b5d5057e79b9b4c2ce39252815929c9f8444d8e745e3241d6ca3fceb0014 +size 1596 diff --git a/assets/voxygen/voxel/figure/hair/orc/male-5.vox b/assets/voxygen/voxel/figure/hair/orc/male-5.vox old mode 100644 new mode 100755 index cbd2aa387d..a145b97dd7 --- a/assets/voxygen/voxel/figure/hair/orc/male-5.vox +++ b/assets/voxygen/voxel/figure/hair/orc/male-5.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fc434af16b04768ae07a8052d1106b847dfca0a13eba0f0f61aaf8a3ae245108 -size 1352 +oid sha256:2b2b7239d42b55ba17ce0c02dee78619190efd983aa9e64f542dbd73f4a654f6 +size 1456 diff --git a/assets/voxygen/voxel/figure/hair/orc/male-6.vox b/assets/voxygen/voxel/figure/hair/orc/male-6.vox old mode 100644 new mode 100755 index 9005904b48..0ca34a3ed5 --- a/assets/voxygen/voxel/figure/hair/orc/male-6.vox +++ b/assets/voxygen/voxel/figure/hair/orc/male-6.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c9e3b4ae37c06dc30927dca14111b22ab8331c21cb36f4802a3ab1f180dfa990 -size 2004 +oid sha256:2f8f4ed7bf72417055754eee8045a4329cc26a978eeed71b27c5908ca560ceef +size 2056 diff --git a/assets/voxygen/voxel/figure/hair/orc/male-7.vox b/assets/voxygen/voxel/figure/hair/orc/male-7.vox new file mode 100755 index 0000000000..5a37fe2d24 --- /dev/null +++ b/assets/voxygen/voxel/figure/hair/orc/male-7.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:41a218fd1cf23dda4b519e75ce058c5331b981cdcb47d7e307ece5c8314646a1 +size 2048 diff --git a/assets/voxygen/voxel/figure/hair/orc/male-8.vox b/assets/voxygen/voxel/figure/hair/orc/male-8.vox new file mode 100755 index 0000000000..6c72e9df05 --- /dev/null +++ b/assets/voxygen/voxel/figure/hair/orc/male-8.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0a01949649af5ace196c17ee6cc7a682475ae76a5b30f08a69eabf18b700a881 +size 1512 diff --git a/assets/voxygen/voxel/figure/hair/orc/male-9.vox b/assets/voxygen/voxel/figure/hair/orc/male-9.vox new file mode 100755 index 0000000000..39208642a7 --- /dev/null +++ b/assets/voxygen/voxel/figure/hair/orc/male-9.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e3012d916a08af5fc273df4d59296f79e29e88c1ac4357f904d64d3443296c61 +size 1796 diff --git a/assets/voxygen/voxel/figure/hair/undead/female-0.vox b/assets/voxygen/voxel/figure/hair/undead/female-0.vox deleted file mode 100644 index 675c1bc148..0000000000 --- a/assets/voxygen/voxel/figure/hair/undead/female-0.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9a0721044563cabaa77e80acacc7d6e51b1fadcdf058c7fe10ebdc1348839f7c -size 2012 diff --git a/assets/voxygen/voxel/figure/hair/undead/female-1.vox b/assets/voxygen/voxel/figure/hair/undead/female-1.vox deleted file mode 100644 index 144b5d96f6..0000000000 --- a/assets/voxygen/voxel/figure/hair/undead/female-1.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:acd22b0a08cf9957c6ccd753bb42ea28416f03cb94a7992cd627021c1a701d03 -size 3016 diff --git a/assets/voxygen/voxel/figure/hair/undead/female-2.vox b/assets/voxygen/voxel/figure/hair/undead/female-2.vox deleted file mode 100644 index 21e4a2ff84..0000000000 --- a/assets/voxygen/voxel/figure/hair/undead/female-2.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9cbd8d99641825f711f10e79107f5b1a81a232e957243e470e65b334a37a9c2f -size 1880 diff --git a/assets/voxygen/voxel/figure/hair/undead/female-3.vox b/assets/voxygen/voxel/figure/hair/undead/female-3.vox deleted file mode 100644 index f3ddccc5f1..0000000000 --- a/assets/voxygen/voxel/figure/hair/undead/female-3.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0c5c991cc7fb399e2a33293aa3aefaf659aa45027701c1e05bd5bd7a6a1d70ff -size 1892 diff --git a/assets/voxygen/voxel/figure/hair/undead/female-4.vox b/assets/voxygen/voxel/figure/hair/undead/female-4.vox deleted file mode 100644 index 4412f1da64..0000000000 --- a/assets/voxygen/voxel/figure/hair/undead/female-4.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:32125220a5c1ca1cc5b8166b7eae18cf922d85efe74ad2185c2ab254f6392067 -size 2004 diff --git a/assets/voxygen/voxel/figure/hair/undead/female-5.vox b/assets/voxygen/voxel/figure/hair/undead/female-5.vox deleted file mode 100644 index d895a1375a..0000000000 --- a/assets/voxygen/voxel/figure/hair/undead/female-5.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:72fd2eacdce6e82d0977ebb721cddccd61ae55fab6ee7b189450fa33a34570ea -size 2272 diff --git a/assets/voxygen/voxel/figure/hair/undead/male-0.vox b/assets/voxygen/voxel/figure/hair/undead/male-0.vox deleted file mode 100644 index 300ca183d3..0000000000 --- a/assets/voxygen/voxel/figure/hair/undead/male-0.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6cd0fcd4ca772ff15467fdf31e09f57ede91d91017af5ea2d1470182af24b211 -size 1960 diff --git a/assets/voxygen/voxel/figure/hair/undead/male-1.vox b/assets/voxygen/voxel/figure/hair/undead/male-1.vox deleted file mode 100644 index 5edc433b8c..0000000000 --- a/assets/voxygen/voxel/figure/hair/undead/male-1.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d13b6572d9a830d3fc02f4254ef368b340d9d85c5d307875a993a0eecd29572d -size 1412 diff --git a/assets/voxygen/voxel/figure/hair/undead/male-2.vox b/assets/voxygen/voxel/figure/hair/undead/male-2.vox deleted file mode 100644 index d9c46b6239..0000000000 --- a/assets/voxygen/voxel/figure/hair/undead/male-2.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:368d9e1705208599ffc53fc9f8ef4fd803408b495e24ea68c6545ebe7faa91d8 -size 1416 diff --git a/assets/voxygen/voxel/figure/hair/undead/male-3.vox b/assets/voxygen/voxel/figure/hair/undead/male-3.vox deleted file mode 100644 index 3691658dbf..0000000000 --- a/assets/voxygen/voxel/figure/hair/undead/male-3.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f11bf21b0dbef0e79a60f5b3f8c63e03daa2efa1a2c7d3ae09a499ce208b45c2 -size 1864 diff --git a/assets/voxygen/voxel/figure/head/danari/female.vox b/assets/voxygen/voxel/figure/head/danari/female.vox old mode 100644 new mode 100755 index 8868d56f30..c18c17edab --- a/assets/voxygen/voxel/figure/head/danari/female.vox +++ b/assets/voxygen/voxel/figure/head/danari/female.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5b10d54c8bef697cb5d34fe313d1e744a47c4588de1c281dde5b629ed88b045f -size 3248 +oid sha256:0697b55219900cfa60fcaa1dbd160ba0fd8f9fff6a205c6f10dbc538f7a54abf +size 3224 diff --git a/assets/voxygen/voxel/figure/head/danari/male.vox b/assets/voxygen/voxel/figure/head/danari/male.vox old mode 100644 new mode 100755 index 5e94ff4429..c9cb59d28f --- 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:def17019457774071beae4ecffe98ee47232fd8885fb419bd04b0229f31a8620 -size 3312 +oid sha256:5f1fade33458d0e2d05aa2d5299c64f1225ee24aa3d742366e567d28938917b8 +size 3320 diff --git a/assets/voxygen/voxel/figure/head/draugr/female.vox b/assets/voxygen/voxel/figure/head/draugr/female.vox new file mode 100755 index 0000000000..54ba72cecb --- /dev/null +++ b/assets/voxygen/voxel/figure/head/draugr/female.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1c45f6a14bbfd38e91a4a347c84a33c764301469ee9abd36b78cb63e2512833d +size 3312 diff --git a/assets/voxygen/voxel/figure/head/draugr/male.vox b/assets/voxygen/voxel/figure/head/draugr/male.vox new file mode 100644 index 0000000000..f9b3035307 --- /dev/null +++ b/assets/voxygen/voxel/figure/head/draugr/male.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:53f98e80b56f8a622579445319ce9197d2f2fc3835c8a08c32a410c2ba2aadfe +size 3144 diff --git a/assets/voxygen/voxel/figure/head/orc/female.vox b/assets/voxygen/voxel/figure/head/orc/female.vox index 309f3bfe66..70d5f651fc 100644 --- a/assets/voxygen/voxel/figure/head/orc/female.vox +++ b/assets/voxygen/voxel/figure/head/orc/female.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a5ed0b6d1c545b7a24a92f0cb5a481736c50263f43f93276bb4813452d7223e2 -size 3216 +oid sha256:7471a3eae3b57552abb5df5280a44c68438b4b832a53202ae3fc2e63673b6272 +size 3280 diff --git a/assets/voxygen/voxel/figure/head/undead/female.vox b/assets/voxygen/voxel/figure/head/undead/female.vox deleted file mode 100644 index 9dc1d84f33..0000000000 --- a/assets/voxygen/voxel/figure/head/undead/female.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0f7e459f4f4f5acc312d533650b6d207ab74a4a90ce6ab9c92f0c24845a81691 -size 3300 diff --git a/assets/voxygen/voxel/figure/head/undead/male.vox b/assets/voxygen/voxel/figure/head/undead/male.vox deleted file mode 100644 index e28b12e47d..0000000000 --- a/assets/voxygen/voxel/figure/head/undead/male.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d1cb58732a4086bf5f48f727d800de2bed3230b87c975f38dbc30044715fb3eb -size 3016 diff --git a/assets/voxygen/voxel/humanoid_armor_head_manifest.ron b/assets/voxygen/voxel/humanoid_armor_head_manifest.ron index df7ec71da6..52dbf217f9 100644 --- a/assets/voxygen/voxel/humanoid_armor_head_manifest.ron +++ b/assets/voxygen/voxel/humanoid_armor_head_manifest.ron @@ -20,7 +20,7 @@ vox_spec: ("armor.misc.head.exclamation", (-11.0, -12.0, 18.0)), color: None ), - (Undead, Male, "common.items.armor.misc.head.exclamation"): ( + (Draugr, Male, "common.items.armor.misc.head.exclamation"): ( vox_spec: ("armor.misc.head.exclamation", (-14.0, -11.0, 18.0)), color: None ),//fix @@ -61,11 +61,11 @@ vox_spec: ("armor.witch.hat", (-2.0, -5.0, 7.0)), color: None ), - (Undead, Male, "common.items.armor.witch.hat"): ( + (Draugr, Male, "common.items.armor.witch.hat"): ( vox_spec: ("armor.witch.hat", (-6.0, -5.0, 7.0)), color: None ), - (Undead, Female, "common.items.armor.witch.hat"): ( + (Draugr, Female, "common.items.armor.witch.hat"): ( vox_spec: ("armor.witch.hat", (-6.0, -5.0, 6.0)), color: None ), @@ -110,11 +110,11 @@ vox_spec: ("armor.misc.head.hog_hood", (-2.0, -5, -6)), color: None ), - (Undead, Male, "common.items.armor.misc.head.hog_hood"): ( + (Draugr, Male, "common.items.armor.misc.head.hog_hood"): ( vox_spec: ("armor.misc.head.hog_hood", (-6.0, -5.0, -7.0)), color: None ), - (Undead, Female, "common.items.armor.misc.head.hog_hood"): ( + (Draugr, Female, "common.items.armor.misc.head.hog_hood"): ( vox_spec: ("armor.misc.head.hog_hood", (-6.0, -5.0, -8.0)), color: None ), @@ -151,11 +151,11 @@ vox_spec: ("armor.misc.head.bamboo_twig", (-1.0, 3.0, -4.0)), color: None ), - (Undead, Male, "common.items.armor.misc.head.bamboo_twig"): ( + (Draugr, Male, "common.items.armor.misc.head.bamboo_twig"): ( vox_spec: ("armor.misc.head.bamboo_twig", (-3.0, 1.0, -2.0)), color: None ), - (Undead, Female, "common.items.armor.misc.head.bamboo_twig"): ( + (Draugr, Female, "common.items.armor.misc.head.bamboo_twig"): ( vox_spec: ("armor.misc.head.bamboo_twig", (-3.0, 1.0, -3.0)), color: None ), @@ -208,11 +208,11 @@ vox_spec: ("armor.misc.head.wanderers_hat", (-2, -6.0, 6.0)), color: None ), - (Undead, Male, "common.items.armor.misc.head.wanderers_hat"): ( + (Draugr, Male, "common.items.armor.misc.head.wanderers_hat"): ( vox_spec: ("armor.misc.head.wanderers_hat", (-6, -6.0, 5.0)), color: None ), - (Undead, Female, "common.items.armor.misc.head.wanderers_hat"): ( + (Draugr, Female, "common.items.armor.misc.head.wanderers_hat"): ( vox_spec: ("armor.misc.head.wanderers_hat", (-6, -6.0, 5.0)), color: None ), @@ -258,11 +258,11 @@ vox_spec: ("armor.pirate.hat", (-2.0, -4.0, 7.0)), color: None ), - (Undead, Male, "common.items.armor.pirate.hat"): ( + (Draugr, Male, "common.items.armor.pirate.hat"): ( vox_spec: ("armor.pirate.hat", (-6.0, -4.0, 7.0)), color: None ), - (Undead, Female, "common.items.armor.pirate.hat"): ( + (Draugr, Female, "common.items.armor.pirate.hat"): ( vox_spec: ("armor.pirate.hat", (-6.0, -4.0, 6.0)), color: None ), @@ -307,11 +307,11 @@ vox_spec: ("armor.blacksmith.hat", (-2.0, 1.0, -1.0)), color: None ), - (Undead, Male, "common.items.armor.blacksmith.hat"): ( + (Draugr, Male, "common.items.armor.blacksmith.hat"): ( vox_spec: ("armor.blacksmith.hat", (-6.0, 0.0, -1.0)), color: None ), - (Undead, Female, "common.items.armor.blacksmith.hat"): ( + (Draugr, Female, "common.items.armor.blacksmith.hat"): ( vox_spec: ("armor.blacksmith.hat", (-6.0, 0.0, -2.0)), color: None ), @@ -356,11 +356,11 @@ vox_spec: ("armor.alchemist.hat", (-2.0, 1.0, 3.0)), color: None ), - (Undead, Male, "common.items.armor.alchemist.hat"): ( + (Draugr, Male, "common.items.armor.alchemist.hat"): ( vox_spec: ("armor.alchemist.hat", (-6.0, 0.0, 3.0)), color: None ), - (Undead, Female, "common.items.armor.alchemist.hat"): ( + (Draugr, Female, "common.items.armor.alchemist.hat"): ( vox_spec: ("armor.alchemist.hat", (-6.0, 0.0, 2.0)), color: None ), @@ -405,11 +405,11 @@ vox_spec: ("armor.chef.hat", (-2.0, -5.0, 7.0)), color: None ), - (Undead, Male, "common.items.armor.chef.hat"): ( + (Draugr, Male, "common.items.armor.chef.hat"): ( vox_spec: ("armor.chef.hat", (-6.0, -5.0, 7.0)), color: None ), - (Undead, Female, "common.items.armor.chef.hat"): ( + (Draugr, Female, "common.items.armor.chef.hat"): ( vox_spec: ("armor.chef.hat", (-6.0, -5.0, 6.0)), color: None ), @@ -454,11 +454,11 @@ vox_spec: ("armor.misc.head.straw", (-2.0, -5.0, 7.0)), color: None ), - (Undead, Male, "common.items.armor.misc.head.straw"): ( + (Draugr, Male, "common.items.armor.misc.head.straw"): ( vox_spec: ("armor.misc.head.straw", (-6.0, -5.0, 7.0)), color: None ), - (Undead, Female, "common.items.armor.misc.head.straw"): ( + (Draugr, Female, "common.items.armor.misc.head.straw"): ( vox_spec: ("armor.misc.head.straw", (-6.0, -5.0, 6.0)), color: None ), @@ -503,11 +503,11 @@ vox_spec: ("armor.misc.head.crown", (-2.0, -5.0, 7.0)), color: None ), - (Undead, Male, "common.items.armor.misc.head.crown"): ( + (Draugr, Male, "common.items.armor.misc.head.crown"): ( vox_spec: ("armor.misc.head.crown", (-6.0, -5.0, 7.0)), color: None ), - (Undead, Female, "common.items.armor.misc.head.crown"): ( + (Draugr, Female, "common.items.armor.misc.head.crown"): ( vox_spec: ("armor.misc.head.crown", (-6.0, -5.0, 6.0)), color: None ), @@ -552,11 +552,11 @@ vox_spec: ("armor.misc.head.mitre", (-2.0, -5.0, 7.0)), color: None ), - (Undead, Male, "common.items.armor.misc.head.mitre"): ( + (Draugr, Male, "common.items.armor.misc.head.mitre"): ( vox_spec: ("armor.misc.head.mitre", (-6.0, -5.0, 7.0)), color: None ), - (Undead, Female, "common.items.armor.misc.head.mitre"): ( + (Draugr, Female, "common.items.armor.misc.head.mitre"): ( vox_spec: ("armor.misc.head.mitre", (-6.0, -5.0, 6.0)), color: None ), @@ -601,12 +601,12 @@ vox_spec: ("armor.misc.head.headband.orc_f", (3.0, 1.0, 5.0)), color: None ), - (Undead, Male, "common.items.armor.misc.head.headband"): ( - vox_spec: ("armor.misc.head.headband.undead_m", (0.0, 2.0, 7.0)), + (Draugr, Male, "common.items.armor.misc.head.headband"): ( + vox_spec: ("armor.misc.head.headband.draugr_m", (0.0, 2.0, 7.0)), color: Some((44, 74, 109)) ), - (Undead, Female, "common.items.armor.misc.head.headband"): ( - vox_spec: ("armor.misc.head.headband.undead_f", (0.0, 2.0, 6.0)), + (Draugr, Female, "common.items.armor.misc.head.headband"): ( + vox_spec: ("armor.misc.head.headband.draugr_f", (0.0, 2.0, 6.0)), color: None ), (Elf, Male, "common.items.armor.misc.head.headband"): ( @@ -650,11 +650,11 @@ vox_spec: ("armor.misc.head.helmet", (-3.0, -3.0, -1.0)), color: None ), - (Undead, Female, "common.items.armor.misc.head.helmet"): ( + (Draugr, Female, "common.items.armor.misc.head.helmet"): ( vox_spec: ("armor.misc.head.helmet", (-6.0, -5.0, -1.0)), color: None ), - (Undead, Male, "common.items.armor.misc.head.helmet"): ( + (Draugr, Male, "common.items.armor.misc.head.helmet"): ( vox_spec: ("armor.misc.head.helmet", (-6.0, -5.0, 1.0)), color: None ), @@ -691,11 +691,11 @@ vox_spec: ("armor.misc.head.bandana.red", (-4.0, -2.0, -10.0)), color: None ), - (Undead, Male, "common.items.armor.misc.head.bandana.red"): ( + (Draugr, Male, "common.items.armor.misc.head.bandana.red"): ( vox_spec: ("armor.misc.head.bandana.red", (-6.0, -2.0, -8.0)), color: None ), - (Undead, Female, "common.items.armor.misc.head.bandana.red"): ( + (Draugr, Female, "common.items.armor.misc.head.bandana.red"): ( vox_spec: ("armor.misc.head.bandana.red", (-6.0, -2.0, -9.0)), color: None ), @@ -740,11 +740,11 @@ vox_spec: ("armor.misc.head.bandana.thief", (-4.0, -2.0, -10.0)), color: None ), - (Undead, Male, "common.items.armor.misc.head.bandana.thief"): ( + (Draugr, Male, "common.items.armor.misc.head.bandana.thief"): ( vox_spec: ("armor.misc.head.bandana.thief", (-6.0, -2.0, -8.0)), color: None ), - (Undead, Female, "common.items.armor.misc.head.bandana.thief"): ( + (Draugr, Female, "common.items.armor.misc.head.bandana.thief"): ( vox_spec: ("armor.misc.head.bandana.thief", (-6.0, -2.0, -9.0)), color: None ), @@ -789,11 +789,11 @@ vox_spec: ("armor.cultist.bandana", (-4.0, 0.0, -10.0)), color: None ), - (Undead, Male, "common.items.armor.cultist.bandana"): ( + (Draugr, Male, "common.items.armor.cultist.bandana"): ( vox_spec: ("armor.cultist.bandana", (-6.0, -1.0, -8.0)), color: None ), - (Undead, Female, "common.items.armor.cultist.bandana"): ( + (Draugr, Female, "common.items.armor.cultist.bandana"): ( vox_spec: ("armor.cultist.bandana", (-6.0, -1.0, -9.0)), color: None ), @@ -846,11 +846,11 @@ vox_spec: ("armor.misc.head.hood", (-2.0, -6.0, -2.0)), color: None ), - (Undead, Male, "common.items.armor.misc.head.hood"): ( + (Draugr, Male, "common.items.armor.misc.head.hood"): ( vox_spec: ("armor.misc.head.hood", (-6.0, -6.0, -2.0)), color: None ), - (Undead, Female, "common.items.armor.misc.head.hood"): ( + (Draugr, Female, "common.items.armor.misc.head.hood"): ( vox_spec: ("armor.misc.head.hood", (-6.0, -6.0, -3.0)), color: None ), @@ -895,11 +895,11 @@ vox_spec: ("armor.misc.head.hood_dark", (-2.0, -7.0, -3.0)), color: None ), - (Undead, Male, "common.items.armor.misc.head.hood_dark"): ( + (Draugr, Male, "common.items.armor.misc.head.hood_dark"): ( vox_spec: ("armor.misc.head.hood_dark", (-6.0, -7.0, -3.0)), color: None ), - (Undead, Female, "common.items.armor.misc.head.hood_dark"): ( + (Draugr, Female, "common.items.armor.misc.head.hood_dark"): ( vox_spec: ("armor.misc.head.hood_dark", (-6.0, -7.0, -4.0)), color: None ), @@ -944,11 +944,11 @@ vox_spec: ("armor.misc.head.spikeguard", (-2.0, -4.0, 9.0)), color: None ), - (Undead, Male, "common.items.armor.misc.head.spikeguard"): ( + (Draugr, Male, "common.items.armor.misc.head.spikeguard"): ( vox_spec: ("armor.misc.head.spikeguard", (-6.0, -4.0, 7.0)), color: None ), - (Undead, Female, "common.items.armor.misc.head.spikeguard"): ( + (Draugr, Female, "common.items.armor.misc.head.spikeguard"): ( vox_spec: ("armor.misc.head.spikeguard", (-6.0, -4.0, 7.0)), color: None ), @@ -993,11 +993,11 @@ vox_spec: ("armor.merchant.turban", (-2.0, -7.0, -4.0)), color: None ), - (Undead, Male, "common.items.armor.merchant.turban"): ( + (Draugr, Male, "common.items.armor.merchant.turban"): ( vox_spec: ("armor.merchant.turban", (-6.0, -7.0, -4.0)), color: None ), - (Undead, Female, "common.items.armor.merchant.turban"): ( + (Draugr, Female, "common.items.armor.merchant.turban"): ( vox_spec: ("armor.merchant.turban", (-6.0, -7.0, -5.0)), color: None ), @@ -1042,11 +1042,11 @@ vox_spec: ("armor.misc.head.winged_coronet", (-2.0, -3.0, 0.0)), color: None ), - (Undead, Male, "common.items.armor.misc.head.winged_coronet"): ( + (Draugr, Male, "common.items.armor.misc.head.winged_coronet"): ( vox_spec: ("armor.misc.head.winged_coronet", (-6.0, -5.0, 0.0)), color: None ), - (Undead, Female, "common.items.armor.misc.head.winged_coronet"): ( + (Draugr, Female, "common.items.armor.misc.head.winged_coronet"): ( vox_spec: ("armor.misc.head.winged_coronet", (-6.0, -5.0, -1.0)), color: None ), @@ -1091,11 +1091,11 @@ vox_spec: ("armor.misc.head.boreal_warhelm", (-2.0, -6.0, -2.0)), color: None ), - (Undead, Male, "common.items.armor.misc.head.boreal_warhelm"): ( + (Draugr, Male, "common.items.armor.misc.head.boreal_warhelm"): ( vox_spec: ("armor.misc.head.boreal_warhelm", (-6.0, -6.0, -3.0)), color: None ), - (Undead, Female, "common.items.armor.misc.head.boreal_warhelm"): ( + (Draugr, Female, "common.items.armor.misc.head.boreal_warhelm"): ( vox_spec: ("armor.misc.head.boreal_warhelm", (-6.0, -6.0, -3.0)), color: None ), @@ -1140,11 +1140,11 @@ vox_spec: ("armor.misc.head.woolly_wintercap", (-2.0, -7.0, -2.0)), color: None ), - (Undead, Male, "common.items.calendar.christmas.armor.misc.head.woolly_wintercap"): ( + (Draugr, Male, "common.items.calendar.christmas.armor.misc.head.woolly_wintercap"): ( vox_spec: ("armor.misc.head.woolly_wintercap", (-6.0, -7.0, -3.0)), color: None ), - (Undead, Female, "common.items.calendar.christmas.armor.misc.head.woolly_wintercap"): ( + (Draugr, Female, "common.items.calendar.christmas.armor.misc.head.woolly_wintercap"): ( vox_spec: ("armor.misc.head.woolly_wintercap", (-6.0, -7.0, -4.0)), color: None ), diff --git a/assets/voxygen/voxel/humanoid_color_manifest.ron b/assets/voxygen/voxel/humanoid_color_manifest.ron index 0ca7742fcb..79d0351f32 100644 --- a/assets/voxygen/voxel/humanoid_color_manifest.ron +++ b/assets/voxygen/voxel/humanoid_color_manifest.ron @@ -7,279 +7,434 @@ // longer be something you need to worry about. hair_colors: ( Danari: [ - (198, 169, 113), // Philosopher's Grey - //(245, 232, 175), // Cream Blonde - //(228, 208, 147), // Gold Blonde - //(228, 223, 141), // Platinum Blonde - (176, 106, 41), // Summer Blonde - (107, 76, 51), // Oak - //(203, 154, 98), // Light - (64, 32, 18), // Skin7 - (86, 72, 71), // Ash - (57, 56, 61), // Raven Black - (101, 83, 95), // Matte Purple - (101, 57, 90), // Witch Purple - (107, 32, 60), // Grape Purple - (135, 38, 39), // Dark Red - (88, 26, 29), // Wine Red - //(146, 32, 32), // Autumn Red - (20, 19, 17), // Black + (166, 168, 138), // Philosopher's Grey + (211, 226, 171), // Fresh Blonde + (34, 69, 27), // Dark Green + (53, 119, 40), // Seaweed Green + (14, 69, 47), // Sea Green + (19, 53, 52), // Deepsea Blue + (20, 38, 61), // Deep Blue + (21, 22, 53), // Midnight Blue + (143, 122, 185), // Lilac + (56, 51, 78), // Magic Purple + (101, 83, 95), // Matte Purple + (101, 57, 90), // Witch Purple + (107, 32, 60), // Grape Purple + (146, 32, 45), // Autumn Red + (88, 26, 29), // Wine Red + (147, 195, 234), // Icy Blue + (20, 19, 17), // Black ], Dwarf: [ - (210, 204, 130), // Platinum Blonde - (220, 199, 119), // Cream Blonde - (212, 156, 73), // Gold Blonde - (176, 106, 41), // Summer Blonde - (216, 146, 114), // Matte Pink - (107, 76, 51), // Oak - (203, 154, 98), // Light - (64, 32, 18), // Skin7 - (86, 72, 71), // Ash - (57, 56, 61), // Raven Black - (101, 83, 95), // Matte Purple - (101, 57, 90), // Witch Purple - (135, 38, 39), // Dark Red - (88, 26, 29), // Wine Red - (191, 228, 254), // Ice NobleBlue - (92, 80, 144), // Kingfisher Blue - (146, 198, 238), // Lagoon Blue - (146, 166, 172), // Matte Green - (0, 139, 58), // Grass Green - (48, 61, 52), // Dark Green - (20, 19, 17), // Black + (226, 213, 208), // White + (160, 150, 147), // Light silver + (94, 88, 86), // Silver + (152, 96, 47), // Light brown + (102, 50, 27), // Rust brown + (107, 76, 51), // Oak + (185, 144, 98), // Birch + (64, 32, 18), // Skin7 + (86, 71, 78), // Soot + (57, 56, 61), // Raven Black + (101, 83, 95), // Matte Purple + (44, 38, 45), // Deep Purple + (135, 38, 39), // Dark Red + (88, 26, 29), // Wine Red + (191, 228, 254), // Ice NobleBlue + (176, 81, 55), // Bright Red + (152, 59, 36), // Autumn Red + (146, 166, 172), // Matte Green + (77, 94, 74), // Moss Green + (48, 61, 52), // Dark Green + (20, 19, 17), // Black ], Elf: [ - (66, 83, 113), // Mysterious Blue - (13, 76, 41), // Rainforest Green - (245, 232, 175), // Cream Blonde - (212, 156, 73), // Gold Blonde - (228, 223, 141), // Platinum Blonde - (176, 106, 41), // Summer Blonde - (107, 76, 51), // Oak - (203, 154, 98), // Light - (64, 32, 18), // Skin7 - (86, 72, 71), // Ash - (57, 56, 61), // Raven Black - (101, 83, 95), // Matte Purple - (101, 57, 90), // Witch Purple - (135, 38, 39), // Dark Red - (88, 26, 29), // Wine Red - (103, 191, 254), // Ice Blue - (92, 80, 144), // Kingfisher Blue - (146, 198, 238), // Lagoon Blue - (80, 156, 211), // Candy Pink - (216, 146, 114), // Matte Pink - (146, 166, 172), // Matte Green - (84, 139, 107), // Grass Green - (48, 61, 52), // Dark Green - (20, 19, 17), // Black + (66, 83, 113), // Mysterious Blue + (13, 76, 41), // Rainforest Green + (245, 232, 175), // Cream Blonde + (245, 240, 209), // Silver Blonde + (228, 223, 141), // Platinum Blonde + (176, 81, 55), // Light Red + (152, 59, 36), // Autumn Red + (201, 196, 178), // Silver + (250, 243, 238), // White + (86, 71, 78), // Ash + (57, 56, 61), // Raven Black + (111, 87, 108), // Dark Purple + (101, 57, 90), // Witch Purple + (135, 38, 39), // Dark Red + (88, 26, 29), // Wine Red + (103, 191, 254), // Ice Blue + (92, 80, 144), // Kingfisher Blue + (146, 198, 238), // Lagoon Blue + (80, 156, 211), // Candy Pink + (216, 146, 114), // Matte Pink + (146, 166, 172), // Matte Green + (84, 139, 107), // Grass Green + (48, 61, 52), // Dark Green + (20, 19, 17), // Black ], Human: [ - (210, 204, 130), // Platinum Blonde - (220, 199, 119), // Cream Blonde - (212, 156, 73), // Gold Blonde - (176, 106, 41), // Summer Blonde - (216, 146, 114), // Matte Pink - (203, 200, 98), // Light - (107, 76, 51), // Oak - (64, 32, 18), // Skin7 - (86, 72, 81), // Ash - (57, 56, 61), // Raven Black - (101, 83, 95), // Matte Purple - (101, 57, 90), // Witch Purple - (135, 38, 39), // Dark Red - (88, 26, 29), // Wine Red - (114, 137, 211), // Ice Blue - (92, 80, 144), // Kingfisher Blue - (146, 198, 238), // Lagoon Blue - (80, 156, 211), // Candy Pink - (146, 166, 172), // Matte Green - (84, 139, 107), // Grass Green - (48, 61, 52), // Dark Green - (20, 19, 17), // Black + (210, 204, 130), // Platinum Blonde + (220, 199, 119), // Cream Blonde + (212, 156, 73), // Gold Blonde + (176, 106, 41), // Summer Blonde + (216, 146, 114), // Matte Pink + (203, 200, 98), // Light + (107, 76, 51), // Oak + (97, 46, 19), // Light Brown + (64, 32, 18), // Dark Brown + (57, 56, 61), // Raven Black + (47, 36, 30), // Deep Brown + (89, 55, 49), // Matte Red + (135, 38, 39), // Dark Red + (88, 26, 29), // Wine Red + (138, 50, 9), // Orange + (154, 70, 10), // Bright Orange + (239, 242, 245), // White + (204, 201, 199), // Gray 1 + (146, 141, 136), // Gray 2 + (97, 92, 88), // Gray 3 + (56, 55, 54), // Gray 4 + (20, 19, 17), // Black ], Orc: [ - (66, 66, 59), // Wise Grey - //(107, 76, 51), // Oak - //(203, 154, 98), // Light - (64, 32, 18), // Skin7 - (54, 30, 26), // Dark Skin7 - (86, 72, 71), // Ash - (57, 56, 61), // Raven Black - (101, 83, 95), // Matte Purple - (101, 57, 90), // Witch Purple - (135, 38, 39), // Dark Red - (88, 26, 29), // Wine Red - (66, 83, 113), // Mysterious Blue - (20, 19, 17), // Black + (66, 66, 59), // Wise Grey + (119, 119, 109), // Silver + (242, 233, 215), // White + (64, 32, 18), // Skin7 + (54, 30, 26), // Dark Skin7 + (86, 72, 71), // Ash + (57, 56, 61), // Raven Black + (37, 45, 37), // Dark Green + (44, 38, 45), // Deep Purple + (135, 38, 39), // Dark Red + (88, 26, 29), // Wine Red + (36, 42, 53), // Dark Blue + (20, 19, 17), // Black ], - Undead: [ - //(245, 232, 175), // Cream Blonde - (228, 208, 147), // Gold Blonde - //(228, 223, 141), // Platinum Blonde - (176, 106, 41), // Summer Blonde - (107, 76, 51), // Oak - (203, 154, 98), // Light - (64, 32, 18), // Skin7 - (86, 72, 71), // Ash - (57, 56, 61), // Raven Black - (101, 83, 95), // Matte Purple - (101, 57, 90), // Witch Purple - (111, 54, 117), // Punky Purple - (135, 38, 39), // Dark Red - (88, 26, 29), // Wine Red - (103, 191, 254), // Ice Blue - (92, 80, 144), // Kingfisher Blue - (146, 198, 238), // Lagoon Blue - (66, 66, 59), // Decayed Grey - //(80, 156, 211), // Candy Pink - (216, 146, 114), // Matte Pink - (0, 131, 122), // Rotten Green - (146, 166, 172), // Matte Green - (84, 139, 107), // Grass Green - (48, 61, 52), // Dark Green - (20, 19, 17), // Black + Draugr: [ + (245, 232, 175), // Cream Blonde + (193, 182, 152), // Dead Blonde + (135, 131, 83), // Rotten Blonde + (50, 40, 32), // Grey Brown + (147, 160, 157), // Grey + (223, 242, 241), // White + (110, 111, 94), // Acid Grey + (86, 72, 71), // Ash + (57, 56, 61), // Raven Black + (101, 83, 95), // Matte Purple + (78, 59, 73), // Darker Purple + (81, 43, 86), // Punky Purple + (111, 37, 37), // Blood Red + (53, 24, 25), // Hellish Red + (84, 146, 193), // Ghostly Blue + (92, 80, 144), // Sea Green + (146, 198, 238), // Lagoon Blue + (66, 66, 59), // Decayed Grey + (30, 47, 61), // Deep Blue + (40, 75, 91), // Night Blue + (40, 131, 123), // Rotten Green + (125, 172, 161), // Matte Green + (70, 94, 57), // Swamp Green + (48, 61, 52), // Dark Green + (20, 19, 17), // Black ], ), + // Alphabetical Order eye_colors_light: ( - VigorousBlack: (71, 59, 49), - NobleBlue: (75, 158, 191), - CuriousGreen: (110, 167, 113), - LoyalBrown: (73, 42, 36), - ViciousRed: (169,0 ,47), - PumpkinOrange: (220, 156, 19), - GhastlyYellow: (221, 225, 31), - MagicPurple: (137, 4, 177), - ToxicGreen: (1, 223, 1), - ExoticPurple: (95, 32, 111), - SulfurYellow: (235, 198, 94), AmberOrange: (137, 46, 1), - PineGreen: (0, 78, 56), + AmberYellow: (226, 168, 54), + BrightBrown: (73, 41, 13), CornflowerBlue: (18, 66, 90), + CuriousGreen: (110, 167, 113), + EmeraldGreen: (67, 160, 48), + ExoticPurple: (95, 32, 111), + FrozenBlue: (53, 214, 255), + GhastlyYellow: (228, 234, 56), + LoyalBrown: (73, 42, 36), + MagicPurple: (137, 4, 177), + NobleBlue: (89, 185, 226), + PineGreen: (0, 78, 56), + PumpkinOrange: (242, 136, 43), + RubyRed: (143, 21, 21), + RegalPurple: (108, 49, 160), + RustBrown: (102, 42, 18), + SapphireBlue: (17, 49, 90), + SulfurYellow: (235, 198, 94), + ToxicGreen: (82, 223, 1), + ViciousRed: (169, 0,47), + VigorousBlack: (71, 59, 49), ), eye_colors_dark: ( - VigorousBlack: (32, 32, 32), - NobleBlue: (62, 130, 159), - CuriousGreen: (81, 124, 84), - LoyalBrown: (54, 30, 26), - ViciousRed: (119, 0, 33), - PumpkinOrange: (209, 145, 18), - GhastlyYellow: (205, 212, 29), - MagicPurple: (110, 3, 143), - ToxicGreen: (1, 185, 1), - ExoticPurple: (69, 23, 80), - SulfurYellow: (209, 176, 84), AmberOrange: (112, 40, 1), - PineGreen: (0, 54, 38), + AmberYellow: (193, 135, 21), + BrightBrown: (54, 31, 11), CornflowerBlue: (13, 47, 64), + CuriousGreen: (81, 124, 84), + EmeraldGreen: (50, 119, 36), + ExoticPurple: (69, 23, 80), + FrozenBlue: (0, 196, 250), + GhastlyYellow: (205, 212, 29), + LoyalBrown: (54, 30, 26), + MagicPurple: (110, 3, 143), + NobleBlue: (65, 154, 193), + PineGreen: (0, 54, 38), + PumpkinOrange: (226, 108, 11), + RubyRed: (94, 19, 19), + RegalPurple: (80, 36, 119), + RustBrown: (78, 33, 15), + SapphireBlue: (13, 35, 64), + SulfurYellow: (152, 132, 7), + ToxicGreen: (68, 185, 1), + ViciousRed: (135, 0, 35), + VigorousBlack: (32, 32, 32), ), eye_white: (255, 255, 255), skin_colors_plain: ( - Skin1: (228, 183, 160), - Skin2: (226, 181, 158), - Skin3: (223, 179, 157), - Skin4: (221, 177, 155), - Skin5: (218, 176, 154), - Skin6: (216, 174, 152), - Skin7: (213, 172, 151), - Skin8: (211, 170, 149), - Skin9: (198, 159, 140), - Skin10: (180, 144, 127), - Skin11: (163, 130, 114), - Skin12: (135, 103, 90), - Skin13: (120, 92, 80), - Skin14: (105, 80, 70), - Skin15: (90, 69, 60), - Skin16: (75, 57, 50), - Skin17: (60, 46, 40), - Skin18: (45, 34, 30), - Iron: (135, 113, 95), - Steel: (108, 94, 86), - DanariOne: (43, 166, 224), - DanariTwo: (40, 155, 210), - DanariThree: (37, 143, 195), - DanariFour: (34, 132, 181), - ElfOne: (118, 84, 157), - ElfTwo: (99, 114, 161), - // ElfThree: (230, 188, 198), + // Human Skin colors + HumanOne: (228, 173, 146), + HumanTwo: (223, 168, 143), + HumanThree: (215, 161, 138), + HumanFour: (207, 154, 133), + HumanFive: (198, 142, 120), + HumanSix: (190, 135, 115), + HumanSeven: (182, 125, 104), + HumanEight: (174, 119, 99), + HumanNine: (165, 109, 89), + HumanTen: (157, 102, 84), + HumanEleven: (149, 96, 80), + HumanTwelve: (132, 81, 67), + HumanThirteen: (124, 75, 63), + HumanFourteen: (116, 69, 59), + HumanFifteen: (108, 61, 52), + HumanSixteen: (91, 50, 43), + HumanSeventeen: (75, 40, 35), + HumanEighteen: (58, 30, 27), + // Dwarf skin colors + DwarfOne: (228, 183, 160), + DwarfTwo: (217, 173, 152), + DwarfThree: (209, 170, 152), + DwarfFour: (198, 160, 144), + DwarfFive: (190, 159, 146), + DwarfSix: (176, 146, 135), + DwarfSeven: (168, 142, 133), + DwarfEight: (160, 138, 131), + DwarfNine: (152, 130, 124), + DwarfTen: (143, 122, 117), + DwarfEleven: (135, 119, 115), + DwarfTwelve: (127, 113, 108), + DwarfThirteen: (119, 108, 101), + DwarfFourteen: (111, 103, 98), + // Elf skin colors + ElfOne: (250, 205, 205), + ElfTwo: (242, 191, 192), + ElfThree: (234, 178, 178), + ElfFour: (226, 171, 178), + ElfFive: (217, 164, 180), + ElfSix: (209, 158, 183), + ElfSeven: (201, 146, 184), + ElfEight: (193, 140, 187), + ElfNine: (171, 127, 176), + ElfTen: (146, 111, 160), + ElfEleven: (159, 161, 209), + ElfTwelve: (146, 148, 201), + ElfThirteen: (133, 135, 193), + ElfFourteen: (122, 124, 185), + ElfFifteen: (111, 112, 168), + ElfSixteen: (132, 119, 110), + ElfSeventeen: (116, 106, 100), + ElfEighteen: (100, 93, 89), + // Orc skin colors OrcOne: (61, 130, 42), OrcTwo: (82, 117, 36), OrcThree: (71, 94, 42), - OrcFour: (97, 54, 29), - UndeadOne: (178, 178, 178), - UndeadTwo: (162, 157, 150), - UndeadThree: (145, 135, 121), + OrcFour: (48, 130, 47), + OrcFive: (59, 102, 51), + OrcSix: (97, 54, 29), + OrcSeven: (97, 65, 29), + OrcEight: (105, 48, 31), + // Danari skin colors + DanariOne: (43, 166, 224), + DanariTwo: (61, 158, 215), + DanariThree: (65, 150, 207), + DanariFour: (64, 123, 182), + DanariFive: (34, 132, 181), + DanariSix: (79, 168, 207), + DanariSeven: (101, 186, 198), + // Draugr skin colors + DraugrOne: (153, 163, 157), + DraugrTwo: (119, 149, 135), + DraugrThree: (145, 182, 165), + DraugrFour: (99, 124, 116), + DraugrFive: (186, 210, 215), + DraugrSix: (215, 211, 207), + DraugrSeven: (132, 129, 127), + DraugrEight: (163, 149, 146), + DraugrNine: (131, 159, 163), ), skin_colors_light: ( - Skin1: (233, 190, 166), - Skin2: (232, 188, 164), - Skin3: (229, 186, 163), - Skin4: (227, 184, 161), - Skin5: (224, 183, 159), - Skin6: (222, 181, 157), - Skin7: (220, 178, 156), - Skin8: (218, 176, 154), - Skin9: (205, 165, 145), - Skin10: (187, 149, 131), - Skin11: (169, 134, 118), - Skin12: (135, 103, 90), - Skin13: (120, 92, 80), - Skin14: (105, 80, 70), - Skin15: (90, 69, 60), - Skin16: (75, 57, 50), - Skin17: (60, 46, 40), - Skin18: (45, 34, 30), - Iron: (144, 125, 106), - Steel: (120, 107, 99), - DanariOne: (44, 172, 230), - DanariTwo: (41, 161, 217), - DanariThree: (38, 148, 202), - DanariFour: (35, 136, 188), - ElfOne: (122, 87, 163), - ElfTwo: (102, 118, 167), - //ElfThree: (242, 199, 209), + // Human Skin colors + HumanOne: (239, 182, 153), + HumanTwo: (231, 176, 148), + HumanThree: (223, 169, 143), + HumanFour: (215, 162, 138), + HumanFive: (207, 148, 125), + HumanSix: (198, 140, 119), + HumanSeven: (190, 133, 114), + HumanEight: (182, 127, 109), + HumanNine: (174, 117, 100), + HumanTen: (165, 110, 95), + HumanEleven: (157, 98, 84), + HumanTwelve: (141, 83, 72), + HumanThirteen: (132, 77, 67), + HumanFourteen: (124, 72, 63), + HumanFifteen: (116, 66, 59), + HumanSixteen: (100, 54, 49), + HumanSeventeen: (83, 44, 40), + HumanEighteen: (67, 35, 32), + // Dwarf skin colors + DwarfOne: (233, 190, 166), + DwarfTwo: (226, 179, 156), + DwarfThree: (217, 176, 158), + DwarfFour: (207, 167, 150), + DwarfFive: (198, 165, 152), + DwarfSix: (185, 153, 142), + DwarfSeven: (176, 148, 139), + DwarfEight: (165, 142, 135), + DwarfNine: (160, 138, 131), + DwarfTen: (152, 130, 124), + DwarfEleven: (143, 126, 122), + DwarfTwelve: (135, 120, 115), + DwarfThirteen: (127, 116, 108), + DwarfFourteen: (119, 111, 105), + // Elf skin colors + ElfOne: (255, 210, 210), + ElfTwo: (250, 198, 198), + ElfThree: (242, 184, 184), + ElfFour: (234, 178, 184), + ElfFive: (226, 171, 189), + ElfSix: (217, 164, 190), + ElfSeven: (209, 152, 192), + ElfEight: (201, 146, 195), + ElfNine: (180, 134, 185), + ElfTen: (160, 122, 176), + ElfEleven: (164, 165, 217), + ElfTwelve: (152, 153, 209), + ElfThirteen: (139, 140, 201), + ElfFourteen: (127, 127, 193), + ElfFifteen: (115, 115, 176), + ElfSixteen: (141, 127, 117), + ElfSeventeen: (124, 114, 107), + ElfEighteen: (108, 101, 96), + // Orc skin colors OrcOne: (83, 165, 56), OrcTwo: (92, 132, 46), OrcThree: (84, 110, 54), - OrcFour: (97, 54, 29), - UndeadOne: (185, 185, 185), - UndeadTwo: (168, 163, 155), - UndeadThree: (150, 139, 125), + OrcFour: (61, 152, 62), + OrcFive: (68, 119, 59), + OrcSix: (113, 63, 34), + OrcSeven: (113, 76, 34), + OrcEight: (122, 54, 36), + // Danari skin colors + DanariOne: (45, 177, 239), + DanariTwo: (66, 170, 231), + DanariThree: (68, 153, 215), + DanariFour: (67, 128, 190), + DanariFive: (35, 136, 188), + DanariSix: (89, 175, 215), + DanariSeven: (106, 195, 207), + // Draugr skin colors + DraugrOne: (168, 179, 172), + DraugrTwo: (126, 157, 141), + DraugrThree: (159, 198, 176), + DraugrFour: (117, 141, 134), + DraugrFive: (200, 219, 223), + DraugrSix: (223, 219, 215), + DraugrSeven: (141, 138, 136), + DraugrEight: (179, 163, 160), + DraugrNine: (139, 169, 174), ), skin_colors_dark: ( - Skin1: (222, 176, 154), - Skin2: (220, 174, 153), - Skin3: (217, 172, 152), - Skin4: (214, 171, 150), - Skin5: (211, 170, 149), - Skin6: (209, 168, 147), - Skin7: (206, 166, 146), - Skin8: (204, 164, 144), - Skin9: (191, 154, 136), - Skin10: (173, 139, 123), - Skin11: (157, 126, 110), - Skin12: (132, 103, 82), - Skin13: (107, 82, 72), - Skin14: (92, 70, 62), - Skin15: (77, 59, 51), - Skin16: (61, 47, 41), - Skin17: (48, 37, 32), - Skin18: (33, 25, 22), - Iron: (124, 99, 82), - Steel: (96, 81, 72), - DanariOne: (43, 166, 224), - DanariTwo: (40, 155, 210), - DanariThree: (37, 143, 195), - DanariFour: (34, 132, 181), - ElfOne: (114, 81, 152), - ElfTwo: (96, 110, 155), - //ElfThree: (217, 178, 187), + // Human Skin colors + HumanOne: (222, 166, 142), + HumanTwo: (215, 161, 138), + HumanThree: (207, 154, 133), + HumanFour: (198, 147, 127), + HumanFive: (190, 134, 115), + HumanSix: (182, 128, 110), + HumanSeven: (174, 117, 100), + HumanEight: (165, 114, 99), + HumanNine: (157, 104, 90), + HumanTen: (149, 98, 85), + HumanEleven: (141, 88, 76), + HumanTwelve: (124, 74, 63), + HumanThirteen: (116, 68, 59), + HumanFourteen: (108, 63, 55), + HumanFifteen: (100, 58, 50), + HumanSixteen: (83, 47, 41), + HumanSeventeen: (67, 37, 33), + HumanEighteen: (50, 27, 24), + // Dwarf skin colors + DwarfOne: (222, 176, 154), + DwarfTwo: (209, 164, 145), + DwarfThree: (201, 159, 141), + DwarfFour: (190, 152, 138), + DwarfFive: (182, 151, 140), + DwarfSix: (168, 138, 129), + DwarfSeven: (160, 133, 126), + DwarfEight: (160, 133, 126), + DwarfNine: (143, 122, 117), + DwarfTen: (135, 115, 110), + DwarfEleven: (127, 112, 108), + DwarfTwelve: (119, 106, 101), + DwarfThirteen: (111, 101, 94), + DwarfFourteen:(102, 95, 90), + // Elf skin colors + ElfOne: (242, 199, 200), + ElfTwo: (234, 185, 186), + ElfThree: (226, 171, 171), + ElfFour: (217, 164, 170), + ElfFive: (209, 158, 174), + ElfSix: (201, 152, 176), + ElfSeven: (193, 140, 177), + ElfEight: (185, 134, 179), + ElfNine: (164, 121, 168), + ElfTen: (138, 105, 152), + ElfEleven: (152, 154, 201), + ElfTwelve: (140, 142, 193), + ElfThirteen: (128, 130, 185), + ElfFourteen: (116, 118, 176), + ElfFifteen: (106, 107, 160), + ElfSixteen: (124, 111, 103), + ElfSeventeen: (108, 99, 93), + ElfEighteen: (91, 85, 81), + // Orc skin colors OrcOne: (55, 114, 36), OrcTwo: (70, 104, 29), OrcThree: (60, 83, 32), - OrcFour: (84, 47, 25), - UndeadOne: (172, 172, 172), - UndeadTwo: (156, 152, 145), - UndeadThree: (128, 119, 107), + OrcFour: (42, 114, 42), + OrcFive: (50, 89, 44), + OrcSix: (84, 47, 25), + OrcSeven: (84, 56, 25), + OrcEight: (97, 43, 28), + // Danari skin colors + DanariOne: (41, 157, 215), + DanariTwo: (59, 155, 207), + DanariThree: (62, 141, 198), + DanariFour: (61, 117, 174), + DanariFive: (34, 132, 181), + DanariSix: (69, 157, 198), + DanariSeven: (84, 177, 190), + // Draugr skin colors + DraugrOne: (137, 146, 140), + DraugrTwo: (105, 132, 119), + DraugrThree: (131, 165, 148), + DraugrFour: (85, 108, 102), + DraugrFive: (171, 193, 198), + DraugrSix: (198, 195, 191), + DraugrSeven: (124, 121, 119), + DraugrEight: (174, 168, 162), + DraugrNine: (119, 145, 149), ), ) diff --git a/assets/voxygen/voxel/humanoid_head_manifest.ron b/assets/voxygen/voxel/humanoid_head_manifest.ron index 6c41353813..4eafc7e5a1 100644 --- a/assets/voxygen/voxel/humanoid_head_manifest.ron +++ b/assets/voxygen/voxel/humanoid_head_manifest.ron @@ -11,39 +11,44 @@ Some(("figure.eyes.general.male_scar-0", (3, 9, 2))), Some(("figure.eyes.general.male_blind-0", (3, 9, 2))), Some(("figure.eyes.general.male_old", (3, 9, 2))), - ], + ], hair: [ + None, Some(("figure.hair.human.male-0", (1, 1, 1))), - Some(("figure.hair.human.male-1", (1, 1, 1))), + Some(("figure.hair.human.male-1", (2, 1, 0))), Some(("figure.hair.human.male-2", (0, -1, 0))), Some(("figure.hair.human.male-3", (0, -1, 0))), Some(("figure.hair.human.male-4", (2, 2, 0))), Some(("figure.hair.human.male-5", (1, 1, 0))), - Some(("figure.hair.human.male-6", (1, 1, 1))), - //Some(("figure.hair.human.male-7", (0, 0, 0))), - //Some(("figure.hair.human.male-8", (5, 0, 5))), - //Some(("figure.hair.human.male-9", (5, 0, 5))), - Some(("figure.hair.human.male-10", (-3, -5, -4))), - //Some(("figure.hair.human.male-11", (0, 0, 0))), - Some(("figure.hair.human.male-12", (4, 2, 7))), + Some(("figure.hair.human.male-6", (0, 0, 0))), + Some(("figure.hair.human.male-7", (1, -2, 1))), + Some(("figure.hair.human.male-8", (1, 1, 0))), + Some(("figure.hair.human.male-9", (1, 1, 0))), + Some(("figure.hair.human.male-10", (1, 1, 0))), + Some(("figure.hair.human.male-11", (1, 1, 0))), + Some(("figure.hair.human.male-12", (2, 1, 2))), Some(("figure.hair.human.male-13", (1, 1, 0))), - Some(("figure.hair.human.male-14", (2, 0, 1))), - Some(("figure.hair.human.male-15", (1, 1, 0))), - Some(("figure.hair.human.male-16", (1, 0, 0))), - Some(("figure.hair.human.male-17", (1, 1, 0))), - Some(("figure.hair.human.male-18", (1, 0, 0))), - Some(("figure.hair.human.male-19", (2, 1, 0))), - Some(("figure.hair.human.male-20", (-3, -4, -7))), - None, + Some(("figure.hair.human.male-14", (2, -3, 0))), + Some(("figure.hair.human.male-15", (1, 0, -2))), + Some(("figure.hair.human.male-16", (0, -1, 0))), + Some(("figure.hair.human.male-17", (2, -3, -1))), + Some(("figure.hair.human.male-18", (1, -2, 0))), + Some(("figure.hair.human.male-19", (1, 0, -2))), + Some(("figure.hair.human.male-20", (0, 1, -3))), ], beard: [ None, Some(("figure.beard.human.human-0", (4, 6, -2))), Some(("figure.beard.human.human-1", (5, 10, -2))), Some(("figure.beard.human.human-2", (3, 7, -3))), + Some(("figure.beard.human.human-3", (2, 7, -1))), + Some(("figure.beard.human.human-4", (3, 10, 0))), + Some(("figure.beard.human.human-5", (2, 7, -3))), + Some(("figure.beard.human.human-6", (4, 10, -1))), + Some(("figure.beard.human.human-7", (2, 7, -1))), + Some(("figure.beard.human.human-8", (5, 7, -1))), ], - accessory: [ - None] + accessory: [None], ), (Human, Female): ( offset: (-7.0, -4.0, -2.0), @@ -55,32 +60,31 @@ Some(("figure.eyes.general.female_heterochromia-0", (2, 10, 2))), Some(("figure.eyes.general.female_scar-0", (2, 10, 2))), Some(("figure.eyes.general.female_blind-0", (2, 10, 2))), - ], + ], hair: [ Some(("figure.hair.human.female-0", (-1, -1, 0))), - Some(("figure.hair.human.female-1", (1, 2, -1))), - Some(("figure.hair.human.female-2", (1, 2, 0))), - Some(("figure.hair.human.female-3", (1, 1, -7))), - Some(("figure.hair.human.female-4", (2, 1, -1))), - Some(("figure.hair.human.female-5", (1, 2, 0))), - Some(("figure.hair.human.female-6", (1, 0, -7))), - Some(("figure.hair.human.female-7", (-1, 0, -1))), - Some(("figure.hair.human.female-8", (0, 0, 0))), - Some(("figure.hair.human.female-9", (0, 2, -1))), - Some(("figure.hair.human.female-10", (-1, -1, 0))), - Some(("figure.hair.human.female-11", (1, 2, 0))), + Some(("figure.hair.human.female-1", (1, 1, -1))), + Some(("figure.hair.human.female-2", (1, 0, 0))), + Some(("figure.hair.human.female-3", (1, -1, -5))), + Some(("figure.hair.human.female-4", (2, 1, 0))), + Some(("figure.hair.human.female-5", (-2, 1, -2))), + Some(("figure.hair.human.female-6", (1, 0, -6))), + Some(("figure.hair.human.female-7", (-1, -1, 0))), + Some(("figure.hair.human.female-8", (1, 1, 0))), + Some(("figure.hair.human.female-9", (1, 1, -4))), + Some(("figure.hair.human.female-10", (0, -1, 0))), + Some(("figure.hair.human.female-11", (0, 0, -4))), Some(("figure.hair.human.female-12", (1, -1, 0))), - Some(("figure.hair.human.female-13", (1, -2, -1))), - Some(("figure.hair.human.female-14", (1, 2, 0))), - Some(("figure.hair.human.female-15", (0, 1, -5))), - Some(("figure.hair.human.female-16", (1, 1, 1))), - Some(("figure.hair.human.female-17", (1, -2, -2))), - //Some(("figure.hair.human.female-18", (1, 0, -7))), - Some(("figure.hair.human.female-19", (-5, 0, -1))), + Some(("figure.hair.human.female-13", (1, 1, -1))), + Some(("figure.hair.human.female-14", (0, 0, -1))), + Some(("figure.hair.human.female-15", (0, -2, -1))), + Some(("figure.hair.human.female-16", (1, -3, -2))), + Some(("figure.hair.human.female-17", (1, -4, -1))), + Some(("figure.hair.human.female-18", (-1, -3, -1))), + Some(("figure.hair.human.female-19", (-4, 0, -1))), ], beard: [None], - accessory: [ - None] + accessory: [None], ), (Orc, Male): ( offset: (-8.0, -5.0, -2.0), @@ -88,34 +92,51 @@ eyes: [ Some(("figure.eyes.orc.male-0", (5, 10, 6))), Some(("figure.eyes.orc.male-1", (5, 10, 5))), - ], + ], hair: [ Some(("figure.hair.dwarf.bald", (0, 3, -1))), - Some(("figure.hair.orc.male-0", (4, 2, 0))), - Some(("figure.hair.orc.male-1", (0, 0, -1))), - Some(("figure.hair.orc.male-2", (0, 0, 0))), - Some(("figure.hair.orc.male-3", (0, 0, 0))), - Some(("figure.hair.orc.male-4", (0, 0, 0))), - Some(("figure.hair.orc.male-5", (0, 0, 0))), - Some(("figure.hair.orc.male-6", (0, 0, 0))), + Some(("figure.hair.orc.male-0", (4, 2, -1))), + Some(("figure.hair.orc.male-1", (0, 2, 1))), + Some(("figure.hair.orc.male-2", (3, 2, 1))), + Some(("figure.hair.orc.male-3", (3, 2, 1))), + Some(("figure.hair.orc.male-4", (3, -2, 1))), + Some(("figure.hair.orc.male-5", (4, 0, 5))), + Some(("figure.hair.orc.male-6", (3, 2, 0))), + Some(("figure.hair.orc.male-7", (4, -2, 2))), + Some(("figure.hair.orc.male-8", (6, 0, 3))), + Some(("figure.hair.orc.male-9", (5, 0, -1))), + Some(("figure.hair.orc.male-10", (3, -1, 0))), + Some(("figure.hair.orc.male-11", (4, -3, 2))), + Some(("figure.hair.orc.male-12", (3, -1, 3))), + Some(("figure.hair.orc.male-13", (4, 3, 4))), ], beard: [ None, - Some(("figure.beard.orc.1", (7, 11, 0))), - Some(("figure.beard.orc.2", (3, 8, -2))), + Some(("figure.beard.orc.orc-0", (7, 11, 0))), + Some(("figure.beard.orc.orc-1", (3, 8, -2))), + Some(("figure.beard.orc.orc-2", (7, 11, -1))), + Some(("figure.beard.orc.orc-3", (4, 10, -1))), + Some(("figure.beard.orc.orc-4", (3, 8, -1))), + Some(("figure.beard.orc.orc-5", (4, 8, -2))), ], accessory: [ Some(("figure.accessory.orc.teeth-0", (5, 11, 3))), - Some(("figure.accessory.orc.earring-male-0", (2, 7, 3))), Some(("figure.accessory.orc.teeth-1", (5, 11, 3))), Some(("figure.accessory.orc.teeth-2", (5, 11, 3))), - Some(("figure.accessory.orc.warpaint-male-0", (0, 4, 3))), + Some(("figure.accessory.orc.teeth-3", (5, 11, 3))), + Some(("figure.accessory.orc.earring-male-0", (2, 7, 3))), + Some(("figure.accessory.orc.earring-male-1", (2, 7, 3))), + Some(("figure.accessory.orc.earring-male-2", (2, 6, 1))), + Some(("figure.accessory.orc.warpaint-male-0", (0, 7, 3))), + Some(("figure.accessory.orc.warpaint-male-1", (5, 7, 0))), + Some(("figure.accessory.orc.warpaint-male-2", (4, 8, 3))), + Some(("figure.accessory.orc.warpaint-male-3", (4, 6, 0))), Some(("figure.accessory.orc.male_eyepatch", (0, 3, 0))), ], ), (Orc, Female): ( offset: (-8.0, -2.5, -2.0), - head: ("figure.head.orc.female", (0, 1, 0)), + head: ("figure.head.orc.female", (0, 0, 0)), eyes: [ Some(("figure.eyes.general.female_default-0", (3, 8, 2))), Some(("figure.eyes.general.female_styled-0", (3, 8, 2))), @@ -123,23 +144,36 @@ Some(("figure.eyes.general.female_heterochromia-0", (3, 8, 2))), Some(("figure.eyes.general.female_scar-0", (3, 8, 2))), Some(("figure.eyes.general.female_blind-0", (3, 8, 2))), - ], + ], hair: [ - Some(("figure.hair.orc.female-0", (-2, -8, 0))), - Some(("figure.hair.orc.female-1", (-2, -8, 0))), - Some(("figure.hair.orc.female-2", (-2, -8, 0))), - Some(("figure.hair.orc.female-3", (-2, -8, -4))), - Some(("figure.hair.orc.female-4", (-2, -8, 0))), - Some(("figure.hair.orc.female-5", (-2, -8, -4))), - Some(("figure.hair.orc.female-6", (-2, -8, -4))), + Some(("figure.hair.orc.female-0", (2, 0, 0))), + Some(("figure.hair.orc.female-1", (3, -5, 0))), + Some(("figure.hair.orc.female-2", (2, -1, 0))), + Some(("figure.hair.orc.female-3", (2, -7, 0))), + Some(("figure.hair.orc.female-4", (0, -1, -1))), + Some(("figure.hair.orc.female-5", (2, 0, -2))), + Some(("figure.hair.orc.female-6", (2, -3, 0))), + Some(("figure.hair.orc.female-7", (2, 0, 0))), + Some(("figure.hair.orc.female-8", (-1, -4, 0))), + Some(("figure.hair.orc.female-9", (3, -2, 0))), + Some(("figure.hair.orc.female-10", (2, 0, -1))), + Some(("figure.hair.orc.female-11", (2, -3, 0))), + Some(("figure.hair.orc.female-12", (0, 0, -2))), + Some(("figure.hair.orc.female-13", (2, -3, 0))), + Some(("figure.hair.orc.female-14", (3, -4, 0))), ], beard: [None], accessory: [ None, Some(("figure.accessory.orc.earring-female-0", (2, 4, 1))), - Some(("figure.accessory.orc.warpaint-female-0", (-2, -4, -7))), - Some(("figure.accessory.orc.warpaint-female-1", (-2, -4, -7))), - ], + Some(("figure.accessory.orc.earring-female-1", (1, 4, 2))), + Some(("figure.accessory.orc.earring-female-2", (1, 4, 0))), + Some(("figure.accessory.orc.earring-female-3", (1, 3, 1))), + Some(("figure.accessory.orc.warpaint-female-0", (3, 4, 1))), + Some(("figure.accessory.orc.warpaint-female-1", (0, 4, 3))), + Some(("figure.accessory.orc.warpaint-female-2", (3, 6, 0))), + Some(("figure.accessory.orc.warpaint-female-3", (3, 7, 0))), + ], ), (Elf, Male): ( offset: (-8.0, -2.5, -2.0), @@ -148,21 +182,46 @@ Some(("figure.eyes.general.male_default-0", (4, 9, 2))), Some(("figure.eyes.general.male_brow_col-0", (4, 9, 2))), Some(("figure.eyes.general.male_bushy-0", (4, 9, 2))), + Some(("figure.eyes.general.male_bushy-1", (3, 9, 2))), Some(("figure.eyes.general.male_as_hair-0", (4, 9, 2))), Some(("figure.eyes.general.male_heterochromia-0", (4, 9, 2))), Some(("figure.eyes.general.male_scar-0", (4, 9, 2))), Some(("figure.eyes.general.male_blind-0", (4, 9, 2))), - ], - hair: [ - Some(("figure.hair.elf.male-0", (2, 1, 1))), - Some(("figure.hair.elf.male-1", (1, -1, 0))), - Some(("figure.hair.elf.male-2", (-2, -4, -7))), - Some(("figure.hair.elf.male-3", (-7, -10, -8))), ], - beard: [None], + hair: [ + Some(("figure.hair.elf.male-0", (2, 0, -2))), + Some(("figure.hair.elf.male-1", (2, 0, -2))), + Some(("figure.hair.elf.male-2", (2, 0, -2))), + Some(("figure.hair.elf.male-3", (2, -3, 0))), + Some(("figure.hair.elf.male-4", (2, -4, -1))), + Some(("figure.hair.elf.male-5", (1, -1, -2))), + Some(("figure.hair.elf.male-6", (2, -1, -6))), + Some(("figure.hair.elf.male-7", (2, -3, 0))), + Some(("figure.hair.elf.male-8", (2, -1, 0))), + Some(("figure.hair.elf.male-9", (2, 0, -1))), + Some(("figure.hair.elf.male-10", (1, -3, -1))), + Some(("figure.hair.elf.male-11", (2, -4, -2))), + Some(("figure.hair.elf.male-12", (0, -3, -1))), + Some(("figure.hair.elf.male-13", (2, -4, -1))), + Some(("figure.hair.elf.male-14", (1, -2, -2))), + ], + beard: [ + None, + Some(("figure.beard.elf.elf-0", (5, 10, -1))), + Some(("figure.beard.elf.elf-1", (5, 10, -4))), + Some(("figure.beard.elf.elf-2", (5, 10, -3))), + Some(("figure.beard.elf.elf-3", (7, 9, -3))), + Some(("figure.beard.elf.elf-4", (3, 7, -3))), + Some(("figure.beard.elf.elf-5", (3, 7, -5))), + Some(("figure.beard.elf.elf-6", (5, 8, -4))), + ], accessory: [ None, - ] + Some(("figure.accessory.elf.earrings-0", (1, 5, 1))), + Some(("figure.accessory.elf.earrings-1", (1, 5, 1))), + Some(("figure.accessory.elf.earrings-2", (1, 5, 1))), + Some(("figure.accessory.elf.earrings-3", (1, 5, 0))), + ], ), (Elf, Female): ( offset: (-8.0, -5.0, -2.0), @@ -174,35 +233,40 @@ Some(("figure.eyes.general.female_heterochromia-0", (3, 9, 2))), Some(("figure.eyes.general.female_scar-0", (3, 9, 2))), Some(("figure.eyes.general.female_blind-0", (3, 9, 2))), - ], + ], hair: [ - Some(("figure.hair.elf.female-0", (0, -2, 0))), - Some(("figure.hair.elf.female-1", (2, 1, -1))), - Some(("figure.hair.elf.female-2", (2, 1, 0))), - Some(("figure.hair.elf.female-3", (2, 0, -7))), - Some(("figure.hair.elf.female-4", (3, 0, -1))), - Some(("figure.hair.elf.female-5", (2, 1, 0))), - Some(("figure.hair.elf.female-6", (2, -1, -7))), - Some(("figure.hair.elf.female-7", (0, -1, -1))), - Some(("figure.hair.elf.female-8", (1, -1, 0))), - Some(("figure.hair.elf.female-9", (1, 1, -1))), + Some(("figure.hair.elf.female-0", (2, -2, 0))), + Some(("figure.hair.elf.female-1", (2, -1, 0))), + Some(("figure.hair.elf.female-2", (1, 0, 0))), + Some(("figure.hair.elf.female-3", (2, 0, -6))), + Some(("figure.hair.elf.female-4", (2, 0, -2))), + Some(("figure.hair.elf.female-5", (1, 1, -3))), + Some(("figure.hair.elf.female-6", (2, 0, -2))), + Some(("figure.hair.elf.female-7", (2, 0, -1))), + Some(("figure.hair.elf.female-8", (2, 0, -1))), + Some(("figure.hair.elf.female-9", (1, -2, -1))), Some(("figure.hair.elf.female-10", (0, -2, 0))), - Some(("figure.hair.elf.female-11", (2, 1, 0))), - Some(("figure.hair.elf.female-12", (2, -2, 0))), + Some(("figure.hair.elf.female-11", (2, -1, -2))), + Some(("figure.hair.elf.female-12", (2, -3, -1))), Some(("figure.hair.elf.female-13", (2, -3, -1))), - Some(("figure.hair.elf.female-14", (2, 1, 0))), - Some(("figure.hair.elf.female-15", (1, 0, -6))), - Some(("figure.hair.elf.female-16", (2, 0, 0))), - Some(("figure.hair.elf.female-17", (2, -3, -2))), - //Some(("figure.hair.elf.female-18", (2, -1, -7))), - Some(("figure.hair.elf.female-19", (2, 0, -2))), - Some(("figure.hair.elf.female-20", (1, -3, 0))), - Some(("figure.hair.elf.female-21", (-4, -1, -1))), + Some(("figure.hair.elf.female-14", (1, -1, 0))), + Some(("figure.hair.elf.female-15", (1, -1, -1))), + Some(("figure.hair.elf.female-16", (1, -1, -1))), + Some(("figure.hair.elf.female-17", (1, -1, -1))), + Some(("figure.hair.elf.female-18", (2, -1, -1))), + Some(("figure.hair.elf.female-19", (2, 0, -1))), + Some(("figure.hair.elf.female-20", (1, -1, -1))), + Some(("figure.hair.elf.female-21", (2, -3, -2))), ], beard: [None], accessory: [ None, - Some(("figure.accessory.elf.headband-0", (6, 9, 4))),] + Some(("figure.accessory.elf.headband-0", (6, 9, 4))), + Some(("figure.accessory.elf.earrings-0", (1, 5, 1))), + Some(("figure.accessory.elf.earrings-1", (1, 5, 1))), + Some(("figure.accessory.elf.earrings-2", (1, 5, 1))), + Some(("figure.accessory.elf.earrings-3", (1, 5, 0))), + ], ), (Dwarf, Male): ( offset: (-6.0, -4.5, -2.0), @@ -217,42 +281,48 @@ Some(("figure.eyes.general.male_blind-0", (2, 10, 2))), Some(("figure.eyes.general.male_old", (1, 10, 1))), Some(("figure.eyes.general.male_old_blind", (1, 10, 1))), - ], + ], hair: [ Some(("figure.hair.dwarf.bald", (0, 3, 1))), - Some(("figure.hair.dwarf.male-0", (1, 1, -3))), + Some(("figure.hair.dwarf.male-0", (1, 1, -2))), Some(("figure.hair.dwarf.male-1", (4, 0, 1))), - //Some(("figure.hair.dwarf.male-2", (0, 2, -2))), - Some(("figure.hair.dwarf.male-3", (1, 1, -3))), - Some(("figure.hair.dwarf.male-4", (1, -4, -3))), - Some(("figure.hair.dwarf.male-5", (1, -6, -3))), - Some(("figure.hair.dwarf.male-6", (1, -4, -3))), - Some(("figure.hair.dwarf.male-7", (-2, -4, -4))), + Some(("figure.hair.dwarf.male-2", (0, 2, -1))), + Some(("figure.hair.dwarf.male-3", (1, -1, -4))), + Some(("figure.hair.dwarf.male-4", (1, -4, -1))), + Some(("figure.hair.dwarf.male-5", (1, -3, -1))), + Some(("figure.hair.dwarf.male-6", (1, -5, 0))), + Some(("figure.hair.dwarf.male-7", (1, -2, -1))), + Some(("figure.hair.dwarf.male-8", (1, 0, -2))), + Some(("figure.hair.dwarf.male-9", (1, 1, 0))), + Some(("figure.hair.dwarf.male-10", (1, -3, 0))), + Some(("figure.hair.dwarf.male-11", (0, -1, -1))), + Some(("figure.hair.dwarf.male-12", (1, -2, -1))), + Some(("figure.hair.dwarf.male-13", (1, 0, -1))), ], beard: [ Some(("figure.beard.dwarf.dwarf-0", (4, 9, -2))), Some(("figure.beard.dwarf.dwarf-1", (1, 7, -8))), - //Some(("figure.beard.dwarf.dwarf-2", (4, 10, -1))), - Some(("figure.beard.dwarf.dwarf-3", (0, 8, -1))), + Some(("figure.beard.dwarf.dwarf-2", (1, 7, -4))), + Some(("figure.beard.dwarf.dwarf-3", (0, 8, -2))), Some(("figure.beard.dwarf.dwarf-4", (4, 9, -4))), Some(("figure.beard.dwarf.dwarf-5", (0, 7, -5))), Some(("figure.beard.dwarf.dwarf-6", (0, 6, -5))), - Some(("figure.beard.dwarf.dwarf-7", (1, 10, -1))), - Some(("figure.beard.dwarf.dwarf-8", (1, 7, -1))), - Some(("figure.beard.dwarf.dwarf-9", (1, 7, -1))), - Some(("figure.beard.dwarf.dwarf-10", (1, 7, -3))), - Some(("figure.beard.dwarf.dwarf-11", (4, 11, 0))), + Some(("figure.beard.dwarf.dwarf-7", (1, 7, -2))), + Some(("figure.beard.dwarf.dwarf-8", (1, 7, -6))), + Some(("figure.beard.dwarf.dwarf-9", (1, 7, -2))), + Some(("figure.beard.dwarf.dwarf-10", (1, 8, -3))), + Some(("figure.beard.dwarf.dwarf-11", (1, 7, -4))), Some(("figure.beard.dwarf.dwarf-12", (1, 7, -2))), - Some(("figure.beard.dwarf.dwarf-13", (1, 9, -4))), + Some(("figure.beard.dwarf.dwarf-13", (1, 7, -5))), Some(("figure.beard.dwarf.dwarf-14", (1, 7, -5))), - Some(("figure.beard.dwarf.dwarf-15", (1, 8, -8))), + Some(("figure.beard.dwarf.dwarf-15", (1, 7, -8))), Some(("figure.beard.dwarf.dwarf-16", (1, 7, -10))), Some(("figure.beard.dwarf.dwarf-17", (1, 7, -5))), - Some(("figure.beard.dwarf.dwarf-18", (2, 8, -4))), + Some(("figure.beard.dwarf.dwarf-18", (1, 7, -5))), Some(("figure.beard.dwarf.dwarf-19", (1, 7, -8))), - Some(("figure.beard.dwarf.dwarf-20", (1, 7,-4))), - Some(("figure.beard.dwarf.dwarf-21", (1, 7, -8))), - Some(("figure.beard.dwarf.dwarf-22", (1, 7, -8))), + Some(("figure.beard.dwarf.dwarf-20", (0, 7,-7))), + Some(("figure.beard.dwarf.dwarf-21", (1, 7, -7))), + Some(("figure.beard.dwarf.dwarf-22", (1, 7, -6))), ], accessory: [ None, @@ -262,7 +332,7 @@ Some(("figure.accessory.dwarf.earrings-1", (0, 3, 0))), Some(("figure.accessory.dwarf.earrings-2", (0, 3, 0))), Some(("figure.accessory.dwarf.earrings-3", (0, 3, 0))), - ] + ], ), (Dwarf, Female): ( offset: (-6.0, -4.5, -2.0), @@ -274,16 +344,23 @@ Some(("figure.eyes.general.female_heterochromia-0", (1, 10, 2))), Some(("figure.eyes.general.female_scar-0", (1, 10, 2))), Some(("figure.eyes.general.female_blind-0", (1, 10, 2))), - ], + ], hair: [ - Some(("figure.hair.dwarf.female-0", (-9, -9, -7))), - Some(("figure.hair.dwarf.female-1", (-9, -9, -7))), - Some(("figure.hair.dwarf.female-2", (-9, -9, -7))), - Some(("figure.hair.dwarf.female-3", (-9, -9, -7))), - Some(("figure.hair.dwarf.female-4", (-3, -2, -5))), - Some(("figure.hair.dwarf.female-5", (-3, -2, -5))), - Some(("figure.hair.dwarf.female-6", (-3, -2, -5))), - Some(("figure.hair.dwarf.female-7", (-9, -9, -7))), + Some(("figure.hair.dwarf.female-0", (1, 0, -5))), + Some(("figure.hair.dwarf.female-1", (0, 0, 0))), + Some(("figure.hair.dwarf.female-2", (0, 2, -1))), + Some(("figure.hair.dwarf.female-3", (1, 1, -2))), + Some(("figure.hair.dwarf.female-4", (-1, -1, -3))), + Some(("figure.hair.dwarf.female-5", (1, -1, -2))), + Some(("figure.hair.dwarf.female-6", (0, -1, 0))), + Some(("figure.hair.dwarf.female-7", (0, 1, -2))), + Some(("figure.hair.dwarf.female-8", (1, 1, -3))), + Some(("figure.hair.dwarf.female-9", (1, 1, -1))), + Some(("figure.hair.dwarf.female-10", (1, 0, -6))), + Some(("figure.hair.dwarf.female-11", (1, -2, -1))), + Some(("figure.hair.dwarf.female-12", (0, 0, -3))), + Some(("figure.hair.dwarf.female-13", (1, -3, 0))), + Some(("figure.hair.dwarf.female-14", (1, -1, -1))), ], beard: [None], accessory: [ @@ -294,49 +371,81 @@ Some(("figure.accessory.dwarf.earrings-1", (0, 3, 0))), Some(("figure.accessory.dwarf.earrings-2", (0, 3, 0))), Some(("figure.accessory.dwarf.earrings-3", (0, 3, 0))), - ] + ], ), - (Undead, Male): ( + (Draugr, Male): ( offset: (-5.0, -4.0, -1.5), - head: ("figure.head.undead.male", (0, 2, 0)), + head: ("figure.head.draugr.male", (0, 2, 0)), eyes: [ - Some(("figure.eyes.undead.male-0", (2, 8, 4))), - Some(("figure.eyes.undead.male-1", (1, 7, 4))), - Some(("figure.eyes.undead.male-2", (1, 8, 4))), - Some(("figure.eyes.undead.male-3", (1, 8, 4))), - ], + Some(("figure.eyes.draugr.male-0", (2, 8, 3))), + Some(("figure.eyes.draugr.male-1", (2, 8, 3))), + Some(("figure.eyes.draugr.male-2", (2, 8, 3))), + Some(("figure.eyes.draugr.male-3", (2, 8, 3))), + Some(("figure.eyes.draugr.male-4", (2, 8, 4))), + Some(("figure.eyes.draugr.male-5", (2, 8, 4))), + Some(("figure.eyes.draugr.male-6", (2, 8, 4))), + Some(("figure.eyes.draugr.male-7", (2, 8, 4))), + ], hair: [ Some(("figure.hair.dwarf.bald", (-1, 1, 1))), - Some(("figure.hair.undead.male-0", (-1, 1, 1))), - Some(("figure.hair.undead.male-1", (3, -2, 0))), - Some(("figure.hair.undead.male-2", (-1, 1, 1))), // <- Modify! - Some(("figure.hair.undead.male-3", (-1, 1, 1))), // <- Modify! + Some(("figure.hair.draugr.male-0", (-1, 1, 1))), + Some(("figure.hair.draugr.male-1", (3, -2, 3))), + Some(("figure.hair.draugr.male-2", (2, 1, 3))), + Some(("figure.hair.draugr.male-3", (-1, 1, 2))), + Some(("figure.hair.draugr.male-4", (-2, 0, -1))), + Some(("figure.hair.draugr.male-5", (-1, 1, -1))), + Some(("figure.hair.draugr.male-6", (0, 1, 0))), + Some(("figure.hair.draugr.male-7", (-1, 1, 0))), + Some(("figure.hair.draugr.male-8", (1, -3, 1))), + Some(("figure.hair.draugr.male-9", (0, -1, 0))), + Some(("figure.hair.draugr.male-10", (-1, 1, -1))), + Some(("figure.hair.draugr.male-11", (1, -2, 3))), + Some(("figure.hair.draugr.male-12", (0, -2, 2))), + Some(("figure.hair.draugr.male-13", (3, 1, 4))), + ], + beard: [ + None, + Some(("figure.beard.draugr.male-0", (2, 9, -3))), + Some(("figure.beard.draugr.male-1", (0, 7, -3))), + Some(("figure.beard.draugr.male-2", (4, 9, -2))), + Some(("figure.beard.draugr.male-3", (0, 7, -3))), + Some(("figure.beard.draugr.male-4", (1, 8, -2))), ], - beard: [None], accessory: [ None, - Some(("figure.accessory.undead.male_eyepatch", (0, 1, 0))),] + Some(("figure.accessory.draugr.male_eyepatch", (3, 2, 4))), + ], ), - (Undead, Female): ( + (Draugr, Female): ( offset: (-5.0, -4.0, -2.0), - head: ("figure.head.undead.female", (0, 2, 0)), + head: ("figure.head.draugr.female", (0, 2, 0)), eyes: [ - Some(("figure.eyes.undead.female-0", (2, 8, 3))), - Some(("figure.eyes.undead.female-1", (0, 8, 3))), - Some(("figure.eyes.undead.female-2", (0, 8, 3))), - ], + Some(("figure.eyes.draugr.female-0", (2, 8, 3))), + Some(("figure.eyes.draugr.female-1", (2, 8, 3))), + Some(("figure.eyes.draugr.female-2", (2, 8, 3))), + ], hair: [ - Some(("figure.hair.undead.female-0", (0, 1, 0))), - Some(("figure.hair.undead.female-1", (-2, 0, -1))), - Some(("figure.hair.undead.female-2", (2, 1, 1))), - Some(("figure.hair.undead.female-3", (0, -3, -0))), - Some(("figure.hair.undead.female-4", (-1, 1, 0))), // <- Modify - Some(("figure.hair.undead.female-5", (-3, 1, 0))), // <- Modify! + None, + Some(("figure.hair.draugr.female-0", (1, 1, 0))), + Some(("figure.hair.draugr.female-1", (-2, 0, -1))), + Some(("figure.hair.draugr.female-2", (3, 1, -1))), + Some(("figure.hair.draugr.female-3", (0, -3, -0))), + Some(("figure.hair.draugr.female-4", (-1, 1, 1))), + Some(("figure.hair.draugr.female-5", (-1, 1, 0))), + Some(("figure.hair.draugr.female-6", (-1, 1, -2))), + Some(("figure.hair.draugr.female-7", (-1, -4, 1))), + Some(("figure.hair.draugr.female-8", (-1, 1, -1))), + Some(("figure.hair.draugr.female-9", (3, -2, 1))), + Some(("figure.hair.draugr.female-10", (-1, -4, 0))), + Some(("figure.hair.draugr.female-11", (-1, -4, 1))), + Some(("figure.hair.draugr.female-12", (-1, -1, 0))), + Some(("figure.hair.draugr.female-13", (-1, 0, -2))), ], beard: [None], accessory: [ None, - Some(("figure.accessory.undead.female_eyepatch", (0, 1, -1))),] + Some(("figure.accessory.draugr.female_eyepatch", (3, 2, 3))), + ], ), (Danari, Male): ( offset: (-9.0, -4.0, -2.0), @@ -350,45 +459,55 @@ Some(("figure.eyes.general.male_scar-0", (5, 9, 4))), Some(("figure.eyes.general.male_blind-0", (5, 9, 4))), Some(("figure.eyes.general.male_old", (4, 9, 3))), - ], + ], hair: [ + None, Some(("figure.hair.danari.male-0", (3, 1, 2))), Some(("figure.hair.danari.male-1", (3, 1, 2))), Some(("figure.hair.danari.male-2", (3, -2, 3))), - Some(("figure.hair.danari.male-3", (-1, -2, 3))), - None, + Some(("figure.hair.danari.male-3", (4, -2, 3))), + Some(("figure.hair.danari.male-4", (3, 0, 3))), + Some(("figure.hair.danari.male-5", (3, -4, 3))), + Some(("figure.hair.danari.male-6", (4, 1, 2))), + Some(("figure.hair.danari.male-7", (2, 0, 0))), + Some(("figure.hair.danari.male-8", (4, -2, 2))), + Some(("figure.hair.danari.male-9", (2, 0, 2))), + Some(("figure.hair.danari.male-10", (2, 0, 2))), + Some(("figure.hair.danari.male-11", (3, 1, 2))), + Some(("figure.hair.danari.male-12", (3, -2, 4))), + Some(("figure.hair.danari.male-13", (3, 0, 2))), ], beard: [ None, Some(("figure.beard.danari.danari-0", (4, 6, -1))), - Some(("figure.beard.danari.danari-1", (4, 6, -5))), - Some(("figure.beard.danari.danari-2", (7, 8, -1))), - Some(("figure.beard.danari.danari-3", (3, 6, -2))), - Some(("figure.beard.danari.danari-4", (3, 5, -2))), - Some(("figure.beard.danari.danari-5", (4, 6, 2))), + Some(("figure.beard.danari.danari-1", (4, 6, -1))), + Some(("figure.beard.danari.danari-2", (6, 8, -1))), + Some(("figure.beard.danari.danari-3", (4, 6, -1))), + Some(("figure.beard.danari.danari-4", (3, 6, -2))), + Some(("figure.beard.danari.danari-5", (3, 6, 1))), Some(("figure.beard.danari.danari-6", (4, 6, 1))), Some(("figure.beard.danari.danari-7", (4, 6, -2))), - Some(("figure.beard.danari.danari-8", (4, 6, -5))), - Some(("figure.beard.danari.danari-9", (4, 5, -7))), - Some(("figure.beard.danari.danari-10", (4, 6, -2))), - Some(("figure.beard.danari.danari-11", (4, 6, -5))), + Some(("figure.beard.danari.danari-8", (4, 6, -4))), + Some(("figure.beard.danari.danari-9", (4, 6, -4))), + Some(("figure.beard.danari.danari-10", (4, 6, -1))), + Some(("figure.beard.danari.danari-11", (4, 6, -2))), Some(("figure.beard.danari.danari-12", (6, 6, 0))), - Some(("figure.beard.danari.danari-13", (7, 10, 0))), - Some(("figure.beard.danari.danari-14", (5, 7, -1))), - ], + Some(("figure.beard.danari.danari-13", (6, 10, -2))), + Some(("figure.beard.danari.danari-14", (6, 10, 2))), + ], accessory: [ Some(("figure.accessory.danari.horns-0", (4, 8, 8))), - Some(("figure.accessory.danari.horns-1", (2, 3, 8))), - Some(("figure.accessory.danari.horns-2", (2, 1, 6))), - Some(("figure.accessory.danari.horns-3", (4, 8, 8))), - Some(("figure.accessory.danari.horns-4", (2, 4, 6))), - Some(("figure.accessory.danari.horns-5", (2, 3, 8))), - Some(("figure.accessory.danari.horns-6", (2, 3, 8))), - ] + Some(("figure.accessory.danari.horns-1", (4, 4, 8))), + Some(("figure.accessory.danari.horns-2", (4, 1, 8))), + Some(("figure.accessory.danari.horns-3", (5, 8, 8))), + Some(("figure.accessory.danari.horns-4", (3, 7, 8))), + Some(("figure.accessory.danari.horns-5", (2, 5, 8))), + Some(("figure.accessory.danari.horns-6", (3, 6, 8))), + ], ), (Danari, Female): ( offset: (-9.0, -4.0, -2.0), - head: ("figure.head.danari.female", (0, 2, 2)), + head: ("figure.head.danari.female", (1, 2, 2)), eyes: [ Some(("figure.eyes.general.female_default-0", (4, 9, 4))), Some(("figure.eyes.general.female_styled-0", (4, 9, 4))), @@ -396,23 +515,34 @@ Some(("figure.eyes.general.female_heterochromia-0", (4, 9, 4))), Some(("figure.eyes.general.female_scar-0", (4, 9, 4))), Some(("figure.eyes.general.female_blind-0", (4, 9, 4))), - ], + ], hair: [ Some(("figure.hair.danari.female-0", (3, -4, 1))), - Some(("figure.hair.danari.female-1", (1, 1, 3))), - Some(("figure.hair.danari.female-2", (3, 1, 0))), // <- Ears - Some(("figure.hair.danari.female-3", (1, -3, 0))), + Some(("figure.hair.danari.female-1", (2, -1, 2))), + Some(("figure.hair.danari.female-2", (3, 1, 1))), + Some(("figure.hair.danari.female-3", (2, 0, 0))), + Some(("figure.hair.danari.female-4", (3, -3, 2))), + Some(("figure.hair.danari.female-5", (2, -1, 3))), + Some(("figure.hair.danari.female-6", (3, 0, 0))), + Some(("figure.hair.danari.female-7", (3, -2, 2))), + Some(("figure.hair.danari.female-8", (3, 0, 0))), + Some(("figure.hair.danari.female-9", (3, 1, 1))), + Some(("figure.hair.danari.female-10", (3, 0, 2))), + Some(("figure.hair.danari.female-11", (3, 0, 2))), + Some(("figure.hair.danari.female-12", (2, 0, 1))), + Some(("figure.hair.danari.female-13", (3, 0, 2))), + Some(("figure.hair.danari.female-14", (3, -3, 3))), ], beard: [None], - accessory: [ + accessory: [ Some(("figure.accessory.danari.horns-0", (4, 8, 8))), - Some(("figure.accessory.danari.horns-1", (2, 3, 8))), - Some(("figure.accessory.danari.horns-2", (2, 1, 6))), - Some(("figure.accessory.danari.horns-3", (4, 8, 8))), - Some(("figure.accessory.danari.horns-4", (2, 4, 6))), - Some(("figure.accessory.danari.horns-5", (2, 3, 8))), - Some(("figure.accessory.danari.horns-6", (2, 3, 8))), - ] + Some(("figure.accessory.danari.horns-1", (4, 4, 8))), + Some(("figure.accessory.danari.horns-2", (4, 1, 8))), + Some(("figure.accessory.danari.horns-3", (5, 8, 8))), + Some(("figure.accessory.danari.horns-4", (3, 7, 8))), + Some(("figure.accessory.danari.horns-5", (2, 5, 8))), + Some(("figure.accessory.danari.horns-6", (3, 6, 8))), + ], ), // More here }) diff --git a/common/src/comp/agent.rs b/common/src/comp/agent.rs index 4653b7fb4a..1935ec6fde 100644 --- a/common/src/comp/agent.rs +++ b/common/src/comp/agent.rs @@ -195,7 +195,7 @@ impl<'a> From<&'a Body> for Psyche { humanoid::Species::Elf => 0.4, humanoid::Species::Human => 0.4, humanoid::Species::Orc => 0.3, - humanoid::Species::Undead => 0.3, + humanoid::Species::Draugr => 0.3, }, Body::QuadrupedSmall(quadruped_small) => match quadruped_small.species { quadruped_small::Species::Pig => 0.5, diff --git a/common/src/comp/body/humanoid.rs b/common/src/comp/body/humanoid.rs index 04af7d4d8a..a2f5ea2e17 100644 --- a/common/src/comp/body/humanoid.rs +++ b/common/src/comp/body/humanoid.rs @@ -76,8 +76,8 @@ impl Body { (Species::Elf, BodyType::Female) => 0.76, (Species::Dwarf, BodyType::Male) => 0.67, (Species::Dwarf, BodyType::Female) => 0.62, - (Species::Undead, BodyType::Male) => 0.78, - (Species::Undead, BodyType::Female) => 0.72, + (Species::Draugr, BodyType::Male) => 0.78, + (Species::Draugr, BodyType::Female) => 0.72, (Species::Danari, BodyType::Male) => 0.56, (Species::Danari, BodyType::Female) => 0.56, } @@ -98,7 +98,7 @@ make_case_elim!( Elf = 2, Human = 3, Orc = 4, - Undead = 5, + Draugr = 5, } ); @@ -112,7 +112,7 @@ pub struct AllSpecies { pub elf: SpeciesMeta, pub human: SpeciesMeta, pub orc: SpeciesMeta, - pub undead: SpeciesMeta, + pub draugr: SpeciesMeta, } impl<'a, SpeciesMeta> core::ops::Index<&'a Species> for AllSpecies { @@ -126,7 +126,7 @@ impl<'a, SpeciesMeta> core::ops::Index<&'a Species> for AllSpecies Species::Elf => &self.elf, Species::Human => &self.human, Species::Orc => &self.orc, - Species::Undead => &self.undead, + Species::Draugr => &self.draugr, } } } @@ -137,7 +137,7 @@ pub const ALL_SPECIES: [Species; 6] = [ Species::Elf, Species::Human, Species::Orc, - Species::Undead, + Species::Draugr, ]; impl<'a, SpeciesMeta: 'a> IntoIterator for &'a AllSpecies { @@ -148,104 +148,139 @@ impl<'a, SpeciesMeta: 'a> IntoIterator for &'a AllSpecies { } // Skin colors -pub const DANARI_SKIN_COLORS: [Skin; 4] = [ +pub const DANARI_SKIN_COLORS: [Skin; 7] = [ Skin::DanariOne, Skin::DanariTwo, Skin::DanariThree, Skin::DanariFour, + Skin::DanariFive, + Skin::DanariSix, + Skin::DanariSeven, ]; pub const DWARF_SKIN_COLORS: [Skin; 14] = [ - Skin::Skin1, - Skin::Skin2, - Skin::Skin3, - Skin::Skin4, - Skin::Skin5, - Skin::Skin6, - Skin::Skin7, - Skin::Skin8, - Skin::Skin9, - Skin::Skin10, - Skin::Skin11, - Skin::Skin12, - Skin::Iron, - Skin::Steel, + Skin::DwarfOne, + Skin::DwarfTwo, + Skin::DwarfThree, + Skin::DwarfFour, + Skin::DwarfFive, + Skin::DwarfSix, + Skin::DwarfSeven, + Skin::DwarfEight, + Skin::DwarfNine, + Skin::DwarfTen, + Skin::DwarfEleven, + Skin::DwarfTwelve, + Skin::DwarfThirteen, + Skin::DwarfFourteen, ]; -pub const ELF_SKIN_COLORS: [Skin; 13] = [ - Skin::Skin1, - Skin::Skin2, - Skin::Skin3, - Skin::Skin5, - Skin::Skin6, - Skin::Skin7, - Skin::Skin8, - Skin::Skin9, - Skin::Skin10, - Skin::Skin11, - Skin::Skin12, +pub const ELF_SKIN_COLORS: [Skin; 18] = [ Skin::ElfOne, Skin::ElfTwo, - //Skin::ElfThree, + Skin::ElfThree, + Skin::ElfFour, + Skin::ElfFive, + Skin::ElfSix, + Skin::ElfSeven, + Skin::ElfEight, + Skin::ElfNine, + Skin::ElfTen, + Skin::ElfEleven, + Skin::ElfTwelve, + Skin::ElfThirteen, + Skin::ElfFourteen, + Skin::ElfFifteen, + Skin::ElfSixteen, + Skin::ElfSeventeen, + Skin::ElfEighteen, ]; pub const HUMAN_SKIN_COLORS: [Skin; 18] = [ - Skin::Skin1, - Skin::Skin2, - Skin::Skin3, - Skin::Skin4, - Skin::Skin5, - Skin::Skin6, - Skin::Skin7, - Skin::Skin8, - Skin::Skin9, - Skin::Skin10, - Skin::Skin11, - Skin::Skin12, - Skin::Skin13, - Skin::Skin14, - Skin::Skin15, - Skin::Skin16, - Skin::Skin17, - Skin::Skin18, + Skin::HumanOne, + Skin::HumanTwo, + Skin::HumanThree, + Skin::HumanFour, + Skin::HumanFive, + Skin::HumanSix, + Skin::HumanSeven, + Skin::HumanEight, + Skin::HumanNine, + Skin::HumanTen, + Skin::HumanEleven, + Skin::HumanTwelve, + Skin::HumanThirteen, + Skin::HumanFourteen, + Skin::HumanFifteen, + Skin::HumanSixteen, + Skin::HumanSeventeen, + Skin::HumanEighteen, +]; +pub const ORC_SKIN_COLORS: [Skin; 8] = [ + Skin::OrcOne, + Skin::OrcTwo, + Skin::OrcThree, + Skin::OrcFour, + Skin::OrcFive, + Skin::OrcSix, + Skin::OrcSeven, + Skin::OrcEight, +]; +pub const DRAUGR_SKIN_COLORS: [Skin; 9] = [ + Skin::DraugrOne, + Skin::DraugrTwo, + Skin::DraugrThree, + Skin::DraugrFour, + Skin::DraugrFive, + Skin::DraugrSix, + Skin::DraugrSeven, + Skin::DraugrEight, + Skin::DraugrNine, ]; -pub const ORC_SKIN_COLORS: [Skin; 4] = [Skin::OrcOne, Skin::OrcTwo, Skin::OrcThree, Skin::OrcFour]; -pub const UNDEAD_SKIN_COLORS: [Skin; 3] = [Skin::UndeadOne, Skin::UndeadTwo, Skin::UndeadThree]; // Eye colors -pub const DANARI_EYE_COLORS: [EyeColor; 3] = [ - EyeColor::CuriousGreen, +pub const DANARI_EYE_COLORS: [EyeColor; 4] = [ + EyeColor::EmeraldGreen, EyeColor::LoyalBrown, + EyeColor::RegalPurple, EyeColor::ViciousRed, ]; -pub const DWARF_EYE_COLORS: [EyeColor; 4] = [ - EyeColor::CuriousGreen, +pub const DWARF_EYE_COLORS: [EyeColor; 6] = [ + EyeColor::AmberYellow, + EyeColor::CornflowerBlue, EyeColor::LoyalBrown, EyeColor::NobleBlue, - EyeColor::CornflowerBlue, -]; -pub const ELF_EYE_COLORS: [EyeColor; 4] = [ - EyeColor::NobleBlue, - EyeColor::CornflowerBlue, - EyeColor::CuriousGreen, - EyeColor::LoyalBrown, -]; -pub const HUMAN_EYE_COLORS: [EyeColor; 4] = [ - EyeColor::NobleBlue, - EyeColor::CornflowerBlue, - EyeColor::CuriousGreen, - EyeColor::LoyalBrown, -]; -pub const ORC_EYE_COLORS: [EyeColor; 5] = [ - EyeColor::LoyalBrown, - EyeColor::ExoticPurple, - EyeColor::AmberOrange, EyeColor::PineGreen, - EyeColor::CornflowerBlue, + EyeColor::RustBrown, ]; -pub const UNDEAD_EYE_COLORS: [EyeColor; 5] = [ - EyeColor::ViciousRed, - EyeColor::PumpkinOrange, +pub const ELF_EYE_COLORS: [EyeColor; 7] = [ + EyeColor::AmberYellow, + EyeColor::BrightBrown, + EyeColor::EmeraldGreen, + EyeColor::NobleBlue, + EyeColor::SapphireBlue, + EyeColor::RegalPurple, + EyeColor::RubyRed, +]; +pub const HUMAN_EYE_COLORS: [EyeColor; 5] = [ + EyeColor::NobleBlue, + EyeColor::CornflowerBlue, + EyeColor::CuriousGreen, + EyeColor::LoyalBrown, + EyeColor::VigorousBlack, +]; +pub const ORC_EYE_COLORS: [EyeColor; 6] = [ + EyeColor::AmberYellow, + EyeColor::CornflowerBlue, + EyeColor::ExoticPurple, + EyeColor::LoyalBrown, + EyeColor::PineGreen, + EyeColor::RustBrown, +]; +pub const DRAUGR_EYE_COLORS: [EyeColor; 6] = [ + EyeColor::FrozenBlue, EyeColor::GhastlyYellow, EyeColor::MagicPurple, + EyeColor::PumpkinOrange, EyeColor::ToxicGreen, + EyeColor::ViciousRed, ]; impl Species { @@ -256,7 +291,7 @@ impl Species { Species::Elf => &ELF_SKIN_COLORS, Species::Human => &HUMAN_SKIN_COLORS, Species::Orc => &ORC_SKIN_COLORS, - Species::Undead => &UNDEAD_SKIN_COLORS, + Species::Draugr => &DRAUGR_SKIN_COLORS, } } @@ -267,7 +302,7 @@ impl Species { Species::Elf => &ELF_EYE_COLORS, Species::Human => &HUMAN_EYE_COLORS, Species::Orc => &ORC_EYE_COLORS, - Species::Undead => &UNDEAD_EYE_COLORS, + Species::Draugr => &DRAUGR_EYE_COLORS, } } @@ -278,12 +313,12 @@ impl Species { /// represent per-species stuff (or have some other solution for validity). pub fn num_hair_colors(self) -> u8 { match self { - Species::Danari => 12, + Species::Danari => 17, Species::Dwarf => 21, Species::Elf => 24, Species::Human => 22, - Species::Orc => 11, - Species::Undead => 22, + Species::Orc => 13, + Species::Draugr => 25, } } @@ -291,7 +326,7 @@ impl Species { self.skin_colors() .get(val as usize) .copied() - .unwrap_or(Skin::Skin3) + .unwrap_or(Skin::HumanThree) } pub fn num_skin_colors(self) -> u8 { self.skin_colors().len() as u8 } @@ -307,18 +342,18 @@ impl Species { pub fn num_hair_styles(self, body_type: BodyType) -> u8 { match (self, body_type) { - (Species::Danari, BodyType::Female) => 4, - (Species::Danari, BodyType::Male) => 5, - (Species::Dwarf, BodyType::Female) => 8, - (Species::Dwarf, BodyType::Male) => 8, - (Species::Elf, BodyType::Female) => 21, - (Species::Elf, BodyType::Male) => 4, - (Species::Human, BodyType::Female) => 19, - (Species::Human, BodyType::Male) => 18, - (Species::Orc, BodyType::Female) => 7, - (Species::Orc, BodyType::Male) => 8, - (Species::Undead, BodyType::Female) => 6, - (Species::Undead, BodyType::Male) => 5, + (Species::Danari, BodyType::Female) => 15, + (Species::Danari, BodyType::Male) => 15, + (Species::Dwarf, BodyType::Female) => 15, + (Species::Dwarf, BodyType::Male) => 15, + (Species::Elf, BodyType::Female) => 22, + (Species::Elf, BodyType::Male) => 15, + (Species::Human, BodyType::Female) => 20, + (Species::Human, BodyType::Male) => 21, + (Species::Orc, BodyType::Female) => 15, + (Species::Orc, BodyType::Male) => 15, + (Species::Draugr, BodyType::Female) => 15, + (Species::Draugr, BodyType::Male) => 15, } } @@ -328,14 +363,14 @@ impl Species { (Species::Danari, BodyType::Male) => 7, (Species::Dwarf, BodyType::Female) => 7, (Species::Dwarf, BodyType::Male) => 7, - (Species::Elf, BodyType::Female) => 2, - (Species::Elf, BodyType::Male) => 1, + (Species::Elf, BodyType::Female) => 6, + (Species::Elf, BodyType::Male) => 5, (Species::Human, BodyType::Female) => 1, (Species::Human, BodyType::Male) => 1, - (Species::Orc, BodyType::Female) => 4, - (Species::Orc, BodyType::Male) => 6, - (Species::Undead, BodyType::Female) => 2, - (Species::Undead, BodyType::Male) => 2, + (Species::Orc, BodyType::Female) => 9, + (Species::Orc, BodyType::Male) => 12, + (Species::Draugr, BodyType::Female) => 2, + (Species::Draugr, BodyType::Male) => 2, } } @@ -348,13 +383,13 @@ impl Species { (Species::Dwarf, BodyType::Female) => 6, (Species::Dwarf, BodyType::Male) => 9, (Species::Elf, BodyType::Female) => 6, - (Species::Elf, BodyType::Male) => 7, + (Species::Elf, BodyType::Male) => 8, (Species::Human, BodyType::Female) => 6, (Species::Human, BodyType::Male) => 7, (Species::Orc, BodyType::Female) => 6, (Species::Orc, BodyType::Male) => 2, - (Species::Undead, BodyType::Female) => 3, - (Species::Undead, BodyType::Male) => 4, + (Species::Draugr, BodyType::Female) => 3, + (Species::Draugr, BodyType::Male) => 8, } } @@ -363,15 +398,15 @@ impl Species { (Species::Danari, BodyType::Female) => 1, (Species::Danari, BodyType::Male) => 16, (Species::Dwarf, BodyType::Female) => 1, - (Species::Dwarf, BodyType::Male) => 22, + (Species::Dwarf, BodyType::Male) => 23, (Species::Elf, BodyType::Female) => 1, - (Species::Elf, BodyType::Male) => 1, + (Species::Elf, BodyType::Male) => 8, (Species::Human, BodyType::Female) => 1, - (Species::Human, BodyType::Male) => 4, + (Species::Human, BodyType::Male) => 10, (Species::Orc, BodyType::Female) => 1, - (Species::Orc, BodyType::Male) => 3, - (Species::Undead, BodyType::Female) => 1, - (Species::Undead, BodyType::Male) => 1, + (Species::Orc, BodyType::Male) => 7, + (Species::Draugr, BodyType::Female) => 1, + (Species::Draugr, BodyType::Male) => 6, } } } @@ -393,20 +428,28 @@ make_case_elim!( #[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, Serialize_repr, Deserialize_repr)] #[repr(u32)] pub enum EyeColor { - VigorousBlack = 0, - NobleBlue = 1, - CuriousGreen = 2, - LoyalBrown = 3, - ViciousRed = 4, - PumpkinOrange = 5, - GhastlyYellow = 6, - MagicPurple = 7, - ToxicGreen = 8, - ExoticPurple = 9, - SulfurYellow = 10, - AmberOrange = 11, + AmberOrange = 0, + AmberYellow = 1, + BrightBrown = 2, + CornflowerBlue = 3, + CuriousGreen = 4, + EmeraldGreen = 5, + ExoticPurple = 6, + FrozenBlue = 7, + GhastlyYellow = 8, + LoyalBrown = 9, + MagicPurple = 10, + NobleBlue = 11, PineGreen = 12, - CornflowerBlue = 13, + PumpkinOrange = 13, + RubyRed = 14, + RegalPurple = 15, + RustBrown = 16, + SapphireBlue = 17, + SulfurYellow = 18, + ToxicGreen = 19, + ViciousRed = 20, + VigorousBlack = 21, } ); @@ -415,39 +458,85 @@ make_case_elim!( #[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, Serialize_repr, Deserialize_repr)] #[repr(u32)] pub enum Skin { - Skin1 = 0, - Skin2 = 1, - Skin3 = 2, - Skin4 = 3, - Skin5 = 4, - Skin6 = 5, - Iron = 6, - Steel = 7, - DanariOne = 8, - DanariTwo = 9, - DanariThree = 10, - DanariFour = 11, - ElfOne = 12, - ElfTwo = 13, - //ElfThree = 14, - OrcOne = 14, - OrcTwo = 15, - OrcThree = 16, - UndeadOne = 17, - UndeadTwo = 18, - UndeadThree = 19, - Skin7 = 20, - Skin8 = 21, - Skin9 = 22, - Skin10 = 23, - Skin11 = 24, - Skin12 = 25, - Skin13 = 26, - Skin14 = 27, - Skin15 = 28, - Skin16 = 29, - Skin17 = 30, - Skin18 = 31, - OrcFour = 32, + // Humans + HumanOne = 0, + HumanTwo = 1, + HumanThree = 2, + HumanFour = 3, + HumanFive = 4, + HumanSix = 5, + HumanSeven = 6, + HumanEight = 7, + HumanNine = 8, + HumanTen = 9, + HumanEleven = 10, + HumanTwelve = 11, + HumanThirteen = 12, + HumanFourteen = 13, + HumanFifteen = 14, + HumanSixteen = 15, + HumanSeventeen = 16, + HumanEighteen = 17, + // Dwarves + DwarfOne = 18, + DwarfTwo = 19, + DwarfThree = 20, + DwarfFour = 21, + DwarfFive = 22, + DwarfSix = 23, + DwarfSeven = 24, + DwarfEight = 25, + DwarfNine = 26, + DwarfTen = 27, + DwarfEleven = 28, + DwarfTwelve = 29, + DwarfThirteen = 30, + DwarfFourteen = 31, + // Elves + ElfOne = 32, + ElfTwo = 33, + ElfThree = 34, + ElfFour = 35, + ElfFive = 36, + ElfSix = 37, + ElfSeven = 38, + ElfEight = 39, + ElfNine = 40, + ElfTen = 41, + ElfEleven = 42, + ElfTwelve = 43, + ElfThirteen = 44, + ElfFourteen = 45, + ElfFifteen = 46, + ElfSixteen = 47, + ElfSeventeen = 48, + ElfEighteen = 49, + // Orcs + OrcOne = 50, + OrcTwo = 51, + OrcThree = 52, + OrcFour = 53, + OrcFive = 54, + OrcSix = 55, + OrcSeven = 56, + OrcEight = 57, + // Danaris + DanariOne = 58, + DanariTwo = 59, + DanariThree = 60, + DanariFour = 61, + DanariFive = 62, + DanariSix = 63, + DanariSeven = 64, + // Draugrs + DraugrOne = 65, + DraugrTwo = 66, + DraugrThree = 67, + DraugrFour = 68, + DraugrFive = 69, + DraugrSix = 70, + DraugrSeven = 71, + DraugrEight = 72, + DraugrNine = 73, } ); diff --git a/voxygen/anim/src/character/mod.rs b/voxygen/anim/src/character/mod.rs index b4a1a9c0ca..bc77432cf3 100644 --- a/voxygen/anim/src/character/mod.rs +++ b/voxygen/anim/src/character/mod.rs @@ -268,8 +268,8 @@ impl<'a> From<&'a Body> for SkeletonAttr { (Elf, Female) => 0.9, (Dwarf, Male) => 1.0, (Dwarf, Female) => 1.0, - (Undead, Male) => 0.9, - (Undead, Female) => 0.9, + (Draugr, Male) => 0.9, + (Draugr, Female) => 0.9, (Danari, Male) => 1.15, (Danari, Female) => 1.15, }, @@ -282,8 +282,8 @@ impl<'a> From<&'a Body> for SkeletonAttr { (Elf, Female) => (-1.0, 9.5), (Dwarf, Male) => (-2.0, 10.0), (Dwarf, Female) => (-2.0, 9.5), - (Undead, Male) => (-1.5, 8.5), - (Undead, Female) => (-1.5, 9.5), + (Draugr, Male) => (-1.5, 8.5), + (Draugr, Female) => (-1.5, 9.5), (Danari, Male) => (-1.5, 7.0), (Danari, Female) => (-1.5, 7.0), }, diff --git a/voxygen/src/menu/char_selection/ui/mod.rs b/voxygen/src/menu/char_selection/ui/mod.rs index 5108630834..ffa75d1edc 100644 --- a/voxygen/src/menu/char_selection/ui/mod.rs +++ b/voxygen/src/menu/char_selection/ui/mod.rs @@ -102,8 +102,8 @@ image_ids_ice! { orc_f: "voxygen.element.ui.char_select.portraits.orc_f", dwarf_m: "voxygen.element.ui.char_select.portraits.dwarf_m", dwarf_f: "voxygen.element.ui.char_select.portraits.dwarf_f", - undead_m: "voxygen.element.ui.char_select.portraits.ud_m", - undead_f: "voxygen.element.ui.char_select.portraits.ud_f", + draugr_m: "voxygen.element.ui.char_select.portraits.ud_m", + draugr_f: "voxygen.element.ui.char_select.portraits.ud_f", elf_m: "voxygen.element.ui.char_select.portraits.elf_m", elf_f: "voxygen.element.ui.char_select.portraits.elf_f", danari_m: "voxygen.element.ui.char_select.portraits.danari_m", @@ -861,7 +861,7 @@ impl Controls { humanoid::Species::Orc => (imgs.orc_m, imgs.orc_f), humanoid::Species::Dwarf => (imgs.dwarf_m, imgs.dwarf_f), humanoid::Species::Elf => (imgs.elf_m, imgs.elf_f), - humanoid::Species::Undead => (imgs.undead_m, imgs.undead_f), + humanoid::Species::Draugr => (imgs.draugr_m, imgs.draugr_f), humanoid::Species::Danari => (imgs.danari_m, imgs.danari_f), }; let [ref mut body_m_button, ref mut body_f_button] = body_type_buttons; @@ -882,14 +882,14 @@ impl Controls { .into(), ]) .spacing(1); - let (human_icon, orc_icon, dwarf_icon, elf_icon, undead_icon, danari_icon) = + let (human_icon, orc_icon, dwarf_icon, elf_icon, draugr_icon, danari_icon) = match body.body_type { humanoid::BodyType::Male => ( self.imgs.human_m, self.imgs.orc_m, self.imgs.dwarf_m, self.imgs.elf_m, - self.imgs.undead_m, + self.imgs.draugr_m, self.imgs.danari_m, ), humanoid::BodyType::Female => ( @@ -897,7 +897,7 @@ impl Controls { self.imgs.orc_f, self.imgs.dwarf_f, self.imgs.elf_f, - self.imgs.undead_f, + self.imgs.draugr_f, self.imgs.danari_f, ), }; @@ -906,7 +906,7 @@ impl Controls { ref mut orc_button, ref mut dwarf_button, ref mut elf_button, - ref mut undead_button, + ref mut draugr_button, ref mut danari_button, ] = species_buttons; let species = Column::with_children(vec![ @@ -948,11 +948,11 @@ impl Controls { ) .into(), icon_button_tooltip( - undead_button, - matches!(body.species, humanoid::Species::Undead), - Message::Species(humanoid::Species::Undead), - undead_icon, - "common.species.undead", + draugr_button, + matches!(body.species, humanoid::Species::Draugr), + Message::Species(humanoid::Species::Draugr), + draugr_icon, + "common.species.draugr", ) .into(), icon_button_tooltip(