sera/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Remove duplicate dds textures for desert_forestfloor_palms.dds, kart_trireme.dds, tree_cypress_a.dds, farming_wheat_harvest_b.dds, road_roman.dds, celt_caratacos.dds, rome_ijv_e.dds, hele_trireme.dds, iber_sail_b.dds, kart_sail_1.dds, kart_sail_2.dds, kart_sail_3.dds.

Browse Source 
Refs #6326

This was SVN commit r26059.
This commit is contained in:
Stan 2021-12-12 19:15:40 +00:00
parent 846b8154c2
commit 0dd3bcc8e7
39 changed files with 127 additions and 160 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
binaries/data/mods/public/art/actors/flora/trees/mediterranean_cypress.xml
View File

@ -13,7 +13,7 @@
</variant>
<variant frequency="2" name="Cypress Tree (Medium)">
<mesh>gaia/tree_cypress_med.dae</mesh>
<props>
<props>
<prop actor="flora/trees/cypress_med_branches.xml" attachpoint="root"/>
</props>
<textures>
@ -22,7 +22,7 @@
</variant>
<variant frequency="2" name="Cypress Tree (Large)">
<mesh>gaia/tree_cypress_large.dae</mesh>
<props>
<props>
<prop actor="flora/trees/cypress_large_branches.xml" attachpoint="root"/>
</props>
<textures>
@ -31,7 +31,7 @@
</variant>
<variant frequency="1" name="Cypress Tree (XLarge)">
<mesh>gaia/tree_cypress_xlarge.dae</mesh>
<props>
<props>
<prop actor="flora/trees/cypress_xlarge_branches.xml" attachpoint="root"/>
</props>
<textures>
@ -40,23 +40,22 @@
</variant>
<variant frequency="2" name="Cypress Tree (Skinny)">
<mesh>gaia/tree_cypress_skinny.dae</mesh>
<props>
<props>
<prop actor="flora/trees/cypress_skinny_branches.xml" attachpoint="root"/>
</props>
<textures>
<texture file="gaia/tree_cypress_a.dds" name="baseTex"/>
<texture file="gaia/tree_cypress_f.png" name="baseTex"/>
</textures>
</variant>
<variant frequency="1" name="Cypress Tree (Tall)">
<mesh>gaia/tree_cypress_tall.dae</mesh>
<props>
<props>
<prop actor="flora/trees/cypress_tall_branches.xml" attachpoint="root"/>
</props>
<textures>
<texture file="gaia/tree_cypress_a.dds" name="baseTex"/>
<texture file="gaia/tree_cypress_f.png" name="baseTex"/>
</textures>
</variant>
</group>
<material>basic_trans_wind.xml</material>
</actor>

8
binaries/data/mods/public/art/actors/props/special/common/plot_grain_fall.xml
View File

@ -1,15 +1,13 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
<group>
<variant name="Boundary">
<mesh>props/shared_field_grain.dae</mesh>
<textures><texture file="gaia/farming_wheat_harvest_b.dds" name="baseTex"/></textures>
<textures>
<texture file="gaia/farming_wheat_harvest_b.png" name="baseTex"/>
</textures>
</variant>
</group>
<material>basic_trans.xml</material>
</actor>

2
binaries/data/mods/public/art/actors/props/structures/athenians/civic_centre_trees.xml
View File

@ -5,7 +5,7 @@
<variant>
<mesh>structural/athen_cc_trees.dae</mesh>
<textures>
<texture file="gaia/tree_cypress_a.dds" name="baseTex"/>
<texture file="gaia/tree_cypress_f.png" name="baseTex"/>
</textures>
</variant>
</group>

6
binaries/data/mods/public/art/actors/props/structures/carthaginians/bireme_sail.xml
View File

@ -10,21 +10,21 @@
<group>
<variant frequency="1" name="Tree">
<textures>
<texture file="props/kart_sail_1.dds" name="baseTex"/>
<texture file="props/kart_sail_1.png" name="baseTex"/>
<texture file="props/sail_norm_1.png" name="normTex"/>
<texture file="props/sail_spec_1.png" name="specTex"/>
</textures>
</variant>
<variant frequency="1" name="tanit">
<textures>
<texture file="props/kart_sail_2.dds" name="baseTex"/>
<texture file="props/kart_sail_2.png" name="baseTex"/>
<texture file="props/sail_norm_1.png" name="normTex"/>
<texture file="props/sail_spec_1.png" name="specTex"/>
</textures>
</variant>
<variant frequency="1" name="other">
<textures>
<texture file="props/kart_sail_3.dds" name="baseTex"/>
<texture file="props/kart_sail_3.png" name="baseTex"/>
<texture file="props/sail_norm_1.png" name="normTex"/>
<texture file="props/sail_spec_1.png" name="specTex"/>
</textures>

6
binaries/data/mods/public/art/actors/props/structures/carthaginians/quin_mainsail.xml
View File

@ -10,21 +10,21 @@
<group>
<variant frequency="1" name="Tree">
<textures>
<texture file="props/kart_sail_1.dds" name="baseTex"/>
<texture file="props/kart_sail_1.png" name="baseTex"/>
<texture file="props/sail_norm_1.png" name="normTex"/>
<texture file="props/sail_spec_1.png" name="specTex"/>
</textures>
</variant>
<variant frequency="1" name="tanit">
<textures>
<texture file="props/kart_sail_2.dds" name="baseTex"/>
<texture file="props/kart_sail_2.png" name="baseTex"/>
<texture file="props/sail_norm_1.png" name="normTex"/>
<texture file="props/sail_spec_1.png" name="specTex"/>
</textures>
</variant>
<variant frequency="1" name="other">
<textures>
<texture file="props/kart_sail_3.dds" name="baseTex"/>
<texture file="props/kart_sail_3.png" name="baseTex"/>
<texture file="props/sail_norm_1.png" name="normTex"/>
<texture file="props/sail_spec_1.png" name="specTex"/>
</textures>

21
binaries/data/mods/public/art/actors/props/structures/carthaginians/trireme_mainsail.xml
View File

@ -9,16 +9,25 @@
</group>
<group>
<variant frequency="1" name="Tree">
<textures><texture file="props/kart_sail_1.dds" name="baseTex"/> <texture file="props/sail_norm_1.png" name="normTex"/>
<texture file="props/sail_spec_1.png" name="specTex"/></textures>
<textures>
<texture file="props/kart_sail_1.png" name="baseTex"/>
<texture file="props/sail_norm_1.png" name="normTex"/>
<texture file="props/sail_spec_1.png" name="specTex"/>
</textures>
</variant>
<variant frequency="1" name="tanit">
<textures><texture file="props/kart_sail_2.dds" name="baseTex"/> <texture file="props/sail_norm_1.png" name="normTex"/>
<texture file="props/sail_spec_1.png" name="specTex"/></textures>
<textures>
<texture file="props/kart_sail_2.png" name="baseTex"/>
<texture file="props/sail_norm_1.png" name="normTex"/>
<texture file="props/sail_spec_1.png" name="specTex"/>
</textures>
</variant>
<variant frequency="1" name="other">
<textures><texture file="props/kart_sail_3.dds" name="baseTex"/> <texture file="props/sail_norm_1.png" name="normTex"/>
<texture file="props/sail_spec_1.png" name="specTex"/></textures>
<textures>
<texture file="props/kart_sail_3.png" name="baseTex"/>
<texture file="props/sail_norm_1.png" name="normTex"/>
<texture file="props/sail_spec_1.png" name="specTex"/>
</textures>
</variant>
</group>
<material>player_trans_parallax_spec.xml</material>

12
binaries/data/mods/public/art/actors/props/structures/carthaginians/trireme_tent.xml
View File

@ -1,12 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<float/>
<group>
<variant frequency="100" name="Base">
<mesh>props/kart_trireme_tent.dae</mesh>
<textures><texture file="structural/kart_trireme.dds" name="baseTex"/></textures>
</variant>
</group>
<material>player_trans.xml</material>
</actor>

8
binaries/data/mods/public/art/actors/props/structures/hellenes/hele_tri1.xml
View File

@ -1,15 +1,13 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
<group>
<variant>
<mesh>props/hele_tri1.dae</mesh>
<textures><texture file="structural/hele_trireme.dds" name="baseTex"/></textures>
<textures>
<texture file="structural/hele_trireme_02.png" name="baseTex"/>
</textures>
</variant>
</group>
<material>basic_trans.xml</material>
</actor>

6
binaries/data/mods/public/art/actors/props/structures/iberians/fishship_sail.xml
View File

@ -4,8 +4,10 @@
<group>
<variant frequency="100" name="mesh">
<mesh>props/iber_fishship_sail.dae</mesh>
<textures><texture file="props/iber_sail_b.dds" name="baseTex"/></textures>
<textures>
<texture file="props/iber_sail_b.png" name="baseTex"/>
</textures>
</variant>
</group>
<material>player_trans.xml</material>
<material>default.xml</material>
</actor>

27
binaries/data/mods/public/art/actors/props/structures/macedonians/civic_centre_trees.xml
View File

@ -1,14 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant>
<mesh>structural/mace_cc_trees.dae</mesh>
<textures>
<texture file="gaia/tree_cypress_a.dds" name="baseTex"/>
<texture file="structural/ao/athen_civic_centre.png" name="aoTex"/>
</textures>
</variant>
</group>
<material>player_trans_ao.xml</material>
</actor>
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant>
<mesh>structural/mace_cc_trees.dae</mesh>
<textures>
<texture file="gaia/tree_cypress_f.png" name="baseTex"/>
</textures>
</variant>
</group>
<material>default.xml</material>
</actor>

28
binaries/data/mods/public/art/actors/props/structures/macedonians/library_trees.xml
View File

@ -1,14 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant>
<mesh>structural/mace_library_trees.dae</mesh>
<textures>
<texture file="gaia/tree_cypress_a.dds" name="baseTex"/>
<texture file="structural/ao/mace_library.png" name="aoTex"/>
</textures>
</variant>
</group>
<material>no_trans_ao.xml</material>
</actor>
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant>
<mesh>structural/mace_library_trees.dae</mesh>
<textures>
<texture file="gaia/tree_cypress_f.png" name="baseTex"/>
<texture file="structural/ao/mace_library.png" name="aoTex"/>
</textures>
</variant>
</group>
<material>no_trans_ao.xml</material>
</actor>

27
binaries/data/mods/public/art/actors/props/structures/spartans/civic_centre_trees.xml
View File

@ -1,14 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant>
<mesh>structural/spart_cc_trees.dae</mesh>
<textures>
<texture file="gaia/tree_cypress_a.dds" name="baseTex"/>
<texture file="structural/ao/spart_civic_centre.png" name="aoTex"/>
</textures>
</variant>
</group>
<material>player_trans_ao.xml</material>
</actor>
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant>
<mesh>structural/spart_cc_trees.dae</mesh>
<textures>
<texture file="gaia/tree_cypress_f.png" name="baseTex"/>
</textures>
</variant>
</group>
<material>default.xml</material>
</actor>

11
binaries/data/mods/public/art/actors/props/units/heads/head_caradoc.xml
View File

@ -1,14 +1,13 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="beard-large">
<color>255 255 255</color>
<variant frequency="1" name="Caradoc's Head">
<mesh>props/head_longhair.dae</mesh>
<textures><texture file="props/head/celt_caratacos.dds" name="baseTex"/></textures>
<textures>
<texture file="props/head/celt_caratacos.dds" name="baseTex"/>
</textures>
</variant>
</group>
<material>default.xml</material>
</actor>

8
binaries/data/mods/public/art/actors/props/units/heads/new/head_caradoc.xml
View File

@ -2,10 +2,12 @@
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="beard-large">
<color>255 255 255</color>
<variant frequency="1" name="Caradoc's Head">
<mesh>props/new/head_longhair.dae</mesh>
<textures><texture file="props/head/celt_caratacos.dds" name="baseTex"/></textures>
<textures>
<texture file="props/head/celt_caratacos.dds" name="baseTex"/>
</textures>
</variant>
</group>
<material>default.xml</material>
</actor>

12
binaries/data/mods/public/art/actors/special/old/hellenes_trireme.xml
View File

@ -10,16 +10,10 @@
<prop actor="props/structures/hellenes/hele_tri2.xml" attachpoint="mast"/>
<prop actor="props/structures/hellenes/hele_tri3.xml" attachpoint="oars"/>
<prop actor="props/units/weapons/bolt.xml" attachpoint="projectile"/>
<prop actor="" attachpoint="12"/>
<prop actor="" attachpoint="16"/>
<prop actor="" attachpoint="17"/>
<prop actor="" attachpoint="19"/>
<prop actor="" attachpoint="20"/>
<prop actor="" attachpoint="22"/>
<prop actor="" attachpoint="23"/>
<prop actor="" attachpoint="24"/>
</props>
<textures><texture file="structural/hele_trireme.dds" name="baseTex"/></textures>
<textures>
<texture file="structural/hele_trireme_02.png" name="baseTex"/>
</textures>
</variant>
</group>
<material>player_trans.xml</material>

8
binaries/data/mods/public/art/terrains/biome-desert/desert_forestfloor_palms.xml
View File

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<terrain>
<textures>
<texture name="baseTex" file="types/desert_forestfloor_palms.dds"/>
<texture name="baseTex" file="types/desert_forestfloor_palms.png"/>
<texture name="normTex" file="types/desert_forestfloor_palms_norm.png"/>
<texture name="specTex" file="types/desert_forestfloor_palms_spec.png"/>
</textures>
<material>terrain_norm_spec.xml</material>
</terrain>
</textures>
<material>terrain_norm_spec.xml</material>
</terrain>

9
binaries/data/mods/public/art/terrains/road/road_roman.xml
View File

@ -1 +1,8 @@
<?xml version="1.0" encoding="utf-8"?> <terrain> <textures> <texture name="baseTex" file="types/road_roman.dds"/> </textures> <material>terrain_base.xml</material> </terrain>
<?xml version="1.0" encoding="utf-8"?>
<terrain>
<textures>
<texture name="baseTex" file="types/road_roman.png"/>
<texture name="normTex" file="types/road_roman_norm.png"/>
</textures>
<material>terrain_norm.xml</material>
</terrain>

BIN
binaries/data/mods/public/art/textures/skins/gaia/farming_wheat_harvest_b.dds (Stored with Git LFS)
View File

Binary file not shown.

BIN
binaries/data/mods/public/art/textures/skins/gaia/tree_cypress_a.dds (Stored with Git LFS)
View File

Binary file not shown.

BIN
binaries/data/mods/public/art/textures/skins/gaia/tree_cypress_f.png (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
binaries/data/mods/public/art/textures/skins/props/head/celt_caratacos.dds (Stored with Git LFS)
View File

Binary file not shown.

BIN
binaries/data/mods/public/art/textures/skins/props/head/celt_caratacos.png (Stored with Git LFS)
View File

Binary file not shown.

BIN
binaries/data/mods/public/art/textures/skins/props/iber_sail_b.dds (Stored with Git LFS)
View File

Binary file not shown.

BIN
binaries/data/mods/public/art/textures/skins/props/iber_sail_b.png (Stored with Git LFS)
View File

Binary file not shown.

BIN
binaries/data/mods/public/art/textures/skins/props/kart_sail_1.dds (Stored with Git LFS)
View File

Binary file not shown.

BIN
binaries/data/mods/public/art/textures/skins/props/kart_sail_1.png (Stored with Git LFS)
View File

Binary file not shown.

BIN
binaries/data/mods/public/art/textures/skins/props/kart_sail_2.dds (Stored with Git LFS)
View File

Binary file not shown.

BIN
binaries/data/mods/public/art/textures/skins/props/kart_sail_2.png (Stored with Git LFS)
View File

Binary file not shown.

BIN
binaries/data/mods/public/art/textures/skins/props/kart_sail_3.dds (Stored with Git LFS)
View File

Binary file not shown.

BIN
binaries/data/mods/public/art/textures/skins/props/kart_sail_3.png (Stored with Git LFS)
View File

Binary file not shown.

BIN
binaries/data/mods/public/art/textures/skins/skeletal/rome_ijv_e.dds (Stored with Git LFS)
View File

Binary file not shown.

BIN
binaries/data/mods/public/art/textures/skins/skeletal/rome_ijv_e.png (Stored with Git LFS)
View File

Binary file not shown.

BIN
binaries/data/mods/public/art/textures/skins/skeletal/rome_ijv_e_02.png (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
binaries/data/mods/public/art/textures/skins/structural/hele_trireme.dds (Stored with Git LFS)
View File

Binary file not shown.

BIN
binaries/data/mods/public/art/textures/skins/structural/hele_trireme_02.png (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
binaries/data/mods/public/art/textures/skins/structural/kart_trireme.dds (Stored with Git LFS)
View File

Binary file not shown.

BIN
binaries/data/mods/public/art/textures/terrain/types/desert_forestfloor_palms.dds (Stored with Git LFS)
View File

Binary file not shown.

BIN
binaries/data/mods/public/art/textures/terrain/types/desert_forestfloor_palms.png (Stored with Git LFS)
View File

Binary file not shown.

BIN
binaries/data/mods/public/art/textures/terrain/types/road_roman.dds (Stored with Git LFS)
View File

Binary file not shown.