Permalink
Browse files

Merge branch 'master' of https://github.com/stwf/0ad

  • Loading branch information...
2 parents 851a331 + 0337cc8 commit 4847c0a52752d0c2a46284c18ebde8f2b38de4fe Steven Fuchs committed Mar 29, 2013
Showing with 3,339 additions and 1,665 deletions.
  1. +28 −0 binaries/data/mods/public/art/actors/geology/geo_waterfall_cave.xml
  2. +26 −0 binaries/data/mods/public/art/actors/geology/geo_waterfall_double.xml
  3. +25 −0 binaries/data/mods/public/art/actors/geology/geo_waterfall_dual.xml
  4. +25 −0 binaries/data/mods/public/art/actors/geology/geo_waterfall_single.xml
  5. +9 −0 binaries/data/mods/public/art/actors/particle/water_splash.xml
  6. +13 −0 binaries/data/mods/public/art/actors/props/geology/geo_waterfall_cave_water.xml
  7. +13 −0 binaries/data/mods/public/art/actors/props/geology/geo_waterfall_double_water.xml
  8. +13 −0 binaries/data/mods/public/art/actors/props/geology/geo_waterfall_dual_water.xml
  9. +13 −0 binaries/data/mods/public/art/actors/props/geology/geo_waterfall_single_water.xml
  10. +18 −1 binaries/data/mods/public/art/actors/props/structures/mauryans/ashoka_pillar.xml
  11. +8 −8 binaries/data/mods/public/art/actors/props/structures/mauryans/ashoka_pillar_big.xml
  12. +15 −0 binaries/data/mods/public/art/actors/props/structures/mauryans/ashoka_pillar_big_base_flowers.xml
  13. +15 −0 binaries/data/mods/public/art/actors/props/structures/mauryans/ashoka_pillar_big_base_struct.xml
  14. +15 −0 binaries/data/mods/public/art/actors/props/structures/mauryans/ashoka_pillar_big_chakra.xml
  15. +2 −2 binaries/data/mods/public/art/actors/props/structures/mauryans/fort_struct_b.xml
  16. +7 −7 binaries/data/mods/public/art/actors/props/structures/mauryans/house_a_struct_b.xml
  17. +5 −7 binaries/data/mods/public/art/actors/props/structures/mauryans/house_b_struct_b.xml
  18. +5 −6 binaries/data/mods/public/art/actors/props/structures/mauryans/house_c_struct_b.xml
  19. +5 −7 binaries/data/mods/public/art/actors/props/structures/mauryans/house_d_struct_b.xml
  20. +17 −0 binaries/data/mods/public/art/actors/props/units/heads/maur_hero_big_turban.xml
  21. +15 −0 binaries/data/mods/public/art/actors/props/units/parasol.xml
  22. +6 −4 binaries/data/mods/public/art/actors/structures/mauryans/barracks.xml
  23. +1 −1 binaries/data/mods/public/art/actors/structures/mauryans/big_stupa.xml
  24. +12 −12 binaries/data/mods/public/art/actors/structures/mauryans/bireme.xml
  25. +3 −4 binaries/data/mods/public/art/actors/structures/mauryans/civil_centre.xml
  26. +3 −3 binaries/data/mods/public/art/actors/structures/mauryans/dock.xml
  27. +3 −6 binaries/data/mods/public/art/actors/structures/mauryans/fishing_ship.xml
  28. +9 −9 binaries/data/mods/public/art/actors/structures/mauryans/fortress.xml
  29. +10 −10 binaries/data/mods/public/art/actors/structures/mauryans/house.xml
  30. +8 −8 binaries/data/mods/public/art/actors/structures/mauryans/market.xml
  31. +27 −0 binaries/data/mods/public/art/actors/structures/mauryans/merchant_ship.xml
  32. +5 −4 binaries/data/mods/public/art/actors/structures/mauryans/mill.xml
  33. +1 −3 binaries/data/mods/public/art/actors/structures/mauryans/misc_structure_01.xml
  34. +13 −13 binaries/data/mods/public/art/actors/structures/mauryans/scout_tower.xml
  35. +11 −10 binaries/data/mods/public/art/actors/structures/mauryans/temple.xml
  36. +13 −14 binaries/data/mods/public/art/actors/structures/mauryans/trireme.xml
  37. +2 −2 binaries/data/mods/public/art/actors/structures/mauryans/wall_gate.xml
  38. +11 −11 binaries/data/mods/public/art/actors/structures/mauryans/wall_long.xml
  39. +11 −11 binaries/data/mods/public/art/actors/structures/mauryans/wall_medium.xml
  40. +11 −11 binaries/data/mods/public/art/actors/structures/mauryans/wall_short.xml
  41. +14 −14 binaries/data/mods/public/art/actors/structures/mauryans/wall_tower.xml
  42. +28 −0 binaries/data/mods/public/art/actors/units/mauryans/elephant_archer_a.xml
  43. +28 −0 binaries/data/mods/public/art/actors/units/mauryans/elephant_archer_b.xml
  44. +28 −0 binaries/data/mods/public/art/actors/units/mauryans/elephant_archer_e.xml
  45. +57 −0 binaries/data/mods/public/art/actors/units/mauryans/hero_ashoka.xml
  46. +35 −35 binaries/data/mods/public/art/actors/units/mauryans/hero_chariot.xml
  47. +39 −40 binaries/data/mods/public/art/actors/units/mauryans/hero_chariot_maiden_parasol.xml
  48. +1 −2 binaries/data/mods/public/art/actors/units/mauryans/hero_maurya_r.xml
  49. +148 −0 binaries/data/mods/public/art/meshes/gaia/geo_waterfall_cave.dae
  50. +85 −0 binaries/data/mods/public/art/meshes/gaia/geo_waterfall_cave_water.dae
  51. +141 −0 binaries/data/mods/public/art/meshes/gaia/geo_waterfall_double.dae
  52. +85 −0 binaries/data/mods/public/art/meshes/gaia/geo_waterfall_double_water.dae
  53. +127 −0 binaries/data/mods/public/art/meshes/gaia/geo_waterfall_dual.dae
  54. +85 −0 binaries/data/mods/public/art/meshes/gaia/geo_waterfall_dual_water.dae
  55. +127 −0 binaries/data/mods/public/art/meshes/gaia/geo_waterfall_single.dae
  56. +85 −0 binaries/data/mods/public/art/meshes/gaia/geo_waterfall_single_water.dae
  57. +9 −9 binaries/data/mods/public/art/meshes/props/ashoka_pillar_big.dae
  58. +75 −0 binaries/data/mods/public/art/meshes/props/ashoka_pillar_big_base_flowers.dae
  59. +75 −0 binaries/data/mods/public/art/meshes/props/ashoka_pillar_big_base_struct.dae
  60. +7 −7 binaries/data/mods/public/art/meshes/props/ashoka_pillar_big_lions.dae
  61. +75 −0 binaries/data/mods/public/art/meshes/props/ashoka_pillar_chakra.dae
  62. +75 −0 binaries/data/mods/public/art/meshes/props/helmet/maur_hero_turban_a.dae
  63. +75 −0 binaries/data/mods/public/art/meshes/props/parasol.dae
  64. +31 −24 binaries/data/mods/public/art/meshes/structural/maur_hero_chariot.dae
  65. +57 −3 binaries/data/mods/public/art/meshes/structural/maur_house_a_struct_b.dae
  66. +58 −4 binaries/data/mods/public/art/meshes/structural/maur_house_b_struct_b.dae
  67. +76 −22 binaries/data/mods/public/art/meshes/structural/maur_house_c_struct_b.dae
  68. +76 −22 binaries/data/mods/public/art/meshes/structural/maur_house_d_struct_b.dae
  69. +9 −9 binaries/data/mods/public/art/meshes/structural/maur_market_stalls_cloth.dae
  70. +170 −0 binaries/data/mods/public/art/meshes/structural/maur_merch_ship.dae
  71. +114 −0 binaries/data/mods/public/art/meshes/structural/maur_merchant.dae
  72. +13 −2 binaries/data/mods/public/art/meshes/structural/maur_mill.dae
  73. +24 −0 binaries/data/mods/public/art/particles/water_splash.xml
  74. BIN binaries/data/mods/public/art/textures/particles/water_splash.png
  75. BIN binaries/data/mods/public/art/textures/skins/gaia/ao/geo_waterfall_cave_ao.png
  76. BIN binaries/data/mods/public/art/textures/skins/gaia/ao/geo_waterfall_double_ao.png
  77. BIN binaries/data/mods/public/art/textures/skins/gaia/ao/geo_waterfall_dual_ao.png
  78. BIN binaries/data/mods/public/art/textures/skins/gaia/ao/geo_waterfall_single_ao.png
  79. BIN binaries/data/mods/public/art/textures/skins/gaia/waterfalls/geo_waterfall_cave.png
  80. BIN binaries/data/mods/public/art/textures/skins/gaia/waterfalls/geo_waterfall_cave_normal.png
  81. BIN binaries/data/mods/public/art/textures/skins/gaia/waterfalls/geo_waterfall_cave_spec.png
  82. BIN binaries/data/mods/public/art/textures/skins/gaia/waterfalls/geo_waterfall_double.png
  83. BIN binaries/data/mods/public/art/textures/skins/gaia/waterfalls/geo_waterfall_double_normal.png
  84. BIN binaries/data/mods/public/art/textures/skins/gaia/waterfalls/geo_waterfall_double_spec.png
  85. BIN binaries/data/mods/public/art/textures/skins/gaia/waterfalls/geo_waterfall_dual.png
  86. BIN binaries/data/mods/public/art/textures/skins/gaia/waterfalls/geo_waterfall_dual_normal.png
  87. BIN binaries/data/mods/public/art/textures/skins/gaia/waterfalls/geo_waterfall_dual_spec.png
  88. BIN binaries/data/mods/public/art/textures/skins/gaia/waterfalls/geo_waterfall_single.png
  89. BIN binaries/data/mods/public/art/textures/skins/gaia/waterfalls/geo_waterfall_single_normal.png
  90. BIN binaries/data/mods/public/art/textures/skins/gaia/waterfalls/geo_waterfall_single_spec.png
  91. BIN binaries/data/mods/public/art/textures/skins/props/helmet/maur_hero_turban_a.png
  92. BIN binaries/data/mods/public/art/textures/skins/skeletal/maur_hero_ashoka.png
  93. BIN binaries/data/mods/public/art/textures/skins/skeletal/maur_hero_ashoka_spec.png
  94. BIN binaries/data/mods/public/art/textures/skins/structural/ao/maur_house_a_ao.png
  95. BIN binaries/data/mods/public/art/textures/skins/structural/ao/maur_house_b_ao.png
  96. BIN binaries/data/mods/public/art/textures/skins/structural/ao/maur_house_c_ao.png
  97. BIN binaries/data/mods/public/art/textures/skins/structural/ao/maur_house_d_ao.png
  98. BIN binaries/data/mods/public/art/textures/skins/structural/ao/maur_mill_ao.png
  99. BIN binaries/data/mods/public/art/textures/skins/structural/ashoka_chakra.png
  100. BIN binaries/data/mods/public/art/textures/skins/structural/ashoka_chakra_normal.png
  101. BIN binaries/data/mods/public/art/textures/skins/structural/ashoka_chakra_spec.png
  102. BIN binaries/data/mods/public/art/textures/skins/structural/maur_merch_ship.png
  103. BIN binaries/data/mods/public/art/textures/ui/session/portraits/units/cart_champion_cavalry.png
  104. BIN binaries/data/mods/public/art/textures/ui/session/portraits/units/maur_ship_bireme.png
  105. BIN binaries/data/mods/public/art/textures/ui/session/portraits/units/maur_ship_fishing.png
  106. BIN binaries/data/mods/public/art/textures/ui/session/portraits/units/maur_ship_merchant.png
  107. BIN binaries/data/mods/public/art/textures/ui/session/portraits/units/maur_ship_trireme.png
  108. BIN binaries/data/mods/public/art/textures/ui/session/portraits/units/maur_support_elephant.png
  109. +1 −1 binaries/data/mods/public/gui/gamesetup/gamesetup.xml
  110. +5 −1 binaries/data/mods/public/gui/session/messages.js
  111. +8 −2 binaries/data/mods/public/gui/session/session.js
  112. +0 −1 binaries/data/mods/public/gui/session/session.xml
  113. +12 −6 binaries/data/mods/public/hwdetect/hwdetect.js
  114. +19 −8 binaries/data/mods/public/maps/scenarios/Punjab 01.xml
  115. +1 −1 binaries/data/mods/public/simulation/ai/common-api-v2/entity.js
  116. +2 −189 binaries/data/mods/public/simulation/ai/common-api-v3/base.js
  117. +1 −1 binaries/data/mods/public/simulation/ai/common-api-v3/entity.js
  118. +52 −16 binaries/data/mods/public/simulation/ai/common-api-v3/shared.js
  119. +2 −0 binaries/data/mods/public/simulation/ai/common-api-v3/terrain-analysis-pathfinder.js
  120. +26 −13 binaries/data/mods/public/simulation/ai/qbot-wc/attack_plan.js
  121. +8 −7 binaries/data/mods/public/simulation/ai/qbot-wc/defence.js
  122. +59 −85 binaries/data/mods/public/simulation/ai/qbot-wc/economy.js
  123. +31 −88 binaries/data/mods/public/simulation/ai/qbot-wc/map-module.js
  124. +55 −326 binaries/data/mods/public/simulation/ai/qbot-wc/military.js
  125. +1 −1 binaries/data/mods/public/simulation/ai/qbot-wc/plan-building.js
  126. +40 −1 binaries/data/mods/public/simulation/ai/qbot-wc/qbot.js
  127. +16 −11 binaries/data/mods/public/simulation/ai/qbot-wc/queue-manager.js
  128. +1 −0 binaries/data/mods/public/simulation/ai/qbot-wc/template-manager.js
  129. +32 −96 binaries/data/mods/public/simulation/ai/qbot-wc/worker.js
  130. +4 −1 binaries/data/mods/public/simulation/components/Foundation.js
  131. +12 −0 binaries/data/mods/public/simulation/components/UnitAI.js
  132. +9 −9 binaries/data/mods/public/simulation/data/player_defaults.json
  133. +47 −47 binaries/data/mods/public/simulation/templates/structures/maur_pillar_ashoka.xml
  134. +61 −0 binaries/data/mods/public/simulation/templates/template_unit_champion_elephant.xml
  135. +47 −0 binaries/data/mods/public/simulation/templates/template_unit_champion_elephant_melee.xml
  136. +3 −3 binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_javelinist.xml
  137. +2 −90 binaries/data/mods/public/simulation/templates/units/cart_champion_cavalry.xml
  138. +1 −89 binaries/data/mods/public/simulation/templates/units/maur_champion_elephant.xml
  139. +63 −1 binaries/data/mods/public/simulation/templates/units/maur_hero_chanakya.xml
  140. +2 −2 binaries/data/mods/public/simulation/templates/units/maur_ship_bireme.xml
  141. +5 −1 binaries/data/mods/public/simulation/templates/units/maur_ship_fishing.xml
  142. +3 −3 binaries/data/mods/public/simulation/templates/units/maur_ship_merchant.xml
  143. +2 −2 binaries/data/mods/public/simulation/templates/units/maur_ship_trireme.xml
  144. +1 −1 binaries/data/mods/public/simulation/templates/units/maur_support_elephant.xml
  145. +1 −88 binaries/data/mods/public/simulation/templates/units/pers_war_elephant.xml
  146. +7 −0 binaries/data/mods/public/simulation/templates/units/spart_support_female_citizen.xml
  147. +1 −1 source/ps/GameSetup/GameSetup.cpp
  148. +27 −21 source/simulation2/components/CCmpAIManager.cpp
  149. +2 −1 source/simulation2/components/CCmpCommandQueue.cpp
  150. +2 −25 source/simulation2/components/CCmpPosition.cpp
  151. +39 −9 source/simulation2/components/CCmpVisualActor.cpp
  152. +0 −1 source/simulation2/components/ICmpPosition.cpp
  153. +0 −2 source/simulation2/components/ICmpPosition.h
  154. +0 −1 source/simulation2/components/tests/test_RangeManager.h
  155. +41 −45 source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Environment/Environment.cpp
  156. +1 −1 source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Map/Map.cpp
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+ <castshadow/>
+<float/>
+ <group>
+ <variant frequency="100" name="waterfall cave">
+ <mesh>gaia/geo_waterfall_cave.dae</mesh>
+<props>
+<prop actor="props/geology/geo_waterfall_cave_water.xml" attachpoint="root"/>
+<prop actor="props/flora/bush_medit_me.xml" attachpoint="bush_medit_me"/>
+<prop actor="props/flora/bush_medit_sm.xml" attachpoint="bush_medit_sm"/>
+<prop actor="props/flora/bush_medit_sm.xml" attachpoint="bush_medit_sm1"/>
+<prop actor="props/flora/bush_medit_sm.xml" attachpoint="bush_medit_sm2"/>
+<prop actor="props/flora/bush_medit_sm_lush.xml" attachpoint="bush_medit_sm_lush"/>
+<prop actor="props/flora/foliagebush.xml" attachpoint="bush_foliagebush1"/>
+<prop actor="props/flora/foliagebush.xml" attachpoint="bush_foliagebush"/>
+<prop actor="particle/water_splash.xml" attachpoint="water_splash"/>
+<prop actor="particle/water_splash.xml" attachpoint="water_splash1"/>
+</props>
+<textures>
+<texture file="gaia/waterfalls/geo_waterfall_cave.png" name="baseTex"/>
+<texture file="gaia/waterfalls/geo_waterfall_cave_spec.png" name="specTex"/>
+<texture file="gaia/waterfalls/geo_waterfall_cave_normal.png" name="normTex"/>
+<texture file="gaia/ao/geo_waterfall_cave_ao.png" name="aoTex"/></textures>
+ </variant>
+ </group>
+ <material>basic_trans_ao_parallax_spec.xml</material>
+</actor>
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+ <castshadow/>
+<float/>
+ <group>
+ <variant frequency="100" name="waterfall cave">
+ <mesh>gaia/geo_waterfall_double.dae</mesh>
+<props>
+<prop actor="props/geology/geo_waterfall_double_water.xml" attachpoint="root"/>
+<prop actor="props/flora/bush_medit_me_lush.xml" attachpoint="bush_medit_me_lush"/>
+<prop actor="props/flora/bush_medit_sm_lush.xml" attachpoint="bush_medit_sm_lush"/>
+<prop actor="props/flora/bush_medit_sm.xml" attachpoint="bush_medit_me_sm"/>
+<prop actor="props/flora/bush_medit_sm.xml" attachpoint="bush_medit_sm1"/>
+<prop actor="props/flora/bush_medit_sm.xml" attachpoint="bush_medit_sm2"/>
+<prop actor="props/flora/bush_medit_sm.xml" attachpoint="bush_medit_sm3"/>
+<prop actor="particle/water_splash.xml" attachpoint="water_splash"/>
+</props>
+<textures>
+<texture file="gaia/waterfalls/geo_waterfall_double.png" name="baseTex"/>
+<texture file="gaia/waterfalls/geo_waterfall_double_spec.png" name="specTex"/>
+<texture file="gaia/waterfalls/geo_waterfall_double_normal.png" name="normTex"/>
+<texture file="gaia/ao/geo_waterfall_double_ao.png" name="aoTex"/></textures>
+ </variant>
+ </group>
+ <material>basic_trans_ao_parallax_spec.xml</material>
+</actor>
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+ <castshadow/>
+<float/>
+ <group>
+ <variant frequency="100" name="waterfall cave">
+ <mesh>gaia/geo_waterfall_dual.dae</mesh>
+<props>
+<prop actor="props/geology/geo_waterfall_dual_water.xml" attachpoint="root"/>
+<prop actor="props/flora/bush_medit_sm_lush.xml" attachpoint="bush_medit_sm_lush"/>
+<prop actor="props/flora/bush_medit_sm.xml" attachpoint="bush_medit_sm"/>
+<prop actor="props/flora/bush_medit_sm.xml" attachpoint="bush_medit_sm1"/>
+<prop actor="props/flora/bush_medit_sm.xml" attachpoint="bush_medit_sm2"/>
+<prop actor="particle/water_splash.xml" attachpoint="water_splash"/>
+<prop actor="particle/water_splash.xml" attachpoint="water_splash1"/>
+</props>
+<textures>
+<texture file="gaia/waterfalls/geo_waterfall_dual.png" name="baseTex"/>
+<texture file="gaia/waterfalls/geo_waterfall_dual_spec.png" name="specTex"/>
+<texture file="gaia/waterfalls/geo_waterfall_dual_normal.png" name="normTex"/>
+<texture file="gaia/ao/geo_waterfall_dual_ao.png" name="aoTex"/></textures>
+ </variant>
+ </group>
+ <material>basic_trans_ao_parallax_spec.xml</material>
+</actor>
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+ <castshadow/>
+<float/>
+ <group>
+ <variant frequency="100" name="waterfall cave">
+ <mesh>gaia/geo_waterfall_single.dae</mesh>
+<props>
+<prop actor="props/geology/geo_waterfall_single_water.xml" attachpoint="root"/>
+<prop actor="props/flora/bush_medit_me_lush.xml" attachpoint="bush_medit_me_lush"/>
+<prop actor="props/flora/bush_medit_me_lush.xml" attachpoint="bush_medit_me_lush1"/>
+<prop actor="props/flora/bush_medit_sm_lush.xml" attachpoint="bush_medit_sm_lush"/>
+<prop actor="props/flora/bush_medit_sm_lush.xml" attachpoint="bush_medit_sm_lush1"/>
+<prop actor="props/flora/bush_medit_sm_lush.xml" attachpoint="bush_medit_sm_lush2"/>
+<prop actor="particle/water_splash.xml" attachpoint="water_splash"/>
+</props>
+<textures>
+<texture file="gaia/waterfalls/geo_waterfall_single.png" name="baseTex"/>
+<texture file="gaia/waterfalls/geo_waterfall_single_spec.png" name="specTex"/>
+<texture file="gaia/waterfalls/geo_waterfall_single_normal.png" name="normTex"/>
+<texture file="gaia/ao/geo_waterfall_single_ao.png" name="aoTex"/></textures>
+ </variant>
+ </group>
+ <material>basic_trans_ao_parallax_spec.xml</material>
+</actor>
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+ <group>
+ <variant name="Base">
+ <particles file="water_splash.xml"/>
+ </variant>
+ </group>
+ <material>basic_trans.xml</material>
+</actor>
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+
+ <group>
+ <variant>
+ <mesh>gaia/geo_waterfall_cave_water.dae</mesh>
+ <textures>
+ <texture file="temp/waterfall.png" name="baseTex"/>
+ </textures>
+ </variant>
+ </group>
+ <material>waterfall.xml</material>
+</actor>
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+
+ <group>
+ <variant>
+ <mesh>gaia/geo_waterfall_double_water.dae</mesh>
+ <textures>
+ <texture file="temp/waterfall.png" name="baseTex"/>
+ </textures>
+ </variant>
+ </group>
+ <material>waterfall.xml</material>
+</actor>
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+
+ <group>
+ <variant>
+ <mesh>gaia/geo_waterfall_dual_water.dae</mesh>
+ <textures>
+ <texture file="temp/waterfall.png" name="baseTex"/>
+ </textures>
+ </variant>
+ </group>
+ <material>waterfall.xml</material>
+</actor>
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+
+ <group>
+ <variant>
+ <mesh>gaia/geo_waterfall_single_water.dae</mesh>
+ <textures>
+ <texture file="temp/waterfall.png" name="baseTex"/>
+ </textures>
+ </variant>
+ </group>
+ <material>waterfall.xml</material>
+</actor>
@@ -11,8 +11,25 @@
</textures>
<props>
<prop actor="props/structures/mauryans/ashoka_lion.xml" attachpoint="ashoka_lion"/>
+<prop actor="props/structures/mauryans/ashoka_pillar_big_base_flowers.xml" attachpoint="root"/>
+<prop actor="props/structures/mauryans/ashoka_pillar_big_base_struct.xml" attachpoint="root"/>
</props>
</variant>
+ <variant name="ashoka pillar big">
+ <mesh>props/ashoka_pillar_big.dae</mesh>
+ <textures>
+ <texture file="structural/ashoka_pillar.png" name="baseTex"/>
+ <texture file="structural/ashoka_pillar_spec.png" name="specTex"/>
+ <texture file="structural/ashoka_pillar_norm.png" name="normTex"/>
+ </textures>
+ <props>
+ <prop actor="props/structures/mauryans/ashoka_pillar_big_lions.xml" attachpoint="root"/>
+<prop actor="props/structures/mauryans/ashoka_pillar_big_chakra.xml" attachpoint="root"/>
+<prop actor="props/structures/mauryans/ashoka_pillar_big_base_flowers.xml" attachpoint="root"/>
+<prop actor="props/structures/mauryans/ashoka_pillar_big_base_struct.xml" attachpoint="root"/>
+
+ </props>
+ </variant>
</group>
- <material>basic_trans_parallax_spec.xml</material>
+ <material>player_trans_parallax_spec.xml</material>
</actor>
@@ -4,14 +4,14 @@
<group>
<variant name="ashoka pillar big">
<mesh>props/ashoka_pillar_big.dae</mesh>
- <textures>
- <texture file="structural/ashoka_pillar.png" name="baseTex"/>
- <texture file="structural/ashoka_pillar_spec.png" name="specTex"/>
- <texture file="structural/ashoka_pillar_norm.png" name="normTex"/>
- </textures>
- <props>
- <prop actor="props/structures/mauryans/ashoka_pillar_big_lions.xml" attachpoint="root"/>
- </props>
+ <textures>
+ <texture file="structural/ashoka_pillar.png" name="baseTex"/>
+ <texture file="structural/ashoka_pillar_spec.png" name="specTex"/>
+ <texture file="structural/ashoka_pillar_norm.png" name="normTex"/>
+ </textures>
+ <props>
+ <prop actor="props/structures/mauryans/ashoka_pillar_big_lions.xml" attachpoint="root"/>
+ </props>
</variant>
</group>
<material>basic_trans_parallax_spec.xml</material>
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+ <castshadow/>
+ <group>
+ <variant name="ashoka pillar base flowers">
+ <mesh>props/ashoka_pillar_big_base_flowers.dae</mesh>
+ <textures>
+ <texture file="props/structs_nature.png" name="baseTex"/>
+ <texture file="props/structs_nature_spec.png" name="specTex"/>
+ <texture file="props/structs_nature_norm.png" name="normTex"/>
+ </textures>
+ </variant>
+ </group>
+ <material>basic_trans_parallax_spec.xml</material>
+</actor>
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+ <castshadow/>
+ <group>
+ <variant name="ashoka pillar base struct">
+ <mesh>props/ashoka_pillar_big_base_struct.dae</mesh>
+ <textures>
+ <texture file="structural/maur_struct.png" name="baseTex"/>
+ <texture file="structural/maur_struct_spec.png" name="specTex"/>
+ <texture file="structural/maur_struct_norm.png" name="normTex"/>
+ </textures>
+ </variant>
+ </group>
+ <material>player_trans_parallax_spec.xml</material>
+</actor>
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+ <castshadow/>
+ <group>
+ <variant name="ashoka pillar chakra">
+ <mesh>props/ashoka_pillar_chakra.dae</mesh>
+ <textures>
+ <texture file="structural/ashoka_chakra.png" name="baseTex"/>
+ <texture file="structural/ashoka_chakra_spec.png" name="specTex"/>
+ <texture file="structural/ashoka_chakra_normal.png" name="normTex"/>
+ </textures>
+ </variant>
+ </group>
+ <material>player_trans_parallax_spec.xml</material>
+</actor>
@@ -6,8 +6,8 @@
<mesh>props/maur_fort_struct_b.dae</mesh>
<textures>
<texture file="structural/maur_struct_b.png" name="baseTex"/>
- <texture file="structural/maur_struct_b_spec.png" name="specTex"/>
- <texture file="structural/maur_struct_b_norm.png" name="normTex"/>
+ <texture file="structural/maur_struct_b_spec.png" name="specTex"/>
+ <texture file="structural/maur_struct_b_norm.png" name="normTex"/>
<texture file="structural/ao/maur_fortress_ao.png" name="aoTex"/>
</textures>
</variant>
@@ -4,13 +4,13 @@
<group>
<variant name="house a struct b">
<mesh>structural/maur_house_a_struct_b.dae</mesh>
- <textures>
- <texture file="structural/maur_struct_b.png" name="baseTex"/>
- <texture file="structural/maur_struct_b_spec.png" name="specTex"/>
- <texture file="structural/maur_struct_b_norm.png" name="normTex"/>
-
- </textures>
+ <textures>
+ <texture file="structural/maur_struct_b.png" name="baseTex"/>
+ <texture file="structural/maur_struct_b_spec.png" name="specTex"/>
+ <texture file="structural/maur_struct_b_norm.png" name="normTex"/>
+ <texture file="structural/ao/maur_house_a_ao.png" name="aoTex"/>
+ </textures>
</variant>
</group>
-<material>player_trans_parallax_spec.xml</material>
+<material>player_trans_ao_parallax_spec.xml</material>
</actor>
@@ -5,14 +5,12 @@
<variant name="house a struct b">
<mesh>structural/maur_house_b_struct_b.dae</mesh>
<textures>
- <texture file="structural/maur_struct_b.png" name="baseTex"/>
- <texture file="structural/maur_struct_b_spec.png" name="specTex"/>
- <texture file="structural/maur_struct_b_norm.png" name="normTex"/>
-
-
-
+ <texture file="structural/maur_struct_b.png" name="baseTex"/>
+ <texture file="structural/maur_struct_b_spec.png" name="specTex"/>
+ <texture file="structural/maur_struct_b_norm.png" name="normTex"/>
+ <texture file="structural/ao/maur_house_b_ao.png" name="aoTex"/>
</textures>
</variant>
</group>
-<material>player_trans_parallax_spec.xml</material>
+<material>player_trans_ao_parallax_spec.xml</material>
</actor>
@@ -5,13 +5,12 @@
<variant name="house a struct c">
<mesh>structural/maur_house_c_struct_b.dae</mesh>
<textures>
- <texture file="structural/maur_struct_b.png" name="baseTex"/>
- <texture file="structural/maur_struct_b_spec.png" name="specTex"/>
- <texture file="structural/maur_struct_b_norm.png" name="normTex"/>
-
-
+ <texture file="structural/maur_struct_b.png" name="baseTex"/>
+ <texture file="structural/maur_struct_b_spec.png" name="specTex"/>
+ <texture file="structural/maur_struct_b_norm.png" name="normTex"/>
+ <texture file="structural/ao/maur_house_c_ao.png" name="aoTex"/>
</textures>
</variant>
</group>
-<material>player_trans_parallax_spec.xml</material>
+<material>player_trans_ao_parallax_spec.xml</material>
</actor>
@@ -5,14 +5,12 @@
<variant name="house a struct d">
<mesh>structural/maur_house_d_struct_b.dae</mesh>
<textures>
-
- <texture file="structural/maur_struct_b.png" name="baseTex"/>
- <texture file="structural/maur_struct_b_spec.png" name="specTex"/>
- <texture file="structural/maur_struct_b_norm.png" name="normTex"/>
-
-
+ <texture file="structural/maur_struct_b.png" name="baseTex"/>
+ <texture file="structural/maur_struct_b_spec.png" name="specTex"/>
+ <texture file="structural/maur_struct_b_norm.png" name="normTex"/>
+ <texture file="structural/ao/maur_house_d_ao.png" name="aoTex"/>
</textures>
</variant>
</group>
-<material>player_trans_parallax_spec.xml</material>
+<material>player_trans_ao_parallax_spec.xml</material>
</actor>
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+ <castshadow/>
+ <group>
+ <variant frequency="1" name="Maur turban">
+ <textures>
+ <texture file="props/helmet/maur_hero_turban_a.png" name="baseTex"/>
+ </textures>
+ </variant>
+ </group>
+ <group>
+ <variant frequency="1" name="top knot front">
+ <mesh>props/helmet/maur_hero_turban_a.dae</mesh>
+ </variant>
+ </group>
+ <material>player_trans.xml</material>
+</actor>
Oops, something went wrong.

0 comments on commit 4847c0a

Please sign in to comment.