Viriato.

git-svn-id: http://svn.wildfiregames.com/public/ps/trunk@14051 3db68df2-c116-0410-a063-a993310a9797
Typo: enemey → enemy.

git-svn-id: http://svn.wildfiregames.com/public/ps/trunk@14052 3db68df2-c116-0410-a063-a993310a9797
Fix typos in descriptions of random maps. Refs #2185.

git-svn-id: http://svn.wildfiregames.com/public/ps/trunk@14053 3db68df2-c116-0410-a063-a993310a9797
Fix typos in civilization files. Refs #2185.

git-svn-id: http://svn.wildfiregames.com/public/ps/trunk@14054 3db68df2-c116-0410-a063-a993310a9797
Fix typos in template files. Refs #2185.

git-svn-id: http://svn.wildfiregames.com/public/ps/trunk@14055 3db68df2-c116-0410-a063-a993310a9797
Merge 'remotes/trunk'
Fixed typos reported in Transifex by qwertz and Loki.

git-svn-id: http://svn.wildfiregames.com/public/ps/trunk@14056 3db68df2-c116-0410-a063-a993310a9797
Merge 'remotes/trunk'
Improve correctness of hotkeys at low framerates.

SDL queues up all the input events received in a frame. When the hotkey system saw a key up/down event, it immediately updated its HotkeyIsPressed state and then pushed a hotkey event onto the end of the queue.

If the initial queue was e.g. [key-down shift, key-press Z, key-up shift], the hotkey event triggered by Z would be processed after the key-up shift had updated the HotkeyIsPressed state, so the handler of the Z hotkey would not think the shift hotkey was pressed.

If the initial queue was e.g. [key-press Z, mouse-click], the hotkey triggered by Z would be processed after the mouse-click event, so it could apply to the wrong building selection.

Fix by pushing the hotkey events onto a special queue that gets processed before any subsequent SDL input events.

Also update the HotkeyIsPressed status when the HOTKEYDOWN/HOTKEYUP events are processed, not when they are generated, to guarantee they are consistent with the DOWN/UP events.

Fixes #1869.

git-svn-id: http://svn.wildfiregames.com/public/ps/trunk@14057 3db68df2-c116-0410-a063-a993310a9797
- Fix garisson and formation aura types
- Implement tech mods for UnitMotion speeds, Fixes #1958, based on patch by wraitii
- Implement athen_hero_themistocles ship speed aura as a test

git-svn-id: http://svn.wildfiregames.com/public/ps/trunk@14058 3db68df2-c116-0410-a063-a993310a9797
Fix launching skirmish maps without selecting a civ

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

Specific Name for Mauryan maiden guards (Visha Kanya).

Clarified the Iberian json a bit.

Some tooltip tweaking.

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

git-svn-id: http://svn.wildfiregames.com/public/ps/trunk@14061 3db68df2-c116-0410-a063-a993310a9797
Remove ResourceGatherer for animals

git-svn-id: http://svn.wildfiregames.com/public/ps/trunk@14062 3db68df2-c116-0410-a063-a993310a9797
Merge 'remotes/trunk'
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