Merge branch 'vfoulon80/skilltree-icons' into 'master'

Browse Source

implement the new skilltree icons

See merge request veloren/veloren!1794

...

This commit is contained in:

Marcel 2021-03-04 18:37:33 +00:00

parent 7b0734ad91 4b23a3b307

commit a7ecd8e180

111 changed files with 484 additions and 219 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN

assets/voxygen/element/icons/skilltree/buff_amount.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 298 B

BIN

assets/voxygen/element/icons/skilltree/buff_combo.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 332 B

BIN

assets/voxygen/element/icons/skilltree/buff_cost.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 292 B

BIN

assets/voxygen/element/icons/skilltree/buff_damage.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 340 B

BIN

assets/voxygen/element/icons/skilltree/buff_distance.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 289 B

BIN

assets/voxygen/element/icons/skilltree/buff_energy_drain.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 320 B

BIN

assets/voxygen/element/icons/skilltree/buff_energy_regen.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 325 B

BIN

assets/voxygen/element/icons/skilltree/buff_explosion.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 408 B

BIN

assets/voxygen/element/icons/skilltree/buff_heal.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 288 B

BIN

assets/voxygen/element/icons/skilltree/buff_helicopter.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 363 B

BIN

assets/voxygen/element/icons/skilltree/buff_infinite.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 299 B

BIN

assets/voxygen/element/icons/skilltree/buff_knockback.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 334 B

BIN

assets/voxygen/element/icons/skilltree/buff_lifesteal.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 306 B

BIN

assets/voxygen/element/icons/skilltree/buff_projectile_speed.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 303 B

BIN

assets/voxygen/element/icons/skilltree/buff_radius.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 397 B

BIN

assets/voxygen/element/icons/skilltree/buff_speed.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 289 B

BIN

assets/voxygen/element/icons/skilltree/debuff_amount.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 308 B

BIN

assets/voxygen/element/icons/skilltree/debuff_combo.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 338 B

BIN

assets/voxygen/element/icons/skilltree/debuff_cost.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 295 B

BIN

assets/voxygen/element/icons/skilltree/debuff_damage.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 345 B

BIN

assets/voxygen/element/icons/skilltree/debuff_distance.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 297 B

BIN

assets/voxygen/element/icons/skilltree/debuff_energy_drain.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 330 B

BIN

assets/voxygen/element/icons/skilltree/debuff_energy_regen.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 332 B

BIN

assets/voxygen/element/icons/skilltree/debuff_explosion.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 408 B

BIN

assets/voxygen/element/icons/skilltree/debuff_heal.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 295 B

BIN

assets/voxygen/element/icons/skilltree/debuff_helicopter.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 365 B

BIN

assets/voxygen/element/icons/skilltree/debuff_infinite.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 310 B

BIN

assets/voxygen/element/icons/skilltree/debuff_knockback.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 338 B

BIN

assets/voxygen/element/icons/skilltree/debuff_lifesteal.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 311 B

BIN

assets/voxygen/element/icons/skilltree/debuff_projectile_speed.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 311 B

BIN

assets/voxygen/element/icons/skilltree/debuff_radius.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 396 B

BIN

assets/voxygen/element/icons/skilltree/debuff_speed.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 294 B

BIN

assets/voxygen/element/icons/skilltree/heal_amount.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 301 B

BIN

assets/voxygen/element/icons/skilltree/heal_combo.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 327 B

BIN

assets/voxygen/element/icons/skilltree/heal_cost.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 286 B

BIN

assets/voxygen/element/icons/skilltree/heal_damage.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 335 B

BIN

assets/voxygen/element/icons/skilltree/heal_distance.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 285 B

BIN

assets/voxygen/element/icons/skilltree/heal_energy_drain.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 316 B

BIN

assets/voxygen/element/icons/skilltree/heal_energy_regen.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 320 B

BIN

assets/voxygen/element/icons/skilltree/heal_explosion.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 405 B

BIN

assets/voxygen/element/icons/skilltree/heal_heal.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 286 B

BIN

assets/voxygen/element/icons/skilltree/heal_helicopter.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 362 B

BIN

assets/voxygen/element/icons/skilltree/heal_infinite.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 295 B

BIN

assets/voxygen/element/icons/skilltree/heal_knockback.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 321 B

BIN

assets/voxygen/element/icons/skilltree/heal_lifesteal.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 307 B

BIN

assets/voxygen/element/icons/skilltree/heal_projectile_speed.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 304 B

BIN

assets/voxygen/element/icons/skilltree/heal_radius.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 387 B

BIN

assets/voxygen/element/icons/skilltree/heal_speed.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 284 B

BIN

assets/voxygen/element/icons/skilltree/leap_cost.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 809 B

BIN

assets/voxygen/element/icons/skilltree/leap_damage.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 799 B

BIN

assets/voxygen/element/icons/skilltree/leap_distance.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 433 B

BIN

assets/voxygen/element/icons/skilltree/leap_knockback.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 425 B

BIN

assets/voxygen/element/icons/skilltree/leap_radius.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 451 B

BIN

assets/voxygen/element/icons/skilltree/magic_amount.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 301 B

BIN

assets/voxygen/element/icons/skilltree/magic_combo.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 330 B

BIN

assets/voxygen/element/icons/skilltree/magic_cost.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 291 B

BIN

assets/voxygen/element/icons/skilltree/magic_damage.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 343 B

BIN

assets/voxygen/element/icons/skilltree/magic_distance.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 290 B

BIN

assets/voxygen/element/icons/skilltree/magic_energy_drain.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 319 B

BIN

assets/voxygen/element/icons/skilltree/magic_energy_regen.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 325 B

BIN

assets/voxygen/element/icons/skilltree/magic_explosion.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 396 B

BIN

assets/voxygen/element/icons/skilltree/magic_heal.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 291 B

BIN

assets/voxygen/element/icons/skilltree/magic_helicopter.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 363 B

BIN

assets/voxygen/element/icons/skilltree/magic_infinite.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 303 B

BIN

assets/voxygen/element/icons/skilltree/magic_knockback.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 334 B

BIN

assets/voxygen/element/icons/skilltree/magic_lifesteal.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 306 B

BIN

assets/voxygen/element/icons/skilltree/magic_projectile_speed.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 305 B

BIN

assets/voxygen/element/icons/skilltree/magic_radius.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 398 B

BIN

assets/voxygen/element/icons/skilltree/magic_speed.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 289 B

BIN

assets/voxygen/element/icons/skilltree/physical_amount.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 308 B

BIN

assets/voxygen/element/icons/skilltree/physical_combo.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 338 B

BIN

assets/voxygen/element/icons/skilltree/physical_cost.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 296 B

BIN

assets/voxygen/element/icons/skilltree/physical_damage.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 344 B

BIN

assets/voxygen/element/icons/skilltree/physical_distance.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 298 B

BIN

assets/voxygen/element/icons/skilltree/physical_energy_drain.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 332 B

BIN

assets/voxygen/element/icons/skilltree/physical_energy_regen.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 331 B

BIN

assets/voxygen/element/icons/skilltree/physical_explosion.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 406 B

BIN

assets/voxygen/element/icons/skilltree/physical_heal.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 296 B

BIN

assets/voxygen/element/icons/skilltree/physical_helicopter.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 369 B

BIN

assets/voxygen/element/icons/skilltree/physical_infinite.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 307 B

BIN

assets/voxygen/element/icons/skilltree/physical_knockback.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 341 B

BIN

assets/voxygen/element/icons/skilltree/physical_lifesteal.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 311 B

BIN

assets/voxygen/element/icons/skilltree/physical_projectile_speed.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 313 B

BIN

assets/voxygen/element/icons/skilltree/physical_radius.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 398 B

BIN

assets/voxygen/element/icons/skilltree/physical_speed.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 291 B

BIN

assets/voxygen/element/icons/skilltree/skill_dodge.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 511 B

BIN

assets/voxygen/element/icons/skilltree/spin_amount.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 371 B

BIN

assets/voxygen/element/icons/skilltree/spin_cost.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 358 B

BIN

assets/voxygen/element/icons/skilltree/spin_damage.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 355 B

BIN

assets/voxygen/element/icons/skilltree/spin_helicopter.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 359 B

BIN

assets/voxygen/element/icons/skilltree/spin_infinite.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 360 B

BIN

assets/voxygen/element/icons/skilltree/spin_speed.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 354 B

BIN

assets/voxygen/element/icons/skilltree/utility_amount.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 297 B

BIN

assets/voxygen/element/icons/skilltree/utility_combo.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 320 B

BIN

assets/voxygen/element/icons/skilltree/utility_cost.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 284 B

BIN

assets/voxygen/element/icons/skilltree/utility_damage.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 333 B

BIN

assets/voxygen/element/icons/skilltree/utility_distance.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 284 B

BIN

assets/voxygen/element/icons/skilltree/utility_energy_drain.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 316 B

BIN

assets/voxygen/element/icons/skilltree/utility_energy_regen.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 320 B

BIN

assets/voxygen/element/icons/skilltree/utility_explosion.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 402 B

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