ad7c53e65a
Adapt the template for corrals to the limitation in UnitAI.CanGarrison. Refs #3412 .
...
This was SVN commit r17648.
2016-01-13 23:33:08 +00:00
c33d1e3741
Remove commented out code and comments invalid since 9542ecdd7e.
...
This was SVN commit r17647.
2016-01-13 22:39:09 +00:00
aa7ef01105
rename reload to revert
...
This was SVN commit r17646.
2016-01-13 22:32:42 +00:00
5c61f68600
Rework the logics of options loading to allow more flexibility (i.e. adding a min or max value for number inputs)
...
Fix some problems when reloading saved options, refs #3511
Add the material quality option, refs #3737
Reload and Save buttons are only enabled when some options have changed.
This was SVN commit r17645.
2016-01-13 22:01:36 +00:00
cd22f9f722
Display all auras in the tooltips (even if there are some with an identical name). Patch by s0600204, fixes #3655 .
...
Add an aura tooltip to the construction panel.
Remove duplicate tooltip code for the training panel.
Eliminate for-each and use the aura ID in GetTemplateDataHelper, since
only that is a unique identifier.
Change the name from "Hero Aura" to "Garrisoned Capture Aura" for that
aura that every hero has.
This was SVN commit r17644.
2016-01-13 19:32:17 +00:00
c9a22ec7c3
Show the population bonus of buildings in the structure tree. Patch by s0600204, fixes #3738 .
...
Also fix a newline in the tooltip.
This was SVN commit r17643.
2016-01-13 18:44:30 +00:00
fb92761c92
Use explicit types instead of auto.
...
This was SVN commit r17642.
2016-01-13 00:42:55 +00:00
27fab6bf1e
Constify Spatial.h a bit.
...
While there don't check for null when delete-ing since that is a no-op,
use the proper type instead of auto, always swap when removing a single
element (instead of comparing .size() to 1), and clean up includes.
foobar
This was SVN commit r17641.
2016-01-13 00:20:22 +00:00
e6a8cd8c5e
Do not redeclare a variable.
...
This was SVN commit r17640.
2016-01-12 20:04:33 +00:00
ee6a5fd915
Extend defensive-stance tooltip and add quotes to object keys.
...
This was SVN commit r17639.
2016-01-12 18:32:30 +00:00
a02f797169
Add unit-stance tooltips. Patch by bb, fixes #3385 .
...
Reorder cases, correct indentation, remove unneeded variable and
sprintf.
This was SVN commit r17638.
2016-01-12 16:19:43 +00:00
4107c2abb9
Fix link to documentation.
...
This was SVN commit r17637.
2016-01-11 23:56:51 +00:00
83efc8363e
fix old typos in sound config
...
This was SVN commit r17636.
2016-01-11 22:39:03 +00:00
2ec4d87abf
Use .assign instead of operator=.
...
This was SVN commit r17634.
2016-01-11 20:57:03 +00:00
f4898c18d8
SpiderMonkey 38 removes the JS_LookupProperty{,ById} API. Refs #3708 .
...
Use JS_GetProperty{,ById} instead.
Ensure that we break if someone tries to serialize a getter by using
something similar to what we used pre 47a03c3397https://bugzilla.mozilla.org/show_bug.cgi?id=1094176
This was SVN commit r17633.
2016-01-11 20:03:33 +00:00
39eb7fb243
Fix JS_SetGCZeal call.
...
https://bugzilla.mozilla.org/show_bug.cgi?id=650978
https://bugzilla.mozilla.org/show_bug.cgi?id=742570
This was SVN commit r17632.
2016-01-11 20:03:31 +00:00
775f856421
Use .assign instead of operator=.
...
This was SVN commit r17631.
2016-01-11 20:03:28 +00:00
d08044c8ad
JS_DumpHeap is removed in SpiderMonkey 38, since we have nothing using it remove it. Refs #3708 .
...
https://bugzilla.mozilla.org/show_bug.cgi?id=1105069
https://bugzilla.mozilla.org/show_bug.cgi?id=1122842
This was SVN commit r17630.
2016-01-11 20:03:09 +00:00
785acdb1c6
Fix test failure on Windows.
...
This was SVN commit r17629.
2016-01-11 20:03:01 +00:00
f0fc36138d
cleanup of previous patches
...
This was SVN commit r17627.
2016-01-10 22:46:37 +00:00
3246b02cda
make easy AI levels easier and hard levels harders by also applying the bonus/malus to trade, fixes #3722
...
add some info on AI levels in the AI config window
This was SVN commit r17626.
2016-01-10 21:57:01 +00:00
7fa2962c45
allows changing options for one session without having to save them, fixes #3511
...
changes on text or number options are now detected without any need of
typing Return, fixes #2451
graphic options (using the renderer type) are now properly saved when
changed
sound options (using the function type) are still not saved
This was SVN commit r17625.
2016-01-10 21:41:34 +00:00
e9511d21d5
Fix bug in d4d05c6236.
...
This was SVN commit r17624.
2016-01-10 17:25:40 +00:00
8c7b6dceaa
Show status-bars of all players to observers, fixes #3215 .
...
This was SVN commit r17623.
2016-01-10 16:47:57 +00:00
8859f33b38
Rename PickFriendlyEntitiesOnScreen to PickPlayerEntitiesOnScreen.
...
Rename PickFriendlyEntitiesInRect to PickPlayerEntitiesInRect.
Rename PickSimilarFriendlyEntities to PickSimilarPlayerEntities.
Add comment.
Refs #3215 .
This was SVN commit r17622.
2016-01-10 14:47:09 +00:00
4a9d6d2e5f
Update all OS X libraries to their latest versions (exlcuding currently unused libjpeg, see #2828 ). Some also include security fixes. Fixes #3721 .
...
Also disable unused wxwidgets features. Patch by trompetin17, refs
#2924 .
Tested by wraitii.
This was SVN commit r17621.
2016-01-10 13:23:25 +00:00
893ca29723
Allow 10 clients to conncet to the server by default (allows 8 players and 2 observers). Refs #3254 .
...
This was SVN commit r17620.
2016-01-10 01:06:07 +00:00
ead85b1572
Update the control-all-units checkbox when changing the perspective and onSimulationUpdate so that it always shows the correct value.
...
This was SVN commit r17619.
2016-01-10 00:59:28 +00:00
9a623a8e00
Style fixes.
...
This was SVN commit r17618.
2016-01-09 23:01:07 +00:00
6b710f35b0
Show the selection panels to observers / in replays, fixes #3731 .
...
This allows observers to see the training queue, researched techs, unit
stance, constructable buildings, garrisoned units, market prices etc.
for all players without changing the perspective.
All buttons are disabled if the user isn't allowed to control the
affected player.
Notice updateUnitCommands() fills out the panel differently in case of
selecting an allied building.
Extends the GUIInterface methods "GetNeededResources",
"CheckTechnologyRequirements" and "IsTechnologyResearched" to optionally
take a different player-argument.
This was SVN commit r17617.
2016-01-09 22:01:08 +00:00
9b922ebadd
Remove invisible character introduced in deaa224785.
...
This was SVN commit r17616.
2016-01-09 12:12:42 +00:00
629e73a768
Fix a compiler warning.
...
This was SVN commit r17615.
2016-01-09 09:52:51 +00:00
491cba314a
Translate some notification messages. Refs #3665 .
...
This was SVN commit r17614.
2016-01-08 23:22:45 +00:00
caa81a1d31
Remove garrison code duplication.
...
This was SVN commit r17613.
2016-01-08 23:02:26 +00:00
deaa224785
Fix some Gallic leader names, based on historic_bruno's suggestions. Fixes #3675
...
This was SVN commit r17612.
2016-01-08 20:12:25 +00:00
87a93b2498
Add version command line option. Fixes #2965 .
...
This was SVN commit r17611.
2016-01-08 19:35:33 +00:00
b4f187b8d4
Defeat the player if he/she has no more units, nor buildings that can train units. Fixes #3229 .
...
This was SVN commit r17610.
2016-01-08 12:21:40 +00:00
5b60f2d1f6
Display the buildrate of foundations in the tooltip. Patch by bb, fixes #3395 .
...
This was SVN commit r17609.
2016-01-08 11:53:48 +00:00
e1e4a00ad7
Enable sky by default. This is usually not needed during gameplay (no sky visible), but it is with cinematic, committed in 89aef0b6eb, where camera can point to the sky.
...
Can still be disabled in game options menu.
Refs: #3301 .
This was SVN commit r17607.
2016-01-07 12:38:43 +00:00
1cc1ba2b17
Fix non-visual replaymode. Refs #3301 (cinematic camera). Patch by Vladislav. Bug reported by eternaf.
...
This was SVN commit r17606.
2016-01-06 21:40:59 +00:00
a7743e95b9
cleanup of unused counters
...
This was SVN commit r17605.
2016-01-06 21:15:58 +00:00
e0a1e2beb1
Session cleanup.
...
Don't send the simstate as an argument of reportGame().
Eliminate a for-each loop.
Remove some superfluous comments.
This was SVN commit r17604.
2016-01-05 03:02:59 +00:00
b18cd3254c
Test FixedVector{2,3}D script conversions, and test calling functions of the prototypes.
...
Also ENSURE that the given value identifier is actually present in the
cache instead of creating one if it is not.
This was SVN commit r17603.
2016-01-04 21:41:40 +00:00
4c4beb8450
cleanup
...
This was SVN commit r17602.
2016-01-04 18:10:04 +00:00
9f334036ef
Do not align object properties.
...
Do not construct objects if they only contain two atomic elements.
Revert getDisconnectReason so as to have a custom message for the error
case. Add a warning.
This was SVN commit r17601.
2016-01-04 17:59:12 +00:00
ab4668ac79
Remove legacy error codes from strings.
...
This was SVN commit r17600.
2016-01-04 17:58:28 +00:00
7a3f011587
Fix a typo.
...
This was SVN commit r17599.
2016-01-04 17:05:43 +00:00
5033fd6cbf
Some const and fix the indentation.
...
This was SVN commit r17598.
2016-01-04 17:05:39 +00:00
24b14fe201
allow the AI to build near walls (but not gates), fixes #3725
...
This was SVN commit r17596.
2016-01-03 21:04:23 +00:00
89aef0b6eb
Cinematic camera core functionality. Patch by Vladislav Belov.
...
Based on existing code that was still around from an old(not working)
implementation.
Supports basic control from trigger scirpts (queue, start and stop
camera paths) and works in multiplayer.
This was SVN commit r17594.
2016-01-03 12:41:04 +00:00
