Permalink
Browse files

Merge remote-tracking branch 'remotes/trunk'

  • Loading branch information...
2 parents 914c910 + de5db4d commit f38b2d5cff361cf9b33c0e95e7674e3363eb86b9 @KieranP KieranP committed Nov 25, 2012
Showing with 1,719 additions and 191 deletions.
  1. +14 −0 binaries/data/mods/public/art/actors/props/special/hele_rock_packed.xml
  2. +14 −0 binaries/data/mods/public/art/actors/props/special/kart_rock_packed.xml
  3. +14 −0 binaries/data/mods/public/art/actors/props/special/rome_rock_packed.xml
  4. +19 −0 binaries/data/mods/public/art/actors/props/special/rome_scorpio_packed.xml
  5. +18 −0 binaries/data/mods/public/art/actors/props/special/rome_scorpio_packed_h.xml
  6. +13 −0 binaries/data/mods/public/art/actors/props/special/rome_scorpio_packed_pack.xml
  7. +30 −0 binaries/data/mods/public/art/actors/props/special/rome_scorpio_packed_r.xml
  8. +22 −0 binaries/data/mods/public/art/actors/props/special/wagon_four_wheel_empty.xml
  9. +23 −0 binaries/data/mods/public/art/actors/props/special/wagon_four_wheel_hele_rock.xml
  10. +23 −0 binaries/data/mods/public/art/actors/props/special/wagon_four_wheel_kart_rock.xml
  11. +23 −0 binaries/data/mods/public/art/actors/props/special/wagon_four_wheel_rome_rock.xml
  12. +17 −19 binaries/data/mods/public/art/actors/structures/persians/gardens_struct.xml
  13. +234 −0 binaries/data/mods/public/art/animation/mechanical/wagon_four_wheel_empty_idle.dae
  14. +362 −0 binaries/data/mods/public/art/animation/mechanical/wagon_four_wheel_empty_move.dae
  15. +74 −0 binaries/data/mods/public/art/meshes/props/special/hele_rock_packed.dae
  16. +76 −0 binaries/data/mods/public/art/meshes/props/special/kart_rock_packed.dae
  17. +121 −0 binaries/data/mods/public/art/meshes/props/special/rome_rock_packed.dae
  18. +121 −0 binaries/data/mods/public/art/meshes/props/special/rome_siege_scorpio_packed.dae
  19. +234 −0 binaries/data/mods/public/art/meshes/props/special/wagon_four_wheel_empty.dae
  20. +7 −6 binaries/data/mods/public/gui/session/input.js
  21. +9 −4 binaries/data/mods/public/gui/session/unit_commands.js
  22. +16 −9 binaries/data/mods/public/gui/session/utility_functions.js
  23. +1 −1 binaries/data/mods/public/maps/scenarios/Units_demo.xml
  24. +8 −3 binaries/data/mods/public/shaders/arb/model_common.fp
  25. +8 −3 binaries/data/mods/public/shaders/arb/terrain_common.fp
  26. +9 −8 binaries/data/mods/public/shaders/effects/model_water.xml
  27. +8 −7 binaries/data/mods/public/shaders/effects/model_waterfall.xml
  28. +9 −8 binaries/data/mods/public/shaders/glsl/model_common.fs
  29. +10 −7 binaries/data/mods/public/shaders/glsl/terrain_common.fs
  30. +13 −0 binaries/data/mods/public/simulation/components/GuiInterface.js
  31. +22 −3 binaries/data/mods/public/simulation/components/ProductionQueue.js
  32. +2 −1 binaries/data/mods/public/simulation/templates/other/celt_tavern.xml
  33. +4 −3 binaries/data/mods/public/simulation/templates/other/hellenic_royal_stoa.xml
  34. +1 −0 binaries/data/mods/public/simulation/templates/other/pers_apartment_block.xml
  35. +1 −0 binaries/data/mods/public/simulation/templates/other/pers_inn.xml
  36. +3 −3 binaries/data/mods/public/simulation/templates/structures/athen_civil_centre.xml
  37. +1 −1 binaries/data/mods/public/simulation/templates/structures/athen_fortress.xml
  38. +1 −0 binaries/data/mods/public/simulation/templates/structures/athen_gymnasion.xml
  39. +1 −0 binaries/data/mods/public/simulation/templates/structures/athen_prytaneion.xml
  40. +0 −2 binaries/data/mods/public/simulation/templates/structures/brit_dock.xml
  41. +1 −0 binaries/data/mods/public/simulation/templates/structures/brit_kennel.xml
  42. +2 −2 binaries/data/mods/public/simulation/templates/structures/cart_civil_centre.xml
  43. +2 −2 binaries/data/mods/public/simulation/templates/structures/cart_embassy_celtic.xml
  44. +2 −2 binaries/data/mods/public/simulation/templates/structures/cart_embassy_iberian.xml
  45. +2 −2 binaries/data/mods/public/simulation/templates/structures/cart_embassy_italiote.xml
  46. +1 −1 binaries/data/mods/public/simulation/templates/structures/cart_fortress.xml
  47. +1 −0 binaries/data/mods/public/simulation/templates/structures/cart_mausoleum.xml
  48. +5 −4 binaries/data/mods/public/simulation/templates/structures/cart_super_dock.xml
  49. +2 −2 binaries/data/mods/public/simulation/templates/structures/celt_civil_centre.xml
  50. +1 −1 binaries/data/mods/public/simulation/templates/structures/celt_dock.xml
  51. +2 −2 binaries/data/mods/public/simulation/templates/structures/celt_fortress_b.xml
  52. +2 −2 binaries/data/mods/public/simulation/templates/structures/celt_fortress_g.xml
  53. +2 −1 binaries/data/mods/public/simulation/templates/structures/celt_kennel.xml
  54. +2 −2 binaries/data/mods/public/simulation/templates/structures/gaul_civil_centre.xml
  55. +1 −1 binaries/data/mods/public/simulation/templates/structures/gaul_dock.xml
  56. +1 −1 binaries/data/mods/public/simulation/templates/structures/gaul_fortress.xml
  57. +3 −3 binaries/data/mods/public/simulation/templates/structures/hele_civil_centre.xml
  58. +1 −0 binaries/data/mods/public/simulation/templates/structures/hele_gymnasion.xml
  59. +1 −0 binaries/data/mods/public/simulation/templates/structures/hele_prytaneion.xml
  60. +1 −1 binaries/data/mods/public/simulation/templates/structures/iber_civil_centre.xml
  61. +1 −1 binaries/data/mods/public/simulation/templates/structures/iber_fortress.xml
  62. +3 −3 binaries/data/mods/public/simulation/templates/structures/mace_civil_centre.xml
  63. +2 −2 binaries/data/mods/public/simulation/templates/structures/mace_fortress.xml
  64. +1 −0 binaries/data/mods/public/simulation/templates/structures/mace_library.xml
  65. +2 −2 binaries/data/mods/public/simulation/templates/structures/maur_barracks.xml
  66. +2 −3 binaries/data/mods/public/simulation/templates/structures/maur_civil_centre.xml
  67. +3 −2 binaries/data/mods/public/simulation/templates/structures/maur_elephant_stables.xml
  68. +4 −4 binaries/data/mods/public/simulation/templates/structures/maur_fortress.xml
  69. +1 −0 binaries/data/mods/public/simulation/templates/structures/pers_apadana.xml
  70. +5 −5 binaries/data/mods/public/simulation/templates/structures/pers_barracks.xml
  71. +2 −2 binaries/data/mods/public/simulation/templates/structures/pers_civil_centre.xml
  72. +1 −1 binaries/data/mods/public/simulation/templates/structures/pers_dock.xml
  73. +2 −2 binaries/data/mods/public/simulation/templates/structures/pers_fortress.xml
  74. +1 −0 binaries/data/mods/public/simulation/templates/structures/pers_sb2.xml
  75. +1 −0 binaries/data/mods/public/simulation/templates/structures/rome_army_camp.xml
  76. +3 −3 binaries/data/mods/public/simulation/templates/structures/rome_fortress.xml
  77. +1 −1 binaries/data/mods/public/simulation/templates/structures/spart_fortress.xml
  78. +1 −0 binaries/data/mods/public/simulation/templates/structures/spart_gerousia.xml
  79. +1 −0 binaries/data/mods/public/simulation/templates/structures/spart_syssiton.xml
  80. +1 −0 binaries/data/mods/public/simulation/templates/template_structure_civic_civil_centre.xml
  81. +1 −0 binaries/data/mods/public/simulation/templates/template_structure_civic_temple.xml
  82. +1 −0 binaries/data/mods/public/simulation/templates/template_structure_defense_defense_tower.xml
  83. +1 −0 binaries/data/mods/public/simulation/templates/template_structure_defense_outpost.xml
  84. +1 −0 binaries/data/mods/public/simulation/templates/template_structure_economic_farmstead.xml
  85. +1 −0 binaries/data/mods/public/simulation/templates/template_structure_economic_market.xml
  86. +2 −1 binaries/data/mods/public/simulation/templates/template_structure_economic_mill.xml
  87. +1 −0 binaries/data/mods/public/simulation/templates/template_structure_military_barracks.xml
  88. +2 −1 binaries/data/mods/public/simulation/templates/template_structure_military_dock.xml
  89. +3 −0 binaries/data/mods/public/simulation/templates/template_structure_military_embassy.xml
  90. +1 −0 binaries/data/mods/public/simulation/templates/template_structure_military_fortress.xml
  91. +1 −0 binaries/data/mods/public/simulation/templates/template_structure_resource_corral.xml
  92. +4 −3 binaries/data/mods/public/simulation/templates/units/athen_ship_trireme.xml
  93. +3 −2 binaries/data/mods/public/simulation/templates/units/maur_hero_ashoka.xml
  94. +30 −29 binaries/data/mods/public/simulation/templates/units/maur_hero_maurya.xml
  95. +3 −2 binaries/data/mods/public/simulation/templates/units/pers_hero_cyrus.xml
  96. +3 −0 source/renderer/Renderer.cpp
  97. +1 −1 source/renderer/ShadowMap.cpp
  98. +1 −4 source/renderer/TerrainRenderer.cpp
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<actor version="1">
+
+ <castshadow/>
+
+ <group>
+ <variant frequency="100" name="hele rock packed">
+ <animations/>
+ <mesh>props/special/hele_rock_packed.dae</mesh>
+ <textures><texture file="structural/hele_siege.dds" name="baseTex"/></textures>
+ </variant>
+ </group>
+
+</actor>
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<actor version="1">
+
+ <castshadow/>
+
+ <group>
+ <variant frequency="100" name="cart rock packed">
+ <animations/>
+ <mesh>props/special/kart_rock_packed.dae</mesh>
+ <textures><texture file="structural/hele_siege.dds" name="baseTex"/></textures>
+ </variant>
+ </group>
+
+</actor>
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<actor version="1">
+
+ <castshadow/>
+
+ <group>
+ <variant frequency="100" name="rome rock packed">
+ <animations/>
+ <mesh>props/special/rome_rock_packed.dae</mesh>
+ <textures><texture file="structural/rome_ballista.png" name="baseTex"/></textures>
+ </variant>
+ </group>
+
+</actor>
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<actor version="1">
+
+ <castshadow/>
+
+ <group>
+ <variant frequency="100" name="Base">
+ <mesh>skeletal/celt_trader.dae</mesh>
+ <props>
+ <prop actor="props/special/rome_scorpio_packed_r.xml" attachpoint="trader"/>
+ <prop actor="props/special/rome_scorpio_packed_h.xml" attachpoint="donkey"/>
+ </props>
+ <textures><texture file="null_white.dds" name="baseTex"/></textures>
+ </variant>
+ </group>
+
+ <material>player_trans.xml</material>
+
+</actor>
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+ <castshadow/>
+ <group>
+ <variant frequency="100" name="Mesh">
+ <animations>
+ <animation file="quadraped/donkey_idle_01.dae" name="idle" speed="10"/>
+ <animation file="quadraped/donkey_death_01.dae" name="death" speed="40"/>
+ <animation file="quadraped/donkey_walk_01.dae" name="walk" speed="25"/>
+ </animations>
+ <mesh>skeletal/donkey.dae</mesh>
+ <props>
+ <prop actor="props/special/rome_scorpio_packed_pack.xml" attachpoint="saddle"/>
+ </props>
+ <textures><texture file="skeletal/animal_donkey.dds" name="baseTex"/></textures>
+ </variant>
+ </group>
+</actor>
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<actor version="1">
+
+ <castshadow/>
+
+ <group>
+ <variant frequency="100" name="Base">
+ <mesh>props/special/rome_siege_scorpio_packed.dae</mesh>
+ <textures><texture file="structural/hele_siege.dds" name="baseTex"/></textures>
+ </variant>
+ </group>
+
+</actor>
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+ <castshadow/>
+ <group>
+ <variant frequency="100" name="Base">
+ <animations>
+ <animation file="biped/inf_pack_idle.dae" name="Idle" speed="200"/>
+ <animation file="biped/inf_pack_walk.dae" name="Walk" speed="30"/>
+ <animation file="infantry/general/dude/dudedeath_sword.psa" name="Death" speed="200"/>
+ </animations>
+ <mesh>skeletal/m_tunic_short.dae</mesh>
+ <props>
+ <prop actor="props/units/heads/rome_monte_b.xml" attachpoint="helmet"/>
+ <prop actor="props/units/heads/head_hele_b.xml" attachpoint="head"/>
+ </props>
+ </variant>
+ </group>
+ <group>
+ <variant frequency="1" name="pectoral--plain">
+ <textures><texture file="skeletal/rome_isw_b.dds" name="baseTex"/></textures>
+ </variant>
+ <variant frequency="1" name="pectoral--muscle">
+ <textures><texture file="skeletal/rome_isw_b_2.dds" name="baseTex"/></textures>
+ </variant>
+ <variant frequency="1" name="pectoral">
+ <textures><texture file="skeletal/rome_isw_b_3.dds" name="baseTex"/></textures>
+ </variant>
+ </group>
+ <material>player_trans.xml</material>
+</actor>
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<actor version="1">
+
+ <castshadow/>
+
+ <group>
+ <variant frequency="100" name="wagon four wheel">
+ <animations>
+ <animation file="mechanical/wagon_four_wheel_empty_idle.dae" name="Idle" speed="100"/>
+ <animation file="mechanical/wagon_four_wheel_empty_move.dae" name="Walk" speed="10"/>
+ <animation file="mechanical/wagon_four_wheel_empty_move.dae" name="Run" speed="10"/>
+ </animations>
+ <mesh>props/special/wagon_four_wheel_empty.dae</mesh>
+ <props>
+ <prop actor="units/hellenes/trader_h.xml" attachpoint="horse_l"/>
+ <prop actor="units/hellenes/trader_h.xml" attachpoint="horse_r"/>
+ </props>
+ <textures><texture file="props/wooden_wagon.png" name="baseTex"/></textures>
+ </variant>
+ </group>
+
+</actor>
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<actor version="1">
+
+ <castshadow/>
+
+ <group>
+ <variant frequency="100" name="wagon hele rock">
+ <animations>
+ <animation file="mechanical/wagon_four_wheel_empty_idle.dae" name="Idle" speed="100"/>
+ <animation file="mechanical/wagon_four_wheel_empty_move.dae" name="Walk" speed="10"/>
+ <animation file="mechanical/wagon_four_wheel_empty_move.dae" name="Run" speed="10"/>
+ </animations>
+ <mesh>props/special/wagon_four_wheel_empty.dae</mesh>
+ <props>
+ <prop actor="props/special/hele_rock_packed.xml" attachpoint="cargo"/>
+ <prop actor="units/hellenes/trader_h.xml" attachpoint="horse_l"/>
+ <prop actor="units/hellenes/trader_h.xml" attachpoint="horse_r"/>
+ </props>
+ <textures><texture file="props/wooden_wagon.png" name="baseTex"/></textures>
+ </variant>
+ </group>
+
+</actor>
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<actor version="1">
+
+ <castshadow/>
+
+ <group>
+ <variant frequency="100" name="wagon kart rock">
+ <animations>
+ <animation file="mechanical/wagon_four_wheel_empty_idle.dae" name="Idle" speed="100"/>
+ <animation file="mechanical/wagon_four_wheel_empty_move.dae" name="Walk" speed="10"/>
+ <animation file="mechanical/wagon_four_wheel_empty_move.dae" name="Run" speed="10"/>
+ </animations>
+ <mesh>props/special/wagon_four_wheel_empty.dae</mesh>
+ <props>
+ <prop actor="props/special/kart_rock_packed.xml" attachpoint="cargo"/>
+ <prop actor="units/hellenes/trader_h.xml" attachpoint="horse_l"/>
+ <prop actor="units/hellenes/trader_h.xml" attachpoint="horse_r"/>
+ </props>
+ <textures><texture file="props/wooden_wagon.png" name="baseTex"/></textures>
+ </variant>
+ </group>
+
+</actor>
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<actor version="1">
+
+ <castshadow/>
+
+ <group>
+ <variant frequency="100" name="wagon hele rock">
+ <animations>
+ <animation file="mechanical/wagon_four_wheel_empty_idle.dae" name="Idle" speed="100"/>
+ <animation file="mechanical/wagon_four_wheel_empty_move.dae" name="Walk" speed="10"/>
+ <animation file="mechanical/wagon_four_wheel_empty_move.dae" name="Run" speed="10"/>
+ </animations>
+ <mesh>props/special/wagon_four_wheel_empty.dae</mesh>
+ <props>
+ <prop actor="props/special/rome_rock_packed.xml" attachpoint="cargo"/>
+ <prop actor="units/hellenes/trader_h.xml" attachpoint="horse_l"/>
+ <prop actor="units/hellenes/trader_h.xml" attachpoint="horse_r"/>
+ </props>
+ <textures><texture file="props/wooden_wagon.png" name="baseTex"/></textures>
+ </variant>
+ </group>
+
+</actor>
@@ -4,7 +4,7 @@
<group>
<variant>
<mesh>structural/pers_gardens_struct.dae</mesh>
- <props>
+ <props>
<prop actor="props/structures/persians/gardens_bush_dese_a.xml" attachpoint="root"/>
<prop actor="props/structures/persians/gardens_bush_desert_c.xml" attachpoint="root"/>
<prop actor="props/structures/persians/gardens_bush_lush_a.xml" attachpoint="root"/>
@@ -13,29 +13,27 @@
<prop actor="props/structures/persians/gardens_bush_tempe_la_b2.xml" attachpoint="root"/>
<prop actor="props/structures/persians/gardens_grass_field.xml" attachpoint="root"/>
<prop actor="props/structures/persians/gardens_log_b.xml" attachpoint="root"/>
- <prop actor="props/structures/persians/gardens_struct_nature.xml" attachpoint="root"/>
- <prop actor="props/structures/persians/gardens_struct_transp.xml" attachpoint="root"/>
-<prop actor="props/structures/persians/gardens_tree_apple_bloom.xml" attachpoint="root"/>
-<prop actor="props/structures/persians/gardens_tree_baobab_a.xml" attachpoint="root"/>
-<prop actor="props/structures/persians/gardens_tree_baobab_b.xml" attachpoint="root"/>
-<prop actor="props/structures/persians/gardens_tree_euro_beech_a_aut.xml" attachpoint="root"/>
-<prop actor="props/structures/persians/gardens_tree_euro_beech_c.xml" attachpoint="root"/>
-<prop actor="props/structures/persians/gardens_tree_lumbardypoplar_a.xml" attachpoint="root"/>
-<prop actor="props/structures/persians/gardens_tree_palmdate_b.xml" attachpoint="root"/>
-<prop actor="props/structures/persians/gardens_trunk_baobab.xml" attachpoint="root"/>
-<prop actor="props/structures/persians/gardens_trunk_deciduous_b.xml" attachpoint="root"/>
-<prop actor="props/structures/persians/gardens_turf.xml" attachpoint="root"/>
-<prop actor="props/structures/persians/gardens_water.xml" attachpoint="root"/>
-<prop actor="props/structures/persians/gardens_water_lillies.xml" attachpoint="root"/>
-<prop actor="props/structures/persians/gardens_wrld_bush_b_2.xml" attachpoint="root"/>
+ <prop actor="props/structures/persians/gardens_struct_nature.xml" attachpoint="root"/>
+ <prop actor="props/structures/persians/gardens_struct_transp.xml" attachpoint="root"/>
+ <prop actor="props/structures/persians/gardens_tree_apple_bloom.xml" attachpoint="root"/>
+ <prop actor="props/structures/persians/gardens_tree_baobab_a.xml" attachpoint="root"/>
+ <prop actor="props/structures/persians/gardens_tree_baobab_b.xml" attachpoint="root"/>
+ <prop actor="props/structures/persians/gardens_tree_euro_beech_a_aut.xml" attachpoint="root"/>
+ <prop actor="props/structures/persians/gardens_tree_euro_beech_c.xml" attachpoint="root"/>
+ <prop actor="props/structures/persians/gardens_tree_lumbardypoplar_a.xml" attachpoint="root"/>
+ <prop actor="props/structures/persians/gardens_tree_palmdate_b.xml" attachpoint="root"/>
+ <prop actor="props/structures/persians/gardens_trunk_baobab.xml" attachpoint="root"/>
+ <prop actor="props/structures/persians/gardens_trunk_deciduous_b.xml" attachpoint="root"/>
+ <prop actor="props/structures/persians/gardens_turf.xml" attachpoint="root"/>
+ <prop actor="props/structures/persians/gardens_water.xml" attachpoint="root"/>
+ <prop actor="props/structures/persians/gardens_water_lillies.xml" attachpoint="root"/>
+ <prop actor="props/structures/persians/gardens_wrld_bush_b_2.xml" attachpoint="root"/>
<prop actor="props/units/weapons/arrow_front.xml" attachpoint="loaded-projectile"/>
<prop actor="props/units/weapons/arrow_front.xml" attachpoint="projectile"/>
</props>
-
<textures>
<texture file="structural/pers_struct.dds" name="baseTex"/>
- <texture file="structural/ao/pers_gardens_ao.png" name="aoTex" />
-
+ <texture file="structural/ao/pers_gardens_ao.png" name="aoTex"/>
</textures>
</variant>
</group>
Oops, something went wrong. Retry.

0 comments on commit f38b2d5

Please sign in to comment.