Merge branch 'snowram/quadrupeds-tails' into 'master'

optimization and tails See merge request veloren/veloren!1031
2024-08-30 18:12:32 +00:00 · 2020-06-01 00:33:24 +00:00 · 2020-06-01 00:33:24 +00:00 · c4cd2f5283
commit c4cd2f5283
parent df5f09de14 3877efec50
172 changed files with 536 additions and 323 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -21,6 +21,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Improved camera aiming
 - Made civsim, sites, etc. deterministic from the same seed.
 - Improved animations by adding orientation variation
+- new tail bone for quad_small body
+- slim the game size through lossless asset optimization

 ### Removed

--- a/assets/voxygen/audio/soundtrack/between_the_fairies.ogg
+++ b/assets/voxygen/audio/soundtrack/between_the_fairies.ogg
--- a/assets/voxygen/audio/soundtrack/campfire_stories.ogg
+++ b/assets/voxygen/audio/soundtrack/campfire_stories.ogg
--- a/assets/voxygen/audio/soundtrack/down_the_rabbit_hole.ogg
+++ b/assets/voxygen/audio/soundtrack/down_the_rabbit_hole.ogg
--- a/assets/voxygen/audio/soundtrack/field_grazing.ogg
+++ b/assets/voxygen/audio/soundtrack/field_grazing.ogg
--- a/assets/voxygen/audio/soundtrack/just_the_beginning.ogg
+++ b/assets/voxygen/audio/soundtrack/just_the_beginning.ogg
--- a/assets/voxygen/audio/soundtrack/limits.ogg
+++ b/assets/voxygen/audio/soundtrack/limits.ogg
--- a/assets/voxygen/audio/soundtrack/mineral_deposits.ogg
+++ b/assets/voxygen/audio/soundtrack/mineral_deposits.ogg
--- a/assets/voxygen/audio/soundtrack/moonbeams.ogg
+++ b/assets/voxygen/audio/soundtrack/moonbeams.ogg
--- a/assets/voxygen/audio/soundtrack/rest_assured.ogg
+++ b/assets/voxygen/audio/soundtrack/rest_assured.ogg
--- a/assets/voxygen/audio/soundtrack/serene_meadows.ogg
+++ b/assets/voxygen/audio/soundtrack/serene_meadows.ogg
--- a/assets/voxygen/audio/soundtrack/snowtop_volume.ogg
+++ b/assets/voxygen/audio/soundtrack/snowtop_volume.ogg
--- a/assets/voxygen/audio/soundtrack/veloren_title_tune.ogg
+++ b/assets/voxygen/audio/soundtrack/veloren_title_tune.ogg
--- a/assets/voxygen/audio/soundtrack/wandering_voices.ogg
+++ b/assets/voxygen/audio/soundtrack/wandering_voices.ogg
--- a/assets/voxygen/background/bg_1.png
+++ b/assets/voxygen/background/bg_1.png
--- a/assets/voxygen/background/bg_10.png
+++ b/assets/voxygen/background/bg_10.png
--- a/assets/voxygen/background/bg_11.png
+++ b/assets/voxygen/background/bg_11.png
--- a/assets/voxygen/background/bg_12.png
+++ b/assets/voxygen/background/bg_12.png
--- a/assets/voxygen/background/bg_13.png
+++ b/assets/voxygen/background/bg_13.png
--- a/assets/voxygen/background/bg_14.png
+++ b/assets/voxygen/background/bg_14.png
--- a/assets/voxygen/background/bg_15.png
+++ b/assets/voxygen/background/bg_15.png
--- a/assets/voxygen/background/bg_2.png
+++ b/assets/voxygen/background/bg_2.png
--- a/assets/voxygen/background/bg_3.png
+++ b/assets/voxygen/background/bg_3.png
--- a/assets/voxygen/background/bg_4.png
+++ b/assets/voxygen/background/bg_4.png
--- a/assets/voxygen/background/bg_5.png
+++ b/assets/voxygen/background/bg_5.png
--- a/assets/voxygen/background/bg_6.png
+++ b/assets/voxygen/background/bg_6.png
--- a/assets/voxygen/background/bg_7.png
+++ b/assets/voxygen/background/bg_7.png
--- a/assets/voxygen/background/bg_8.png
+++ b/assets/voxygen/background/bg_8.png
--- a/assets/voxygen/background/bg_9.png
+++ b/assets/voxygen/background/bg_9.png
--- a/assets/voxygen/background/bg_main.png
+++ b/assets/voxygen/background/bg_main.png
--- a/assets/voxygen/background/death.png
+++ b/assets/voxygen/background/death.png
--- a/assets/voxygen/background/hurt.png
+++ b/assets/voxygen/background/hurt.png
--- a/assets/voxygen/voxel/armor/belt/cloth_black.vox
+++ b/assets/voxygen/voxel/armor/belt/cloth_black.vox
--- a/assets/voxygen/voxel/armor/belt/cloth_grey.vox
+++ b/assets/voxygen/voxel/armor/belt/cloth_grey.vox
--- a/assets/voxygen/voxel/armor/belt/dark.vox
+++ b/assets/voxygen/voxel/armor/belt/dark.vox
--- a/assets/voxygen/voxel/armor/chest/cloth_red_kimono.vox
+++ b/assets/voxygen/voxel/armor/chest/cloth_red_kimono.vox
--- a/assets/voxygen/voxel/armor/chest/grayscale.vox
+++ b/assets/voxygen/voxel/armor/chest/grayscale.vox
--- a/assets/voxygen/voxel/armor/chest/leather-0.vox
+++ b/assets/voxygen/voxel/armor/chest/leather-0.vox
--- a/assets/voxygen/voxel/armor/chest/leather-2.vox
+++ b/assets/voxygen/voxel/armor/chest/leather-2.vox
--- a/assets/voxygen/voxel/armor/chest/plate_green-0.vox
+++ b/assets/voxygen/voxel/armor/chest/plate_green-0.vox
--- a/assets/voxygen/voxel/armor/empty.vox
+++ b/assets/voxygen/voxel/armor/empty.vox
--- a/assets/voxygen/voxel/armor/foot/assa.vox
+++ b/assets/voxygen/voxel/armor/foot/assa.vox
--- a/assets/voxygen/voxel/armor/foot/dark-0.vox
+++ b/assets/voxygen/voxel/armor/foot/dark-0.vox
--- a/assets/voxygen/voxel/armor/foot/dark_jester-elf_shoe.vox
+++ b/assets/voxygen/voxel/armor/foot/dark_jester-elf_shoe.vox
--- a/assets/voxygen/voxel/armor/foot/foot_none.vox
+++ b/assets/voxygen/voxel/armor/foot/foot_none.vox
--- a/assets/voxygen/voxel/armor/hand/assa_right.vox
+++ b/assets/voxygen/voxel/armor/hand/assa_right.vox
--- a/assets/voxygen/voxel/armor/hand/bare_left.vox
+++ b/assets/voxygen/voxel/armor/hand/bare_left.vox
--- a/assets/voxygen/voxel/armor/hand/bare_right.vox
+++ b/assets/voxygen/voxel/armor/hand/bare_right.vox
--- a/assets/voxygen/voxel/armor/hand/cloth_basic_left.vox
+++ b/assets/voxygen/voxel/armor/hand/cloth_basic_left.vox
--- a/assets/voxygen/voxel/armor/hand/cloth_basic_right.vox
+++ b/assets/voxygen/voxel/armor/hand/cloth_basic_right.vox
--- a/assets/voxygen/voxel/armor/hand/cloth_blue_left-0.vox
+++ b/assets/voxygen/voxel/armor/hand/cloth_blue_left-0.vox
--- a/assets/voxygen/voxel/armor/hand/cloth_green_left-0.vox
+++ b/assets/voxygen/voxel/armor/hand/cloth_green_left-0.vox
--- a/assets/voxygen/voxel/armor/hand/cloth_green_right-0.vox
+++ b/assets/voxygen/voxel/armor/hand/cloth_green_right-0.vox
--- a/assets/voxygen/voxel/armor/hand/cloth_purple_left-0.vox
+++ b/assets/voxygen/voxel/armor/hand/cloth_purple_left-0.vox
--- a/assets/voxygen/voxel/armor/hand/cloth_purple_right-0.vox
+++ b/assets/voxygen/voxel/armor/hand/cloth_purple_right-0.vox
--- a/assets/voxygen/voxel/armor/hand/plate_right-0.vox
+++ b/assets/voxygen/voxel/armor/hand/plate_right-0.vox
--- a/assets/voxygen/voxel/armor/shoulder/chain_left-1.vox
+++ b/assets/voxygen/voxel/armor/shoulder/chain_left-1.vox
--- a/assets/voxygen/voxel/armor/shoulder/chain_left.vox
+++ b/assets/voxygen/voxel/armor/shoulder/chain_left.vox
--- a/assets/voxygen/voxel/armor/shoulder/chain_right-1.vox
+++ b/assets/voxygen/voxel/armor/shoulder/chain_right-1.vox
--- a/assets/voxygen/voxel/armor/shoulder/chain_right.vox
+++ b/assets/voxygen/voxel/armor/shoulder/chain_right.vox
--- a/assets/voxygen/voxel/armor/shoulder/cloth_purple_left-0.vox
+++ b/assets/voxygen/voxel/armor/shoulder/cloth_purple_left-0.vox
--- a/assets/voxygen/voxel/armor/shoulder/leather_left-0.vox
+++ b/assets/voxygen/voxel/armor/shoulder/leather_left-0.vox
--- a/assets/voxygen/voxel/armor/shoulder/leather_right-0.vox
+++ b/assets/voxygen/voxel/armor/shoulder/leather_right-0.vox
--- a/assets/voxygen/voxel/armor/shoulder/leather_right-1.vox
+++ b/assets/voxygen/voxel/armor/shoulder/leather_right-1.vox
--- a/assets/voxygen/voxel/armor/shoulder/plate_right-0.vox
+++ b/assets/voxygen/voxel/armor/shoulder/plate_right-0.vox
--- a/assets/voxygen/voxel/lantern/black-0.vox
+++ b/assets/voxygen/voxel/lantern/black-0.vox
--- a/assets/voxygen/voxel/lantern/green-0.vox
+++ b/assets/voxygen/voxel/lantern/green-0.vox
--- a/assets/voxygen/voxel/npc/boar/female/chest.vox
+++ b/assets/voxygen/voxel/npc/boar/female/chest.vox
--- a/assets/voxygen/voxel/npc/boar/female/tail.vox
+++ b/assets/voxygen/voxel/npc/boar/female/tail.vox
--- a/assets/voxygen/voxel/npc/boar/male/chest.vox
+++ b/assets/voxygen/voxel/npc/boar/male/chest.vox
--- a/assets/voxygen/voxel/npc/boar/male/tail.vox
+++ b/assets/voxygen/voxel/npc/boar/male/tail.vox
--- a/assets/voxygen/voxel/npc/cat/female/chest.vox
+++ b/assets/voxygen/voxel/npc/cat/female/chest.vox
--- a/assets/voxygen/voxel/npc/cat/female/tail.vox
+++ b/assets/voxygen/voxel/npc/cat/female/tail.vox
--- a/assets/voxygen/voxel/npc/cat/male/chest.vox
+++ b/assets/voxygen/voxel/npc/cat/male/chest.vox
--- a/assets/voxygen/voxel/npc/cat/male/tail.vox
+++ b/assets/voxygen/voxel/npc/cat/male/tail.vox
--- a/assets/voxygen/voxel/npc/duck/male/tail.vox
+++ b/assets/voxygen/voxel/npc/duck/male/tail.vox
--- a/assets/voxygen/voxel/npc/eagle/female/head.vox
+++ b/assets/voxygen/voxel/npc/eagle/female/head.vox
--- a/assets/voxygen/voxel/npc/eagle/female/leg_l.vox
+++ b/assets/voxygen/voxel/npc/eagle/female/leg_l.vox
--- a/assets/voxygen/voxel/npc/eagle/female/leg_r.vox
+++ b/assets/voxygen/voxel/npc/eagle/female/leg_r.vox
--- a/assets/voxygen/voxel/npc/eagle/female/tail.vox
+++ b/assets/voxygen/voxel/npc/eagle/female/tail.vox
--- a/assets/voxygen/voxel/npc/eagle/female/torso.vox
+++ b/assets/voxygen/voxel/npc/eagle/female/torso.vox
--- a/assets/voxygen/voxel/npc/eagle/female/wing_l.vox
+++ b/assets/voxygen/voxel/npc/eagle/female/wing_l.vox
--- a/assets/voxygen/voxel/npc/eagle/female/wing_r.vox
+++ b/assets/voxygen/voxel/npc/eagle/female/wing_r.vox
--- a/assets/voxygen/voxel/npc/eagle/male/head.vox
+++ b/assets/voxygen/voxel/npc/eagle/male/head.vox
--- a/assets/voxygen/voxel/npc/eagle/male/leg_l.vox
+++ b/assets/voxygen/voxel/npc/eagle/male/leg_l.vox
--- a/assets/voxygen/voxel/npc/eagle/male/leg_r.vox
+++ b/assets/voxygen/voxel/npc/eagle/male/leg_r.vox
--- a/assets/voxygen/voxel/npc/eagle/male/tail.vox
+++ b/assets/voxygen/voxel/npc/eagle/male/tail.vox
--- a/assets/voxygen/voxel/npc/eagle/male/torso.vox
+++ b/assets/voxygen/voxel/npc/eagle/male/torso.vox
--- a/assets/voxygen/voxel/npc/eagle/male/wing_l.vox
+++ b/assets/voxygen/voxel/npc/eagle/male/wing_l.vox
--- a/assets/voxygen/voxel/npc/eagle/male/wing_r.vox
+++ b/assets/voxygen/voxel/npc/eagle/male/wing_r.vox
--- a/assets/voxygen/voxel/npc/fox/female/chest.vox
+++ b/assets/voxygen/voxel/npc/fox/female/chest.vox
--- a/assets/voxygen/voxel/npc/fox/female/tail.vox
+++ b/assets/voxygen/voxel/npc/fox/female/tail.vox
--- a/assets/voxygen/voxel/npc/fox/male/chest.vox
+++ b/assets/voxygen/voxel/npc/fox/male/chest.vox
--- a/assets/voxygen/voxel/npc/fox/male/tail.vox
+++ b/assets/voxygen/voxel/npc/fox/male/tail.vox
--- a/assets/voxygen/voxel/npc/hyena/female/chest.vox
+++ b/assets/voxygen/voxel/npc/hyena/female/chest.vox
--- a/assets/voxygen/voxel/npc/hyena/female/foot_bl.vox
+++ b/assets/voxygen/voxel/npc/hyena/female/foot_bl.vox
--- a/assets/voxygen/voxel/npc/hyena/female/foot_br.vox
+++ b/assets/voxygen/voxel/npc/hyena/female/foot_br.vox
--- a/assets/voxygen/voxel/npc/hyena/female/foot_fl.vox
+++ b/assets/voxygen/voxel/npc/hyena/female/foot_fl.vox
--- a/assets/voxygen/voxel/npc/hyena/female/foot_fr.vox
+++ b/assets/voxygen/voxel/npc/hyena/female/foot_fr.vox
--- a/assets/voxygen/voxel/npc/hyena/female/head.vox
+++ b/assets/voxygen/voxel/npc/hyena/female/head.vox
--- a/Show More
+++ b/Show More