Merge branch 'pfauenauge/character-assets' into 'master'

Character assets Part 1

See merge request veloren/veloren!501
This commit is contained in:
Joshua Barretto 2019-09-18 16:46:12 +00:00
commit c4cbe26438
146 changed files with 1129 additions and 535 deletions

View File

@ -14,6 +14,6 @@ opt-level = 2
overflow-checks = false
[profile.release]
debug = true
debug = false
codegen-units = 1
lto = true

View File

@ -1,5 +1,5 @@
{
"humanoid" : [
"humanoid": [
"Adon",
"Agro",
"Arlo",
@ -62,6 +62,7 @@
"Lydan",
"Mavrek",
"Moki",
"Monty",
"Nazim",
"Nesso",
"Ophni",
@ -80,6 +81,7 @@
"Roux",
"Ryven",
"Sarkin",
"Sturp",
"Straus",
"Syrin",
"Talon",
@ -196,6 +198,7 @@
"Ubba",
"Ulva",
"Valor",
"Vechro",
"Wolf",
"Wolfgang",
"Yara",

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

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