Commit Graph

12280 Commits

Author SHA1 Message Date
37f5aa5351 Standardized animations for cavalry swordsmen. Will do the same for cavalry spearmen. This is to help the player differentiate the unit types better.
This was SVN commit r14072.
2013-11-03 10:31:57 +00:00
768c821f13 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).

This was SVN commit r14071.
2013-11-03 10:14:43 +00:00
096fc43f9e Three new skirmish maps. 2 need Iberians walls though.
Deleted a couple of scenarios.

This was SVN commit r14070.
2013-11-03 09:51:16 +00:00
f4bd08427c Trader speed tech!
This was SVN commit r14069.
2013-11-03 05:40:43 +00:00
29e4b1a17c Update Android support
This was SVN commit r14068.
2013-11-02 23:05:38 +00:00
8aa6485d78 Fix shader errors with OpenGL ES
This was SVN commit r14067.
2013-11-02 22:58:38 +00:00
ba5b572ccc Iberian walls for Caspian Sea skirmish map.
Rubble for these houses.

This was SVN commit r14066.
2013-11-02 16:54:15 +00:00
c1c45bd7c8 Caspian Sea skirmish map.
Clouds.

This was SVN commit r14065.
2013-11-02 15:28:33 +00:00
1fa2fc9739 CClientArea parsing test
This was SVN commit r14064.
2013-11-02 14:39:08 +00:00
ce7c97b79f Improve back to work behaviour (queues taken into account), fix #2206, patch from Itms
This was SVN commit r14063.
2013-11-01 22:00:06 +00:00
358e8f5992 Remove ResourceGatherer for animals
This was SVN commit r14062.
2013-10-31 19:37:42 +00:00
552a4527ca Iberian walls for Deccan Plateau skirmish map.
Specific Name for Mauryan maiden guards (Visha Kanya).

Clarified the Iberian json a bit.

Some tooltip tweaking.

This was SVN commit r14060.
2013-10-31 17:21:10 +00:00
543ec3a8c7 Fix launching skirmish maps without selecting a civ
This was SVN commit r14059.
2013-10-30 17:01:11 +00:00
60fb5ed1c3 - 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

This was SVN commit r14058.
2013-10-30 16:12:53 +00:00
2d1be3d47e 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.

This was SVN commit r14057.
2013-10-30 01:38:32 +00:00
11c7c44a0b Fixed typos reported in Transifex by qwertz and Loki.
This was SVN commit r14056.
2013-10-29 23:22:09 +00:00
b67c411b33 Fix typos in template files. Refs #2185.
This was SVN commit r14055.
2013-10-28 20:26:35 +00:00
15f09f7005 Fix typos in civilization files. Refs #2185.
This was SVN commit r14054.
2013-10-28 20:21:27 +00:00
538c250d67 Fix typos in descriptions of random maps. Refs #2185.
This was SVN commit r14053.
2013-10-28 20:19:09 +00:00
dd7445262c Typo: enemey → enemy.
This was SVN commit r14052.
2013-10-28 20:01:51 +00:00
fcde137b30 Viriato.
This was SVN commit r14051.
2013-10-28 14:35:25 +00:00
e2f475b86a Make the *nix ARM support a little sturdier, Fixes #2121
This was SVN commit r14050.
2013-10-27 21:06:15 +00:00
3173722099 Copy this.entites in GarrisonHolder before passing and modifying it. Patch by mimo. Fixes #2238.
This was SVN commit r14049.
2013-10-27 16:37:51 +00:00
31e79e6709 Reorders the game setup drop list for maps.
This was SVN commit r14048.
2013-10-26 15:20:13 +00:00
30af350e31 New Neareastern Badlands skirmish map and it's awesome with Whizbang Graphics (WBG) enabled.
Tweaked some stuff on a few maps.

Fixed Iberian Walls for Nile River skirmish.

Changed names for Ptolemaic warships.

A couple of technology portraits for Advanced and Elite upgrades (these
techs are not implemented, but planned).

This was SVN commit r14047.
2013-10-26 15:10:15 +00:00
OmriLahav
597da2ff9d Alpha 14 remake
This was SVN commit r14045.
2013-10-26 11:10:21 +00:00
a45b074b07 Renamed the Arabian Oasis maps to Libyan Oasis, because the Egyptian eye candy assets insinuate the Libyan Desert instead of the Arabian Desert.
Changed Nile River maps to "naval" maps because the AI gets stuck trying
to cross the river.

Renamed the "ptol" statue ruins to "egyptian" statue ruins. Makes them
more generically "Egyptian".

Ensured siege engines can only be built in City Phase.

This was SVN commit r14044.
2013-10-26 10:31:52 +00:00
64dc783a18 Simplified the Spartan population penalty.
Changed costs on a few units.

New tooltips and hero auras for Carthaginian heroes Hannibal, Hamilcar,
and Maharbal. (see: wiki civ profile)

Fixed specificname for some Carthaginian units.

Added a field entity for "skirmish" maps.

This was SVN commit r14043.
2013-10-26 09:40:21 +00:00
fe6d508a82 Punjab skirmish map.
Some map tweaks.

This was SVN commit r14042.
2013-10-26 03:07:03 +00:00
1ee4c52779 All 4 players on Nile River skirmish map now have Iberian walls.
This was SVN commit r14041.
2013-10-25 09:00:46 +00:00
10ddc2aed6 Fixed starting unit for Ptolemies.
Nile River skirmish map (still needs Iberian walls for 2 of the
players).

New map preview for Arabian Oasis.

Moved Civic Center back to Town Phase, but made it take twice as long to
build.

Fixed elephant template.

Fixed up Persian Highlands skirmish map based on some notes from
Alpha123.

This was SVN commit r14040.
2013-10-25 08:02:55 +00:00
OmriLahav
14166af0ac This was SVN commit r14038. 2013-10-24 09:46:26 +00:00
4e86b00a05 Remove inconsistencies in the manual. Refs #2185.
Fix player name.
Make log messages when saving games use quotes around paths.

This was SVN commit r14037.
2013-10-23 22:18:40 +00:00
20ed5b118c Unify script conversions and remove JSInterface_Vector3D.
Because it was historically grown, we have some duplicated code for
converting script types to native types.
This patch removes the file JSConversions.cpp and moves some code to
ScriptConversions.cpp.
The places using JSConversions.cpp are changed to use the
ScriptInterface's conversion functions in ScriptConversions.cpp.
I also removed JSInterface_Vector3D because it had additional
requirements to the conversion code that no other code has and because
it's currently not used. I think it doesn't make sense to maintain code
just because it could possibly be used again later.

Closes #2213
Refs #1886

This was SVN commit r14036.
2013-10-20 17:13:53 +00:00
a4cd90ddfc Avoid non-ASCII characters in source code, since tools don't decode them consistently.
Fixes #2198.

This was SVN commit r14035.
2013-10-20 09:27:44 +00:00
d6f6d2b145 Remove useless error messages.
This was SVN commit r14034.
2013-10-20 01:47:16 +00:00
2117f77812 Fixed some resource placement.
This was SVN commit r14033.
2013-10-20 01:18:59 +00:00
50a2bddf77 Fixed some goats.
This was SVN commit r14032.
2013-10-20 01:10:02 +00:00
34d927f25c These two skirmish maps are now complete with walls for Iberians.
This was SVN commit r14031.
2013-10-19 23:52:28 +00:00
15f565f316 Corinthian Isthmus and Persian Highlands skirmish maps (wip).
This was SVN commit r14030.
2013-10-19 20:54:41 +00:00
742c489353 Fix typos, remove BOMs and add newlines before EOF. Refs #2185. Patch by Gallaecio.
This was SVN commit r14029.
2013-10-19 20:13:48 +00:00
71a41ba401 Line endings. Refs #2185.
This was SVN commit r14028.
2013-10-19 20:07:20 +00:00
45d4e92782 Fixed building requirements for Town Phase.
Changed Brit Wonder to the new Stonehenge model. :)

Trying out some new hunting changes from sanderd. Might just be
temporary. Refs #2092

This was SVN commit r14027.
2013-10-19 18:20:25 +00:00
b9892bc73a Remove ScriptableObject/CJSObject
Since all remaining uses of ScriptableObject/CJSObject have been
removed, the related files can now also be removed.
Closes #2212
Refs #2126
Refs #2137
Refs #1886

This was SVN commit r14026.
2013-10-19 10:14:08 +00:00
024dd82209 Fix non-PCH build
This was SVN commit r14024.
2013-10-19 01:11:20 +00:00
ac335f37c8 Fix some Clang warnings about unused private members
This was SVN commit r14023.
2013-10-19 00:53:58 +00:00
c0b628bcac Fix some typos. Patches by Swyter (Spanish translator). Fixes #2210, #2211.
This was SVN commit r14022.
2013-10-18 20:33:08 +00:00
701508922f Use CStrIntern for font names to reduce lookup cost
This was SVN commit r14020.
2013-10-18 16:15:42 +00:00
91169c82c7 Optimise rendering of scrollable text boxes by clipping
Add optional clipping rectangle to CTextRenderer. Strings that are
printed
outside the vertical extent of the clipping rectangle will be
immediately
skipped. This greatly reduces the cost of large scrollable text boxes.

This was SVN commit r14019.
2013-10-18 16:05:02 +00:00
751558d894 Optimise text rendering by batching
When CTextRenderer is given multiple strings with no differences other
than position, render them in a single glDrawElements call to reduce
driver overhead.

Also avoid some unnecessary copies of std::wstrings.

This helps performance a bit with large GUI text boxes.

This was SVN commit r14018.
2013-10-18 16:02:48 +00:00