real_tabasco_sauce/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Actions Activity

Normal map and Specular map for warship sails.

Browse Source 
Fixed Cav Sword tooltip.

Updated the product logo a little bit.

This was SVN commit r13881.
This commit is contained in:
Michael D. Hafer 2013-09-21 11:50:04 +00:00
parent 0233bb4877
commit 21639ce5ea
27 changed files with 178 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9,14 +9,26 @@
</group>
<group>
<variant frequency="1" name="Tree">
<textures><texture file="props/kart_sail_1.dds" name="baseTex"/></textures>
<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>
</variant>
<variant frequency="1" name="tanit">
<textures><texture file="props/kart_sail_2.dds" name="baseTex"/></textures>
<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>
</variant>
<variant frequency="1" name="other">
<textures><texture file="props/kart_sail_3.dds" name="baseTex"/></textures>
<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>
</variant>
</group>
<material>player_trans.xml</material>
<material>player_trans_parallax_spec.xml</material>
</actor>

5
binaries/data/mods/public/art/actors/props/structures/carthaginians/quin_foresail.xml
View File

@ -5,8 +5,9 @@
<group>
<variant frequency="100" name="Base">
<mesh>props/kart_quin_foresail.dae</mesh>
<textures><texture file="props/sail_blank_netting.png" name="baseTex"/></textures>
<textures><texture file="props/sail_blank_netting.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.xml</material>
<material>player_trans_parallax_spec.xml</material>
</actor>

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

@ -9,14 +9,26 @@
</group>
<group>
<variant frequency="1" name="Tree">
<textures><texture file="props/kart_sail_1.dds" name="baseTex"/></textures>
<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>
</variant>
<variant frequency="1" name="tanit">
<textures><texture file="props/kart_sail_2.dds" name="baseTex"/></textures>
<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>
</variant>
<variant frequency="1" name="other">
<textures><texture file="props/kart_sail_3.dds" name="baseTex"/></textures>
<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>
</variant>
</group>
<material>player_trans.xml</material>
<material>player_trans_parallax_spec.xml</material>
</actor>

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

@ -9,14 +9,17 @@
</group>
<group>
<variant frequency="1" name="Tree">
<textures><texture file="props/kart_sail_1.dds" name="baseTex"/></textures>
<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>
</variant>
<variant frequency="1" name="tanit">
<textures><texture file="props/kart_sail_2.dds" name="baseTex"/></textures>
<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>
</variant>
<variant frequency="1" name="other">
<textures><texture file="props/kart_sail_3.dds" name="baseTex"/></textures>
<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>
</variant>
</group>
<material>player_trans.xml</material>
<material>player_trans_parallax_spec.xml</material>
</actor>

20
binaries/data/mods/public/art/actors/props/structures/hellenes/pentekonter_mainsail.xml
View File

@ -8,14 +8,26 @@
</group>
<group>
<variant frequency="1" name="sail_eye">
<textures><texture file="props/hele_sail_eye_war.dds" name="baseTex"/></textures>
<textures>
<texture file="props/hele_sail_eye_war.dds" 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="sail_pegasus">
<textures><texture file="props/hele_sail_pegasus_war.dds" name="baseTex"/></textures>
<textures>
<texture file="props/hele_sail_pegasus_war.dds" 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="sail_star">
<textures><texture file="props/hele_sail_star_war.dds" name="baseTex"/></textures>
<textures>
<texture file="props/hele_sail_star_war.dds" 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.xml</material>
<material>player_trans_parallax_spec.xml</material>
</actor>

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

@ -4,8 +4,12 @@
<group>
<variant frequency="100" name="mesh">
<mesh>props/hele_trireme_foresail.dae</mesh>
<textures><texture file="props/sail_blank_netting.png" name="baseTex"/></textures>
<textures>
<texture file="props/sail_blank_netting.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.xml</material>
<material>player_trans_parallax_spec.xml</material>
</actor>

20
binaries/data/mods/public/art/actors/props/structures/hellenes/trireme_mainsail.xml
View File

@ -8,14 +8,26 @@
</group>
<group>
<variant frequency="1" name="sail_eye">
<textures><texture file="props/hele_sail_eye_war.dds" name="baseTex"/></textures>
<textures>
<texture file="props/hele_sail_eye_war.dds" 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="sail_pegasus">
<textures><texture file="props/hele_sail_pegasus_war.dds" name="baseTex"/></textures>
<textures>
<texture file="props/hele_sail_pegasus_war.dds" 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="sail_star">
<textures><texture file="props/hele_sail_star_war.dds" name="baseTex"/></textures>
<textures>
<texture file="props/hele_sail_star_war.dds" 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.xml</material>
<material>player_trans_parallax_spec.xml</material>
</actor>

14
binaries/data/mods/public/art/actors/props/structures/persians/bireme_mast.xml
View File

@ -9,11 +9,19 @@
</group>
<group>
<variant frequency="1" name="trireme-sail-zoroaster">
<textures><texture file="props/pers_trireme_sail.dds" name="baseTex"/></textures>
<textures>
<texture file="props/pers_trireme_sail.dds" 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="trireme-sail-royal standard">
<textures><texture file="props/pers_trireme_sail_b.dds" name="baseTex"/></textures>
<textures>
<texture file="props/pers_trireme_sail_b.dds" 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.xml</material>
<material>player_trans_parallax_spec.xml</material>
</actor>

14
binaries/data/mods/public/art/actors/props/structures/persians/trireme_mast.xml
View File

@ -9,11 +9,19 @@
</group>
<group>
<variant frequency="1" name="trireme-sail-zoroaster">
<textures><texture file="props/pers_trireme_sail.dds" name="baseTex"/></textures>
<textures>
<texture file="props/pers_trireme_sail.dds" 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="trireme-sail-royal standard">
<textures><texture file="props/pers_trireme_sail_b.dds" name="baseTex"/></textures>
<textures>
<texture file="props/pers_trireme_sail_b.dds" 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.xml</material>
<material>player_trans_parallax_spec.xml</material>
</actor>

4
binaries/data/mods/public/art/actors/props/structures/romans/bireme_foresail.xml
View File

@ -6,8 +6,10 @@
<mesh>props/rome_bireme_foresail.dae</mesh>
<textures>
<texture file="props/sail_blank_netting.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.xml</material>
<material>player_trans_parallax_spec.xml</material>
</actor>

4
binaries/data/mods/public/art/actors/props/structures/romans/bireme_mainsail.xml
View File

@ -10,8 +10,10 @@
<variant frequency="1" name="sail-spqr">
<textures>
<texture file="props/rome_sail_a.dds" 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.xml</material>
<material>player_trans_parallax_spec.xml</material>
</actor>

8
binaries/data/mods/public/art/actors/props/structures/romans/quinquereme_mast.xml
View File

@ -5,8 +5,12 @@
<group>
<variant frequency="100" name="Base">
<mesh>props/rome_qui_mast.dae</mesh>
<textures><texture file="props/rome_sail_a.dds" name="baseTex"/></textures>
<textures>
<texture file="props/rome_sail_a.dds" 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.xml</material>
<material>player_trans_parallax_spec.xml</material>
</actor>

8
binaries/data/mods/public/art/actors/props/structures/romans/trireme_foresail.xml
View File

@ -4,8 +4,12 @@
<group>
<variant frequency="100" name="mesh">
<mesh>props/rome_trireme_foresail.dae</mesh>
<textures><texture file="props/sail_blank_netting.png" name="baseTex"/></textures>
<textures>
<texture file="props/sail_blank_netting.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.xml</material>
<material>player_trans_parallax_spec.xml</material>
</actor>

8
binaries/data/mods/public/art/actors/props/structures/romans/trireme_mainsail.xml
View File

@ -8,8 +8,12 @@
</group>
<group>
<variant frequency="1" name="sail-spqr">
<textures><texture file="props/rome_sail_a.dds" name="baseTex"/></textures>
<textures>
<texture file="props/rome_sail_a.dds" 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.xml</material>
<material>player_trans_parallax_spec.xml</material>
</actor>

20
binaries/data/mods/public/art/actors/props/structures/spartans/pentekonter_mainsail.xml
View File

@ -8,14 +8,26 @@
</group>
<group>
<variant frequency="1" name="sail_scorpion">
<textures><texture file="props/spart_sail_a.png" name="baseTex"/></textures>
<textures>
<texture file="props/spart_sail_a.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="sail_dokana">
<textures><texture file="props/spart_sail_b.png" name="baseTex"/></textures>
<textures>
<texture file="props/spart_sail_b.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="sail_lamda">
<textures><texture file="props/spart_sail_c.png" name="baseTex"/></textures>
<textures>
<texture file="props/spart_sail_c.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.xml</material>
<material>player_trans_parallax_spec.xml</material>
</actor>

26
binaries/data/mods/public/art/actors/props/structures/spartans/trireme_mainsail.xml
View File

@ -8,17 +8,33 @@
</group>
<group>
<variant frequency="1" name="sail_scorpion">
<textures><texture file="props/spart_sail_a.png" name="baseTex"/></textures>
<textures>
<texture file="props/spart_sail_a.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="sail_dokana">
<textures><texture file="props/spart_sail_b.png" name="baseTex"/></textures>
<textures>
<texture file="props/spart_sail_b.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="2" name="sail_lamda">
<textures><texture file="props/spart_sail_c.png" name="baseTex"/></textures>
<textures>
<texture file="props/spart_sail_c.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="sail_gorgon">
<textures><texture file="props/spart_sail_d.png" name="baseTex"/></textures>
<textures>
<texture file="props/spart_sail_d.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.xml</material>
<material>player_trans_parallax_spec.xml</material>
</actor>

8
binaries/data/mods/public/art/actors/structures/athenians/trireme.xml
View File

@ -16,11 +16,9 @@
<prop actor="props/structures/hellenes/trireme_foresail.xml" attachpoint="sail"/>
<prop actor="props/structures/hellenes/trireme_shroud.xml" attachpoint="sail"/>
</props>
</variant>
</group>
<group>
<variant frequency="1" name="Blue Eye">
<textures><texture file="structural/hele_trireme_big.dds" name="baseTex"/></textures>
<textures>
<texture file="structural/hele_trireme_big.dds" name="baseTex"/>
</textures>
</variant>
</group>
<material>player_trans.xml</material>

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

Binary file not shown.

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

Binary file not shown.

BIN
binaries/data/mods/public/art/textures/ui/pregame/shell/logo/0ad_logo.png (Stored with Git LFS)
View File

Binary file not shown.

BIN
binaries/data/mods/public/art/textures/ui/pregame/shell/logo/product.dds (Stored with Git LFS)
View File

Binary file not shown.

BIN
binaries/data/mods/public/art/textures/ui/session/icons/mappreview/nopreview.png (Stored with Git LFS)
View File

Binary file not shown.

BIN
binaries/data/mods/public/art/textures/ui/session/portraits/emblems/emblem_athens.png (Stored with Git LFS)
View File

Binary file not shown.

BIN
binaries/data/mods/public/art/textures/ui/session/portraits/emblems/emblem_persians_alt.png (Stored with Git LFS)
View File

Binary file not shown.

BIN
binaries/data/mods/public/art/textures/ui/session/portraits/emblems/persians.png (Stored with Git LFS)
View File

Binary file not shown.

BIN
binaries/data/mods/public/art/textures/ui/session/portraits/emblems/persians2.png (Stored with Git LFS)
View File

Binary file not shown.

2
binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_swordsman.xml
View File

@ -44,7 +44,7 @@
<Classes datatype="tokens">Sword</Classes>
<GenericName>Cavalry Swordsman</GenericName>
<History>Fighting from horseback with a sword is a tricky thing to do. This required usage of a sword that was longer than the typical infantry sword. One needed a good reach to attack from the height of a horse. If you were without spear (the ideal weapon of choice) it was probably because you needed your hands free to do other tasks such as riding hard and fast. It wasn't uncommon for the men to dismount and attack from foot if they were armed with only a sword.</History>
<Tooltip>Classes: Melee Cavalry Spearman.
<Tooltip>Classes: Melee Cavalry Swordsman.
Counters: 2x vs. Archers, All Support Units, and Siege Weapons.
Countered by: Spearmen, Cavalry Skirmishers, Elephants.</Tooltip>
</Identity>