1
0
forked from 0ad/0ad
Commit Graph

16623 Commits

Author SHA1 Message Date
b8f1ad155b Delete two orphaned templates.
This was SVN commit r18755.
2016-09-24 00:47:25 +00:00
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
caef42084d Add missing JSAutoRequest calls. (hopefully all of them have been spotted now)
Patch by echotangoecho, refs #4053

This was SVN commit r18730.
2016-09-18 09:34:45 +00:00
184d64cdc8 Fix building on Fedora, by adding the Position Independant Code flag when building with gcc. This flag is not supposed to break anything and did not cause troubles when testing it on some other platforms than Fedora.
Based on patch by bb, fixes #3869

This was SVN commit r18729.
2016-09-18 08:54:27 +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
c92e74138a Use the local timezone when localizing UTC timestamps. Patch by Imarok, fixes #3350, refs #2938.
Thus show the correct time in the lobby, savegame and replay menu.

This was SVN commit r18725.
2016-09-15 13:16:48 +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
a8403bd7e5 Add a linker flag on Windows allowing the game to be large address aware. This allows the game to use more than 2GB of RAM. https://msdn.microsoft.com/en-us/library/wz223b1z.aspx
However, this can mask memory issues, so this flag will not be enabled
by default. The autobuilder will use it, so SVN playtesters and release
users can benefit from it. Windows users compiling the game themselves
will have the 2GB limitation.

Fixes #4190, refs #1619, #4191
Flag tested by Stan

This was SVN commit r18711.
2016-09-07 09:03:47 +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
b60cf4663d Whitespace fixes, patch by echotangoecho, refs #1619
This was SVN commit r18704.
2016-09-05 08:34:19 +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