Commit Graph

10948 Commits

Author SHA1 Message Date
f1bf3ef35e broke a thing, fixing it
This was SVN commit r19022.
2016-12-06 12:30:00 +00:00
9929d9c684 Stan's Gaul storehouse, metropolitan Seleucid cc actor, Cart wall foundation and scaffold actors
This was SVN commit r19021.
2016-12-06 11:48:19 +00:00
fe77783145 Change color of disabled labels and dropdowns, patch by vladislavbelov, fixes #4350
This was SVN commit r19020.
2016-12-05 17:21:51 +00:00
da2a021b64 Sling skeleton
This was SVN commit r19018.
2016-12-04 22:47:16 +00:00
697c8c6b03 3D stairs on the seleucid civic center
This was SVN commit r19017.
2016-12-04 18:59:50 +00:00
ac836c860c Fix errors when using the developer overlay to change the perspective while in building placement preview. Patch by Vladislav.
This was SVN commit r19015.
2016-12-01 02:17:28 +00:00
b60f26983c Finish previous commit (selected wrong search scope modifier in eclipse yesterday).
This was SVN commit r19014.
2016-11-30 15:35:06 +00:00
5e92a139f5 Rename costIcon to resourceIcon.
This was SVN commit r19013.
2016-11-29 16:45:26 +00:00
d67ada09c9 Use strings instead of integers for the values of aiAnalysisInfluenceGroup (used by petra to position dropsites). Reviewed by mimo, fixes #4377.
This was SVN commit r19012.
2016-11-28 20:50:42 +00:00
7702908a52 Remove an unused variable following 1b20ac7671 and fix some missing and some redundant semicolons found with jshint.
This was SVN commit r19011.
2016-11-28 14:47:13 +00:00
041c456999 Don't ask the host to exit the game upon defeat if other humans are still playing.
Remove the now unneeded disconnect warning (which is still present for
the menu exit button).

This was SVN commit r19010.
2016-11-28 14:19:17 +00:00
d296cbab7c Fix some string issues reported on transifex, a typo reported by silk and end loading screen tip files with a newline.
This was SVN commit r19008.
2016-11-28 00:52:45 +00:00
9970b433a2 Add chat command to kick or ban all observers, refs #3241.
This is in particular useful as many observers can join in the gamesetup
phase
(since the server doesn't restrict connects then due to not knowing in
advance which client will become an assigned player.)

This was SVN commit r19007.
2016-11-27 23:31:14 +00:00
b87fe17ac6 Fix undefined guid error when trying to kick as a nonhosting client in the gamesetup following 9c4344a940.
This was SVN commit r19006.
2016-11-27 23:16:59 +00:00
57efd31a19 petra: increase priority of some cheap techs useful for initial economy boost
This was SVN commit r19005.
2016-11-27 17:26:56 +00:00
7464bb9ec7 fixes some leftover from 52f311da2b, refs #3934
This was SVN commit r19004.
2016-11-27 16:35:50 +00:00
3d9c6f19ab Added seleucid champion elephant mesh and texture.
This was SVN commit r19001.
2016-11-26 12:48:57 +00:00
86a79e14da Load- and save dialog cleanup.
Disable savegame selection list when there is no selectable item besides
the "No saved games found" item.

This was SVN commit r18999.
2016-11-25 03:36:10 +00:00
e3b30aa2ac Load and save dialog cleanup.
Unfiy delete and load button disabling (to remove a duplicate line and
support a hypothetical reload button).
Remove an unneeded selectionChanged call (which is automatically done
when changing the selection index).

This was SVN commit r18998.
2016-11-25 03:35:08 +00:00
86ea5a5122 Save and load dialog bugfix. Reported by frapstar, refs #4361.
Change a wrong check in the save and load screen that didn't handle the
"No saved games found" case.

This was SVN commit r18997.
2016-11-25 03:32:33 +00:00
f15e900086 Implement noconfirmation hotkey for deleting savegames in the save dialog. Refs #3962.
Remove the deleteGame duplicate.

This was SVN commit r18996.
2016-11-25 03:30:16 +00:00
30598bd451 Remove an unused function that is redundant with GetGameType from the EndGameManager.
This was SVN commit r18995.
2016-11-24 19:37:38 +00:00
417c84870c Actually remove trailing tabs from source/.
This was SVN commit r18991.
2016-11-23 14:09:58 +00:00
6149dd3841 Actually remove trailing whitespace for non-header files as well.
This was SVN commit r18989.
2016-11-23 13:02:58 +00:00
944ba16eb4 End source files with a newline.
This was SVN commit r18988.
2016-11-23 11:27:54 +00:00
b4b4404c64 petra: a few adjustement when switching from town to city phase
This was SVN commit r18986.
2016-11-22 19:16:23 +00:00
af85c1bfdc change the diminishingReturns (used for farms) to make it more intuitive and mod-friendly, reviewed by fatherbushido, fixes #4356
This was SVN commit r18985.
2016-11-22 18:34:37 +00:00
0b03713b3b Unify duplicate patrol target types hardcodings. Reviewed by fatherbushido long ago, refs #4253.
This was SVN commit r18983.
2016-11-22 12:46:46 +00:00
c390dee14c Hide the resources of defeated allies in the top panel tooltips, refs #3841.
This was SVN commit r18982.
2016-11-22 12:36:13 +00:00
fd5ba1e882 Timer component cleanup. Patch by Stan, fixes #4158.
Use objects instead of arrays to achieve more readable code.
Use two for-of loops, a continue instead of an if-else pattern and
remove an unneeded variable dt.

This was SVN commit r18981.
2016-11-22 12:28:22 +00:00
f391f113f9 Fix wall-placement cost tooltip, refs #3934.
This was SVN commit r18980.
2016-11-22 11:55:28 +00:00
a8b9416725 Colorize selected units in observermode, reviewed by elexis, fixes #4167
This was SVN commit r18979.
2016-11-21 21:35:26 +00:00
91c7805dec move the diminishing returns computation from the ResourceGatherer to the ResourceSupply component, reviewed by fatherbushido, refs #4356
This was SVN commit r18978.
2016-11-21 18:29:40 +00:00
1b20ac7671 Remove silencing of resource-not-found errors (that were introduced with an enabled property in the JSON resource files that got removed later). Refs #3934.
This was SVN commit r18977.
2016-11-21 17:32:17 +00:00
552f7043b0 Disable all unusable structures on survival of the fittest, refs #3102.
Prohibit gathering of wood by removing storehouses and the worker
elephant.
Keep the roman army camp allowed for now because it isn't a dropsite.
Always spawn at least one attacker in the first wave.

This was SVN commit r18976.
2016-11-21 17:28:21 +00:00
7cb3fe8eff hidden texture loader actor in the carthaginian CC to prevent loading on damage
This was SVN commit r18972.
2016-11-20 22:02:18 +00:00
0fa69f9983 Seleucid main menu background
This was SVN commit r18968.
2016-11-20 20:02:41 +00:00
78e31116f7 Carthage themed background variant commit
This was SVN commit r18967.
2016-11-20 01:19:43 +00:00
3653925a00 Gatherrate tooltip rework.
Display the gatherrate tooltip in the selection details.
Remove structure tree specific gatherrate parsing code.
Receive the data directly from Templates.js and GUIInterface.js like the
other tooltips do.
Add TODO about the tooltip lying (averaging over the subtypes).

This was SVN commit r18966.
2016-11-19 14:34:02 +00:00
f66a202cb0 Remove unused milk food subtype.
This was SVN commit r18965.
2016-11-19 14:30:32 +00:00
52f311da2b Merge resource agnostic branch by s0600204, fixes #3934.
Remove all occurances of hardcoded resources in the simulation, GUI and
AI code by
specifying resources as JSON files in a new simulation subdirectory and
accessing them through a globally defined prototype.

This was SVN commit r18964.
2016-11-19 14:29:45 +00:00
79f3cae70d Add missing Mercenary visible classes to thracian mercenaries templates.
This was SVN commit r18962.
2016-11-19 08:25:56 +00:00
85e68d4c0e Remove useless Rollover element from Identity schema. Fix a related unit template.
This was SVN commit r18961.
2016-11-18 20:05:38 +00:00
b83d5eb63c Fix a test failure on SM45. Patch by leper, fixes #4353.
This was SVN commit r18959.
2016-11-18 09:43:54 +00:00
527a7bc9b6 Clean some templates with useless Identity entries.
This was SVN commit r18956.
2016-11-17 09:23:58 +00:00
6efd5ea505 petra: some more adjustements for lastManStanding games
This was SVN commit r18955.
2016-11-16 19:35:12 +00:00
65fae7f965 Rename clStone to clRock, to be consistent with all other maps. Reviewed by FeXoR on 2016-10-29.
This was SVN commit r18954.
2016-11-16 14:05:54 +00:00
d999fc4be5 Prevent collisions of straggler trees with mines. Reviewed by FeXoR on 2016-10-29.
This was SVN commit r18953.
2016-11-16 13:57:04 +00:00
827ee03cc0 Random map fortress generation code cleanup.
Create target objects in a single statement where possible, to highlight
the absence of self-reference.
Separate arrays of hardcoded templates from the logic.
Use loops to remove duplicate statements.
Add scopes to the new code to show and enforce that some variables are
indeed local.

This was SVN commit r18952.
2016-11-16 13:40:40 +00:00
5f97892814 Don't overwrite skipFirstWall of placePolygonalWall with true if false were given.
This was SVN commit r18951.
2016-11-16 12:48:24 +00:00
8efe5baf64 Further increase metal cost and train time of Spartan Skiritai swordsmen (0b2f0ea042), in agreement with borg, Vercingetorix and Hannibal Barca.
This was SVN commit r18950.
2016-11-16 10:31:30 +00:00
d623a73f9f Remove structure tree helper function that was never used since 932dbc7221.
This was SVN commit r18949.
2016-11-16 10:07:08 +00:00
95fa246b82 Aura icon for farm penalty around CC
This was SVN commit r18948.
2016-11-15 23:18:36 +00:00
64878bb416 Order the lobby gamelist by the number of playerslots instead of the ratio of online and total players. Reviewed by scythetwirler.
This was SVN commit r18947.
2016-11-15 21:59:16 +00:00
8243803f14 AI: clean some deprecated functions following f352e2c725
This was SVN commit r18946.
2016-11-15 19:50:36 +00:00
f352e2c725 AI diplomacy support for lastManStanding, patch by Sandarac, tests reviewed by elexis, fixes #4143
This was SVN commit r18945.
2016-11-15 18:48:20 +00:00
a96335fad1 Regression tests for all aura types. Patch by fatherbushido, fixes #4124.
This was SVN commit r18944.
2016-11-15 16:30:10 +00:00
d6fa0c4255 Partial EndGameManager test by Sandarac, refs #4143.
This was SVN commit r18943.
2016-11-15 15:10:14 +00:00
aa26863d5c Fix an OOS on rejoin caused by ParamNode.cpp using an invalid node cache. Patch by leper, fixes #4316.
Reuse the temple of vesta inheritance from 06bf79b7e8 which was affected
by this bug.

This was SVN commit r18942.
2016-11-15 14:01:15 +00:00
3008533c8e Add a template manager test that reveals an inheritance error in ParamNode.cpp which can trigger an OOS on rejoin. Patch by leper, refs #4316.
This was SVN commit r18941.
2016-11-15 13:51:29 +00:00
2bf1dbfd13 An awesome Rejoin-test tool by wraitii and Itms, fixes #4242, refs #3460.
Contrary to the serializationtest, initializes the secondary simstate
only once
before progressively applying updates.
Thus reproducing actual multiplayer rejoining, enabling developers to
analyze OOS reports solely from the replay file of the rejoined and a
non-rejoined client.

This was SVN commit r18940.
2016-11-15 13:26:58 +00:00
9a4fcd55a8 Very large art commit, hopefully I don't break anything
foundations and construction sites, not-yet-implemented animations,
briton walls, fortress, and textures
Carthaginian buildings, destruction variants

This was SVN commit r18939.
2016-11-15 00:09:04 +00:00
cc4d68c68d micro optimisation of water shader
This was SVN commit r18938.
2016-11-14 23:41:48 +00:00
a89f521e08 GUI cleanup.
Remove sprintf from untranslated error messages, unneeded braces and
comments, add missing quotes.

This was SVN commit r18934.
2016-11-14 13:43:27 +00:00
34ce0f865d Reset the cursor when opening new GUI pages. Patch by danger89, refs #539.
Remove duplicate cursor image and duplicate hardcoded default paths.

This was SVN commit r18933.
2016-11-14 13:23:07 +00:00
ceecd948e2 Move that string to another transifex resource while not in string freeze, 58a8380dd9, f37faa57e3.
This was SVN commit r18931.
2016-11-14 09:22:38 +00:00
9dca10e32f Remove two pointless references and fix a typo. Patch by fatherbushido, refs #4276.
This was SVN commit r18929.
2016-11-14 01:44:17 +00:00
59edc42042 String extension for the will to fight upgrade following 5e88ae118a / 1f8c75db08.
This was SVN commit r18928.
2016-11-14 00:28:10 +00:00
448bf31b15 Disable upgrade buttons to observers. Reviewed by elexis. Fixes #4302 Refs #2706
This was SVN commit r18927.
2016-11-13 22:31:04 +00:00
e256d85305 Disable right-click playercommands to observers. Patch by elexis. Refs #4302.
This was SVN commit r18926.
2016-11-13 18:03:23 +00:00
93aefe0787 Split the 1D and 2D interpolation into 2 Functions. Renamed BicubicInterpolation.js to interpolation.js. Original patch by Vladislav. Reviewed by fatherbushido. Fixes #4218
This was SVN commit r18925.
2016-11-13 17:34:08 +00:00
1a05eba451 petra: do not steal ally's cattle when inside its territory, fixes #4331
This was SVN commit r18923.
2016-11-12 13:12:20 +00:00
fe01a710a5 implement ptol civ bonus and optimization of ResourceTrickle component, refs #4082
This was SVN commit r18920.
2016-11-11 12:46:25 +00:00
e55ee5048e Bump version number to Alpha 22.
Remove "new" keyword from Alpha 21 maps.
Remove "new pathfinder" hint from Alpha 19, as reported by fcxSanya.
Show chat timestmaps by default.

This was SVN commit r18919.
2016-11-11 01:46:12 +00:00
41a338ca3e Translate the reveal map cheat notification following the lift of the string freeze.
This was SVN commit r18918.
2016-11-11 01:16:55 +00:00
01b667ab86 Invincible women on survival of the fittest to prevent women fights and cheap tower kills. Based on patch by bb, refs #3102.
This was SVN commit r18915.
2016-11-06 03:11:04 +00:00
9468cfdc8c Don't use black for gaia on survival of the fittest, refs #3102.
Some GUI elements use white until the first diplomacy change.
The choice black is confusing, problematic as there is a dark gray
player color and
problematic as black words in the chat have no contrast to the black
background.
Changing playercolors in running games is a questionable feature, thus
don't attempt to inform the GUI via a GUIInterface notification now.

This was SVN commit r18914.
2016-11-06 02:16:40 +00:00
0555ace16e Don't spawn units for defeated players and players who won on survival of the fittest. Refs #3102.
The previous code errored as the trigger point became gaia, consequently
trying to access the undefined playerCivicCenter of gaia.
Remove two useless loops by sending the command for all entities instead
of one command for each entity.
Rename attackerEntities to attackerTemplates and attackerCount to
attackersPerTemplate.

This was SVN commit r18913.
2016-11-06 01:46:56 +00:00
d124b32f6a Prevent out of scope usage of cmpTrigger, which would result in an OOS on rejoin, refs #4310.
This was SVN commit r18912.
2016-11-05 21:46:32 +00:00
554032e507 Revert 06bf79b7e8 as it revealed an OOS on rejoin in the engine code, refs #4232 #4316.
This was SVN commit r18911.
2016-11-05 20:44:58 +00:00
5a25f7817f Slightly nerf gallic naked fanatic rush.
15% less HP, walk speed from 17.3 to 16.5 (as cavalry has 17.5).
Discussed with borg, Hannibal_Barca and nigel87.

This was SVN commit r18910.
2016-11-05 20:23:36 +00:00
53570da065 Fix an OOS on rejoin on survival of the fittest. Patch by Itms, fixes #4310.
The code kept the reference to the trigger component before
deserialization,
thus accessed the empty civic center array instead of the deserialized
one.

 refering to the actual Trigger component instead of

This was SVN commit r18909.
2016-11-05 16:40:20 +00:00
3c9100b4e2 Trimming off the inactive Gaul roof variations that call missing texture files
This was SVN commit r18908.
2016-11-05 14:21:20 +00:00
f569e5ce04 Don't throw errors attempting to spawn templates that don't exist on survival of the fittest. Patch by bb, refs #3102.
This was SVN commit r18907.
2016-11-04 14:56:32 +00:00
31c7713e9b Remove a hunk with commented out code and a hunk of broken duplicate code from survival of the fittest, refs #3102.
The removed code is redundant with the AlliedVictoryCheck of the
EndGameManager which is called for all victory conditions.
The code is broken because it suggests last man standing mode while
actually not implementing it.
As of #4143, players can chose between allied victory or last man
standing mode. They should be able to chose on this map too.

This was SVN commit r18906.
2016-11-04 14:53:57 +00:00
b83168cfbf Revert 9846f374a0 as it doesn't work with the packaged version, refs #4313, because that comes with DDS files instead of PNGs and FileExists does not translate that like the sprite attribute does.
This was SVN commit r18905.
2016-11-04 12:18:11 +00:00
6d81ba0476 Tag persian skirmishers as mercenaries and make their cost consistent with the other mercenary champions. Patch by fatherbushido.
This was SVN commit r18901.
2016-11-01 16:35:56 +00:00
b08113b0bb Fix some weird water colors on some maps (like green on latium) that were revealed by the new water shader in ead8436b3d. Patch by Imarok, reviewed by Stan, fixes #4288.
This was SVN commit r18897.
2016-11-01 09:57:53 +00:00
aad0ef4673 Nerf population bonus of all celtic civs, not only britons, refs 48e5101239, reviewed by fatherbushido.
This was SVN commit r18896.
2016-11-01 09:37:33 +00:00
27e2a33573 Change order of preferred classes for ships attack. Refs #4194.
This was SVN commit r18895.
2016-10-31 19:10:54 +00:00
4c0dbcf51b Nerf mauryan chariot spam by allowing them to be trained only at the fortress. Suggestion by nigel87.
This was SVN commit r18894.
2016-10-31 17:24:10 +00:00
bc9bdc151f Sentry tower icon by Lion.Kanzen, refs #3959.
This was SVN commit r18893.
2016-10-31 16:00:08 +00:00
569424d9f7 Add missing preferred classes to ships. Reviewed by fatherbushido, refs #4194.
This was SVN commit r18892.
2016-10-31 13:59:55 +00:00
48e5101239 Nerf british population bonus for town phase buildings, in agreement with borg and fatherbushido.
This was SVN commit r18891.
2016-10-31 13:56:40 +00:00
0db69d55fb Don't use multilayered textures on Ngorongoro as the blending is broken. Patch by Vladislav, refs #4219.
This was SVN commit r18890.
2016-10-31 13:43:02 +00:00
7dbd225783 Fix mistake in c1774bc4f2.
This was SVN commit r18889.
2016-10-31 13:32:18 +00:00
06d6410ac3 complete 0c8c879ed1 in case the stats of the original and upgraded structures are different
This was SVN commit r18888.
2016-10-30 12:29:26 +00:00
42b42e8d64 Slightly nerf champion cavalry archers by reducing a bit accuracy and pierce damage. Reduce a bit accuracy of basic cavalry archer to keep consistency. Agreed by scythetwirler.
This was SVN commit r18887.
2016-10-29 18:11:06 +00:00
af40768b14 Fixes an oversight in 37e5d6a5af that made random map Latium throw an error. Fixes #4296
This was SVN commit r18886.
2016-10-29 12:53:35 +00:00
02bf76bbdc petra: check that the foundation still exist when builders approach it
This was SVN commit r18884.
2016-10-28 18:08:48 +00:00
0c8c879ed1 petra: take into account possible upgrade in garrison manager
This was SVN commit r18883.
2016-10-28 18:04:52 +00:00
d8665adf42 Random map script cleanup.
Remove many unneeded parenthesis when assigning variables.
Use min and max to avoid ternaries.
Simplify ternaries that return booleans.
Remove == true from checks.

This was SVN commit r18881.
2016-10-28 16:01:02 +00:00
b70af394df Take account of control group when checking if we can upgrade an entity. Fix a call to an unknown function. Style reviewed by elexis, logic overviewed by wraitii. Fix #4285.
This was SVN commit r18878.
2016-10-28 12:17:16 +00:00
a64f3c7597 Fix an oversight in the water shader that made water buggy with disabled reflections. Fixes #4287
This was SVN commit r18877.
2016-10-27 20:19:13 +00:00
37e5d6a5af Array simplifications for random map scripts.
Use for...of loop and remove unneeded array and length variables.
Use fill and concat to remove unneeded loops.
Utilize map to create new arrays instead of reusing the same inside
fill.
Remove an unneeded non-recursive copy in the RandomGroup placer.

This was SVN commit r18876.
2016-10-27 16:32:24 +00:00
1234227f98 Simple random map script cleanups.
Merge else and if.
Remove else after continue/return.
Use ternaries and remove duplicate terms.

This was SVN commit r18875.
2016-10-27 12:47:17 +00:00
720183b127 Fix broken whitespace in cycladic archipelago.
Merge two if-statements in latium.

This was SVN commit r18874.
2016-10-27 12:39:42 +00:00
c1774bc4f2 Trivial random map script cleanup.
Remove duplicate comments and add more progress updates.
Few whitespace fixes and ternaries.

This was SVN commit r18873.
2016-10-27 12:27:47 +00:00
f92279bbef Remove unused clWater and clRiver tile class from maps that don't have water nor rivers.
Remove pointless restraint checks on clWater on oasis before the water
is painted.

This was SVN commit r18872.
2016-10-27 12:20:54 +00:00
7523355699 Fix fish placement on cantabrian highlands and fortress, as these maps failed to pass the restrictions as an array.
Remove duplicate fish placement from english channel.
Allow placing docks on neareastern badlands to gather the placed fish by
increasing the waterheight from the default 19.9 to 20.

This was SVN commit r18871.
2016-10-27 12:13:05 +00:00
700ec18723 Don't place fish on land on the random map archipelago, fixes #3746.
This was SVN commit r18870.
2016-10-27 12:05:55 +00:00
143b0a7bd1 Prevent resource collisions on the random map latium and spread mines a bit.
This was SVN commit r18869.
2016-10-27 12:04:57 +00:00
7854c7cc36 Allow non-forest resources to be placed in the middle strip of the latium random map (by only marking the actual cliffs as such instead of everything on that strip).
This was SVN commit r18868.
2016-10-27 11:59:04 +00:00
58a8380dd9 Don't move that string to another transifex resource while in string freeze.
This was SVN commit r18866.
2016-10-26 23:23:37 +00:00
f37faa57e3 Add missing translate call to the upgrade tooltip and fix a newline removed by b5340a19ad which was only needed by the resource tooltip. Reported by fatherbushido.
Merge duplicate technology requirement tooltips.

This was SVN commit r18865.
2016-10-26 23:19:19 +00:00
f74639e7d9 add some missing semicolon
This was SVN commit r18864.
2016-10-24 18:00:14 +00:00
3bbadc33ab petra: do not try to defend an ally cc if attacked before its construction began
This was SVN commit r18863.
2016-10-24 17:58:59 +00:00
d90e5af9c5 Random map script cleanup.
Annotate and move the envrionment defaults to the file that contains the
methods to change them.
Remove redundant watercolor entry and add default water tint to a map
that didn't specify it.
Add a comment about the default waterheight pitfall (4391498cf4).
Add missing quotes and spaces, remove unneeded comments.

This was SVN commit r18862.
2016-10-24 12:53:23 +00:00
85d357e182 Notify players of who used the reveal map developer cheat.
This was SVN commit r18861.
2016-10-23 21:36:07 +00:00
6b983bbf06 Change the perspective to "observer" to reveal the map to observers who watched a player resign, while keeping the choice to see the old territory from d5b85c7ffc.
This was SVN commit r18860.
2016-10-23 16:21:33 +00:00
072cbbe26b Delay the exit message box in multiplayer games until after the synchronization is finished, to avoid stacking message boxes.
This was SVN commit r18857.
2016-10-23 14:49:32 +00:00
6056ebb64f Fix png encoding
This was SVN commit r18856.
2016-10-23 13:58:30 +00:00
8d1ece4060 New icon for the Persian Ishtar Gate, made by Lion.Kanzen. Refs #3959
This was SVN commit r18855.
2016-10-23 13:48:28 +00:00
d6eabc9f0a Remove the number of players recommendation per mapsize as it's plain wrong, refs #4141.
This was SVN commit r18854.
2016-10-23 12:57:57 +00:00
e0ac50778e Tweak elevation bonus of sentry tower to match his height. Add elevation bonus to attack tooltip (it was missing in structure tree and selection panel). Reviewed by elexis.
This was SVN commit r18853.
2016-10-23 12:25:55 +00:00
37f8441703 Add missing mime types to the templates added after d883fc332d and remove the UTF-8 byte order mark from the seleucid military colony introduced in edc1b2c066.
This was SVN commit r18852.
2016-10-21 13:53:21 +00:00
dc8c359847 Rename pers_palace.xml since that template contains the currently unused palace while the Apadana is the palace found in the game.
This was SVN commit r18851.
2016-10-21 13:42:58 +00:00
f42a6d391a Tweak elephant hero stats. There were some inconsistencies with champion elephant template. Remove some hard bonuses forgotten in previous balancing commits. Reviewed by elexis.
This was SVN commit r18850.
2016-10-21 13:07:17 +00:00
57c546d1c1 Increase the number of units to garrison for some special buildings, reviewed by fatherbushido:
from 5 to 10 for champion buildings and persian palaces,
from 0 to 6 for embassies,
from 0 to 5 dogs for the kennel
while keeping the garrison limit of the seven other special buildings at
5.

This was SVN commit r18849.
2016-10-21 12:06:26 +00:00
20ea96e784 Reset the rallypoint when capturing that building or unit, since the rallypoint command is only meaningful to the player that issued it. Reviewed by fatherbushido.
This was SVN commit r18848.
2016-10-21 11:34:20 +00:00
7d3639a0f6 Add the least amount of code to fix the disappearance of the phase requirements tooltip after f4bfe7c3ad and mark the incomplete implementation from b8245da606 as TODO, to be solved by refs #3993. Patch by fatherbushido.
This was SVN commit r18847.
2016-10-21 11:30:25 +00:00
f4a5a665dd Reduce the maximum crush damage of siege towers (25 / second) by half and increase pierce damage. Reviewed by fatherbushido.
This was SVN commit r18846.
2016-10-21 10:12:20 +00:00
d5b85c7ffc See the explored territory of defeated players in observermode.
This was SVN commit r18845.
2016-10-20 16:31:52 +00:00
7b37ed8c05 Adds melee visible classes to war dog, so it's affected by military selection filter and some upgrades. Noticed by elexis.
This was SVN commit r18844.
2016-10-20 10:12:22 +00:00
fcc99da9e6 Slightly increase the size of the locale configuration dialog and its GUI elements to fit the longest translations. Patch by Imarok, fixes #2925.
This was SVN commit r18843.
2016-10-19 13:32:10 +00:00
11dc6df143 Fix a gamesetup bug where the clients would see two players with the same color, while the host already sees the corrected version after increasing the number of players.
This was SVN commit r18842.
2016-10-18 18:53:28 +00:00
d1f4a6ab40 Give the Sentry Tower some territory influence. Reviewed by fatherbushido.
This was SVN commit r18841.
2016-10-18 16:42:27 +00:00
15dd804112 Remove trailing whitespace of all map scripts (as in all whitespace that doesn't come before any non-whitespace character on the same line).
This was SVN commit r18840.
2016-10-18 13:08:01 +00:00
f24fd75577 Add missing semicolons found with jshint to all map scripts.
This was SVN commit r18839.
2016-10-18 12:52:00 +00:00
31b9481c08 Tweak obstruction size of the stonehenge wonder. It seems it was not updated when the model changed. Reviewed by elexis. Fixes #3861.
This was SVN commit r18837.
2016-10-17 09:59:05 +00:00
f7ddad6455 Use native lineendings.
This was SVN commit r18836.
2016-10-16 21:21:45 +00:00
c24831387a Initialize UnitAI component of initial garrisoned units, fixes #4281
This was SVN commit r18832.
2016-10-13 17:38:13 +00:00
c5e87628fb Remove the unneeded hardcoding of the Alt+F4 hotkey which causes 0AD on linux to exit unintentionally after receiving the window focus from another window which was closed with that hotkey (with multiple tiling window managers). Reviewed by Philip, tested by Imarok and Itms, fixes #4272.
The hotkey introduced in 5135bcb899 was likely a workaround for the
custom windows SDL (wsdl) implementation which is no longer in use.

This was SVN commit r18830.
2016-10-11 15:48:02 +00:00
f80ffc20fd Fix 4edff555a3: damage only one unit when the main target is missed by a projectile and others units are reached, to be coherent when the main target is hit. Commented by leper. Refs #4276.
This was SVN commit r18829.
2016-10-11 06:03:10 +00:00
4edff555a3 Fix an issue with ranged attack: wrong units were damaged. Refs #4276. Commented by leper and Itms.
This was SVN commit r18828.
2016-10-10 18:59:59 +00:00
fbadd0995d Fix an issue with splash damage. The ranged attack strengths were parsed instead of the splash strengths. Refs #4276.
This was SVN commit r18827.
2016-10-10 18:49:57 +00:00
106e4bddbf petra: check that we are dealing with a foundation before trying to provide it with builders, fixes #4271
This was SVN commit r18826.
2016-10-10 16:41:31 +00:00
9512eb7cd2 Optimizes random map Caledonian Meadows: Broadened paths, much faster generation, added progress indicators, larger bases. Reviewed by Itms. Fixes #4275
This was SVN commit r18819.
2016-10-09 21:03:14 +00:00
ba2bb82406 Remove friendly fire for splash damage of quinquremes to make it coherent with catapults. Decided in dev meeting.
This was SVN commit r18818.
2016-10-09 19:50:34 +00:00
2029a3f763 Fix missing maxArrowCount in the GUIInterface causing a wrong projectile tooltip in the session. Reviewed by fatherbushido, refs #3816.
Also unify the garrison limit property names in GUIInterface and
Template parsing (thereby also distinguishing a garrison limit of 0 and
undefined in that equation).

This was SVN commit r18817.
2016-10-09 15:53:23 +00:00
5f1736cbd4 Don't place chicken inside civic centers and unify chicken placement code. Reviewed by FeXoR, fixes #3836.
This was SVN commit r18816.
2016-10-09 15:07:48 +00:00
1f8c75db08 Don't break string freeze.
This was SVN commit r18815.
2016-10-08 18:05:37 +00:00
5e88ae118a Let the "will to fight" upgrade also boost siege engine and ship attack damage. Patch by fatherbushido.
This was SVN commit r18814.
2016-10-08 16:26:13 +00:00
bb0924bb6c Fix computational errors in Damage.js for testing collision of a point with the square or the cirle footprint of an entity. Logic reviewed by Itms, style reviewed by elexis.
This was SVN commit r18811.
2016-10-07 20:36:24 +00:00
a5b399de29 Fix two issues related to splash damage: fix a mismatch between the string false and the false boolean, fix an issue with an omitted array of players. Noticed by Mate-86. Patch by leper. Refs #3610, #1910, c4c315f6a0.
This was SVN commit r18810.
2016-10-07 20:29:56 +00:00
3c72c16d6c Add a missing check for undefined resource costs when picking the unit portrait in observermode. Patch by Imarok, fixes #4269.
This was SVN commit r18809.
2016-10-07 17:57:03 +00:00
bb438eca09 Removes useless divsions in Damage. Read by elexis.
This was SVN commit r18808.
2016-10-07 10:05:38 +00:00
35945eff53 Revert the persistance of playersettings for skirmish maps in b642f0d876, because it overwrites potential team numbers suggested by the map. Tested by mimo, fixes #4248, refs #3120.
Keep the code simplification and removal of duplicate code.

This was SVN commit r18806.
2016-10-06 15:13:30 +00:00
f450ba1398 Use the default AI instead of not assigning one when the map doesn't specify it (c1b5e8c8b7 broke that). Tested by mimo, refs #4248.
This was SVN commit r18805.
2016-10-06 15:03:40 +00:00
d7e51f2a4f Fix an OOS without rejoin after selecting the first unit.
Introduced by 46ead523b8, caused by serializing the aura cache which is
initialized by the tooltip calls from the GUI.
Reviewed by Itms, in combination with 09e775446e fixes #4239.

This was SVN commit r18804.
2016-10-06 14:11:56 +00:00
46bfa4dbe3 Fix a warning when pressing the delete hotkey when nothing is selected introduced by a754b1bad4, refs #3823.
This was SVN commit r18803.
2016-10-05 21:34:22 +00:00
c99281be39 Nerf iberian tower by reducing garrison limit from 10 to 8. Reviewed by fatherbushido.
This was SVN commit r18802.
2016-10-05 17:15:58 +00:00
c139b24a6b Fixes the peak and final map control to be swapped that where added in 4e4f0dbbd8. Patch by pilino1234 - added to the credits. Reviewed by Imarok. Fixes #4262
This was SVN commit r18798.
2016-10-01 16:16:18 +00:00
b74b807444 Fixes a counter mistake when an upgrade is complete. Reviewed by elexis. Refs #4255, #2706.
This was SVN commit r18796.
2016-10-01 11:27:08 +00:00
902a0f5914 New icon for the Persian Hall made by Lion.Kanzen
This was SVN commit r18795.
2016-09-30 19:53:56 +00:00
c1b28ba1e0 Fix some strings reported by translators.
This was SVN commit r18793.
2016-09-29 20:54:13 +00:00
fd8d918764 Reveal the name of the new Alpha.
This was SVN commit r18792.
2016-09-29 19:54:51 +00:00
e81b557d9b Don't refund the upgrade costs when the upgrade completes. Patch by fatherbushido, fixes #4255, refs #2706.
This was SVN commit r18791.
2016-09-29 12:01:34 +00:00
9cea2bb8fe Fix paired techs following a754b1bad4. Patch by Imarok, fixes #4251, refs #3823.
This was SVN commit r18790.
2016-09-29 10:25:48 +00:00
5bbed34aaf Disable upgrade for the gaia palisades rock fort template. The bugs was noticed by elexis in gauls sandbox map. Refs #4125, 5d4604e767.
This was SVN commit r18789.
2016-09-28 15:38:05 +00:00
a29407bb89 Don't overwrite cached template data by by cloning the referenced object, thus fix a GUI bug revealed by refs #3823. Patch by Imarok, refs #4251.
This was SVN commit r18788.
2016-09-28 11:52:25 +00:00
46ece38e29 Display the correct cost when selecting multiple entities that can perform the same upgrade. Patch by Imarok, refs #2706, #3823.
This was SVN commit r18787.
2016-09-28 11:34:05 +00:00
7c3c5f6173 Fix some string issues reported on transifex.
This was SVN commit r18786.
2016-09-27 18:29:32 +00:00
e4ceff3e54 Add 2px of black border to the patrol icon. Icon by Stan, refs #1720.
This was SVN commit r18785.
2016-09-26 14:57:50 +00:00
a29f18968a Fix broken string as noticed by fatherbushido, refs #1720.
This was SVN commit r18784.
2016-09-26 12:13:08 +00:00
2e488571de Fix some whitespace and remove unneeded parenthesis and brackets in the RallyPointCommands simulation helper.
This was SVN commit r18783.
2016-09-26 10:25:47 +00:00
8d4af29faf Adding random map Caledonian Meadows. Fixes #4245
This was SVN commit r18781.
2016-09-25 21:53:39 +00:00
bd9240a3ef Siege statistics for the summary screen. Patch by Mate-86, fixes #4033.
This was SVN commit r18780.
2016-09-25 21:45:21 +00:00
a85c6c6967 Patrol units. Patch by Imarok, based on patch by svott, reviewed by fatherbushido and bb.
This was SVN commit r18779.
2016-09-25 21:33:05 +00:00
51b7b80de2 Removes old depreciated technologies from production queue of atlas only (or skirmish map) structures. Refs #4170.
This was SVN commit r18778.
2016-09-25 21:27:08 +00:00
4ea54e10e7 Slightly increases armour of mauryans macemen champions wich had been signifantly nerfed in previous alphas. Agreed by scythetwirler.
This was SVN commit r18777.
2016-09-25 21:12:16 +00:00
24f149237f Show bartered resources to observers, fixes #3839.
This was SVN commit r18776.
2016-09-25 20:26:25 +00:00
92a1ba9426 Filterable ingame chat history. Based on patch by Imarok, reviewed by bb, fixes #4069.
Rename session chatPanel style to chatPanelOverlay and merge other
chatPanel styles in common/.
Fix a singleplayer bug where messages send by the player wouldn't be
shown in the chat overlay due to a missing guid != "local" check.
Save the user preference whether to show the history to the user config
file.
Remove /enemy /ally and /observer aliases for simplicity.

This was SVN commit r18775.
2016-09-25 20:10:38 +00:00
6e3cdb2f5d Use a custom style for the text in the Diplomacy manager instead of abusing the ChatPanel style, refs #4069.
This was SVN commit r18774.
2016-09-25 19:56:35 +00:00
a754b1bad4 Correctly handle commands and production for multiple units and mixed selections. Patch by Imarok, reviewed by Itms, fixes #3823. Fixes #3492, #3288, #3668.
This was SVN commit r18773.
2016-09-25 19:38:10 +00:00
a867fca514 Petra AI: Use ally instead of team chat, since it should eventually be able to use diplomacy. Based on patch by bb, refs #4143, #3102, #4069.
This was SVN commit r18772.
2016-09-25 14:00:26 +00:00
905dffe89c Show an icon with tooltip in the summary screen indicating which player was defeated, has won or is still playing. Patch by javiergodas, reviewed by niektb, fixes #4187.
This was SVN commit r18771.
2016-09-25 13:48:59 +00:00
83ac228a9c Reduces attack of garrisoned arrows in buildings by 20%, since champions were nerfed in b5bf0c7e86 and while buildings became much harder to capture in 27c46a0a68 and 8b14bfe78b. Removes a duplicate entry. Reviewed by elexis and FeXoR.
This was SVN commit r18770.
2016-09-25 13:47:50 +00:00
58f7e9d5fb Patrol icon by Stan, refs #1720.
This was SVN commit r18769.
2016-09-25 13:33:47 +00:00
19de6a4204 Add minimum distance to outposts since players made walls of them and since they shoot an arrow each when garrisoned.
Since vision range is 80m (120m upgraded), a minimum distance of 50m
should be more than fine enough for the intended purpose.

This was SVN commit r18768.
2016-09-25 11:20:26 +00:00
4f50f9251f Reverts 591771a0be as capture doesn't work for units with BuildingAI. Refs #3356, #4189, #4000.
This was SVN commit r18766.
2016-09-25 10:07:12 +00:00
903460994d Adds missing preferred classes in some templates. Fixes #4194.
This was SVN commit r18765.
2016-09-25 06:54:56 +00:00
af40d51068 Add gamesetup filter for new maps, fixes #4246.
Don't complain if there are no maps of the selected maptype for the
current mapfilter.

This was SVN commit r18764.
2016-09-24 21:30:20 +00:00
9bce5324b1 Order the carried resources as usual. Patch by Imarok, refs #3113.
This was SVN commit r18763.
2016-09-24 21:12:47 +00:00
edc1b2c066 its a biggie, finishing up the seleucids, new wood towers and some gaul roof and fortress stuff. I dont care much for mass late uploads like this, everything works on my end
This was SVN commit r18758.
2016-09-24 14:52:55 +00:00
fd8f689f35 Whitespace and indentation fix for readme.txt
This was SVN commit r18756.
2016-09-24 10:37:21 +00:00
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
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