Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Reorganize and optimize assets

See merge request veloren/veloren!2099
This commit is contained in:
Joshua Yanovski 2021-04-11 22:55:54 +00:00
commit 01145f4a53
1092 changed files with 542 additions and 535 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
assets/voxygen/background/death.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.8 KiB

After

Width:  |  Height:  |  Size: 3.8 KiB

BIN
assets/voxygen/background/hurt.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.4 KiB

After

Width:  |  Height:  |  Size: 5.2 KiB

BIN
assets/voxygen/element/0_1_knight.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 20 KiB

After

Width:  |  Height:  |  Size: 19 KiB

BIN
assets/voxygen/element/animation/buff_frame/1.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 101 B

BIN
assets/voxygen/element/animation/buff_frame/2.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 79 B

BIN
assets/voxygen/element/animation/buff_frame/3.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 102 B

BIN
assets/voxygen/element/animation/buff_frame/4.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 78 B

BIN
assets/voxygen/element/animation/buff_frame/5.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 102 B

BIN
assets/voxygen/element/animation/buff_frame/6.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 82 B

BIN
assets/voxygen/element/animation/buff_frame/7.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 103 B

BIN
assets/voxygen/element/animation/buff_frame/8.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 78 B

BIN
assets/voxygen/element/animation/gears/1.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 843 B

BIN
assets/voxygen/element/animation/gears/2.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.0 KiB

BIN
assets/voxygen/element/animation/gears/3.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.0 KiB

BIN
assets/voxygen/element/animation/gears/4.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.0 KiB

BIN
assets/voxygen/element/animation/gears/5.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.1 KiB

BIN
assets/voxygen/element/animation/loaders/cauldron1.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 594 B

After

Width:  |  Height:  |  Size: 236 B

BIN
assets/voxygen/element/animation/loaders/cauldron2.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 608 B

After

Width:  |  Height:  |  Size: 230 B

BIN
assets/voxygen/element/animation/loaders/cauldron3.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 589 B

After

Width:  |  Height:  |  Size: 230 B

BIN
assets/voxygen/element/animation/loaders/cauldron4.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 588 B

After

Width:  |  Height:  |  Size: 231 B

BIN
assets/voxygen/element/animation/loaders/cauldron5.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 598 B

After

Width:  |  Height:  |  Size: 229 B

BIN
assets/voxygen/element/animation/loaders/cheese1.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 382 B

After

Width:  |  Height:  |  Size: 232 B

BIN
assets/voxygen/element/animation/loaders/cheese2.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 385 B

After

Width:  |  Height:  |  Size: 225 B

BIN
assets/voxygen/element/animation/loaders/cheese3.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 384 B

After

Width:  |  Height:  |  Size: 229 B

BIN
assets/voxygen/element/animation/loaders/cheese4.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 381 B

After

Width:  |  Height:  |  Size: 223 B

BIN
assets/voxygen/element/animation/loaders/cheese5.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 387 B

After

Width:  |  Height:  |  Size: 227 B

BIN
assets/voxygen/element/animation/loaders/coins1.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 727 B

After

Width:  |  Height:  |  Size: 294 B

BIN
assets/voxygen/element/animation/loaders/coins2.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 744 B

After

Width:  |  Height:  |  Size: 302 B

BIN
assets/voxygen/element/animation/loaders/coins3.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 705 B

After

Width:  |  Height:  |  Size: 294 B

BIN
assets/voxygen/element/animation/loaders/coins4.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 691 B

After

Width:  |  Height:  |  Size: 303 B

BIN
assets/voxygen/element/animation/loaders/coins5.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 747 B

After

Width:  |  Height:  |  Size: 305 B

BIN
assets/voxygen/element/animation/loaders/house1.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 370 B

After

Width:  |  Height:  |  Size: 238 B

BIN
assets/voxygen/element/animation/loaders/house2.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 369 B

After

Width:  |  Height:  |  Size: 239 B

BIN
assets/voxygen/element/animation/loaders/house3.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 371 B

After

Width:  |  Height:  |  Size: 243 B

BIN
assets/voxygen/element/animation/loaders/house4.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 376 B

After

Width:  |  Height:  |  Size: 243 B

BIN
assets/voxygen/element/animation/loaders/house5.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 369 B

After

Width:  |  Height:  |  Size: 238 B

7
assets/voxygen/element/animation/loaders/manifest.ron
View File

@ -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",

BIN
assets/voxygen/element/animation/loaders/mouse-cheese1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 357 B

BIN
assets/voxygen/element/animation/loaders/mouse-cheese2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 355 B

BIN
assets/voxygen/element/animation/loaders/mouse-cheese3.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 355 B

BIN
assets/voxygen/element/animation/loaders/mouse-cheese4.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 361 B

BIN
assets/voxygen/element/animation/loaders/mouse-cheese5.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 359 B

BIN
assets/voxygen/element/animation/loaders/ship1.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 381 B

After

Width:  |  Height:  |  Size: 247 B

BIN
assets/voxygen/element/animation/loaders/ship2.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 381 B

After

Width:  |  Height:  |  Size: 248 B

BIN
assets/voxygen/element/animation/loaders/ship3.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 379 B

After

Width:  |  Height:  |  Size: 245 B

BIN
assets/voxygen/element/animation/loaders/ship4.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 381 B

After

Width:  |  Height:  |  Size: 248 B

BIN
assets/voxygen/element/animation/loaders/ship5.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 381 B

After

Width:  |  Height:  |  Size: 247 B

BIN
assets/voxygen/element/buttons/anvil.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 355 B

BIN
assets/voxygen/element/buttons/anvil_hover.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 437 B

BIN
assets/voxygen/element/buttons/anvil_press.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 412 B

BIN
assets/voxygen/element/buttons/armor_slot.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.9 KiB

BIN
assets/voxygen/element/buttons/armor_slot_empty.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.0 KiB

BIN
assets/voxygen/element/buttons/armor_slot_selected.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.1 KiB

BIN
assets/voxygen/element/buttons/arrow_down.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 213 B

BIN
assets/voxygen/element/buttons/arrow_down_gold.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.0 KiB

BIN
assets/voxygen/element/buttons/arrow_down_hover.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 223 B

BIN
assets/voxygen/element/buttons/arrow_down_press.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 226 B

BIN
assets/voxygen/element/buttons/bag/closed.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.2 KiB

BIN
assets/voxygen/element/buttons/bag/closed_hover.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 5.0 KiB

BIN
assets/voxygen/element/buttons/bag/closed_press.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 6.3 KiB

BIN
assets/voxygen/element/buttons/bag/open.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.4 KiB

BIN
assets/voxygen/element/buttons/bag/open_hover.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 5.3 KiB

BIN
assets/voxygen/element/buttons/bag/open_press.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 6.3 KiB

BIN
assets/voxygen/element/buttons/border.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.7 KiB

BIN
assets/voxygen/element/buttons/border_mo.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.7 KiB

BIN
assets/voxygen/element/buttons/border_press.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.7 KiB

BIN
assets/voxygen/element/buttons/border_pressed.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.7 KiB

BIN
assets/voxygen/element/buttons/border_skills.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.0 KiB

BIN
assets/voxygen/element/buttons/button.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.3 KiB

BIN
assets/voxygen/element/buttons/button_hover.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.1 KiB

BIN
assets/voxygen/element/buttons/button_mmap_closed.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 256 B

BIN
assets/voxygen/element/buttons/button_mmap_closed_hover.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 251 B

BIN
assets/voxygen/element/buttons/button_mmap_closed_press.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 261 B

BIN
assets/voxygen/element/buttons/button_mmap_open.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 273 B

BIN
assets/voxygen/element/buttons/button_mmap_open_hover.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 265 B

BIN
assets/voxygen/element/buttons/button_mmap_open_press.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 266 B

BIN
assets/voxygen/element/buttons/button_press.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.2 KiB

BIN
assets/voxygen/element/buttons/checkbox/active.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 329 B

BIN
assets/voxygen/element/buttons/checkbox/hover.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 343 B

BIN
assets/voxygen/element/buttons/checkbox/inactive.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 221 B

BIN
assets/voxygen/element/buttons/checkbox/inactive_hover.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 237 B

BIN
assets/voxygen/element/buttons/checkbox/press.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 317 B

BIN
assets/voxygen/element/buttons/close_btn.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 470 B

BIN
assets/voxygen/element/buttons/close_btn_hover.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 485 B

BIN
assets/voxygen/element/buttons/close_btn_press.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 469 B

BIN
assets/voxygen/element/buttons/group.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.1 KiB

BIN
assets/voxygen/element/buttons/group_hover.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.2 KiB

BIN
assets/voxygen/element/buttons/group_press.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.2 KiB

BIN
assets/voxygen/element/buttons/indicator_mmap.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.5 KiB

BIN
assets/voxygen/element/buttons/indicator_mmap_small.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 719 B

BIN
assets/voxygen/element/buttons/inv_collapse.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.7 KiB

BIN
assets/voxygen/element/buttons/inv_collapse_hover.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.7 KiB

BIN
assets/voxygen/element/buttons/inv_collapse_press.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.7 KiB

BIN
assets/voxygen/element/buttons/inv_expand.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.9 KiB

BIN
assets/voxygen/element/buttons/inv_expand_hover.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.9 KiB

BIN
assets/voxygen/element/buttons/inv_expand_press.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.9 KiB

BIN
assets/voxygen/element/buttons/inv_slot.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 320 B

BIN
assets/voxygen/element/buttons/inv_slot_blue.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.2 KiB

BIN
assets/voxygen/element/buttons/inv_slot_gold.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.3 KiB

BIN
assets/voxygen/element/buttons/inv_slot_green.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.2 KiB

Some files were not shown because too many files have changed in this diff Show More