gptbot/0ad
1
0
Fork 0
forked from mirrors/0ad
Code Pull Requests Activity

Fix of concern raised following the latest commits.

Browse Source 
Emergency commit of what is fixed already because an ongoing blackout in
my country.

Thread:
https://wildfiregames.com/forum/index.php?/topic/26012-task-animations-re-export-and-unit-meshes-fix/page/10/

This was SVN commit r22732.
This commit is contained in:
Alexandermb
2019-08-20 19:22:16 +00:00
parent 3962a050f5
commit a56c81a79c
47 changed files with 116 additions and 233 deletions
Download Patch File Download Diff File Expand all files Collapse all files
binaries/data/mods/public/art/actors/props/units/capes/gaul_infantry_spearman_c.xml
+2 -7
View File
@@ -52,7 +52,7 @@
</variant>
</group>
<group>
<variant file="biped/base_spearman_relax_fast.xml"/>
<variant file="biped/base_gaul_fanatic.xml"/>
<variant file="biped/carry_food.xml"/>
<variant file="biped/carry_meat.xml"/>
<variant file="biped/carry_wood.xml"/>
@@ -73,12 +73,7 @@
<variant file="biped/gather_praise.xml"/>
<variant file="biped/build.xml"/>
<variant file="biped/build_farm.xml"/>
<variant name="Death">
<animations>
<animation file="biped/new/death_a.dae" id="death1" name="Death" speed="60"/>
<animation file="biped/new/death_b.dae" id="death2" name="Death" speed="60"/>
</animations>
</variant>
<variant file="biped/death_infantry.xml"/>
</group>
<material>player_trans.xml</material>
</actor>
binaries/data/mods/public/art/actors/props/units/capes/rider/champ_ptol_spear.xml
+1 -1
View File
@@ -10,7 +10,7 @@
</variant>
</group>
<group>
<variant file="biped/base_cavalry_spearman_relax_shield_c.xml"/>
<variant file="biped/base_cavalry_spearman_relax_shield_aspis.xml"/>
<variant file="biped/rider/carry_meat.xml"/>
</group>
<group>
binaries/data/mods/public/art/actors/props/units/capes/rider/spearman_relax_shield_c.xml
+1 -1
View File
@@ -10,7 +10,7 @@
</variant>
</group>
<group>
<variant file="biped/base_cavalry_spearman_relax_shield_c.xml"/>
<variant file="biped/base_cavalry_spearman_relax_shield_aspis.xml"/>
<variant file="biped/rider/base_carry_meat.xml"/>
</group>
<group>
binaries/data/mods/public/art/actors/props/units/capes/rider/spearman_relax_shield_reverse.xml
+1 -1
View File
@@ -10,7 +10,7 @@
</variant>
</group>
<group>
<variant file="biped/base_cavalry_spearman_relax_shield_reverse.xml"/>
<variant file="biped/base_cavalry_spearman_relax_shield_aspis_reverse.xml"/>
<variant file="biped/rider/base_carry_meat.xml"/>
</group>
<group>
binaries/data/mods/public/art/actors/props/units/shields/aspis_ptol_p.xml
-30
View File
@@ -1,30 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant>
<mesh>props/shield/aspis_03_front.dae</mesh>
<props>
<prop actor="props/units/shields/props/aspis_back_bronze_03.xml" attachpoint="root"/>
<prop actor="props/units/shields/props/aspis_handgrip_bronze_03.xml" attachpoint="handgrip"/>
</props>
</variant>
</group>
<group>
<variant frequency="1" name="Shield Round B">
<textures>
<texture file="props/shield/ptol_round_b_bronze_player.png" name="baseTex"/>
<texture file="props/shield/ptol_round_b_norm.png" name="normTex"/>
<texture file="props/shield/ptol_round_b_spec.png" name="specTex"/>
</textures>
</variant>
<variant frequency="1" name="Shield Round A Bronze">
<textures>
<texture file="props/shield/ptol_round_a_bronze_player.png" name="baseTex"/>
<texture file="props/shield/ptol_round_a_norm.png" name="normTex"/>
<texture file="props/shield/ptol_round_a_spec.png" name="specTex"/>
</textures>
</variant>
</group>
<material>player_trans_parallax_spec.xml</material>
</actor>
binaries/data/mods/public/art/actors/props/units/shields/pelta_back_player_color.xml
-15
View File
@@ -1,15 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant>
<mesh>props/shields/pelta_back.dae</mesh>
<textures>
<texture file="props/shield/pelta_back.png" name="baseTex"/>
<texture file="props/shield/pelta_back_norm.png" name="normTex"/>
<texture file="props/shield/pelta_back_spec.png" name="specTex"/>
</textures>
</variant>
</group>
<material>basic_trans_parallax_spec.xml</material>
</actor>
binaries/data/mods/public/art/actors/props/units/shields/pelta_back_wicker.xml
-15
View File
@@ -1,15 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant>
<mesh>props/shields/pelta_back.dae</mesh>
<textures>
<texture file="props/shield/pelta_back.png" name="baseTex"/>
<texture file="props/shield/pelta_back_norm.png" name="normTex"/>
<texture file="props/shield/pelta_back_spec.png" name="specTex"/>
</textures>
</variant>
</group>
<material>basic_trans_parallax_spec.xml</material>
</actor>
binaries/data/mods/public/art/actors/props/units/shields/pelta_front_01.xml
-18
View File
@@ -1,18 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant>
<mesh>props/shields/pelta_front.dae</mesh>
<textures>
<texture file="props/shield/pelta_front.png" name="baseTex"/>
<texture file="props/shield/pelta_front_norm.png" name="normTex"/>
<texture file="props/shield/pelta_front_spec.png" name="specTex"/>
</textures>
<props>
<prop actor="props/units/shields/pelta_back_01.xml" attachpoint="root"/>
</props>
</variant>
</group>
<material>basic_trans_parallax_spec.xml</material>
</actor>
binaries/data/mods/public/art/actors/props/units/shields/pelte_ptol_p.xml
+17
View File
@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant>
<props>
<prop actor="props/units/shields/props/pelte_back_bronze_01.xml" attachpoint="root"/>
<prop actor="props/units/shields/props/aspis_handgrip_bronze_03.xml" attachpoint="handgrip"/>
</props>
</variant>
</group>
<group>
<variant frequency="1" file="shields/ptol_pelte_01.xml" name="Ptol-IP-01"/>
<variant frequency="1" file="shields/ptol_pelte_02.xml" name="Ptol-IP-02"/>
</group>
<material>player_trans_parallax_spec.xml</material>
</actor>
binaries/data/mods/public/art/actors/props/units/shields/props/aspis_handgrip_01.xml
-19
View File
@@ -1,19 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" file="shields/aspis_handgrip_bronze_01.xml" name="Aspis-Handgrip-01"/>
</group>
<group>
<variant name="Handgrip">
<mesh>props/shield/props/aspis_handgrip.dae</mesh>
</variant>
<variant name="Handgrip-03">
<mesh>props/shield/props/aspis_handgrip_03.dae</mesh>
</variant>
<variant name="Handgrip-04">
<mesh>props/shield/props/aspis_handgrip_04.dae</mesh>
</variant>
</group>
<material>basic_trans_parallax_spec.xml</material>
</actor>
binaries/data/mods/public/art/actors/props/units/shields/props/aspis_handgrip_02.xml
-22
View File
@@ -1,22 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant>
<textures>
<texture file="props/shield/handgrips_01.png" name="baseTex"/>
<texture file="props/shield/handgrips_01_norm.png" name="normTex"/>
<texture file="props/shield/handgrips_01_spec.png" name="specTex"/>
</textures>
</variant>
</group>
<group>
<variant name="Handgrip-01">
<mesh>props/shield/props/aspis_handgrip_01.dae</mesh>
</variant>
<variant name="Handgrip-02">
<mesh>props/shield/props/aspis_handgrip_02.dae</mesh>
</variant>
</group>
<material>basic_trans_parallax_spec.xml</material>
</actor>
binaries/data/mods/public/art/actors/units/athenians/cavalry_swordsman_e_r.xml
+1 -1
View File
@@ -8,7 +8,7 @@
<prop actor="props/units/helmets/hele_illyrian_crested.xml" attachpoint="helmet"/>
<prop actor="props/units/heads/new/head_hele_e.xml" attachpoint="head"/>
<prop actor="props/units/weapons/xiphos.xml" attachpoint="weapon_R"/>
<prop actor="props/temp/l_sheath.xml" attachpoint="sheath_L"/>
<prop actor="props/units/weapons/sheath_xiphos_e.xml" attachpoint="sheath_01_L"/>
</props>
</variant>
</group>
binaries/data/mods/public/art/actors/units/athenians/infantry_slinger_e.xml
+1 -1
View File
@@ -7,7 +7,7 @@
<props>
<prop actor="props/units/heads/new/head_hele_e.xml" attachpoint="head"/>
<prop actor="props/units/weapons/sling.xml" attachpoint="weapon_R"/>
<prop actor="props/units/helmets/hele_straw_01.xml" attachpoint="helmet"/>
<prop actor="props/units/heads/hele_straw.xml" attachpoint="helmet"/>
<prop actor="props/units/weapons/slingrock.xml" attachpoint="projectile"/>
</props>
<textures>
binaries/data/mods/public/art/actors/units/athenians/infantry_swordsman_c.xml
+1 -1
View File
@@ -9,7 +9,7 @@
<prop actor="props/units/heads/new/head_hele_b.xml" attachpoint="head"/>
<prop actor="props/units/shields/aspis_athen_m.xml" attachpoint="shield_arm"/>
<prop actor="props/units/weapons/xiphos.xml" attachpoint="weapon_R"/>
<prop actor="props/units/weapons/sheath_xiphos.xml" attachpoint="sheath_01_L"/>
<prop actor="props/units/weapons/sheath_xiphos_e.xml" attachpoint="sheath_01_L"/>
</props>
</variant>
</group>
binaries/data/mods/public/art/actors/units/carthaginians/cavalry_spearman_a_r.xml
+1 -1
View File
@@ -56,7 +56,7 @@
</variant>
</group>
<group>
<variant file="biped/base_cavalry_spearman_relax_shield_reverse.xml"/>
<variant file="biped/base_cavalry_spearman_relax_shield_aspis_reverse.xml"/>
<variant file="biped/rider/carry_meat.xml"/>
</group>
<group>
binaries/data/mods/public/art/actors/units/carthaginians/cavalry_spearman_b_r.xml
+1 -1
View File
@@ -61,7 +61,7 @@
</variant>
</group>
<group>
<variant file="biped/base_cavalry_spearman_relax_shield_reverse.xml"/>
<variant file="biped/base_cavalry_spearman_relax_shield_aspis_reverse.xml"/>
<variant file="biped/rider/carry_meat.xml"/>
</group>
<group>
binaries/data/mods/public/art/actors/units/carthaginians/cavalry_spearman_e_r.xml
+1 -1
View File
@@ -63,7 +63,7 @@
</variant>
</group>
<group>
<variant file="biped/base_cavalry_spearman_relax_shield_reverse.xml"/>
<variant file="biped/base_cavalry_spearman_relax_shield_aspis_reverse.xml"/>
<variant file="biped/rider/carry_meat.xml"/>
</group>
<group>
binaries/data/mods/public/art/actors/units/carthaginians/infantry_swordsman_2_a.xml
-1
View File
@@ -7,7 +7,6 @@
<prop actor="props/units/heads/new/head_hele_a.xml" attachpoint="head"/>
<prop actor="props/units/shields/samn_scutum_adv.xml" attachpoint="shield"/>
<prop actor="props/units/weapons/xiphos.xml" attachpoint="weapon_R"/>
<prop actor="props/units/samnite_panoply_bronze.xml" attachpoint="breastplate"/>
</props>
</variant>
</group>
binaries/data/mods/public/art/actors/units/gauls/infantry_spearman_c.xml
+11 -1
View File
@@ -2,7 +2,7 @@
<actor version="1">
<castshadow/>
<group>
<variant file="biped/base_hoplite.xml">
<variant file="biped/base_gaul_fanatic.xml">
<mesh>skeletal/new/m_naked.dae</mesh>
<props>
<prop actor="props/units/heads/new/head_celt.xml" attachpoint="head"/>
@@ -50,6 +50,16 @@
</group>
<group>
<variant frequency="1" name="Idle"/>
<variant frequency="1" name="Attack_melee">
<props>
<prop actor="props/units/weapons/spear.xml" attachpoint="weapon_R"/>
</props>
</variant>
<variant frequency="1" name="Run">
<props>
<prop actor="props/units/weapons/spear.xml" attachpoint="weapon_R"/>
</props>
</variant>
<variant file="biped/attack_capture.xml"/>
<variant file="biped/death_infantry.xml">
<props>
binaries/data/mods/public/art/actors/units/macedonians/infantry_pikeman_a.xml
+4 -1
View File
@@ -144,7 +144,10 @@
<variant file="biped/build_farm.xml"/>
<variant file="biped/death_infantry.xml"/>
<variant file="biped/formations/syntagma_front.xml"/>
<variant file="biped/formations/syntagma_mid.xml"/>
<variant file="biped/formations/syntagma_01.xml"/>
<variant file="biped/formations/syntagma_02.xml"/>
<variant file="biped/formations/syntagma_03.xml"/>
<variant file="biped/formations/syntagma_04.xml"/>
<variant file="biped/formations/syntagma_back.xml"/>
</group>
<material>player_trans_spec.xml</material>
binaries/data/mods/public/art/actors/units/macedonians/infantry_pikeman_b.xml
+4 -1
View File
@@ -39,7 +39,10 @@
<variant file="biped/build_farm.xml"/>
<variant file="biped/death_infantry.xml"/>
<variant file="biped/formations/syntagma_front.xml"/>
<variant file="biped/formations/syntagma_mid.xml"/>
<variant file="biped/formations/syntagma_01.xml"/>
<variant file="biped/formations/syntagma_02.xml"/>
<variant file="biped/formations/syntagma_03.xml"/>
<variant file="biped/formations/syntagma_04.xml"/>
<variant file="biped/formations/syntagma_back.xml"/>
</group>
<material>player_trans.xml</material>
binaries/data/mods/public/art/actors/units/ptolemies/cavalry_spearman_a_r.xml
+2 -2
View File
@@ -2,7 +2,7 @@
<actor version="1">
<castshadow/>
<group>
<variant file="biped/base_cavalry_spearman_relax_shield_c.xml" frequency="100" name="Base">
<variant file="biped/base_cavalry_spearman_relax_shield_aspis.xml" frequency="100" name="Base">
<mesh>skeletal/new/m_tunic_short.dae</mesh>
<props>
<prop actor="props/units/heads/new/head_hele_a.xml" attachpoint="head"/>
@@ -34,7 +34,7 @@
</variant>
</group>
<group>
<variant file="biped/base_cavalry_spearman_relax_shield_c.xml"/>
<variant file="biped/base_cavalry_spearman_relax_shield_aspis.xml"/>
<variant file="biped/rider/carry_meat.xml"/>
</group>
<group>
binaries/data/mods/public/art/actors/units/ptolemies/cavalry_spearman_c_r.xml
+1 -1
View File
@@ -2,7 +2,7 @@
<actor version="1">
<castshadow/>
<group>
<variant file="biped/base_cavalry_spearman_relax_shield_c.xml" frequency="100" name="Base">
<variant file="biped/base_cavalry_spearman_relax_shield_aspis.xml" frequency="100" name="Base">
<mesh>skeletal/new/m_armor_tunic_short.dae</mesh>
<props>
<prop actor="props/units/heads/new/head_hele_a.xml" attachpoint="head"/>
binaries/data/mods/public/art/actors/units/ptolemies/cavalry_spearman_e_r.xml
+2 -2
View File
@@ -2,7 +2,7 @@
<actor version="1">
<castshadow/>
<group>
<variant file="biped/base_cavalry_spearman_relax_shield_c.xml" frequency="100" name="Base">
<variant file="biped/base_cavalry_spearman_relax_shield_aspis.xml" frequency="100" name="Base">
<mesh>skeletal/new/m_tunic_short.dae</mesh>
<props>
<prop actor="props/units/heads/new/head_hele_a.xml" attachpoint="head"/>
@@ -28,7 +28,7 @@
</variant>
</group>
<group>
<variant file="biped/base_cavalry_spearman_relax_shield_c.xml"/>
<variant file="biped/base_cavalry_spearman_relax_shield_aspis.xml"/>
<variant file="biped/rider/carry_meat.xml"/>
</group>
<group>
binaries/data/mods/public/art/actors/units/ptolemies/infantry_pikeman_a.xml
+1 -1
View File
@@ -5,7 +5,7 @@
<variant frequency="1" name="Base">
<mesh>skeletal/new/m_armor_tunic_short.dae</mesh>
<props>
<prop actor="props/units/shields/aspis_mace_a.xml" attachpoint="shield_arm"/>
<prop actor="props/units/shields/pelte_mace_a.xml" attachpoint="shield_arm"/>
<prop actor="props/units/weapons/sarissa.xml" attachpoint="weapon_R"/>
<prop actor="props/units/heads/spartan_phalangite_helmet.xml" attachpoint="helmet"/>
<prop actor="props/units/heads/new/head_egyptian_e.xml" attachpoint="head"/>
binaries/data/mods/public/art/actors/units/ptolemies/infantry_pikeman_b.xml
+1 -1
View File
@@ -7,7 +7,7 @@
<props>
<prop actor="props/units/heads/new/head_egyptian_e.xml" attachpoint="head"/>
<prop actor="props/units/heads/ptol_quilted_b.xml" attachpoint="helmet"/>
<prop actor="props/units/shields/aspis_sml_player_color.xml" attachpoint="shield_arm"/>
<prop actor="props/units/shields/pelte_sml_player_color.xml" attachpoint="shield_arm"/>
<prop actor="props/units/weapons/sarissa.xml" attachpoint="weapon_R"/>
</props>
</variant>
binaries/data/mods/public/art/actors/units/ptolemies/infantry_pikeman_c.xml
+1 -1
View File
@@ -6,7 +6,7 @@
<mesh>skeletal/new/m_armor_tunic_short.dae</mesh>
<props>
<prop actor="props/units/heads/new/head_hele_b.xml" attachpoint="head"/>
<prop actor="props/units/shields/aspis_ptol_p.xml" attachpoint="shield_arm"/>
<prop actor="props/units/shields/pelte_ptol_p.xml" attachpoint="shield_arm"/>
<prop actor="props/units/weapons/sarissa.xml" attachpoint="weapon_R"/>
<prop actor="props/units/capes/pikeman.xml" attachpoint="root"/>
</props>
binaries/data/mods/public/art/actors/units/ptolemies/infantry_pikeman_e.xml
+1 -1
View File
@@ -6,7 +6,7 @@
<mesh>skeletal/new/m_armor_tunic_short.dae</mesh>
<props>
<prop actor="props/units/heads/new/head_egyptian_e.xml" attachpoint="head"/>
<prop actor="props/units/shields/aspis_ptol_p.xml" attachpoint="shield_arm"/>
<prop actor="props/units/shields/pelte_ptol_p.xml" attachpoint="shield_arm"/>
<prop actor="props/units/weapons/sarissa.xml" attachpoint="weapon_R"/>
</props>
<textures>
binaries/data/mods/public/art/actors/units/spartans/infantry_spearman_c.xml
+1 -1
View File
@@ -5,7 +5,7 @@
<variant file="biped/base_hoplite.xml">
<mesh>skeletal/new/m_armor_tunic_short.dae</mesh>
<props>
<prop actor="props/units/heads/new/head_corinthian.xml" attachpoint="head"/>
<prop actor="props/units/heads/new/head_hele_e.xml" attachpoint="head"/>
<prop actor="props/units/weapons/spear_hoplite.xml" attachpoint="weapon_R"/>
<prop actor="props/units/shields/aspis_spart_c.xml" attachpoint="shield_arm"/>
<prop actor="props/units/capes/hoplite_fast.xml" attachpoint="root"/>
binaries/data/mods/public/art/animation/biped/infantry/spearman/run_ready_shield.dae
LFS
BIN
View File
Binary file not shown.
binaries/data/mods/public/art/animation/biped/infantry/spearman/run_relax_shield.dae
LFS
BIN
View File
Binary file not shown.
binaries/data/mods/public/art/animation/biped/infantry/spearman/run_relx_shield.dae
LFS
BIN
View File
Binary file not shown.
binaries/data/mods/public/art/variants/biped/base_camel_archer.xml
-12
View File
@@ -1,12 +0,0 @@
<variant name="Base" frequency="1">
<animations>
<animation file="biped/cavalryidle.psa" name="Idle" speed="50"/>
<animation file="biped/cavalryidle.psa" name="Walk" speed="50"/>
<animation file="biped/rider_gallop.psa" name="Run" speed="40"/>
<animation event="0.84" file="biped/rider_archer_atk_a.psa" load="0.16" name="attack_ranged" speed="100"/>
<animation event="0.5" file="biped/rider_sword_shield_atk_a.psa" name="attack_slaughter" speed="400"/>
<animation event="0.5" file="biped/rider_sword_shield_atk_a.psa" name="gather_meat" speed="350"/>
<animation event="0.5" file="biped/rider_spear_shield_atk_a.psa" name="gather_meat" speed="350"/>
<animation file="biped/rider_sword_death_a.psa" name="death" speed="230"/>
</animations>
</variant>
binaries/data/mods/public/art/variants/biped/base_camel_javelinist.xml
-12
View File
@@ -1,12 +0,0 @@
<variant name="Base" frequency="1">
<animations>
<animation file="biped/cavalryidle.psa" name="Idle" speed="50"/>
<animation file="biped/cavalryidle.psa" name="Walk" speed="50"/>
<animation file="biped/rider_gallop.psa" name="Run" speed="40"/>
<animation event="0.59" file="biped/rider_javelin_atk_a.psa" load="0" name="attack_ranged" speed="50"/>
<animation event="0.5" file="biped/rider_sword_shield_atk_a.psa" name="attack_slaughter" speed="400"/>
<animation event="0.5" file="biped/rider_sword_shield_atk_a.psa" name="gather_meat" speed="300"/>
<animation event="0.5" file="biped/rider_sword_shield_atk_a.psa" name="gather_meat" speed="300"/>
<animation file="biped/rider_sword_death_a.psa" name="death" speed="230"/>
</animations>
</variant>
binaries/data/mods/public/art/variants/biped/rider/base_cavalry_spearman_relax_shield_aspis.xml → binaries/data/mods/public/art/variants/biped/base_cavalry_spearman_relax_shield_aspis.xml
+7 -7
View File
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<variant file="biped/rider/cavalry/base_spearman_shield_aspis_normal_attack.xml">
<animations>
<animation file="biped/rider/cavalry/spearman/idle_shield_aspis_relax_a.dae" name="idle" speed="80"/>
<animation file="biped/rider/cavalry/spearman/trot_shield_aspis_a.dae" name="Walk" speed="7"/>
</animations>
</variant>
<?xml version="1.0" encoding="UTF-8"?>
<variant file="biped/rider/cavalry/base_spearman_shield_aspis_normal_attack.xml">
<animations>
<animation file="biped/rider/cavalry/spearman/idle_shield_aspis_relax_a.dae" name="idle" speed="80"/>
<animation file="biped/rider/cavalry/spearman/trot_shield_aspis_a.dae" name="Walk" speed="7"/>
</animations>
</variant>
binaries/data/mods/public/art/variants/biped/rider/base_cavalry_spearman_relax_shield_aspis_reverse.xml → binaries/data/mods/public/art/variants/biped/base_cavalry_spearman_relax_shield_aspis_reverse.xml
+7 -7
View File
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<variant file="biped/rider/cavalry/base_spearman_shield_aspis_reverse_attack.xml">
<animations>
<animation file="biped/rider/cavalry/spearman/idle_shield_aspis_relax_b.dae" name="idle" speed="80"/>
<animation file="biped/rider/cavalry/spearman/trot_shield_aspis_b.dae" name="Walk" speed="7"/>
</animations>
</variant>
<?xml version="1.0" encoding="UTF-8"?>
<variant file="biped/rider/cavalry/base_spearman_shield_aspis_reverse_attack.xml">
<animations>
<animation file="biped/rider/cavalry/spearman/idle_shield_aspis_relax_b.dae" name="idle" speed="80"/>
<animation file="biped/rider/cavalry/spearman/trot_shield_aspis_b.dae" name="Walk" speed="7"/>
</animations>
</variant>
binaries/data/mods/public/art/variants/biped/base_cavalry_spearman_relax_shield_c.xml
-7
View File
@@ -1,7 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<variant file="biped/rider/cavalry/base_spearman_big_shield.xml">
<animations>
<animation file="biped/rider/cavalry/spearman/idle_shield_relax_c.dae" name="idle" speed="80"/>
<animation file="biped/rider/cavalry/spearman/trot_shield_c.dae" name="Walk" speed="7"/>
</animations>
</variant>
binaries/data/mods/public/art/variants/biped/base_cavalry_spearman_relax_shield_reverse.xml
+2 -2
View File
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<variant file="biped/rider/cavalry/base_spearman_shield_reverse_attack.xml">
<animations>
<animation file="biped/rider/cavalry/spearman/idle_shield_relax_c.dae" name="idle" speed="80"/>
<animation file="biped/rider/cavalry/spearman/trot_shield_c.dae" name="Walk" speed="7"/>
<animation file="biped/rider/cavalry/spearman/idle_shield_relax_b.dae" name="idle" speed="80"/>
<animation file="biped/rider/cavalry/spearman/trot_shield_b.dae" name="Walk" speed="7"/>
</animations>
</variant>
binaries/data/mods/public/art/variants/biped/base_gaul_fanatic.xml
+16
View File
@@ -0,0 +1,16 @@
<variant name="Base" frequency="1">
<animations>
<animation file="biped/infantry/hoplite/idle_relax.dae" name="Idle" id="idle1" speed="30"/>
<animation file="biped/infantry/hoplite/idle_relax.dae" name="Idle" id="idle2" speed="31"/>
<animation file="biped/infantry/hoplite/idle_relax.dae" name="Idle" id="idle3" speed="32"/>
<animation file="biped/infantry/spearman/run_relax_shield.dae" name="Walk" id="walk1" speed="7"/>
<animation file="biped/infantry/spearman/run_relax_shield.dae" name="Walk" id="walk2" speed="8"/>
<animation file="biped/infantry/spearman/run_relax_shield.dae" name="Walk" id="walk3" speed="9"/>
<animation file="biped/infantry/spearman/run_ready_shield.dae" name="Run" id="run1" speed="4"/>
<animation file="biped/infantry/spearman/run_ready_shield.dae" name="Run" id="run2" speed="5"/>
<animation file="biped/infantry/spearman/run_ready_shield.dae" name="Run" id="run3" speed="6"/>
<animation event="0.5" file="biped/infantry/spearman/attack_melee_a.dae" name="Attack_melee" id="attack1" speed="30"/>
<animation event="0.5" file="biped/infantry/swordsman/attack_melee_shield_b.dae" name="Attack_melee" id="attack2" speed="100"/>
<animation file="biped/infantry/promotion.dae" name="promotion" speed="80"/>
</animations>
</variant>
binaries/data/mods/public/art/variants/biped/rider/cavalry/base_spearman_big_shield.xml
-11
View File
@@ -1,11 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<variant file="biped/rider/cavalry/base_spearman.xml">
<animations>
<animation file="biped/rider/cavalry/spearman/gallop_shield.dae" name="Run" speed="7"/>
<animation file="biped/rider/cavalry/spearman/attack_shield_stab_02.dae" name="attack_melee" event="0.5" id="attack1" speed="60"/>
<animation file="biped/rider/cavalry/spearman/attack_shield_stab_01.dae" event="0.5" name="attack_melee" id="attack2" speed="60"/>
<animation file="biped/rider/cavalry/spearman/attack_shield_stab_01.dae" event="0.5" name="attack_melee" id="attack3" speed="60"/>
<animation file="biped/rider/cavalry/spearman/attack_shield_stab_01.dae" event="0.5" name="attack_melee" id="attack4" speed="60"/>
<animation file="biped/rider/cavalry/attack_capture.dae" name="attack_capture" speed="100"/>
</animations>
</variant>
binaries/data/mods/public/art/variants/biped/rider/cavalry/base_spearman_shield_reverse_attack.xml
+4 -4
View File
@@ -2,10 +2,10 @@
<variant file="biped/rider/cavalry/base_spearman.xml">
<animations>
<animation file="biped/rider/cavalry/spearman/gallop_shield.dae" name="Run" speed="7"/>
<animation file="biped/rider/cavalry/spearman/attack_shield_stab_reverse_02.dae" event="0.5" name="attack_melee" id="attack1" speed="60"/>
<animation file="biped/rider/cavalry/spearman/attack_shield_stab_reverse_01.dae" event="0.5" name="attack_melee" id="attack2" speed="60"/>
<animation file="biped/rider/cavalry/spearman/attack_shield_stab_reverse_01.dae" event="0.5" name="attack_melee" id="attack3" speed="60"/>
<animation file="biped/rider/cavalry/spearman/attack_shield_stab_reverse_01.dae" event="0.5" name="attack_melee" id="attack4" speed="60"/>
<animation file="biped/rider/cavalry/spearman/attack_shield_stab_reverse_d.dae" event="0.5" name="attack_melee" id="attack1" speed="60"/>
<animation file="biped/rider/cavalry/spearman/attack_shield_stab_reverse_a.dae" event="0.5" name="attack_melee" id="attack2" speed="60"/>
<animation file="biped/rider/cavalry/spearman/attack_shield_stab_reverse_a.dae" event="0.5" name="attack_melee" id="attack3" speed="60"/>
<animation file="biped/rider/cavalry/spearman/attack_shield_stab_reverse_c.dae" event="0.5" name="attack_melee" id="attack4" speed="60"/>
<animation file="biped/rider/cavalry/attack_capture.dae" name="attack_capture" speed="100"/>
</animations>
</variant>
binaries/data/mods/public/art/variants/biped/rider/death_archer.xml
+2 -2
View File
@@ -1,6 +1,6 @@
<variant name="Death">
<animations>
<animation file="biped/rider/cavalry/archer/death.dae" name="death" id="death1" speed="120"/>
<animation file="biped/rider/cavalry/archer/death.dae" name="death" id="death2" speed="120"/>
<animation file="biped/rider/cavalry/generic/death.dae" name="death" id="death1" speed="120"/>
<animation file="biped/rider/cavalry/generic/death.dae" name="death" id="death2" speed="120"/>
</animations>
</variant>
binaries/data/mods/public/art/variants/biped/rider/elephantry/turret_idle.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<variant frequency="1" name="Idle">
<animations>
<animation file="biped/new/inf_sarissa_rest.dae" name="Idle" speed="25"/>
<animation file="biped/infantry/pikeman/idle_relax.dae" name="Idle" speed="25"/>
</animations>
</variant>
binaries/data/mods/public/art/variants/shields/ptol_pelte_01.xml
+8
View File
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<variant file="shields/pelte_base.xml" name="Ptol-02">
<textures>
<texture file="props/shield/ptol_round_b_bronze_player.png" name="baseTex"/>
<texture file="props/shield/ptol_round_b_norm.png" name="normTex"/>
<texture file="props/shield/ptol_round_b_spec.png" name="specTex"/>
</textures>
</variant>
binaries/data/mods/public/art/variants/shields/ptol_pelte_02.xml
+8
View File
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<variant file="shields/pelte_base.xml" name="Ptol-02">
<textures>
<texture file="props/shield/ptol_round_a_bronze_player.png" name="baseTex"/>
<texture file="props/shield/ptol_round_b_norm.png" name="normTex"/>
<texture file="props/shield/ptol_round_b_spec.png" name="specTex"/>
</textures>
</variant>
binaries/data/mods/public/art/variants/shields/spart_aspis_h_02.xml
-6
View File
@@ -1,6 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<variant file="shields/aspis_base_01.xml" name="Spart-Lambda-06">
<textures>
<texture file="props/shield/aspis_spart_lambda_06.png" name="baseTex"/>
</textures>
</variant>
binaries/data/mods/public/art/variants/shields/spart_aspis_h_03.xml
-6
View File
@@ -1,6 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<variant file="shields/aspis_base_01.xml" name="Spart-Hero-01">
<textures>
<texture file="props/shield/aspis_spart_king.png" name="baseTex"/>
</textures>
</variant>