Commit Graph

10152 Commits

Author SHA1 Message Date
ec1696ded3 Send a network message to update the GUI if another player pauses a multiplayer game. Patch by echotangoecho, fixes #1950.
Pause animations then and on disconnect.
Don't unpause unintentionally when closing a message box in
singleplayer.

This was SVN commit r18204.
2016-05-19 22:10:38 +00:00
856dc1c999 Network cleanup.
Send the "client has rejoined" message after the synchronization
finished instead of right after the loading screen.
Patch by echotangoecho, refs #1949, #1950.

This was SVN commit r18203.
2016-05-19 21:03:46 +00:00
1b3a12ea92 Also update this file following 1c5a7f6267.
This was SVN commit r18200.
2016-05-19 17:51:56 +00:00
09ceb841f3 Add some useful warnings on missing or abnormal template/technology data.
This was SVN commit r18199.
2016-05-19 15:12:28 +00:00
1c5a7f6267 Moved BUILDING_ANGlE from the maps to BUILDING_ORIENTATION in a random map lib. Made some arguments optional with the default set to that constant, renamed some arguments and moved "orientation" in placeCivDefaultEntities to kwargs. Removed unneeded comments. Fixes #3988
This was SVN commit r18198.
2016-05-19 14:48:21 +00:00
4921056b9e Revert de06dc76f7 as it's broken in several ways and revealed a simulation bug. Refs #3288.
This was SVN commit r18197.
2016-05-19 09:33:17 +00:00
b57a103e81 petra cleanup, mainly unneeded parentheses
This was SVN commit r18196.
2016-05-17 19:35:33 +00:00
329caed9dd petra: be more inclined to help an ally attacked by several enemies
This was SVN commit r18195.
2016-05-17 19:31:03 +00:00
de06dc76f7 Show researchable techs of all selected entities, not only the first one. Fixes #3288.
This was SVN commit r18194.
2016-05-17 19:05:18 +00:00
67cdbedb24 Fix an option comment.
This was SVN commit r18192.
2016-05-17 16:35:48 +00:00
b49414b03e Gamesetup cleanup.
Use JSdoc comments and use rgbToGuiColor as pointed out by sanderd17.

This was SVN commit r18191.
2016-05-17 16:05:36 +00:00
0501ff9f59 Fix Seleucus aura
This was SVN commit r18190.
2016-05-17 11:44:29 +00:00
23a43cb0f6 Allow more choices for the wonder timeout, refs #3234.
This was SVN commit r18189.
2016-05-16 18:32:24 +00:00
2de117618b Fix typo in 46ead523b8. Patch by fatherbushido, refs #3792.
This was SVN commit r18188.
2016-05-16 13:57:45 +00:00
c34998b85a Show the playerselection dropdown in front of the "Follow player" observer option in case they overlap.
This was SVN commit r18187.
2016-05-16 13:18:26 +00:00
0b6c7ca1b0 ai: remove some unneeded parentheses
This was SVN commit r18186.
2016-05-16 10:48:52 +00:00
7ddfc89c18 petra: fix buildLimit when it is 0, reported by fatherbushido
This was SVN commit r18185.
2016-05-16 10:23:35 +00:00
24b262e4d1 Remove the trigger keyword from these maps as they either use the Tutorial AI for scripting or use a script only to place entities on load, refs #3013.
This was SVN commit r18182.
2016-05-16 00:21:44 +00:00
9eccf5cd07 Use an actual playername instead of "You" in singleplayer, fixes #3979.
Differentiate between SP and MP name and allow editing it in the
settings.
Defaults to the OS username.
Makes sharing singleplayer replays more effective.
Also fixes a troublesome colorization of "You" in a translated sentence,
refs #3501.

This was SVN commit r18180.
2016-05-15 17:13:35 +00:00
6680fe82e2 Add maplist filter for maps that come with triggerscripts. Patch by fabio and Stan, refs #3013.
This was SVN commit r18179.
2016-05-15 04:19:45 +00:00
4944d9b83c GUI / messagebox cleanup.
Remove pointless "mode" argument from messageBox and add newlines to its
calls.
Remove unused variable codes, trailing whitespace and useless comments.
Remove redundant button init code by using a loop (forEach to avoid a
closure).
Inline many unneeded variables.
Add missing translate to gamesetup_mp.js.
Quote object keys and capitalize globals correctly.

This was SVN commit r18178.
2016-05-15 04:04:31 +00:00
b562db2f27 Update the loading screen tooltips following 60a2af2988.
This was SVN commit r18177.
2016-05-15 01:14:33 +00:00
f64f1c4ade Show a hint when failed to connect to a game stating that it is likely caused by the host not forwarding the UDP port. Patch by Stan, fixes #3570.
This was SVN commit r18176.
2016-05-15 00:37:58 +00:00
5a5f05f8d9 Remove gather penalty from some more units (the penalty is added as tech). Units discovered by fatherbushido.
This was SVN commit r18175.
2016-05-14 20:17:04 +00:00
6dbdaf1160 fix 58e356babb
This was SVN commit r18174.
2016-05-14 18:25:35 +00:00
dd26d683c6 Summary screen cleanup.
Few simplifications, newlines for sprintf calls.

This was SVN commit r18173.
2016-05-14 13:10:50 +00:00
58e356babb allow trade with mirage markets, fixes #3894
This was SVN commit r18172.
2016-05-14 12:27:48 +00:00
866d04a22b Fix typo.
This was SVN commit r18171.
2016-05-14 12:15:41 +00:00
ac525fcd2a some cleanup in petra
This was SVN commit r18170.
2016-05-14 12:14:12 +00:00
f5cfda84b8 Gamesetup cleanup. Patch by Imarok, fixes #3980.
Rename GUI objects to numPlayers, mapFilter and mapType for consistency.
Thus use loops to remove code duplication for hiding controls.

This was SVN commit r18169.
2016-05-14 12:07:41 +00:00
721c47a9e8 remove the hardcoded gain in petra, fixes #3943, patch by LittleDev
This was SVN commit r18168.
2016-05-14 12:04:44 +00:00
0b8845eb4f fix 7f300bbf3d
This was SVN commit r18167.
2016-05-13 20:14:02 +00:00
7f300bbf3d Fix issue with elite units not being able to gather anything
This was SVN commit r18165.
2016-05-12 19:04:24 +00:00
148f485172 remove some unused var
This was SVN commit r18164.
2016-05-12 17:42:27 +00:00
a4cb84c8e0 ai cleanup, mainly trailing spaces
This was SVN commit r18163.
2016-05-12 17:38:58 +00:00
7eea4bd81a GUI cleanup.
A commit against colored spaces.
Use helper function to shorten code while keeping the space apparent.
Inline username variable.
Rename playerIndex to playerID.

This was SVN commit r18162.
2016-05-12 16:08:26 +00:00
7c2ff117f3 Distinguish resign- and defeat-chatmessage. Patch by dpiquet, fixes #3501.
For consistency, also colorize the "You" part in the singleplayer
variants.

This was SVN commit r18161.
2016-05-12 14:02:05 +00:00
366085e037 Savegame cleanup.
Simplify the error message for savegames with different mods enabled.
Remove deprecated for-each with map and for-of.
Simplify code that used conditional operator by replacing it with
logical operators.
Add linebreaks.
Quote object keys.
Early return.
Prefix global with g_.
Remove unneeded sprintf in error messages.
Capitalize comments.

This was SVN commit r18160.
2016-05-12 12:14:22 +00:00
518ad5380d Replay menu cleanup
Add the version number to the incompatibility message.
Add missing translate for the comma-separation.

This was SVN commit r18159.
2016-05-12 11:48:08 +00:00
8b14bfe78b Balance garrisoned regeneration rate as proposed by mimo and scythetwirler.
Reduce rate in village phase from 10 to 5.
Increase town phase addition from 2 to 7 and city phase addition from
1.5 to 9.

This was SVN commit r18157.
2016-05-11 22:32:33 +00:00
b0000da90e Fix small issue discovered by fatherbushido
This was SVN commit r18156.
2016-05-11 09:35:52 +00:00
9414674cfc Train naked fanatics in town phase to promote rushing, completes b5bf0c7e86.
This was SVN commit r18155.
2016-05-11 00:42:56 +00:00
f5dccae966 Display the carried resources when selecting a group of units. Patch by Imarok, fixes #3113.
Shows the information for all selected units and for all units of a
given type.
Rename g_CostDisplayNames to g_CostDisplayIcons.

This was SVN commit r18154.
2016-05-11 00:07:38 +00:00
2b0fa71d23 Session cleanup.
Use colorizePlayernameByID instead of replica.

This was SVN commit r18152.
2016-05-10 03:14:51 +00:00
71c441b092 GUI cleanup.
Remove a wrong translation comment.
Nuke duplicate calls.

This was SVN commit r18151.
2016-05-10 02:35:12 +00:00
6ba0d86ab6 Seleucid market commit
This was SVN commit r18150.
2016-05-09 22:45:50 +00:00
7d4fb0d4d9 Limit population cost to at most 3, as suggested by scythetwirler.
This was SVN commit r18149.
2016-05-09 20:02:32 +00:00
18e9c4e558 Session cleanup.
Remove a pointless conditional operator (which had been introduced with
the other format-message functions that distinguish more strings).
Remove unneeded parenthesis and try once more to align this if-statement
properly.

This was SVN commit r18147.
2016-05-09 01:00:34 +00:00
cf7a71965b Removing function euclid_distance as duplication of getDistance. Fixes #3968
This was SVN commit r18142.
2016-05-08 15:15:43 +00:00
7471a0db63 Separate global heightmap manipulation functions to a library. Fixes #3764
This was SVN commit r18141.
2016-05-08 14:58:57 +00:00