Commit Graph

533 Commits

Author SHA1 Message Date
15f56cd984 Fix armour and attack display of heroes
This was SVN commit r15091.
2014-05-02 10:32:21 +00:00
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
5658bb391b fix delete selection no more working after #15074
This was SVN commit r15087.
2014-05-01 21:06:43 +00:00
d51f2a0c35 Version bump and regeneration of translation templates accordingly.
This was SVN commit r15081.
2014-05-01 00:44:47 +00:00
911be4e860 The convention is confirm button on right, decline button on left (updates some in-game dialogs). Also enables GLSL.
This was SVN commit r15074.
2014-04-30 06:28:57 +00:00
e7b4c8b92a Make game automatically resume after closing the options menu. Refs #2507
This was SVN commit r15072.
2014-04-30 05:31:44 +00:00
a88f1222c0 Update AI descriptions, closes #2500. Also correct some capitalization and developer overlay transparency for #2507.
This was SVN commit r15071.
2014-04-30 05:04:12 +00:00
dfacf5358c New lobby connect/registration page. Not perfect but fixes most of the outstanding issues. Refs #2312
This was SVN commit r15069.
2014-04-30 00:46:57 +00:00
b8245da606 Improve disabled technology tooltip. Fixes #2497
This was SVN commit r15055.
2014-04-28 15:17:26 +00:00
60334f05c8 Fix error introduced in 95b0a8d9bf while fixing a warning
This was SVN commit r15034.
2014-04-27 15:56:10 +00:00
95b0a8d9bf Fixed warnings in ‘gui’ due to the new SpiderMonkey
Refs #2372

This was SVN commit r15030.
2014-04-27 13:51:43 +00:00
60e1ff59f5 Fix warning about msg.guid not being defined
This was SVN commit r15029.
2014-04-27 13:38:17 +00:00
d4109916a3 Moved the translation of AI messages to a later point
This avoids attempts to translate messages prefixed with keywords,
such as “/team Message prefixed with a keyword”, and translates them
only after the keyword has been removed. Some keywords may hide the
message, removing the need for a translation altogether.

This was SVN commit r15027.
2014-04-27 13:33:15 +00:00
0db4cc690e Check for hero attack before querying it. Fixes #2490
This was SVN commit r15020.
2014-04-27 08:03:15 +00:00
2ad7187f92 Move XMPP polling to the mainloop. Should reduce lobby disconnects. Fixes #2491
This was SVN commit r15018.
2014-04-27 05:37:34 +00:00
9a809c3131 Revert overlay resizing (forgot about translations) and minor fixes to my last changes.
This was SVN commit r15010.
2014-04-26 19:52:56 +00:00
abf12fb503 Enhance the main menu options page and use it to replace the in-game settings page..
This was SVN commit r15007.
2014-04-26 19:31:23 +00:00
4770e64449 Some i18n fixed on the JavaScript side
Do not try to translate empty strings in translateObjectKeys().
Do not try to translate empty formation tooltips.
Do not translate player names at a point where they are already
translated.

This was SVN commit r15005.
2014-04-26 18:27:53 +00:00
e92bf0c89d Show translated player name in chat messages
This should only affect player names that users do not define, such as
“Player 2”.
I’ve checked that:
• This change translate the name of the AI player in chat messages of
tutorial scenarios.
• If I name myself “Player 1” and host a multiplayer game, “Player 1” is
not translated.

This was SVN commit r14992.
2014-04-25 04:28:06 +00:00
7afe0afbca Internationalized the messages of the tutorial AI
This was SVN commit r14991.
2014-04-25 03:41:01 +00:00
abed1b1734 Made the developer overlay wide enough for the Long Strings locale
This was SVN commit r14990.
2014-04-25 03:11:22 +00:00
c1c10667df Improved the internationalization of the construction “Insufficient resources” message
This was SVN commit r14988.
2014-04-25 02:45:19 +00:00
0c88edc2f2 Internationalized rank names
In order to do so, I had to extend the XML message extractor to support
using XML tags as context.
This is because one of the ranks is “Advanced”, which is a pretty common
string.

This was SVN commit r14986.
2014-04-25 01:47:42 +00:00
73470a3610 Remove all references to serif fonts in the GUI files (see cde72788a2)
Rebuild the sans fonts to include the missing glyph character (fixes
#2483)
Update the pot files

This was SVN commit r14980.
2014-04-24 13:33:15 +00:00
bfa6bbd0e0 Internationalized the wall cost string
Also, added a check for the getCostComponentDisplayName() function, as I
once got an empty string, although I was not able to reproduce it.

This was SVN commit r14979.
2014-04-24 06:16:43 +00:00
1fa5f13133 Improved the internationalization of the Diplomacy dialog box
You can now translate resource names differently depending on whether
they are in the middle of a sentence or at the beginning.
The Close button in the Diplomacy dialog box is now internationalized.

This was SVN commit r14978.
2014-04-24 05:48:23 +00:00
9dd4e71f1d Internationalized some messages
• You can now translate “The production queue is full”.
• Internationalized the “Pause” and “Resume” buttons. Only the initial
label was internationalized, it would switch to English as soon as you
pause the game for the first time.
• Internationalized the “Screenshot written to” message in the engine.

This was SVN commit r14968.
2014-04-22 06:35:51 +00:00
e05c8263c5 Internationalization of the public mod (JavaScript and GUI XML side)
It includes a marvelous language selection menu developed by Yves.

It also includes the introduction of a sprintf implementation for
JavaScript, as well as
translation helper functions that use JavaScript-side translation
caching.

This patch includes code by Yves, sanderd17, leper and Gallaecio.

Ref #67

This was SVN commit r14954.
2014-04-20 20:51:48 +00:00
fe4f17fd73 Only send game report if ranking is enabled.
This was SVN commit r14936.
2014-04-16 14:00:09 +00:00
9e2d0b9506 Fix #2404. Rating auto-configure TODO (eg 2v2 games do not automatically show as being unrated). See #2276.
This was SVN commit r14934.
2014-04-16 06:03:49 +00:00
47a516df34 Fix some JS warnings. Refs #2372.
This was SVN commit r14933.
2014-04-15 01:12:48 +00:00
833c2bac7a save/restore camera position and orientation in saved games, fixes #2354
This was SVN commit r14905.
2014-04-06 16:27:57 +00:00
90b9926ca1 Fixes warning showing up with the new SpiderMonkey.
The changed return value isn't related but returning false makes more
sense there IMO.

Refs #2372

This was SVN commit r14863.
2014-03-22 23:31:40 +00:00
cde72788a2 * Add support for fallback fonts in the font builder.
* Replace DejaVu with Biolinium for the existign sans-styles.
* Add additional sans-styles using Biolinum.
* Update the GUI style definitions to use the sans-styles instead of
serif styles.
(Wait with updating custom defined fonts in strings, as it will cause a
mess with the internationalisation that's about to be included)
* Add fonts from the quite complete FreeFont family as fallback fonts.
* Render all glyphs supported by the different fonts to support as many
scripts as possible.
* Fixes #2457.
(Now hope I included all needed files)

This was SVN commit r14853.
2014-03-17 10:13:49 +00:00
883f307b40 Implement a basic observer mode. Any player which joins a multiplayer game but is not assigned a player slot automatically becomes an observer. Refs #69
This was SVN commit r14849.
2014-03-16 23:29:27 +00:00
8959e63a53 Add back unintentionally removed idle workers button tooltip.
This was SVN commit r14826.
2014-03-09 02:42:42 +00:00
fb65288463 Fix hover effect not regenerating after mousedown events, minor GUI code cleanup, and fix #2414
This was SVN commit r14819.
2014-03-07 22:43:57 +00:00
32cf46f01c Fix some 'undefined' problems reported by Lion.Kanzen + improve coding style.
This was SVN commit r14814.
2014-03-07 08:27:13 +00:00
8f30e722ab Some inconsequential style adjustments.
This was SVN commit r14809.
2014-03-06 02:24:06 +00:00
5582409973 Converts most parts of the game to use Pureon's new UI
This was SVN commit r14804.
2014-03-04 02:23:01 +00:00
a3e1c68b9a Fix #2373. Have player resign if not returning to a networked game. Also notify host of networked game that by leaving all other players will be disconnected. Based off patch by boeseRaupe
This was SVN commit r14772.
2014-02-21 20:02:23 +00:00
039b06e012 Enable selection of dogs when selecting idle warriors. Patch by tau. Fixes #2436
This was SVN commit r14760.
2014-02-17 21:40:47 +00:00
be881dc420 Reformat the database to accept the additional summary counters as well as adding a couple summary counters. Also deletes unnecessary welcome message and deletes whitespace. Refs #686.
This was SVN commit r14752.
2014-02-16 06:06:16 +00:00
d8152f1eda exchange if order otherwise we can't make a trade route with a damaged market
This was SVN commit r14744.
2014-02-09 18:42:06 +00:00
e4e32c8cd7 Fixes a typo from 1d3ac14d35.
This was SVN commit r14717.
2014-02-01 03:55:24 +00:00
60619dbf3f Add technologies cheat. Fixes #2072. Patch by boeseRaupe
This was SVN commit r14712.
2014-01-31 15:30:16 +00:00
9fe465884d Implements resource trickle. Allows decimal player resources. Fixes #2413.
This was SVN commit r14710.
2014-01-31 12:01:49 +00:00
b9eea330d0 Strip some whitespace and fix a warning in session.js
This was SVN commit r14704.
2014-01-29 19:00:47 +00:00
1d3ac14d35 Better summary screen. Fixes #686. Patch by Bajter and Kabzerek
This was SVN commit r14703.
2014-01-29 18:30:56 +00:00
459f13e72b Clean up the colorfade code. Patch by boeseRaupe, fixes #2395
This was SVN commit r14702.
2014-01-29 14:49:36 +00:00
8953179e1a allow the possibility to define route with waypoints when doing trade, fixes #1207, #1821 and #1822
This was SVN commit r14697.
2014-01-28 18:56:39 +00:00
5e70bd3628 Fix and cleanup my recent changes.
This was SVN commit r14686.
2014-01-26 19:01:21 +00:00
3e1fc74add improve alert tooltip, see #2353
This was SVN commit r14684.
2014-01-26 18:17:13 +00:00
5d4f509810 Update existing minimap idle button, add minimap idle button highlight and disabled, and some style fixes in session.xml. Refs #823 and refs #2357
This was SVN commit r14658.
2014-01-24 18:40:01 +00:00
8845910f9c Of course the time I don't test before committing is the time I make a syntax error. I think the RNG hates me.
This was SVN commit r14619.
2014-01-19 02:57:40 +00:00
7a520adbf3 Improve the wording of attack tooltips.
This was SVN commit r14618.
2014-01-19 02:01:21 +00:00
c4643d925d Fix two bugs in attack tooltips. Add an extra Math.round to ensure we don't get huge decimals, and use a building's default arrow count as a minimum in rate calculation.
This was SVN commit r14610.
2014-01-18 19:20:17 +00:00
ea526eedd1 Adjust the attack tooltips. Make the formatting for attack rate more consistent and use meters instead of tiles for range.
This was SVN commit r14609.
2014-01-18 18:59:51 +00:00
1040cf2034 Add back a new minimap overlay, re-add and implement the original idle button, little whitespace cleanup, and delete some old unused ui images.
This was SVN commit r14599.
2014-01-18 02:38:07 +00:00
786afd9fcc Implement the number of gaia gatherers (it probably won't happen but it's safer that way).
Change UnitAI to call "leave" handlers on a conversion, like on a
destruction, so a unit will safely go to idle state on
resignation/conversions. Might fix some very weird bugs that probably
haven't been reported yet.
Reported by AlThePhoenix.
Fixes #2383.

This was SVN commit r14585.
2014-01-15 00:04:25 +00:00
0f56dceef2 Give the minimap 20px more on eack side and remove the ugly overlay. Also cleanup some nearby code.
This was SVN commit r14580.
2014-01-14 03:25:12 +00:00
0521d936a1 reduce a GuiInterface call for displaying formation tooltip
This was SVN commit r14577.
2014-01-12 18:39:47 +00:00
4ef80d26aa Proper fix for the gatherer count. Fix an AI bug. Thanks to Gameboy and Gildas for reporting.
This was SVN commit r14571.
2014-01-11 18:14:13 +00:00
eee6ed65dc still another fix to the gatherer count
This was SVN commit r14567.
2014-01-10 22:50:13 +00:00
df9fb05689 Fix the gatherer count per player further and some style niceness.
This was SVN commit r14565.
2014-01-10 20:27:34 +00:00
87250a79c9 delete groups with a right click. Fixes #2341. Patch by boeseRaupe
This was SVN commit r14558.
2014-01-10 16:51:13 +00:00
3d23f81696 Show the number of attacks per second to show users some attack speed, without showing the actual timers, or calcualtion of the number of arrows. Fixes #2352
This was SVN commit r14555.
2014-01-10 09:17:40 +00:00
bec7cfd520 Another attempt to fix the lobby disconnects.
This was SVN commit r14541.
2014-01-08 04:22:34 +00:00
b1e0f1b62a Clean up the mess of different ways to note the formations (capitalised, with spaces, with underscores, concatenated ...) by always referring to the template name.
This was SVN commit r14534.
2014-01-07 13:33:08 +00:00
8226d75715 Make PickEntitiesAtPoint faster yielding 1-3% overall performance improvement. Fixes #2358. Also removes some trailing whitespace.
This was SVN commit r14532.
2014-01-07 04:05:10 +00:00
8cc1ddf6de Small code style fix
This was SVN commit r14527.
2014-01-06 20:13:55 +00:00
3406f2f3e8 Fix code style of files committed too soon in f19a8d6b41
Adds blinking overlay to ther hero icon when he's attacked
Adds a health bar to the hero icon
Fixes #1902
Patch by boeseRaupe

This was SVN commit r14525.
2014-01-06 13:48:17 +00:00
f19a8d6b41 Take the box formation out of the special case formations
This was SVN commit r14524.
2014-01-06 13:32:48 +00:00
3d5f661447 Fixes assertion failure when opening the ingame manual.
This problem happens because callback functions need to be passed to GUI
pages differently since 4b1297b328.

Refs #2241

This was SVN commit r14499.
2014-01-04 11:48:28 +00:00
4b1297b328 Removes g_ScriptingHost and implements global to compartment 1 to 1 relation.
Each GUI Page gets its own compartment and all ScriptInterfaces in the
same thread should now use the same JS Runtime.
This is required for the SpiderMonkey upgrade.
Check the ticket for details.

Closes #2241
Refs #1886
Refs #1966

This was SVN commit r14496.
2014-01-04 10:14:53 +00:00
9a41c588fe prevent traders to cycle between two adjacent markets
This was SVN commit r14490.
2014-01-03 14:03:12 +00:00
e73738d794 Do not pause multiplayer games if one player opens a dialog. Patch by boeseRaupe. Fixes #2275.
This was SVN commit r14481.
2014-01-02 16:30:24 +00:00
dd86995f77 Fix some newlines.
This was SVN commit r14480.
2014-01-02 16:22:03 +00:00
d7f18c10de Add visual indicator when unsetting rally-points, closes #2117
This was SVN commit r14462.
2013-12-31 13:21:06 +00:00
cd125a94e2 fix tests + code style cleanup
This was SVN commit r14426.
2013-12-29 10:01:39 +00:00
bf58f04511 add wonder victory condition. Refs #1649
This was SVN commit r14418.
2013-12-28 13:40:39 +00:00
749c4d5270 change the way to manage trade, closes #2311
This was SVN commit r14417.
2013-12-28 10:44:59 +00:00
659736301a define the limit changing elements together with the limits, so they can be queried by the GUI and the AI. Fixes #2187
This was SVN commit r14408.
2013-12-27 10:58:48 +00:00
41b3dfc89c Implement town bell
* the icons are temporary, and can be replaced later
* The sounds are created by LAVS, but may also need some polishing, so
the current ones are placeholders too
* The patch code is created by Itms
fixes #2154

This was SVN commit r14392.
2013-12-26 10:43:51 +00:00
fd47e6caee Name.
This was SVN commit r14341.
2013-12-13 13:30:59 +00:00
e173493621 separate gui entityState in two parts to improve gui timing, adresses #2179
This was SVN commit r14306.
2013-12-08 10:02:19 +00:00
9678cf547a cache quantities depending only on the selection, adresses #2179
This was SVN commit r14296.
2013-12-05 18:50:29 +00:00
a96a333b47 Small cleanup.
This was SVN commit r14274.
2013-12-03 01:01:12 +00:00
e88d05e0e4 allow units to guard/escort buildings or units, fixes #2034
This was SVN commit r14263.
2013-11-30 17:30:08 +00:00
351468dbe5 fix initialisation of developper overlay for saved games
This was SVN commit r14240.
2013-11-28 18:08:41 +00:00
09d5507ecb clean some useless code
This was SVN commit r14214.
2013-11-19 21:27:23 +00:00
2102648f7c Allows autogarrison of newly trained units, fixes #1044
This was SVN commit r14144.
2013-11-11 15:37:16 +00:00
81cf02cc13 Fix building with --without-lobby. Fixes #2249.
This was SVN commit r14113.
2013-11-08 15:28:44 +00:00
0f8d3e23db ;
This was SVN commit r14112.
2013-11-08 15:28:38 +00:00
da6abe630a Fix error message on starting game due to missing global variable.
This was SVN commit r14110.
2013-11-08 09:52:48 +00:00
bffe917914 Multiplayer lobby based on the XmPP protocol. Special thanks to Philip, alpha123, scythetwirler, and anyone else who has helped build, debug or test the lobby.
This was SVN commit r14098.
2013-11-07 20:07:24 +00:00
3743e58f9a allow enabling the game clock as a persistent setting
This was SVN commit r14092.
2013-11-07 18:06:52 +00:00
6fae05b5f6 fix
This was SVN commit r14083.
2013-11-03 17:41:59 +00:00
6dca6910c3 Recursively count garrisoned units to avoid overcapacity
This was SVN commit r14074.
2013-11-03 13:13:30 +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