1
0
forked from mirrors/0ad

16562 Commits

Author SHA1 Message Date
elexis 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.
a21
2016-11-06 03:11:04 +00:00
elexis 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
elexis 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
elexis 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
elexis 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
elexis 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
elexis 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
LordGood 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
elexis 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
elexis 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
elexis 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
elexis 661cb8c932 Add URLs and keywords for the software search in the gnome software center and it's derivates used by many linux flavors, fixes #3734.
Add a menu entry for atlas.
Add some translations for the product description provided by native
speaking players and contributors.

This was SVN commit r18904.
2016-11-01 18:07:21 +00:00
elexis 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
Itms aba2e53714 Update the list of bundled languages for A21.
This was SVN commit r18900.
2016-11-01 16:33:33 +00:00
elexis 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
elexis 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
fatherbushido 27e2a33573 Change order of preferred classes for ships attack. Refs #4194.
This was SVN commit r18895.
2016-10-31 19:10:54 +00:00
elexis 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
elexis bc9bdc151f Sentry tower icon by Lion.Kanzen, refs #3959.
This was SVN commit r18893.
2016-10-31 16:00:08 +00:00
elexis 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
elexis 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
elexis 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
elexis 7dbd225783 Fix mistake in c1774bc4f2.
This was SVN commit r18889.
2016-10-31 13:32:18 +00:00
mimo 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
fatherbushido 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
FeXoR 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
elexis f15f49c93b Add Open Age Ratings Service metadata to the appdata file, allowing the Gnome Software Center to show an accurate age rating depending on the country of the user. Patch by Jeru, reviewed by feneur, refs #3734.
This was SVN commit r18885.
2016-10-28 18:10:57 +00:00
mimo 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
mimo 0c8c879ed1 petra: take into account possible upgrade in garrison manager
This was SVN commit r18883.
2016-10-28 18:04:52 +00:00
elexis 4898e94c81 Remove unneeded braces and whitespace in empty lines.
This was SVN commit r18882.
2016-10-28 16:11:59 +00:00
elexis 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
elexis 5a384f4eaf Fix an OOS on rejoin when a ptolemian lighthouse revealing the shoreline was built prior. Patch by Itms and wraitii, fixes #4277.
Serialize the mapsize in the pathfinder and the reveal shoreline flag in
the range manager.
Reload the rangemanager data after other components have been
deserialized.
Use the SerializeCommon pattern in the pathfinder to avoid code
duplication.
Move the shoreline logic from the Vision component to the range manager.
Remove unused interface mocks from the rangemanager test following
b05879e151.

This was SVN commit r18879.
2016-10-28 15:34:24 +00:00
fatherbushido 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
wraitii 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
elexis 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
elexis 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
elexis 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
elexis 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
elexis 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
elexis 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
elexis 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
elexis 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
elexis 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
elexis 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
elexis 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
mimo f74639e7d9 add some missing semicolon
This was SVN commit r18864.
2016-10-24 18:00:14 +00:00
mimo 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
elexis 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
elexis 85d357e182 Notify players of who used the reveal map developer cheat.
This was SVN commit r18861.
2016-10-23 21:36:07 +00:00
elexis 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