Commit graph

10094 commits

Author SHA1 Message Date
elexis
9cc98aaf47 Take new observermode into account in some missing places, refs #3850, #3168.
This was SVN commit r18223.
2016-05-23 15:26:47 +00:00
sanderd17
33f6713f94 New attempt to get the aura translations included. See 1606d40f68
This was SVN commit r18221.
2016-05-23 10:40:26 +00:00
mimo
6171f66d06 AI: fix serialization of template changes, fixes #3993, refs #3858
This was SVN commit r18219.
2016-05-22 20:25:41 +00:00
sanderd17
a951762d6c Add support to the structure tree for units with technologies in their production queue. Patch by s0600204. Fixes #4001
This was SVN commit r18218.
2016-05-22 15:32:47 +00:00
mimo
9c9796d8ad Changes in AI: Decrease a bit the required number of champions in attacks because of the recent increase of their cost,
Make more use of corrals when no fields and Cleanups

This was SVN commit r18216.
2016-05-21 17:06:25 +00:00
mimo
682086b7fb do not let the captureStrength become infinite when capturing a damaged structure, fix #3973, patch by fatherbushido
This was SVN commit r18215.
2016-05-21 16:44:20 +00:00
elexis
4b5f8dfca6 Remove trailing whitespace and simplify some length checks. Refs #252.
This was SVN commit r18214.
2016-05-21 16:20:27 +00:00
sanderd17
a2bd82d171 Complete phase tooltips. Patch by fatherbushido. Fixes #3451
This was SVN commit r18213.
2016-05-21 11:18:06 +00:00
sanderd17
1606d40f68 I18n of auras. Based on patch by fatherbushido. Fixes #3982
This was SVN commit r18212.
2016-05-21 09:18:05 +00:00
FeXoR
ff342619c7 Fixes a bug in random map schwarzwald.js introduced in 7471a0db63 that prevented the starting positions to be flattened.
This was SVN commit r18211.
2016-05-20 20:36:10 +00:00
sanderd17
a84b923380 Fix timing of previous patch
This was SVN commit r18210.
2016-05-20 14:05:19 +00:00
sanderd17
804fd4be61 Update 'survival of the fittest' to work with capturing (include siege engines in the attacking units) + add some randomness to the waves + make the timing a bit more challenging
This was SVN commit r18209.
2016-05-20 14:02:47 +00:00
elexis
7cd43ba8cf Fix whitespace and remove duplicate comment, refs #1950.
This was SVN commit r18208.
2016-05-20 12:51:27 +00:00
sanderd17
9368ffe345 Fix tech modifications calculations so we don't bump into stupid mistakes again (f.e. multiplying two positive numbers is now guaranteed to stay positive). See 7f300bbf3d and 0b8845eb4f
This was SVN commit r18207.
2016-05-20 11:20:51 +00:00
elexis
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
elexis
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
elexis
1b3a12ea92 Also update this file following 1c5a7f6267.
This was SVN commit r18200.
2016-05-19 17:51:56 +00:00
sanderd17
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
FeXoR
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
elexis
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
mimo
b57a103e81 petra cleanup, mainly unneeded parentheses
This was SVN commit r18196.
2016-05-17 19:35:33 +00:00
mimo
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
elexis
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
elexis
67cdbedb24 Fix an option comment.
This was SVN commit r18192.
2016-05-17 16:35:48 +00:00
elexis
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
sanderd17
0501ff9f59 Fix Seleucus aura
This was SVN commit r18190.
2016-05-17 11:44:29 +00:00
elexis
23a43cb0f6 Allow more choices for the wonder timeout, refs #3234.
This was SVN commit r18189.
2016-05-16 18:32:24 +00:00
elexis
2de117618b Fix typo in 46ead523b8. Patch by fatherbushido, refs #3792.
This was SVN commit r18188.
2016-05-16 13:57:45 +00:00
elexis
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
mimo
0b6c7ca1b0 ai: remove some unneeded parentheses
This was SVN commit r18186.
2016-05-16 10:48:52 +00:00
mimo
7ddfc89c18 petra: fix buildLimit when it is 0, reported by fatherbushido
This was SVN commit r18185.
2016-05-16 10:23:35 +00:00
elexis
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
elexis
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
elexis
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
elexis
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
elexis
b562db2f27 Update the loading screen tooltips following 60a2af2988.
This was SVN commit r18177.
2016-05-15 01:14:33 +00:00
elexis
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
sanderd17
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
mimo
6dbdaf1160 fix 58e356babb
This was SVN commit r18174.
2016-05-14 18:25:35 +00:00
elexis
dd26d683c6 Summary screen cleanup.
Few simplifications, newlines for sprintf calls.

This was SVN commit r18173.
2016-05-14 13:10:50 +00:00
mimo
58e356babb allow trade with mirage markets, fixes #3894
This was SVN commit r18172.
2016-05-14 12:27:48 +00:00
elexis
866d04a22b Fix typo.
This was SVN commit r18171.
2016-05-14 12:15:41 +00:00
mimo
ac525fcd2a some cleanup in petra
This was SVN commit r18170.
2016-05-14 12:14:12 +00:00
elexis
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
mimo
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
mimo
0b8845eb4f fix 7f300bbf3d
This was SVN commit r18167.
2016-05-13 20:14:02 +00:00
sanderd17
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
mimo
148f485172 remove some unused var
This was SVN commit r18164.
2016-05-12 17:42:27 +00:00
mimo
a4cb84c8e0 ai cleanup, mainly trailing spaces
This was SVN commit r18163.
2016-05-12 17:38:58 +00:00
elexis
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