1
0
forked from 0ad/0ad

This was SVN commit r8764.

This commit is contained in:
Matthijs de Rijk 2010-12-02 23:28:31 +00:00
parent 11f7296188
commit a7a858b9c0

View File

@ -1,16 +1,49 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<float/>
<group>
<variant frequency="100" name="Base">
<mesh>structural/hele_tric.dae</mesh>
<props>
<prop actor="props/structures/hellenes/trireme_cor_mast.xml" attachpoint="root"/>
<prop actor="props/structures/hellenes/trireme_cor_oars.xml" attachpoint="root"/>
</props>
<texture>structural/plac_hele.dds</texture>
</variant>
</group>
<material>player_trans.xml</material>
</actor>
<<<<<<< .mine
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
<float/>
<group>
<variant frequency="100" name="Base">
<mesh>structural/hele_tric.dae</mesh>
<texture>structural/hele_tric_a.dds</texture>
</variant>
</group>
<group>
<variant frequency="1" name="sail">
<props>
<prop actor="props/structures/hellenes/trireme_cor_mast.xml" attachpoint="root"/>
<prop actor="props/structures/hellenes/trireme_cor_oars.xml" attachpoint="root"/>
</props>
</variant>
<variant frequency="1" name="no-sail">
<props>
<prop actor="props/structures/hellenes/trireme_cor_oars.xml" attachpoint="root"/>
</props>
</variant>
</group>
<material>player_trans.xml</material>
</actor>=======
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<float/>
<group>
<variant frequency="100" name="Base">
<mesh>structural/hele_tric.dae</mesh>
<props>
<prop actor="props/structures/hellenes/trireme_cor_mast.xml" attachpoint="root"/>
<prop actor="props/structures/hellenes/trireme_cor_oars.xml" attachpoint="root"/>
</props>
<texture>structural/plac_hele.dds</texture>
</variant>
</group>
<material>player_trans.xml</material>
</actor>
>>>>>>> .r7157