Commit Graph

1093 Commits

Author SHA1 Message Date
b8d3ef71f7 Fixes the updated dropdowns for multiplayer clients broken in 65f4c8b0e8
This was SVN commit r15038.
2014-04-27 18:18:05 +00:00
461a17c95d Reverted d91756b251 after breaking the fix for the lobby that sanders17 had implemented
This was SVN commit r15037.
2014-04-27 17:38:19 +00:00
65f4c8b0e8 Moves Select number of players to a more fitting and translation-friendly location. Also makes the map selection texts more translation-friendly in terms of space.
This was SVN commit r15036.
2014-04-27 17:24:37 +00:00
f9ccf05aa8 Change the style of dropdowns as per Mythos_Ruler. Also moves the rating list to the right side of the leaderboard (where it is on most rating lists).
This was SVN commit r15035.
2014-04-27 16:28:59 +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
63bcf2fef6 Don't display I'm ready in single player setup. Refs #2447.
This was SVN commit r15033.
2014-04-27 15:32:22 +00:00
ce0f439817 Adjusts the lobby gamelist and dropdowns to support more translations (space-wise).
This was SVN commit r15032.
2014-04-27 14:52:32 +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
d91756b251 Moved the translation of map data to the loadMap() function
This avoids the translation of strings that had been previously
translated later in the code.

This was SVN commit r15026.
2014-04-27 13:28:47 +00:00
813db55b08 Fixed the numbering in the terms of user of the lobby
Reported by ‘tema’ (Italian translator) at Transifex:
https://www.transifex.com/projects/p/0ad/translate/#it/public/24566468

This was SVN commit r15022.
2014-04-27 10:02:23 +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
81883806ec First version of the lobby Terms of Service and Terms of Use.
This was SVN commit r15019.
2014-04-27 05:59:48 +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
98905af6eb Added a context to some very generic strings and regenerated the public mod POT file
This was SVN commit r15015.
2014-04-27 00:23:19 +00:00
0d3c608b05 Increases title bar width for internationalization support and unsquishes map preview in the lobby
This was SVN commit r15014.
2014-04-27 00:07:27 +00:00
aaf5ad1a63 Cosmetic cleanup - Delete full stop and make scrollbar a circle
This was SVN commit r15012.
2014-04-26 22:45:48 +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
2ae1e16628 Fix translation of some game setup elements in multiplayer games
This was SVN commit r15009.
2014-04-26 19:52:16 +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
d1d7afe46c Implements ready status into gamesetup. Fixes #2447.
This was SVN commit r15006.
2014-04-26 18:34:34 +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
f5b0fc1076 Swap button placement on options page to be more consistant with other parts of the GUI.
This was SVN commit r15004.
2014-04-26 18:03:29 +00:00
3dd76c84bc Added a translation comment to the ‘Locale:’ string of the language menu
In order to do this, I added support for extracting the ‘comment’
attribute of translatable XML elements.

This was SVN commit r15000.
2014-04-26 12:51:12 +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
0d33f6412d Fixes #2482
This was SVN commit r14974.
2014-04-23 08:22:55 +00:00
311acea712 Fit UI for longer translations
This was SVN commit r14973.
2014-04-23 07:47:46 +00:00
3b571406f8 Enlarge tooltip size to fit all locales
This was SVN commit r14972.
2014-04-22 17:51:56 +00:00
21362de6ac Add workaround for testing long strings with the separate po. ICU wouldn't accept a non-existing language.
This was SVN commit r14969.
2014-04-22 11:38:15 +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
5a8bc1158a Add some more GUI graphics settings while fixing some persistence issues. Refs #2310
This was SVN commit r14967.
2014-04-22 05:09:31 +00:00
e82a9f1a4d Removed a line break to make more space for translations
This was SVN commit r14963.
2014-04-21 14:27:02 +00:00
5aab36670c Give some more space to the labels in the advanced localization menu.
This was SVN commit r14958.
2014-04-20 22:38:29 +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
52c0a9b908 Changes to English strings after reports in Transifex by translators
This was SVN commit r14950.
2014-04-20 19:00:37 +00:00
fe4f17fd73 Only send game report if ranking is enabled.
This was SVN commit r14936.
2014-04-16 14:00:09 +00:00
a9b34da617 Fix some merge conflicts 9e2d0b9506 missed.
This was SVN commit r14935.
2014-04-16 13:58:56 +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
e1488fee56 Add an 'explore map' option to the game setup.
This was SVN commit r14931.
2014-04-14 19:52:49 +00:00
1073382e3b Sorts the lobby player list, ignoring case
This was SVN commit r14927.
2014-04-13 18:29:32 +00:00
40e2a1e065 Fixes some javascript warnings in the lobby.
This was SVN commit r14923.
2014-04-13 01:48:24 +00:00
180aa5c60d Makes the moderator prefix visible in the chatbox.
This was SVN commit r14922.
2014-04-12 23:40:36 +00:00
08c1c8ed2d Minor tweaks to some particles.
Updated quinquereme tip image and text.

Minor updates to some maps.

Seleucids now use some Ptolemies ship actors temporarily.

This was SVN commit r14917.
2014-04-12 07:13:37 +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
5372b27142 Silences some warnings that show up on the gamesetup screen with the new SpiderMonkey without changing any behaviour.
Refs #2372

This was SVN commit r14862.
2014-03-22 13:54:10 +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
caeaf62723 Adjust widths in the lobby to make the map size dropdown fit.
This was SVN commit r14843.
2014-03-15 20:58:59 +00:00
0e0cd65134 Some GUI alignment/sizing improvements.
This was SVN commit r14828.
2014-03-09 19:24:17 +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
66942c74fa Be more forgiving for training spaces (which cause empty strings on splitting) and avoid using bigger fonts for non-capitalisable signs in headings
This was SVN commit r14815.
2014-03-07 11:11:45 +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
29f94a759c Fix an issue with lobby registration and a minor wording tweak.
This was SVN commit r14813.
2014-03-07 01:52:06 +00:00
abbd6efef1 Updates outdated/incorrect hotkeys.
This was SVN commit r14812.
2014-03-06 23:57:02 +00:00
8a98bca9b2 Fixes the last z order (hopefully) and a style inconsistency.
This was SVN commit r14811.
2014-03-06 22:45:13 +00:00
ec26f1de83 Reduces z order to fix ai dialog.
This was SVN commit r14810.
2014-03-06 22:34:15 +00:00
8f30e722ab Some inconsequential style adjustments.
This was SVN commit r14809.
2014-03-06 02:24:06 +00:00
ef76d24e66 Fixes z order and a capitalization error.
This was SVN commit r14808.
2014-03-06 02:00:12 +00:00
5f5cfb10ee Fixes a typo and makes naming of the fading consistent with other sprites.
This was SVN commit r14807.
2014-03-05 21:24:48 +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
1a2f889bb9 7cba43c9db changed the behaviour in case of undefined values which was not intended even if there's a warning now.
This should revert to correct behaviour for undefined values again (even
though this value should never be undefined).

Refs 2372

This was SVN commit r14803.
2014-03-03 23:01:49 +00:00
7cba43c9db Fixes warnings printed by the new SpiderMonkey.
Sets SelectableInGameSetup to true in all civ json files that didn't
have it set.
Having this value set to undefined (not set) was interpreted as true,
which is quite arbitrary.
With the new SpiderMonkey a warning will be printed if the value is
undefined.
This avoids ambiguity but makes the setting mandatory.

Refs #2372

This was SVN commit r14802.
2014-03-03 21:58:15 +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
0ea3b7b7dd Adds the moderator prefix to the playerlist in the lobby.
This was SVN commit r14767.
2014-02-20 23:26:36 +00:00
a725266337 Slightly better options menu.
This was SVN commit r14766.
2014-02-20 22:45:43 +00:00
2429f1e93c Displays ratings on the gamesetup page and formats ratings less than 1000 correctly.
This was SVN commit r14762.
2014-02-19 00:40:35 +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
f92a46330d Anti-disconnect addition to the gamesetup screen. Also fixes typo in the lobby bot README.
This was SVN commit r14753.
2014-02-16 06:22:16 +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
df1221e9f5 Correct inverted sprites on modern tickbox and add a default modern tooltip style.
This was SVN commit r14739.
2014-02-09 05:31:25 +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
ff4ed09b6f Backend for special formatting of moderaters in the lobby userlist.
This was SVN commit r14706.
2014-01-30 15:46:19 +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
5ec0dc8ae8 Fix a bug with one of the lobby settings I added to the options window.
This was SVN commit r14680.
2014-01-26 05:51:48 +00:00
39fef5c299 Add the ability to display chat messages when joining the lobby and quickly mostly update the options window to the new UI style.
This was SVN commit r14679.
2014-01-26 05:39:55 +00:00
a8fbe4eedc Centralizes centering rating into one function.
This was SVN commit r14678.
2014-01-26 05:27:00 +00:00
041c6ab1b3 More lobby cleanup.
This was SVN commit r14677.
2014-01-26 04:25:35 +00:00
0db9a18d39 Fix issue where lobby spam was being sent to external clients.
This was SVN commit r14672.
2014-01-25 21:58:22 +00:00
851c05a038 Cleanup and spam blocker redesign in lobby.js.
This was SVN commit r14671.
2014-01-25 20:51:01 +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
b46a6de335 Allow using the XMPP room subject to display lobby information to user, make the lobby GUI code more readable, and cleanup the modern styles.
This was SVN commit r14656.
2014-01-24 18:20:15 +00:00