Improve back to work behaviour (queues taken into account), fix #2206, patch from Itms

git-svn-id: http://svn.wildfiregames.com/public/ps/trunk@14063 3db68df2-c116-0410-a063-a993310a9797
CClientArea parsing test

git-svn-id: http://svn.wildfiregames.com/public/ps/trunk@14064 3db68df2-c116-0410-a063-a993310a9797
Caspian Sea skirmish map.

Clouds.



git-svn-id: http://svn.wildfiregames.com/public/ps/trunk@14065 3db68df2-c116-0410-a063-a993310a9797
Iberian walls for Caspian Sea skirmish map.

Rubble for these houses.

git-svn-id: http://svn.wildfiregames.com/public/ps/trunk@14066 3db68df2-c116-0410-a063-a993310a9797
Fix shader errors with OpenGL ES


git-svn-id: http://svn.wildfiregames.com/public/ps/trunk@14067 3db68df2-c116-0410-a063-a993310a9797
Update Android support


git-svn-id: http://svn.wildfiregames.com/public/ps/trunk@14068 3db68df2-c116-0410-a063-a993310a9797
Merge 'remotes/trunk'
Trader speed tech!

git-svn-id: http://svn.wildfiregames.com/public/ps/trunk@14069 3db68df2-c116-0410-a063-a993310a9797
Three new skirmish maps. 2 need Iberians walls though.

Deleted a couple of scenarios.

git-svn-id: http://svn.wildfiregames.com/public/ps/trunk@14070 3db68df2-c116-0410-a063-a993310a9797
Acropolis 7 scenario renamed to "Acropolis Night."

Cycladic Archipelago 06 and Deccan Plateau 01 scenarios deleted.

Gambia River skirmish map (still needs 2 out of 3 Iberian wall circuits).

git-svn-id: http://svn.wildfiregames.com/public/ps/trunk@14071 3db68df2-c116-0410-a063-a993310a9797
Standardized animations for cavalry swordsmen. Will do the same for cavalry spearmen. This is to help the player differentiate the unit types better.

git-svn-id: http://svn.wildfiregames.com/public/ps/trunk@14072 3db68df2-c116-0410-a063-a993310a9797
Fix VS2013 build errors, warnings

git-svn-id: http://svn.wildfiregames.com/public/ps/trunk@14073 3db68df2-c116-0410-a063-a993310a9797
Recursively count garrisoned units to avoid overcapacity

git-svn-id: http://svn.wildfiregames.com/public/ps/trunk@14074 3db68df2-c116-0410-a063-a993310a9797
small code style fix

git-svn-id: http://svn.wildfiregames.com/public/ps/trunk@14075 3db68df2-c116-0410-a063-a993310a9797
Normal and spec maps for a bunch of shields.

git-svn-id: http://svn.wildfiregames.com/public/ps/trunk@14076 3db68df2-c116-0410-a063-a993310a9797
More shield changes.

Tweaked number of 5-pop houses on Sicilia skirmish map.

New "Sahel" Skirmish map.

git-svn-id: http://svn.wildfiregames.com/public/ps/trunk@14077 3db68df2-c116-0410-a063-a993310a9797
Renamed a bunch of maps.

git-svn-id: http://svn.wildfiregames.com/public/ps/trunk@14078 3db68df2-c116-0410-a063-a993310a9797
rename technology modifier 'multiplier' to 'multiply' for consistency with auras, and it looks better next to the existing 'add'

git-svn-id: http://svn.wildfiregames.com/public/ps/trunk@14079 3db68df2-c116-0410-a063-a993310a9797
Standardized Cav Spearmen animations.

git-svn-id: http://svn.wildfiregames.com/public/ps/trunk@14080 3db68df2-c116-0410-a063-a993310a9797
Map preview for Zagros Mtns.

Changed preview for Greek acrpolis.

Fixed quote attribution. Thanks anfialro.

git-svn-id: http://svn.wildfiregames.com/public/ps/trunk@14081 3db68df2-c116-0410-a063-a993310a9797