Merge branch 'vfoulon80/reorganize-assets' into 'master'

Reorganize and optimize assets See merge request veloren/veloren!2099
2024-08-30 18:12:32 +00:00 · 2021-04-11 22:55:54 +00:00 · 2021-04-11 22:55:54 +00:00 · 2ee8fc378f
commit 2ee8fc378f
parent dc4c02baad a2e92c6715
1092 changed files with 2150 additions and 2182 deletions
--- 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/element/0_1_knight.png
+++ b/assets/voxygen/element/0_1_knight.png
--- a/assets/voxygen/element/animation/buff_frame/1.png
+++ b/assets/voxygen/element/animation/buff_frame/1.png
--- a/assets/voxygen/element/animation/buff_frame/2.png
+++ b/assets/voxygen/element/animation/buff_frame/2.png
--- a/assets/voxygen/element/animation/buff_frame/3.png
+++ b/assets/voxygen/element/animation/buff_frame/3.png
--- a/assets/voxygen/element/animation/buff_frame/4.png
+++ b/assets/voxygen/element/animation/buff_frame/4.png
--- a/assets/voxygen/element/animation/buff_frame/5.png
+++ b/assets/voxygen/element/animation/buff_frame/5.png
--- a/assets/voxygen/element/animation/buff_frame/6.png
+++ b/assets/voxygen/element/animation/buff_frame/6.png
--- a/assets/voxygen/element/animation/buff_frame/7.png
+++ b/assets/voxygen/element/animation/buff_frame/7.png
--- a/assets/voxygen/element/animation/buff_frame/8.png
+++ b/assets/voxygen/element/animation/buff_frame/8.png
--- a/assets/voxygen/element/animation/gears/1.png
+++ b/assets/voxygen/element/animation/gears/1.png
--- a/assets/voxygen/element/animation/gears/2.png
+++ b/assets/voxygen/element/animation/gears/2.png
--- a/assets/voxygen/element/animation/gears/3.png
+++ b/assets/voxygen/element/animation/gears/3.png
--- a/assets/voxygen/element/animation/gears/4.png
+++ b/assets/voxygen/element/animation/gears/4.png
--- a/assets/voxygen/element/animation/gears/5.png
+++ b/assets/voxygen/element/animation/gears/5.png
--- a/assets/voxygen/element/animation/loaders/cauldron1.png
+++ b/assets/voxygen/element/animation/loaders/cauldron1.png
--- a/assets/voxygen/element/animation/loaders/cauldron2.png
+++ b/assets/voxygen/element/animation/loaders/cauldron2.png
--- a/assets/voxygen/element/animation/loaders/cauldron3.png
+++ b/assets/voxygen/element/animation/loaders/cauldron3.png
--- a/assets/voxygen/element/animation/loaders/cauldron4.png
+++ b/assets/voxygen/element/animation/loaders/cauldron4.png
--- a/assets/voxygen/element/animation/loaders/cauldron5.png
+++ b/assets/voxygen/element/animation/loaders/cauldron5.png
--- a/assets/voxygen/element/animation/loaders/cheese1.png
+++ b/assets/voxygen/element/animation/loaders/cheese1.png
--- a/assets/voxygen/element/animation/loaders/cheese2.png
+++ b/assets/voxygen/element/animation/loaders/cheese2.png
--- a/assets/voxygen/element/animation/loaders/cheese3.png
+++ b/assets/voxygen/element/animation/loaders/cheese3.png
--- a/assets/voxygen/element/animation/loaders/cheese4.png
+++ b/assets/voxygen/element/animation/loaders/cheese4.png
--- a/assets/voxygen/element/animation/loaders/cheese5.png
+++ b/assets/voxygen/element/animation/loaders/cheese5.png
--- a/assets/voxygen/element/animation/loaders/coins1.png
+++ b/assets/voxygen/element/animation/loaders/coins1.png
--- a/assets/voxygen/element/animation/loaders/coins2.png
+++ b/assets/voxygen/element/animation/loaders/coins2.png
--- a/assets/voxygen/element/animation/loaders/coins3.png
+++ b/assets/voxygen/element/animation/loaders/coins3.png
--- a/assets/voxygen/element/animation/loaders/coins4.png
+++ b/assets/voxygen/element/animation/loaders/coins4.png
--- a/assets/voxygen/element/animation/loaders/coins5.png
+++ b/assets/voxygen/element/animation/loaders/coins5.png
--- a/assets/voxygen/element/animation/loaders/house1.png
+++ b/assets/voxygen/element/animation/loaders/house1.png
--- a/assets/voxygen/element/animation/loaders/house2.png
+++ b/assets/voxygen/element/animation/loaders/house2.png
--- a/assets/voxygen/element/animation/loaders/house3.png
+++ b/assets/voxygen/element/animation/loaders/house3.png
--- a/assets/voxygen/element/animation/loaders/house4.png
+++ b/assets/voxygen/element/animation/loaders/house4.png
--- a/assets/voxygen/element/animation/loaders/house5.png
+++ b/assets/voxygen/element/animation/loaders/house5.png
--- a/assets/voxygen/element/animation/loaders/manifest.ron
+++ b/assets/voxygen/element/animation/loaders/manifest.ron
@ -13,6 +13,13 @@
        "voxygen.element.animation.loaders.cheese4",
        "voxygen.element.animation.loaders.cheese5",
    ]),
+    (8.0, [
+        "voxygen.element.animation.loaders.mouse-cheese1",
+        "voxygen.element.animation.loaders.mouse-cheese2",
+        "voxygen.element.animation.loaders.mouse-cheese3",
+        "voxygen.element.animation.loaders.mouse-cheese4",
+        "voxygen.element.animation.loaders.mouse-cheese5",
+    ]),
    (6.0, [
        "voxygen.element.animation.loaders.coins1",
        "voxygen.element.animation.loaders.coins2",
--- a/assets/voxygen/element/animation/loaders/mouse-cheese1.png
+++ b/assets/voxygen/element/animation/loaders/mouse-cheese1.png
--- a/assets/voxygen/element/animation/loaders/mouse-cheese2.png
+++ b/assets/voxygen/element/animation/loaders/mouse-cheese2.png
--- a/assets/voxygen/element/animation/loaders/mouse-cheese3.png
+++ b/assets/voxygen/element/animation/loaders/mouse-cheese3.png
--- a/assets/voxygen/element/animation/loaders/mouse-cheese4.png
+++ b/assets/voxygen/element/animation/loaders/mouse-cheese4.png
--- a/assets/voxygen/element/animation/loaders/mouse-cheese5.png
+++ b/assets/voxygen/element/animation/loaders/mouse-cheese5.png
--- a/assets/voxygen/element/animation/loaders/ship1.png
+++ b/assets/voxygen/element/animation/loaders/ship1.png
--- a/assets/voxygen/element/animation/loaders/ship2.png
+++ b/assets/voxygen/element/animation/loaders/ship2.png
--- a/assets/voxygen/element/animation/loaders/ship3.png
+++ b/assets/voxygen/element/animation/loaders/ship3.png
--- a/assets/voxygen/element/animation/loaders/ship4.png
+++ b/assets/voxygen/element/animation/loaders/ship4.png
--- a/assets/voxygen/element/animation/loaders/ship5.png
+++ b/assets/voxygen/element/animation/loaders/ship5.png
--- a/assets/voxygen/element/buttons/anvil.png
+++ b/assets/voxygen/element/buttons/anvil.png
--- a/assets/voxygen/element/buttons/anvil_hover.png
+++ b/assets/voxygen/element/buttons/anvil_hover.png
--- a/assets/voxygen/element/buttons/anvil_press.png
+++ b/assets/voxygen/element/buttons/anvil_press.png
--- a/assets/voxygen/element/buttons/armor_slot.png
+++ b/assets/voxygen/element/buttons/armor_slot.png
--- a/assets/voxygen/element/buttons/armor_slot_empty.png
+++ b/assets/voxygen/element/buttons/armor_slot_empty.png
--- a/assets/voxygen/element/buttons/armor_slot_selected.png
+++ b/assets/voxygen/element/buttons/armor_slot_selected.png
--- a/assets/voxygen/element/buttons/arrow_down.png
+++ b/assets/voxygen/element/buttons/arrow_down.png
--- a/assets/voxygen/element/buttons/arrow_down_gold.png
+++ b/assets/voxygen/element/buttons/arrow_down_gold.png
--- a/assets/voxygen/element/buttons/arrow_down_hover.png
+++ b/assets/voxygen/element/buttons/arrow_down_hover.png
--- a/assets/voxygen/element/buttons/arrow_down_press.png
+++ b/assets/voxygen/element/buttons/arrow_down_press.png
--- a/assets/voxygen/element/buttons/bag/closed.png
+++ b/assets/voxygen/element/buttons/bag/closed.png
--- a/assets/voxygen/element/buttons/bag/closed_hover.png
+++ b/assets/voxygen/element/buttons/bag/closed_hover.png
--- a/assets/voxygen/element/buttons/bag/closed_press.png
+++ b/assets/voxygen/element/buttons/bag/closed_press.png
--- a/assets/voxygen/element/buttons/bag/open.png
+++ b/assets/voxygen/element/buttons/bag/open.png
--- a/assets/voxygen/element/buttons/bag/open_hover.png
+++ b/assets/voxygen/element/buttons/bag/open_hover.png
--- a/assets/voxygen/element/buttons/bag/open_press.png
+++ b/assets/voxygen/element/buttons/bag/open_press.png
--- a/assets/voxygen/element/buttons/border.png
+++ b/assets/voxygen/element/buttons/border.png
--- a/assets/voxygen/element/buttons/border_mo.png
+++ b/assets/voxygen/element/buttons/border_mo.png
--- a/assets/voxygen/element/buttons/border_press.png
+++ b/assets/voxygen/element/buttons/border_press.png
--- a/assets/voxygen/element/buttons/border_pressed.png
+++ b/assets/voxygen/element/buttons/border_pressed.png
--- a/assets/voxygen/element/buttons/border_skills.png
+++ b/assets/voxygen/element/buttons/border_skills.png
--- a/assets/voxygen/element/buttons/button.png
+++ b/assets/voxygen/element/buttons/button.png
--- a/assets/voxygen/element/buttons/button_hover.png
+++ b/assets/voxygen/element/buttons/button_hover.png
--- a/assets/voxygen/element/buttons/button_mmap_closed.png
+++ b/assets/voxygen/element/buttons/button_mmap_closed.png
--- a/assets/voxygen/element/buttons/button_mmap_closed_hover.png
+++ b/assets/voxygen/element/buttons/button_mmap_closed_hover.png
--- a/assets/voxygen/element/buttons/button_mmap_closed_press.png
+++ b/assets/voxygen/element/buttons/button_mmap_closed_press.png
--- a/assets/voxygen/element/buttons/button_mmap_open.png
+++ b/assets/voxygen/element/buttons/button_mmap_open.png
--- a/assets/voxygen/element/buttons/button_mmap_open_hover.png
+++ b/assets/voxygen/element/buttons/button_mmap_open_hover.png
--- a/assets/voxygen/element/buttons/button_mmap_open_press.png
+++ b/assets/voxygen/element/buttons/button_mmap_open_press.png
--- a/assets/voxygen/element/buttons/button_press.png
+++ b/assets/voxygen/element/buttons/button_press.png
--- a/assets/voxygen/element/buttons/checkbox/active.png
+++ b/assets/voxygen/element/buttons/checkbox/active.png
--- a/assets/voxygen/element/buttons/checkbox/hover.png
+++ b/assets/voxygen/element/buttons/checkbox/hover.png
--- a/assets/voxygen/element/buttons/checkbox/inactive.png
+++ b/assets/voxygen/element/buttons/checkbox/inactive.png
--- a/assets/voxygen/element/buttons/checkbox/inactive_hover.png
+++ b/assets/voxygen/element/buttons/checkbox/inactive_hover.png
--- a/assets/voxygen/element/buttons/checkbox/press.png
+++ b/assets/voxygen/element/buttons/checkbox/press.png
--- a/assets/voxygen/element/buttons/close_btn.png
+++ b/assets/voxygen/element/buttons/close_btn.png
--- a/assets/voxygen/element/buttons/close_btn_hover.png
+++ b/assets/voxygen/element/buttons/close_btn_hover.png
--- a/assets/voxygen/element/buttons/close_btn_press.png
+++ b/assets/voxygen/element/buttons/close_btn_press.png
--- a/assets/voxygen/element/buttons/group.png
+++ b/assets/voxygen/element/buttons/group.png
--- a/assets/voxygen/element/buttons/group_hover.png
+++ b/assets/voxygen/element/buttons/group_hover.png
--- a/assets/voxygen/element/buttons/group_press.png
+++ b/assets/voxygen/element/buttons/group_press.png
--- a/assets/voxygen/element/buttons/indicator_mmap.png
+++ b/assets/voxygen/element/buttons/indicator_mmap.png
--- a/assets/voxygen/element/buttons/indicator_mmap_small.png
+++ b/assets/voxygen/element/buttons/indicator_mmap_small.png
--- a/assets/voxygen/element/buttons/inv_collapse.png
+++ b/assets/voxygen/element/buttons/inv_collapse.png
--- a/assets/voxygen/element/buttons/inv_collapse_hover.png
+++ b/assets/voxygen/element/buttons/inv_collapse_hover.png
--- a/assets/voxygen/element/buttons/inv_collapse_press.png
+++ b/assets/voxygen/element/buttons/inv_collapse_press.png
--- a/assets/voxygen/element/buttons/inv_expand.png
+++ b/assets/voxygen/element/buttons/inv_expand.png
--- a/assets/voxygen/element/buttons/inv_expand_hover.png
+++ b/assets/voxygen/element/buttons/inv_expand_hover.png
--- a/assets/voxygen/element/buttons/inv_expand_press.png
+++ b/assets/voxygen/element/buttons/inv_expand_press.png
--- a/assets/voxygen/element/buttons/inv_slot.png
+++ b/assets/voxygen/element/buttons/inv_slot.png
--- a/assets/voxygen/element/buttons/inv_slot_blue.png
+++ b/assets/voxygen/element/buttons/inv_slot_blue.png
--- a/assets/voxygen/element/buttons/inv_slot_gold.png
+++ b/assets/voxygen/element/buttons/inv_slot_gold.png
--- a/assets/voxygen/element/buttons/inv_slot_green.png
+++ b/assets/voxygen/element/buttons/inv_slot_green.png
--- a/Show More
+++ b/Show More