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#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
543ec3a8c7
Fix launching skirmish maps without selecting a civ
...
This was SVN commit r14059.
2013-10-30 17:01:11 +00:00
31e79e6709
Reorders the game setup drop list for maps.
...
This was SVN commit r14048.
2013-10-26 15:20:13 +00:00
7901ed51d4
Implements skirmish maps, based on patch by sanderd17, fixes #1198 . Skirmish maps are like scenarios, except the player can choose their civ during match setup. To create a skirmish map: place some skirmish entities for each player in Atlas (see templates/skirmish/* for examples), uncheck the player's civ in Atlas' player panel if desired, and save in the maps/skirmishes directory. The map will appear in match setup under the "Skirmish" match type.
...
Implements custom, VFS-based map load/save dialogs for Atlas (replaces
broken native file dialogs), fixes #631 , #889 .
Fixes map loading/saving to handle arbitrary subdirectories for better
organization.
Adds default settings to Atlas player panel, fixes #1872 . Each setting
now has a checkbox to choose whether it should be saved with the map
(avoids writing lots of useless default data for each map).
Adds map preview setting to Atlas, refs #1745 .
Cleans up and simplifies some duplicate code.
Fixes optional serialization performance test.
This was SVN commit r13938.
2013-10-04 02:29:16 +00:00
8cf5f61885
Avoids ugly layering of GUI pages when entering match setup
...
This was SVN commit r13922.
2013-09-30 20:51:19 +00:00
553875ea83
Allow the use of Enter in addition to the OK button in the Join Game dialog.
...
This was SVN commit r13867.
2013-09-17 00:30:11 +00:00
97912dd545
This was SVN commit r13864.
2013-09-16 16:56:26 +00:00
82fb0ce6be
Improve game setup GUI performance by switching from main menu instead of pushing the page on top of the stsck
...
This was SVN commit r13828.
2013-09-12 15:12:08 +00:00
e3b9f17c19
Removes useless "old maps" filter from match setup, refs #2071
...
This was SVN commit r13719.
2013-08-20 02:28:49 +00:00
86a8dd7e6f
Small cleanup.
...
This was SVN commit r13583.
2013-07-21 23:25:15 +00:00
de5d4491ab
var-fare
...
This was SVN commit r13404.
2013-05-12 22:28:02 +00:00
0686c6a553
Resetting 'default' maps.
...
This was SVN commit r13379.
2013-04-29 02:36:57 +00:00
16de5c75ac
Adds game speed option to match setup, adds in-game control for single player games, fixes #785 .
...
Refactors some GUI utility functions.
This was SVN commit r13340.
2013-04-03 23:24:22 +00:00
d709fe50ed
Clean-up of Aegis scripts. Most deprecated functions have been removed, some comments updated. Also makes resource maps 8-bit to save a little memory.
...
Fix the placement of the "civ info" button to avoid overlapping on
1024*768.
This was SVN commit r13298.
2013-03-16 09:59:43 +00:00
3958c03dbc
Changes default scenarios to Punjab 1
...
This was SVN commit r13294.
2013-03-15 23:06:16 +00:00
5af7544918
Bug fixes and small improvements to Aegis. Change the "C" button into a "Settings" button. Fix to -autostart-aidiff.
...
This was SVN commit r13289.
2013-03-15 12:35:16 +00:00
25293ce0cc
Many small bugfixes for AIs. Adds support for difficulty (and along with that, some behind-the-door architecture for a handicap system).
...
Adds -autostart-aidiff to set the difficulty from the command line from
testing.
This was SVN commit r13278.
2013-03-13 20:44:48 +00:00
26f616aba7
Save player name when hosting.
...
This was SVN commit r13115.
2013-01-24 20:12:12 +00:00
637fb6d258
Fixes a bug in player assignment and prevents starting games with no assigned human players, fixes #1054
...
This was SVN commit r13070.
2013-01-12 05:39:04 +00:00
50fcbc1fc5
Fixes some alignment issues in the match setup UI
...
This was SVN commit r13050.
2013-01-06 00:34:21 +00:00
276f0a41a0
New Year's clean-up.
...
Throw a warning if a invalid (not present) AI is specified in a map.
Replace the last occurences of jubot with qbot.
Exclude the common siege templates from the Units Demo map.
Fix an error with flying units.
Replace CFG_GET_SYS_VAL with CFG_GET_USER_VAL and rename it to
CFG_GET_VAL to reflect its behaviour better.
Fix linker error with clang 3.2. Refs 1588.
Remove some useless includes.
This was SVN commit r13031.
2013-01-01 18:33:53 +00:00
adc4012944
Save last multiplayer server. Based on patch by Aurium. Fixes #1778 .
...
Fix bug in ConfigDB: Creating a value could result in changing a value
in a different namespace.
This was SVN commit r13021.
2012-12-25 22:49:18 +00:00
9a2dfa3fc0
Read default multiplayer server name/IP address from config. Patch by Aurium. Refs #1778 .
...
This was SVN commit r13003.
2012-12-20 21:44:56 +00:00
53397d1b9d
Show hidden AIs when they are used by a map. Fixes #1748 .
...
This was SVN commit r12965.
2012-12-09 14:40:43 +00:00
a21e01150a
Basic diplomacy. Refs #7 .
...
This was SVN commit r12778.
2012-10-23 16:31:07 +00:00
9177683653
Match setup GUI revamp. Adds pop-cap and starting resource options. Refs #802
...
This was SVN commit r12756.
2012-10-15 15:19:24 +00:00
59f3f1830c
This was SVN commit r12713.
2012-09-27 06:23:53 +00:00
e464332c74
Fixing a bug in "random" map selection.
...
This was SVN commit r12704.
2012-09-24 11:13:37 +00:00
bdab01b381
Making the "random" option in the map selection dropdown orange. Refs #1668
...
This was SVN commit r12685.
2012-09-17 08:24:04 +00:00
91f3463bd3
Adding the "Random" option in map selection. Fixes #1668
...
This was SVN commit r12684.
2012-09-17 02:58:47 +00:00
4365cc639d
Default ai player names patch: Codes. Fixes #1582 .
...
This was SVN commit r12666.
2012-09-13 06:18:01 +00:00
323d7b207e
Completely hide deprecated AIs for now.
...
This was SVN commit r12633.
2012-09-04 17:41:46 +00:00
6adccf3660
Hide unusable AIs from the default match setup drop-down list.
...
This was SVN commit r12626.
2012-09-04 07:09:36 +00:00
25f7012f0c
Squished the match setup player display a bit, to better show longer names at low resolutions.
...
This was SVN commit r12625.
2012-09-04 07:01:11 +00:00
1a3a6a73ac
Made the "default" maps Acropolis 1 (first map alphabetically in the list).
...
This was SVN commit r12596.
2012-09-02 03:03:53 +00:00
bbed3ca69a
Made player slot reassignment in the game setup screen swap slot contents instead of leaving the old slot empty.
...
This was SVN commit r12457.
2012-08-17 21:22:07 +00:00
9dc838bed5
Add support for cropped images in the GUI code and update game setup to use cropped map previews. Refs #1343 .
...
This was SVN commit r12348.
2012-08-10 19:59:20 +00:00
f210008b07
Put a warning about the AI into the description of naval maps.
...
This was SVN commit r12326.
2012-08-08 23:10:21 +00:00
8fc1fd2478
Fixes default map names, closes #1578
...
This was SVN commit r12299.
2012-08-06 18:09:22 +00:00
202a02568b
Cheats ... fixes #1555 .
...
This was SVN commit r12284.
2012-08-05 14:01:05 +00:00
b186fc4e7e
A small tweak.
...
This was SVN commit r12137.
2012-07-17 03:55:00 +00:00
b444e3c435
Cleanup...
...
This was SVN commit r12129.
2012-07-16 05:52:43 +00:00
8c9ef1139a
This was SVN commit r12106.
2012-07-14 04:15:20 +00:00
1b7519be91
Fixing the random player selection
...
This was SVN commit r12104.
2012-07-14 03:10:35 +00:00
c908970c02
This was SVN commit r12101.
2012-07-13 04:37:04 +00:00
8cd2751131
This was SVN commit r12100.
2012-07-13 04:15:23 +00:00
1233323e79
A minor change.
...
This was SVN commit r12099.
2012-07-13 04:05:13 +00:00
d0a1a3bd50
Fixed a bug.
...
This was SVN commit r12098.
2012-07-13 03:41:07 +00:00
c63074cabb
New GUI changes.
...
This was SVN commit r12096.
2012-07-13 03:00:18 +00:00
8c848c2f45
Replaces info icon with higher quality version. Fixes #1469 .
...
Uses add_color effect, so it's easier to change the theme.
Fixes some inconsistent whitespace.
This was SVN commit r11930.
2012-06-02 00:09:57 +00:00
8d66340329
Really set Oasis 11 as the default multiplayer map.
...
This was SVN commit r11829.
2012-05-10 22:23:09 +00:00
b36b9da9a0
Single player default map now Punjab 3.
...
This was SVN commit r11817.
2012-05-10 17:05:19 +00:00
7d00b830aa
Changed default maps.
...
This was SVN commit r11815.
2012-05-10 05:04:10 +00:00
2fbca07f6d
Adds random civ option to game setup, based on patch by deebee. Fixes #1082 .
...
This was SVN commit r11778.
2012-05-06 23:20:57 +00:00
ae1d57a4c7
Made Oasis X the default map.
...
This was SVN commit r11312.
2012-03-10 20:13:25 +00:00
6d3b9c5cf0
This was SVN commit r10911.
2012-01-15 16:14:35 +00:00
ae2725bcc1
Default maps for alpha 8 release
...
This was SVN commit r10682.
2011-12-07 14:27:41 +00:00
