Commit Graph

177 Commits

Author SHA1 Message Date
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
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
4e0a588456 Switch more buttons, see 911be4e860
This was SVN commit r15096.
2014-05-03 08:45:19 +00:00
62f5476dec Add support for adding translation context to XML elements. Patch by Gallaecio.
Add translation context to some lobby headers.

This was SVN commit r15078.
2014-04-30 22:33:08 +00:00
29cab5f5ed Also change reveal map to revealed map.
Fix typo in tutorial map. Remove message refering to finite fields.

This was SVN commit r15066.
2014-04-29 14:51:21 +00:00
b246017f9f Explore_d_ map.
This was SVN commit r15065.
2014-04-29 13:10:56 +00:00
75713cc101 Don't display 'UNR' in the gamesetup on unranked players. This makes unranked lobby playernames consistant with those of rankless players who join via IP.
This was SVN commit r15051.
2014-04-28 05:39:18 +00:00
a8b50a66da Fixes to the lobby internationalization by sanderd17 and me
All strings are now translated at the last point, right before they are
added to the GUI.
Some other fixes are included.

This was SVN commit r15046.
2014-04-27 20:24:48 +00:00
251372a062 Missing var statement.
This was SVN commit r15044.
2014-04-27 19:10:28 +00:00
cfb72e990b Make gamesetup chat formatting more similar to the lobby and note that all players must be ready before starting a multiplayer game.
This was SVN commit r15043.
2014-04-27 19:06:21 +00:00
8f53ddd6b9 Unifies some translatable strings on the gamesetup screen.
This was SVN commit r15042.
2014-04-27 19:03:15 +00:00
2f8487b84b Adds translation support for the "More options" window on the gamesetup screen.
This was SVN commit r15041.
2014-04-27 18:41:56 +00:00
a163ac1c11 Reverts a rogue copy-paste in the last commit.
This was SVN commit r15039.
2014-04-27 18:23:15 +00:00
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
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
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
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
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
aaf5ad1a63 Cosmetic cleanup - Delete full stop and make scrollbar a circle
This was SVN commit r15012.
2014-04-26 22:45:48 +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
d1d7afe46c Implements ready status into gamesetup. Fixes #2447.
This was SVN commit r15006.
2014-04-26 18:34:34 +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
0d33f6412d Fixes #2482
This was SVN commit r14974.
2014-04-23 08:22:55 +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
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
e1488fee56 Add an 'explore map' option to the game setup.
This was SVN commit r14931.
2014-04-14 19:52:49 +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
0e0cd65134 Some GUI alignment/sizing improvements.
This was SVN commit r14828.
2014-03-09 19:24:17 +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
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
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
baf6925b66 Tactical varfare.
This was SVN commit r14528.
2014-01-06 20:55:22 +00:00
4a11b30b39 Fixes assertion failure when clicking the settings button (aiconfig) on the match setup screen.
This problem happens because callback functions need to be passed to GUI
pages differently since 4b1297b328.

Refs #2241

This was SVN commit r14498.
2014-01-04 11:29:35 +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
ddee36e0a8 Hide map size for skirmish and scenarios. Refs #2301.
Also fix my previous commit because obviously I had committed the wrong
default value.

This was SVN commit r14448.
2013-12-30 15:59:00 +00:00
bf58f04511 add wonder victory condition. Refs #1649
This was SVN commit r14418.
2013-12-28 13:40:39 +00:00
ad0d81cb8a Various lobby changes and some optimizations in the lobby bot by scythetwirler.
This was SVN commit r14396.
2013-12-26 19:45:20 +00:00
3ab983f8a1 Some "varfare" again plus a call to initMusic because that will be needed for the Spidermonkey upgrade.
This was SVN commit r14188.
2013-11-15 18:35:19 +00:00
4406be3a69 Fix crash when trying to join the lobby again if the host disconnected in the game setup screen.
This was SVN commit r14137.
2013-11-10 22:42:48 +00:00
81cf02cc13 Fix building with --without-lobby. Fixes #2249.
This was SVN commit r14113.
2013-11-08 15:28:44 +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