From b8e9f74070540a15d306fdfbd03bfceeba91d2ae Mon Sep 17 00:00:00 2001 From: Enrique Date: Sat, 16 Nov 2013 13:03:58 +0000 Subject: [PATCH] Added animations to gaia asian elephant male. Maur support elephant is now asian, it has new texture. Added normal texture for the skin of all asian elephants. (only armors before) This was SVN commit r14191. --- .../art/actors/fauna/elephant_asian.xml | 15 ++++++++- .../units/mauryans/support_elephant.xml | 32 +++++++++---------- .../art/meshes/props/maur_support_turret.dae | 4 +-- .../skeletal/animal-elephant-asian-norm.png | 3 ++ .../skeletal/maur_elephant_archer_normal.png | 4 +-- .../skeletal/maur_elephant_hero_normal.png | 4 +-- .../skeletal/maur_elephant_siege_normal.png | 4 +-- .../skins/skeletal/maur_elephant_worker.png | 3 ++ .../skeletal/maur_elephant_worker_norm.png | 3 ++ .../skeletal/maur_elephant_worker_spec.png | 3 ++ 10 files changed, 50 insertions(+), 25 deletions(-) create mode 100644 binaries/data/mods/public/art/textures/skins/skeletal/animal-elephant-asian-norm.png create mode 100644 binaries/data/mods/public/art/textures/skins/skeletal/maur_elephant_worker.png create mode 100644 binaries/data/mods/public/art/textures/skins/skeletal/maur_elephant_worker_norm.png create mode 100644 binaries/data/mods/public/art/textures/skins/skeletal/maur_elephant_worker_spec.png diff --git a/binaries/data/mods/public/art/actors/fauna/elephant_asian.xml b/binaries/data/mods/public/art/actors/fauna/elephant_asian.xml index 86a6d53dd3..2586116df9 100644 --- a/binaries/data/mods/public/art/actors/fauna/elephant_asian.xml +++ b/binaries/data/mods/public/art/actors/fauna/elephant_asian.xml @@ -3,10 +3,23 @@ + + + + + + + + + + + + skeletal/elephant_asian_male.dae + @@ -23,5 +36,5 @@ - basic_specmap.xml + basic_trans_parallax_spec.xml diff --git a/binaries/data/mods/public/art/actors/units/mauryans/support_elephant.xml b/binaries/data/mods/public/art/actors/units/mauryans/support_elephant.xml index 197fc219c7..8328e6920f 100644 --- a/binaries/data/mods/public/art/actors/units/mauryans/support_elephant.xml +++ b/binaries/data/mods/public/art/actors/units/mauryans/support_elephant.xml @@ -2,27 +2,27 @@ - + - - - - - - - - - - - + + + + + + + + + + - skeletal/elephant_african_forest.dae + skeletal/elephant_asian_male.dae - - + + + @@ -39,5 +39,5 @@ - player_trans_spec.xml + player_trans_parallax_spec.xml diff --git a/binaries/data/mods/public/art/meshes/props/maur_support_turret.dae b/binaries/data/mods/public/art/meshes/props/maur_support_turret.dae index ec2bef7f6e..ed3cbb7a8b 100644 --- a/binaries/data/mods/public/art/meshes/props/maur_support_turret.dae +++ b/binaries/data/mods/public/art/meshes/props/maur_support_turret.dae @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f4b39c1616067aabc239021859988ca666f28fe31ba85d5c0c4828b8042f4a8f -size 166077 +oid sha256:290cf37948c43eea66e35dd33cdb796d9571cfe1acfb745c680f43e712dee161 +size 152408 diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/animal-elephant-asian-norm.png b/binaries/data/mods/public/art/textures/skins/skeletal/animal-elephant-asian-norm.png new file mode 100644 index 0000000000..c3a83fc921 --- /dev/null +++ b/binaries/data/mods/public/art/textures/skins/skeletal/animal-elephant-asian-norm.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cf02e7e19bd3c2970be68473611d4b3f8d4c9efe72062186b6e6654fec23d48a +size 413046 diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/maur_elephant_archer_normal.png b/binaries/data/mods/public/art/textures/skins/skeletal/maur_elephant_archer_normal.png index 00156897f0..7e0a92a3bf 100644 --- a/binaries/data/mods/public/art/textures/skins/skeletal/maur_elephant_archer_normal.png +++ b/binaries/data/mods/public/art/textures/skins/skeletal/maur_elephant_archer_normal.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fca78147012836b196a037d5e0956b5513d211eed04ab54cb17a89092e01f01f -size 97174 +oid sha256:e5cea994a145203e8d81455267203fddd3530f7bae95fd521a80e5a4c4bb538f +size 415396 diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/maur_elephant_hero_normal.png b/binaries/data/mods/public/art/textures/skins/skeletal/maur_elephant_hero_normal.png index 309045b8dc..9fd299377a 100644 --- a/binaries/data/mods/public/art/textures/skins/skeletal/maur_elephant_hero_normal.png +++ b/binaries/data/mods/public/art/textures/skins/skeletal/maur_elephant_hero_normal.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:87437a74a723268566173816a7f3fe92a70335b5eef259e2aacccc9f855adad4 -size 599684 +oid sha256:e4953b814174c35dc2a668a668ef98f3a7b14d598e9e1e5f45c73d9b2c0f35dc +size 919517 diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/maur_elephant_siege_normal.png b/binaries/data/mods/public/art/textures/skins/skeletal/maur_elephant_siege_normal.png index 1e5f6929a4..c02b6a156d 100644 --- a/binaries/data/mods/public/art/textures/skins/skeletal/maur_elephant_siege_normal.png +++ b/binaries/data/mods/public/art/textures/skins/skeletal/maur_elephant_siege_normal.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d924d24ab48714fc409a2226838d2e9337d569a326ff07fc354931c7ae4f4dfc -size 264174 +oid sha256:a4f19bf4617c249c8d33d45fffad136c60d76d6644482d3381c0ebd51467afc6 +size 671443 diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/maur_elephant_worker.png b/binaries/data/mods/public/art/textures/skins/skeletal/maur_elephant_worker.png new file mode 100644 index 0000000000..665375907b --- /dev/null +++ b/binaries/data/mods/public/art/textures/skins/skeletal/maur_elephant_worker.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d79a953da0d29fac7d549e6a89ee0ea632458179f50bb1971396e1879cefe0e7 +size 421879 diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/maur_elephant_worker_norm.png b/binaries/data/mods/public/art/textures/skins/skeletal/maur_elephant_worker_norm.png new file mode 100644 index 0000000000..c2547fbda5 --- /dev/null +++ b/binaries/data/mods/public/art/textures/skins/skeletal/maur_elephant_worker_norm.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8482c0d4542f4294b83b660231364120cd39b65e48cd044739593f11373a084d +size 454449 diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/maur_elephant_worker_spec.png b/binaries/data/mods/public/art/textures/skins/skeletal/maur_elephant_worker_spec.png new file mode 100644 index 0000000000..fc56bf00ca --- /dev/null +++ b/binaries/data/mods/public/art/textures/skins/skeletal/maur_elephant_worker_spec.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6e017740ddd334ca6ab943a5681b9dd00f309bbe944021f91442cb8b9b36e4eb +size 250311