Permalink
Browse files

Merge remote-tracking branch 'remotes/trunk'

  • Loading branch information...
2 parents b2eddf1 + f99f887 commit e2909fbfb1e62488c341a748c6586d304f28ddbf @KieranP KieranP committed Apr 9, 2012
Showing with 56 additions and 459 deletions.
  1. +5 −26 binaries/data/mods/public/art/meshes/structural/iber_wall_tower.dae
  2. BIN binaries/data/mods/public/art/textures/ui/session/icons/formations/battleline-selected.png
  3. BIN binaries/data/mods/public/art/textures/ui/session/icons/formations/box-selected.png
  4. BIN binaries/data/mods/public/art/textures/ui/session/icons/formations/columnclosed-selected.png
  5. BIN binaries/data/mods/public/art/textures/ui/session/icons/formations/columnopen-selected.png
  6. BIN binaries/data/mods/public/art/textures/ui/session/icons/formations/flank-selected.png
  7. BIN binaries/data/mods/public/art/textures/ui/session/icons/formations/lineclosed-selected.png
  8. BIN binaries/data/mods/public/art/textures/ui/session/icons/formations/lineopen-selected.png
  9. BIN binaries/data/mods/public/art/textures/ui/session/icons/formations/phalanx-selected.png
  10. BIN binaries/data/mods/public/art/textures/ui/session/icons/formations/scatter-selected.png
  11. BIN binaries/data/mods/public/art/textures/ui/session/icons/formations/skirmish-selected.png
  12. BIN binaries/data/mods/public/art/textures/ui/session/icons/formations/syntagma-selected.png
  13. BIN binaries/data/mods/public/art/textures/ui/session/icons/formations/testudo-selected.png
  14. BIN binaries/data/mods/public/art/textures/ui/session/icons/formations/wedge-selected.png
  15. BIN binaries/data/mods/public/art/textures/ui/session/icons/resources/food.png
  16. BIN binaries/data/mods/public/art/textures/ui/session/icons/resources/food_selected.png
  17. BIN binaries/data/mods/public/art/textures/ui/session/icons/resources/metal.png
  18. BIN binaries/data/mods/public/art/textures/ui/session/icons/resources/metal_selected.png
  19. BIN binaries/data/mods/public/art/textures/ui/session/icons/{single → resources}/population.png
  20. BIN binaries/data/mods/public/art/textures/ui/session/icons/resources/stone.png
  21. BIN binaries/data/mods/public/art/textures/ui/session/icons/resources/stone_selected.png
  22. BIN binaries/data/mods/public/art/textures/ui/session/icons/resources/wood.png
  23. BIN binaries/data/mods/public/art/textures/ui/session/icons/resources/wood_selected.png
  24. BIN binaries/data/mods/public/art/textures/ui/session/icons/sheets/formation.dds
  25. +0 −12 binaries/data/mods/public/art/textures/ui/session/icons/sheets/formation.txt
  26. BIN binaries/data/mods/public/art/textures/ui/session/icons/sheets/resource.dds
  27. +0 −5 binaries/data/mods/public/art/textures/ui/session/icons/sheets/resource.txt
  28. BIN binaries/data/mods/public/art/textures/ui/session/icons/stances/aggressive-selected.png
  29. BIN binaries/data/mods/public/art/textures/ui/session/icons/stances/defensive-selected.png
  30. BIN binaries/data/mods/public/art/textures/ui/session/icons/stances/passive-selected.png
  31. BIN binaries/data/mods/public/art/textures/ui/session/icons/stances/standground-selected.png
  32. BIN binaries/data/mods/public/art/textures/ui/session/icons/stances/violent-selected.png
  33. +0 −354 binaries/data/mods/public/gui/common/icon_sprites.xml
  34. +10 −9 binaries/data/mods/public/gui/pregame/mainmenu.js
  35. +2 −2 binaries/data/mods/public/gui/pregame/mainmenu.xml
  36. +2 −4 binaries/data/mods/public/gui/session/selection_details.js
  37. +11 −7 binaries/data/mods/public/gui/session/session.xml
  38. +1 −12 binaries/data/mods/public/gui/session/styles.xml
  39. +25 −28 binaries/data/mods/public/gui/session/unit_commands.js

Large diffs are not rendered by default.

Oops, something went wrong.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
@@ -1,12 +0,0 @@
-loose,Loose,
-box,Box,
-column_c,Column Closed,
-line_c,Line Closed,
-column_o,Column Open,
-line_o,Line Open,
-flank,Flank,
-skirmish,Skirmish,
-wedge,Wedge,
-testudo,Testudo,
-phalanx,Phalanx,
-syntagma,Syntagma,
@@ -1,5 +0,0 @@
-food,Food,
-wood,Wood,
-stone,Stone,
-metal,Metal,
-population,Population,
@@ -447,233 +447,6 @@
/>
</sprite>
- <!--
- ==========================================
- SESSION GUI - ICON SHEETS - FORMATION
- ==========================================
- -->
-
- <sprite name="snIconSheetFormation">
- <image texture="session/icons/sheets/formation.dds"
- cell_size="64 64"
- size="0 0 100% 100%"
- />
- </sprite>
- <sprite name="snIconSheetFormationOver">
- <effect add_color="42 42 42 0"/>
- <image texture="session/icons/sheets/formation.dds"
- cell_size="64 64"
- size="0 0 100% 100%"
- />
- </sprite>
- <sprite name="snIconSheetFormationDisabled">
- <effect grayscale=""/>
- <image texture="session/icons/sheets/formation.dds"
- cell_size="64 64"
- size="0 0 100% 100%"
- />
- </sprite>
-
- <sprite name="snIconSheetFormationButton">
- <image texture="session/icons/bkg/portrait.dds"
- size="0 0 100% 100%"
- />
- <image texture="session/icons/sheets/formation.dds"
- cell_size="64 64"
- size="0 0 100% 100%"
- />
- </sprite>
- <sprite name="snIconSheetFormationButtonOver">
- <effect add_color="42 42 42 0"/>
- <image texture="session/icons/bkg/portrait.dds"
- size="0 0 100% 100%"
- />
- <image texture="session/icons/sheets/formation.dds"
- cell_size="64 64"
- size="0 0 100% 100%"
- />
- </sprite>
- <sprite name="snIconSheetFormationButtonDisabled">
- <effect grayscale=""/>
- <image texture="session/icons/bkg/portrait.dds"
- size="0 0 100% 100%"
- />
- <image texture="session/icons/sheets/formation.dds"
- cell_size="64 64"
- size="0 0 100% 100%"
- />
- </sprite>
-
- <sprite name="snIconSheetFormationTabButton">
- <image texture="session/icons/bkg/tab.dds"
- size="0 0 100% 100%"
- />
- <image texture="session/icons/sheets/formation.dds"
- cell_size="64 64"
- size="0 0 100% 100%"
- />
- </sprite>
- <sprite name="snIconSheetFormationTabButtonOver">
- <image texture="session/icons/bkg/tab.dds"
- size="0 0 100% 100%"
- />
- <image
- texture="session/icons/sheets/formation.dds"
- cell_size="64 64"
- size="0 0 100% 100%"
- >
- <effect add_color="42 42 42 0"/>
- </image>
- </sprite>
-
- <sprite name="snIconSheetFormationTabButtonDisabled">
- <effect grayscale=""/>
- <image texture="session/icons/bkg/tab.dds"
- size="0 0 100% 100%"
- />
- <image texture="session/icons/sheets/formation.dds"
- cell_size="64 64"
- size="0 0 100% 100%"
- />
- </sprite>
-
- <!--
- ==========================================
- SESSION GUI - ICON SHEETS - GARRISON
- ==========================================
- -->
-
- <sprite name="snIconSheetGarrison">
- <image texture="session/icons/sheets/garrison.dds"
- cell_size="64 64"
- size="0 0 100% 100%"
- />
- </sprite>
- <sprite name="snIconSheetGarrisonOver">
- <effect add_color="42 42 42 0"/>
- <image texture="session/icons/sheets/garrison.dds"
- cell_size="64 64"
- size="0 0 100% 100%"
- />
- </sprite>
- <sprite name="snIconSheetGarrisonDisabled">
-
- <image texture="session/icons/sheets/garrison.dds"
- cell_size="64 64"
- size="0 0 100% 100%"
- />
- </sprite>
-
- <sprite name="snIconSheetGarrisonButton">
- <image texture="session/icons/bkg/command_outer.dds"
- size="0 0 100% 100%"
- />
- <image texture="session/icons/bkg/command_inner.dds"
- size="0 0 100% 100%"
- />
- <image texture="session/icons/sheets/garrison.dds"
- cell_size="64 64"
- size="0 0 100% 100%"
- />
- </sprite>
- <sprite name="snIconSheetGarrisonButtonOver">
- <image texture="session/icons/bkg/command_outer.dds"
- size="0 0 100% 100%"
- />
- <image
- texture="session/icons/bkg/command_inner.dds"
- size="0 0 100% 100%"
- >
- <effect add_color="42 42 42 0"/>
- </image>
- <image texture="session/icons/sheets/garrison.dds"
- cell_size="64 64"
- size="0 0 100% 100%"
- />
- </sprite>
- <sprite name="snIconSheetGarrisonButtonDisabled">
- <image texture="session/icons/bkg/command_outer.dds"
- size="0 0 100% 100%"
- />
- <image texture="session/icons/bkg/command_inner.dds"
- size="0 0 100% 100%"
- />
- <image texture="session/icons/sheets/garrison.dds"
- cell_size="64 64"
- size="0 0 100% 100%"
- />
- </sprite>
-
- <!--
- ==========================================
- SESSION GUI - ICON SHEETS - GATHER
- ==========================================
- -->
-
- <sprite name="snIconSheetGather">
- <image texture="session/icons/sheets/gather.dds"
- cell_size="64 64"
- size="0 0 100% 100%"
- />
- </sprite>
- <sprite name="snIconSheetGatherOver">
- <effect add_color="42 42 42 0"/>
- <image texture="session/icons/sheets/gather.dds"
- cell_size="64 64"
- size="0 0 100% 100%"
- />
- </sprite>
- <sprite name="snIconSheetGatherDisabled">
- <effect grayscale=""/>
- <image texture="session/icons/sheets/gather.dds"
- cell_size="64 64"
- size="0 0 100% 100%"
- />
- </sprite>
-
- <sprite name="snIconSheetGatherButton">
- <image texture="session/icons/bkg/command_outer.dds"
- size="0 0 100% 100%"
- />
- <image
- texture="session/icons/bkg/command_inner.dds"
- size="0 0 100% 100%"
- />
- <image texture="session/icons/sheets/gather.dds"
- cell_size="64 64"
- size="0 0 100% 100%"
- />
- </sprite>
- <sprite name="snIconSheetGatherButtonOver">
- <image texture="session/icons/bkg/command_outer.dds"
- size="0 0 100% 100%"
- />
- <image
- texture="session/icons/bkg/command_inner.dds"
- size="0 0 100% 100%"
- >
- <effect add_color="42 42 42 0"/>
- </image>
- <image texture="session/icons/sheets/gather.dds"
- cell_size="64 64"
- size="0 0 100% 100%"
- />
- </sprite>
- <sprite name="snIconSheetGatherButtonDisabled">
- <effect grayscale=""/>
- <image texture="session/icons/bkg/command_outer.dds"
- size="0 0 100% 100%"
- />
- <image
- texture="session/icons/bkg/command_inner.dds"
- size="0 0 100% 100%"
- />
- <image texture="session/icons/sheets/gather.dds"
- cell_size="64 64"
- size="0 0 100% 100%"
- />
- </sprite>
-
<!--
==========================================
SESSION GUI - ICON SHEETS - MENU
@@ -788,76 +561,6 @@
/>
</sprite>
- <!--
- ==========================================
- SESSION GUI - ICON SHEETS - RANK
- ==========================================
- -->
-
- <sprite name="snIconSheetRank">
- <image texture="session/icons/sheets/rank.dds"
- cell_size="32 32"
- size="0 0 100% 100%"
- />
- </sprite>
- <sprite name="snIconSheetRankOver">
- <effect add_color="42 42 42 0"/>
- <image texture="session/icons/sheets/rank.dds"
- cell_size="64 64"
- size="0 0 100% 100%"
- />
- </sprite>
- <sprite name="snIconSheetRankDisabled">
- <effect grayscale=""/>
- <image texture="session/icons/sheets/rank.dds"
- cell_size="32 32"
- size="0 0 100% 100%"
- />
- </sprite>
-
- <sprite name="snIconSheetRankButton">
- <image texture="session/icons/bkg/command_outer.dds"
- size="0 0 100% 100%"
- />
- <image
- texture="session/icons/bkg/command_inner.dds"
- size="0 0 100% 100%"
- />
- <image texture="session/icons/sheets/rank.dds"
- cell_size="32 32"
- size="0 0 100% 100%"
- />
- </sprite>
- <sprite name="snIconSheetRankButtonOver">
- <image texture="session/icons/bkg/command_outer.dds"
- size="0 0 100% 100%"
- />
- <image
- texture="session/icons/bkg/command_inner.dds"
- size="0 0 100% 100%"
- >
- <effect add_color="42 42 42 0"/>
- </image>
- <image texture="session/icons/sheets/rank.dds"
- cell_size="64 64"
- size="0 0 100% 100%"
- />
- </sprite>
- <sprite name="snIconSheetRankButtonDisabled">
- <effect grayscale=""/>
- <image texture="session/icons/bkg/command_outer.dds"
- size="0 0 100% 100%"
- />
- <image
- texture="session/icons/bkg/command_inner.dds"
- size="0 0 100% 100%"
- />
- <image texture="session/icons/sheets/rank.dds"
- cell_size="32 32"
- size="0 0 100% 100%"
- />
- </sprite>
-
<!--
==========================================
SESSION GUI - ICON SHEETS - REPLAY
@@ -915,63 +618,6 @@
/>
</sprite>
- <!--
- ==========================================
- SESSION GUI - ICON SHEETS - RESOURCE
- ==========================================
- -->
-
- <sprite name="snIconSheetResource">
- <image texture="session/icons/sheets/resource.dds"
- cell_size="64 64"
- size="0 0 100% 100%"
- />
- </sprite>
- <sprite name="snIconSheetResourceOver">
- <effect add_color="42 42 42 0"/>
- <image texture="session/icons/sheets/resource.dds"
- cell_size="64 64"
- size="0 0 100% 100%"
- />
- </sprite>
- <sprite name="snIconSheetResourceDisabled">
- <effect grayscale=""/>
- <image texture="session/icons/sheets/resource.dds"
- cell_size="64 64"
- size="0 0 100% 100%"
- />
- </sprite>
-
- <sprite name="snIconSheetResourceButton">
- <image texture="session/icons/bkg/portrait.dds"
- size="0 0 100% 100%"
- />
- <image texture="session/icons/sheets/resource.dds"
- cell_size="64 64"
- size="0 0 100% 100%"
- />
- </sprite>
- <sprite name="snIconSheetResourceButtonOver">
- <effect add_color="42 42 42 0"/>
- <image texture="session/icons/bkg/portrait.dds"
- size="0 0 100% 100%"
- />
- <image texture="session/icons/sheets/resource.dds"
- cell_size="64 64"
- size="0 0 100% 100%"
- />
- </sprite>
- <sprite name="snIconSheetResourceButtonDisabled">
- <effect grayscale=""/>
- <image texture="session/icons/bkg/portrait.dds"
- size="0 0 100% 100%"
- />
- <image texture="session/icons/sheets/resource.dds"
- cell_size="64 64"
- size="0 0 100% 100%"
- />
- </sprite>
-
<!--
==========================================
SESSION GUI - ICON SHEETS - STATISTIC
Oops, something went wrong.

0 comments on commit e2909fb

Please sign in to comment.