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 875bdd8d71 fb953cc7f4

commit cb305536e8

111 changed files with 775 additions and 252 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 (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/voxygen/element/icons/skilltree/buff_combo.png (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/voxygen/element/icons/skilltree/buff_cost.png (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/voxygen/element/icons/skilltree/buff_damage.png (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/voxygen/element/icons/skilltree/buff_distance.png (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/voxygen/element/icons/skilltree/buff_energy_drain.png (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/voxygen/element/icons/skilltree/buff_energy_regen.png (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/voxygen/element/icons/skilltree/buff_explosion.png (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/voxygen/element/icons/skilltree/buff_heal.png (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/voxygen/element/icons/skilltree/buff_helicopter.png (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/voxygen/element/icons/skilltree/buff_infinite.png (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/voxygen/element/icons/skilltree/buff_knockback.png (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/voxygen/element/icons/skilltree/buff_lifesteal.png (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/voxygen/element/icons/skilltree/buff_projectile_speed.png (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/voxygen/element/icons/skilltree/buff_radius.png (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/voxygen/element/icons/skilltree/buff_speed.png (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/voxygen/element/icons/skilltree/debuff_amount.png (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/voxygen/element/icons/skilltree/debuff_combo.png (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/voxygen/element/icons/skilltree/debuff_cost.png (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/voxygen/element/icons/skilltree/debuff_damage.png (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/voxygen/element/icons/skilltree/debuff_distance.png (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/voxygen/element/icons/skilltree/debuff_energy_drain.png (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/voxygen/element/icons/skilltree/debuff_energy_regen.png (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/voxygen/element/icons/skilltree/debuff_explosion.png (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/voxygen/element/icons/skilltree/debuff_heal.png (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/voxygen/element/icons/skilltree/debuff_helicopter.png (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/voxygen/element/icons/skilltree/debuff_infinite.png (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/voxygen/element/icons/skilltree/debuff_knockback.png (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/voxygen/element/icons/skilltree/debuff_lifesteal.png (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/voxygen/element/icons/skilltree/debuff_projectile_speed.png (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/voxygen/element/icons/skilltree/debuff_radius.png (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/voxygen/element/icons/skilltree/debuff_speed.png (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/voxygen/element/icons/skilltree/heal_amount.png (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/voxygen/element/icons/skilltree/heal_combo.png (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/voxygen/element/icons/skilltree/heal_cost.png (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/voxygen/element/icons/skilltree/heal_damage.png (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/voxygen/element/icons/skilltree/heal_distance.png (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/voxygen/element/icons/skilltree/heal_energy_drain.png (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/voxygen/element/icons/skilltree/heal_energy_regen.png (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/voxygen/element/icons/skilltree/heal_explosion.png (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/voxygen/element/icons/skilltree/heal_heal.png (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/voxygen/element/icons/skilltree/heal_helicopter.png (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/voxygen/element/icons/skilltree/heal_infinite.png (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/voxygen/element/icons/skilltree/heal_knockback.png (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/voxygen/element/icons/skilltree/heal_lifesteal.png (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/voxygen/element/icons/skilltree/heal_projectile_speed.png (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/voxygen/element/icons/skilltree/heal_radius.png (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/voxygen/element/icons/skilltree/heal_speed.png (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/voxygen/element/icons/skilltree/leap_cost.png (Stored with Git LFS)

View File

Binary file not shown.

BIN

assets/voxygen/element/icons/skilltree/leap_damage.png (Stored with Git LFS)

View File

Binary file not shown.

BIN

assets/voxygen/element/icons/skilltree/leap_distance.png (Stored with Git LFS)

View File

Binary file not shown.

BIN

assets/voxygen/element/icons/skilltree/leap_knockback.png (Stored with Git LFS)

View File

Binary file not shown.

BIN

assets/voxygen/element/icons/skilltree/leap_radius.png (Stored with Git LFS)

View File

Binary file not shown.

BIN

assets/voxygen/element/icons/skilltree/magic_amount.png (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/voxygen/element/icons/skilltree/magic_combo.png (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/voxygen/element/icons/skilltree/magic_cost.png (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/voxygen/element/icons/skilltree/magic_damage.png (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/voxygen/element/icons/skilltree/magic_distance.png (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/voxygen/element/icons/skilltree/magic_energy_drain.png (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/voxygen/element/icons/skilltree/magic_energy_regen.png (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/voxygen/element/icons/skilltree/magic_explosion.png (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/voxygen/element/icons/skilltree/magic_heal.png (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/voxygen/element/icons/skilltree/magic_helicopter.png (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/voxygen/element/icons/skilltree/magic_infinite.png (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/voxygen/element/icons/skilltree/magic_knockback.png (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/voxygen/element/icons/skilltree/magic_lifesteal.png (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/voxygen/element/icons/skilltree/magic_projectile_speed.png (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/voxygen/element/icons/skilltree/magic_radius.png (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/voxygen/element/icons/skilltree/magic_speed.png (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/voxygen/element/icons/skilltree/physical_amount.png (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/voxygen/element/icons/skilltree/physical_combo.png (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/voxygen/element/icons/skilltree/physical_cost.png (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/voxygen/element/icons/skilltree/physical_damage.png (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/voxygen/element/icons/skilltree/physical_distance.png (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/voxygen/element/icons/skilltree/physical_energy_drain.png (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/voxygen/element/icons/skilltree/physical_energy_regen.png (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/voxygen/element/icons/skilltree/physical_explosion.png (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/voxygen/element/icons/skilltree/physical_heal.png (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/voxygen/element/icons/skilltree/physical_helicopter.png (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/voxygen/element/icons/skilltree/physical_infinite.png (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/voxygen/element/icons/skilltree/physical_knockback.png (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/voxygen/element/icons/skilltree/physical_lifesteal.png (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/voxygen/element/icons/skilltree/physical_projectile_speed.png (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/voxygen/element/icons/skilltree/physical_radius.png (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/voxygen/element/icons/skilltree/physical_speed.png (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/voxygen/element/icons/skilltree/skill_dodge.png (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/voxygen/element/icons/skilltree/spin_amount.png (Stored with Git LFS)

View File

Binary file not shown.

BIN

assets/voxygen/element/icons/skilltree/spin_cost.png (Stored with Git LFS)

View File

Binary file not shown.

BIN

assets/voxygen/element/icons/skilltree/spin_damage.png (Stored with Git LFS)

View File

Binary file not shown.

BIN

assets/voxygen/element/icons/skilltree/spin_helicopter.png (Stored with Git LFS)

View File

Binary file not shown.

BIN

assets/voxygen/element/icons/skilltree/spin_infinite.png (Stored with Git LFS)

View File

Binary file not shown.

BIN

assets/voxygen/element/icons/skilltree/spin_speed.png (Stored with Git LFS)

View File

Binary file not shown.

BIN

assets/voxygen/element/icons/skilltree/utility_amount.png (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/voxygen/element/icons/skilltree/utility_combo.png (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/voxygen/element/icons/skilltree/utility_cost.png (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/voxygen/element/icons/skilltree/utility_damage.png (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/voxygen/element/icons/skilltree/utility_distance.png (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/voxygen/element/icons/skilltree/utility_energy_drain.png (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/voxygen/element/icons/skilltree/utility_energy_regen.png (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/voxygen/element/icons/skilltree/utility_explosion.png (Stored with Git LFS) Normal file

View File

Binary file not shown.

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