8151 Commits

Author SHA1 Message Date
sanderd17 0a880413fe Fix the out-of-world error we saw in the team game yesterday
This was SVN commit r15145.
2014-05-11 09:36:12 +00:00
JoshuaJB d70abd548a Move yellow modern buttons to their own style to correct naming issues (eg. ModernButtonRed was yellow). New name is ModernButtonYellow. Also switched the default button color back to red due to complaints by team members on IRC.
This was SVN commit r15144.
2014-05-11 03:25:34 +00:00
Mythos_Ruler 056d740e7f Fixes #2542
This was SVN commit r15143.
2014-05-10 23:40:53 +00:00
mimo fb2cda5aba prevent weird behaviour when the ship in which we want to garrison is selected with the units to garrison
This was SVN commit r15142.
2014-05-10 22:21:24 +00:00
Mythos_Ruler b2ec4e0e2a Portrait for Roman bireme.
Modern button from red to yellow.

This was SVN commit r15141.
2014-05-10 21:33:46 +00:00
Mythos_Ruler f287a7da12 Elephants can transport aboard Medium and Heavy warships.
This was SVN commit r15140.
2014-05-10 16:15:26 +00:00
sanderd17 da8843127c Fix displaying wrong text when no tooltip was defined, as reported by Kanetaka. Also cleans up the code to make it shorter.
This was SVN commit r15139.
2014-05-10 13:37:38 +00:00
Mythos_Ruler e79ad6b30b Switch Military Colonies to use the mercenary camp actor.
Update a few tech names (shouldn't affect translations).

This was SVN commit r15137.
2014-05-09 00:18:23 +00:00
mimo a5708873db set the right civ for mace dock
This was SVN commit r15136.
2014-05-08 23:15:01 +00:00
sanderd17 2c1917176a Use untranslated playerState.civ, if the civName 'Gaia' happened to be translated, this resulted in an undefined texture, which was the case in Chinese, and reported by Gameboy.
This was SVN commit r15135.
2014-05-08 14:07:48 +00:00
sanderd17 955e6e788a Fix counting foundations as concuestCritical.
This was SVN commit r15133.
2014-05-08 11:27:09 +00:00
mimo 8e39a2297d fix delete selection broken (again) in bb65358dac. Code is changed to prevent this to happen again
This was SVN commit r15131.
2014-05-08 08:21:20 +00:00
scythetwirler a620cf8e17 Fixes an issue with unassigned players being functionally ready but not having the green marker
This was SVN commit r15130.
2014-05-08 04:47:57 +00:00
JoshuaJB bb65358dac After discussion with scythetwirler with input from Philip and Mythos, popup dialogs (like for delete, resign, and exit) should have no on the right as we want the user to click no in most of those cases. It's the 'recommended' action. In the case of save/cancel or continue/back, save and continue should always be on the right as that's the 'recommended' action. With some review, this placement seems consistant across operating systems.
This was SVN commit r15129.
2014-05-08 03:43:03 +00:00
sanderd17 cbeb40a14b Fix foundations changing entity limits. Fixes #2536
This was SVN commit r15123.
2014-05-07 08:24:31 +00:00
sanderd17 19ca1e3ebf Fix locale verification to also allow ICU locales without data, but still don't allow bogus locales. Patch by Yves. Fixes #2533.
This was SVN commit r15122.
2014-05-07 08:14:57 +00:00
mimo c5b184744c stop failed attack in aegis, see #2486
This was SVN commit r15121.
2014-05-07 07:03:21 +00:00
JoshuaJB 27382a7d78 Swap OK and Cancel positions on the AI config GUI page. (Also cleanup the XML a bit)
This was SVN commit r15120.
2014-05-06 19:02:34 +00:00
sanderd17 9fadc2709c Clean up the gate transformation tooltips as it caused problems for mods.
This was SVN commit r15119.
2014-05-06 18:52:05 +00:00
Mythos_Ruler 34a9b8c260 New song by Omri to the Celtic civs.
This was SVN commit r15118.
2014-05-06 12:28:25 +00:00
OmriLahav 93cfdce090 This was SVN commit r15116. 2014-05-06 08:19:45 +00:00
mimo f181a89c34 fixes wrong test
This was SVN commit r15115.
2014-05-05 19:22:54 +00:00
mimo 48bb533895 temporarily disable trader formation, see #2528
This was SVN commit r15111.
2014-05-04 21:38:31 +00:00
sanderd17 06685a3f9b Fix small issue
This was SVN commit r15110.
2014-05-04 20:22:31 +00:00
historic_bruno 44b40a85bb Fixes some broken actor references
This was SVN commit r15109.
2014-05-04 08:08:48 +00:00
historic_bruno ba5e6d9168 Removes duplicate FleeDistance property from template_unit_fauna_decorative (found by checkrefs.pl)
This was SVN commit r15108.
2014-05-04 05:52:51 +00:00
scythetwirler 9b136a45fc Fixes a couple dialog buttons
This was SVN commit r15106.
2014-05-04 02:44:14 +00:00
sanderd17 2eb2845c29 Extra check on the existance of a replacement, be more forgiving in the skirmish replacer.
This was SVN commit r15104.
2014-05-03 17:53:37 +00:00
sanderd17 dd13e01ac6 Extra check on existance of template, to be more forgiving if some template in the productionqueue doesn't exist.
This was SVN commit r15103.
2014-05-03 17:29:22 +00:00
Enrique e70eccf0ca Added Stan's contributor ptol_corral details in Lordgood's model
Added Stan's Cleopatra texture

This was SVN commit r15102.
2014-05-03 13:05:34 +00:00
sanderd17 575cdd7979 A spearman isn't ranged
This was SVN commit r15101.
2014-05-03 13:04:08 +00:00
sanderd17 b09925b27e switch the game setup confirmation buttons and move the welcome screen buttons
This was SVN commit r15100.
2014-05-03 09:21:05 +00:00
sanderd17 542bc1b273 Further fix switched buttons
This was SVN commit r15099.
2014-05-03 09:07:31 +00:00
Yves c1d5f6882c Also switch the button name to disable the correct one.
4e0a588456 only switched the label and the action.

This was SVN commit r15098.
2014-05-03 08:59:31 +00:00
sanderd17 12ec51783d Fix in-game manual display
This was SVN commit r15097.
2014-05-03 08:53:06 +00:00
sanderd17 4e0a588456 Switch more buttons, see 911be4e860
This was SVN commit r15096.
2014-05-03 08:45:19 +00:00
scythetwirler f066549523 Makes the other players default to unassigned instead of Default AI in a sandbox map.
This was SVN commit r15095.
2014-05-03 04:00:14 +00:00
Yves 122dae799b Don't allow returning an invalid locale from the advanced language menu.
This was SVN commit r15094.
2014-05-02 21:14:28 +00:00
sanderd17 99486ed7ab Add camera to the second player, somehow avoids strange errors.
This was SVN commit r15093.
2014-05-02 20:08:48 +00:00
mimo b8e9bae75e fixes Petra trying to keep going with a canceled attack
This was SVN commit r15092.
2014-05-02 11:03:24 +00:00
sanderd17 15f56cd984 Fix armour and attack display of heroes
This was SVN commit r15091.
2014-05-02 10:32:21 +00:00
sanderd17 ace3269768 Fix problem with sprintf errors being thrown when the AI places structures on the wrong places, make the code more uniform. Fixes #2485
This was SVN commit r15090.
2014-05-02 10:09:53 +00:00
sanderd17 a36a0bbd87 Improve my previous fix by throwing error objects instead of strings
This was SVN commit r15089.
2014-05-02 07:34:05 +00:00
sanderd17 aaf92409c9 Fix sprintf error reporting by printing the stack trace, and not trying to translate the calls
This was SVN commit r15088.
2014-05-02 07:27:44 +00:00
mimo 5658bb391b fix delete selection no more working after #15074
This was SVN commit r15087.
2014-05-01 21:06:43 +00:00
Yves 210374d86d Fixes Aegis not training additional units when no starting units are around.
Patch by Teiresias.

Fixes #2460

This was SVN commit r15086.
2014-05-01 13:13:38 +00:00
sanderd17 b9af0ac0e4 Enlarge various elements of the lobby login page to fit other languages.
This was SVN commit r15085.
2014-05-01 12:59:50 +00:00
sanderd17 a64456e6d8 Fix small space issue in the lobby (still some work to do there)
This was SVN commit r15084.
2014-05-01 11:38:53 +00:00
Gallaecio 47fc05d696 String freeze? Who said that?
Fix typo: avalible → available.

This was SVN commit r15082.
2014-05-01 01:22:59 +00:00
Gallaecio d51f2a0c35 Version bump and regeneration of translation templates accordingly.
This was SVN commit r15081.
2014-05-01 00:44:47 +00:00