Merge branch 'chara_selection' into 'master'

Browse Source

New icons in diary general combat section

See merge request veloren/veloren!3176

...

This commit is contained in:

Marcel 2022-02-04 20:37:41 +00:00

parent b0667f2664 d26906724c

commit d785e97ae1

24 changed files with 49 additions and 46 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/skills/skilltree/bg.png (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

assets/voxygen/element/skills/skilltree/energy_plus.png (Stored with Git LFS)

View File

Binary file not shown.

BIN

assets/voxygen/element/skills/skilltree/health_plus.png (Stored with Git LFS)

View File

Binary file not shown.

BIN

assets/voxygen/element/skills/skilltree/skill_climbing.png (Stored with Git LFS)

View File

Binary file not shown.

BIN

assets/voxygen/element/skills/skilltree/skill_dodge.png (Stored with Git LFS)

View File

Binary file not shown.

BIN

assets/voxygen/element/skills/skilltree/skill_swim.png (Stored with Git LFS)

View File

Binary file not shown.

BIN

assets/voxygen/element/skills/skilltree/unlock_axe.png (Stored with Git LFS)

View File

Binary file not shown.

BIN

assets/voxygen/element/skills/skilltree/unlock_bow.png (Stored with Git LFS)

View File

Binary file not shown.

BIN

assets/voxygen/element/skills/skilltree/unlock_hammer.png (Stored with Git LFS)

View File

Binary file not shown.

BIN

assets/voxygen/element/skills/skilltree/unlock_sceptre.png (Stored with Git LFS)

View File

Binary file not shown.

BIN

assets/voxygen/element/skills/skilltree/unlock_staff-0.png (Stored with Git LFS)

View File

Binary file not shown.

BIN

assets/voxygen/element/skills/skilltree/unlock_sword.png (Stored with Git LFS)

View File

Binary file not shown.

BIN

assets/voxygen/element/skills/skilltree/utility_cost.png (Stored with Git LFS)

View File

Binary file not shown.

BIN

assets/voxygen/element/skills/skilltree/utility_duration.png (Stored with Git LFS)

View File

Binary file not shown.

BIN

assets/voxygen/element/skills/skilltree/utility_speed.png (Stored with Git LFS)

View File

Binary file not shown.

BIN

assets/voxygen/element/ui/diary/buttons/lock.png (Stored with Git LFS)

View File

Binary file not shown.

BIN

assets/voxygen/element/ui/diary/buttons/slot_skilltree.png (Stored with Git LFS)

View File

Binary file not shown.

BIN

assets/voxygen/element/weapons/axe.png (Stored with Git LFS)

View File

Binary file not shown.

BIN

assets/voxygen/element/weapons/bow.png (Stored with Git LFS)

View File

Binary file not shown.

BIN

assets/voxygen/element/weapons/hammer.png (Stored with Git LFS)

View File

Binary file not shown.

BIN

assets/voxygen/element/weapons/sceptre.png (Stored with Git LFS)

View File

Binary file not shown.

BIN

assets/voxygen/element/weapons/staff.png (Stored with Git LFS)

View File

Binary file not shown.

BIN

assets/voxygen/element/weapons/sword.png (Stored with Git LFS)

View File

Binary file not shown.

BIN

assets/voxygen/element/weapons/swords_crossed.png (Stored with Git LFS)

View File

Binary file not shown.