removed improper comparison warning

git-svn-id: http://svn.wildfiregames.com/public/ps/trunk@12899 3db68df2-c116-0410-a063-a993310a9797
Icons for siege packing/unpacking/cancelling

git-svn-id: http://svn.wildfiregames.com/public/ps/trunk@12900 3db68df2-c116-0410-a063-a993310a9797
Added mauryan scout tower with ao

git-svn-id: http://svn.wildfiregames.com/public/ps/trunk@12901 3db68df2-c116-0410-a063-a993310a9797
Attempted fix to prevent strange timer-related bug in Atlas (fails to start when opened from the game's main menu), refs #1729

git-svn-id: http://svn.wildfiregames.com/public/ps/trunk@12902 3db68df2-c116-0410-a063-a993310a9797
Sync with upstream. Refs #1518.

git-svn-id: http://svn.wildfiregames.com/public/ps/trunk@12903 3db68df2-c116-0410-a063-a993310a9797
Implements siege packing. Closes #1718.
Adds templates for packed and unpacked siege units - needs stat tweaking.

git-svn-id: http://svn.wildfiregames.com/public/ps/trunk@12904 3db68df2-c116-0410-a063-a993310a9797
Group civs in info screen by culture. Fixes #1734.

git-svn-id: http://svn.wildfiregames.com/public/ps/trunk@12905 3db68df2-c116-0410-a063-a993310a9797
fix: remove unnecessary failure check concerning window class atom. fixes #1729

git-svn-id: http://svn.wildfiregames.com/public/ps/trunk@12906 3db68df2-c116-0410-a063-a993310a9797
merge with local codebase: fix PopulationCount

git-svn-id: http://svn.wildfiregames.com/public/ps/trunk@12907 3db68df2-c116-0410-a063-a993310a9797
Merge remote-tracking branch 'remotes/trunk'
fix synchronization of TimerState (refs #1729)

git-svn-id: http://svn.wildfiregames.com/public/ps/trunk@12908 3db68df2-c116-0410-a063-a993310a9797
Fixes compile error introduced in r12907


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

git-svn-id: http://svn.wildfiregames.com/public/ps/trunk@12910 3db68df2-c116-0410-a063-a993310a9797
Merge remote-tracking branch 'remotes/trunk'
Formation order queueing. Fixes #592, #593 and #1716.
Allow changing the formation, while under attack. Fixes #1624. Patch by Simikolon.

git-svn-id: http://svn.wildfiregames.com/public/ps/trunk@12911 3db68df2-c116-0410-a063-a993310a9797
Rome rock packed model fix

git-svn-id: http://svn.wildfiregames.com/public/ps/trunk@12912 3db68df2-c116-0410-a063-a993310a9797
Don't show slaughter attack in tooltips and hide the tutorial AI.  Patch from zoot.  Fixes #1732

git-svn-id: http://svn.wildfiregames.com/public/ps/trunk@12913 3db68df2-c116-0410-a063-a993310a9797
Add "score" tab in post-game summary.  Patch from EMontana.  FIxes #1721.

git-svn-id: http://svn.wildfiregames.com/public/ps/trunk@12914 3db68df2-c116-0410-a063-a993310a9797
Fix bug with gather-near-position.
Use the max range for attacking.

git-svn-id: http://svn.wildfiregames.com/public/ps/trunk@12915 3db68df2-c116-0410-a063-a993310a9797
Handle undefined team setting properly.

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