Commit Graph

10529 Commits

Author SHA1 Message Date
5d4604e767 Make wooden tower upgradable to the defense tower. Reviewed by fatherbushido, siole and Hannibal Barca, fixes #4125.
Let towers cost 50 wood and reduce the stone cost by 50.
The upgrade costs so much that it's cheaper to build a stone tower than
building and upgrading a wooden tower, but still cheaper than building a
wooden and stone tower.
Increase the minimum distance between wooden tower to 60, so that the
upgrade won't circumstance the minDistance of the stone tower.
Add missing newline to the entity limit tooltip of the upgrade component
(refs #2706) that was never visible before.

This was SVN commit r18754.
2016-09-24 00:16:59 +00:00
06bf79b7e8 Offer the same techs and production queue at the Temple of Vesta as are available to the general roman temple (in particular Sibylline Books tech).
Reviewed by fatherbushido, fixes #4232.

This was SVN commit r18753.
2016-09-23 22:36:45 +00:00
09e775446e Fix a frequent rejoining OOS. We actually need to serialize the data loaded from the disk, because JS objects in the memory or newly loaded from the disk will not behave the same way.
Fixes #4239, refs #3834.

This was SVN commit r18752.
2016-09-23 21:24:14 +00:00
ad1a4d6121 Autocomplete hotkey tooltips for the gamesetup-, session- and lobby chat and replay playerlist filter.
Delete hotkey tooltips for replay menu and save and load dialogs.
Reviewed by bb, fixes #4145.

This was SVN commit r18751.
2016-09-23 21:16:12 +00:00
22efe2fa8a Add missing new file in ca90df29c0 as reported by bb, refs #4222.
This was SVN commit r18750.
2016-09-23 20:36:29 +00:00
43ecbbc09e Fix a trade cart UnitAI error occuring rarely on defeat, by clearing the traderoute if the trader changed ownership. Patch by mimo, fixes #4131.
Also simplify MoveToMarket.

This was SVN commit r18749.
2016-09-23 16:11:26 +00:00
127ca4e177 More immersive descriptions for _kalis new maps. Patch by Hannibal Barca, reviewed by Itms, fixes #4226.
This was SVN commit r18748.
2016-09-23 15:44:14 +00:00
19002a1396 Back to work hotkey. Patch by Imarok, refs #4008.
This was SVN commit r18747.
2016-09-23 15:16:33 +00:00
6f1e46a641 Resize the gray phase bar background in the structure tree to end after the last template of that phase. Patch by usey11, fixes #3939.
This was SVN commit r18746.
2016-09-23 09:38:45 +00:00
ca90df29c0 Add click button sound to the gamesetup icon buttons and credits page. Patch by Vladislav, fixes #4222, refs #3805, #3744.
This was SVN commit r18745.
2016-09-23 09:07:38 +00:00
8ce1929966 Sort the country dropdown choices alphabetically in the localization settings. Patch by Vladislav, fixes #4221.
This was SVN commit r18744.
2016-09-23 08:58:08 +00:00
8f82a97c23 Adds the missing hero garrison aura to Chanakya hero. It was missing as the template doesn't inherit of an hero template. Adds back entries of this template mistakenly removed in 94791c53c6. Noticed by elexis. Fixes #4233.
This was SVN commit r18742.
2016-09-21 14:32:54 +00:00
e894c78fd3 Uses MatchesClassList for restricted classes tests in order to allow more flexibility as whitelisting. Uses it for fishing boat template and fixes a cursor inconsistency. Patch by erraunt and elexis. Fixes #4092
This was SVN commit r18741.
2016-09-21 12:51:14 +00:00
65752e7b29 Revert the usage of the "disable" tag in the Loot component, since these should become mandatory instead of optional.
Fix a typo "disabled".

This was SVN commit r18740.
2016-09-21 11:00:01 +00:00
49127cf68a Gamesetup player assignment column header position adjustment for the smallest supported resolution 1024x768.
Increase the size of the color label by stealing some space from
neighboring fields,
so it works for all translations with the minimum resolution, fixes
#3761, refs #1580.

Right-align civ-info and reset buttons with the dropdowns for consistent
appearance, refs #3805.
Ensure column headers/buttons can't overlap by giving neighboring fields
identical left/right values.

This was SVN commit r18739.
2016-09-20 11:22:15 +00:00
94791c53c6 Loot balancing overhaul and cleanup. Based on patch by fatherbushido, refs #4193.
Add missing loot entry to many new buildings that were added after
d7b31da2dc and ships.
Give civic centers and wonders a significant amount.
Food related structures contain some food.
Temples somehow yielded 500 metal loot previously.
Remove experience point loot from non-defensive buildings.
Merge loot for cavalry and hero templates.
Swordsmen and sword cavalry loot 5 metal, slingers 5 stone, other units
5 wood.
Remove some duplicate Looter, MiniMap, Selectable and
TrainingRestriction entries.
Remove pointless sentence "Special Building." from persian hall tooltip.

This was SVN commit r18738.
2016-09-20 01:58:44 +00:00
b5340a19ad Remove two unneeded newlines in the needed resources tooltip.
Don't display the projectile tooltip in the construction panel, since
that also doesn't show the attack tooltip.

(Since there is not much choice between attacking structures, the attack
information doesn't help deciding which
structure to build. Displaying the tooltips would require 3 lines.)

This was SVN commit r18737.
2016-09-20 00:38:36 +00:00
4391498cf4 Reduce the waterheight from the default 19.9 to 18 after the heightmap interpolation in refs #4174 made water visible in wrong locations. Fixes #4231.
This was SVN commit r18736.
2016-09-19 22:00:03 +00:00
0c6cc228c0 Unify siege armor. Buff bolt shooters and siege towers slightly. Reviewed by fatherbushido.
Increase crush armor of most siege from 1 to 5,
decrease crush armor of rams from 10 to 5.

Bolt shooters were not affected by d38adc7cd0, but nerfed too much in
8a2638a8f5.
Thus make them stronger as in that commit, but weaker than before it by
increasing their repeat rate by 25%.

Remove minimum attack distance of the macedonian siege tower and
shoot one arrow per unit garrisoned but at most 10 arrows,
rather than shooting only one arrow for 2 units garrisoned.

This was SVN commit r18735.
2016-09-19 14:08:48 +00:00
3b816e82ab Loot tooltips. Patch by Mate-86, fixes #4193.
This was SVN commit r18733.
2016-09-19 01:21:09 +00:00
85efeaac5a Crannog icon by LionKanzen, refs #3959.
This was SVN commit r18732.
2016-09-19 01:13:01 +00:00
02848dcd17 Simple petra AI regicide support. Patch by Sandarac, refs #4142.
The AI will retreat the hero in regicide games once it reaches less than
70% health.
It will garrison it in healing structures. Elephant heroes will retreat
to the home base.
Once the hero has healed, it will be used for attacks again.

This was SVN commit r18731.
2016-09-18 14:27:03 +00:00
eb09c2a8c5 Show the portrait of the most common (or most costly) unit type in the selection group buttons on the left hand side. Patch by Imarok, fixes #2163.
This was SVN commit r18728.
2016-09-16 10:47:00 +00:00
72a26857e9 Use the current OS X version instead of a hardcoded value in the path to the OSX development tools, when building the OSX bundle.
Patch by jurgemaister, plus some little fixes, fixes #3884.
Tested on OSX 10.11.

This was SVN commit r18726.
2016-09-15 13:41:16 +00:00
5d3f1ce348 Extend the shared ally vision tech tooltip to mention the allied summary screen entries and the resource / population tooltips. Patch by Imarok, reviewed by fatherbushido.
This was SVN commit r18724.
2016-09-13 16:54:39 +00:00
1ca4c7c988 List Bahrain as a naval map, since ships are required to cross the persian gulf to Bahrain and Qatar.
This was SVN commit r18723.
2016-09-12 22:15:07 +00:00
85a187b89f Tweaks hp modification of the phase city tech to keep the current balance as tech modifications calculations changed in 9368ffe345.
This was SVN commit r18722.
2016-09-12 15:38:13 +00:00
c43654c120 Display the number of clients too when typing the /list chat command.
This was SVN commit r18720.
2016-09-12 02:23:19 +00:00
24a488bacc Increase the maximum observer limit to 32 for the upcoming release, refs #4210.
This was SVN commit r18719.
2016-09-11 22:46:00 +00:00
5f67763e97 Remove or fix some broken art files. Bring wrld_med_plant.png back from the dead.
Based on patch by stanislas69, refs #2524
Fixes #3796

This was SVN commit r18718.
2016-09-11 16:28:45 +00:00
ca51672225 Fix typo in a68881dd0f.
This was SVN commit r18717.
2016-09-11 15:30:06 +00:00
fb9da87264 Restores armour entry in economic structure template wich was mistakenly removed in 27c46a0a68. Slighty reduces stats compares to a20. Fixes #4195. Reported by Warbeast. Agreed by scythetwirler. Reviewed by elexis.
This was SVN commit r18716.
2016-09-10 11:24:22 +00:00
a68881dd0f Five new random map scripts by _kali: Bahrain, Harbor, Howe Sound, Ngorongo and Rouen.
Besides harbor, they are portraying actual geographic regions.
Some environmental improvements by niektb.

This was SVN commit r18714.
2016-09-07 20:06:01 +00:00
f63cef5ad0 Fix few typos in comments.
This was SVN commit r18713.
2016-09-07 17:02:25 +00:00
64b1da0ddf Adds globalscripts/BicubicInterpolation.js, the corresponding license_mit.txt and points to it for other files with the same license in LICENSE.txt - reviewed by Philip and Itms. Uses that to fix an interpolation issue in gaia.js and also fixes a "fail by one" there - reviewed by elexis. Fixes #4174
This was SVN commit r18710.
2016-09-06 21:49:57 +00:00
a673a330a5 Fixes a typo in 8c6944f58f.
This was SVN commit r18709.
2016-09-06 13:14:51 +00:00
baed376b06 Removes Town class from wallset template. It was misleading because palisades and walls are not Town structure and they didn't even count as such buildings because the built walls don't inherit class from wallset.
This was SVN commit r18708.
2016-09-06 12:47:09 +00:00
8c6944f58f Adds Capturable component tests. Fixes a message. Thanks elexis and sanderd17 for the remarks. Fixes #4149.
This was SVN commit r18707.
2016-09-05 20:02:33 +00:00
58c8812cc7 Removes duplicated entries in crannog template. Noticed by Imarok.
This was SVN commit r18706.
2016-09-05 14:08:55 +00:00
417aec9495 Fixes village, town, city classes inconsistencies in templates. Reported by WarBeast. Refs #4147.
This was SVN commit r18705.
2016-09-05 12:45:07 +00:00
c056b9bfb9 Fix critical gamesetup bug again where the game can't be started after a previously assigned disconnected client rejoins a full game. Same as #3602, reintroduced by b642f0d876, refs #3120. Fixes #4120.
This was SVN commit r18702.
2016-09-05 02:15:04 +00:00
565709701e Hide the "I'm ready" button to observers. Patch by echotangoecho, fixes #4112.
Right-align the affected buttons and neighboring GUI objects.

This was SVN commit r18701.
2016-09-05 01:53:08 +00:00
f61f051d74 New random map script Marmara by _kali, reviewed by niektb.
This was SVN commit r18700.
2016-09-04 22:30:03 +00:00
c118467c33 Fix broken transparency of the mediterranean mappreview image.
This was SVN commit r18699.
2016-09-04 22:25:57 +00:00
ff2fe5d04a Fixes immortals technology as it affected also the persian mercenary champion spearman. Reported by WarBeast.
This was SVN commit r18698.
2016-09-04 21:36:45 +00:00
488b4482d9 Skirmish map Two Seas overhaul by Stan, refs #2881.
Adds starting resources and units, forests, mines, animals, treasures
and some decoratives.

This was SVN commit r18697.
2016-09-04 21:19:14 +00:00
2e1441d2ba Fixes a copy paste error introduced in 46ead523b8 for a roman hero aura, noticed by WarBeast. Reviewed by elexis.
This was SVN commit r18695.
2016-09-04 10:34:57 +00:00
53d5f9f573 Adds melee cavalry to garrison arrow classes for some buildings and ships that can garrison cavalry. Previously all ranged units and all infantry were allowed wich was misleading. Discussed with Yves and reviewed by elexis.
This was SVN commit r18693.
2016-09-03 13:09:08 +00:00
317502d915 Objectives dialog. Icon by Lionkanzen. Reviewed by bb, fixes #3263 #4141.
Explain the new victory conditions and last man standing option in the
gamesetup.
Add an ingame dialog showing these explanations and all other chosen
gamesetup options,
so that players don't have to recall them and late observers don't have
to ask.

This was SVN commit r18692.
2016-09-03 09:11:02 +00:00
9b52dfb554 Allow queuing orders if an action is preselected. Patch by Imarok, refs #1720.
This was SVN commit r18691.
2016-09-03 07:42:08 +00:00
add6b0206c Adds a missing civ requirement for a pair technology.
This was SVN commit r18653.
2016-09-01 07:35:13 +00:00
8f1b37b216 Major ordered list GUI cleanup. Patch by Imarok, fixes #3905.
Remove m_SelectedDef, m_SelectedColumnOrder and m_HeadingHeight. Use
GetSetting and SetSetting instead. Thus
implement selecting a column / column order sprite from JS correctly.
Since the actual list sorting is done in JS, only the column header
sprites were inaccurate.

Remove "selected_def" since that is redundant with "selected_column".
Merge "selected_column" with "default_column" (and
"selected_column_order" with "default_column_order") since
all properties provided in XML pages are defaults and to remove the
copying on init.

Rename "def" to "column" and "ObjectDef" to "COListColumn".
Replace 30px header height hardcoded in the C++ with an option set by
the style.
Remove the unneeded requirement to specify a "list_name".
Thus rename "list_name" to "list_month" in the replay menu.
Remove unneeded "list_" prefix and substr(5) in column checks.
Use ranged loops.
Fix typo "Avalible".
Add an error message if the GUI style doesn't specify the selected
column order.

This was SVN commit r18652.
2016-08-31 19:29:48 +00:00
a4a99bc129 Fix a lot of whitespace in gui/.
This was SVN commit r18650.
2016-08-27 15:33:22 +00:00
fe8d096364 Add GetPlayersByDiplomacy to cmpPlayer.
This is in turn used by GetEnemies and the new GetAllies and
GetMutualAllies.
Use these in a few places as those are common queries.

Fixes #4161.
Reviewed by: fatherbushido
This was SVN commit r18649.
2016-08-27 15:28:02 +00:00
38c9d48708 Prevent leaking internal data in cmpPlayer.
Refs #4161.
Reviewed by: fatherbushido
This was SVN commit r18648.
2016-08-27 15:27:44 +00:00
2366d36f54 Remove unneeded includes.
Refs #4161.
Reviewed by: fatherbushido
This was SVN commit r18647.
2016-08-27 15:27:13 +00:00
2c5cddd684 Move message registrations to the right file.
Refs #4161.
Reviewed by: fatherbushido
This was SVN commit r18646.
2016-08-27 15:26:54 +00:00
c4c315f6a0 Remove cmpPlayerManager.GetAllPlayerEntities() which leaked internal data.
And all uses thereof could easily be replaced.
This changes the data structure of cmpTrigger.conquestEntitiesByPlayer
to
not store the player entity at all, and since that is now gone replaces
the
object by the array that was its sole property.

Refs #4161.
Reviewed by: fatherbushido
This was SVN commit r18645.
2016-08-27 15:26:23 +00:00
737ede0f89 Improves military-only-selection modifier, now filters fishing boat and merchant ship. Uses the same classes filter for find-idle-warrior. Reviewed by elexis. Fixes #4129.
This was SVN commit r18644.
2016-08-27 10:34:21 +00:00
35f8061ef2 Remove Armour from fish templates. Fixes #4169.
Given that Armour needs Health disabling one but not the other is an
error.

This was SVN commit r18643.
2016-08-26 19:37:12 +00:00
eb20661e34 Fix an oversight in 84bde41394, as reported by gameboy.
This was SVN commit r18642.
2016-08-26 14:19:01 +00:00
dfea781d71 Session GUI cleanup.
Remove a wrong space in a tooltip if the delete hotkey isn't set.

This was SVN commit r18641.
2016-08-26 10:05:23 +00:00
859dffd949 Add disabled effect for Stone themed buttons and Modern themed checkboxes. Patch by Imarok, fixes #4165.
This was SVN commit r18639.
2016-08-25 22:35:01 +00:00
b50ffac36b GUI sprite cleanup.
Move training panel portrait sprite from common/ to session/.

This was SVN commit r18638.
2016-08-25 22:14:56 +00:00
29c95f3a49 GUI sprite / style cleanup.
Merge common/styles.xml (which contains only the special default style)
with common/common_styles.xml.
Rename common/common_sprites.xml to common/sprites.xml.

This was SVN commit r18637.
2016-08-25 20:23:17 +00:00
84bde41394 GUI style / sprite cleanup.
Move remains of common/sprite1.xml to common/common_sprites.xml.

Remove duplicates bkFillBlack and bkTranslucent.
Rename bkWhiteBorderBlack to BackgroundWhiteBorderBlack.

Move BackgroundSessionTooltip and BackgroundInformationTooltip to
session/.
Remove unused BackgroundErrorTooltip.

This was SVN commit r18636.
2016-08-25 18:36:05 +00:00
eab5436d55 Fix oversight in 42cef1d29f.
This was SVN commit r18635.
2016-08-25 18:12:24 +00:00
52504bbfa8 GUI style / sprite cleanup.
Move civ icon overlay entries from common/ to session/.
Move main menu entries from common/ to pregame/.
Remove unused pgButton.

This was SVN commit r18634.
2016-08-25 13:59:25 +00:00
a8837fed41 Major GUI stlye and sprite cleanup.
Remove many unused and orphaned entries from common/,
including the entire Wheat theme from more than a decade ago and
most parts of the Stone theme.

Besides being unused, nearly all of the styles were ugly and don't fit
to the existing theme.
No entry should be reintroduced without being actually used somewhere
and if so, use a new subdirectory with the name of the theme.

This was SVN commit r18633.
2016-08-25 13:24:03 +00:00
f5eabf8ec8 Reverts e38665d7a6 (excepting the buildtime part of iberian and macedonian fortress templates) as #3818 must be fixed in a cleaner way. Fixes a typo. Refs #3818.
This was SVN commit r18632.
2016-08-25 10:44:19 +00:00
9fb4e9ef90 GUI style cleanup.
Remove commented out, unused scrollbars and a style.

This was SVN commit r18631.
2016-08-25 09:45:41 +00:00
4935c4384e GUI sprite cleanup.
Remove the commented out StonePanel theme which is superseded by thin
and large border variations.

This was SVN commit r18630.
2016-08-25 09:36:36 +00:00
6df480260e Main menu cleanup.
Remove code that was commented out.
Remove unneeded comments.
Use JSdoc comments.
Move globals to the top of the file.
Quotes for object keys.

This was SVN commit r18629.
2016-08-24 11:18:26 +00:00
42cef1d29f Hero / group icon color fade cleanup.
Move globals to the top of the file.
Proper case for globals.
Rename restartAble to restartable.
Use proper JSdoc comments.
Whitespace fixes.
Abbreviate with rgbToGuiColor.

This was SVN commit r18628.
2016-08-24 10:10:30 +00:00
11d10baf26 Delete old main menu background whose reference was removed in 6bcb3f5695 (2779512c6e). Delete commented out sprites.
This was SVN commit r18627.
2016-08-23 15:57:37 +00:00
2f12bae102 Deal ranged damage even if the attacker dies. Patch by LeanderH. Fixes #3610.
Create a Damage system component from the Damage helper object and parts
of
the Attack component. This fixes the issue by making ranged damage
independent
of the attacking entity.

While there fix the issue of damaging all nearby entities in case the
actual
target was not hit, instead of only a single one.

This was SVN commit r18625.
2016-08-22 01:00:57 +00:00
7947351a08 Add regression test for damage being dealt if the attacker dies. Based on patch by LeanderH. Refs #3610.
This was SVN commit r18624.
2016-08-22 01:00:30 +00:00
f79a9bd4c4 Removes 3 redundant numerical informations in tooltips. Reviewed by elexis.
This was SVN commit r18618.
2016-08-21 16:22:42 +00:00
ea48757635 Cleans simulation templates xml files: sorts components by alphabetical order, fixes identation and removes tabs. Reviewed by elexis. Fixes #4160.
This was SVN commit r18617.
2016-08-21 16:19:03 +00:00
289916b4d2 Updates Identity classes and visible classes documentation. Cleans inconsistencies (identation, some classes were sometimes in Classes and other times in VisibleClasses, adds missing class for javelinist cavalry hero, removes Camel classes from traders and seleucid cavalry, removes unused and misleading Light, Medium, Heavy classes). Comments by Sanderd17, elexis and s0600204. Refs #4147
This was SVN commit r18616.
2016-08-21 09:03:00 +00:00
9846f374a0 Suppress a file not found error and show the placeholder image instead of plain magenta if the mappreview wasn't found.
This was SVN commit r18614.
2016-08-17 23:11:11 +00:00
7470e88624 Always save the replay metadata (summary screen info) when ending the application. Patch by Imarok, fixes #4020.
This was SVN commit r18613.
2016-08-17 15:17:43 +00:00
d789a09be5 Add missing component check to fix regicide on survival of the fittest. Patch by bb, refs #2160.
This was SVN commit r18611.
2016-08-16 10:51:54 +00:00
9a7dbc55ae Removes duplicated unused unit templates. Greek references by Itms. Reviewed by elexis.
This was SVN commit r18607.
2016-08-15 11:51:57 +00:00
6eaf76d653 Actually seed the random number generator used in the simulation. Reviewed by sanderd17, fixes #4127.
This was SVN commit r18604.
2016-08-14 16:28:54 +00:00
00a469be1b Show the last-man-standing option regardless of whether it is possible to set it. Reviewed by fatherbushido, refs #3970.
This was SVN commit r18603.
2016-08-14 15:35:58 +00:00
0c21c24754 Replay menu init performance improvement, reviewed by Imarok.
displayReplayList was called once per filter initialization i.e. 8 times
too often on init.
This can save multiple seconds when opening the menu.

This was SVN commit r18602.
2016-08-14 10:34:23 +00:00
e4000d11cf Display the gamestart time in the lobby. Patch by Imarok, combined with d7d0a7f869 fixes #3476.
XPartaMupp patch reviewed by scythetwirler.

This was SVN commit r18601.
2016-08-14 09:03:30 +00:00
416049e4b4 Remove charge attack from the templates which isn't implemented nor designed yet. Patch by fatherbushido, fixes #4139.
Remove the unused "recharge" attack timer which was introduced in
b21e798243 but should have been removed with 4e5c5e2d8f.

This was SVN commit r18599.
2016-08-11 14:35:50 +00:00
fb46ce578f Give the Carthaginian hero Maharbal a melee attack bonus instead of the not implemented charge bonus. Based on patch by fatherbushido, refs #4139.
This was SVN commit r18598.
2016-08-11 14:20:00 +00:00
7a0703872f Remove a wrong argument from e3b3261a62.
This was SVN commit r18597.
2016-08-11 13:20:31 +00:00
f941744c7b Removes a useless newline in training limit tooltip. Patch by elexis.
This was SVN commit r18596.
2016-08-11 12:34:11 +00:00
66bd4e9da7 Deletes unused technology file forgotten in 94a240737c, removes 2 tooltips duplicated with aura tooltips. Reviewed by elexis.
This was SVN commit r18595.
2016-08-11 12:27:22 +00:00
657070aea6 Moves misplaced desciptions from requirementsTooltips to tooltips in technology json files.
This was SVN commit r18594.
2016-08-11 08:49:53 +00:00
849b79fcec New icon for the Temple of Vesta by Stanislas69 with help from Lion.Kanzen en a little retouching from wowgetoffyourcellphone.
This was SVN commit r18593.
2016-08-10 17:50:41 +00:00
3102424439 Add Open animation to Ptolemian Gate. Made by Stanislas69.
Fix the Ptolemian Gate obstructions on the fly.

This was SVN commit r18592.
2016-08-08 18:32:28 +00:00
04a81620f9 Update translation messages after the removal of the gate conversion tooltip in b2f4b0f494. Reviewed by elexis. Refs #2706.
This was SVN commit r18586.
2016-08-06 16:31:19 +00:00
e3b3261a62 Attack component tests, reviewed by sanderd17.
This was SVN commit r18583.
2016-08-05 18:44:00 +00:00
7ce9e7675f Adds and updates documentation in /components/interfaces/ files. Reviewed by elexis. Fixes #4128
This was SVN commit r18581.
2016-08-03 12:04:49 +00:00
4e87fef3da The old debug API has been removed in SpiderMonkey 38, so remove profiler1 script profiling.
Patch by leper, refs #3708

See also https://bugzilla.mozilla.org/show_bug.cgi?id=1069694

This was SVN commit r18580.
2016-08-02 16:58:30 +00:00