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
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
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
aba2e53714
Update the list of bundled languages for A21.
...
This was SVN commit r18900.
2016-11-01 16:33:33 +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
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
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
4898e94c81
Remove unneeded braces and whitespace in empty lines.
...
This was SVN commit r18882.
2016-10-28 16:11:59 +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
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
2016-10-28 15:34:24 +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
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
44f0929ea6
Don't throw FSM update errors (type=16 state=6) when kicking clients while others haven't finished the authentication, loading screen or synchronization yet, refs #3241 .
...
This was SVN commit r18859.
2016-10-23 15:44:02 +00:00
20399b72f1
Fix a bug where the networked game would never start if a client would disconnect while synchronizing, fixes #4289 .
...
This was SVN commit r18858.
2016-10-23 15:13:16 +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
7f8f820e35
Fix an oversight in d8c11434a8/18823, fixes #4270 .
...
This was SVN commit r18835.
2016-10-16 20:17:31 +00:00
0991c22026
Take vision range techs into account on ownership change (capturing or defeat). Solves an OOS, reviewed by wraitii, fixes #4279 , refs #3989 .
...
This was SVN commit r18833.
2016-10-15 18:22:10 +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
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
9c2404e40e
Some tweaks in order to fix the non-graphical test modes (serialization test, etc.), and possible future non-visual players like headless game servers.
...
The internal data of the component, which is serialized, should not
depend on the presence of a visual Unit.
Also remove a misleading comment about a simple initialization code.
Refs #4270
This was SVN commit r18824.
2016-10-10 10:56:13 +00:00
ef7486c5d3
Fix a number of things in cmpVisualActor:
...
* Rewrite the Update function, add more details and information in
comments, and properly serialize everything that function needs.
* Fix the broken deserialization code by using a sane helper function.
* Fix the `SelectMovementAnimation` function.
Fixes #4270 .
This was SVN commit r18823.
2016-10-10 10:49:49 +00:00
d8c11434a8
Save the animation sync offset, for consistency's sake.
...
Refs #4270
This was SVN commit r18822.
2016-10-10 10:41:36 +00:00
79b37bd4dc
Improve style and whitespace in CCmpVisualActor.
...
Refs #4270
This was SVN commit r18821.
2016-10-10 10:37:58 +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
0030f6ad2b
In CCmpVisualActor, m_Unit is not initialized when running without graphics, so we must check that pointer everytime. Also make one call consistent with the rest of the file.
...
Fixes #4238 , refs #3952
This was SVN commit r18812.
2016-10-08 08:49:35 +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 46ead523b809e775446efixes #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
636da605bb
Following e757fb84d5: also regenerate the JS values for AI maps upon deserialization.
...
Fixes #4247 , refs #4191
This was SVN commit r18797.
2016-10-01 12:29:44 +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
58704fa140
Remove a function relying on systems that are not optimized at all. This function is not actually used by Petra.
...
If it is needed at some point, this map should be handled and updated
the same way as the passability map and territory map are.
Refs #4191
This was SVN commit r18760.
2016-09-24 15:21:20 +00:00
e757fb84d5
More clever map updates for the AI.
...
This patch fixes frequent memory issues by removing several dummy
allocations and a lot of memory footwork.
Fixes #4191
This was SVN commit r18759.
2016-09-24 15:16:55 +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
172c222e9b
Fix a possible source of segmentation fault in our custom version of ObjectIdCache.
...
Patch by echotangoecho, refs #4053
This was SVN commit r18757.
2016-09-24 13:48:11 +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
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 d38adc7cd08a2638a8f5
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
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
e0c30745f9
Template manager cleanup. Patch by leper, refs #2951 .
...
Move an early return to the top of the function.
Add an early return in case an error was determined.
Remove unneeded variables ok and templatePath.
Replace includeSubdirectories boolean with a flags int to merge
duplicate vfs::ForEachFile calls.
This was SVN commit r18696.
2016-09-04 15:28:36 +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
c2078bd0c6
Supress an error warning that isn't valid for unsortable ordered lists and hide sorting sprites if sorting is disabled. Based on patch by Imarok, refs #3905 .
...
This was SVN commit r18694.
2016-09-03 22:22:11 +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
8284cc4302
SpiderMonkey 38 upgrade: 35/35
...
Some comments for the next SpiderMonkey upgrade. That's all folks, fixes
#3708
This was SVN commit r18689.
2016-09-02 16:55:13 +00:00
2a33c4476f
SpiderMonkey 38 upgrade: 34/35
...
Use the C++ API for Maps. Patch by leper.
Addresses https://bugzilla.mozilla.org/show_bug.cgi?id=1121332
This was SVN commit r18688.
2016-09-02 16:54:00 +00:00
0cc23c1964
SpiderMonkey 38 upgrade: 33/35
...
Remove a workaround. Note that this removal is incomplete. Based on
patch by leper.
This was SVN commit r18687.
2016-09-02 16:53:22 +00:00
9b794593db
SpiderMonkey 38 upgrade: 32/35
...
JS_GetStringCharsAndLength was removed, use
JS_Get{Latin1,TwoByte}StringCharsAndLength instead.
Actually handle strings in both the Latin1 and TwoByte cases since we
need to.
This saves some space when serializing and also when running as they are
stored that way in the vm.
Also handle the error case.
Patch by leper.
For more information:
https://blog.mozilla.org/javascript/2014/07/21/slimmer-and-faster-javascript-strings-in-firefox/
Addresses https://bugzilla.mozilla.org/show_bug.cgi?id=1037869
This was SVN commit r18686.
2016-09-02 16:51:09 +00:00
72ec5d9767
SpiderMonkey 38 upgrade: 31/35
...
Remove workaround for crash when using multiple ctxts per runtime, this
was fixed upstream. Patch by leper.
Addresses https://bugzilla.mozilla.org/show_bug.cgi?id=890243 and
https://bugzilla.mozilla.org/show_bug.cgi?id=905926
This was SVN commit r18685.
2016-09-02 16:50:07 +00:00
f06eb5536b
SpiderMonkey 38 upgrade: 30/35
...
Upstream added a compartment option to preserve JIT code during
non-shrinking GCs, so use it. Patch by leper.
Addresses https://bugzilla.mozilla.org/show_bug.cgi?id=1068697
This was SVN commit r18684.
2016-09-02 16:48:41 +00:00
27c434e2bd
SpiderMonkey 38 upgrade: 29/35
...
We now have better error messages, so fix the tests to account for that.
Patch by leper.
This was SVN commit r18683.
2016-09-02 16:47:33 +00:00
fe52bf0457
SpiderMonkey 38 upgrade: 28/35
...
The GC API changed to have explicit start and step methods, and the
start/shrink cases now take the gc kind as a parameter. Patch by leper.
Addresses https://bugzilla.mozilla.org/show_bug.cgi?id=1099152
This was SVN commit r18682.
2016-09-02 16:46:39 +00:00
80c8c2c3d6
SpiderMonkey 38 upgrade: 27/35
...
JS_NewRuntime had the useHelperThreads param removed and a
maxNurseryBytes param added. Patch by leper.
Addresses https://bugzilla.mozilla.org/show_bug.cgi?id=941805 and
https://bugzilla.mozilla.org/show_bug.cgi?id=1034621
This was SVN commit r18681.
2016-09-02 16:45:45 +00:00
58cace1156
SpiderMonkey 38 upgrade: 26/35
...
JS_Define{,UC}Property{,ById} has the attrs parameter moved in front of
the getter and setter params. Patch by leper.
Addresses https://bugzilla.mozilla.org/show_bug.cgi?id=959787
https://bugzilla.mozilla.org/show_bug.cgi?id=1088002 and
https://bugzilla.mozilla.org/show_bug.cgi?id=1211607
This was SVN commit r18680.
2016-09-02 16:44:33 +00:00
99534a15f1
SpiderMonkey 38 upgrade: 25/35
...
Remove the proto parameter from JS_DefineObject. Patch by leper.
Addresses https://bugzilla.mozilla.org/show_bug.cgi?id=1127494
This was SVN commit r18679.
2016-09-02 16:41:36 +00:00
ffd4207c30
SpiderMonkey 38 upgrade: 24/35
...
Work around upstream API breakage by moving from a define to a const
member and not using the namespace explicitly.
This is caused by https://bugzilla.mozilla.org/show_bug.cgi?id=896116
and this patch by leper was submitted at
https://bugzilla.mozilla.org/show_bug.cgi?id=1236373
This was SVN commit r18678.
2016-09-02 16:40:01 +00:00
ef6d1c77c8
SpiderMonkey 38 upgrade: 23/35
...
JS_GetArrayBufferData now takes an AutoCheckCannotGC parameter. Patch by
leper.
Addresses https://bugzilla.mozilla.org/show_bug.cgi?id=1061288
This was SVN commit r18677.
2016-09-02 16:38:31 +00:00
c396155ad8
SpiderMonkey 38 upgrade: 22/35
...
Parallel compilation was renamed to Offthread compilation. Patch by
leper.
Addresses https://bugzilla.mozilla.org/show_bug.cgi?id=1020364
This was SVN commit r18676.
2016-09-02 16:37:35 +00:00
2db0fb27ae
SpiderMonkey 38 upgrade: 21/35
...
The naming conventions for typed array types changed. Patch by leper.
Addresses https://bugzilla.mozilla.org/show_bug.cgi?id=1021790
This was SVN commit r18675.
2016-09-02 16:36:40 +00:00
f77441fb10
SpiderMonkey 38 upgrade: 20/35
...
Some options have been moved from ctxt to runtime. Patch by leper.
This was SVN commit r18674.
2016-09-02 16:35:58 +00:00
8f7ba9acf8
SpiderMonkey 38 upgrade: 18/35
...
JS_SetErrorReporter now takes a JSRuntime instead of a JSContext. Patch
by leper.
Addresses https://bugzilla.mozilla.org/show_bug.cgi?id=981198
This was SVN commit r18673.
2016-09-02 16:35:03 +00:00
2aa75a05d4
SpiderMonkey 38 upgrade: 18/35
...
Renamed JS_Compile{,UC}Function to JS::CompileFunction. Patch by leper.
Addresses https://bugzilla.mozilla.org/show_bug.cgi?id=1089026
This was SVN commit r18672.
2016-09-02 16:34:02 +00:00
8747b1c098
SpiderMonkey 38 upgrade: 17/35
...
JS_GetUint*Array now takes an AutoCheckCannotGC parameter. Based on
patch by leper.
Addresses https://bugzilla.mozilla.org/show_bug.cgi?id=1061288
This was SVN commit r18671.
2016-09-02 16:33:10 +00:00
c06eda0209
SpiderMonkey 38 upgrade: 16/35
...
JS_GetTypeName was removed from the API, but we asked upstream to add it
back (https://bugzilla.mozilla.org/show_bug.cgi?id=1037718 ).
This was SVN commit r18670.
2016-09-02 16:32:26 +00:00
ef764d5d64
SpiderMonkey 38 upgrade: 15/35
...
Temporary workaround dropping of parent parameter from JS_NewObject* by
switching to JS_NewObjectWithGivenProto.
We should just drop support for serializing the parent since upstream is
dropping the parent parameter from all those functions.
Patch by leper.
Addresses https://bugzilla.mozilla.org/show_bug.cgi?id=1136906 and
https://bugzilla.mozilla.org/show_bug.cgi?id=1136345
This was SVN commit r18669.
2016-09-02 16:30:35 +00:00
c3710c9632
SpiderMonkey 38 upgrade: 14/35
...
JS_NewObject has no parent or proto arg anymore, use
JS_NewObjectWithGivenProto instead. Patch by leper.
Addresses https://bugzilla.mozilla.org/show_bug.cgi?id=1136906
https://bugzilla.mozilla.org/show_bug.cgi?id=1127443 and
https://bugzilla.mozilla.org/show_bug.cgi?id=1136345
This was SVN commit r18668.
2016-09-02 16:29:21 +00:00
8d15411abf
SpiderMonkey 38 upgrade: 13/35
...
Update JS_NewObject to JS_NewPlainObject, with new parameters. Patch by
leper.
Addresses https://bugzilla.mozilla.org/show_bug.cgi?id=1136906 and
https://bugzilla.mozilla.org/show_bug.cgi?id=1125356
This was SVN commit r18667.
2016-09-02 16:28:17 +00:00
c99ae7ca1c
SpiderMonkey 38 upgrade: 12/35
...
Major update to the JSClass stubs. Based on patch by leper.
https://bugzilla.mozilla.org/show_bug.cgi?id=1103152
This was SVN commit r18666.
2016-09-02 16:26:54 +00:00
b01300c222
SpiderMonkey 38 upgrade: 11/35
...
Renamed JS_CallHeapFooTracer to JS_CallFooTracer. Patch by leper.
Addresses https://bugzilla.mozilla.org/show_bug.cgi?id=1052388
This was SVN commit r18665.
2016-09-02 16:25:42 +00:00
761abd587e
SpiderMonkey 38 upgrade: 10/35
...
Use operator= instead of .set(). Patch by leper.
Addresses https://bugzilla.mozilla.org/show_bug.cgi?id=1128110
This was SVN commit r18664.
2016-09-02 16:24:46 +00:00
c7c3ef9f92
SpiderMonkey 38 upgrade: 09/35
...
Use .toFoo() instead of JSVAL_TO_FOO. Patch by leper.
Addresses https://bugzilla.mozilla.org/show_bug.cgi?id=952650
This was SVN commit r18663.
2016-09-02 16:23:44 +00:00
1223efcef8
SpiderMonkey 38 upgrade: 08/35
...
Update ObjectToIDMap to the ESR38 version and use the unbarriered
tracers. Patch by leper.
Addresses https://bugzilla.mozilla.org/show_bug.cgi?id=1052388
This was SVN commit r18662.
2016-09-02 16:22:42 +00:00
548601b2d8
SpiderMonkey 38 upgrade: 07/35
...
Use operator[] instead of handleAt. Patch by leper.
Addresses https://bugzilla.mozilla.org/show_bug.cgi?id=972385
This was SVN commit r18661.
2016-09-02 16:21:03 +00:00
4b028508ae
SpiderMonkey 38 upgrade: 06/35
...
Check for the new SpiderMonkey version.
This was SVN commit r18660.
2016-09-02 16:19:31 +00:00
ca80797dcc
SpiderMonkey 38 upgrade: 05/35
...
Update premake scripts.
This was SVN commit r18659.
2016-09-02 16:18:57 +00:00
7e6a960e83
SpiderMonkey 38 upgrade: 02/35
...
Update files for building SpiderMonkey.
Add a script for starting the tracelogger, as well as some instructions,
to be detailed in the wiki.
This was SVN commit r18656.
2016-09-02 16:14:11 +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
014a6d621b
Keep mounting the cache directory in tests. Fixes oversight in 493990f472.
...
This was SVN commit r18623.
2016-08-22 01:00:23 +00:00
e4c527d5c5
Fix indentation.
...
This was SVN commit r18622.
2016-08-21 20:35:13 +00:00
4ed7d6c202
Fix compilation failure.
...
This was SVN commit r18621.
2016-08-21 20:35:10 +00:00
9998592542
Remove unused variable.
...
This was SVN commit r18620.
2016-08-21 20:35:08 +00:00
e7df8edc7d
Mark method const.
...
This was SVN commit r18619.
2016-08-21 20:35:06 +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
3a2b418c0e
Fixes off-by-one error.
...
This was SVN commit r18612.
2016-08-17 00:30:57 +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
27f2b2e04d
Guess who hasn't used SVN in a while...actually svn add the new file.
...
This was SVN commit r18610.
2016-08-16 03:38:56 +00:00
5e643ba6be
Splits lobby bot into a ratings bot and a main bot. Fixes #3022 .
...
This was SVN commit r18609.
2016-08-16 03:35:53 +00:00
b9a6d2af16
Use the debugger output on Windows for invalid parameter tests (see bd9bc6db78).
...
This way, the test output is not polluted by the error messages when
running in debug mode.
This was SVN commit r18608.
2016-08-15 12:15:19 +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
b21e7982434e5c5e2d8f
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
bb1f86f515
Remove duplication of the Hexify function.
...
Remove the useless extern keyword from function declarations in
ps/Util.h.
Patch by echotangoecho, refs #4095
This was SVN commit r18591.
2016-08-08 12:50:39 +00:00
e3cdb2253d
Fix calls to CXeromyces::Terminate in the main loop to fix several possible memory leaks.
...
Make init/shutdown order consistent in some places.
This was SVN commit r18589.
2016-08-08 08:32:57 +00:00
162535c7b7
Tiny whitespace cleanup.
...
This was SVN commit r18587.
2016-08-07 17:44:27 +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
9e4f0cc543
Properly shut down SpiderMonkey using JS_ShutDown.
...
This also adds some validation to ensure the correct order of JS_Init,
JS_NewRuntime, JS_DestroyRuntime and JS_ShutDown calls.
Refs #3708
This was SVN commit r18584.
2016-08-06 15:41:59 +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
72ca6c5f80
Style cleanup by leper, preparing the SpiderMonkey update. Refs #3708
...
This was SVN commit r18579.
2016-08-02 16:12:11 +00:00
f7ff71e8d5
Hotkeys to repair, ungarrison and focus on the rallypoint. Patch by Imarok, refs #4008 .
...
This was SVN commit r18578.
2016-08-02 15:42:35 +00:00
493990f472
Fix engine tests when no mods are present, by making the pathfinder tests consistent with the rest of the tests.
...
This was SVN commit r18577.
2016-08-02 15:38:39 +00:00
335b55d49b
Add tests to AuraManager component. Fixes #4123
...
This was SVN commit r18576.
2016-08-02 12:19:40 +00:00
8af205fd71
Fix building of fields + update tests to make sure this doesn't happen again. Refs #4121
...
This was SVN commit r18575.
2016-08-02 11:54:18 +00:00
69b3c5871b
Print warnings when no or the wrong list of mods is passed when starting non-visual replays. Patch by ArnH, fixes #2807 .
...
This was SVN commit r18574.
2016-08-02 11:11:10 +00:00
fba9346947
Fix regicide spawn point preference bug, refs #2160 .
...
On maps with multiple buildings it didn't prioritize the civic center.
This part would require a findLastIndexOf array function to avoid the
loop.
This was SVN commit r18572.
2016-07-31 00:40:26 +00:00
105e1484fb
The repair button is expected to work with construction sites.
...
This was SVN commit r18571.
2016-07-30 23:52:09 +00:00
edd5d20733
Hide unassigned hotkeys. Patch by Imarok, refs #3051 .
...
This was SVN commit r18570.
2016-07-30 16:30:07 +00:00
51eb4b255c
Don't let the props inherit the 'idle' animation if the parent doesn't have the needed animation. Fixes #4071
...
This was SVN commit r18568.
2016-07-29 11:57:27 +00:00
09ab4fe9d3
Add tests to the Foundation component + fix some minor issues found by implementing the tests. Fixes #4121
...
This was SVN commit r18567.
2016-07-29 11:48:07 +00:00
ab2c73e93a
Allow to set 'unused' as a hotkey to disable that action. Patch by Imarok. Fixes #3051
...
This was SVN commit r18565.
2016-07-27 12:29:31 +00:00
c70975b116
Pompeii random map script by _kali.
...
This was SVN commit r18564.
2016-07-27 11:35:19 +00:00
0fcc1fbce6
Fixes scenario map missing units introduced in previous commit, refs f3d35d8a8a.
...
This was SVN commit r18563.
2016-07-25 20:31:23 +00:00
f3d35d8a8a
Prevents training of unexpected units in buildings introduced in 60a2af2988, lets mace trains 2 mercs in captured stoa or in their own stoa for scenario map, fixes #4011 .
...
This was SVN commit r18562.
2016-07-25 18:54:28 +00:00
20b4e039be
Fix fileendings of files with mixed fileendings in the public mod (except art, l10n) and in source/ (except for source/third_party/).
...
Thus fix lineendings in files that were missed in bcbf25bfbd
2016-07-25 12:58:47 +00:00
a0058c533b
Don't throw errors and hide the summary screen button when encountering an empty replay metadata file.
...
That kind of file can be written in case the partition has no more space
left when ending the game.
This was SVN commit r18560.
2016-07-25 11:26:56 +00:00
e262e021b0
Fix an off by one error. Reported by fatherbushido, refs #2160 .
...
This was SVN commit r18559.
2016-07-25 11:20:34 +00:00
bcbf25bfbd
Fix line endings of all files in source/ except source/third_party/.
...
This was SVN commit r18558.
2016-07-25 09:07:45 +00:00
ba25ffef74
rmlib2 simplifications.
...
This was SVN commit r18556.
2016-07-24 04:25:45 +00:00
8e1dcbe2fa
Mediterranean tree balancing.
...
Increase minimum distance between forests so as to carve more space for
player buildings. Reported by sentado, based on patch by _kali.
Adapt metal and stone mine numbers to keep the same probability.
This was SVN commit r18555.
2016-07-24 04:24:44 +00:00
c8d7992820
Mediterranean shoreline heightdata fix for easier dock placement (especially in caucasus). Reported by sentado, patch by _kali.
...
This was SVN commit r18554.
2016-07-24 04:19:56 +00:00
e80f0f9930
Mediterranean bugfix for a rare case where birch trees were placed in north africa
...
(since the localbiome wasn't set for stronghold bases).
Remove non-existing roads which were not accessed before.
This was SVN commit r18553.
2016-07-24 04:18:10 +00:00
a3da37ffd3
Gaia control improvements.
...
Don't throw errors when finishing a gaia foundation.
Allow cheats for gaia.
This was SVN commit r18552.
2016-07-24 02:19:34 +00:00
c652e0942a
Session cleanup.
...
Move some code from selectViewPlayer to updateTopPanel.
Inline variable civName.
Move one check out of an if-statement in selectViewPlayer.
Merge duplicate call Engine.GetGUIObjectByName("civIcon") for
consistency with other code.
This was SVN commit r18551.
2016-07-24 02:17:43 +00:00
64624d121c
Tree balancing of the red sea map.
...
Sometimes players didn't have any wood close by while usually all
players have practically limitless wood around. Reported by sentado.
Thus enforce greater distance between big forests and add some tiny
forests in between them.
Keep a big distance between all forests as it is supposed to be a
desert.
This was SVN commit r18550.
2016-07-23 17:30:32 +00:00
6543e78cce
Seleucid dock
...
This was SVN commit r18549.
2016-07-23 10:15:46 +00:00
eaf0f88420
Add missing vertical heightmap scaling to _kali's new random map scripts.
...
This was SVN commit r18548.
2016-07-22 18:26:53 +00:00
9da74739d4
Gah, refs fb8f360ef0.
...
This was SVN commit r18547.
2016-07-22 15:12:11 +00:00
9c4344a940
Acoustic notification when someone mentions the name of the player in the lobby or game chat. Patch and soundfile by andy5995.
...
This was SVN commit r18545.
2016-07-21 15:31:39 +00:00
8dddd369ef
Basic regicide gamemode. Based on patch by Sandarac, refs #2160 .
...
Spawn a random hero at gamestart and defeat the player if the hero dies.
Consider nomad maps where units spawn without buildings or start on a
ship.
Correct a comment for TriggerHelper.SpawnUnits.
Make shuffleArray available to GUI and simulation and use it to
randomize heroes.
This was SVN commit r18544.
2016-07-21 15:12:49 +00:00
34c26767ca
Add reddish dust to red sea. Actor by Stan, reviewed by _kali.
...
This was SVN commit r18543.
2016-07-21 11:20:33 +00:00
41474760e2
Remove healers from the idle worker queue as that is typically used to get units back to work or delete the workers if they can't work anymore. Thanks sanderd17 for a quick opinion.
...
Idle healers still show up when pressing the idle worker selection lasso
filter hotkey (I by default).
This was SVN commit r18542.
2016-07-21 10:46:32 +00:00
26b29e1de7
fix fa7e0c10ba
...
This was SVN commit r18541.
2016-07-21 07:44:28 +00:00
8e98de87ec
Reset Last Man Standing flag when enabling rated games, to avoid the warn, refs #3970 .
...
This was SVN commit r18540.
2016-07-21 01:12:02 +00:00
fb8f360ef0
Fix missing observermode for players who won (and that's why a ternary was used there before 9f796068f8).
...
Don't start the defeat music when clicking on resign and then restarting
it right on the next turn.
This was SVN commit r18539.
2016-07-21 01:06:35 +00:00
c84d41dc41
Hide walk speed tooltip for unpacked siege engines.
...
This was SVN commit r18538.
2016-07-21 00:04:42 +00:00
1bb3438450
Add missing round to cf04bad4bc, refs #3841 .
...
This was SVN commit r18537.
2016-07-20 23:55:25 +00:00
ec3200dfee
Session and lobby cleanup.
...
Remove unused variable label and rating.
Remove hardcoded group limit of 10.
Inline pointless constant guiName.
This was SVN commit r18535.
2016-07-20 16:21:42 +00:00
d7d0a7f869
Submit and display more information about matches in the lobby. Patch by Imarok, refs #3476 .
...
Includes team numbers, online/offline- and won/defeated state, AI type
and difficulty for running games and
only the playernames with observer-player distinction in the gamesetup.
Use JSON format inside the XML stanza and minimize traffic by packing
teams.
Use the observer distinction to correctly apply the "full games" trigger
in the lobby, fixes #3143 .
XPartaMupp patch applied by scythetwirler.
unescapeText function by sanderd17, refs #3409 .
This was SVN commit r18534.
2016-07-20 16:04:23 +00:00
cf04bad4bc
Ingame summary screen and allied resource / population tooltips for active players. Patch by Imarok, also reviewed by fatherbushido and discussed with mimo, fixes #3841 .
...
Shows (only) the stats of the current player in the summary screen while
playing.
Also shows those of mutual allies too if the shared vision tech is
researched.
Display the resources and population counts of allies in the tooltips of
the top panel.
Use a sprintf for the pop / limit ratio and remove hardcoded resource
strings in the XML, refs #3934 .
This was SVN commit r18533.
2016-07-20 01:22:07 +00:00
fa7e0c10ba
fix a call to DeleteEntityAndReturn with undefined arguments, + some cleanup, refs #2706
...
This was SVN commit r18532.
2016-07-19 18:25:31 +00:00
01ff2fb0e0
petra: reset some collections only if needed
...
This was SVN commit r18531.
2016-07-19 17:26:03 +00:00
a498d18738
Fix a stronghold placement bug. Patch by _kali, fixes #4088 .
...
Furthermore add two TODOs about other known placement bugs and
don't enforce close player placement if the team consists of only two
players,
since controlling much territory is more important than having a
neighboring allied CC close by.
This was SVN commit r18530.
2016-07-19 15:33:05 +00:00
2feeda802d
Show the garrisoned healrate in tooltips, revealing not necessarily intuitive rates for special buildings and ships.
...
This was SVN commit r18529.
2016-07-19 13:19:37 +00:00
d0639c4df6
Ram garrison balancing.
...
Garrison up to 10 men in rams and 12 in persian ones, in order to
have a greater chance of attacking enemies with many melee champs
defending,
since the new balancing in alpha 21 requires siege engines to destroy
buildings, see d38adc7cd027c46a0a68d1ed264c9b
2016-07-19 13:17:02 +00:00
9132fd4406
petra: try to improve detection of inaccessible targets
...
This was SVN commit r18526.
2016-07-17 18:28:20 +00:00
df55f73894
ai: remove a useless argument
...
This was SVN commit r18525.
2016-07-17 17:10:01 +00:00
ea3492a9a5
Fix averaging of heightmaps which broke on giant mapsizes. Thanks Sandarac for reporting.
...
This was SVN commit r18524.
2016-07-17 12:59:10 +00:00
33e3e6c2ab
Three new random map scripts by _kali showing actual geographical regions: Amazon, Mediterranean and Red Sea.
...
Includes a water and skyset fix by niektb. Partially reviewed by FeXoR.
Like last time, commits can be found at
https://github.com/0ADMods/maps_random_by_kali
This was SVN commit r18523.
2016-07-15 19:39:42 +00:00
a83f2a376b
Update the idle-worker hotkeys as they were changed in ff6b80305c. Patch by andy5995, reviewed by Itms, fixes #4089 , see also 4eea798d79.
...
This was SVN commit r18521.
2016-07-14 02:09:35 +00:00
82f1987114
Clean an out-of-scope variable usage. Patch by Stan.
...
This was SVN commit r18520.
2016-07-14 01:58:05 +00:00
1459fe0f8e
Nuke a confusing warning that is thrown everytime the host selects a map that the clients done have.
...
This was SVN commit r18519.
2016-07-13 23:09:29 +00:00
6ade29d0da
Rename DeleteMessages to DeleteWonderVictoryMessages to help distinguish it from possible other trigger script methods ( ced8ceed47).
...
This was SVN commit r18518.
2016-07-13 18:42:35 +00:00
df18564038
Merge duplicate big house templates. Patch by Sandarac, reviewed by mimo, fixes #4100 .
...
While at it, remove the revert of the
civbonus_hellenic_architecture.json in the hellenic house templates
(1091 Health * 1,1 = 1200 Health),
since the templates should be independent from the number of the json
file (thus restore the missing 10% bonus for hellenic houses).
Construct big houses in 50 (respectively 55) seconds instead of 60
seconds for the same reason (and using a number that is more round than
53 without increasing the buildtime).
This was SVN commit r18517.
2016-07-13 18:09:08 +00:00
224fec3954
petra: techCostMultiplier applies only to techs and not to trained units
...
This was SVN commit r18516.
2016-07-13 13:28:53 +00:00
ec1de0eac1
Small fix to the previous commit. The variable was unused and overwritten, thus hiding the issue.
...
This was SVN commit r18515.
2016-07-13 07:03:47 +00:00
ced8ceed47
Properly handle wonder victory messages after a player has won.
...
Patch by Sandarac, reviewed by elexis, fixes #4010
This was SVN commit r18514.
2016-07-13 06:51:59 +00:00
d29806ff2d
Structure tree cleanup.
...
Use Math.max/min and quote object keys for the wallpiece parsing.
This was SVN commit r18513.
2016-07-13 02:02:47 +00:00
92bf34d68d
Fix duplicate lobby rating transfer due to the report being sent for every player instead of only the local player, refs 9f796068f8, #4013 .
...
This is still a bug in XPartaMupp as that should in theory avoid
obviously invalid reports
(defeating players twice in the 'simulation' of the lobby bot).
This was SVN commit r18512.
2016-07-12 11:24:46 +00:00
4c0f12bce3
Fix autostart replays following a23884d79a by grabbing g_GameAttributes from the simulation instead of the GUI. Patch by Imarok, refs #3143 .
...
Don't remove attribs from the init attributes as that is still used by
the loading screen to show the mapname.
This was SVN commit r18510.
2016-07-12 01:49:48 +00:00
cab6a8c633
Prevent fishing ships from trying to attack entities besides fauna, refs #4092 .
...
This was SVN commit r18509.
2016-07-11 23:55:07 +00:00
c1eff53eab
Complete the previous commit to account for both rmlib2 files.
...
This was SVN commit r18508.
2016-07-11 18:01:01 +00:00
2d3a9b1a55
Use var instead of const in rmgen2 and fix a typo. Reported by FeXoR, patch by elexis
...
This was SVN commit r18507.
2016-07-11 17:40:05 +00:00
3d7c6981ca
Fix a too early return and a wrong negation in the attack component "cleanup" of a09c59e044 that broke RestrictedClasses, thus stopped violent animals from attacking. Remove an unneeded space. Slaughter two if-statements whose condition is never satisfied (due to GetAttackTypes never returning that item) introduced in 092206b12e and ef4a1e261c.
...
Patch by elexis
This was SVN commit r18506.
2016-07-11 17:25:19 +00:00
4eea798d79
Add descriptions for the Shift modifier. Patch by andy5995
...
This was SVN commit r18504.
2016-07-10 18:02:16 +00:00
73d62fb903
make the ai use allied dropsites when shared, fixes #4085
...
This was SVN commit r18503.
2016-07-10 17:44:48 +00:00
800662ec63
Walls templates cleanup. Use relative templates for Health. Let gates inherit the long wall template instead of the defensive structure template to reduce redundancy / duplicate entries. Remove unused costs as gate is a wall upgrade. Let a non zero cost build time to gate to fix infinite repair rate, ref #3707 , #3811 .
...
This was SVN commit r18502.
2016-07-09 21:50:25 +00:00
ca76fb5053
finetune the load savedgame layout of f7ff2f2e99
...
This was SVN commit r18501.
2016-07-09 18:24:00 +00:00
e38665d7a6
Use decimals instead of integers to allow relative templates for resource costs, as proposed by sanderd17, fixes #3818 . Use relative templates following 68f87cb556.
...
This was SVN commit r18500.
2016-07-08 15:33:50 +00:00
ff4e751dce
petra cleanup
...
This was SVN commit r18499.
2016-07-08 15:13:04 +00:00
84fae4baeb
Fix lineendings for all map files.
...
This was SVN commit r18498.
2016-07-08 08:42:49 +00:00
c8c7dbc6a4
Fix missing actor.
...
This was SVN commit r18497.
2016-07-08 08:28:16 +00:00
90f0e32f84
Mauryan wall to gate conversion costs wood instead of stone as they are made of wood.
...
This was SVN commit r18495.
2016-07-07 10:28:31 +00:00
8f0439b016
Remove one array with hardcoded resources used for icons in tooltips. Patch by s0600204, refs #3934 .
...
This was SVN commit r18494.
2016-07-07 01:32:41 +00:00
888a281552
Complete rename of 9d20881ef4.
...
This was SVN commit r18493.
2016-07-07 01:22:03 +00:00
275be69883
Fix missing this-reference in 9d20881ef4 and update gamesetup following a874b3c1c3.
...
This was SVN commit r18492.
2016-07-07 00:10:26 +00:00
20866bd9d8
petra cleanup
...
This was SVN commit r18491.
2016-07-06 18:51:43 +00:00
db3f332aa4
Stan's Ptolemaic military colony and a few updates I forgot to commit with the seleucid blacksmith
...
This was SVN commit r18490.
2016-07-06 14:49:07 +00:00
ec2e2a84a4
Fix and improve 001c411cc2.
...
This was SVN commit r18489.
2016-07-05 20:23:12 +00:00
05195d0692
apply leaveFoundation to enemies when under ceaseFire, fixes #3667 , patch by Sandarac
...
This was SVN commit r18488.
2016-07-05 17:13:35 +00:00
4fc8dc517f
Delete command improvements and bugfixes.
...
Allow deleting of miraged foundations.
Add component method to set units undeletable. Based on patch by bb,
refs #3102 .
If the control-all-units cheat is active, delete sheep, mostly captured
buildings and undeletable units.
Merge duplicate delete checks in the GUI. Thereby take into account the
control-all-units cheat and undeletability in all places.
Disable the delete button if the entity can't be deleted.
Add a tooltip for undeletability.
Don't colorize whitespace.
Remove unneeded comments.
This was SVN commit r18487.
2016-07-05 01:17:07 +00:00
5769321038
Show selection panels of other players in case the control-all-units cheat is active.
...
This was SVN commit r18486.
2016-07-05 00:51:15 +00:00
d9fa069ee7
Fix session implementation of the splash tooltip of 22b72a362b and related cleanup.
...
Add comments to document that GetEntityState and GetTemplateDataHelper
need to use the same object structure.
Remove four unneeded conditionals that are always true from
GetTemplateDataHelper.
Inline 3 splash damage variables in the attack component.
This was SVN commit r18485.
2016-07-04 22:16:35 +00:00
de8bb7fe28
Skirmish map "Dueling Cliffs" by scythetwirler, reworked by niektb.
...
This was SVN commit r18483.
2016-07-04 02:45:27 +00:00
afa4b0cba1
Fix autocomplete in gamesetup, see 09fdf716e9. Thanks echotangoecho for reporting.
...
This was SVN commit r18482.
2016-07-03 20:53:43 +00:00
437cc13b95
Make charge attack unavailable from the simulation.
...
The order change to GetAttackTypes in a09c59e044
2016-07-03 20:41:03 +00:00
0f38095dfd
Remove the outdated tooltip following 0624045e6c.
...
This was SVN commit r18480.
2016-07-03 20:40:19 +00:00
d99c5ce064
Fix typo.
...
This was SVN commit r18479.
2016-07-03 11:25:59 +00:00
bbe75c14f8
Implements the ai changes from s0600204 resource-agnostic patch, refs #3934
...
This was SVN commit r18478.
2016-07-03 10:26:34 +00:00
22b72a362b
Splash damage tooltip.
...
This was SVN commit r18477.
2016-07-03 04:08:52 +00:00
0624045e6c
Train women from houses in village phase, as that's typically the only time when they are trained.
...
This was SVN commit r18476.
2016-07-03 03:13:50 +00:00
fe8b65b708
Show the actual walk speed in the ingame tooltip. Patch by fatherbushido.
...
This was SVN commit r18475.
2016-07-03 02:25:57 +00:00
0fd2c517f5
Lobby cleanup.
...
Cache the viewed profile directly.
Remove the rating check since it is always true ("-2" used if the rating
doesn't exist).
This was SVN commit r18474.
2016-07-03 02:14:03 +00:00
02f89aad41
Fix wrong variable declaration in 8d9255eaee and merge duplicate, as reported by mimo.
...
This was SVN commit r18473.
2016-07-03 02:01:00 +00:00
2a3d380e75
Upgrade component cleanup, refs #2706 .
...
Use the cheat multiplier for upgrading and un/packing.
Remove if-statements that are always true.
Remove unused undefined "time" item from array in the selection panel.
Pass that object directly instead of copying each property explicitly.
Various indentation fixes in the selection panel code.
This was SVN commit r18472.
2016-07-03 01:50:55 +00:00
c24b6b582d
Fix tests. Patch by fatherbushido, refs #2706 .
...
Some simplifications and array functions.
Fix indentation, thanks pastebin.
This was SVN commit r18471.
2016-07-02 21:32:09 +00:00
f468ac936b
Fix to the upgrade commit, including one by fatherbushido. Refs #2706
...
This was SVN commit r18470.
2016-07-02 16:05:56 +00:00
967a500d37
Fix Roman Siege Wall after b2f4b0f494. Patch by fatherbushido.
...
This was SVN commit r18469.
2016-07-02 08:35:31 +00:00
b2f4b0f494
Allow entities to upgrade into other entities.
...
This new components allows giving the upgrade a cost, required
technologies, and a required time.
Implement gates using this generic component.
Fixes #2706
This was SVN commit r18467.
2016-07-01 19:43:26 +00:00
1276b98965
Argh.
...
This was SVN commit r18466.
2016-07-01 15:18:09 +00:00
a09c59e044
Attack component cleanup.
...
Use .filter(), .every() and .some() to simplify, Math.max/min instead of
if-statements, inline functions, add newlines and allow attack orders
while flying.
This was SVN commit r18465.
2016-07-01 15:05:09 +00:00
9d20881ef4
Update healer tooltips to also show up in the selection details with actual values from the simulation. Based on patch by fatherbushido, fixes #4026 .
...
Also clean up the Health component.
Rename healer to heal (as that is the actual component name).
Remove the structure tree code to replace a proper Templates.js
implementation.
This was SVN commit r18464.
2016-07-01 13:32:34 +00:00
bb69a6fb86
Tooltip cleanup.
...
Use toFixed instead of round hacks, refs #3395 .
Show one more digit in the speed tooltip.
This was SVN commit r18463.
2016-07-01 10:37:01 +00:00
e611dd6993
Remove unneeded population bonus tooltip strings. Patch by fatherbushido, refs dde2cd38be.
...
This was SVN commit r18462.
2016-07-01 10:03:14 +00:00
1e5d67b6bb
Fix missing replacement in 4d9565297d. Thanks Imarok for reporting.
...
This was SVN commit r18460.
2016-06-30 12:30:36 +00:00
b134047abe
Also add a reset-teams button for consistency, refs #3805 .
...
This was SVN commit r18459.
2016-06-30 12:03:37 +00:00
b642f0d876
Persist the the valid subset of chosen player settings when changing the skirmish map. Patch by Offensive ePeen, refs #3120 .
...
This was SVN commit r18458.
2016-06-30 10:02:32 +00:00
e6e8efec1c
Tooltip cleanup.
...
Remove duplicate arguments from the helper function to get the
template/entity data.
This was SVN commit r18457.
2016-06-30 02:12:26 +00:00
ef9eb787be
Remove wrong space from 4d9565297d.
...
This was SVN commit r18456.
2016-06-30 02:11:30 +00:00
1114afa939
Garrison tooltips by fatherbushido.
...
Show how many units can be garrisoned, the number of arrows shot by
default, per unit and limit, fixes #3816 .
Thus remove a lot of hardcoded numbers in the translated strings and
correct a wrong number for the mauryan ship, fixes #3904 .
This was SVN commit r18455.
2016-06-30 01:31:40 +00:00
4d9565297d
Tooltip overhaul.
...
Also contains a patch by fatherbushido for attackRateDetails and
getAttackTooltip to
not show something broken for buildingAI units that can capture, fixes
#4061 (see #4000 ).
Make tooltip functions uniform.
Pass template everywhere
instead of template.armour in getArmorTooltip
rate in getRepairRateTooltip and getBuildRateTooltip and
entState in attackRateDetails.
Add an early return for every tooltip function.
Use empty string instead of "Armor: (None)" for trees etc..
Don't prefix tooltip return values with "\n", but let the user of that
function add them.
Thus make tooltip concatenation much nicer (f.e. draw.js).
Use a loop instead of duplicating per damage type in damageTypesToText.
Add font functions to avoid duplicating tag code.
Merge sprintf's and inline variables.
Add few TODOs.
Fix some strings:
Use "%(specificName)s %(fontStart)s(%(genericName)s)%(fontEnd)s")
instead of "(" + foo + ")" ...
Use existing "%(percentage)s%%" instead of foo + "%" in
armorLevelToPercentageString.
Remove
duplication by calling/introducing shared functions (getEntityTooltip,
getHealthTooltip, getGatherTooltip, getVisibleEntityClassesFormatted),
unused function damageTypeDetails which was also a duplicate of
damageTypesToText,
unused function damageValues,
some warns that are equivalent to errors they attempt to cover up
(getAttackTypeLabel, getCostComponentDisplayIcon, getEntityNames,
getEntityNamesFormatted),
some unused variables,
"???" and translate("???").
Don't fix translate("Foo:") strings to avoid a lot of translation work.
This was SVN commit r18454.
2016-06-30 01:16:09 +00:00
30c7a2ef18
Remove gathering capacity from elephant archers as they are way too clumsy for that (as they would use the melee/slaughter attack too).
...
It might be unexpected in the first place to let them gather.
(However that is not really weirder than having cavalry hunt sheep.)
This was SVN commit r18453.
2016-06-29 13:35:20 +00:00
a23884d79a
Cache gameAttributes in the session. Patch by Imarok, refs #3143 , #3263 .
...
This was SVN commit r18452.
2016-06-29 01:45:20 +00:00
46cabf0fde
Add missing JSAutoRequest calls. Based on patch by echotangoecho, refs #4053 .
...
This was SVN commit r18451.
2016-06-29 00:00:44 +00:00
d30ee0292b
Fixes a bug in random map library placer.js function SimpleObject.place() that placed entities outside of the playable map area. Add a constant MAP_BORDER_WIDTH to remove magic numbers. Also removed some unneeded brackets in the changed files. Fixes 4012
...
This was SVN commit r18450.
2016-06-28 11:37:56 +00:00
0f1cef8766
Code cleanup of random map lib map.js.
...
This was SVN commit r18449.
2016-06-27 22:42:12 +00:00
9b3ec336fe
Make non-refraction water less transparent.
...
This was SVN commit r18448.
2016-06-27 13:50:54 +00:00
d60d7d7da6
pow is behaving in undefined ways for negative numbers and this lead to issues on nvidia and amd. Fix this and comment for future reference. Thanks to fatherbushido for the debugging help.
...
This was SVN commit r18447.
2016-06-27 11:36:10 +00:00
e782e23ff9
Fix 8da8d28102 as it didn't update the ingame summary screen and did a wrong inline. Reported by Imarok.
...
This was SVN commit r18446.
2016-06-27 11:18:56 +00:00
307ed87829
petra: fix some rare case trying to attack an ally
...
This was SVN commit r18444.
2016-06-26 18:18:29 +00:00
ead8436b3d
Improve water rendering, partly based on a patch by aeonios, including:
...
-increase the size of the refraction and reflection texture
-blur the refraction map depending on depth
Fixes #3781
This was SVN commit r18443.
2016-06-26 16:54:58 +00:00
a4a45e4dc4
Fix compiler warning, thanks to elexis. Refs #4056
...
This was SVN commit r18442.
2016-06-26 16:51:52 +00:00
9f796068f8
Win and defeat cleanup, fixes #4013 .
...
Add a new simulation message and chat notification for players who won.
Avoid duplicate playerstate messages in the sim and GUI by triggering
changes with a function instead of a message.
Reveal the map on defeat/win exclusively in the player component
(instead of having a silly GUI proxy and doing it also in the
EndGameManager sometimes).
Remove the skipAlliedVictory argument from the player component, since
that shouldn't contain references to the EndGameManager, refs #3970 .
Show a proper message box on win/loss and add the hint for hosts
disconnecting other players.
Do defeat/win procedure in the GUI when such a message arrives, instead
of checking onTick for playerstate changes.
Thus don't show that confirmation again on every rejoin.
Don't show a pointless message box if IsAtlasRunning.
Explain that the session.js variable is needed to avoid an
order-of-execution bug.
Select "observer" item when rejoining as a defeated player.
Remove an unneeded call to updateTopPanel.
This was SVN commit r18441.
2016-06-26 04:40:50 +00:00
8da8d28102
Savegame / summary screen / replay menu cleanup, refs #1090 .
...
Savegame / replay menu selected game information:
Show players who won the game (not only defeat).
Show translated civs instead of the civ code.
Use a translation for "%(team)s:\n%(playerDescriptions)s".
Merge nearly duplicate objects passed to formatPlayerInfo.
Merge deleteGame and deleteGameWithoutConfirmation.
Summary screen:
Construct the summary screen title in place, not in the session, nor
replay menu.
Remove g_Players from the replay metadata since all relevant
information is contained in the sim data.
Split g_GameData into gui and sim.
Access g_GameData instead of data for consistency.
Move code from XML to JS.
Don't use victory music when observers enter the summary screen (just
keep the current track like when exiting the game as a player).
Rename updateObjectPlayerPosition to initPlayerBoxPositions.
This was SVN commit r18440.
2016-06-26 03:36:55 +00:00
898ab5229b
Change profiling calls to get a better view of what is actually slow and what is not.
...
This was SVN commit r18438.
2016-06-25 13:12:35 +00:00
d2e081b602
Separate getFullEntityList() - gathering all entities placed until now on a random map in a list - from getMapData(). Preparation for committing collision detection and beautifier patches. Fixes #4068
...
This was SVN commit r18437.
2016-06-25 12:00:06 +00:00
be1b5a9fa7
Improve Profiler2 JS interface with multiple threads and frameless threads. Add a setting to the analysis graphs. Refs #4056
...
This was SVN commit r18436.
2016-06-25 10:12:04 +00:00
c886206d96
Fix crash after opening profiler2 with GPU profiling following 3cbe96d24c. Refs #4056
...
This was SVN commit r18435.
2016-06-25 09:11:10 +00:00
98f8541581
remove a useless leftover var
...
This was SVN commit r18434.
2016-06-24 18:03:19 +00:00
d8e9642d09
Fix lineendings of all files in simulation/.
...
This was SVN commit r18433.
2016-06-24 12:39:22 +00:00
989df9cb3b
Fix lineendings of JS simulation components.
...
This was SVN commit r18432.
2016-06-24 12:23:39 +00:00
b8fbfe2d20
Survival of the fittest cleanup. Based on patch by bb, refs #3102 .
...
Show notificaiton to all players and observers.
Whitespace fixes.
let instead of var.
This was SVN commit r18430.
2016-06-23 22:37:42 +00:00
9c980173e3
petra cleanup
...
This was SVN commit r18429.
2016-06-23 18:25:27 +00:00
62f4a4f7ca
Lobby / gamesetup cleanup.
...
Translate the map "random" in the lobby.
Fix a warning in getMapDisplayName reported by echotangoecho when
hosting a lobby game and selecting the random map.
Use the right translation of that "random" map in b84b9a374a
2016-06-23 14:33:28 +00:00
89fd897fd9
Buff quinquereme, especially the garrisoning of expensive catapults. Patch by causative, fixes #4065 .
...
This was SVN commit r18427.
2016-06-23 13:20:46 +00:00
95d3612b68
Fix Profiler2 calls in UserReport.cpp, which lead to multiple Leave events being recorded without corresponding enter events. Possible fix for the linux crash of profiler2.
...
This was SVN commit r18426.
2016-06-23 10:01:31 +00:00
490ee7387f
Fix a double to float coercion and JS errors with empty threads in Profiler2 . Refs #4056
...
This was SVN commit r18424.
2016-06-22 16:46:49 +00:00
3cbe96d24c
Revamp Profiler2 to make it more usable.
...
Features include new graphs to compare runtime of functions and runtimes
across reports, as well as new profiling functions that only profile
spikes.
This was SVN commit r18423.
2016-06-22 13:38:05 +00:00
68bc88fb95
Savegame GUI cleanup..
...
Move duplicate reallyDeleteGame to shared file.
Inline getPlayerInfoText since it is used only once, refs #1090 .
Merge deleteGame and deleteGameWithoutConfirmation.
Use let instead of var.
This was SVN commit r18422.
2016-06-22 11:42:43 +00:00
2735494a92
Configurable batch size when training units. Patch by Sandarac, fixes #4059 .
...
This was SVN commit r18421.
2016-06-22 11:13:40 +00:00
70417715be
Enhanced autumn trees from Delenda Est. Related forum topic: https://wildfiregames.com/forum/index.php?/topic/20833-autumn-tree-content-mod/#comment-317651
...
This was SVN commit r18420.
2016-06-21 15:45:14 +00:00
0f807c643a
GUI cleanup.
...
Point out missing functionality and unused properties in the
implementation of checkboxes.
Don't specify a useless font tag for checkboxes in the templates.
This was SVN commit r18419.
2016-06-21 14:38:06 +00:00
9e526614be
Accidentally left a change from #4056 in in 7c21a0cf8e.
...
This was SVN commit r18418.
2016-06-21 11:13:00 +00:00
7c21a0cf8e
Header cleanup: profile.h is no longer unnecessarily included in scriptinterface.h but rather in the required .cpp files
...
This was SVN commit r18417.
2016-06-21 10:33:11 +00:00
bc40ebb97e
Improve bartering GUI responsiveness and immediately switch to the selected resource instead of waiting one turn. Refs #3194 .
...
This was SVN commit r18416.
2016-06-21 09:34:26 +00:00
4fde34c168
Revert be5f2d2bb5 since the implicit conversion throws a warning.
...
This was SVN commit r18415.
2016-06-21 00:06:14 +00:00
600f21578f
cleanup of some replay and savedgame stuff
...
This was SVN commit r18414.
2016-06-20 17:43:16 +00:00
be5f2d2bb5
Remove an unneeded String() conversion.
...
This was SVN commit r18413.
2016-06-20 16:09:57 +00:00
23a9fa1e65
Trigger script cleanup.
...
Remove tons of trailing whitespace.
Format JSdoc comments properly.
Use alphabetical sorting in array.
let instead of var.
Eliminate deprecated for-each.
This was SVN commit r18412.
2016-06-20 15:59:14 +00:00
86db6dcf12
Implement wonder victory games that are finished instantaneously after build, refs #3234 .
...
Thus don't supplement the hypothetically missing wonderduration
gameattribute with a hardcoded simulation default.
This was SVN commit r18411.
2016-06-20 15:46:21 +00:00
f7ff2f2e99
improve load game UI, fixes #1090
...
This was SVN commit r18409.
2016-06-19 21:01:25 +00:00
5bc0de7f3a
Put the newly credited persons in 24b2a2b828 in an alphabetical order
...
This was SVN commit r18408.
2016-06-19 18:13:35 +00:00
24b2a2b828
Three new fauna portraits made by Foaly
...
This was SVN commit r18407.
2016-06-19 18:08:39 +00:00
5186560466
Suppress a warning.
...
This was SVN commit r18406.
2016-06-19 14:37:38 +00:00
22f6daf612
Add missing territory to corrals (to prevent decay in connected allied territory).
...
Increase territory of the storehouse slightly to allow adjacent
buildings.
This was SVN commit r18405.
2016-06-19 14:32:42 +00:00
dbe985cd78
petra: remove some useless return
...
This was SVN commit r18404.
2016-06-18 17:34:02 +00:00
e8291130bd
petra: update list of enemy structures when diplomacy changes
...
This was SVN commit r18403.
2016-06-18 16:59:34 +00:00
932b0c1e3e
Trireme and bireme ship balancing.
...
The mauryan empire is not known to have the strongest fleet, so reduce
their ships hitpoints to the average for that model.
Redue bireme metal cost to make it an actual alternative to the trireme,
considering population cost and hitpoints.
Remove a hardoded linenumber in a comment.
This was SVN commit r18402.
2016-06-18 14:30:21 +00:00
64d14b9fc6
Fix "supersedes" indentation issue of technologies in 4c22d4631a.
...
This was SVN commit r18401.
2016-06-18 11:07:44 +00:00
b28dfb42df
Fix indentation of auras in 46ead523b8. Patch by fatherbushido, reported by leper, fixes #4062 , refs #3792 .
...
This was SVN commit r18400.
2016-06-18 10:45:33 +00:00
09fdf716e9
Session cleanup.
...
Move chat window and developer overlay to a custom file.
Use String(foo) instead of ""+foo.
Remove a pointless loop and GetGUIObjectByName call in autoCompleteNick.
Remove noisy line-comments.
This was SVN commit r18399.
2016-06-17 15:38:07 +00:00
f4b818bec4
Wonder mode cleanup.
...
Remove unused, seemingly unusable wonder duration multiplier, refs
#3234 .
Replace wonderDuration of the EndGameManager with gameTypeSettings,
since the component should be agnostic about victory condition logic.
Remove an unused cmpEndGameManager.
Inline a variable, few newlines, let intsead of var.
This was SVN commit r18398.
2016-06-17 14:24:30 +00:00
8c69309e7c
Missing semicolon, rephrase comment, refs #3216 .
...
This was SVN commit r18397.
2016-06-17 12:08:40 +00:00
f60befe098
Capture statistics summary. Patch by maveric and Imarok, fixes #3216 .
...
Also colorize the headings, use two lines per player and remove
duplication of an ugly regex hack.
This was SVN commit r18395.
2016-06-17 02:27:11 +00:00
df764c0200
Increase vision range proportionally when increasing the attack range. Patch by Imarok, fixes #3989 .
...
This was SVN commit r18394.
2016-06-17 01:11:39 +00:00
a214f83017
Trader cleanup.
...
Remove unused required goods.
Won't be used since setting the goods individually for every trader is
overkill.
This was SVN commit r18393.
2016-06-16 20:54:31 +00:00
7c9c715ddc
Tech tree cleanup.
...
Newlines.
Eliminate deprecated for each.
One or two simplifications.
This was SVN commit r18392.
2016-06-16 20:26:36 +00:00
a874b3c1c3
Colorize playernames in the kick/ban chat notification, refs #3241 .
...
This was SVN commit r18391.
2016-06-16 17:13:02 +00:00
450973a624
Clean up some code-style issues reported by leper
...
This was SVN commit r18390.
2016-06-16 14:51:12 +00:00
ed7924f9ca
Session GUI cleanup
...
Use arrow functions.
Inline exchangeResources which was defined in the wrong file.
Remove unused selectRequiredGoods. Related code should be removed likely
too.
Add missing translate.
This was SVN commit r18389.
2016-06-16 01:08:36 +00:00
8aea8d0849
Replace magic number with a readable string, refs #3436 .
...
This was SVN commit r18388.
2016-06-16 00:40:21 +00:00
f25921ba24
improve 2392f6fe8e as these checks are also done in Commands.js, thanks to leper
...
This was SVN commit r18387.
2016-06-15 21:20:04 +00:00
6da94fef96
petra cleanup, spotted by leper
...
This was SVN commit r18386.
2016-06-15 21:06:09 +00:00
156b360f06
Print engine version to the logfiles.
...
This was SVN commit r18385.
2016-06-15 19:26:28 +00:00
ed225e1fc4
Chat cleanup, refs #3870 .
...
Remove toggleChatWindow which duped openChat and closeChat.
Toggling the chat window with hotkeys is pointless due to the focus.
Inline setTeamChat.
Add some newlines, 2 missing semicolons and remove unneeded comments.
This was SVN commit r18384.
2016-06-15 16:54:16 +00:00
8302eeaf73
Rest of the previous commit.
...
This was SVN commit r18383.
2016-06-15 16:16:55 +00:00
0ce02441ee
Simulation cleanup
...
Use QueryPlayerIDInterface to remove duplication as suggested by leper.
Remove its duplicate GetPlayerComponent.
Add IsOwnedByHelper and IsOwnedByEntityHelper to remove duplicated ally
check functions.
Remove unused function GetPlayerFilter from 17c473f2f3
2016-06-15 16:13:08 +00:00
84d5fb2d34
Tooltip GUI engine cleanup.
...
Merge some if statements.
Fix whitespace.
Remove unneeded comments and braces.
Remove one duplicated statement out of an if-statement.
This was SVN commit r18381.
2016-06-15 15:40:05 +00:00
997ea01b2b
Fix typo in 366085e037 as reported by mimo.
...
This was SVN commit r18380.
2016-06-14 21:29:37 +00:00
a296909f91
GUI engine cleanup.
...
Merge a check.
Remove unneeded comments and braces.
Some whitespace fixes.
This was SVN commit r18379.
2016-06-14 15:06:39 +00:00
a9426a3f26
Distinguish private and public room level messages in the lobby. Patch by scythetwirler, refs #3865 .
...
This was SVN commit r18378.
2016-06-14 14:07:52 +00:00
8d9255eaee
Lobby cleanup.
...
Remove duplicate assignments in updateGameSelection.
Add function senderFont to remove duplication.
Add newlines to reduce line length and have properties of different
objects start on the same level of indentation.
Use logical OR instead of ternary in two occurances (mapTypeIdx).
This was SVN commit r18377.
2016-06-14 13:28:54 +00:00
b65594832d
Lobby cleanup.
...
Use let instead of var.
Merge redundant assignment in updateSubject.
This was SVN commit r18376.
2016-06-14 12:34:46 +00:00
fb5e738920
Lobby cleanup. Patch by scythetwirler, refs #3865 .
...
Replace an ugly workaround of ccb534259d
2016-06-14 12:17:37 +00:00
949f22b67d
Victory check cleanup.
...
Use let instead of var.
Add newlines and a missing semicolon.
Remove an excess semicolon.
This was SVN commit r18374.
2016-06-14 11:18:28 +00:00
62061557db
Host on arbitrary UDP ports. Patch in cooperation with Imarok, fixes #3575 .
...
This was SVN commit r18372.
2016-06-13 16:56:14 +00:00
7b655b7ea6
Implement multiplayer dialog retries, fixes #4035 , refs #3575 .
...
Cleanup:
Move all code to hide elements to switchSetupPage.
Remove nasty second argument from switchSetupPage by just hiding every
page.
To avoid another state variable, immediately set g_IsConnecting to true
by calling startConnectionStatus when trying to host.
Use .some instead of a loop.
This was SVN commit r18371.
2016-06-13 14:29:52 +00:00
320798f901
Don't select "everyone" but the previously selected chat addressee when someone connected or disconnected. Fixes #3956 .
...
This was SVN commit r18369.
2016-06-12 21:11:01 +00:00
31decd6274
Messed up variable name in 9dc66a27d8.
...
This was SVN commit r18368.
2016-06-12 15:29:43 +00:00
929711febb
Fix skirmish entities to use Hellenic actors after removing the Athenian duplicates.
...
This was SVN commit r18367.
2016-06-12 15:13:09 +00:00
9dc66a27d8
Pass pointer by ref.
...
This was SVN commit r18366.
2016-06-12 14:37:13 +00:00
6e2106edd8
Fix whitespace, refs #3000 .
...
This was SVN commit r18365.
2016-06-12 13:54:00 +00:00
38c7d7224a
Elephants are not expected to capture buildings.
...
This was SVN commit r18363.
2016-06-11 16:07:28 +00:00
a0960f4f89
Show the player color and name of units from other players garrisoned in allied buildings. Fixes #4052 .
...
This was SVN commit r18362.
2016-06-11 15:02:34 +00:00
d7d1d8ccb5
Implement buttons for up to 10 heroes. Patch by Clockwork-Muse, fixes #3000 .
...
This was SVN commit r18361.
2016-06-11 13:46:04 +00:00
759aaa2264
Fixes a bug introduced in 0bf90da597 that prevents entity placement on some rectangular maps e.g. Phoenician Levant and Corsica vs Sardinia. Also fixes a typo in the Phoenician Levant .js and .json files. Fixes #4012
...
This was SVN commit r18360.
2016-06-11 11:16:07 +00:00
ab9cef172b
Savegame cleanup.
...
Implement loading of multiplayer savegames that were created by
observers.
This was SVN commit r18359.
2016-06-11 00:30:11 +00:00
001c411cc2
Remove a division by a fixed equal to one in NearestNavcell in the short-range pathfinder which was from profiling on VC2013/windows 7 responsible for about 10% of ComputeShortPath.
...
This was SVN commit r18358.
2016-06-10 22:57:28 +00:00
c94cd66a57
Savegame cleanup.
...
Remove the player assignments altogether (506350d6fa
2016-06-10 19:04:57 +00:00
6ba90a2555
Session cleanup.
...
Move message polling code from onTick to messages.js and blend it in.
This was SVN commit r18356.
2016-06-10 13:17:47 +00:00
506350d6fa
Savegame, session and gamesetup cleanup.
...
Don't save the player assignments to savegames as
the GUIDs are outdated and the GUI data only applies to the player that
saved the game.
Remove unneeded argument from getPlayerData.
Remove invalid (ready should be status) and unneeded playerAssignment
data when selecting a map in singleplayer mode.
Show filenames of saved games in the debug log.
This was SVN commit r18355.
2016-06-10 13:03:13 +00:00
a792503cab
completes the ai adaptation to cost multipliers, fixes #4003
...
This was SVN commit r18353.
2016-06-09 19:28:54 +00:00
dd823dd572
ai cleanup
...
This was SVN commit r18352.
2016-06-09 19:25:40 +00:00
41bc367bd1
Messed up 01603708de
...
This was SVN commit r18350.
2016-06-09 17:45:50 +00:00
01603708de
Reuse vectors in the short-range pathfinder, making SplitAAEdges much faster and reducing memory fragmentation substantially. Refs #3588
...
This was SVN commit r18349.
2016-06-09 17:38:59 +00:00
91e4ac58e3
Ensure in the simulation that locked teams and last man standing aren't enabled simultaneously. Suggested by leper, refs #3970 .
...
This was SVN commit r18348.
2016-06-09 15:35:12 +00:00
f92447f88b
Observer mode cleanup, refs #3168 .
...
For consistency remove grayout from unit action commands (unload all,
delete, ...) as suggested by sanderd17 some time ago.
Remove unneeded grayout from unittype specific ungarrison buttons (as
the grayout is added automatically in this case).
Allow focusing on rallypoints for observers (should be added to the
allied commands too).
Add newlines and inline some variables.
This was SVN commit r18347.
2016-06-09 15:32:41 +00:00
4bb9c80001
Continue to allow cheating and some other commands after winning the game. Refs #3168 .
...
This was SVN commit r18346.
2016-06-09 14:47:25 +00:00
fab2e9274a
Lobby cleanup. Based on patch by Imarok, refs #3575 .
...
Fix a typo and use let instead of var.
This was SVN commit r18345.
2016-06-09 13:59:40 +00:00
d1cc3dcb80
Re-use the same vector for the range manager spatial subdivision queries to cut down on allocations and memory fragmentation. Refs #4045
...
This was SVN commit r18344.
2016-06-08 17:06:58 +00:00
2165250316
Clarify translated string, as reported on transifex.
...
This was SVN commit r18343.
2016-06-08 11:12:10 +00:00
cd3c52c53f
Last Man Standing mode. Based on patch by Sandarac, fixes #3970 .
...
Also fix a simulation bug (check for allied victory on game start).
The mode is not a victory condition as it applies to all victoriy
conditions.
This was SVN commit r18342.
2016-06-08 11:03:16 +00:00
70e6be5196
GUI engine cleanup.
...
Remove unneeded parenthesis and few whitespace changes.
This was SVN commit r18341.
2016-06-07 15:57:33 +00:00
ffd1639f05
Implement damage variants with an example for the Iberian fire ship. Fixes #3983
...
This was SVN commit r18340.
2016-06-07 13:21:32 +00:00
a7b310f3bd
GUI engine cleanup.
...
Fix typos, remove unneeded comments.
This was SVN commit r18339.
2016-06-07 12:02:33 +00:00
29a069b6fb
petra cleanup
...
This was SVN commit r18337.
2016-06-05 20:52:21 +00:00
260f925ad9
Some fixes and improvements suggested by leper
...
This was SVN commit r18336.
2016-06-05 20:48:22 +00:00
ee8061d867
fixed market actor and seleucid spec texture
...
This was SVN commit r18335.
2016-06-05 15:31:48 +00:00
d3ffa91fa9
petra cleanup
...
This was SVN commit r18334.
2016-06-05 14:44:17 +00:00
e260fab9a0
petra: first part of adaptation to cost multipliers, ref #4003
...
This was SVN commit r18333.
2016-06-05 14:39:37 +00:00
98f1d02d88
Fix garrison flag on new seleucid blacksmith
...
This was SVN commit r18332.
2016-06-05 08:47:22 +00:00
f064b0566c
Seleucids blacksmith, fixed a few things with the corral and barracks too
...
This was SVN commit r18331.
2016-06-05 05:31:05 +00:00
756d23c987
petra cleanup
...
This was SVN commit r18330.
2016-06-04 17:36:14 +00:00
f6b9cbf280
Remove duplicate temple actors
...
This was SVN commit r18329.
2016-06-04 14:15:52 +00:00
29b6f8273f
Fix garrison flags of hellenistic civs + remove duplication for a number of athen vs hele actors + clean up some actors
...
This was SVN commit r18328.
2016-06-04 14:02:19 +00:00
279a9ed785
Move old Persian building
...
This was SVN commit r18327.
2016-06-04 13:29:08 +00:00
e573ea54a2
Move some old hellenistic actors to the old directory
...
This was SVN commit r18326.
2016-06-04 13:25:30 +00:00
04123e7725
some cleanup, reported by leper
...
This was SVN commit r18325.
2016-06-04 12:43:02 +00:00
c08bde9100
Fix garrison flags on Spartan buildings + clean up some actors
...
This was SVN commit r18323.
2016-06-04 12:18:47 +00:00
248a48d88a
Major network cleanup. Patch by Imarok.
...
Access the server from the client only, not from the GUI (except for
autostarted games).
Thereby lay the foundation for clients to setup the game (refs #3806 )
and dedicated hosting (refs #3556 ).
Doesn't transfer nor remove the SetTurnLength showcase from 0ebe3486b6
2016-06-04 12:08:30 +00:00
1871213496
Fix garrison flags on Seleucid buildings + clean up some actors
...
This was SVN commit r18321.
2016-06-04 12:06:48 +00:00
9a38ae6455
Fix garrison flags on Roman buildings + clean up some actors
...
This was SVN commit r18320.
2016-06-04 11:58:10 +00:00
c0f0f6fb53
Fix garrison flags on Ptolemaeic buildings + clean up some actors
...
This was SVN commit r18319.
2016-06-04 11:31:21 +00:00
6377670543
Simulation cleanup.
...
Fix previous commit and add missing semicolon.
This was SVN commit r18318.
2016-06-04 02:33:53 +00:00
40e8600a58
Statistics tracker cleanup.
...
Inline some variables.
Simplify domestic animal check.
Remove trailing whitespace.
This was SVN commit r18317.
2016-06-04 01:58:37 +00:00
a84b9a087c
Fix some string issues pointed out by leper.
...
This was SVN commit r18316.
2016-06-04 00:59:46 +00:00
4110fee44e
Session cleanup and bugfix.
...
Rename "hosts" following 903803ceec
2016-06-03 16:54:00 +00:00
80ea90ec4b
Summary screen cleanup.
...
Use 8b30273a50
2016-06-03 16:22:02 +00:00
92f2a21ac5
Summary screen cleanup.
...
Thou shalt not repeat thyself when formatting numbers.
Renaming of 1-character variables by Imarok.
This was SVN commit r18313.
2016-06-03 16:17:21 +00:00
0bf90da597
Fixes a bug for random maps where Map.validT didn't apply the distance parameter properly on rectangular maps. Fixes #4012
...
This was SVN commit r18312.
2016-06-03 15:29:28 +00:00
3cf766126b
Fix garrison flags on Persian buildings + clean up some actors
...
This was SVN commit r18311.
2016-06-03 15:12:07 +00:00
4048c0e03c
Fix garrison flags on Mauryan buildings + clean up some actors
...
This was SVN commit r18310.
2016-06-03 14:21:07 +00:00
81eb22d01a
Fix garrison flags on Macedonian buildings + clean up some actors
...
This was SVN commit r18309.
2016-06-03 14:00:59 +00:00
03060c4307
Fix skirmish replacements
...
This was SVN commit r18308.
2016-06-03 13:49:26 +00:00
81512a5558
Fix garrison flags on iberian buildings + clean up some actors
...
This was SVN commit r18307.
2016-06-03 13:11:47 +00:00
8e2fb41f92
Rename the not-so-new celtic actors
...
This was SVN commit r18306.
2016-06-03 11:38:04 +00:00
80ffd7ecb6
Move old celtic actors to a separate directory
...
This was SVN commit r18305.
2016-06-03 11:26:03 +00:00
1a3ed203b6
Fix previous commit where SVN messed up a bit between copying and moving files
...
This was SVN commit r18304.
2016-06-03 11:04:41 +00:00
b881c4e327
Move old athenian actors to separate directory + rename the not-so-new actors to regular names
...
This was SVN commit r18303.
2016-06-03 10:09:03 +00:00
df622b5614
Remove magic number from credits code.
...
This was SVN commit r18301.
2016-06-03 09:37:58 +00:00
903803ceec
Gamesetup ready- and PlayerAssignments-cleanup.
...
Split logic to onClientJoin onClientLeave.
Remove duplicate, yet slightly different ready button caption.
Rename hosts to newAssignments in the GUI message sent by the NetClient.
This was SVN commit r18299.
2016-06-03 02:28:29 +00:00
0f8b10fc0e
Gamesetup cleanup.
...
Call updateGameAttributes instead of copying the function contents.
Inline numPlayers and remove ternary that returns the same value in both
cases.
Add newlines, change some comments.
This was SVN commit r18298.
2016-06-03 00:21:21 +00:00
c941a2f352
Gamesetup cleanup.
...
Determine the Seed, AISeed and matchID only once (when starting the
game).
Only specify Seed on random maps.
This was SVN commit r18297.
2016-06-02 23:54:18 +00:00
8b30273a50
GUI engine improvement + gamesetup cleanup.
...
Grab the list of children of a GUI object directly instead of hardcoding
the names.
This was SVN commit r18296.
2016-06-02 22:49:28 +00:00
31a7181eb8
Hide the continue button from d9caf157e2 once pressed, refs #4031 .
...
This was SVN commit r18295.
2016-06-02 22:39:02 +00:00
53ffe766d8
Fix garrison flags on Gallic and Celtic structures + clean up the Gallic and Celtic structure actors
...
This was SVN commit r18294.
2016-06-02 20:18:06 +00:00
0fc9a47c85
Fix garrison flags on Carthaginian structures + clean up the Carthaginian structure actors
...
This was SVN commit r18293.
2016-06-02 19:59:02 +00:00
b0b0495fc9
Fix garrison flags on Briton structures + clean up the Briton structure actors
...
This was SVN commit r18292.
2016-06-02 19:44:16 +00:00
d4fa905cb1
Fix garrison flags on Athenian structures + clean up the Athenian structure actors
...
This was SVN commit r18291.
2016-06-02 19:35:59 +00:00
5be948019b
ai cleanup
...
This was SVN commit r18290.
2016-06-02 18:08:14 +00:00
d9caf157e2
Fix a confirmation hotkey bug in the multiplayer dialog. Patch by Imarok, fixes #4031 .
...
Remove a duplicate button and move code from XML to JS.
This was SVN commit r18289.
2016-06-02 16:47:24 +00:00
6df3b0d794
Wall placement cleanup. Somewhat based on patch by bb, refs #3811 .
...
Early return instead of a big if-statement.
Inline r, targetX, targetZ, towerX and towerZ.
Rename s to spacing.
Remove unneeded else keywords.
Eliminate deprecated for-each.
Use let instead of var.
Quote object keys.
++i instead of i++.
Some newlines.
This was SVN commit r18288.
2016-06-02 12:52:54 +00:00
00c3b09008
Patch by Sandarac and bb, fixes #3859 .
...
This was SVN commit r18287.
2016-06-02 12:14:32 +00:00
f15abb066c
Allow garrisoning elephants at the elephant stables. Patch by jonbaer.
...
Also add missing obstruction class to the elephant archer and fix its
walking speed.
This was SVN commit r18286.
2016-06-02 12:05:41 +00:00
74e672d879
Observermode cleanup, fixes #3850 .
...
Recalculate status bars when changing the perspective.
This was SVN commit r18285.
2016-06-02 00:20:02 +00:00
00ea7763f7
GUIInterface / observermode cleanup as recommended by leper, fixes #3999 .
...
Default to the viewed player in the GUIInterface to avoid passing that
separately in some places, refs #3168 .
Thus GetEntityState will be called for the viewed player instead of
observer playerID, therefore
fixes a fog-of-war selection relict when changing the perspective, refs
#3850 .
Also remove some unused player arguments.
This was SVN commit r18283.
2016-06-02 00:09:21 +00:00
662f8ec620
Template cleanup. Patch by fatherbushido, refs #4021 .
...
Move duplicate military colony template to a new parent template.
This was SVN commit r18282.
2016-06-01 23:33:29 +00:00
4223fad060
Make it easier for mods to add their own credits. Fixes #3986
...
This was SVN commit r18281.
2016-06-01 19:37:24 +00:00
ab4c656ff6
make healer more proactive, patch by causative, fixes #3932
...
decrease a bit the increase of heal range with techs, and also decrease
a bit the cost of such techs
This was SVN commit r18280.
2016-06-01 17:59:06 +00:00
ff886b1773
Try to fix issue with probably uninitialised animation frequency, improve error message and clean up code a bit
...
This was SVN commit r18278.
2016-06-01 07:21:50 +00:00
8a8c0b526d
Template Cleanup. Some string fixes for 802d0f0de8 and d238128960 as suggested by leper.
...
This was SVN commit r18277.
2016-06-01 00:13:57 +00:00
8a4af2e7b5
Template cleanup. Patch by Palaxin, refs #4021 .
...
Move duplicate library template to a new parent template.
This was SVN commit r18276.
2016-05-31 23:49:44 +00:00
1bd82494a3
Template cleanup. Patch by Palaxin, fixes #4022 .
...
Move duplicate rotary mill template to a new parent template.
This was SVN commit r18275.
2016-05-31 23:12:07 +00:00
3eea0df931
ai cleanup
...
This was SVN commit r18274.
2016-05-31 21:06:53 +00:00
7060ca888c
petra: continue splitting of attack function in smaller functions, + some cleanup
...
This was SVN commit r18273.
2016-05-31 21:04:13 +00:00
246c758085
All wonders should have rallypoints. Patch by Sandarac, fixes #4002 .
...
This was SVN commit r18271.
2016-05-31 09:49:14 +00:00
2bcb5f7d18
Actually delete it, refs #4016 .
...
This was SVN commit r18270.
2016-05-31 02:16:11 +00:00
8f02ae3fd2
Template cleanup. Patch by fatherbushido, fixes #4016 .
...
Removes duplicate theatron templates and use a parent template instead.
Removes unused Theban theatron.
Fixes a buildtime inconsistency.
Also improve the tooltip string as suggested by leper.
This was SVN commit r18269.
2016-05-31 02:13:20 +00:00
ac4533f7df
Network cleanup, refs #3752 .
...
Replace a TODO comment asking why something is set with a comment
answering that.
This was SVN commit r18268.
2016-05-30 17:59:02 +00:00
b18c4ac217
Code style improvements to df971c3885
...
This was SVN commit r18267.
2016-05-30 17:05:39 +00:00
83af69286d
Allow simulation to set the actor variant selection, and use it for the garrison flag. Fixes #3952 Refs #2679 , #3983
...
This was SVN commit r18266.
2016-05-30 14:07:48 +00:00
df971c3885
Allow to give a frequency to animations, and allow to sync randomly selected animations on base model and prop. Fixes #2324
...
This was SVN commit r18265.
2016-05-30 11:53:19 +00:00
92e28ba947
more petra cleanup
...
This was SVN commit r18263.
2016-05-29 18:37:02 +00:00
25e637dcac
Fix issue with undefined newValue while origValue is defined.
...
This was SVN commit r18262.
2016-05-29 18:10:57 +00:00
1edacf6153
Add another missing hotkey to the ingame manual as mentioned by sanderd17.
...
This was SVN commit r18261.
2016-05-29 17:44:46 +00:00
a8c05c8df3
Revert ba071f8b4e as it is unsafe for serialization
...
This was SVN commit r18260.
2016-05-29 14:51:15 +00:00
1a8f5f3490
Move rallypoint waypoints smoothly with moving targets
...
This was SVN commit r18259.
2016-05-29 12:49:32 +00:00
3d6c48e357
ai cleanup, mainly var -> let
...
This was SVN commit r18258.
2016-05-29 12:26:41 +00:00
f1610ce4fa
petra: wip changes to make it less dumb against walls
...
and start splitting the huge attack function in small parts
This was SVN commit r18257.
2016-05-29 12:16:53 +00:00
ba071f8b4e
Reduce number of rallypoint recalculations when a target has moved before, but doesn't move now.
...
This was SVN commit r18256.
2016-05-29 12:15:24 +00:00
d238128960
Balance the wonder and improve unique building tooltips.
...
Increase the armor of buildings following 27c46a0a68
2016-05-28 20:49:45 +00:00
50ba14d16d
Restructure unit_actions.js. Fixes #4007
...
This was SVN commit r18254.
2016-05-28 14:46:20 +00:00
16bad4ee07
Properly handle the case of removed hotkeys in 6162c6388f, refs #3051 .
...
This was SVN commit r18253.
2016-05-28 10:50:22 +00:00
6162c6388f
Show hotkeys in the tooltips of six buttons.
...
This was SVN commit r18252.
2016-05-27 23:49:14 +00:00
39bf451d49
Use relative template for 0b2f0ea042.
...
This was SVN commit r18251.
2016-05-27 23:42:34 +00:00
1b598eaccf
ai: remove some redundant get functions
...
This was SVN commit r18250.
2016-05-27 19:59:27 +00:00
0b2f0ea042
Balance hellenic champions.
...
Double the metal cost of elite spartan citizen soldiers, as they have
stats near those of champions.
Use a more reasonable cost for age 2 champions.
Differentiate the armored swordsmen from the other sword champions by
actually increasing it's armor.
This was SVN commit r18249.
2016-05-27 18:58:52 +00:00
802d0f0de8
Unique building aura balancing, refs #3930
...
Owning multiple libraries and theatrons increases the aura bonus
proportionally, so as to incentivize capturing.
Make the library aura more appealing by giving a 10% research time
bonus.
Improve a tooltip.
This was SVN commit r18248.
2016-05-27 17:13:31 +00:00
06b77c1522
Update manual with some new hotkeys.
...
This was SVN commit r18247.
2016-05-27 17:01:18 +00:00
5ad1079a5a
Show the filepath in the command line output when taking screenshots.
...
This was SVN commit r18245.
2016-05-27 14:24:05 +00:00
038e45cba8
Rotate icon, refs #3805 .
...
This was SVN commit r18244.
2016-05-27 13:22:10 +00:00
965e658463
Make ptolemian bolt shooter available. Patch by fatherbushido, fixes #4006 .
...
Let ptolemians produce it in a captured siege workshop.
Remove bolt shooter technology from seleucids, as they don't have that
weapon.
This was SVN commit r18243.
2016-05-27 11:57:20 +00:00
f422b67eb0
Fix issue with hidden techs after researching it
...
This was SVN commit r18242.
2016-05-27 08:37:44 +00:00
67149137c8
Reduce the size of the "Team" label to not overlap the reset-civ button when using 1024x768. Patch by Sandarac, refs #3805 .
...
This was SVN commit r18240.
2016-05-27 01:49:15 +00:00
78accf3d97
Add a button to the gamesetup to reset the selected civilizations of all players to random.
...
Code by Sandarac, icon by Lionkanzen, fixes #3805 .
This was SVN commit r18239.
2016-05-26 22:58:30 +00:00
30e7b3bf25
Implement hotkey to delete units and buildings without confirmation dialog. Patch by Sandarac, fixes #3962 .
...
This was SVN commit r18238.
2016-05-26 22:33:38 +00:00
dacecd0f33
Better syntax for e84e0611b0
...
This was SVN commit r18237.
2016-05-26 20:04:20 +00:00
e84e0611b0
Fix an issue 1b0fbee2d9. Selecting ents with and without production queue gave undefined tech cost multipliersOC.
...
This was SVN commit r18236.
2016-05-26 19:56:14 +00:00
4bf0dddace
Add javelin to samnite skirmisher projectile attachpoint. Fixes #4005
...
This was SVN commit r18235.
2016-05-26 18:10:22 +00:00
0856dde011
fix a typo in 58e356babb, plus a missing semicolon
...
This was SVN commit r18234.
2016-05-26 17:58:08 +00:00
1b0fbee2d9
Let auras and techs modify tech cost. Patch by fatherbushido. Fixes #3930
...
This was SVN commit r18233.
2016-05-26 06:28:23 +00:00
9c67cd6743
transfer the entities angles to the AIs
...
This was SVN commit r18231.
2016-05-25 19:03:41 +00:00
07007f1963
some cleanup in ai
...
This was SVN commit r18230.
2016-05-25 18:43:48 +00:00
3d27d47d54
Seleucid corral
...
This was SVN commit r18229.
2016-05-25 12:39:16 +00:00
09907351a0
Little update to the musicians list, plus alphabetic order for instrument players.
...
This was SVN commit r18228.
2016-05-24 19:17:07 +00:00
d7e7a24168
Gamesetup cleanup (game/map-description), refs #3994 .
...
Add linebreaks.
Eliminate unneeded variables mapName and gameDescription.
Remove a check as g_GameAttributes.map is always defined.
Sort the two one-line statements above the helper variable declarations
to make it more more obvious that the statements don't use them.
This was SVN commit r18227.
2016-05-24 12:56:52 +00:00
b2f3402c50
Network cleanup.
...
Remove unused netmessage type NMT_LAST.
Use CStr instead of the alias CStr8.
Remove unneeded comments.
This was SVN commit r18226.
2016-05-24 12:21:21 +00:00
a99f314a61
Session cleanup.
...
Use let instead of var.
This was SVN commit r18225.
2016-05-24 12:06:22 +00:00
6e17a7d2ff
Session / unit-actions cleanup.
...
Eliminate deprecated for-each.
Merge if-conditions.
Add linebreaks to objects, so that each property is declared on a
separate line, refs #252 .
For consistency, use returns in negative instead of positive cases.
Make three functions global, one of which had been defined thrice.
Remove comments stating the same as the code.
This was SVN commit r18224.
2016-05-24 12:03:33 +00:00
9cc98aaf47
Take new observermode into account in some missing places, refs #3850 , #3168 .
...
This was SVN commit r18223.
2016-05-23 15:26:47 +00:00
33f6713f94
New attempt to get the aura translations included. See 1606d40f68
...
This was SVN commit r18221.
2016-05-23 10:40:26 +00:00
6171f66d06
AI: fix serialization of template changes, fixes #3993 , refs #3858
...
This was SVN commit r18219.
2016-05-22 20:25:41 +00:00
a951762d6c
Add support to the structure tree for units with technologies in their production queue. Patch by s0600204. Fixes #4001
...
This was SVN commit r18218.
2016-05-22 15:32:47 +00:00
38de20c989
Add missing init, refs #3991 .
...
This was SVN commit r18217.
2016-05-21 20:24:38 +00:00
9c9796d8ad
Changes in AI: Decrease a bit the required number of champions in attacks because of the recent increase of their cost,
...
Make more use of corrals when no fields and Cleanups
This was SVN commit r18216.
2016-05-21 17:06:25 +00:00
682086b7fb
do not let the captureStrength become infinite when capturing a damaged structure, fix #3973 , patch by fatherbushido
...
This was SVN commit r18215.
2016-05-21 16:44:20 +00:00
4b5f8dfca6
Remove trailing whitespace and simplify some length checks. Refs #252 .
...
This was SVN commit r18214.
2016-05-21 16:20:27 +00:00
a2bd82d171
Complete phase tooltips. Patch by fatherbushido. Fixes #3451
...
This was SVN commit r18213.
2016-05-21 11:18:06 +00:00
1606d40f68
I18n of auras. Based on patch by fatherbushido. Fixes #3982
...
This was SVN commit r18212.
2016-05-21 09:18:05 +00:00
ff342619c7
Fixes a bug in random map schwarzwald.js introduced in 7471a0db63 that prevented the starting positions to be flattened.
...
This was SVN commit r18211.
2016-05-20 20:36:10 +00:00
a84b923380
Fix timing of previous patch
...
This was SVN commit r18210.
2016-05-20 14:05:19 +00:00
804fd4be61
Update 'survival of the fittest' to work with capturing (include siege engines in the attacking units) + add some randomness to the waves + make the timing a bit more challenging
...
This was SVN commit r18209.
2016-05-20 14:02:47 +00:00
7cd43ba8cf
Fix whitespace and remove duplicate comment, refs #1950 .
...
This was SVN commit r18208.
2016-05-20 12:51:27 +00:00
9368ffe345
Fix tech modifications calculations so we don't bump into stupid mistakes again (f.e. multiplying two positive numbers is now guaranteed to stay positive). See 7f300bbf3d and 0b8845eb4f
...
This was SVN commit r18207.
2016-05-20 11:20:51 +00:00
ec1696ded3
Send a network message to update the GUI if another player pauses a multiplayer game. Patch by echotangoecho, fixes #1950 .
...
Pause animations then and on disconnect.
Don't unpause unintentionally when closing a message box in
singleplayer.
This was SVN commit r18204.
2016-05-19 22:10:38 +00:00
856dc1c999
Network cleanup.
...
Send the "client has rejoined" message after the synchronization
finished instead of right after the loading screen.
Patch by echotangoecho, refs #1949 , #1950 .
This was SVN commit r18203.
2016-05-19 21:03:46 +00:00
6f744aef88
Simulation context cleanup, refs #3991 , #3168 .
...
Save the viewed player in the CGame class.
Add the const keyword back to the SimContext to help find mistakes at
compiletime.
This was SVN commit r18201.
2016-05-19 19:42:07 +00:00
1b3a12ea92
Also update this file following 1c5a7f6267.
...
This was SVN commit r18200.
2016-05-19 17:51:56 +00:00
09ceb841f3
Add some useful warnings on missing or abnormal template/technology data.
...
This was SVN commit r18199.
2016-05-19 15:12:28 +00:00
1c5a7f6267
Moved BUILDING_ANGlE from the maps to BUILDING_ORIENTATION in a random map lib. Made some arguments optional with the default set to that constant, renamed some arguments and moved "orientation" in placeCivDefaultEntities to kwargs. Removed unneeded comments. Fixes #3988
...
This was SVN commit r18198.
2016-05-19 14:48:21 +00:00
4921056b9e
Revert de06dc76f7 as it's broken in several ways and revealed a simulation bug. Refs #3288 .
...
This was SVN commit r18197.
2016-05-19 09:33:17 +00:00
b57a103e81
petra cleanup, mainly unneeded parentheses
...
This was SVN commit r18196.
2016-05-17 19:35:33 +00:00
329caed9dd
petra: be more inclined to help an ally attacked by several enemies
...
This was SVN commit r18195.
2016-05-17 19:31:03 +00:00
de06dc76f7
Show researchable techs of all selected entities, not only the first one. Fixes #3288 .
...
This was SVN commit r18194.
2016-05-17 19:05:18 +00:00
01d41cc8a5
Actually update the sound gain after changing the setting. Patch by dpiquet, fixes #3901 .
...
This was SVN commit r18193.
2016-05-17 16:40:36 +00:00
67cdbedb24
Fix an option comment.
...
This was SVN commit r18192.
2016-05-17 16:35:48 +00:00
b49414b03e
Gamesetup cleanup.
...
Use JSdoc comments and use rgbToGuiColor as pointed out by sanderd17.
This was SVN commit r18191.
2016-05-17 16:05:36 +00:00
0501ff9f59
Fix Seleucus aura
...
This was SVN commit r18190.
2016-05-17 11:44:29 +00:00
23a43cb0f6
Allow more choices for the wonder timeout, refs #3234 .
...
This was SVN commit r18189.
2016-05-16 18:32:24 +00:00
2de117618b
Fix typo in 46ead523b8. Patch by fatherbushido, refs #3792 .
...
This was SVN commit r18188.
2016-05-16 13:57:45 +00:00
c34998b85a
Show the playerselection dropdown in front of the "Follow player" observer option in case they overlap.
...
This was SVN commit r18187.
2016-05-16 13:18:26 +00:00
0b6c7ca1b0
ai: remove some unneeded parentheses
...
This was SVN commit r18186.
2016-05-16 10:48:52 +00:00
7ddfc89c18
petra: fix buildLimit when it is 0, reported by fatherbushido
...
This was SVN commit r18185.
2016-05-16 10:23:35 +00:00
f4e69b7c07
Cleanup of #3255 , fixes #3966 .
...
Don't create an empty oos_logs directory when starting the game.
Rename getDateIndexSubdirectory to createDateIndexSubdirectory.
Add a comment for the breakpoint argument of CreateDirectories.
This was SVN commit r18183.
2016-05-16 00:56:07 +00:00
24b262e4d1
Remove the trigger keyword from these maps as they either use the Tutorial AI for scripting or use a script only to place entities on load, refs #3013 .
...
This was SVN commit r18182.
2016-05-16 00:21:44 +00:00
9eccf5cd07
Use an actual playername instead of "You" in singleplayer, fixes #3979 .
...
Differentiate between SP and MP name and allow editing it in the
settings.
Defaults to the OS username.
Makes sharing singleplayer replays more effective.
Also fixes a troublesome colorization of "You" in a translated sentence,
refs #3501 .
This was SVN commit r18180.
2016-05-15 17:13:35 +00:00
6680fe82e2
Add maplist filter for maps that come with triggerscripts. Patch by fabio and Stan, refs #3013 .
...
This was SVN commit r18179.
2016-05-15 04:19:45 +00:00
4944d9b83c
GUI / messagebox cleanup.
...
Remove pointless "mode" argument from messageBox and add newlines to its
calls.
Remove unused variable codes, trailing whitespace and useless comments.
Remove redundant button init code by using a loop (forEach to avoid a
closure).
Inline many unneeded variables.
Add missing translate to gamesetup_mp.js.
Quote object keys and capitalize globals correctly.
This was SVN commit r18178.
2016-05-15 04:04:31 +00:00
b562db2f27
Update the loading screen tooltips following 60a2af2988.
...
This was SVN commit r18177.
2016-05-15 01:14:33 +00:00
f64f1c4ade
Show a hint when failed to connect to a game stating that it is likely caused by the host not forwarding the UDP port. Patch by Stan, fixes #3570 .
...
This was SVN commit r18176.
2016-05-15 00:37:58 +00:00
5a5f05f8d9
Remove gather penalty from some more units (the penalty is added as tech). Units discovered by fatherbushido.
...
This was SVN commit r18175.
2016-05-14 20:17:04 +00:00
6dbdaf1160
fix 58e356babb
...
This was SVN commit r18174.
2016-05-14 18:25:35 +00:00
dd26d683c6
Summary screen cleanup.
...
Few simplifications, newlines for sprintf calls.
This was SVN commit r18173.
2016-05-14 13:10:50 +00:00
58e356babb
allow trade with mirage markets, fixes #3894
...
This was SVN commit r18172.
2016-05-14 12:27:48 +00:00
866d04a22b
Fix typo.
...
This was SVN commit r18171.
2016-05-14 12:15:41 +00:00
ac525fcd2a
some cleanup in petra
...
This was SVN commit r18170.
2016-05-14 12:14:12 +00:00
f5cfda84b8
Gamesetup cleanup. Patch by Imarok, fixes #3980 .
...
Rename GUI objects to numPlayers, mapFilter and mapType for consistency.
Thus use loops to remove code duplication for hiding controls.
This was SVN commit r18169.
2016-05-14 12:07:41 +00:00
721c47a9e8
remove the hardcoded gain in petra, fixes #3943 , patch by LittleDev
...
This was SVN commit r18168.
2016-05-14 12:04:44 +00:00
0b8845eb4f
fix 7f300bbf3d
...
This was SVN commit r18167.
2016-05-13 20:14:02 +00:00
7f300bbf3d
Fix issue with elite units not being able to gather anything
...
This was SVN commit r18165.
2016-05-12 19:04:24 +00:00
148f485172
remove some unused var
...
This was SVN commit r18164.
2016-05-12 17:42:27 +00:00
a4cb84c8e0
ai cleanup, mainly trailing spaces
...
This was SVN commit r18163.
2016-05-12 17:38:58 +00:00
7eea4bd81a
GUI cleanup.
...
A commit against colored spaces.
Use helper function to shorten code while keeping the space apparent.
Inline username variable.
Rename playerIndex to playerID.
This was SVN commit r18162.
2016-05-12 16:08:26 +00:00
7c2ff117f3
Distinguish resign- and defeat-chatmessage. Patch by dpiquet, fixes #3501 .
...
For consistency, also colorize the "You" part in the singleplayer
variants.
This was SVN commit r18161.
2016-05-12 14:02:05 +00:00
366085e037
Savegame cleanup.
...
Simplify the error message for savegames with different mods enabled.
Remove deprecated for-each with map and for-of.
Simplify code that used conditional operator by replacing it with
logical operators.
Add linebreaks.
Quote object keys.
Early return.
Prefix global with g_.
Remove unneeded sprintf in error messages.
Capitalize comments.
This was SVN commit r18160.
2016-05-12 12:14:22 +00:00
518ad5380d
Replay menu cleanup
...
Add the version number to the incompatibility message.
Add missing translate for the comma-separation.
This was SVN commit r18159.
2016-05-12 11:48:08 +00:00
0e5815b78f
Remove trailing whitespace.
...
This was SVN commit r18158.
2016-05-12 11:27:21 +00:00
8b14bfe78b
Balance garrisoned regeneration rate as proposed by mimo and scythetwirler.
...
Reduce rate in village phase from 10 to 5.
Increase town phase addition from 2 to 7 and city phase addition from
1.5 to 9.
This was SVN commit r18157.
2016-05-11 22:32:33 +00:00
b0000da90e
Fix small issue discovered by fatherbushido
...
This was SVN commit r18156.
2016-05-11 09:35:52 +00:00
9414674cfc
Train naked fanatics in town phase to promote rushing, completes b5bf0c7e86.
...
This was SVN commit r18155.
2016-05-11 00:42:56 +00:00
f5dccae966
Display the carried resources when selecting a group of units. Patch by Imarok, fixes #3113 .
...
Shows the information for all selected units and for all units of a
given type.
Rename g_CostDisplayNames to g_CostDisplayIcons.
This was SVN commit r18154.
2016-05-11 00:07:38 +00:00
2a830fdb6a
Support building with mozjs 31.5 used in Ubuntu PPA.
...
Fixes #3039 .
This was SVN commit r18153.
2016-05-10 09:02:58 +00:00
2b0fa71d23
Session cleanup.
...
Use colorizePlayernameByID instead of replica.
This was SVN commit r18152.
2016-05-10 03:14:51 +00:00
71c441b092
GUI cleanup.
...
Remove a wrong translation comment.
Nuke duplicate calls.
This was SVN commit r18151.
2016-05-10 02:35:12 +00:00
6ba0d86ab6
Seleucid market commit
...
This was SVN commit r18150.
2016-05-09 22:45:50 +00:00
7d4fb0d4d9
Limit population cost to at most 3, as suggested by scythetwirler.
...
This was SVN commit r18149.
2016-05-09 20:02:32 +00:00
18e9c4e558
Session cleanup.
...
Remove a pointless conditional operator (which had been introduced with
the other format-message functions that distinguish more strings).
Remove unneeded parenthesis and try once more to align this if-statement
properly.
This was SVN commit r18147.
2016-05-09 01:00:34 +00:00
b45e3e46f7
add non-blocking obstruction to mirages, fixes #3957 , refs #2951
...
This was SVN commit r18145.
2016-05-08 17:26:43 +00:00
883d1aaf48
Fix Windows build. Those includes in 1a3fb29ff3 didn't resolve properly on Windows, refs #3953 .
...
This was SVN commit r18143.
2016-05-08 16:25:00 +00:00
cf7a71965b
Removing function euclid_distance as duplication of getDistance. Fixes #3968
...
This was SVN commit r18142.
2016-05-08 15:15:43 +00:00
7471a0db63
Separate global heightmap manipulation functions to a library. Fixes #3764
...
This was SVN commit r18141.
2016-05-08 14:58:57 +00:00
1a3fb29ff3
Network cleanup, fixes #3953 .
...
Don't compare for "127.0.0.1" to identify the host, but check for a new
boolean flag that is set by the client, refs #2854 .
Remove an unneeded IP address conversion from u32 to string, refs #3241 .
This was SVN commit r18140.
2016-05-08 11:46:19 +00:00
cc3d7d58ea
Improve findIdleUnit and hasIdleUnit code. Patch by Clockwork-Muse. Fixes #3826
...
This was SVN commit r18139.
2016-05-08 09:32:16 +00:00
09fd6da38e
Update credits
...
This was SVN commit r18136.
2016-05-06 07:26:51 +00:00
cd4957144c
remove hardcoded inconsistencies in some templates, fixes #3954 , patch by fatherbushido
...
This was SVN commit r18134.
2016-05-05 12:12:42 +00:00
503cc428b4
Add team option to autostart. Patch by Jonbaer
...
This was SVN commit r18133.
2016-05-04 06:51:34 +00:00
dfad4ec7d7
fix petra typo reported by falsevision, fixes #3955
...
This was SVN commit r18132.
2016-05-03 18:49:33 +00:00
051ba38f36
Reduce gather speed for elite units, as in their original template.
...
This was SVN commit r18131.
2016-05-03 17:40:21 +00:00
77224548bf
Use references instead of copies
...
This was SVN commit r18130.
2016-05-02 19:03:19 +00:00
eaed715a13
Fix typo in aura tooltip
...
This was SVN commit r18129.
2016-05-02 18:02:24 +00:00
a2c3a8a8db
Fix typo in AuraManager
...
This was SVN commit r18128.
2016-05-02 17:32:04 +00:00
c1b5e8c8b7
Gamesetup cleanup. Ensure the existance of the AI property after selecting a map or loading the persistmatchsettings.
...
This was SVN commit r18127.
2016-05-02 17:08:22 +00:00
36d8e0bf5b
Remove unused function.
...
This was SVN commit r18126.
2016-05-02 16:53:38 +00:00
58569aa573
Fix some auras. Patch by fatherbushido. Fixes #3947
...
This was SVN commit r18125.
2016-05-02 16:26:27 +00:00
2378ecd35c
Swap the civilizations when swapping players in the gamesetup. Based on patch by Vladislav, fixes #3804 .
...
This was SVN commit r18124.
2016-05-02 13:42:37 +00:00
c3488df240
Clean up AuraManager objects while the game is running. Refs #3834
...
This was SVN commit r18123.
2016-05-02 10:31:32 +00:00
4ea49f374a
Disable serialization of the AI when no AI players are present. Disable serialization of cached AI templates overall. Improve serialization of repetitive vectors and templatenames. Refs #3834
...
This was SVN commit r18121.
2016-05-02 09:26:07 +00:00
19ccdb8cf5
Updated Gaul Tavern. Thanks for Stan for the model and actors and wackyserious for the texture fix
...
This was SVN commit r18119.
2016-05-01 21:10:32 +00:00
bc19818e86
some petra cleaning
...
This was SVN commit r18118.
2016-05-01 15:03:23 +00:00
462540585b
Network cleanup.
...
Only send the network-warnings to clients that successfully joined the
gamesetup or game.
Thus save a bit performance and
prevents a rare, harmless FSM update error (like in refs #3199 ) in case
a client received the message while authenticating.
Reported by fatherbushido, refs #3264 .
This was SVN commit r18117.
2016-05-01 10:33:51 +00:00
3bb1058950
Allow more structures in the structure tree. Patch by s0600204. Fixes #3938
...
This was SVN commit r18116.
2016-05-01 08:42:27 +00:00
32d8c60239
Implement team bonuses. Patch by fatherbushido. Fixes #2445
...
This was SVN commit r18115.
2016-05-01 08:38:59 +00:00
4471e0bf18
Colonnade for Seleucid city building
...
This was SVN commit r18114.
2016-05-01 04:35:24 +00:00
d8ed6d828a
Separate some random map libraries into a new directory. Fixes #3900
...
This was SVN commit r18113.
2016-04-30 14:42:10 +00:00
983ef2ed2c
Add translation context to the "Unknown" strings, allowing to chose a different translation for every occurance.
...
This was SVN commit r18112.
2016-04-30 14:01:07 +00:00
7ab5f8daf6
Allow filtering the replaylist by single/multiplayer, victorycondition and rated games. Patch by Imarok, fixes #3436 .
...
This was SVN commit r18111.
2016-04-30 13:24:28 +00:00
4cfd0d64fb
Only show the AI-difficulty button if there is an AI assigned to that playerslot. Patch by Imarok, fixes #3942 .
...
This was SVN commit r18110.
2016-04-30 12:14:08 +00:00
d420717eba
add some missing semicolon from b88f63b699
...
This was SVN commit r18109.
2016-04-29 19:56:58 +00:00
b88f63b699
Move the const from simulation/helpers/TraderGain.js into the templates (InternationalBonus and GainMultiplier)
...
Add a tech to improve the internalBonus and give an improved bonus to
cart
Patch from fatherbushido, fixes #3917
This was SVN commit r18108.
2016-04-29 18:52:44 +00:00
b780073e24
petra cleanup
...
This was SVN commit r18105.
2016-04-28 17:14:07 +00:00
c76b2a6c92
Session cleanup.
...
Remove an occurance of a hardcoded playerlimit.
This was SVN commit r18104.
2016-04-28 16:39:09 +00:00
3e177c7f84
Hide the link to the replay in the summary screen if the client rejoined, since the replay doesn't work in that case.
...
Patch by Imarok, refs #3437 .
This was SVN commit r18103.
2016-04-28 09:10:16 +00:00
ef3794f90a
Fix serialisationtest by serializing the territory trigger event, and sending the message only once.
...
This was SVN commit r18102.
2016-04-27 18:37:27 +00:00
f24523dc8f
Rename TechnologyTemplateManager to DataTemplateManager in order to reflect its new function. Fixes #3909 . Disable serialisation of technology templates. Refs #3834
...
This was SVN commit r18100.
2016-04-27 08:25:47 +00:00
f7a618d233
Seleucid barracks edit
...
Seleucid wonder commit
This was SVN commit r18098.
2016-04-27 04:43:47 +00:00
7c6e2019e6
Petra: Prevent the AI to endlessly try building structures that none of its units can build,
...
This fixes the problem of romans not building defense towers
This was SVN commit r18097.
2016-04-26 19:14:13 +00:00
fd4d5cce64
petra: recomputes territory only when receiving some events, refs #3858
...
This was SVN commit r18096.
2016-04-26 18:26:18 +00:00
76a076e776
fix petra typos reported by falseVision, fixes #3926
...
This was SVN commit r18095.
2016-04-26 18:15:57 +00:00
d49f31cdcd
Display health bar for garrisoned units. Patch by Imarok. Fixes #3114
...
This was SVN commit r18094.
2016-04-25 07:24:05 +00:00
d70062c348
Cleanup of the network code (range-based for, remove spaces between angle brackets, and other little things).
...
Based on a patch by elexis, fixes #3907
This was SVN commit r18091.
2016-04-24 20:48:53 +00:00
c856bc296d
Slight improvement to the short range pathfinder. Patch by fsincos, refs #3925
...
This was SVN commit r18090.
2016-04-24 14:35:31 +00:00
6137fea5ed
Make order of persian buildings concistent in the panels. Patch by bb
...
This was SVN commit r18089.
2016-04-23 21:17:13 +00:00
644b3e6fa1
Improve the UI icon for the patrol button, refs #1720 .
...
This was SVN commit r18088.
2016-04-23 10:48:14 +00:00
2f1c08de64
Greek rooftiles texture update
...
This was SVN commit r18087.
2016-04-23 09:04:22 +00:00
72421f97d8
Fix a typo (compability -> compatibility).
...
This was SVN commit r18086.
2016-04-22 22:32:20 +00:00
fca844eef6
Restore the previously selected item and filters when returning to the replay menu. Patch by Imarok, fixes #3742 .
...
Also few cleanups and translate the mapnames in the correct place.
This was SVN commit r18085.
2016-04-22 22:25:50 +00:00
f0263086c4
Roman textures transparency fix
...
This was SVN commit r18084.
2016-04-22 16:47:56 +00:00
11d150ce59
Move animations for female citizens to separate variant files.
...
This was SVN commit r18083.
2016-04-22 12:51:09 +00:00
f9a7494d3f
Roman rooftile update
...
This was SVN commit r18082.
2016-04-22 11:01:50 +00:00
7130e50d7f
Improve the length of the new wall models a bit (still doesn't fit perfectly)
...
This was SVN commit r18081.
2016-04-22 07:34:49 +00:00
c226517f2f
Seleucid walls, finally
...
Placeholder normalmaps and specmaps added too
This was SVN commit r18079.
2016-04-22 06:10:01 +00:00
b120404141
Reveal AI settings in the gamesetup to all players. Based on patch by Imarok, fixes #3911 .
...
This was SVN commit r18078.
2016-04-21 20:07:39 +00:00
c2e42f0e55
Add capture animation to champion infantry of different civs
...
This was SVN commit r18077.
2016-04-21 09:05:13 +00:00
fa703a2613
Revert a copy&paste mistake in 46ead523b8 when auras were converted from XML to JSON. Patch by fatherbushido, refs #3792 .
...
This was SVN commit r18076.
2016-04-20 22:39:31 +00:00
b2fdfeba53
New gamesetup option enabling the host to vary the time required to win the wonder-gamemode. Patch by svott, fixes #3234 .
...
This was SVN commit r18075.
2016-04-20 21:01:58 +00:00
46443f92c9
Define animations for Spartan infantry in separate variant files.
...
This was SVN commit r18074.
2016-04-20 10:55:02 +00:00
d305371782
Define animations for Seleucid infantry in separate variant files.
...
This was SVN commit r18073.
2016-04-20 10:47:24 +00:00
2b3aa81c0e
Define animations for Ptolemy infantry in separate variant files.
...
This was SVN commit r18072.
2016-04-20 09:58:34 +00:00
9ee2f75390
Define animations for Roman infantry in separate variant files.
...
This was SVN commit r18071.
2016-04-20 09:49:54 +00:00
a40857556a
Define animations for Persian infantry in separate variant files.
...
This was SVN commit r18070.
2016-04-20 08:51:11 +00:00
532d495e6d
Define animations for Mauryan infantry in separate variant files.
...
This was SVN commit r18069.
2016-04-20 08:33:59 +00:00
a032d5c8b5
Define animations for Macedonian infantry in separate variant files.
...
This was SVN commit r18068.
2016-04-20 08:03:13 +00:00
70feece690
Define animations for Iberian infantry in separate variant files.
...
This was SVN commit r18067.
2016-04-20 07:07:05 +00:00
5602454fe2
Correctly support different javelin types for different javelinists
...
This was SVN commit r18066.
2016-04-20 06:51:50 +00:00
bdabc459b0
Define animations for Hellenistic infantry in separate variant files.
...
This was SVN commit r18065.
2016-04-20 06:21:07 +00:00
481f90d107
Define animations for Celtic infantry in separate variant files.
...
This was SVN commit r18064.
2016-04-19 19:09:05 +00:00
8311472a5c
Change include into forward declaration
...
This was SVN commit r18063.
2016-04-19 17:48:06 +00:00
2dea3f2ec4
Remove two more build limit tooltips. Patch by fatherbushido
...
This was SVN commit r18062.
2016-04-19 16:22:48 +00:00
61fcf29a9e
Define animations for Carthagian infantry in separate variant files.
...
This was SVN commit r18061.
2016-04-19 16:15:01 +00:00
04794599ed
GUI cleanup.
...
Use logical AND instead of the conditional operator.
This was SVN commit r18060.
2016-04-19 15:41:14 +00:00
82ad4998cc
Move attack animations definitions for the Athenian civ to variation files too.
...
This was SVN commit r18059.
2016-04-19 12:59:27 +00:00
4b4de5204b
Head and helmet of the Athenian hoplite must always appear together.
...
This was SVN commit r18058.
2016-04-19 12:25:48 +00:00
421a65ef41
Define civil tasks for infantry in separate variant files, and update the Athenian infantry to use it.
...
This was SVN commit r18057.
2016-04-19 10:10:49 +00:00
e81fdc3f4d
Not sure how I managed to commit the wrong contents in the variant file ...
...
This was SVN commit r18056.
2016-04-19 08:30:25 +00:00
1e6c12de7b
Allow variants to be defined in external files. Fixes #3286
...
This was SVN commit r18054.
2016-04-19 07:51:59 +00:00
5d8e5edbfb
Improved farms from LordGood.
...
This was SVN commit r18053.
2016-04-18 22:46:46 +00:00
eb09c58b00
Remove build limit from tooltips (the limit text is generated automatically).
...
This was SVN commit r18051.
2016-04-18 13:09:00 +00:00
a60abaa1c8
Disable building most structures in unconnected territory. Fixes #3526
...
This was SVN commit r18049.
2016-04-18 07:00:22 +00:00
6dd8d77d32
The dialogs aren't unused, but used for triggers (currently at least the demo map)
...
This was SVN commit r18048.
2016-04-18 06:54:04 +00:00
de0500e274
Fix the shared dropsites unit action icon. Refs #3791
...
This was SVN commit r18047.
2016-04-17 21:00:51 +00:00
07b368f064
Thanks, IDE, for proper indentation detection...
...
This was SVN commit r18046.
2016-04-17 20:29:02 +00:00
27c46a0a68
Increases hack armour on buildings, since we have capturing now. Increase garrison regeneration rate for structures.
...
This was SVN commit r18045.
2016-04-17 20:18:13 +00:00
c25dc39b86
Distribute XP per hit. Fixes #3889
...
This was SVN commit r18044.
2016-04-17 17:52:22 +00:00
c9eb2fd05c
Adds a build limit to Persian Halls.
...
This was SVN commit r18043.
2016-04-17 17:46:57 +00:00
ba56678bb3
Add market component to foundations. This is needed since 8f4dffe3f0 to be able to set
...
a market rallyPoint on a market foundation. refs #2951 "
This was SVN commit r18042.
2016-04-17 16:14:19 +00:00
df3c3c35b2
Cleanup cinema code. Fix some issues with resetting of times. Patch by Vladislav. Refs #3814
...
This was SVN commit r18041.
2016-04-17 15:43:29 +00:00
9c6e9f70b5
ai: fix typo from 317e2b259d
...
This was SVN commit r18039.
2016-04-16 17:52:50 +00:00
259af9effc
adapt the ai to recent changes in phase tech requirements
...
This was SVN commit r18038.
2016-04-16 13:15:41 +00:00
d38adc7cd0
Makes siege less useless.
...
This was SVN commit r18037.
2016-04-15 17:37:38 +00:00
f905ee2c7e
Don't use the ternary operator as some people find that unreadable.
...
This was SVN commit r18035.
2016-04-15 06:11:38 +00:00
15e44a89ff
Fix structree with new 'notciv' tech requirement
...
This was SVN commit r18034.
2016-04-14 18:23:32 +00:00
3ddfa1695e
Fix tests
...
This was SVN commit r18033.
2016-04-14 17:25:22 +00:00
ec3fb36602
Fix build for gcc 4.6. Patch by Vladislav
...
This was SVN commit r18032.
2016-04-14 16:36:12 +00:00
a57bfc829e
Add a button to the summary screen to replay the game that was just played (or replayed). Patch by Imarok, fixes #3437 .
...
This was SVN commit r18031.
2016-04-14 14:45:03 +00:00
f4bfe7c3ad
Disallow certain civs to use certain techs (which could have become available after capturing a building of a different civ). Patch by fatherbushido. Fixes #3902
...
This was SVN commit r18030.
2016-04-14 11:33:48 +00:00
317e2b259d
AI: changes in the tech requirements (following what is done in the simulation) + some cleanup
...
This was SVN commit r18029.
2016-04-13 20:12:21 +00:00
8f4dffe3f0
add a new market component, fixes #3277
...
This was SVN commit r18028.
2016-04-13 19:56:18 +00:00
a69da3401f
Completely hide techs that aren't researchable by the civ of the owner + cleanup of requirements checking. Patch by fatherbushido. Fixes #3899
...
This was SVN commit r18027.
2016-04-13 09:15:16 +00:00
4e4f0dbbd8
Fixes the handling of teams in the summary screen, along with some cleanup. Patch by Imarok, fixes #3150 , #3561 .
...
This was SVN commit r18026.
2016-04-12 19:34:41 +00:00
b5bf0c7e86
Nerfs champions and slows champion production speed.
...
This was SVN commit r18025.
2016-04-12 18:51:14 +00:00
60a2af2988
Adds some more civ-specific structures and formerly atlas-only structures. Adds loyalty regen and epic healing auras..
...
This was SVN commit r18024.
2016-04-12 18:38:23 +00:00
e23daa11ec
AI: add a isMutualAlly function for #3526 and update the AI for e0cfcbd806
...
This was SVN commit r18023.
2016-04-12 17:37:04 +00:00
8aa5b1fa9e
Center lake in random map schwarzwald
...
This was SVN commit r18022.
2016-04-12 12:03:48 +00:00
e0cfcbd806
Enable technologies on captured buildings. Allow a negation on the civ selection in the technology json files. Patch by fatherbushido
...
This was SVN commit r18021.
2016-04-11 19:40:53 +00:00
8c870f8633
petra: remove a leftover test
...
This was SVN commit r18020.
2016-04-11 17:20:45 +00:00
f83505986e
Tune the size and angle of the valley generation of the Lion's Den map for smaller maps. Patch by _kali, fixes #3844 .
...
This was SVN commit r18019.
2016-04-11 10:43:56 +00:00
649cc82ff1
Only send a gamereport to the lobbybot for 1v1s (as only those are rated), fixes #3040 .
...
This was SVN commit r18018.
2016-04-11 09:54:06 +00:00
5ac76ecf89
Some style fixes reported by leper.
...
This was SVN commit r18016.
2016-04-10 16:57:12 +00:00
b5ff5a6969
make the force explicit such that the previous order is recorded in the workOrders
...
This was SVN commit r18015.
2016-04-10 16:41:00 +00:00
3183a4ea4a
Improve selection rings for animals. Patch by Palaxin. Fixes #3786
...
This was SVN commit r18014.
2016-04-10 08:31:11 +00:00
f8e986d057
Fix territory not being updated when diplomacy changes. Fixes #3891
...
This was SVN commit r18012.
2016-04-09 19:57:34 +00:00
8c436a8a41
Slight improvement of the flood filling algorithm in the hierarchical pathfinder.
...
Remove some useless check and a useless reverse loop, and add a flag to
prevent redundant checks.
Patch by fsincos, refs #3588
This was SVN commit r18011.
2016-04-09 19:47:09 +00:00
cc35f221c8
Add auras back to structure tree. Patch by bb. Fixes #3887
...
This was SVN commit r18010.
2016-04-09 16:00:42 +00:00
9f21806ef7
Properly round health and CP values. Patch by bb. Fixes #3855
...
This was SVN commit r18009.
2016-04-09 07:35:20 +00:00
e93c1e6bca
add diversity to corral production, fixes #3877
...
This was SVN commit r18008.
2016-04-08 20:51:24 +00:00
2392f6fe8e
lock/unlock simultaneously multiple dropsites when selected
...
This was SVN commit r18007.
2016-04-08 20:48:10 +00:00
90cb6ff6b6
petra: improve the sharing between support units and citizen soldiers
...
This was SVN commit r18006.
2016-04-08 18:31:09 +00:00
378c8bdf26
Remove references to a possibly undefined variable and improve some error messages.
...
This was SVN commit r18005.
2016-04-08 18:23:17 +00:00
fd8c181f9d
dropsites are now shared by default, but still can be locked
...
This was SVN commit r18004.
2016-04-08 18:05:45 +00:00
a4f10d53f2
Fix indentation due to pastebin patch losing a newline
...
This was SVN commit r18003.
2016-04-08 14:43:06 +00:00
59c6fd44a0
Remove stamina completely. Patch by fatherbushido
...
This was SVN commit r18002.
2016-04-08 14:36:18 +00:00
22bbe450e4
Move some methods out of the headers. Patch by Vladislav. Refs #3814
...
This was SVN commit r18000.
2016-04-07 17:47:30 +00:00
524d35ffdc
Stop defense tower techs from affecting wall tower stats
...
This was SVN commit r17999.
2016-04-07 16:57:00 +00:00
017d5cc7de
petra: fix serialization on f057eb5aba and fix placement of rotary mills
...
This was SVN commit r17998.
2016-04-07 16:55:08 +00:00
dd7ee8f53f
Rename StrictAlly to ExclusiveAlly, since that term was already used in the AI code.
...
This was SVN commit r17997.
2016-04-07 16:51:25 +00:00
3c40131c61
Player component cleanup.
...
Remove unneeded parenthesis.
Restore indentation.
This was SVN commit r17996.
2016-04-07 10:57:11 +00:00
f7099d364c
Fix typo
...
This was SVN commit r17995.
2016-04-07 08:23:06 +00:00
ffe2c7bbb4
Add methods to check for strickt alliance. Patch by fatherbushido
...
This was SVN commit r17994.
2016-04-07 08:12:15 +00:00
f8ce6819b9
Add s1lence to credits
...
This was SVN commit r17993.
2016-04-07 07:24:14 +00:00
6471a54c9f
Refactor GetEntityCollisions to make it clear what the function actually does since the new pathfinder
...
This was SVN commit r17992.
2016-04-06 17:36:47 +00:00
9aa829d034
Add female Greek voice and musicians credits.
...
This was SVN commit r17991.
2016-04-06 16:56:29 +00:00
7d9f64ca40
Set default model of cart wall tower to Idle while constructing. Fixes #3504
...
This was SVN commit r17990.
2016-04-06 12:59:23 +00:00
eeb07d8231
Don't show bridges on minimap, and don't let them change ownership
...
This was SVN commit r17989.
2016-04-06 11:44:05 +00:00
fd4e899f11
Remove useless History tags from the templates in preparation of #3212
...
This was SVN commit r17988.
2016-04-06 09:53:53 +00:00
ccf0f74970
Random-map-script cleanup.
...
Flatten 37 variables into 3 objects and give them proper names.
This was SVN commit r17987.
2016-04-05 22:32:51 +00:00
138724ce0f
Random-map-script cleanup.
...
Rename biomeID to g_BiomeID.
This was SVN commit r17986.
2016-04-05 18:49:37 +00:00
5744c2c6b0
petra: improve warning and warn only once when garrisonManager gets muddled
...
This was SVN commit r17985.
2016-04-05 18:44:15 +00:00
7029ddc2dd
fix autostart in maps with gaia in PlayerData, fixes #3880
...
This was SVN commit r17984.
2016-04-05 18:21:10 +00:00
8b0d24048a
First unit test for auras
...
This was SVN commit r17983.
2016-04-05 15:28:38 +00:00
4be96ece08
Implement stackable auras + fix an issue with techs, auras and ownership changes. Patch by fatherbushido. Fixes #3792
...
This was SVN commit r17982.
2016-04-05 14:13:44 +00:00
70a3201b23
Remove triple X comment pollution from maps.
...
This was SVN commit r17981.
2016-04-05 11:53:05 +00:00
62b7c07353
Remove unused author and version tag from ardennes forest.
...
This was SVN commit r17980.
2016-04-05 11:22:16 +00:00
bfa94b87ae
Bumps up version number.
...
This was SVN commit r17978.
2016-04-04 21:20:45 +00:00
a7806675fb
This was SVN commit r17977.
2016-04-04 21:18:58 +00:00
6c3964f52a
Cleanup of SoundGroup XML files.
...
Remove some useless settings using the default values.
Remove the obsolete <Replacement> tag.
Update some documentation in the code, fix whitespace and unify line
endings.
Patch by otero, fixes #3268
This was SVN commit r17976.
2016-04-04 20:54:48 +00:00
2a11d3ca7b
Interpolate cinematic camera rotation + allow more points in cinematic path + add comments. Patch by Vladislav. Refs #3814
...
This was SVN commit r17975.
2016-04-04 20:31:18 +00:00
46ead523b8
Cleanup of the Auras code in preparation of stackable auras. Implements auras being enabled by techs. Refs #3792 . Patch by fatherbushido
...
This was SVN commit r17974.
2016-04-04 18:55:44 +00:00
d7b62e0af7
cleanup of the ai api, with removal of some old stuff
...
This was SVN commit r17973.
2016-04-04 18:12:48 +00:00
f057eb5aba
petra now uses corrals on maps with low starting resources
...
This was SVN commit r17971.
2016-04-03 09:16:14 +00:00
63fad07905
nerf a bit wall towers
...
This was SVN commit r17970.
2016-04-03 09:13:13 +00:00
1d0c0e00e5
allows destroying animals when controlAllUnits is set
...
This was SVN commit r17969.
2016-04-02 14:58:31 +00:00
8211f95978
petra cleanup
...
This was SVN commit r17968.
2016-04-02 14:49:08 +00:00
18960ddcf8
fix petra training of support units, fixes #3864
...
This was SVN commit r17967.
2016-04-02 14:23:14 +00:00
42b93c45b8
fix playerData of Forest Battle map
...
This was SVN commit r17966.
2016-04-02 14:21:20 +00:00
3f1b30a8e3
Update Translators credits and add texane to the list of contributors (refs #3863 ).
...
This was SVN commit r17964.
2016-03-28 00:23:04 +00:00
a517184150
Update the creditTranslators script for the A20 languages.
...
This was SVN commit r17963.
2016-03-28 00:18:13 +00:00
d3255168b9
enet backward-compatibility fix, refs #2854 . Patch by texane, fixes #3863 .
...
This was SVN commit r17960.
2016-03-27 23:27:37 +00:00
373107898c
Update the list of included languages for A20: Bulgarian, Hungarian and Swedish get in the team!
...
This was SVN commit r17959.
2016-03-27 22:08:25 +00:00
ad34950780
Add a missing check to 347ffabaeb as the previous one throws errors in case a dead sheep lies in the selection rectangle.
...
Thanks bb for reporting, refs #2407 .
This was SVN commit r17957.
2016-03-27 12:46:18 +00:00
6b2a3bb549
Translate the "Observer" choice in the observer mode player selection dropdown.
...
This was SVN commit r17956.
2016-03-26 19:19:49 +00:00
c777e34cba
Properly fix the typo mentioned in 91ed318f0d. The ++i in the for loop already increments i so doing it once more is not wanted.
...
Fixes #3854 .
This was SVN commit r17955.
2016-03-26 13:25:51 +00:00
6b212dc6ad
Fix promotion of barrack champions for the Macedonians. Fixes #3853 . Patch by fatherbushido.
...
This was SVN commit r17954.
2016-03-26 11:21:49 +00:00
b0c74fdaa0
petra: fix a misbehaviour spotted by sanderd17, when the defenseManager tries to rescue units performing an attack
...
This was SVN commit r17953.
2016-03-25 18:21:13 +00:00
c5ede78373
Require players to own a wonder for 10minutes (instead of 5) before declaring them the winner of wonder-victory games.
...
This was SVN commit r17952.
2016-03-25 18:05:19 +00:00
6f0d0ff8f4
Round max hp of units in simulation. Refs #3855
...
This was SVN commit r17951.
2016-03-25 12:51:48 +00:00
e8decfbd2b
Amend fdf7dabe18: the foundation component won't exist for a mirage (foundation inside the fog-of-war) so the miraged interface to it should be queried.
...
Fixes #3849 .
This was SVN commit r17949.
2016-03-24 21:48:15 +00:00
aa64a92d1a
Ignore production hotkeys for observers instead of throwing errors on press.
...
This was SVN commit r17948.
2016-03-24 21:26:34 +00:00
350422dcae
Fix whitespace (leading mixed whitespace, trailing whitespace and missing newlines).
...
Remove three unused variables area, ix and iz.
Thanks mimo for reporting.
This was SVN commit r17947.
2016-03-24 15:53:53 +00:00
66267cb714
Remove a check for an edge case where the entrance of a bluff would be cutoff by the players territory.
...
Instead, reserve some space at the bottom of the slope for an entrance.
Finetune the terrain textures of bluffs depending on the biome.
Patch by _kali, refs #3455 .
This was SVN commit r17946.
2016-03-24 15:34:36 +00:00
6312b71911
Improve the resource distribution on the map "Ambush" and maps using bluffs in general. Based on patch by _kali, refs #3455 .
...
Bluffs:
Cover half instead of most of the area of bluffs with forests (to allow
placing CCs / forts there).
Proportionally reduce the likelyhood of placing metal/stone on bluffs.
Compensate the absence of forests on the savanna biome with more
straggler trees.
Ambush:
Place forests also on the mainland (so that players are not immediately
forced to expand to bluffs).
Reduce the amount of berries and animals a bit following 91e8248273
2016-03-24 14:54:47 +00:00
ebfd214a19
Return Infinity instead of undefined in BuildingAI.GetMaxArrowCount. Refs #3196 , #3846 and 82fa9d8f5b.
...
Notice the previous check `if (count > this.GetMaxArrowCount())`
implicitly relied on
numerical comparisons returning false if one of the two arguments is
undefined.
This was SVN commit r17944.
2016-03-24 13:25:47 +00:00
58d3425ad4
Reduce the number of lobby gamelist updates by roughly 60-80% by eliminating duplicate packets, refs #3847 .
...
This was SVN commit r17943.
2016-03-24 12:08:00 +00:00
572847ddd4
Revert 1f34a004e5.
...
It breaks the Windows build by using time_t and it changes too many
things to the way lobby messages are processed to be entirely safe to
commit now.
Refs #3832 .
As a side effect it reverts e514aca599#3350 .
This was SVN commit r17941.
2016-03-23 21:58:23 +00:00
c58bbfaa14
Select observer for defeated players, but keep the current player selected on win.
...
This was SVN commit r17940.
2016-03-23 13:49:59 +00:00
82fa9d8f5b
Fix counting issue with previous commit
...
This was SVN commit r17939.
2016-03-23 10:01:27 +00:00
63d276b73b
Fix counting of arrows in buildings: don't remove entities twice from the garrisonholder. Fixes #3846
...
This was SVN commit r17938.
2016-03-23 09:04:02 +00:00
e7deb587bb
Random-map-script cleanup.
...
Use constants when checking for the biome type.
Remove unused code for nonexistent biomeID 0 from gaia.js.
This was SVN commit r17937.
2016-03-23 03:05:39 +00:00
cfb8a6e30e
Fix confusion between concat and push in map Frontier, patch by _kali.
...
This was SVN commit r17936.
2016-03-23 02:06:06 +00:00
fc14e733bd
Change an Object into a Map, this should stop the deserializer of reordering the keys in some cases and stop an OOS on rejoining. Refs #3375
...
This was SVN commit r17935.
2016-03-22 20:57:27 +00:00
c43ce2ca55
cleanup of missing semicolon
...
This was SVN commit r17934.
2016-03-21 20:33:05 +00:00
1a02684cf7
Check for GUID, as the playerIndex doesn't distinguish between observers. Refs #1767 .
...
(Avoid private messages where sender and addressee are identical).
This was SVN commit r17933.
2016-03-21 18:58:52 +00:00
f8d05ed5c3
fix petra serialization (add two variables forgotten, and remove two useless ones)
...
This was SVN commit r17932.
2016-03-21 18:15:39 +00:00
820846b56b
Completely initialise Auras even before ownership is set. Fixes #3843
...
This was SVN commit r17931.
2016-03-21 16:22:40 +00:00
0448a3de73
Lobby cleanup.
...
Make sense of the spammonitor by using an object instead of an array and
introducing a global constant instead of using magic numbers.
This was SVN commit r17930.
2016-03-21 14:29:41 +00:00
e514aca599
Display chat-timestamps in the lobby in the correct timezone, refs #3350 .
...
This was SVN commit r17929.
2016-03-21 13:53:22 +00:00
1f34a004e5
Add timestamps to the GUI/chat-notifications sent from XmppClient, even if it's not a historical message.
...
Correct spammonitor behavior for historical messages and when returning
to the lobby from a game.
Patch by Josh, fixes #3832 .
This was SVN commit r17928.
2016-03-21 13:48:22 +00:00
86a309ad76
Show replay path in commandline interface.
...
This was SVN commit r17927.
2016-03-21 12:09:21 +00:00
f8a09cf5c1
Seleucid barracks model, actor, AO
...
This was SVN commit r17926.
2016-03-21 10:25:01 +00:00
8f4daa9dd0
Lobby performance improvement.
...
Since 8b437a0b1c#3840 .
This was SVN commit r17924.
2016-03-21 03:44:01 +00:00
cfe169d2bc
Reduce lobbybot load by only requesting a ratinglist when actually opening the leaderboard (as suggested by scythetwirler).
...
This was SVN commit r17923.
2016-03-21 01:51:05 +00:00
9e338f4461
Barter component cleanup. Replace deprecated for-each.
...
This was SVN commit r17922.
2016-03-21 00:45:32 +00:00
10b6022557
Convert string to int conversion in the lobby-leaderboard.
...
This was SVN commit r17921.
2016-03-21 00:38:31 +00:00
91e8248273
Make "Lion's Den" and "Empre" default maps.
...
Add more animals/berries to "Ambush".
Improve placing of initial resources on all of _kali's maps.
* Increase distance from chickens to CC from `7` to `9` (to account for
roman CCs, refs #3836 )
* Increase number of initial trees from `5` to `25` (ensuring players
have enough wood to build a new CC)
* Avoid resource collisions by increasing the minDistance from `2` to
`4` (when not using angles)
* Ensure that initial resources are placed (by first placing mines and
adding retry-loops for the other resources)
Notice The loop can't be moved to `createObjectGroup` since
* the parameters (like `mAngle`) also need to randomized again
* we need to place initial resources in range of the actual
playerbase
This was SVN commit r17920.
2016-03-20 19:03:43 +00:00
b84b9a374a
Improve some strings based on translators' feedback.
...
This was SVN commit r17919.
2016-03-20 18:58:59 +00:00
81948477df
fix the test when changing markets, fixes #3838
...
This was SVN commit r17918.
2016-03-20 14:00:49 +00:00
3025b4b8e3
Reduce query time of rating sorts.
...
This was SVN commit r17917.
2016-03-20 05:17:15 +00:00
01b963b259
Update version names to A20
...
This was SVN commit r17915.
2016-03-19 08:21:00 +00:00
d5059e8e23
Don't use that variable outside of scope.
...
This was SVN commit r17913.
2016-03-18 17:54:22 +00:00
31fe2770f6
Update credits, refs #3234 .
...
This was SVN commit r17912.
2016-03-18 14:58:13 +00:00
5c6ba10626
Remove blood from skeletons, refs #3455 .
...
This was SVN commit r17911.
2016-03-18 14:02:47 +00:00
3337adcbbe
Remove unused variables, duplicate comments and trailing whitespace from volcanic lands.
...
This was SVN commit r17910.
2016-03-18 12:04:17 +00:00
b623a3a9ff
Ensure initial trees are placed on volcanic lands and add missing semicolons. Patch by niektb, refs #3808 .
...
This was SVN commit r17909.
2016-03-18 11:56:00 +00:00
0a8ed799f1
Revert tech applying to auras due to issues. Patch by fatherbushido. Fixes #3830
...
This was SVN commit r17907.
2016-03-17 08:25:13 +00:00
d44c4fd5c6
Update manual to mention skirmish maps
...
This was SVN commit r17906.
2016-03-17 08:13:52 +00:00
f7045b23ce
Fix some errors reported by translators on Transifex.
...
This was SVN commit r17905.
2016-03-16 23:27:17 +00:00
19a218cd48
Change the language names for translation credits to the names in the original language.
...
This removes the loophole in our release process, fixes #3827 .
This was SVN commit r17904.
2016-03-16 23:04:10 +00:00
6d52a71d4a
Include some new random maps by kali! Style updates by elexis and map previews by niektb.
...
Refs #3455
This was SVN commit r17903.
2016-03-16 22:59:10 +00:00
94f9100ba1
Limit the length of error strings to prevent crashes when logging long strings
...
This was SVN commit r17902.
2016-03-16 18:24:32 +00:00
29e0a23c8e
fix gui for non-sharable dropsites
...
This was SVN commit r17901.
2016-03-16 16:13:18 +00:00
d033038d69
Also translate specific name in strucTree (translations already exist)
...
This was SVN commit r17900.
2016-03-16 12:22:23 +00:00
c3324765d2
improved icon from niektb
...
This was SVN commit r17899.
2016-03-15 20:22:19 +00:00
0863f20722
cleanup
...
This was SVN commit r17898.
2016-03-15 18:27:17 +00:00
62f6aa07d0
Add missing round to the armor tooltip. Patch by fatherbushido, fixes #3817 .
...
This was SVN commit r17897.
2016-03-15 05:12:22 +00:00
518ae4fcb2
Lock diplomacy for all players if the locked-teams setting is enabled, fixes #3702 .
...
GUI fix in 17e6b316fa
2016-03-15 04:53:13 +00:00
d61e315f4d
Fix few style issues remarked by leper.
...
Add a unit (seconds) to the network-timeout warning.
Rename isChatAddressee to parseChatAddressee as it changes the message.
Early return for EnableOOSLog to avoid printing duplicate messages.
This was SVN commit r17895.
2016-03-15 04:37:41 +00:00
a2ecee4168
Rest of the previous commit, refs #3743 .
...
This was SVN commit r17894.
2016-03-15 04:08:07 +00:00
d7fe1b6002
Allow observers to follow the commands and attacks of the currently viewed player, fixes #3743 .
...
If enabled, the camera focuses on the affected units (source and target)
and selects them.
This was SVN commit r17893.
2016-03-15 04:02:15 +00:00
f1d99a9450
Fix a typo which made the "Exit" button in the in-game menu look weird. Thanks niektb for noticing!
...
This was SVN commit r17892.
2016-03-14 19:47:34 +00:00
dd07241ef7
Petra: fix a bug in attackPlan spotted by leper
...
This was SVN commit r17891.
2016-03-14 18:08:51 +00:00
c4f607f6e0
Random Map cleanup.
...
Remove unneeded braces and comments.
Use ++i instead of i++.
Use foo.bar instead of foo["bar"].
Fix a comment.
This was SVN commit r17890.
2016-03-14 18:00:09 +00:00
87da09bf1b
Fix tests broken in 028e573759
...
This was SVN commit r17889.
2016-03-14 17:50:56 +00:00
bedce1e617
Observer fix for shared-dropsites, refs #3791 .
...
This was SVN commit r17887.
2016-03-14 01:23:09 +00:00
541a5567d8
Show the attack-notification to observers.
...
Allow adding entities to the selection if they are owned by the observed
player.
This was SVN commit r17886.
2016-03-14 00:35:37 +00:00
a7b31398b0
Revert dbbc600dc3, refs #3745 , refs #3823
...
This was SVN commit r17885.
2016-03-13 22:18:31 +00:00
f7ea533ab9
better icon from niektb, refs #3791
...
This was SVN commit r17884.
2016-03-13 17:38:23 +00:00
9238fc8713
Fix oversight in dbbc600dc3: GetExtendedEntityState is far too demanding for performance, and it is not needed.
...
Refs #3745
This was SVN commit r17883.
2016-03-13 17:06:12 +00:00
d84ad7799a
Limit arrows on certain buildings and ships. Patch by sanderd17, fixes #3196 .
...
Balancing by elexis, reverts fcf7344537
2016-03-13 17:02:18 +00:00
042c9a9334
Allow hosting matches with 8 players and up to 16 observers, fixes #3254 .
...
The host can change the number of allowed observers in running games.
Make sure that joining observers won't take the "slot" of disconnected
players, fixes #3671 .
Send clients a new disconnect reason "Server full" instead of letting
them timeout.
This was SVN commit r17881.
2016-03-13 16:52:00 +00:00
dbbc600dc3
Workaround for the multiple-selection commands problem in the case of the back-to-work button. In this case a fix is really needed, as long as the system for handling the selection is not improved.
...
Also fix the wrong documentation for some functions.
Patch by svott, fixes #3745 .
This was SVN commit r17880.
2016-03-13 16:44:21 +00:00
369ca4d012
Allow RMS authors to set the biomeID explicitly or to randomize excluding some biomes.
...
Add missing semicolon for random_sky.
Fix some scope whitespace issues.
This was SVN commit r17879.
2016-03-13 14:13:38 +00:00
2022aad5d1
decrease the hack armour of fields to favor rushes
...
This was SVN commit r17878.
2016-03-13 14:09:52 +00:00
6c8004c206
Player component cleanup.
...
Fat-arrow.
Whitespace fixes for some selected objects.
Newlines to make it more readable.
++i instead of i++.
This was SVN commit r17877.
2016-03-13 13:49:37 +00:00
2e5969c395
Thanks Guuts for #3606 and the other patches you have worked on!
...
This was SVN commit r17876.
2016-03-13 13:36:25 +00:00
028e573759
allow the use of allied dropsites using tech, fixes #3791
...
This was SVN commit r17875.
2016-03-13 13:33:21 +00:00
bcfa626bc4
Improve 27b4df0978.
...
This was SVN commit r17874.
2016-03-12 22:20:15 +00:00
26488bd892
Fix ugly all-bold tooltip for the multiple details area capture bar (reported by bb who has a good eyesight!)
...
This was SVN commit r17871.
2016-03-12 18:36:28 +00:00
c9cecab0be
Remove libjpeg. Fixes #2828 .
...
Based on patch by dalerank, tested on Windows, might need to be amended
for OSX.
This was SVN commit r17870.
2016-03-12 18:15:04 +00:00
753a79ff67
Fix messages.json
...
This was SVN commit r17868.
2016-03-12 17:48:16 +00:00
b2f0544215
Delete some broken actor and art files, listed by stanislas69, refs #2524
...
This was SVN commit r17867.
2016-03-12 15:46:26 +00:00
a4a1bcab94
Remove the now useless UnitMotion planning, and cleanup of CCmpUnitMotion.cpp (unused variables, whitespace). Fixes #3790 .
...
This should have a noticeable impact on performance (in the good way!)
Thanks mimo for noticing something was off with the planning system!
This was SVN commit r17866.
2016-03-12 13:44:51 +00:00
27b4df0978
Improve some aura and technology descriptions where there was a confusion between speed and time.
...
Patch by Palaxin, fixes #3600
This was SVN commit r17865.
2016-03-12 13:18:32 +00:00
2546eecbf3
fix modifications (by tech or aura) of garrison and formation auras, fixes #3799 , patch by fatherbushido
...
This was SVN commit r17863.
2016-03-10 21:46:37 +00:00
18829e17c2
Fix comment following e0a9dfd5a2.
...
This was SVN commit r17862.
2016-03-10 17:11:36 +00:00
e0a9dfd5a2
Allow changing the late-observer flag in a running game, fixes #3669 .
...
Remove it from the game-attributes, since it is not used in the
simulation, nor are they supposed to change in running games.
This was SVN commit r17861.
2016-03-10 11:35:43 +00:00
2305218d9f
Optionnames are in lower case, refs #3604 .
...
This was SVN commit r17860.
2016-03-10 11:16:15 +00:00
b71e7e3538
Petra chathelper cleanup.
...
Inline variables used only once.
This was SVN commit r17859.
2016-03-10 10:44:52 +00:00
aa1e3f6d06
Session cleanup
...
Simpler errorhandling when fetching GUIInterface-notifications.
This was SVN commit r17858.
2016-03-10 10:15:23 +00:00
4b636fc407
Add a precision to the instructions included in default.cfg.
...
This was SVN commit r17857.
2016-03-09 21:48:41 +00:00
212d8e7dd0
cleanup of 98b4fe6d00
...
This was SVN commit r17856.
2016-03-09 21:45:14 +00:00
04586c9e8b
Adapt the number-of-players GUI objects of the lobby to support 10 and more clients.
...
This was SVN commit r17855.
2016-03-09 21:30:53 +00:00
98b4fe6d00
fixes confusion between markets when doing trade, fixes #3812 , patch by leper and fatherbushido
...
This was SVN commit r17854.
2016-03-09 19:54:12 +00:00
7409fe4bec
Defeated players are not supposed to do stuff.
...
Not sending resources on defeat also gives an incentive to completely
defeat players.
Patch by fatherbushido, refs #3265 .
This was SVN commit r17853.
2016-03-09 16:11:55 +00:00
2fea95530f
Quit if the user requested that while loading the replay list. Fixes #3446 .
...
This was SVN commit r17852.
2016-03-09 16:06:41 +00:00
f2ed0098ee
Make the playername-deduplication ("User" -> "User (2)") optional.
...
Have it disabled by default to fix #3604 .
Prevents players from rejoining as late-observers in case they timed-out
on the client-side but not on the server-side.
This was SVN commit r17851.
2016-03-09 15:02:38 +00:00
c0f321b52e
Add svott (refs #3736 ) and fpre (refs #3205 ) to the contributors.
...
This was SVN commit r17850.
2016-03-09 14:33:41 +00:00
7c33658fdd
ships can be garrisoned in cart superDock with a heal rate, fixes #3810 , patch by fatherbushido
...
This was SVN commit r17849.
2016-03-08 21:50:37 +00:00
a1c6d9149b
fix typo from 8725c3ae7a
...
This was SVN commit r17848.
2016-03-08 18:49:06 +00:00
c7c8d9a5c7
Map previews for 3 random maps and some selected demo maps. Patch by yoreei, fixes #3798 .
...
This was SVN commit r17847.
2016-03-08 17:29:18 +00:00
52bf894c50
Remove naval-tag from flood.
...
(It can be played without any ships and naval maps are not offered by
default).
Thanks yoreei for reporting.
This was SVN commit r17846.
2016-03-08 14:00:44 +00:00
c511e9c4ec
To avoid unintentional joins, ask lobby users if they want to late-join the game as an observer before attempting to do so. Refs #3739 .
...
Add selectedGame() to simplify some checks.
Add linebreaks to hostGame().
This was SVN commit r17845.
2016-03-08 00:18:21 +00:00
ea73e6b3b4
New random map script "Flood". Created by _kali and niektb, refs #3455 .
...
This was SVN commit r17844.
2016-03-07 23:13:52 +00:00
35a13c5080
Remove trailing whitespace.
...
This was SVN commit r17843.
2016-03-07 17:28:31 +00:00
f3ba295593
Add new contributor _kali to the randommap-script credits.
...
Add existing contributors niektb and Stan to the map-section for the new
maps in alpha 20.
This was SVN commit r17842.
2016-03-07 17:12:34 +00:00
dd5cc3d02e
Gamesetup cleanup.
...
Inline initializaiton of g_ServerName and fix a typo in e05c8263c5
2016-03-07 15:05:16 +00:00
fc0f496e3d
Fix indentation, refs #3803 .
...
This was SVN commit r17840.
2016-03-07 11:44:03 +00:00
e827ebeb5c
Multiplayer-gamesetup cleanup.
...
Eliminate deprecated for-each.
Quote object keys.
Remove unneeded sprintf from error() calls.
Remove unneeded comments.
Add linebreaks.
This was SVN commit r17839.
2016-03-07 11:42:52 +00:00
05bf260838
Fix the garrisoning flag for some Seleucid buildings, patch by stanislas69. Fixes #3631
...
This was SVN commit r17838.
2016-03-07 11:38:00 +00:00
49c30ae4b8
Give credit to three awesome contributors, refs #3802 .
...
This was SVN commit r17837.
2016-03-07 10:24:38 +00:00
231586f2fa
Aura cleanup.
...
Eliminate deprecated for-each.
Remove unused variable auraNames.
Use array-filter instead of for-loop.
Fix whitespace.
Don't use affectedPlayers outside of scope.
This was SVN commit r17835.
2016-03-06 14:57:39 +00:00
b1cacacff1
Fix the test of the Player-component following c9b0db7f5f. Patch by fatherbushido, fixes #3803 , refs #3522 .
...
This was SVN commit r17834.
2016-03-06 14:02:34 +00:00
b155a28698
Immediately set the fog-of-war instead of waiting for session.js to load, refs #3168 .
...
This was SVN commit r17832.
2016-03-06 13:56:07 +00:00
5a8d7d1a58
petra cleanup
...
This was SVN commit r17831.
2016-03-05 16:20:49 +00:00
bcf2c75513
New in-game Credits page, fixes #3744 .
...
This was SVN commit r17830.
2016-03-05 11:52:08 +00:00
1504115c14
I shouldn't rename things.
...
This was SVN commit r17829.
2016-03-05 11:43:14 +00:00
dfbf874d8b
Some string fixes.
...
This was SVN commit r17828.
2016-03-05 11:30:27 +00:00
6451a4c3c1
Petra: improve choice of workers, fixes #3586 , patch from otero
...
This was SVN commit r17827.
2016-03-04 17:08:45 +00:00
6b19eefdcb
cleanup of some foreach
...
This was SVN commit r17826.
2016-03-04 16:51:52 +00:00
9d2b8a74b7
petra: do not let the ai build too much towers or fortresses
...
This was SVN commit r17824.
2016-03-03 18:38:13 +00:00
d3e9aa2101
petra: complete changes started in 8d0223d6aa + some cleanup"
...
This was SVN commit r17823.
2016-03-03 16:18:12 +00:00
7403b92785
petra cleanup: use some arrow functions for sort
...
This was SVN commit r17822.
2016-03-02 17:10:26 +00:00
8d0223d6aa
petra: do not anymore assume that workers are necessarily builders and gatherers
...
This was SVN commit r17821.
2016-03-02 16:58:02 +00:00
8725c3ae7a
Diplomacy-manager cleanup.
...
Move resource-tributing button code to a custom function.
Shorten comment.
Reuse RESOURCES.
Inline tributeResource.
This was SVN commit r17820.
2016-03-02 16:56:44 +00:00
ed1afbebfc
Diplomacy-manager cleanup.
...
Move the text setup to a custom function.
Reuse colorizePlayernameByID.
Add newlines.
This was SVN commit r17819.
2016-03-02 16:44:57 +00:00
17e6b316fa
Diplomacy manager cleanup.
...
Move the diplomatic stance button initialization to a custom function.
Always hide the button if locked-teams is enabled, refs #3702 .
Inline setDiplomacy.
This was SVN commit r17818.
2016-03-02 16:38:05 +00:00
23d37f188a
cleanup of some missing tabs
...
This was SVN commit r17817.
2016-03-02 16:25:14 +00:00
e99e7e33ba
Diplomacy manager cleanup.
...
Split openDiplomacy into four smaller functions, starting with
diplomacyFormatAttackRequestButton in this commit.
Hide the button if the user has no allies and after defeat/win.
This was SVN commit r17816.
2016-03-02 16:23:46 +00:00
af396c9bf9
Player-component cleanup.
...
Remove deprecated for-each and inline a variable.
This was SVN commit r17815.
2016-03-02 15:00:24 +00:00
458b4a6567
Prohibit user-initiated diplomacy-changes in the simulation while ceasefire is active, refs #2749 .
...
This was SVN commit r17814.
2016-03-02 14:43:18 +00:00
012b686e7c
Two early returns. Refs #3265 .
...
This was SVN commit r17813.
2016-03-02 13:42:47 +00:00
163af24a6c
cleanup in petra, patch by otero
...
This was SVN commit r17812.
2016-03-01 17:57:19 +00:00
9c6082ec23
fix garrison aura from heros, patch by fatherbushido
...
This was SVN commit r17811.
2016-03-01 17:19:16 +00:00
04c94da3cb
add some missing spaces in previous commit
...
This was SVN commit r17810.
2016-03-01 17:12:38 +00:00
c9b0db7f5f
Techs can now modify an aura
...
Wonder population bonus is now an aura (reverted when the wonder is
destroyed) with 10 pop (wonder) with an additionnal +40 with the tech
patch by fatherbushido
This was SVN commit r17809.
2016-03-01 17:10:42 +00:00
b88fd4fe09
fix typo from 8a3bbdf4db
...
This was SVN commit r17808.
2016-02-29 17:21:35 +00:00
ba0700f612
garrisoning only works between mutual allies
...
This was SVN commit r17806.
2016-02-28 12:58:52 +00:00
ae309ed550
Replace the inscription on the altar in the main menu background.
...
The new inscription fits better with the scene, set in Sparta, and is
the Greek original epitaph written on the Cenotaph of Thermopylae,
according to Herodotus:
"Go, tell the Spartans, stranger passing by, that here, obedient to
their laws, we lie."
The previous inscription was apparently a fraction of a sentence and was
about Spartan foreign policy in Ionia.
Suggestion and research by Danny, art by wowgetoffyourcellphone.
This was SVN commit r17805.
2016-02-27 21:31:59 +00:00
c2fad862d8
Correct a typo in 2b0c40d7b2, thanks fede for reporting, fixes #3794 .
...
This was SVN commit r17804.
2016-02-26 22:40:22 +00:00
652ec4f8e5
fix some resetting of gatherer walk animation
...
This was SVN commit r17802.
2016-02-24 18:57:23 +00:00
ec43274e2b
drop carried resources when finishing to build a dropsite
...
This was SVN commit r17801.
2016-02-24 18:49:28 +00:00
05cf535c58
do not drop resources when garrisoning in allied structure
...
This was SVN commit r17800.
2016-02-24 17:45:13 +00:00
632901043e
Give the mauryan pillar of ashoka a trade speed bonus, fixes #3639 .
...
This was SVN commit r17799.
2016-02-23 23:30:42 +00:00
4ebcae8fa6
Highlight unassigned players in the player-assignments dropdown. Sort by player index. Based on patch by dalerank, fixes #3508 .
...
This was SVN commit r17798.
2016-02-23 22:40:43 +00:00
8b85b72dfc
Fix water-terrain painting following 6cc00f6a82. Based on patch by niektb.
...
This was SVN commit r17797.
2016-02-23 17:47:55 +00:00
2b0c40d7b2
Translate some untranslated strings, refs #3665 .
...
Add a chat message if the control-all units cheat was used, refs #2676 .
This was SVN commit r17796.
2016-02-23 17:29:39 +00:00
df42b9caba
Commands.js cleanup.
...
This was SVN commit r17795.
2016-02-23 15:51:09 +00:00
e10ff35869
Commands.js cleanup. Remove unneeded characters of all sorts and use "early-continues".
...
This was SVN commit r17794.
2016-02-23 15:04:28 +00:00
b60c6f6b15
Commands.js cleanup - fix whitespace.
...
This was SVN commit r17793.
2016-02-23 14:52:20 +00:00
8a3bbdf4db
Commands.js cleanup. Fix remaining for-each loops and increment operators.
...
This was SVN commit r17792.
2016-02-23 14:49:03 +00:00
e953ca23ba
Commands.js cleanup. Replace deprecated for-each.
...
This was SVN commit r17791.
2016-02-23 14:36:50 +00:00
3a502c0d21
Commands.js cleanup, use fat-arrows.
...
This was SVN commit r17790.
2016-02-23 14:13:46 +00:00
844566c787
Translate the developer-overlay notification at the receiving end, fixes #3304 .
...
This was SVN commit r17789.
2016-02-23 12:27:34 +00:00
7a5d75be11
Better placement for initial resources on Island Stronghold, based on patch by niektb, refs #3455 .
...
First place all starting entities before placing initial resources to
avoid placing them on each other.
Don't place initial mines near the territory of allies.
This was SVN commit r17788.
2016-02-23 11:51:16 +00:00
c6804aad35
Small RMS library style improvement.
...
This was SVN commit r17787.
2016-02-23 10:46:32 +00:00
fc298eb3f5
Show time-notifications to observers, refs #3168 .
...
This was SVN commit r17786.
2016-02-22 22:53:48 +00:00
b68654b52d
Inlining this is not possible due to the closure.
...
This was SVN commit r17785.
2016-02-22 17:23:46 +00:00
97c3a166a8
Don't shoot an undocumented arrow from UnitAI if the entity also has a BuildingAI component shooting arrows. Fixes #3763 .
...
Instead, add the arrow to the affected unit templates (except bireme and
trireme, refs #3196 ).
This was SVN commit r17784.
2016-02-22 17:01:16 +00:00
94ccb153a6
BuildingAI style fixes, refs #3763 .
...
Remove a duplicate targetUnits-, some useless length-checks and unneeded
comments.
This was SVN commit r17783.
2016-02-22 16:44:57 +00:00
8f630789e6
Add/move the Mercenary tag to VisibleClasses, so that all mercenaries are influenced by auras and techs.
...
Patch by fatherbushido, fixes #3770 .
This was SVN commit r17782.
2016-02-22 11:13:31 +00:00
6006edf031
Revert approach to detect offline players without remembering disconnect messages, since it doesn't work for entities of unassigned players. Refs #3677 .
...
Remove unused AIManager.
Inline playerData.
This was SVN commit r17780.
2016-02-20 17:37:19 +00:00
6e9fd4ccf2
fix the ungarrison-all command from allied structures
...
This was SVN commit r17779.
2016-02-20 15:04:00 +00:00
7918347342
Hide the offline-hint for gaia, refs #3677 .
...
Inline some variables.
This was SVN commit r17777.
2016-02-19 14:36:36 +00:00
a32ed75bff
Fix a race-condition when two games have been started simultaneously and attempt to create the same replay directory, refs #3255 .
...
Instead of triggering a debug-breakpoint, print a warning to stdout and
succeed in the N'th retry when having started N processes
simultaneously.
Previously the problem had been addressed by using the processID in the
directory name.
This was SVN commit r17776.
2016-02-19 11:22:32 +00:00
4cda0b7040
Don't show the offline hint for AI-assigned players, refs #3677 .
...
This was SVN commit r17774.
2016-02-18 14:46:45 +00:00
6cc00f6a82
Reduce base-height of the random map island stronghold, so units don't walk too far into the water. Patch by niektb, refs #3455 .
...
This was SVN commit r17773.
2016-02-18 13:50:10 +00:00
2e7e1c0b2b
Prevent the local client of the host from becoming disconnected in case of lag, fixes #2854 .
...
This was SVN commit r17772.
2016-02-18 13:10:59 +00:00
f8b20d181d
Add chat-addressee dropdown, refs #1767 .
...
Add observer-only chat and allow private messages from observer to
observer.
Prevent defeated players from using the team-chat, fixes #3441 .
This was SVN commit r17771.
2016-02-18 01:09:56 +00:00
365cbf5b64
Apply auras to resource costs of buildings. Fix some broken loops over a Map. Patch by fatherbushido, fixes #3769 .
...
This was SVN commit r17770.
2016-02-17 23:27:36 +00:00
6289251b3b
Improve unitMotion in the final step before reaching the target,
...
which decreases the proportion of units going back and forth around the
target
This was SVN commit r17769.
2016-02-17 19:00:34 +00:00
4584a81656
be less restrictive with fix for #3785
...
This was SVN commit r17768.
2016-02-17 18:31:01 +00:00
5aa7a232a4
Ceasefiremanager cleanup.
...
Let instead of var.
Remove unneeded comments.
Remove trailing whitespace.
This was SVN commit r17767.
2016-02-16 16:23:40 +00:00
41d7e64271
prevent short pathfinder to go into impassable region, fixes #3785
...
This was SVN commit r17765.
2016-02-15 21:24:27 +00:00
a9376eeebb
update goal before pathing when moving target refs #3472 and improve unitMotion overlay
...
This was SVN commit r17764.
2016-02-15 19:30:17 +00:00
c3ac6cf7fc
Save target-nodes (lookAt-coordinates) for cinematic-camera paths. Patch by Vladislav, refs #3301 .
...
This was SVN commit r17763.
2016-02-15 17:18:59 +00:00
badc75b0ad
Show wall-aura in the construction tooltip. Patch by s0600204, fixes #3766 .
...
This was SVN commit r17762.
2016-02-15 16:18:57 +00:00
5998d13442
Use date and sequential ID for replay-directorynames, fixes #3255 .
...
Save replays in userdata (screenshots, savegames) and create one
subdirectory for every release.
This was SVN commit r17761.
2016-02-15 15:57:23 +00:00
ab57951198
Don't lose the player-offline hint on diplomacy change. Patch by dalerank, fixes #3677 .
...
Also remove the "disconnected" property which has apparently never been
used since its introduction in 81f5e0ac5f
2016-02-15 15:38:56 +00:00
5485f50948
Defeat the player if the only building owned is an athenian theatron. Patch by fatherbushido, refs #3229 .
...
This was SVN commit r17759.
2016-02-15 13:08:59 +00:00
9ec4f35959
Improve and fix some wrong observer-checks that didn't take defeated players into account. Refs #3168 , #3215 .
...
Introduce isPlayerObserver to easily cover that case.
Move some checks and updates into selectViewPlayer and eliminate
setObserverMode.
Initialize the music before changing the perspective.
This was SVN commit r17758.
2016-02-15 12:53:06 +00:00
e3bd2e3fa8
Session cleanup, some simplifications.
...
This was SVN commit r17757.
2016-02-15 11:39:02 +00:00
823fe17dd4
Entity selection cleanup.
...
Replace deprecated for-each and remove trailing whitespace.
This was SVN commit r17755.
2016-02-14 23:25:28 +00:00
cb4f8989f1
add a small vision range for aggressive/violent animals, refs #3783
...
This was SVN commit r17754.
2016-02-14 17:08:55 +00:00
ecb65cd58d
petra cleanup
...
This was SVN commit r17753.
2016-02-13 16:28:23 +00:00
2695e7c77b
Remove trailing whitespace, refs #3586 .
...
This was SVN commit r17752.
2016-02-13 11:44:46 +00:00
3244d91add
Don't render a selection box instead of crashing due to ENSURE when elements are removed from a dropdownlist
...
(while the list is rendered and the last element being selected).
This was SVN commit r17751.
2016-02-12 16:38:25 +00:00
07133ceb8c
fix sound options not propagated to sound manager when reverting/resetting options
...
This was SVN commit r17749.
2016-02-09 19:00:10 +00:00
4ad601a301
Sorry for the surprise fix but that really hurts my eyes :p
...
This was SVN commit r17748.
2016-02-09 16:12:52 +00:00
cd9106b664
Fix / finish previous commit.
...
This was SVN commit r17747.
2016-02-09 14:34:59 +00:00
ca9d06d6ad
Correct handling of replays with no turns or only turn 0.
...
Add a comment for 3ec3f0b160
2016-02-09 12:09:17 +00:00
4ac89001f4
Fix compile error for gcc 4.6, refs #3168 .
...
This was SVN commit r17745.
2016-02-08 22:44:23 +00:00
ca19d42a68
fix typos in renderer's initialization, refs #3737
...
This was SVN commit r17744.
2016-02-08 18:27:56 +00:00
ac1f935bad
Split GUI updates from onSimulationUpdate.
...
This was SVN commit r17743.
2016-02-08 14:01:21 +00:00
a9de2bf397
cleanup of 971d70fa99
...
This was SVN commit r17741.
2016-02-07 19:06:15 +00:00
971d70fa99
allows the user to restore the default game options, refs #3737
...
This was SVN commit r17739.
2016-02-07 15:10:44 +00:00
43f358563c
when saving an option to file, write only that value and not all the content of the user configDB, refs #3737
...
This was SVN commit r17738.
2016-02-07 11:31:23 +00:00
26f7a3df96
init configDB with renderer initial values, refs #3737
...
This was SVN commit r17737.
2016-02-07 11:24:09 +00:00
a2f7d4d82a
Show fog of war in observermode, fixes #3168 .
...
This was SVN commit r17735.
2016-02-06 12:56:41 +00:00
875a774da9
New random map "Island Stronghold" by _kali, reworked by niektb. Refs #3455 .
...
This was SVN commit r17734.
2016-02-06 12:30:40 +00:00
b973eebeda
Add color indicator to the playerselection in observermode, refs #3168 .
...
This was SVN commit r17733.
2016-02-06 12:19:02 +00:00
22f5b00fce
Implement network-warnings, fixes #3264 .
...
Shows a notification if the local client or other players connections
timeout or have bad latency.
This was SVN commit r17730.
2016-02-04 17:14:46 +00:00
4d41bd9622
reorganize options, adding dependences, refs #3737
...
This was SVN commit r17729.
2016-02-02 21:50:00 +00:00
6052716a78
Random-map-script cleanup.
...
Move duplicate code of the area- and object-group placing methods to
retryPlacing and two coordinate-randomization functions.
Remove three unused functions (println obsolete since 0e0ed9492634f1817869
2016-02-02 16:33:36 +00:00
fdc67768f0
Random random-map-script cleanup.
...
Simplify sortPlayers.
Use [] instead of new Array.
Remove unneeded braces.
Use JSDoc comments.
Use let instead of var.
This was SVN commit r17727.
2016-02-02 13:35:03 +00:00
b1fbc5b6bd
Add newlines, remove unneeded braces.
...
This was SVN commit r17726.
2016-02-02 11:23:01 +00:00
254f6357f6
Fix a typo (terreins -> terrains).
...
This was SVN commit r17725.
2016-02-02 10:56:39 +00:00
d8b0404281
petra: some tweaks to be able to better deal with maps like the Migration scenario
...
i.e. maps with a small starting island, no initial population and no
initial gathering food
This was SVN commit r17723.
2016-01-29 19:41:34 +00:00
30bd2baeeb
fix Migration scenario map
...
This was SVN commit r17722.
2016-01-29 18:53:09 +00:00
b65f2a338c
petra cleanup
...
This was SVN commit r17720.
2016-01-28 19:44:18 +00:00
c46e64c4d2
fix dropdown option
...
This was SVN commit r17719.
2016-01-28 18:44:50 +00:00
30d0bcd350
petra remove some useless code
...
This was SVN commit r17718.
2016-01-28 18:30:39 +00:00
75d91c6a26
petra: fix account of foundation popbonus when checking if new houses are needed
...
This was SVN commit r17717.
2016-01-27 18:30:49 +00:00
06eadf2bc4
petra cleanup + some tweaks
...
This was SVN commit r17716.
2016-01-27 18:17:55 +00:00
564941c477
fix wall buildings after f34dc412b6, refs #3647
...
This was SVN commit r17715.
2016-01-26 19:04:29 +00:00
91ed318f0d
fix typo
...
This was SVN commit r17714.
2016-01-26 18:36:59 +00:00
08d326cef5
clone the rallypoint data from cmd, fixes #3751
...
This was SVN commit r17713.
2016-01-26 18:03:06 +00:00
090f2ccfe5
Don't modify the command object. Refs #3647 .
...
This was SVN commit r17712.
2016-01-26 17:58:15 +00:00
bb8ceba632
completes f34dc412b6 for non visual replays, refs #3751
...
This was SVN commit r17711.
2016-01-25 20:37:26 +00:00
ab16ddb256
Show a more specific disconnect-message in case the host closed the server. Refs #3264 , #3570 .
...
This was SVN commit r17710.
2016-01-25 12:56:30 +00:00
3ec3f0b160
Stop the animations at the end of visual replays, refs #3581 .
...
This was SVN commit r17709.
2016-01-25 10:23:03 +00:00
e683751b4f
Delete code which became obsolete with 56bb858802.
...
This was SVN commit r17708.
2016-01-25 09:57:33 +00:00
68f87cb556
Proportionally adapt cost for civ-specific fortresses since the generic template was changed in 6b9b863747.
...
Thanks Hannibal Barca for reporting.
This was SVN commit r17706.
2016-01-25 00:38:33 +00:00
4a58c7f8b6
petra: improve performance of docks positioning (was really slow) + some cleanup
...
This was SVN commit r17705.
2016-01-24 20:43:27 +00:00
7c6f35b2c0
Update the unit selection for observers, refs #3168 .
...
Don't disable the deselect button.
This was SVN commit r17704.
2016-01-24 12:33:34 +00:00
199d38dfec
Work around clang bug to fix compiling.
...
This was SVN commit r17703.
2016-01-24 10:34:38 +00:00
4bff1ef1a9
Disables MSVC build warning C4003 "not enough actual parameters for macro", introduced by changes in Boost 1.57
...
This was SVN commit r17700.
2016-01-24 01:03:39 +00:00
aa8541e8ce
2-player skirmish map "Golden Island". Created by scythetwirler and updated by niektb.
...
This was SVN commit r17697.
2016-01-23 23:02:25 +00:00
1a66f510d0
Use const T& for parameters of some types in script-exposed native functions
...
Using references matches the C++ coding style better and should improve
performance a bit in theory. It avoids 2 copies of T in case of the
functions registered with RegisterFunction (mainy used in the GUI). It
should also avoid one or two copies in case of
DEFINE_INTERFACE_METHOD_X, which is used in the simulation, but I
haven't bothered to count it there exactly.
It is now predefined which types have to be passed by const reference
and which are passed by value. Note that references can't be used as
out-parameters (to return multiple values to JS). This hasn't worked
before either and probably never will.
This was SVN commit r17696.
2016-01-23 15:17:56 +00:00
5f86beea6f
Replace HandleWrapper and avoid repoint function
...
JS::Handle<T>::repoint gets removed with SpiderMonkey 38, so the
existing solution has to be replaced. The new approach should also be a
bit clearer. Named Return Value Optimization (NRVO) should avoid a
superfluous temporary for the return value in the generic template
function implementation of AssignOrFromJSVal.
Refs #3708
This was SVN commit r17695.
2016-01-23 14:42:59 +00:00
b9f1125010
Fixes memory leak in TestPreprocessor. When using CPreprocessor::Parse "you must free() the result string only if the returned address is not inside the source text"
...
This was SVN commit r17693.
2016-01-23 03:48:00 +00:00
27d04d0165
Close previously opened dialogs before opening a new one. Fixes #3535 . Also remove many duplicate calls.
...
This was SVN commit r17692.
2016-01-23 03:40:31 +00:00
4fbd550cda
Correct z-ordering issue for chat panel and input form. Patch by dalerank, refs #3535 .
...
This was SVN commit r17691.
2016-01-23 03:24:00 +00:00
c97a91f7bd
Change displayed string instead of throwing errors in case of unspecified civs in replays.
...
This was SVN commit r17690.
2016-01-23 02:41:35 +00:00
5747619c39
Don't create replays without commands in case of running non-visual replay or an atlas simulation.
...
Remove trailing whitespace.
This was SVN commit r17689.
2016-01-23 01:02:57 +00:00
dd7287c1c8
additionnal petra cleanup
...
fix a case with foundation access not defined
This was SVN commit r17688.
2016-01-22 19:46:51 +00:00
c955d74330
petra cleanup (thanks to leper's suggestion)
...
This was SVN commit r17687.
2016-01-22 18:45:28 +00:00
fdf7dabe18
check that the target can be built or repaired inside the canRepair function
...
This was SVN commit r17685.
2016-01-21 20:49:57 +00:00
edb16dafbb
petra cleanup
...
This was SVN commit r17684.
2016-01-21 20:38:56 +00:00
df7da846ad
some cleanup in ai api
...
This was SVN commit r17683.
2016-01-21 20:23:19 +00:00
b5cb62ffa2
Remove error messages from the CinemaManager, since not having a GameView is expected in non-visual replay. Patch by Vladislav, refs #3301 .
...
This was SVN commit r17682.
2016-01-21 13:07:52 +00:00
cccd33e7fe
petra cleanup
...
This was SVN commit r17679.
2016-01-20 19:45:47 +00:00
87886b7b03
fix the AI for the switch to the Repairable component
...
This was SVN commit r17678.
2016-01-20 19:04:38 +00:00
dd545bdbf1
petra cleanup
...
This was SVN commit r17677.
2016-01-19 23:19:40 +00:00
0a64bf25cd
Sort globals, add JSDoc comments, remove trailing whitespace.
...
This was SVN commit r17676.
2016-01-19 18:09:34 +00:00
5308b95aa8
Let observers change perspective. Refs #3168 .
...
Disable the controls for observers (unless the developer-option is
enabled).
Don't check for g_IsObserver, since observers should be able to use the
developer overlay as well.
Update all GUI elements when changing the perspective using
onSimulationUpdate().
Enable observermode for defeated players.
This was SVN commit r17675.
2016-01-19 17:23:16 +00:00
0e48b7df75
Update the idle-worker-button onSimulationUpdate. Patch by svott, fixes #3736 .
...
This was SVN commit r17674.
2016-01-19 16:04:59 +00:00
f34dc412b6
Deep freeze simulation commands to prevent accidental updates. Fixes #3647 .
...
This was SVN commit r17673.
2016-01-18 22:24:50 +00:00
e035e3e985
Restore the replay selection after deletion. Based on patch by dalerank, fixes #3473 .
...
This was SVN commit r17672.
2016-01-18 20:16:45 +00:00
a6f8b3b3d7
rename the Close button, refs #3737
...
This was SVN commit r17671.
2016-01-18 19:44:48 +00:00
a59833102f
Specify the default column sorting order in XML instead of JS.
...
Ref #2405 , #3473 .
This was SVN commit r17670.
2016-01-18 19:23:14 +00:00
9481c168bd
petra cleanup
...
This was SVN commit r17669.
2016-01-18 19:20:09 +00:00
69f4614768
Don't use two different default values ("name" and "") in JS for the default lobby sorting order in b8fce56821, refs #2405 .
...
Supplement a variable g_GameStatusOrder missing in 66ec6dbf12
2016-01-18 18:29:16 +00:00
f8941ac668
boost_signals was removed in 940868398c.
...
This was SVN commit r17667.
2016-01-18 16:46:32 +00:00
5d00d0ff8b
Update libpng to 1.6.21 + comments cleanup.
...
This was SVN commit r17666.
2016-01-18 16:42:54 +00:00
7c40c67efa
Fix a bug in b8fce56821 which prevented the replaylist from being sorted correclty on init, refs #2405 , #3473 .
...
The default column argument is given in XML and applied in
COList::SetupText() but it hasn't been stored, preventing JS from
knowing the selected column.
This was SVN commit r17665.
2016-01-18 14:45:13 +00:00
8827db201a
Remove the virtual keyword since this is a helper-function not used by the interface. Refs #3215 .
...
This was SVN commit r17663.
2016-01-18 03:41:00 +00:00
8d2a73bf52
Show the aura of city walls in the structure tree. Patch by s0600204, refs #3655 .
...
This was SVN commit r17662.
2016-01-18 03:24:26 +00:00
48ba4d9cb4
Updates precompiled win32 SDL libs to 2.0.4 from libsdl.org.
...
Fixes windows build with SDL 2.0.4, fixes #3138 , #3225
This was SVN commit r17658.
2016-01-17 23:11:37 +00:00
c20ee2ad5e
add dropdown capacity for options, fixes #2596
...
remove use of eval for function execution
This was SVN commit r17657.
2016-01-17 21:50:54 +00:00
dc9d1fff11
restore sorting in template, refs #3741
...
This was SVN commit r17656.
2016-01-17 15:44:38 +00:00
cfb2216b8c
Remove JSDebugger. Closes #2419 , #2973 . Refs #410 , #2348 , #3708 .
...
https://bugzilla.mozilla.org/show_bug.cgi?id=1069694
This was SVN commit r17655.
2016-01-17 00:34:33 +00:00
b4d11cf747
let farms have the terrain ownership, fixes #3741
...
This was SVN commit r17654.
2016-01-16 12:47:33 +00:00
c4d9b64fe5
fix undef var when in petra debug
...
This was SVN commit r17653.
2016-01-15 19:12:34 +00:00
0d33ec31cc
Pass cmd to TryTransformWallToGate as that is used when debugging commands. Patch by dalerank. Fixes #3694 .
...
This was SVN commit r17651.
2016-01-14 16:21:05 +00:00
327c0d0d00
Remove trailing whitespace. Refs #118 .
...
This was SVN commit r17650.
2016-01-14 00:04:32 +00:00
419453e212
Allow randommap-scripts to set a custom fail-limit when placing objects. Patch by Stan, fixes #3567 .
...
This was SVN commit r17649.
2016-01-13 23:51:46 +00:00
ad7c53e65a
Adapt the template for corrals to the limitation in UnitAI.CanGarrison. Refs #3412 .
...
This was SVN commit r17648.
2016-01-13 23:33:08 +00:00
c33d1e3741
Remove commented out code and comments invalid since 9542ecdd7e.
...
This was SVN commit r17647.
2016-01-13 22:39:09 +00:00
aa7ef01105
rename reload to revert
...
This was SVN commit r17646.
2016-01-13 22:32:42 +00:00
5c61f68600
Rework the logics of options loading to allow more flexibility (i.e. adding a min or max value for number inputs)
...
Fix some problems when reloading saved options, refs #3511
Add the material quality option, refs #3737
Reload and Save buttons are only enabled when some options have changed.
This was SVN commit r17645.
2016-01-13 22:01:36 +00:00
cd22f9f722
Display all auras in the tooltips (even if there are some with an identical name). Patch by s0600204, fixes #3655 .
...
Add an aura tooltip to the construction panel.
Remove duplicate tooltip code for the training panel.
Eliminate for-each and use the aura ID in GetTemplateDataHelper, since
only that is a unique identifier.
Change the name from "Hero Aura" to "Garrisoned Capture Aura" for that
aura that every hero has.
This was SVN commit r17644.
2016-01-13 19:32:17 +00:00
c9a22ec7c3
Show the population bonus of buildings in the structure tree. Patch by s0600204, fixes #3738 .
...
Also fix a newline in the tooltip.
This was SVN commit r17643.
2016-01-13 18:44:30 +00:00
fb92761c92
Use explicit types instead of auto.
...
This was SVN commit r17642.
2016-01-13 00:42:55 +00:00
27fab6bf1e
Constify Spatial.h a bit.
...
While there don't check for null when delete-ing since that is a no-op,
use the proper type instead of auto, always swap when removing a single
element (instead of comparing .size() to 1), and clean up includes.
foobar
This was SVN commit r17641.
2016-01-13 00:20:22 +00:00
e6a8cd8c5e
Do not redeclare a variable.
...
This was SVN commit r17640.
2016-01-12 20:04:33 +00:00
ee6a5fd915
Extend defensive-stance tooltip and add quotes to object keys.
...
This was SVN commit r17639.
2016-01-12 18:32:30 +00:00
a02f797169
Add unit-stance tooltips. Patch by bb, fixes #3385 .
...
Reorder cases, correct indentation, remove unneeded variable and
sprintf.
This was SVN commit r17638.
2016-01-12 16:19:43 +00:00
4107c2abb9
Fix link to documentation.
...
This was SVN commit r17637.
2016-01-11 23:56:51 +00:00
83efc8363e
fix old typos in sound config
...
This was SVN commit r17636.
2016-01-11 22:39:03 +00:00
2ec4d87abf
Use .assign instead of operator=.
...
This was SVN commit r17634.
2016-01-11 20:57:03 +00:00
f4898c18d8
SpiderMonkey 38 removes the JS_LookupProperty{,ById} API. Refs #3708 .
...
Use JS_GetProperty{,ById} instead.
Ensure that we break if someone tries to serialize a getter by using
something similar to what we used pre 47a03c3397https://bugzilla.mozilla.org/show_bug.cgi?id=1094176
This was SVN commit r17633.
2016-01-11 20:03:33 +00:00
39eb7fb243
Fix JS_SetGCZeal call.
...
https://bugzilla.mozilla.org/show_bug.cgi?id=650978
https://bugzilla.mozilla.org/show_bug.cgi?id=742570
This was SVN commit r17632.
2016-01-11 20:03:31 +00:00
775f856421
Use .assign instead of operator=.
...
This was SVN commit r17631.
2016-01-11 20:03:28 +00:00
d08044c8ad
JS_DumpHeap is removed in SpiderMonkey 38, since we have nothing using it remove it. Refs #3708 .
...
https://bugzilla.mozilla.org/show_bug.cgi?id=1105069
https://bugzilla.mozilla.org/show_bug.cgi?id=1122842
This was SVN commit r17630.
2016-01-11 20:03:09 +00:00
785acdb1c6
Fix test failure on Windows.
...
This was SVN commit r17629.
2016-01-11 20:03:01 +00:00
f0fc36138d
cleanup of previous patches
...
This was SVN commit r17627.
2016-01-10 22:46:37 +00:00
3246b02cda
make easy AI levels easier and hard levels harders by also applying the bonus/malus to trade, fixes #3722
...
add some info on AI levels in the AI config window
This was SVN commit r17626.
2016-01-10 21:57:01 +00:00
7fa2962c45
allows changing options for one session without having to save them, fixes #3511
...
changes on text or number options are now detected without any need of
typing Return, fixes #2451
graphic options (using the renderer type) are now properly saved when
changed
sound options (using the function type) are still not saved
This was SVN commit r17625.
2016-01-10 21:41:34 +00:00
e9511d21d5
Fix bug in d4d05c6236.
...
This was SVN commit r17624.
2016-01-10 17:25:40 +00:00
8c7b6dceaa
Show status-bars of all players to observers, fixes #3215 .
...
This was SVN commit r17623.
2016-01-10 16:47:57 +00:00
8859f33b38
Rename PickFriendlyEntitiesOnScreen to PickPlayerEntitiesOnScreen.
...
Rename PickFriendlyEntitiesInRect to PickPlayerEntitiesInRect.
Rename PickSimilarFriendlyEntities to PickSimilarPlayerEntities.
Add comment.
Refs #3215 .
This was SVN commit r17622.
2016-01-10 14:47:09 +00:00
4a9d6d2e5f
Update all OS X libraries to their latest versions (exlcuding currently unused libjpeg, see #2828 ). Some also include security fixes. Fixes #3721 .
...
Also disable unused wxwidgets features. Patch by trompetin17, refs
#2924 .
Tested by wraitii.
This was SVN commit r17621.
2016-01-10 13:23:25 +00:00
893ca29723
Allow 10 clients to conncet to the server by default (allows 8 players and 2 observers). Refs #3254 .
...
This was SVN commit r17620.
2016-01-10 01:06:07 +00:00
ead85b1572
Update the control-all-units checkbox when changing the perspective and onSimulationUpdate so that it always shows the correct value.
...
This was SVN commit r17619.
2016-01-10 00:59:28 +00:00
9a623a8e00
Style fixes.
...
This was SVN commit r17618.
2016-01-09 23:01:07 +00:00
6b710f35b0
Show the selection panels to observers / in replays, fixes #3731 .
...
This allows observers to see the training queue, researched techs, unit
stance, constructable buildings, garrisoned units, market prices etc.
for all players without changing the perspective.
All buttons are disabled if the user isn't allowed to control the
affected player.
Notice updateUnitCommands() fills out the panel differently in case of
selecting an allied building.
Extends the GUIInterface methods "GetNeededResources",
"CheckTechnologyRequirements" and "IsTechnologyResearched" to optionally
take a different player-argument.
This was SVN commit r17617.
2016-01-09 22:01:08 +00:00
9b922ebadd
Remove invisible character introduced in deaa224785.
...
This was SVN commit r17616.
2016-01-09 12:12:42 +00:00
629e73a768
Fix a compiler warning.
...
This was SVN commit r17615.
2016-01-09 09:52:51 +00:00
491cba314a
Translate some notification messages. Refs #3665 .
...
This was SVN commit r17614.
2016-01-08 23:22:45 +00:00
caa81a1d31
Remove garrison code duplication.
...
This was SVN commit r17613.
2016-01-08 23:02:26 +00:00
deaa224785
Fix some Gallic leader names, based on historic_bruno's suggestions. Fixes #3675
...
This was SVN commit r17612.
2016-01-08 20:12:25 +00:00
87a93b2498
Add version command line option. Fixes #2965 .
...
This was SVN commit r17611.
2016-01-08 19:35:33 +00:00
b4f187b8d4
Defeat the player if he/she has no more units, nor buildings that can train units. Fixes #3229 .
...
This was SVN commit r17610.
2016-01-08 12:21:40 +00:00
5b60f2d1f6
Display the buildrate of foundations in the tooltip. Patch by bb, fixes #3395 .
...
This was SVN commit r17609.
2016-01-08 11:53:48 +00:00
e1e4a00ad7
Enable sky by default. This is usually not needed during gameplay (no sky visible), but it is with cinematic, committed in 89aef0b6eb, where camera can point to the sky.
...
Can still be disabled in game options menu.
Refs: #3301 .
This was SVN commit r17607.
2016-01-07 12:38:43 +00:00
1cc1ba2b17
Fix non-visual replaymode. Refs #3301 (cinematic camera). Patch by Vladislav. Bug reported by eternaf.
...
This was SVN commit r17606.
2016-01-06 21:40:59 +00:00
a7743e95b9
cleanup of unused counters
...
This was SVN commit r17605.
2016-01-06 21:15:58 +00:00
e0a1e2beb1
Session cleanup.
...
Don't send the simstate as an argument of reportGame().
Eliminate a for-each loop.
Remove some superfluous comments.
This was SVN commit r17604.
2016-01-05 03:02:59 +00:00
b18cd3254c
Test FixedVector{2,3}D script conversions, and test calling functions of the prototypes.
...
Also ENSURE that the given value identifier is actually present in the
cache instead of creating one if it is not.
This was SVN commit r17603.
2016-01-04 21:41:40 +00:00
4c4beb8450
cleanup
...
This was SVN commit r17602.
2016-01-04 18:10:04 +00:00
9f334036ef
Do not align object properties.
...
Do not construct objects if they only contain two atomic elements.
Revert getDisconnectReason so as to have a custom message for the error
case. Add a warning.
This was SVN commit r17601.
2016-01-04 17:59:12 +00:00
ab4668ac79
Remove legacy error codes from strings.
...
This was SVN commit r17600.
2016-01-04 17:58:28 +00:00
7a3f011587
Fix a typo.
...
This was SVN commit r17599.
2016-01-04 17:05:43 +00:00
5033fd6cbf
Some const and fix the indentation.
...
This was SVN commit r17598.
2016-01-04 17:05:39 +00:00
24b14fe201
allow the AI to build near walls (but not gates), fixes #3725
...
This was SVN commit r17596.
2016-01-03 21:04:23 +00:00
89aef0b6eb
Cinematic camera core functionality. Patch by Vladislav Belov.
...
Based on existing code that was still around from an old(not working)
implementation.
Supports basic control from trigger scirpts (queue, start and stop
camera paths) and works in multiplayer.
This was SVN commit r17594.
2016-01-03 12:41:04 +00:00
d313a1934a
Code style cleanups for CinemaPath in preparation for the cinematic camera patch.
...
Refs #3301
This was SVN commit r17593.
2016-01-02 20:14:14 +00:00
a32aa3b6cf
petra: use the proper attack number when deserializing, refs #3720
...
This was SVN commit r17592.
2016-01-02 18:16:50 +00:00
036f985017
Add missing semicolons.
...
Update timestamp.
This was SVN commit r17591.
2016-01-02 18:12:02 +00:00
8773d816ae
add specific regeneration when idle, fixes #3606 , patch by Guuts
...
This was SVN commit r17590.
2016-01-02 18:10:10 +00:00
1d00164b6b
petra: make better use of the new fishing tech
...
This was SVN commit r17589.
2016-01-02 17:50:56 +00:00
d5d60d53ed
Replace JS_ASSERT (which is renamed to MOZ_ASSERT in SpiderMonkey 38) with TS_ASSERT, since the former was used for no apparent reason.
...
This was SVN commit r17588.
2016-01-01 21:28:25 +00:00
9281aaf25e
Map more specific messages from the Gloox documentation to registration results and stanza errors in the lobby code. Also, don't request translation of more arcane errors. Fixes #3047
...
This was SVN commit r17587.
2016-01-01 18:38:50 +00:00
371a41c216
seems that line was missing, with the result that garrisoned units sent a TerritoryPositionChanged message each turn
...
This was SVN commit r17586.
2016-01-01 17:45:53 +00:00
7c89cfb3ba
fix typo in petra debug outputs
...
This was SVN commit r17585.
2016-01-01 17:41:49 +00:00
9f9db45a03
Fix broken feedback display logic and broken error handling from ccb534259d. Additionally, streamline logic in prelobby.js and remove an unexplained check in lobby.js added by 76a1a84a58.
...
This was SVN commit r17584.
2016-01-01 17:18:17 +00:00
ccb534259d
Major lobby cleanup.
...
Create an object holding the handling of all netmessage types.
Display private messages sent by moderators.
Details:
Switch back the second and third argument of CreateSimpleMessage, so it
relates again to the switch/object.
Reduce the dimension/nesting of the object/switch from three to two.
Hence remove the useless "standard" and "internal" value send in the
text field.
Rename CreateSimpleMessage to CreateGUIMessage
Use the property "level" instead of "text" for "connect" and
"disconnect".
Remove the handling of the "connect" event in lobby.js, since it is
never called.
Translate the disconnect event.
Add comments and explicit checks to handleMessage and handleMUCMessage
to make obvious where they differ.
Remove the "message" property from those GUI messages, since it should
just use "text".
Move the login-fail handling to JS.
Remove useless sprintf calls from warning messages.
Inline some variables.
Add missing semicolons.
This was SVN commit r17581.
2015-12-31 17:08:23 +00:00
2bf194134b
Repairrate cleanup. Refs #3395 , patch by bb.
...
Rename ratio to rate.
Simplify translation.
Round in GUI, not simulation.
Check for div/0.
Fix wrong variable name in test_GuiInterface.js.
This was SVN commit r17580.
2015-12-31 15:20:12 +00:00
75eed7cc79
Missing semicolons, two wrong commata, jshint ftw.
...
This was SVN commit r17579.
2015-12-31 14:02:59 +00:00
a144ec7e08
Indentation corrections and other code style fixes in preparation for the cinematic camera patch.
...
Refs #3301
This was SVN commit r17578.
2015-12-31 13:40:56 +00:00
460f17e6f7
Fix mauryan pillar of ashoka GUI panel bug. Refs #3639 .
...
It can only be built while ashoka is alive.
Previously the structure was selectable from the panel but not placable
while he was absent.
This was SVN commit r17577.
2015-12-31 12:19:45 +00:00
f7a262fa4a
Remove trailing whitespace. Based on patch by otero, refs #3268 .
...
This was SVN commit r17576.
2015-12-31 11:45:13 +00:00
8d9cfd66b8
Reorganize code in different files in prepartion for the cinematic camera patch (by Vladislav Belov).
...
Refs #3301
This was SVN commit r17575.
2015-12-30 21:16:35 +00:00
969008befd
Add shebang to ease running the script as a program.
...
Update replay command adding needed -mod=public.
This was SVN commit r17574.
2015-12-30 14:29:28 +00:00
36c08193ba
optimizes range queries, fixes #3717
...
This was SVN commit r17573.
2015-12-30 13:44:51 +00:00
082a32802b
Refresh the diplomacy and trade window in case the playerselection (change perspective) has changed.
...
This was SVN commit r17572.
2015-12-30 12:10:11 +00:00
aa8e0159a0
Only regain health while idle (Battlefield Medicine tech). Fixes #3606 , patch by Guuts.
...
This was SVN commit r17571.
2015-12-30 11:37:50 +00:00
6cdd99474a
Fix fail.
...
This was SVN commit r17570.
2015-12-30 11:17:50 +00:00
7648b4f482
Gamesetup and session cleanup.
...
Convert network commands to an object and simplify the formating of
system chat messages.
This was SVN commit r17569.
2015-12-29 15:29:24 +00:00
46a42c04ef
Gamesetup message cleanup.
...
Transform switch-statements into objects.
Make them more consistent, in particular the kick/ban and
ready-messages.
Also colorizes the playername in disconnect messages.
Fix a wrong comment in the network code and remove a duplicate check
(AIs).
This was SVN commit r17568.
2015-12-29 14:45:53 +00:00
9f65e90b60
Fix wrong errormessage in case of encountering a broken replay.
...
This was SVN commit r17567.
2015-12-29 14:00:30 +00:00
f8ec158116
Session cleanup.
...
Transform trivial switch-statements to objects.
Move removeOldChatMessage right below addChatMessage, since it is only
used there.
This was SVN commit r17566.
2015-12-28 23:16:33 +00:00
2e8d5aa2c8
Session chat cleanup.
...
Unify switch-statement using objects.
Do not parse recursively, but do a linear 2-step process. Remove msg.me
property and move "/me" parsing out of that function.
Early return instead of using msg.hide.
Add observer-checks for private messages to impede abuse and fix #3270 .
Remove the "/all" command, since it doesn't add functionality but
complexity.
Remove a TODO as displaying multiple contexts ("/team /allies text"?) is
not useful currently and made the previous code error-prone.
This was SVN commit r17565.
2015-12-28 22:16:21 +00:00
2a0d403b4b
let promotion improve a bit the capture strength of citizen
...
This was SVN commit r17564.
2015-12-28 18:51:49 +00:00
6182385626
Session cleanup.
...
Remove variable action.
Close diplomacy and trade window on disconnect.
This was SVN commit r17563.
2015-12-28 17:19:29 +00:00
543472b77b
Optimization of isBoxVisible + cleanup, fixes #3712
...
This was SVN commit r17561.
2015-12-28 16:27:31 +00:00
82c215de49
prevent thousands of calls per turn of calculeTerritories which would exit immediately
...
This was SVN commit r17560.
2015-12-28 16:23:06 +00:00
704c08d2b0
petra: fixes placement of dock when on the border of the map
...
fixes attack path computation when change of target during
preparation
fixes #3710
This was SVN commit r17557.
2015-12-26 13:14:13 +00:00
0d41806e99
Session cleanup.
...
Move formating of resource-amounts to new function
translateResourceAmounts.
Rename player/player1 to sourcePlayer/targetPlayer.
Inline colorizedPlayername.
This was SVN commit r17556.
2015-12-26 01:40:50 +00:00
5d56ee0449
Session cleanup.
...
Move new objects to globals, which makes the code easier to read,
changable for mods and saves performance.
Move cheat functions below variable declarations.
Remove old function formatClientList, which for any reason didn't make
it into last commit.
This was SVN commit r17555.
2015-12-26 00:42:52 +00:00
a280cb87db
Colorize playernames when using the /list command in the gamesetup/session.
...
Add two missing semicolons and remove an unnecessary one.
Eliminate formatClientList, message, formattedUsername and
formattedUsernamePrefix.
Move four hardcoded colors to globals.
This was SVN commit r17554.
2015-12-25 23:49:28 +00:00
5f95bca6b0
Session cleanup (trading dialog text).
...
Move the code to update the idle-traders text to two new simplified
functions.
Eliminate all if-statements (including quadruple-nested ones).
This was SVN commit r17553.
2015-12-25 19:35:14 +00:00
0fb87496e7
Display the correct AI name instead of "Unknown Player" in case an AI sends a formatted chat message (introduced in 03adf0111a).
...
Thanks Evulant (AlThePhoenix) for reporting.
This was SVN commit r17552.
2015-12-25 18:07:16 +00:00
b154056266
Those globals were removed in 5aae5ee55a.
...
This was SVN commit r17550.
2015-12-24 20:54:47 +00:00
5aae5ee55a
Session menu cleanup.
...
Replace for-each with for-of.
Remove duplicate code from updateMenuPosition.
Eliminate three unneeded globals.
Rename savedGameData to g_SavedGameData.
Remove unneeded braces.
This was SVN commit r17549.
2015-12-24 14:59:03 +00:00
39ffb0a6bd
Session menu cleanup.
...
Rename globals to g_Foo.
Remove unused variable playerID from updateTimeNotifications which
became obsolete in fe9eeedd66
2015-12-24 02:53:18 +00:00
7a75f22f9f
Session cleanup.
...
Transform switch-statement in handleNetMessage to object of fat-arrow
functions.
Also add missing check to colorizePlayernameByGUID.
This was SVN commit r17547.
2015-12-24 01:46:06 +00:00
7caaa278d6
Session cleanup.
...
Move code from switch-statement to handlePlayerAssignmentsMessage.
Inline updatePlayerDataAdd and updatePlayerDataRemove as they are tiny
and only used here.
Remove comments, early return, eliminate for-each.
This was SVN commit r17546.
2015-12-24 01:06:01 +00:00
f276791069
Session cleanup.
...
Transform netstatus switch-statement to an object consisting of a
fat-arrow function per message type.
This was SVN commit r17545.
2015-12-23 23:51:18 +00:00
3dcf51c466
Session chat cleanup.
...
Remove duplicate code by transforming getUsernameAndColor to
colorizePlayername.
Notice the previous function getUsernameAndColorByGUID didn't work with
unassigned players.
This was SVN commit r17544.
2015-12-23 19:06:48 +00:00
48f72aacc9
petra: some defense tweaks + cleanup
...
This was SVN commit r17543.
2015-12-23 16:17:05 +00:00
4eedfac0ca
Refactor session chat.
...
Show chatmessages for diplomacy-changes and tributed resources to
observers/in replays. Fixes #3379 .
This was SVN commit r17542.
2015-12-23 15:48:06 +00:00
03adf0111a
Session chat cleanup
...
Remove g_PlayerAssignments from calls to findGuidForPlayerID, since the
argument was removed in ae92736b02
2015-12-22 21:45:09 +00:00
cf7b8329fb
Use var instead of let, since this variable is defined with var in this function already.
...
This was SVN commit r17540.
2015-12-22 20:43:17 +00:00
3fd4d07ca1
Test \0 in object property names for serializing.
...
This was SVN commit r17539.
2015-12-22 19:01:18 +00:00
67b7366528
petra: remove hyphen in file names
...
This was SVN commit r17538.
2015-12-22 18:21:37 +00:00
ae92736b02
Session chat cleanup.
...
Use .property instead of ["property"].
Use if (object.property) instead of if ("property" in object).
Use array- and fat-arrow functions.
This was SVN commit r17537.
2015-12-22 17:37:22 +00:00
3ba50b4ed4
decrease the repair rate of walls, refs #3707
...
This was SVN commit r17536.
2015-12-22 17:37:00 +00:00
6970ebba16
Test non-ASCII string conversions.
...
This was SVN commit r17535.
2015-12-22 17:30:05 +00:00
ef7c01ee4c
Don't error out when selecting maps with non-existent civs.
...
This was SVN commit r17534.
2015-12-22 17:04:57 +00:00
385101bbe7
petra: cleanup of defenseManager
...
This was SVN commit r17533.
2015-12-22 16:58:53 +00:00
dca07f9ddd
Fix e9bc3e2089.
...
This was SVN commit r17532.
2015-12-22 16:44:27 +00:00
4212777334
Session chat cleanup.
...
Correct indentation.
This was SVN commit r17531.
2015-12-22 16:05:27 +00:00
e9bc3e2089
Session chat cleanup.
...
Split formatChatMessage into smaller functions.
Correct the indentation with the next commit.
This was SVN commit r17530.
2015-12-22 16:02:25 +00:00
0e40273c28
Session chat cleanup.
...
Move code from addChatMessage to a new function formatChatMessage.
This was SVN commit r17529.
2015-12-22 15:29:03 +00:00
57af0ac8b4
Session chat cleanup.
...
Remove duplicate call to parseChatCommands.
Rename msg.action to msg.me, as it only applies to the "/me" chat
command.
Remove some duplicate checks.
Remove unused variable userTag.
Also fix a wrong space in the loading screen.
This was SVN commit r17528.
2015-12-22 14:56:30 +00:00
848efb56b3
Make a method const.
...
This was SVN commit r17527.
2015-12-22 14:08:32 +00:00
bd35b097e2
Session chat cleanup.
...
Process the "system" case first.
Move shared variable to colorizedPlayername.
Remove trailing whitespace.
This was SVN commit r17526.
2015-12-22 13:38:38 +00:00
b790403c87
Strip trailing whitespace from network code.
...
This was SVN commit r17524.
2015-12-21 13:58:32 +00:00
72dcd7422d
Loading screen cleanup. Patch by Stan, refs #2087 .
...
Use let instead of var.
Use g_ prefix for globals.
Remove trailing whitespace.
This was SVN commit r17523.
2015-12-20 23:02:18 +00:00
41fa85a34b
Map cleanup.
...
Remove the "Seed" attribute as it is a relict of Atlas and not used
anywhere.
Also remove the author-tag of Forest Battle (4) as it's the only map
that has it.
This was SVN commit r17522.
2015-12-20 21:48:48 +00:00
0dda3b579c
drop resources before switching to next queued order, fixes #1670
...
This was SVN commit r17521.
2015-12-20 21:30:34 +00:00
d4d05c6236
Session cleanup. Patch by Stan.
...
Eliminate the deprecated for-each.
This was SVN commit r17520.
2015-12-20 21:20:05 +00:00
423d26890a
fix cases where changes in unitai orders were not transmitted to the ai
...
This was SVN commit r17519.
2015-12-20 21:07:47 +00:00
bacedf18bc
Show the repair-ratio in the tooltip of buildings. Patch by bb, refs #3395 .
...
This was SVN commit r17518.
2015-12-20 20:40:42 +00:00
eb8e381934
GuiInterface Cleanup
...
Remove trailing whitespace.
This was SVN commit r17517.
2015-12-20 19:18:39 +00:00
fab9327a14
GuiInterface cleanup. Refs #3395 .
...
Simplify GetAverageRangeForBuildings and GetFormationInfoFromTemplate.
Use let instead of var.
Quote object keys.
Remove unneeded braces and variables.
Remove unused variable cmpMirage in L414 and numCleared in L1096.
Add missing semicolon in L637.
Use fat-arrow function.
This was SVN commit r17516.
2015-12-20 19:05:57 +00:00
c2b74197e0
Cleanup tooltips and selection details. Refs #3395 .
...
Use let instead of var.
Quote object keys.
Prefix globals with g_.
Remove some unneeded variables.
Use ternary operator and fat arrow functions.
This was SVN commit r17515.
2015-12-20 17:15:21 +00:00
eea104748d
Adjusts female citizen HP cost correctly using relative templates. Fixes #3510 . Patch by Palaxin.
...
This was SVN commit r17514.
2015-12-19 22:57:28 +00:00
509028d738
CompileOptions::setFileAndLine does not copy the string, so create a copy for it.
...
This was SVN commit r17512.
2015-12-19 02:55:30 +00:00
332096e4ed
SpiderMonkey 38 removes JS_AllocateArrayBufferContents.
...
Users required the returned buffer to be passable to free(), so replace
it by malloc().
https://bugzilla.mozilla.org/show_bug.cgi?id=1037358
This was SVN commit r17511.
2015-12-19 02:49:46 +00:00
190f9176df
SpiderMonkey 38 removes JS_NewPropertyIterator, use JS_Enumerate instead.
...
https://bugzilla.mozilla.org/show_bug.cgi?id=1081660
This was SVN commit r17510.
2015-12-19 02:21:22 +00:00
e80e37cb21
Fix whitespace.
...
This was SVN commit r17509.
2015-12-19 02:03:30 +00:00
753936e7df
SpiderMonkey 38 removes JS_Evaluate{,UC}Script, use JS::Evaluate.
...
https://bugzilla.mozilla.org/show_bug.cgi?id=1100579
This was SVN commit r17508.
2015-12-19 01:58:03 +00:00
56bf37a54e
Simulation cleanup (Attack.js)
...
Use let instead of var.
Do not redeclare timeToTarget and cmpTimer.
Remove unused variable graphicalPosition.
Fix some whitespace issues.
This was SVN commit r17507.
2015-12-19 01:48:11 +00:00
2239fe338c
The jschar typedef is removed in SpiderMonkey 38.
...
Since it already is char16_t in 31 replace it by that.
https://bugzilla.mozilla.org/show_bug.cgi?id=1063962
This was SVN commit r17506.
2015-12-19 01:29:55 +00:00
69ab2bae5b
Some ctors were made explicit in SpiderMonkey 38, so call them where needed.
...
https://bugzilla.mozilla.org/show_bug.cgi?id=1013663
This was SVN commit r17505.
2015-12-19 01:13:56 +00:00
efda359acc
Use new when calling the builtin typed array constructor.
...
The current code will be forbidden in ES6.
This was SVN commit r17504.
2015-12-19 01:10:13 +00:00
825a2fcc34
Summary screen cleanup. Based on patch by bb, fixes #3518 .
...
This was SVN commit r17503.
2015-12-19 01:00:32 +00:00
a381334976
Gamesetup cleanup
...
Unify the gameattributes-update of checkboxes.
This was SVN commit r17502.
2015-12-18 22:40:56 +00:00
9cf9695d8d
Graceful exit in case of trying to replay a directory. Fixes #3427 .
...
Also remove unneeded variable ran_atlas.
This was SVN commit r17501.
2015-12-18 21:16:08 +00:00
abce6cb737
Pathfinder optimization, fixes #3541 .
...
Simplify the math of Geometry::TestRayAASquare.
This was SVN commit r17500.
2015-12-18 15:05:33 +00:00
659606b83e
Revert the removal of setting the defaults in updateGUIObjects in b1e754c9b1 (until a better solution is found).
...
Add comments for the unsuspecting.
This was SVN commit r17499.
2015-12-18 12:48:04 +00:00
2d34b198df
Remove a wrong tag from two skirmish maps.
...
This was SVN commit r17497.
2015-12-17 21:10:20 +00:00
d31afada25
Gamesetup cleanup
...
Move assignments of dropdownlist functions from XML to JS, so they are
all defined in one place.
Rename a function.
This was SVN commit r17496.
2015-12-16 23:13:59 +00:00
dca32228b5
fix dead tree actor, patch by stanislas69, fixes #3705
...
This was SVN commit r17495.
2015-12-16 20:45:08 +00:00
3196df663f
some petra cleanup
...
This was SVN commit r17494.
2015-12-16 17:57:39 +00:00
6c4598fe16
increase a bit the loot xp of fauna_hunt, refs #3701
...
This was SVN commit r17493.
2015-12-16 17:54:00 +00:00
58cf3cb266
Correct two wrong references to variables in 5ccee7ade1. Patch by bb, fixes #3703 .
...
This was SVN commit r17492.
2015-12-16 17:15:16 +00:00
c1b97e4709
Improve indentation of 'case' statements updated after SDL1 removal (thanks leper).
...
Also update other 'case' statements in the same file for consistency.
This was SVN commit r17491.
2015-12-16 15:36:56 +00:00
7e9d105401
Toggle the session menu with the hotkey. Patch by Vladislav, fixes #3661 .
...
This was SVN commit r17490.
2015-12-16 02:05:29 +00:00
1c6baed8e3
Gamesetup cleanup
...
Move creation of game-description to a separate function.
This was SVN commit r17489.
2015-12-16 01:37:43 +00:00
b1e754c9b1
Gamesetup cleanup
...
Remove all remaining variables referencing GUI objects in
updateGUIObjects.
Do more simple checks and insert new calls at more coherent places.
This was SVN commit r17488.
2015-12-16 00:42:26 +00:00
6873a5e5a9
Gamesetup cleanup
...
Unify switch-statement and remove unused variables.
This was SVN commit r17487.
2015-12-15 23:57:45 +00:00
f99de00779
Fix an operator precedence bug in the previous commit.
...
This was SVN commit r17486.
2015-12-15 23:19:01 +00:00
78cc57c16b
Gamesetup cleanup (loadPersistMatchSettings, updateGUIObjects)
...
Move GUI updates from loadPersistMatchSettings to updateGUIObjects.
Simplify updateGUIObjects and use setGUIBoolean.
Move SetRankedGame from updateGUIObjects to handleGamesetupMessage.
Early return in handleGamesetupMessage.
This was SVN commit r17485.
2015-12-15 18:25:32 +00:00
df25d425dd
Gamesetup cleanup (loadPersistMatchSettings)
...
Remove duplicate GUI updates which are done in initMapNameList and
updateGUIObjects.
Remove the g_IsInGuiUpdate line as the variable will be overwritten with
the next statement.
This was SVN commit r17484.
2015-12-15 17:16:35 +00:00
ffc70a2390
Gamesetup cleanup.
...
Don't copy the label from the dropdownlist, but create it from
g_MapFilters.
Move placeholder items to g_RandomMap and g_RandomCiv.
This was SVN commit r17483.
2015-12-15 15:40:34 +00:00
ab053fef3e
Gamesetup cleanup
...
Remove 4 duplicate GUI updates in updateGUIObjects.
mapSelectionBox is updated in initMapNameList, the other three are done
80 lines below.
Inline finding of the selected map.
This was SVN commit r17482.
2015-12-15 14:57:06 +00:00
a960958379
Gamesetup cleanup.
...
Abort in case a client tries to update the gamesettings.
Rename onGameAttributesChange to updateGUIObjects.
Move a check to sendRegisterGameStanza().
This was SVN commit r17481.
2015-12-15 14:14:52 +00:00
8354adb74a
Gamesetup cleanup
...
Deobfuscate mapfilter code. Remove unneeded, peculiar functions.
Construct g_MapFilters in-place and mark as const.
In initMapNameList, load "all" maps if no mapfilter is specified.
This was SVN commit r17480.
2015-12-15 12:23:39 +00:00
5a7c2ec2db
Cleanup after SDL1 removal.
...
Remove the "sdl1" option from premake4.lua (thanks historic_bruno).
Improve isUnprintableChar indentation, resolve two defines, change SDL*
to SDL2 in premake (thanks leper).
This was SVN commit r17479.
2015-12-15 08:53:24 +00:00
931f5f752b
Gamesetup cleanup.
...
Resolve if-statements in initMultiplayerSettings.
This was SVN commit r17478.
2015-12-15 00:21:27 +00:00
5a7a56da41
more cleanup on petra
...
This was SVN commit r17477.
2015-12-14 21:17:22 +00:00
0ed4a4c102
update the XP loot points of animals, fixes #3701 , and remove the outdated and not used elephant template
...
This was SVN commit r17476.
2015-12-14 20:49:04 +00:00
636cc34a13
Gamesetup cleanup & translation fix
...
The caption of mapSelectionText (mapname-label visible to clients)
showed "random" instead of a translated "Random".
Move hardcoded "orange" color to a global const.
Simplify loadMapData.
Rename saveGameAttributes() to savePersistMatchSettings().
This was SVN commit r17475.
2015-12-14 18:47:41 +00:00
a8ac537ebc
Limit the number of units spawned when using cheats to prevent freezing the game. Based on patch by Stan, fixes #3545 .
...
This was SVN commit r17474.
2015-12-14 17:10:55 +00:00
da9ec4f325
Session cleanup.
...
Remove unused and useless ambientsound code. The ambient actually stops
with EndGame.
This was SVN commit r17473.
2015-12-14 16:47:45 +00:00
5df6a0182a
Gamesetup cleanup.
...
Use hideControl for playerdropdowns.
Remove some superfluous checks and comments.
Simplify using logical or, math and ternary operator.
This was SVN commit r17472.
2015-12-14 15:37:58 +00:00
acde954f8d
Gamesetup cleanup.
...
Use let in function scope too.
Though spider monkey doesn't support let fully yet, it might be able to
detect some more reference errors in the code with later versions.
For example if a let variable is referenced before being defined
(temporal dead zone).
Besides, it is an easier rule to follow (let in functions, var for
globals) and makes the code more coherent.
This was SVN commit r17471.
2015-12-14 14:32:43 +00:00
9a2d0f803e
Remove disabled by default SDL1 support.
...
Refs #2041 .
This was SVN commit r17470.
2015-12-14 10:52:21 +00:00
7665a9ee31
Session cleanup.
...
The usual suspects:
Move all constants to the top.
Rename all globals to g_Foo.
Use let for all local variables (except in the for-each parts which will
be updated later).
Quote object keys.
Ternary operator.
Fat-arrow functions.
Whitespace issues.
This was SVN commit r17468.
2015-12-14 05:37:34 +00:00
25e6136786
Clear g_ChatTimers too in case the new /clear command is used from the session. Refs #3396 .
...
This was SVN commit r17467.
2015-12-14 04:14:58 +00:00
4dbc9b8b1d
Cleanup color.js
...
Move some shared color-code to color.js.
Remove shuffleArray() as it's unused since bbc325fb5a
2015-12-14 03:53:48 +00:00
6e80288d30
Add a chat-command to clear all messages. Works for lobby, gamesetup and session. Patch by ruiRanger, fixes #3396 .
...
This was SVN commit r17465.
2015-12-14 03:12:26 +00:00
f776e06044
Session messages/notification cleanup.
...
Rename globals, use const, let, JSdoc comments.
Rename host to guid for coherency.
Don't use for-each.
This was SVN commit r17464.
2015-12-14 03:08:53 +00:00
45c7d1681f
petra cleanup, mainly renaming stuff for better readability
...
This was SVN commit r17463.
2015-12-13 22:04:09 +00:00
5864447d92
Don't resurrect dead units when trying to promoting them while they die. Patch by karamel, fixes #3544 .
...
This was SVN commit r17461.
2015-12-13 18:09:56 +00:00
b87b3ff3dc
Left some debug code in.
...
This was SVN commit r17460.
2015-12-13 17:39:19 +00:00
a7a6b3316c
GUI cleanup.
...
Moves cropping of the mappreview image to a common function
setMapPreviewImage.
Also avoids magic numbers by using the actual formula.
This was SVN commit r17459.
2015-12-13 17:09:41 +00:00
1e504cd64c
Fix the actoreditor menu bar on OSX. Patch by trompetin17. Fixes #1554 .
...
This was SVN commit r17458.
2015-12-13 16:53:35 +00:00
909b8d4369
Allow multiple special sprites, to facilitate cases where we want to add an overlay to a sprite.
...
"color" can make use of the sprite's alpha texture, and the "add_color"
effect will now take the original image's alpha into account.
Remove the no longer needed "unaffordableMask" images on a variety of
panels.
Somewhat based on a patch by BoeseRaupe. Fixes #2421 and #3688 .
This was SVN commit r17456.
2015-12-13 16:03:17 +00:00
88d6f35126
Summary screen cleanup.
...
Rename panelsData and teamMiscHelperData to g_Foo.
Use let instead of var everywhere except for globals.
Quote object keys, add some spaces.
This was SVN commit r17455.
2015-12-13 13:20:54 +00:00
5ccee7ade1
Summary screen cleanup. Patch by bb, refs #3518 .
...
Renames globals to g_Foo.
Uses let instead of for in loops.
Fixes indentation and some whitespace issues.
This was SVN commit r17453.
2015-12-13 12:42:58 +00:00
160b6e60cd
Added new tree acacia and variations.
...
Upgraded aleppo pines.
New Oaks and dead oaks variations.
New generic dead trees.
Upgraded grapes texture by Stanislas69. Thanks Stan!
This was SVN commit r17452.
2015-12-12 22:44:39 +00:00
5c36a4ab22
Gamesetup cleanup.
...
Unify calls to hideControl which were duplicated per maptype.
This was SVN commit r17451.
2015-12-12 21:43:32 +00:00
59b9a7a0db
Gamesetup cleanup.
...
Introduce a GUI function to set checkboxes and their label-counterpart
in one line.
Replace code that is duplicated for every maptype.
Fix a typo "ExporeMap" from e05c8263c5
2015-12-12 20:29:54 +00:00
745b1aae8d
Correctly hide the mapsize-description (see 0b4308bbc8).
...
This was SVN commit r17449.
2015-12-12 18:07:39 +00:00
47a23904e5
adding more diversity in petra warnings
...
This was SVN commit r17448.
2015-12-12 15:45:02 +00:00
0b4308bbc8
Gamesetup cleanup (simplify GUI calls)
...
Make a hidden function globally available and use it everywhere to
simplify the hiding/showing of GUI elements.
Use strings instead of the references to the actual GUI objects, so that
the code doesn't rely on variables anymore.
Use a default argument so we can reuse it with regards to other
conditions like scenario maps or multiplayer.
Notice the JS variables have the same name as the GUIObjects, so the
replacement is simple.
This was SVN commit r17447.
2015-12-12 15:35:52 +00:00
2e54fee44d
Fix oversight in 3006904403.
...
This was SVN commit r17446.
2015-12-12 15:27:07 +00:00
96003e8812
Correct the order of JSDoc arguments in so many places and use @returns instead of @return.
...
Remove some unneeded comments.
This was SVN commit r17445.
2015-12-12 14:53:28 +00:00
89f74d2528
Fix a playerassignment-bug in the gamesetup where the game couldn't be started if a player has rejoined the gamesetup while the host reduced the number of players.
...
The previous code failed at it as it looped over g_PlayerAssignments
instead of all slots.
Based on patch by Pilzschaf, fixes #3602 .
This was SVN commit r17444.
2015-12-12 12:00:18 +00:00
a939b49de7
Fix #3607 by assigning new players to unused slots instead of assuming that the n'th slot is available.
...
This was SVN commit r17443.
2015-12-12 10:48:59 +00:00
3006904403
Gamesetup cleanup.
...
Split handleNetMessage into five smaller functions.
Besides improving the readability a bit, it allows adding new variables
without declaring them in the scope of other messagetypes.
This was SVN commit r17442.
2015-12-12 10:31:06 +00:00
ead4caaa41
do mot modify the cmd object, refs #3467
...
This was SVN commit r17441.
2015-12-11 20:15:10 +00:00
bdc028fe09
Include award-winning skirmish map Forest Battle (4). Map created by Stan and reworked by niektb. Fixes #3618 .
...
See Mapping Contest 16 hosted by the Council of Modders.
This was SVN commit r17440.
2015-12-11 19:36:03 +00:00
71abb9cbed
Use same resource translations as are used in the GUI already. Refs #3691 .
...
This was SVN commit r17439.
2015-12-11 19:11:37 +00:00
eacbdd4dfb
cleanup in the petra queueManager
...
This was SVN commit r17438.
2015-12-11 18:45:03 +00:00
489822e384
some cleanup in the ai common-api
...
This was SVN commit r17437.
2015-12-11 18:35:01 +00:00
925b2910fe
Fix whitespace and remove the placeholder functions initHostControls and initFinalize (see previous commit).
...
This was SVN commit r17436.
2015-12-11 18:33:09 +00:00
7b9c1e23db
Major gamesetup cleanup.
...
Split the 280-line function initGUIObjects (former initMain) into
sixteen short functions.
Do not correct indentation in this commit in order to have the smallest
changeset possible, highlighting the actual changes
[the only logic change being mapTypes.selected and mapFilters.selected
being set one function (initMoreOptions) earlier].
This was SVN commit r17435.
2015-12-11 18:20:45 +00:00
48e3959391
Change the "Summary" button from the top bar to the menu to help support our minimal resolution.
...
Disable said button for non-observers.
Refs #3387 .
This was SVN commit r17434.
2015-12-11 15:49:33 +00:00
4a81d53f3b
Gamesetup cleanup.
...
Rename initMain to initGUIObjects to clarify what the function does.
While init() sets globals without touching the GUI, initGUIObjects
updates all GUI controls after the first tick.
Rename loadGameAttributes to loadPersistMatchSettings as that's more
specific as to where the attributes are loaded from.
Add some JSDoc comments and a TODO for an annoying old bug.
Simplifiy to-boolean conversions by negating twice (!!)
This was SVN commit r17433.
2015-12-11 14:11:33 +00:00
682a7b3ba0
Gamesetup cleanup.
...
Don't define variables inside switch-statements.
Move chat-font to global.
Rename host and an i to guid, newPlayer to newGUID to be more coherent.
Do early continues when finding joinings/leavings and swapping players.
This was SVN commit r17432.
2015-12-11 11:55:16 +00:00
c32a2b52be
Gamesetup cleanup.
...
Simplify initMapNameList.
Remove six superfluous checks.
Remove two unneeded variables in updatePlayerList.
This was SVN commit r17431.
2015-12-11 10:17:44 +00:00
42548698c5
Gamesetup cleanup.
...
Replace more var by let.
The only remaining places to update are switch-statements.
This was SVN commit r17429.
2015-12-11 00:21:04 +00:00
df86b15b91
Gamesetup cleanup.
...
Simplify by using array functions, the ternary operator and unifying
duplicate code.
Move map-paths to a global.
This was SVN commit r17428.
2015-12-11 00:02:18 +00:00
d07f16ed80
petra: fix resource translations, fixes #3691
...
This was SVN commit r17427.
2015-12-10 20:35:24 +00:00
afa07325a1
petra: improve the detection of stuck gatherers, refs #3562
...
This was SVN commit r17426.
2015-12-10 20:02:37 +00:00
a74d9be130
make const the new method introduced in 2451872731
...
This was SVN commit r17425.
2015-12-10 19:23:50 +00:00
57260e185b
Use let instead of var in the gamesetup.
...
Doing so follows the principle of least exposure and means those
variables will be destroyed when leaving the block (i.e. memory being
freed up earlier).
The blocks affected by this commit are short (mostly 3-5 lines).
The variables are not referenced before or after the block, nor in their
temporal dead zones.
This was SVN commit r17424.
2015-12-10 17:44:14 +00:00
e57c99c6f6
Add a button to the top bar to access the summary screen in-game or in replays.
...
No effort was done to prevent players from accessing it since it's
impossible to prevent them from doing so anyway.
Fixes #3387 .
This was SVN commit r17423.
2015-12-10 15:33:06 +00:00
4dcbad7b1b
Simplify init() and initMain(). Exit gracefully in case of encountering an error there.
...
Do not focus the maplist when entering the singleplayer gamesetup as
that actually doesn't have an effect (you can't scroll the maplist with
arrow-keys).
This was SVN commit r17422.
2015-12-10 14:24:03 +00:00
9b4e359d64
Gah.
...
This was SVN commit r17421.
2015-12-10 13:28:57 +00:00
223305b7ae
Simplify sendRegisterGameStanza by using the conditional operator and removing four variables which are used only once.
...
This was SVN commit r17420.
2015-12-10 13:20:45 +00:00
7a8c37a885
Use map function instead of deprecated for-each.
...
This was SVN commit r17419.
2015-12-10 13:06:36 +00:00
63fa889fcd
Rename playableOnly to selectableOnly as non-selectable civs can be playable on scenario maps.
...
This was SVN commit r17418.
2015-12-10 12:52:38 +00:00
af4dc43478
Revert the removal of non-selectable civs from the gamesetup ( bbc325fb5a) to allow scenario maps to select unselectable civs.
...
This was SVN commit r17417.
2015-12-10 12:49:53 +00:00
349b5786dd
Fix test failure. Refs #3590 .
...
This was SVN commit r17416.
2015-12-09 22:52:33 +00:00
b6dbb2bff0
fix tabs of 2451872731
...
This was SVN commit r17415.
2015-12-09 20:56:53 +00:00
2451872731
improve performance of hierarchical pathfinder, refs #3588
...
This was SVN commit r17413.
2015-12-09 19:56:30 +00:00
73a26a22ca
Enable by default postproc, smoothlos and all water features when on OpenGL4+.
...
This autodetection has a higer priority than default.cfg, but lower
priority than local changes.
Note that after enabling these features some get disabled later on on
some drivers (Intel, software renderers).
Also note that mesa drivers only expose core profile OpenGL, and 0 A.D.
reads compatibility profile, so that on mesa drivers OpenGL4 is never
detected and these features are never enabled by default.
This was SVN commit r17412.
2015-12-09 16:12:58 +00:00
07f0a178f4
Fixes what looks a copy-paste error.
...
Makes disable_allwater setting in hwdetect.js what it was supposed to
do.
This was SVN commit r17411.
2015-12-09 11:35:40 +00:00
a5152c14d1
Properly use the passed parameter as all other occourences.
...
Fixes 'disable_allwater = false' case in hwdetect.js.
This was SVN commit r17410.
2015-12-09 11:28:24 +00:00
6a73dc2e16
fix multiple (useless) insertion in grid update of hierarchical pathfinder
...
This was SVN commit r17409.
2015-12-08 22:58:04 +00:00
b4f0227f1b
Add support for undeletable entities. Fixes #3590 .
...
This was SVN commit r17408.
2015-12-08 22:34:32 +00:00
82ca673e0a
petra: retune the dock placement criteria, fixes #3469
...
This was SVN commit r17407.
2015-12-08 19:16:50 +00:00
489e41362a
Use placeholder in plural string.
...
This was SVN commit r17406.
2015-12-08 18:13:09 +00:00
fd32da5c87
Update tinygettext.
...
Updates tinygettext to upstream commit
328f015d0b07465c8a5a05cbfc0a41154a2f8ebf.
This adds better collision logging.
This was SVN commit r17405.
2015-12-08 18:05:11 +00:00
61886f0e7a
Use inheritance instead of redefining properties.
...
This was SVN commit r17404.
2015-12-08 18:05:06 +00:00
80663a6c8a
Add gray, stone-esc modern button type.
...
This was SVN commit r17403.
2015-12-07 18:47:41 +00:00
71cd4ac3cc
Simplify input.js. Unify checks, remove unneeded variables and use the conditional operator.
...
This was SVN commit r17401.
2015-12-07 13:45:50 +00:00
780a1de136
Don't comment out code. Refs #3486 .
...
This was SVN commit r17400.
2015-12-07 12:27:52 +00:00
8af675e207
Don't emit sounds when selecting dead animals. Patch by Stan. Fixes #3486 .
...
This was SVN commit r17399.
2015-12-07 00:21:24 +00:00
9e39d6b46c
Implement markForPluralTranslation() which allows to translate plural-strings sent by the simulation.
...
Use it for the build-restriction notifications.
Based on patch by Safa Alfulaij, fixes #3081 .
This was SVN commit r17398.
2015-12-06 23:56:03 +00:00
66bb4deef8
Use the tech name as it is used everywhere else.
...
This was SVN commit r17397.
2015-12-06 21:29:09 +00:00
d5e083247a
fix 66bd932374 which has increased too much the repair specificness: it should be higher than the capture one, but smaller than the move one. refs #3443
...
This was SVN commit r17396.
2015-12-06 21:02:04 +00:00
3483a2d226
Extract attack notification strings. Refs #3691 .
...
This was SVN commit r17395.
2015-12-06 20:51:32 +00:00
abd7b78b02
Return the boolean test instead of having an if-return return.
...
This was SVN commit r17394.
2015-12-06 20:51:30 +00:00
2bd22bb6a8
Fix whitespace.
...
This was SVN commit r17393.
2015-12-06 17:13:47 +00:00
0462829579
Use more plural translations for tooltips. Patch by Safa Alfulaij. Refs #3081 .
...
This was SVN commit r17392.
2015-12-06 16:56:46 +00:00
953e745067
Do a more explicit sanitycheck in loadCivData (in case we encounter the value false).
...
Make that viking boat gaia which is more coherent with the other
eastereggs.
This was SVN commit r17391.
2015-12-06 15:30:49 +00:00
21f032c305
Ignore the "user" mod when checking the compability of replays and savegames.
...
This was SVN commit r17390.
2015-12-06 14:00:03 +00:00
84678cf40e
Tune lobby rating alignment and remove a TODO that won't be fixed due to uglyness.
...
This was SVN commit r17389.
2015-12-06 13:21:41 +00:00
cff6056e9f
Lobby cleanup.
...
Remove unneeded 4 globals and 2 functions used for sorting the lobby
lists.
This was SVN commit r17388.
2015-12-06 12:13:06 +00:00
66ec6dbf12
Lobby cleanup.
...
Actually define these variables and revert to sorting by state for
gamelists by default (despite not having a column to sort for that).
This was SVN commit r17387.
2015-12-06 11:42:30 +00:00
987a7028bd
Implements relative templates. Fixes #2936 . Thanks to leper, wraitii, historicbruno and everyone else that helped.
...
This was SVN commit r17386.
2015-12-05 17:02:25 +00:00
8813cb3133
petra: some fixes (buildrestrictions min distance) and some cleanup
...
This was SVN commit r17385.
2015-12-05 15:02:45 +00:00
99c0d0493c
remove warnings in structtree, fixes #3682 , patch from s0600204
...
This was SVN commit r17384.
2015-12-05 14:57:09 +00:00
4b37462645
Restore player- and game-selection when updating the lists. Fixes #3244 .
...
The previous selection is saved globally so that we don't lose it in
case of no element being selected.
Also remove an unused variable.
This was SVN commit r17383.
2015-12-05 04:28:23 +00:00
7316473921
Don't translate botnames in multiplayer games (so names are in english instead of the language of the host). Refs #3307
...
This was SVN commit r17382.
2015-12-04 23:54:45 +00:00
bbc325fb5a
Gamesetup cleanup. Refs #3680 .
...
Don't even load non-playable civs in the gamesetup and add sanity checks
to sanitizePlayerData() and loadCivData() so that we can remove later
checks.
Remove some blatantly wrong code from launchGame().
Move hardcoded romanNumbers to a global.
This was SVN commit r17381.
2015-12-04 23:45:35 +00:00
71b0d9c052
Update atlas with the new map_sizes.json format. Refs #3355 .
...
This was SVN commit r17379.
2015-12-04 16:37:30 +00:00
6572b6d042
Simplify civ info (main menu -> learn how to play -> history).
...
Add JSDoc comments.
Refs #3680 a bit.
This was SVN commit r17378.
2015-12-04 15:35:34 +00:00
654ec6f2bf
Gamesetup cleanup. Refs #3680
...
Simplify mapfilter code and mark g_CivData as const.
This was SVN commit r17377.
2015-12-04 14:06:01 +00:00
82d93c89dd
Gamesetup cleanup. Refs #3680
...
Remove a broken implementation of default maps.
Remove some unneeded comments.
This was SVN commit r17376.
2015-12-04 13:10:50 +00:00
99d7b73d2c
Don't link unused eastereggs to wrong civs. Patch by Stan, fixes #3679 .
...
This was SVN commit r17375.
2015-12-04 12:47:04 +00:00
e8bb6f5974
Actually remove the old file from the repository. Refs #3355
...
This was SVN commit r17374.
2015-12-04 12:30:24 +00:00
a98a44875e
Move mapsizes to the new simulation settings system. Fixes #3355 .
...
Notice that initMapSizes() confusingly mapped from "LongName" to "names"
and from "Name" to "shortnames".
Now it's identical in both parts.
Also fixes a bug in the summary screen where it would show "Scenario"
for a skirmish map.
This was SVN commit r17373.
2015-12-04 12:24:58 +00:00
d50075adc4
Lobby cleanup. Fixes #3383
...
This was SVN commit r17371.
2015-12-04 00:22:15 +00:00
76a1a84a58
Lobby cleanup. Refs #3383
...
Remove wrong attempt to display private-messages in the lobby.
Move hardcoded font to g_SenderFont global.
Replace some variables with references.
Correct indentation in ircFormat().
This was SVN commit r17370.
2015-12-03 22:22:26 +00:00
787960b63c
Lobby cleanup. Refs #3383
...
Removes a broken translation in displayProfile().
Removes many unused functions, variables and comments.
Moves filter initialization to new function.
Moves hardcoded system color to g_SystemColor.
Simplifies a lot without changing the logic otherwise.
This was SVN commit r17369.
2015-12-03 17:43:16 +00:00
88816a1043
Fix two oversights and simplify mapfilter-initialization. Refs #3383
...
This was SVN commit r17368.
2015-12-03 14:10:28 +00:00
2e69872b11
Remove debug parser from replay menu. Refs #3440
...
This was SVN commit r17367.
2015-12-03 03:12:43 +00:00
477e8c36ee
Lobby cleanup. Simplifies updatePlayerList() and moves hardcoded color values to the top of the file for easy access. Refs #3383
...
This was SVN commit r17366.
2015-12-03 02:52:44 +00:00
5b2738b0cb
Doubles size of sound card string buffers, for users with many sound devices present. Fixes #3660
...
This was SVN commit r17365.
2015-12-02 22:41:17 +00:00
3c6580ed83
Add JSdoc comments to all lobby globals and remove g_MapSizes because it is only used locally. Refs #3383
...
This was SVN commit r17364.
2015-12-02 17:44:09 +00:00
a88e8e3e5c
Remove obfuscated easteregg in the lobby.
...
This was SVN commit r17363.
2015-12-02 17:21:08 +00:00
2b64d83978
Enlighten too dark username-colors in the lobby and gamesetup-chat. Patch by fpre, fixes #3205 .
...
This was SVN commit r17362.
2015-12-02 17:00:12 +00:00
e6840f5fca
Remove useless global g_SpecialKey. Refs #3383
...
This was SVN commit r17360.
2015-12-02 16:00:20 +00:00
d1f0cbe01d
Renames to g_MapSizes, g_UserRating and g_SpamMonitor. Refs #3383 #3440
...
This was SVN commit r17359.
2015-12-02 14:54:08 +00:00
02c065e2c9
Removes the unused "gone" presence state from the lobby. Refs #3383 .
...
This was SVN commit r17358.
2015-12-02 14:41:32 +00:00
eeaffa05ee
Correct sorting for ratings in the lobby and use fat-arrow functions. Fixes #3662 .
...
This was SVN commit r17357.
2015-12-02 14:29:27 +00:00
a1e57aaeaf
Replay menu cleanups. Fixes #3440 .
...
Hides the summary-button in the replaymenu in case the summary wasn't
saved.
Corrects the timestamp for incompatible replays.
Remove unused UNUSED from header files.
Use string8() instead of OsString().
Mention a reported compiler warning.
Use const& instead of a copy in StartVisualReplay().
This was SVN commit r17356.
2015-12-02 13:53:44 +00:00
0553a74884
Remove wrong semicolons. Refs #3424
...
This was SVN commit r17353.
2015-12-02 03:24:04 +00:00
cd635f9615
cleanup of df6d30a910
...
This was SVN commit r17352.
2015-12-01 21:03:24 +00:00
df6d30a910
fix affordable gui of gates
...
This was SVN commit r17351.
2015-12-01 19:41:52 +00:00
0a8fc4bb08
improve pathFinder by optimizing the DistanceToSquare computation, refs #3588
...
This was SVN commit r17350.
2015-12-01 19:01:41 +00:00
b657eb05e2
Remove the unused and broken function GetBaseSpeed. Fixes #3672 .
...
This was SVN commit r17349.
2015-12-01 13:17:34 +00:00
60f82e54dd
Make the warning message on software renderers a bit more informative.
...
This was SVN commit r17348.
2015-12-01 09:42:49 +00:00
418318ea88
Properly read preferglsl in user config files.
...
This was SVN commit r17347.
2015-12-01 09:00:12 +00:00
bef7682bbe
Fixes a bug in the mauryan warchariot walk-animation. They were walking instead of standing on the chariot when it moves.
...
Patch by Stan. Refs #2577 .
This was SVN commit r17346.
2015-11-30 22:09:00 +00:00
45723b1293
Don't break the translation of the playerdefaults. Refs #3355
...
This was SVN commit r17345.
2015-11-30 20:51:20 +00:00
6fd700d95d
restore min range distance of defense towers, and make it removable with murder_hole tech, fixes #3559
...
This was SVN commit r17344.
2015-11-30 20:49:57 +00:00
2008f3e3a9
Plural translation since that is needed for some languages.
...
This was SVN commit r17343.
2015-11-30 20:47:42 +00:00
66bd932374
gives repair a lower priority compared to capture, fixes #3443
...
This was SVN commit r17342.
2015-11-30 20:26:10 +00:00
6f09803e8c
TerrainTextureManager file loading rewrite. Fixes #3358 .
...
Add directory callback to vfs::ForEachFile.
Each terrain directory should now have a terrains.xml file,
as using the previous terrains.xml file is unlikely to be what was
intended.
This was SVN commit r17341.
2015-11-30 20:12:12 +00:00
af202ae963
Clean up software renderers detection.
...
Fix llvmpipe (mesa) detection.
Add softpipe (mesa) detection.
Add GDI Generic (Windows) detection.
Consolidate software renderers detection in a function.
Disable s3tc on software renderers, it halves performance and make
textures weird.
Add a warning when on software renderer, to inform the player something
is bad.
This was SVN commit r17339.
2015-11-30 16:12:12 +00:00
fa9c8e061b
Enable GLSL by default on OpenGL 3+.
...
This doesn't override any user setting, it just changes the default when
no preferglsl setting is specified.
Fixes #3641 .
Refs #145 .
This was SVN commit r17338.
2015-11-30 10:51:02 +00:00
f8f8a1eb6a
Increases the gatherer limit for some special resources. Fixes #3583 .
...
This was SVN commit r17336.
2015-11-30 04:20:30 +00:00
324179e2b9
Show icon for the female inspiration aura. Fixes #3384
...
This was SVN commit r17335.
2015-11-30 03:58:19 +00:00
d7e444b862
Loot resources that killed enemies carried. Fixes #2732
...
This was SVN commit r17334.
2015-11-30 03:41:18 +00:00
56716577e0
Changes the type "notification" of some GuiInterface-notifications to "chat" as the former isn't defined.
...
Also fixes a typo reported by AlThePhoenix and removes trailing
whitespace.
This was SVN commit r17333.
2015-11-30 02:06:58 +00:00
700859b2c3
Move the playerdefaults to the settings directory. Refs #3355
...
This was SVN commit r17332.
2015-11-30 01:33:59 +00:00
61e5e92b14
Update/revamp my template analyzer tool.
...
Remove the useless "fancy" data in favor of a simpler visualization of
templates, adding an in-place tool to filter and sort (for convenience).
This was SVN commit r17331.
2015-11-29 19:19:20 +00:00
ff30dc2ba4
Forgot to add the JSON file. Refs #3477 .
...
This was SVN commit r17330.
2015-11-29 16:53:32 +00:00
296f3b2614
Adds a new cheat as an abbreviation for most other cheats. Also cleans the code.
...
Fixes #3477 . Patch by bb.
This was SVN commit r17329.
2015-11-29 16:47:04 +00:00
28bea05e06
Show units that can train other units (trainer units) in the structure tree. Patch by s0600204. Fixes #3213 .
...
This was SVN commit r17328.
2015-11-29 16:18:21 +00:00
c9f40be84e
improve indentation of 34b0c6d779
...
This was SVN commit r17327.
2015-11-29 16:13:13 +00:00
34b0c6d779
add a NOT when checking classes matching, fixes #3611
...
This was SVN commit r17326.
2015-11-29 15:59:52 +00:00
814cdd9524
Tie tangent generation with preferGLSL setting for convenience since that setting was not really useful. Fixes #2506 . Patch by fabio.
...
This was SVN commit r17325.
2015-11-29 15:44:22 +00:00
51793dde28
Fix an oversight when constructing walls that changed issued commands and would result in false positives when running with -serializationtest. Refs #3637
...
This was SVN commit r17324.
2015-11-29 15:25:51 +00:00
bb7c4aa86a
Code cleanup. Refs #3420 .
...
Since the window is now closed immediately after disconnect in
messages.js, we don't need to close it in menu.js.
This was SVN commit r17323.
2015-11-29 15:11:30 +00:00
9f75b78a84
fix nearGatherPosition, fixes #3658
...
This was SVN commit r17322.
2015-11-29 14:43:28 +00:00
42d42243ac
add specific names for gaul and brit fishing ships, fixes #3490 , patch from stanislas69
...
This was SVN commit r17321.
2015-11-29 14:29:43 +00:00
a6b44c12a2
Don't replace the custom colors of scenario maps with default colors. Fixes #3627 .
...
This was SVN commit r17320.
2015-11-29 13:38:10 +00:00
58f88210f3
Informs the translation extractor of the replay menu. Fixes #3656 .
...
Thanks Itms for reporting :-)
This was SVN commit r17319.
2015-11-29 13:31:38 +00:00
6a4e0f714c
Cleans up Looter.js. Removes duplicate code and simplifies it. Fixes #3424 . Thanks fcxSanya for the review!
...
This was SVN commit r17318.
2015-11-29 02:15:35 +00:00
7b67324ae6
Code cleanup.
...
Adds missing whitespace to objects.
Removes trailing whitespace.
Corrects some for-loop counters.
This was SVN commit r17317.
2015-11-29 01:45:45 +00:00
d8ecc2f87f
Lobby cleanup.
...
Designate constants as such.
Comply with naming convention for globals.
Quote object keys.
Add few JSDoc comments.
Refs #3383 .
This was SVN commit r17316.
2015-11-29 01:29:38 +00:00
d39810df7d
Closes the chat window after disconnect and prevents opening it again. Fixes #3420 .
...
This was SVN commit r17315.
2015-11-29 00:51:00 +00:00
7de746cc58
Visual replay code cleanup. Refs #3440 .
...
Moves StartVisualReplay() from JSInterface_VisualReplay.cpp to
VisualReplay.cpp, so that the former doesn't define any logic.
Uses replayFile.string8() instead of
utf8_from_wstring(replayFile.string()).
SAFE_DELETE instead of delete.
Fixes a compiler warning in getReplayDuration().
This was SVN commit r17314.
2015-11-29 00:23:18 +00:00
8cf2333568
Corrects an offset of a menu entry. Thanks niektb for reporting. Refs #3440
...
This was SVN commit r17313.
2015-11-28 23:27:54 +00:00
d21f932bf9
Experiment: lower the cost of palisade walls a lot and of stone walls slightly, make them both faster to build. Make palisades less resistant (in particular to hack attacks). Reduce the efficiency of stone wall towers since those could be used stand-alone to have more towers.
...
This was SVN commit r17312.
2015-11-28 15:32:23 +00:00
8f74850215
add technologies for fishing, fixes #3576 , fishing_net icon from stanislas69
...
This was SVN commit r17311.
2015-11-28 13:43:26 +00:00
be9b6fa59c
improves performance of hierarchical pathFinder, refs #3588
...
This was SVN commit r17310.
2015-11-28 13:06:44 +00:00
0d27dbf5a3
some petra cleanup
...
This was SVN commit r17309.
2015-11-28 11:46:45 +00:00
ca3828f9ac
some simulation cleanup
...
This was SVN commit r17308.
2015-11-28 11:43:14 +00:00
be2ddb9c63
some gui cleanup
...
This was SVN commit r17307.
2015-11-28 11:23:04 +00:00
2548187474
fix selection when owner change, ref #3645
...
This was SVN commit r17306.
2015-11-28 11:16:13 +00:00
2d4ec03019
update packing flag, fixes #3628
...
This was SVN commit r17305.
2015-11-28 11:11:40 +00:00
0d1b595fa0
fix UnitAI state, fix #3630
...
This was SVN commit r17304.
2015-11-28 11:09:29 +00:00
432df9b38e
Use two range based for loops to fix two TODOs.
...
This was SVN commit r17303.
2015-11-28 08:27:42 +00:00
c0c19db94e
Null serialization functions for some components without dynamic state.
...
This was SVN commit r17302.
2015-11-28 08:27:41 +00:00
e4834e8a0d
Some JS component cleanup.
...
This was SVN commit r17301.
2015-11-28 08:27:38 +00:00
5d243d0ce8
Clarify font licenses.
...
This was SVN commit r17300.
2015-11-28 08:27:36 +00:00
9a40d1284e
Update version numbers. Switch lobby room.
...
This was SVN commit r17299.
2015-11-28 08:27:33 +00:00
082af749f0
Actually remove all unlisted translations.
...
This was SVN commit r17298.
2015-11-21 20:00:20 +00:00
229e850dba
Fix a compiler warning.
...
This was SVN commit r17296.
2015-11-20 20:42:45 +00:00
fc6af83c2a
cleanup 5b335442fb
...
This was SVN commit r17294.
2015-11-20 19:47:08 +00:00
5b335442fb
fix a bug in the HierarchicalPathfinder revealed by changes in 9b0ed97d05, patch by wraitii
...
This was SVN commit r17293.
2015-11-20 19:45:48 +00:00
08df9e8533
Update built on OS X to 1.6.19.
...
This was SVN commit r17291.
2015-11-19 23:47:41 +00:00
ee8f9516eb
Update translations to be included in the release.
...
This was SVN commit r17290.
2015-11-19 23:09:49 +00:00
3cbbf31173
revert 6e0e607b20 as it prevented to open the developper overlay in autostart games
...
This was SVN commit r17288.
2015-11-19 22:28:30 +00:00
0b2da13dea
never edit a patch before commiting !
...
This was SVN commit r17287.
2015-11-19 22:17:00 +00:00
621b22265f
petra: fix some units staying idle after recovering capture points to their own structures
...
This was SVN commit r17285.
2015-11-19 22:09:57 +00:00
9b0ed97d05
fixes and performance improvements in hierarchical pathfinder, fixes #3621
...
This was SVN commit r17284.
2015-11-19 22:02:25 +00:00
4a2a155090
petra: do not sent a tribute to a defeated player
...
This was SVN commit r17283.
2015-11-19 20:04:21 +00:00
6e0e607b20
Temporary fix for #3551 in the interest of having a fair A19. Prohibit deverloper overlay cheats when cheats are disabled. Patch by elexis. Refs #3551
...
This was SVN commit r17282.
2015-11-19 17:27:27 +00:00
9e35f7d68b
The over-rasterization of obstructions introduced in [17161] could in very rare cases lead to an OOS in the passability grid. Fixes #3612 .
...
This was SVN commit r17278.
2015-11-16 22:03:10 +00:00
83191580c0
cleanup of 34fd23e920 to make l.... happy
...
This was SVN commit r17277.
2015-11-16 18:59:10 +00:00
9819b23529
I should not commit half-finished debug code.
...
This was SVN commit r17276.
2015-11-16 18:48:05 +00:00
09285ec257
Fixes #3507 . Patch by Palaxin.
...
This was SVN commit r17275.
2015-11-16 18:37:00 +00:00
70164a02c4
Handle double-clicks on list elements better. Patch by elexis.
...
Fixes #3574
This was SVN commit r17274.
2015-11-16 18:23:21 +00:00
721c731567
Decreases slinger walkspeed so they have a slightly harder time slaughtering skirmishers.
...
This was SVN commit r17271.
2015-11-15 22:01:11 +00:00
c2f3d61a80
Fix #3613 by adding the visibility component to triggers. Patch by elexis.
...
This was SVN commit r17270.
2015-11-15 21:23:35 +00:00
2e3b7f5906
Lessens the effect of another very powerful aura.
...
This was SVN commit r17269.
2015-11-15 20:38:56 +00:00
678cd646bd
Lessens the effect of a very powerful aura.
...
This was SVN commit r17268.
2015-11-15 20:26:37 +00:00
afef406e18
petra: fix cases where the ai would wrongly think a resource is inaccessible (because of missing reset of its internal flags)
...
This was SVN commit r17267.
2015-11-15 19:35:40 +00:00
025e28be83
fix test broken in 34fd23e920, fix #3614
...
This was SVN commit r17266.
2015-11-15 17:48:25 +00:00
39f572af88
Stop processing turns after a replay finishes. Patch by elexis. Fixes #3581
...
The animations continue because we currently have no easy way to stop
interpolating. My suggestion would be to implement a network
synchronised pause and use something like that.
This was SVN commit r17265.
2015-11-15 15:08:46 +00:00
34fd23e920
optimize the finding of new target (no changes on the output) when lots of units involved, fixes #3605
...
This was SVN commit r17264.
2015-11-15 13:19:21 +00:00
6b8dc7684a
Return in case we do not have any available JS timer slots instead of accessing OOB memory.
...
This was SVN commit r17263.
2015-11-15 01:09:35 +00:00
f1f0fa1f8f
Fix a typo. Thanks stan for noticing.
...
This was SVN commit r17260.
2015-11-14 21:46:05 +00:00
fcb1008fa3
Fix wolfhound actor. Patch by stanislas69. Fixes #3608 .
...
This was SVN commit r17259.
2015-11-14 21:45:27 +00:00
e7040784ff
Adds an update trigger or else rating list isn't updated on join.
...
This was SVN commit r17258.
2015-11-14 20:26:41 +00:00
c93eb938cc
New mastiff and wolfhound units with full animations modeled by Micket (Thanks Micket, they're awesome!)
...
three variations of mastiff texture for its different ranks with
different armor levels.
Wolfhound unit not yet applied to the template, but it has its own
animations
New rhino unit, modeled by Micket too. It has a duplicated template from
the bear as placeholder.
This was SVN commit r17257.
2015-11-14 20:07:21 +00:00
3760891131
Fix the precedent fix. It turns out the code behaves in much weirder ways than I expected.
...
This was SVN commit r17255.
2015-11-14 19:03:20 +00:00
14f53315d6
Fix previous commit and OOS and rejoin. I need to get my hands on the guy that decided "init" wasn't called on deserialize.
...
This was SVN commit r17254.
2015-11-14 18:41:52 +00:00
3473828735
Makes some powerful techs harder to obtain or less effective.
...
This was SVN commit r17253.
2015-11-14 17:29:00 +00:00
ebbabb01f5
Other small JS performance improvement.
...
This was SVN commit r17252.
2015-11-14 16:07:48 +00:00
4e492ab7fa
Optimize PerformGather in ResourceGatherer.js after the Tracelogger revelead it was a performance hotspot. Should be about twice as fast.
...
Optimizations were: caching gathering rates and removing a useless
message.
This was SVN commit r17251.
2015-11-14 12:26:33 +00:00
092206b12e
Finding new targets can be really slow when lot of units are involved. In Combat demo huge for example, it could represent more than 30% of the simulation time. Part of it is because we loop several times on all identity classes of all enemy units, and most of the time for nothing. This patch avoids the useless loops, and adds some cleanup.
...
In addition, when testing if we can't attack a units, Capture and
Slaughter were used even if not applicable.
This was SVN commit r17250.
2015-11-13 17:47:31 +00:00
e7fb75a680
Initialize new variables correctly.
...
This was SVN commit r17247.
2015-11-12 23:07:54 +00:00
e9271025dc
Forgot to serialize a new unitMotion variable, resulting in OOS on rejoin.
...
This was SVN commit r17245.
2015-11-12 20:57:50 +00:00
bc0048d592
Update rallypoint coordinates for rallypoints targeting entities ("attack", "repair"...). Fixes #3597
...
This was SVN commit r17243.
2015-11-12 17:39:46 +00:00
9357cce112
Math is hard
...
This was SVN commit r17242.
2015-11-12 17:32:33 +00:00
3febc387d5
Styling fixes.
...
This was SVN commit r17241.
2015-11-12 17:23:50 +00:00
52443dfe80
Fix an erroneous ENSURE in PatchRData and move it where it will be very slightly clearer. Fixes #3598
...
This was SVN commit r17240.
2015-11-12 17:22:44 +00:00
da7bd0c92c
Improved action-capture icon, designed by stan and wraitii.
...
Fixes #3595 .
This was SVN commit r17239.
2015-11-12 09:46:31 +00:00
913545aa41
Mark several CFixedVector2D as const and passed by reference in Geometry and a few other places. Mark some functions (that probably already were) inline.
...
Also make sure we don't include Geometry.h where it's not necessary.
This was SVN commit r17238.
2015-11-11 20:50:02 +00:00
f3b22e51a3
Optimize Geometry::PointIsInSquare, which is used quite often in performance hotspots.
...
Original patch by mimo. Refs #3588
This was SVN commit r17236.
2015-11-11 20:02:47 +00:00
c2928c44d4
Make farm props sway in the wind (they sway very lightly).
...
This was SVN commit r17235.
2015-11-11 19:12:06 +00:00
a138bed96b
Fix an issue where units did not notice other moving units with my latest commits.
...
This was SVN commit r17234.
2015-11-11 19:06:07 +00:00
cc199c4cca
Fix a critical typo in the last commit and a debug message left in accidentally. Thanks fabio.
...
This was SVN commit r17232.
2015-11-11 13:55:36 +00:00
56baae08c3
Fix action-capture icon transparency and optimize with optipng -o 5 and advdef -z -4
...
Refs: #2823
This was SVN commit r17230.
2015-11-11 13:34:15 +00:00
06cb37ff74
Add PlanNextStep back to the unitMotion, in a completely different version. This basically anticipates where we'll probably move next, and checks if static units might block us. Makes paths look slightly better.
...
This was SVN commit r17229.
2015-11-11 13:29:06 +00:00
607955489d
Check if units are in the world in UnitRenderer::PickAllEntitiesAtPoint. Probably fixes #3587 , though I'm not sure as it proved unreproducible.
...
This was SVN commit r17228.
2015-11-11 13:27:13 +00:00
1b00bfc98d
Change the capture icon to something that looks like two flags instead of a weird red blob. Icon by Stan.
...
This was SVN commit r17227.
2015-11-11 13:24:41 +00:00
3b13fb7608
Improve unitMotion behavior. When a unit's path is obstructed, it will now try shortpathing around an increasingly large search range, to optimize behavior in trivial cases where it just needs to go around a unit.
...
Also stop trying too hard when we are close to the destination and our
only order is to move there.
This should result in a slight optimization of the behavior, as well as
slightly more sanity overall.
This was SVN commit r17226.
2015-11-11 12:49:24 +00:00
3ddd72c1a4
Fix a rare case where units might get stuck around other idle entities, and clarify a related comment.
...
Refs #3471
This was SVN commit r17225.
2015-11-11 12:28:38 +00:00
c42160ec10
Fix an issue where units could not go around large obstructions when short-pathing as it ran in the search-space "walls", reported by gamebot. Fixes #3593 .
...
This is also a very slight optimization.
This was SVN commit r17224.
2015-11-11 12:23:11 +00:00
2f6f0bd477
Serialize everything that is needed by UpdateVisibilityData instead of assuming everything as dirty.
...
Fixes #3271 .
This was SVN commit r17223.
2015-11-11 12:15:57 +00:00
8b0bca0556
Fix action-capture icon transparency.
...
Refs: #2823
This was SVN commit r17222.
2015-11-11 11:45:39 +00:00
9e0ef737b2
Fix Athenian town phase description.
...
This was SVN commit r17219.
2015-11-11 03:27:38 +00:00
5f7ce1089a
Fix translation comments.
...
This was SVN commit r17218.
2015-11-11 03:27:34 +00:00
32da740f14
Allow kicking/banning players from gamesetup and session. Patch by elexis. Fixes #3241 .
...
This was SVN commit r17217.
2015-11-11 02:05:23 +00:00
d3ff090ce7
Fix an OOS issue where, on ownership change, units affected by speed-modifying technologies did not update their speed.
...
This was SVN commit r17215.
2015-11-10 23:31:06 +00:00
f0deeab899
Rename commands to g_Commands.
...
This was SVN commit r17213.
2015-11-09 23:25:34 +00:00
51ec6f4728
improve function RasterizeRectWithClearance, about 40% faster, ref #3588
...
This was SVN commit r17212.
2015-11-09 21:16:46 +00:00
35b0478f70
Improve Mauryan corral specific name. Patch by stanislas69. Fixes #3555 .
...
This was SVN commit r17211.
2015-11-09 16:49:53 +00:00
0ba9fa1cc1
Optimize RasterizeRectWithClearance slightly further. Thanks mimo for noticing.
...
This was SVN commit r17209.
2015-11-08 18:08:49 +00:00
313d324fac
Fix some cases of unit "dancing". Thanks to Elexis for nagging me.
...
This was SVN commit r17208.
2015-11-08 17:55:23 +00:00
fe040c695f
Change the shape rasterization to not use DistanceToSquare, which often called sqrt. This apparently reduces total turn time by as much as 5% (!)
...
Refs #3368
This was SVN commit r17207.
2015-11-08 17:24:59 +00:00
cb025bb725
Removes extraneous check from XpartaMuPP. Fixes #3568 .
...
This was SVN commit r17206.
2015-11-08 17:09:59 +00:00
dd6d09521c
Not sure how but I messed up the previous commit.
...
This was SVN commit r17205.
2015-11-08 16:44:08 +00:00
42d0e6d46e
Optimize the hierarchical pathfinder's "makeGoalReachable" slightly. Does not affect simulation results.
...
This was SVN commit r17204.
2015-11-08 16:39:43 +00:00
cd025b2069
fix typo
...
This was SVN commit r17203.
2015-11-08 13:09:49 +00:00
7c2f178634
petra: do not try to train females if not available in templates, only a temporary fix waiting for #3586
...
This was SVN commit r17202.
2015-11-08 13:05:56 +00:00
8f00293a58
Assign proper alternatives to some terrian materials. Fixes #3585
...
This was SVN commit r17200.
2015-11-07 19:43:41 +00:00
d569fe63b4
petra: don't loose time approaching a target entity if it was captured in the meantime
...
This was SVN commit r17199.
2015-11-07 18:12:55 +00:00
c319ff062d
Partial fix to a formation "gliding" issue, unsure so far what is causing this.
...
This was SVN commit r17198.
2015-11-07 17:36:31 +00:00
3163c9d4a2
Fix a rare issue with the short-range pathfinder where units took odd paths when the target was beyond the search zone.
...
This was SVN commit r17197.
2015-11-07 14:33:55 +00:00
ad4edba3dc
move a bit an unreachable tree, fixes #3584
...
This was SVN commit r17196.
2015-11-07 14:22:10 +00:00
eed9739031
Make terrain conform to the materialmgr.quality setting. Make quality 0.0 remove triplanar texturing and tree swaying effect.
...
In consequence, pick a sensible default at 2.0 so that new players have
a somewhat good looking game.
This was SVN commit r17195.
2015-11-06 20:55:07 +00:00
2d7074e8d6
Fix unused variables left behind.
...
This was SVN commit r17194.
2015-11-06 20:42:12 +00:00
596025df71
Fix a bug in [17163] that could get units with a large passability class stuck.
...
This was SVN commit r17192.
2015-11-06 20:33:13 +00:00
e26b59c917
Changes to unitMotion.
...
Make sure we do not treat as circles entities that we really should
treat as squares (such as trees). This fixes an issue reported by Stan.
Make sure we never forget about our destination if we are blocked by
unit obstructions. This makes sure that units in a group but not in
formation will not be blocked by the other units, and probably makes the
general behavior more sane. Helps following [17166]
Refs #3505 , #3471 , #3376
This was SVN commit r17191.
2015-11-06 20:09:18 +00:00
9efd79e240
Fix an issue where square diagonals were incorrectly handled when checking the distance to the target. Fixes #3577 properly. Patch by mimo.
...
Decrease fishing ship gathering range in consequence (revert [17178]).
This was SVN commit r17190.
2015-11-06 19:56:52 +00:00
1ed3761859
Fix style issues and redundant code in [17161] and [17163].
...
This was SVN commit r17189.
2015-11-06 19:48:08 +00:00
2126b53b9d
Fixes interpolation of flying objects.
...
This was SVN commit r17187.
2015-11-06 16:56:39 +00:00
33398baa90
petra: only units which have effectively started an attack should be stopped when the attack is aborted, fixes #3582
...
This was SVN commit r17185.
2015-11-05 20:52:41 +00:00
83bba7bdfc
revert e0771b98dd which was based on misunderstanding of the algo, and fix the inverted_circle case, refs #3577
...
This was SVN commit r17184.
2015-11-05 19:22:04 +00:00
05547bf36f
Fix an oversight.
...
This was SVN commit r17182.
2015-11-05 16:52:19 +00:00
071c5317f4
I have noticed from walking on a bridge everyday to work that reflections are more distorted when vieved at an angle. This is a quick attempt at imitating this effect.
...
This was SVN commit r17181.
2015-11-04 21:08:24 +00:00
a9323da01b
Fix #3566 by fixing an off-by-one error in the final replay turn logic. Patch by elexis.
...
This was SVN commit r17180.
2015-11-04 20:33:34 +00:00
815b0e4e03
Change tree obstruction sizes following [17161] as it looks better and will help units navigate through forests.
...
This was SVN commit r17179.
2015-11-04 20:14:39 +00:00
12d8753eff
Bump fishing ships gathering range since their obstruction size was effectively increased with the new pathfinder. This resulted in them sometimes not being able to deposit their resources at docks.
...
Fixes #3577 , reported by maxticatrix through elexis.
This was SVN commit r17178.
2015-11-04 19:49:56 +00:00
8f1853b8d8
Prevent accidental overwriting of replays in very rare cases while we wait for a better solution.
...
Refs #3255
This was SVN commit r17177.
2015-11-04 19:26:40 +00:00
f91478c730
Fix an oversight in the obstruction manager that lead to possibly the most insidious OOS error we've seen so far.
...
Fixes #3292 .
This was SVN commit r17176.
2015-11-04 18:51:47 +00:00
bc6727a23a
Show a message about cheats being enabled in gamesetup. Patch by elexis. Fixes #3546 .
...
This was SVN commit r17175.
2015-11-03 20:44:53 +00:00
9138bff64e
Increases pierce armour of ranged siege.
...
This was SVN commit r17174.
2015-11-03 20:14:04 +00:00
9b8180ffe8
Slight nerf reduction.
...
This was SVN commit r17173.
2015-11-03 18:46:12 +00:00
54b405a0d0
Reduces effectiveness of early camel rush
...
This was SVN commit r17172.
2015-11-03 18:19:11 +00:00
e527a5c321
Fix #3525 and #3399 by recalculating territories on request to GetTerritoryPercentage. Patch by elexis
...
This was SVN commit r17171.
2015-11-02 07:32:43 +00:00
6493974800
Fix #2676 by only acknowledging commands matching the sender's name if cheats are disabled. Based on patch by historic_bruno.
...
This was SVN commit r17170.
2015-11-02 03:20:44 +00:00
a897fac229
petra: fix a rare serialization bug where an entity inside an army was killed on the same turn it was serialized
...
This was SVN commit r17169.
2015-11-01 18:54:29 +00:00
3ba435ae35
Lowers the minrange of towers and the briton fortress, which were too big and resulted in units close to them being impossible to attack. This seems like an oversight and not a feature, as we currently do not have murder holes or similar technologies.
...
I left outpost minrange higher so that it's actually safe to attack
outposts when you reach their foot. Seemed realistic.
Fixes #3559
This was SVN commit r17167.
2015-11-01 17:22:43 +00:00
1694913b16
Make "no formation" the default setting but keep formations activated to help pathfinding in A19. Use at your own risk. Refs #3505 and #3565 .
...
Also make rabbit, chicken and shark no longer obstruct movement, to
further help with pathfinding. These may or may not be udpated later.
Refs #3562 . Fixes #3497 .
This was SVN commit r17166.
2015-11-01 17:10:19 +00:00
e5765ba1ef
petra: do not react to pseudo-attacks (recovering capture points) from allies
...
This was SVN commit r17165.
2015-11-01 17:09:09 +00:00
d9e9345be2
fix some indentation of 6e05a00929
...
This was SVN commit r17164.
2015-11-01 16:47:53 +00:00
357203a90f
Pathfinding changes: unit-unit collisions now allow for some overlap, so units can get closer to each other, which I found improved pathfinding considerably.
...
Also fix a potential issue I noticed in some cases, though that
particular fix implies scrapping waypoints, so if units seem to get
lost, please report so and I'll revert those changes.
I can't find any way to get units stuck with this patch.
This was SVN commit r17163.
2015-11-01 13:38:48 +00:00
14038d4cd8
Fix more pathfinding issues.
...
Change the way the long-range pathfinder rasterisation works slightly so
that we have a better compatibility with the short-range pathfinder.
Should fix the "stuck units" issues, though I am not sure so I am not
marking them as fixed so far. Refs #3471 , #3505 , and possibly #3292 .
Caveat: I am now using clearance of 0.8 for "default" class, which might
have side-effects: please report anything weird.
Also fix leftover style issues.
This was SVN commit r17161.
2015-11-01 07:28:43 +00:00
4428c1e690
Fix #3537 with better rating state enforcement. Patch by elexis.
...
This was SVN commit r17160.
2015-10-31 21:19:58 +00:00
a6111ff8b7
Fix #3309 by capping m_DeltaSimTime in NetTurnManager.cpp. Patch by elexis. Review by Philip.
...
This was SVN commit r17159.
2015-10-31 21:04:47 +00:00
6acfec0f44
Fix a logic error in the hierarchical pathfinder that resulted in it not updating all passability classes correctly. Fixes #3538 , refs #3292 (it fixes one of the cases, but not the examples).
...
Also features style fixes, thanks leper for noticing.
This was SVN commit r17158.
2015-10-31 20:47:47 +00:00
a3f467ae4e
Make resources have a static, passable obstruction. Ought to be a temporary fix. Fixes #3530
...
See #3530#comment:9 for a proper fix to this issue.
This was SVN commit r17156.
2015-10-31 15:28:42 +00:00
4d804cf26b
fix typo in 6e05a00929
...
This was SVN commit r17155.
2015-10-31 13:42:14 +00:00
6e05a00929
fix obstruction of target entity not taken into account in short pathfinder, closes #3539
...
This was SVN commit r17154.
2015-10-31 13:37:34 +00:00
9a623cb302
only decay towards connected tiles, fixes #3558
...
This was SVN commit r17153.
2015-10-31 13:26:59 +00:00
8494e36aa8
Revert the logic change in 9da482ead4. This commit removed the checks in UnitMotion against structures, which should have been fine except the short-range pathfinder and the long-range pathfinder are not entirely compatible (check out #3532 for details). This behavior was probably slightly optimized, but it was too clever for its own good in the current state of the pathfinder, might be reintroduced later.
...
This resulted in ALL "units inside obstructions" issues.
Thanks to elexis for the testing.
Fixes #3532 , #3450 .
Refs #3538 (still OOSes), #3410 (unitmotion remains buggy for
formations, but this is only aesthethic.)
Probably affects #3471 and #3505 , but those are not fixed.
This was SVN commit r17152.
2015-10-31 08:43:31 +00:00
e895b044e7
Fix #3553 by removing a superfluous warning. Patch by elexis.
...
This was SVN commit r17151.
2015-10-31 07:21:09 +00:00
c517bc2aab
Double-click to join game/load replay. Fixes #3557 . Patch by elexis.
...
This was SVN commit r17150.
2015-10-31 06:05:18 +00:00
108633affd
Fix #3415 . Removes 'ghost' scrollbar bounding to enable extreme-right hover and selection in dropdowns. Patch by elexis.
...
This was SVN commit r17149.
2015-10-31 05:40:43 +00:00
230654f6ca
Correct celtic champion swordsman running animation speed. Fixes #3542 . Patch by stanislas69.
...
This was SVN commit r17148.
2015-10-31 04:12:43 +00:00
3e7dd53aa1
Hotfix #3549 for A19. Don't save ip and player name during lobby-initiated joins.
...
This was SVN commit r17147.
2015-10-31 04:10:04 +00:00
2a26db2dc2
fix passability of mauryan support elephant, refs #3539
...
This was SVN commit r17146.
2015-10-26 23:14:26 +00:00
e0771b98dd
fix switch between square or circle approximation in UnitMotion, refs #3539
...
This was SVN commit r17145.
2015-10-26 22:59:26 +00:00
f4cb822d9d
do the circle approximation also in INVERTED goals in UnitMotion, refs #3405
...
This was SVN commit r17143.
2015-10-18 20:23:02 +00:00
70d5e4e318
fix the INVERTED_CIRCLE and INVERTED_SQUARE PathGoal, fixes #3405
...
This was SVN commit r17142.
2015-10-18 20:21:20 +00:00
d7b8e0fb79
do not assume a max number of players in the ai api
...
This was SVN commit r17141.
2015-10-17 17:04:28 +00:00
cb7c25768a
Petra: some cleanups
...
This was SVN commit r17140.
2015-10-17 17:01:26 +00:00
496dc13952
remove orphan function after ef4a1e261c, patch by stanislas69
...
This was SVN commit r17139.
2015-10-17 16:55:21 +00:00
21992c0827
Fixes incorrect build restriction message for MaxDistance, patch by karamel, fixes #3529
...
This was SVN commit r17138.
2015-10-17 09:47:01 +00:00
82590753d7
fix a moved function, fixes #3531
...
This was SVN commit r17137.
2015-10-16 17:14:39 +00:00
070a7259ad
Fixes more dialog button order issues, based on patch by stanislas69, fixes #3524
...
This was SVN commit r17135.
2015-10-15 04:07:37 +00:00
b97e565017
Fixes path formatting in Windows OOS error message, patch by elexis, fixes #3498
...
This was SVN commit r17134.
2015-10-15 03:50:45 +00:00
c0b4e78801
Fixes stream serialization bug on OS X 10.8 and older, which caused instant OOS in multiplayer games, fixes #3108 .
...
Fixes test failures on OS X 10.7 and older, refs #3109
This was SVN commit r17133.
2015-10-15 03:31:30 +00:00
4043c56518
Fixes global init order bug that caused OOS between OS X and other platforms, fixes #3499 . May improve pathfinding behavior in some cases, please test!
...
This was SVN commit r17132.
2015-10-15 02:51:12 +00:00
32dafe707d
cleanup and simplification of 38af159598, fixes #3519
...
This was SVN commit r17130.
2015-10-12 17:12:36 +00:00
78f6551b83
Fixes some incorrect texture references found by checkrefs.pl, refs #2524
...
This was SVN commit r17129.
2015-10-11 22:28:02 +00:00
3122792da8
Fixes missing reference in Iberian corral, patch by elexis, fixes #3520
...
This was SVN commit r17128.
2015-10-11 22:01:56 +00:00
4994dfb26a
Avoids RuntimeError: dictionary changed size during iteration
...
This was SVN commit r17127.
2015-10-11 20:47:52 +00:00
9db4fb5ddb
fix typo in Game.cpp
...
This was SVN commit r17126.
2015-10-11 11:12:27 +00:00
93a14b595f
var inside loop was not redefined to undef, replace it by let, fixes #3513
...
This was SVN commit r17125.
2015-10-11 11:04:53 +00:00
b0f267b61c
fix typo in UnitMotion, fixes #3474
...
This was SVN commit r17124.
2015-10-11 11:00:11 +00:00
f5348c6dd6
Introduce less rounding errors in the falloff to allow a more precise territory calculation. Fixes #3334 . Based on code by elexis.
...
This was SVN commit r17122.
2015-10-11 09:01:50 +00:00
fd5f9c547b
Updates OS X libs build script to use miniupnpc 1.9.20151008
...
This was SVN commit r17120.
2015-10-10 23:53:54 +00:00
1ac5ccff0b
fix the ceaseFire gui, patch by elexis, fixes #3413
...
This was SVN commit r17118.
2015-10-10 16:51:52 +00:00
40acf66ba9
Fixes hotkey bugs introduced in a07add11c6, patch by elexis. Fixes #3495
...
This was SVN commit r17116.
2015-10-10 07:22:07 +00:00
02628b8902
Removes unused pathfinder consts, patch by stanislas69. Fixes #3500
...
This was SVN commit r17115.
2015-10-10 06:48:42 +00:00
a90d2cd43a
fix JS undefined property warning, patch by Evulant (AlThePhoenix), fixes #3496
...
This was SVN commit r17114.
2015-10-09 21:57:34 +00:00
412779684c
improves 38af159598
...
This was SVN commit r17113.
2015-10-09 18:14:53 +00:00
d73734ff50
fix wrong chat colors, patch by AlThePhoenix, fixes #3489
...
This was SVN commit r17112.
2015-10-09 17:54:39 +00:00
38af159598
fix UnitAI state of turrets, fix #3481
...
This was SVN commit r17111.
2015-10-08 21:59:52 +00:00
1b3ee1195c
remove some useless ternary operators in ai api
...
This was SVN commit r17110.
2015-10-08 21:19:00 +00:00
ef4a1e261c
fix standGround units not attacking, patch by karamel, fixes #3284
...
This was SVN commit r17109.
2015-10-08 20:48:05 +00:00
03b00b0041
revert d5c758eef3 and better fix of #3430 , fixes #3466
...
This was SVN commit r17108.
2015-10-06 20:59:13 +00:00
3bf05c81fc
temple aura should only affect healable units, fixes #3482
...
This was SVN commit r17107.
2015-10-05 20:45:39 +00:00
86d81c5baa
fix attackAsFormation of special formations, fixes #3086
...
This was SVN commit r17106.
2015-10-05 20:40:14 +00:00
2767ae83d7
Fixes button order in delete unit confirmation dialog, fixes #3483
...
This was SVN commit r17105.
2015-10-05 01:47:20 +00:00
e0093c8ecc
Remove an unused function (it was used by the old pathfinder).
...
This was SVN commit r17103.
2015-10-04 18:02:16 +00:00
b11b16a99a
petra: fix edge case where the AI could not build houses
...
This was SVN commit r17102.
2015-10-04 17:58:55 +00:00
2505a2ec70
Remove a preprocessor ambiguity, fixes #3480 .
...
This was SVN commit r17101.
2015-10-04 17:21:36 +00:00
395c90372e
fishing ships are not expected to be able to move in formation
...
This was SVN commit r17100.
2015-10-03 17:50:50 +00:00
b2ed9d79cc
fix Aegean sea RMS, patch by stanislas69
...
This was SVN commit r17099.
2015-10-03 17:45:17 +00:00
cfe4a2e568
Fix a cause of serialization problems. Fixes #3450 .
...
This was SVN commit r17097.
2015-10-03 11:02:12 +00:00
bb997f6cae
Fix previous commit.
...
This was SVN commit r17096.
2015-10-03 10:32:30 +00:00
d60940ac59
Code improvements and style fixes.
...
This was SVN commit r17095.
2015-10-03 08:27:19 +00:00
dc69aed954
Remove some old and unused code.
...
This was SVN commit r17094.
2015-10-02 18:27:10 +00:00
4e95efacb8
temporarily disable the AttackAsFormation, refs #3086
...
This was SVN commit r17093.
2015-10-01 20:38:02 +00:00
9a8c88216a
Copy capture points for mirages. Fixes #3475 .
...
This was SVN commit r17092.
2015-10-01 16:32:48 +00:00
102358a5cb
Fix build for recent versions of miniupnpc.
...
This was SVN commit r17091.
2015-09-30 21:32:54 +00:00
061c7f6058
Const ref.
...
This was SVN commit r17090.
2015-09-30 20:28:23 +00:00
b0a6979242
Source the spidermonkey patch script. Fixes #3462 .
...
This was SVN commit r17089.
2015-09-30 20:28:13 +00:00
a345edee75
petra: fix inconsistencies in the (rare) case the AI choose to launch an attack against gaia units
...
This was SVN commit r17088.
2015-09-29 19:31:39 +00:00
3a06d3a08b
fix team chat, patch by elexis, fixes #3464
...
This was SVN commit r17087.
2015-09-29 18:53:30 +00:00
d5c758eef3
change immediately to IDLE state when no more orders, fixes #3430
...
This was SVN commit r17086.
2015-09-27 17:32:55 +00:00
2132f868b8
Replace the rectangle rasterization algorithm by the original version from Philip's branch.
...
The current version is flawed (it doesn't handle the partially
obstructed cells as it should).
Refs #3410 .
This was SVN commit r17084.
2015-09-27 16:46:26 +00:00
a7e0dc1534
update attack and heal range queries, patch by leper, fixes #3080
...
This was SVN commit r17082.
2015-09-27 12:23:40 +00:00
31b29b98ad
petra: implement first choice between capture and attack, fixes #3459
...
This was SVN commit r17081.
2015-09-26 22:25:37 +00:00
fb10249cd8
cleaning of the AI api for capture/attack choice, refs #3459
...
This was SVN commit r17080.
2015-09-26 22:06:54 +00:00
1f5bb8d62e
fix some flaws revealed by the fix #3430
...
This was SVN commit r17079.
2015-09-26 21:41:35 +00:00
9cc477c5ef
let the garrison regeneration rate depends on the phase, fixes #3434
...
This was SVN commit r17077.
2015-09-24 22:15:58 +00:00
82f3ee7384
fix typo in previous commit
...
This was SVN commit r17076.
2015-09-24 21:57:43 +00:00
037fe8282e
fix initialization of this.oldAttackType used for resetting the attack anims, fix #3221
...
This was SVN commit r17075.
2015-09-24 21:55:09 +00:00
aceff9ab15
fix rallyPoint on market foundation
...
This was SVN commit r17074.
2015-09-24 21:06:06 +00:00
831c386856
Make the structure tree support paired technologies. Patch by s0600204, fixes #3401 .
...
This was SVN commit r17073.
2015-09-24 19:54:59 +00:00
0e80c9c945
Make the territory decay rate a decimal value. Fixes #3449 .
...
This was SVN commit r17072.
2015-09-24 19:52:36 +00:00
b19d900a02
Fix fb6b86f928, fixes #3218 .
...
This was SVN commit r17071.
2015-09-24 17:40:49 +00:00
8c146cb325
Fix missing rounding in the GUI. Patch by stanislas69, fixes #3245 .
...
This was SVN commit r17070.
2015-09-24 17:36:40 +00:00
315143424c
New berry bush colors, texture updated by stanislas69. Fixes #3377 .
...
This was SVN commit r17069.
2015-09-24 17:21:45 +00:00
dcf8e66aca
Update the goal serialization for 03d2c5e40b. Fixes #3425 .
...
This was SVN commit r17068.
2015-09-24 17:13:39 +00:00
a1a61be547
Also patch SpiderMonkey on OSX.
...
This was SVN commit r17067.
2015-09-24 12:04:15 +00:00
a564ccaf11
Update version name: This will be A19 Syllepsis, which means "Capture" in Ancient Greek.
...
This was SVN commit r17065.
2015-09-23 21:18:44 +00:00
de2f97a9cc
Fix translation of starting resources, patch by elexis, refs #3355
...
This was SVN commit r17064.
2015-09-23 21:12:31 +00:00
a68d5dae0d
fix developper overlay in visual replay, patch by elexis, fixes #3435
...
This was SVN commit r17063.
2015-09-23 20:28:22 +00:00
1456db00fc
reduce the increase of decayRate from 5060b1bb4f
...
This was SVN commit r17062.
2015-09-22 18:53:29 +00:00
71c52f15e9
reduce the increase of decayRate from 5060b1bb4f
...
This was SVN commit r17061.
2015-09-22 18:52:57 +00:00
5060b1bb4f
Make loyalty drain on decaying buildings much more punishing.
...
This was SVN commit r17060.
2015-09-22 03:05:16 +00:00
14aaa7c640
add some missing semicolon
...
This was SVN commit r17059.
2015-09-21 21:08:58 +00:00
676358e634
some cleanups of the AIs
...
This was SVN commit r17057.
2015-09-21 17:26:19 +00:00
b830233498
Fix previous commit, some new files didn't pass through.
...
This was SVN commit r17055.
2015-09-21 17:14:26 +00:00
d64b95b28c
An awesome Visual Replay menu, made by elexis. Fixes #3258 .
...
This was SVN commit r17054.
2015-09-21 17:00:21 +00:00
7002af5b9c
Some capturing nerfs.
...
This was SVN commit r17053.
2015-09-20 19:09:02 +00:00
ff7aa57931
Complete c19903936b.
...
This was SVN commit r17052.
2015-09-20 14:26:21 +00:00
107015861c
move map description, refs #3258 , patch by elexis
...
This was SVN commit r17051.
2015-09-20 12:44:01 +00:00
3317e6c68b
rename autostart visualreplay, refs #3258 , patch by elexis
...
This was SVN commit r17050.
2015-09-20 12:29:59 +00:00
2971852f27
Fix map selection in the lobby gamesetup. Patch by elexis.
...
This was SVN commit r17049.
2015-09-20 10:44:29 +00:00
c19903936b
Correct a missed translation comment and fix translation contexts in the simulation settings.
...
This was SVN commit r17048.
2015-09-20 10:37:45 +00:00
0db7ea2dd2
still another bunch of missing semicolon signaled by jshint
...
This was SVN commit r17047.
2015-09-19 13:04:33 +00:00
4235c67764
still another bunch of cleanup (mainly missing semicolon) signaled by jshint
...
This was SVN commit r17046.
2015-09-19 12:55:58 +00:00
0b86bbd424
another bunch of cleanup (mainly missing semicolon) signaled by jshint
...
This was SVN commit r17045.
2015-09-19 12:50:48 +00:00
e42e02d4fe
bunch of cleanup (mainly missing semicolon) signaled by jshint
...
This was SVN commit r17044.
2015-09-19 12:41:21 +00:00
e2bfba740b
sanitize matchsettings, patch by elexis, fixes #3431
...
This was SVN commit r17043.
2015-09-19 12:35:10 +00:00
fb6b86f928
Use the good material for the destroyed roman camp actor. Patch by stanislas69, fixes #3218 .
...
This was SVN commit r17042.
2015-09-19 12:18:27 +00:00
881f80a26a
Highlight all player names in the lobby chat. Patch by stanislas69, fixes #3281 .
...
This was SVN commit r17041.
2015-09-19 12:15:06 +00:00
4996d28110
change player color in gamesetup in random and skirmish maps, patch by elexis and stanislas69, fixes #1580
...
This was SVN commit r17040.
2015-09-18 21:54:43 +00:00
c24f2b1414
Revert a wrongly committed WIP change.
...
This was SVN commit r17038.
2015-09-18 19:54:19 +00:00
7b84c26a44
Fix some issues reported on Transifex.
...
This was SVN commit r17037.
2015-09-18 19:51:56 +00:00
0c043b5bdb
Fix edge case in the UnitAI state machine. Fixes #3429 .
...
This was SVN commit r17036.
2015-09-18 17:07:32 +00:00
4da5d571fc
Move the AI data to the new simulation settings system. Patch by elexis. Refs #3355 .
...
This was SVN commit r17034.
2015-09-18 16:36:52 +00:00
4655196d6f
petra: exit immediately when no entities, fix #3110
...
This was SVN commit r17033.
2015-09-17 18:19:06 +00:00
57a094268c
petra: some tweaks and cleanings
...
This was SVN commit r17032.
2015-09-17 17:58:34 +00:00
749637dc84
Move the map types to the new simulation settings system. Patch by elexis. Refs #3355 .
...
This was SVN commit r17031.
2015-09-17 17:55:27 +00:00
b478b9742a
Workaround for a specific case of #3410 , where units could stand on a committed foundation. Just check for units and order them to leave during all the building.
...
Refs #3410 .
This was SVN commit r17029.
2015-09-17 16:34:30 +00:00
b77ad821c2
Reenable formations and fix/improve the communication between UnitAI and UnitMotion. With the new pathfinder some path requests can be completed instantaneously, so UnitAI has to handle MoveStarted messages even in the IDLE state.
...
Please note that this commit makes #3410 really visible. Formation
members might pass through buildings.
Refs #3410 , #3337 .
This was SVN commit r17028.
2015-09-17 16:31:23 +00:00
fc45777793
delay the ownerShip only after the entity is spawned, fix #3422
...
This was SVN commit r17027.
2015-09-16 09:33:38 +00:00
21619a4705
Move the victory conditions to the new simulation settings system. Patch by elexis. Refs #3355,#3001
...
This was SVN commit r17026.
2015-09-16 09:22:36 +00:00
4e716699d7
cleanup of EntityState caching
...
This was SVN commit r17025.
2015-09-15 21:34:31 +00:00
7e18c0fd9e
determineAction only when needed
...
This was SVN commit r17024.
2015-09-15 18:39:03 +00:00
012bf32673
petra: improve detection of threatening enemy units, complete and fix 7ac0a4a3db, fixes #3418
...
This was SVN commit r17023.
2015-09-15 18:29:57 +00:00
7eefcbe8c5
Do not use non-static data member initializer.
...
GCC 4.6 does not support those and initializing it in the ctor is a lot
clearer in this case.
This was SVN commit r17022.
2015-09-15 00:55:03 +00:00
a65a8472f9
Mark some const functions as such.
...
This was SVN commit r17021.
2015-09-13 20:59:10 +00:00
e7f736fd0f
Move the game speeds to the new simulation settings system. Patch by elexis. Refs #3355
...
This was SVN commit r17019.
2015-09-13 19:15:07 +00:00
ae3aad704d
fix previous commit
...
This was SVN commit r17018.
2015-09-13 19:06:14 +00:00
9816e7c92d
Rename some variables to point out that they are only used in visual replay. Add script function IsVisualReplay. Refs #9 #3355 , patch by elexis
...
This was SVN commit r17017.
2015-09-13 19:03:33 +00:00
7ac0a4a3db
petra: improve detection of threatening enemy units
...
This was SVN commit r17016.
2015-09-13 17:25:18 +00:00
4964303f54
petra: be more restrictive to attack a field, refs #3406
...
This was SVN commit r17015.
2015-09-13 17:21:48 +00:00
ae6475fcc0
Fix a typo, patch by godlikeldh.
...
This typo didn't have any influence since dirty unit shapes are usually
discarded during the rasterization (they don't block long-range
pathfinding). Switching the order of a check in RasterizeHelper prevents
performance problems to a really small extent.
This was SVN commit r17014.
2015-09-13 10:18:37 +00:00
03d2c5e40b
Support inverted goals with the long-range pathfinder. This allows units to flee and should fix problems with ranged units too close to their targets. Fixes #3405 , refs #3372 .
...
Now that units flee it's necessary to fix the unit chasing: this commit
reintroduces some code from 298115f4c5#1537 .
Also includes some style improvements to the UnitMotion code.
This was SVN commit r17013.
2015-09-13 09:33:09 +00:00
bbcf996531
Move the population cap to the new simulation settings system. Patch by elexis. Refs #3355 .
...
This was SVN commit r17012.
2015-09-13 00:32:34 +00:00
8bb21e251a
Make Tuscan Acropolis skirmish map playable. Changes by stanislas69. Fixes #2970 .
...
This was SVN commit r17011.
2015-09-12 20:59:19 +00:00
73c210f6fb
Clean up line endings.
...
This was SVN commit r17010.
2015-09-12 20:58:59 +00:00
bdd6dd0f2f
JS component cleanup.
...
This was SVN commit r17009.
2015-09-12 20:58:57 +00:00
f271dd2bc1
fix display in structure tree of techs researchable only at a later phase than their availability, #fix #3411 , patch by S0600204
...
This was SVN commit r17008.
2015-09-12 20:02:14 +00:00
29f7f56f60
Add the starting resources to the new simulation settings system, refs #3355 , patch by elexis
...
This was SVN commit r17007.
2015-09-12 19:29:42 +00:00
a3767c3236
Add the ceasefire settings to the new simulation settings system.
...
Patch by elexis, refs #3355 .
This was SVN commit r17006.
2015-09-12 09:48:35 +00:00
979ea476b7
petra: do no make a trade route between too nearby markets
...
This was SVN commit r17005.
2015-09-11 18:06:26 +00:00
8507a7bc27
Create commands.txt only when actually starting the game. Patch by elexis. Fixes #3408 .
...
This was SVN commit r17004.
2015-09-11 17:44:50 +00:00
558695365d
Add some documentation about system components. Fixes #3315 .
...
This was SVN commit r17003.
2015-09-11 04:10:26 +00:00
fc051d94cc
Add check for non-passable (likely water-only) maps to territory percentage calculation.
...
Patch by s0600204. Fixes #3407 .
This was SVN commit r17002.
2015-09-11 02:16:21 +00:00
7842aa0468
petra: do not loose time attacking useless structures
...
This was SVN commit r17001.
2015-09-10 19:27:18 +00:00
dff16f664e
make fences not capturable (as walls and palisades)
...
This was SVN commit r17000.
2015-09-10 19:26:06 +00:00
9da482ead4
Based on previous experimental changes, major update to the unit motion.
...
With this change, units will not check their movement against all
obstructions when moving: terrain and static obstructions are assumed to
be handled by the long-range pathfinder.
However, when static obstructions are changed, the paths have to be
invalidated. In order to minimize the performance impact, units will
check for obstructions when they move after a passability change. If
they collide with something, they will recompute a path that will take
into account the new passability map.
Also includes some code cleanup. This patch should not change
performance a lot: the lower number of checks should give a small
performance improvement while using the message broadcasting system
should hurt it a bit.
Fixes #3376 , #3337 , #1914 .
This was SVN commit r16998.
2015-09-10 18:12:13 +00:00
8b437a0b1c
Fix #3386 , patch by elexis.
...
This was SVN commit r16997.
2015-09-10 05:30:18 +00:00
00a51404c9
cleanup of some for ... in loops on arrays (replaced by for ... of)
...
This was SVN commit r16996.
2015-09-09 18:21:17 +00:00
6213db17dd
petra: some tweaks in trade techs
...
This was SVN commit r16995.
2015-09-09 18:00:53 +00:00
ec6ae9d601
avoid that ships block allied docks, fix #3402
...
This was SVN commit r16994.
2015-09-09 17:37:44 +00:00
3f37ac44d6
Correctly fix the splashscreen typo.
...
This was SVN commit r16993.
2015-09-08 19:23:47 +00:00
bd355c531a
petra: fix and complete c1efebab15
...
This was SVN commit r16992.
2015-09-07 18:14:50 +00:00
a40fdd52d9
fix typo in 19d8c631be
...
This was SVN commit r16991.
2015-09-07 18:00:59 +00:00
5a685b84ca
Recompute the cost grid in the TerritoryManager when needed. Patch by s0600204. Fixes #3399 , #3400 .
...
This was SVN commit r16990.
2015-09-06 22:35:38 +00:00
c1efebab15
petra: do not always try to capture (depends on garrison inside target)
...
This was SVN commit r16989.
2015-09-06 18:39:46 +00:00
19d8c631be
Commit an updated version of the splashscreen for the new pathfinder.
...
This was SVN commit r16988.
2015-09-06 09:08:55 +00:00
4e3b933b11
Fixes some issues in checkrefs.pl: soundgroups have new gender and lang tags, PMP version bump, GUI XML can include directories, civ data path changed
...
This was SVN commit r16987.
2015-09-06 04:42:28 +00:00
448b8248cf
Revert my experimental changes from the previous days. Hopefully I can design something that doesn't introduce a ton of new issues. Refs #3376
...
This was SVN commit r16986.
2015-09-05 18:20:08 +00:00
1d89d05956
Don't try to short-path to non-point goals, because the algorithm won't deal with connectivity. Fixes another bug reported in #3363 .
...
This was SVN commit r16985.
2015-09-04 20:43:05 +00:00
2a7dc39d07
some cleanups of gui code
...
This was SVN commit r16984.
2015-09-04 17:50:04 +00:00
9e3ee0e849
Petra: make a bit more use of cavalry
...
This was SVN commit r16983.
2015-09-04 17:47:54 +00:00
3005637370
Make a compromise between f240374b28 and f134ac63bb by making the filtering of pathfinding-blocking shapes conditional.
...
Those shapes need to be taken into account when computing a short path,
but they need to be discarded when checking movements or they will
create long/short inconsistencies.
This was SVN commit r16981.
2015-09-03 20:09:25 +00:00
ad9736b5a5
Fix Arabic plural equation in tinygettext.
...
Patch by SafaAlfulaij taken from
https://github.com/tinygettext/tinygettext/pull/8 .
This was SVN commit r16980.
2015-09-03 16:42:05 +00:00
847fbea820
Apparently SVN messed up when I applied the patch for 0c14436c26, so fix it.
...
Also include some fixes to elexis's oversights, refs #3355 .
This was SVN commit r16979.
2015-09-03 07:32:32 +00:00
c0d8645a6d
remove some unnecessary object<->array copies + some parentheses cleanup
...
This was SVN commit r16978.
2015-09-02 18:14:26 +00:00
7d6553099f
Fix wrong offset when clicking too close to the header of sortable lists. Also added some code comments.
...
Patch by elexis, fixes #3391
This was SVN commit r16976.
2015-09-02 17:55:02 +00:00
0c14436c26
Move player and team number limits to a centralized file which will also eventually hold various kinds of settings.
...
Patch by elexis, refs #3355
This was SVN commit r16975.
2015-09-02 17:45:01 +00:00
8dde1cda94
Style cleanup, and remove a wrong TODO.
...
This was SVN commit r16974.
2015-09-02 17:40:31 +00:00
0c4c6e499d
Fix the LeaveFoundation order in UnitAI in the case of animals. The code used was a hack using the fleeing tactics, so use the regular "Order.LeaveFoundation" code shared with non-animal units.
...
Fixes #3372
This was SVN commit r16973.
2015-09-02 17:36:20 +00:00
bcc75b2156
fix buggy test
...
This was SVN commit r16972.
2015-09-02 17:11:29 +00:00
f134ac63bb
Revert most of f240374b28 which was actually bad. It caused units to get stuck because the obstructions won't block the same paths when rasterized on the grid and when directly tested for collisions.
...
As a general rule, pathfinding-blocking shapes should not be tested
against for movements. Only the passability grid should be considered.
As the algorithm which tests paths on this grid was fixed in 1c9ea56800Fixes #3376 .
This was SVN commit r16971.
2015-09-02 15:50:16 +00:00
5ff31a1e33
small cleanup of unit_actions.js
...
This was SVN commit r16970.
2015-09-01 20:49:37 +00:00
c599019b0a
fix crash when switching to gaia perspective while controlAllUnits is enabled
...
This was SVN commit r16969.
2015-09-01 20:46:49 +00:00
025391db35
fix behavior when under alert, fixes #3273
...
This was SVN commit r16968.
2015-08-31 19:54:06 +00:00
2c87ccb66e
Fix typo causing errors for building placement.
...
This was SVN commit r16967.
2015-08-30 23:07:25 +00:00
9451cf38f7
Fixes Esc key opening options dialog in match setup, introduced by a964e83c79
...
This was SVN commit r16966.
2015-08-30 21:31:03 +00:00
8a8a3b8377
Revert a wrong piece of code from 63e42fbd31. Refs #3293
...
This was SVN commit r16965.
2015-08-30 20:32:22 +00:00
1a15131d2d
Lobby bot optimizations.
...
This was SVN commit r16964.
2015-08-30 17:50:16 +00:00
63e42fbd31
Display which player(s) are OOS when it happens. Also fix some encoding issues with file paths.
...
Patch by elexis, fixes #3293 .
This was SVN commit r16963.
2015-08-30 17:47:18 +00:00
f47cb2c711
Fix the OOS reported by elexis in #3335 , and clean some whitespace and style.
...
The list of modified entities was thrown out on global visibility
updates (those happen on rejoin) but only in-world entities were
actually updated then, causing problems with garrisoning.
Now the list of modified entities can happen to be large, so replace the
hacky check for infinite loops by a real check.
This was SVN commit r16962.
2015-08-30 17:42:10 +00:00
45a39e7dfd
Fix 3171 by moving some logic to C++. These changes do not optimize the presence buffer and only fix the state bug.
...
This was SVN commit r16961.
2015-08-30 12:56:48 +00:00
2aef62d65f
Handle backrefs properly for maps and sets. Fixes #3374 .
...
Allocate the tag for the backreference before deserializing the content,
to match the order of serializing.
This was SVN commit r16959.
2015-08-30 04:51:16 +00:00
acf7b7aefb
Some gamesetup and in-game messages code convention related cleanup. Based on patch by elexis.
...
This was SVN commit r16958.
2015-08-30 03:34:07 +00:00
870237cce4
Do not create range queries in case we aren't at war with anyone. Fixes #3382 .
...
This was SVN commit r16957.
2015-08-30 02:49:49 +00:00
8befb23db3
In-game chat code cleanup. Based on patches by elexis.
...
This was SVN commit r16956.
2015-08-30 02:21:17 +00:00
57f340f906
Fix player rejoins. Refs #3242 .
...
This was SVN commit r16955.
2015-08-30 02:03:50 +00:00
c9893b3dd0
Test serialization of nested maps. Refs #3164 , #3374 .
...
This was SVN commit r16954.
2015-08-30 00:06:39 +00:00
90a99a1589
Prevent observers from using most chat commands. Refs #2879 .
...
Chat prefixed with /all could circumvent the check. Fix this by only
allowing /me.
(Note that this is not a full solution, see #3270.)
Refactors the cheat and chat input code based on changes in some of
elexis' patches.
This was SVN commit r16953.
2015-08-29 23:30:41 +00:00
a67b3b8942
UnitAI cleanup. Setup*RangeQuery. Refs #3080 .
...
Do not create range queries when being destructed.
rangeMan -> cmpRangeManager.
This was SVN commit r16952.
2015-08-29 22:49:52 +00:00
8217fa1a0e
Warn about range queries that can never return any results.
...
This was SVN commit r16951.
2015-08-29 22:49:49 +00:00
6f0850f6bc
Improve UnitAI's FindNearby* functions.
...
Stop them from starting a range query in case we have no ownership (or
-1).
Make use of Array.find() to make them a bit nicer.
This was SVN commit r16950.
2015-08-29 22:49:46 +00:00
31113cb8c3
UnitAI cleanup.
...
Use Array.{some,every,forEach,find} to simplify existing code.
Also make use of some fat arrow functions.
Some code style fixes.
Let FindNewHealTargets call RespondToHealableEntities to remove code
duplication.
This was SVN commit r16949.
2015-08-29 22:49:44 +00:00
5a7b4e380a
Rename some occurences of *Man to cmp*Manager.
...
This was SVN commit r16948.
2015-08-29 22:49:42 +00:00
2b1c128b66
Change the attack hotkey to Ctrl.
...
This is both easier to press, and also does not introduce any hotkey
conflict.
This was SVN commit r16947.
2015-08-29 22:49:38 +00:00
39343a8c84
Fix test failure.
...
This was SVN commit r16946.
2015-08-29 22:49:32 +00:00
e56dddbefb
Optionally allow observers to rejoin a game when they weren't here during the game setup.
...
Patch by elexis, fixes #3242 .
This was SVN commit r16945.
2015-08-28 20:20:10 +00:00
8e70140ec2
Handle properly static shapes that overlap the edge of the map (likely to happen with square maps).
...
This should fix #3364 .
This was SVN commit r16944.
2015-08-28 11:38:14 +00:00
d31ebaa47a
add a new Repairable component defining a ratio of repairTime/buildTime for repairable entities. Fixes #633
...
This was SVN commit r16943.
2015-08-27 20:31:10 +00:00
34555ad70c
Enhance i18n extractor to support a single context for a json file. Patch by elexis. Refs #3355 .
...
This was SVN commit r16942.
2015-08-27 19:07:36 +00:00
d129ae3cd8
Fix a special situation where map control percentage wasn't computed properly.
...
Also improve the code and fix a typo.
Based on patch by s0600204, fixes #3378 .
This was SVN commit r16941.
2015-08-27 16:26:32 +00:00
e3208c8784
fix rallyPoint on foundation, (it worked only by chance because all structures are repairable)
...
This was SVN commit r16940.
2015-08-25 15:39:11 +00:00
b9ab8f5855
Explicitly include public's mod.json in Windows packages.
...
Also clean up some unused options in the dist script.
This was SVN commit r16939.
2015-08-25 12:55:05 +00:00
217a478ac7
Improved materials for wooden towers (spec maps, AO maps, parallax). Patch and AO map by stanislas69, fixes #3352 .
...
This was SVN commit r16938.
2015-08-24 07:09:05 +00:00
8923768bff
Fix spelling of "Feminization" in the summary screen and in associated code.
...
This was SVN commit r16935.
2015-08-23 18:00:17 +00:00
47bca54228
Fixes the computation of team values for some of the summary counters, and reorder columns. Refs #3311
...
This was SVN commit r16934.
2015-08-23 17:57:51 +00:00
a63b7a0126
Add ability to query the map control percentage, and use this value in the summary screen. Patch by s0600204, fixes #3321
...
This was SVN commit r16933.
2015-08-23 17:44:37 +00:00
b694ab41d9
Show the number of trade carts and looted resources in the summary screen. Patch by bb, fixes #3311
...
This was SVN commit r16932.
2015-08-22 17:57:41 +00:00
74c420f658
GUI code cleanup. Fixes #3354 .
...
Lots of code style fixes:
* type [*&]varname -> type[*&] varname
* else
if (...)
->
else if (...)
* Spaces around some ops.
* i++ -> ++i.
* switch-case style fixes.
* Indentation fixes.
* Removing some commented out code.
* include header sorting
* Changed multiple pointer var declarations to be one per line.
* Removed strange spaces in some places.
* Changed some include header guards to be consistent with the rest of
the codebase.
* Use UNUSED() instead of UNUSED2().
Some small code fixes:
* Using .find() instead of .count() == 0.
* !.empty() instead of .size() == 0.
* Range-based for loops.
* Making some member functions const by small changes.
* Adds GetScrollBarPos(idx) const for this.
* Using early returns/continues in some places.
* Uses size_t for some loops in CList and COList.
* Removes unused heading element (not attribute) from COList.
* Use ENSURE in one case where some custom code did something similar.
* Made some parameters const ptrs/refs.
* Change removal loop in GUItext.cpp to erase-unique.
* Made some static things const.
* Allow iterating over children of IGUIObject with range-based for
loops by
exposing begin() and end() (rename from ChildrenIt{Begin,End}()) and
use it.
Comments:
* Comment COList.
* Update a few comments.
* Remove useless or duplicated comments.
This was SVN commit r16931.
2015-08-21 17:08:41 +00:00
d821601978
Revert changes when clicking "Cancel" in the options page.
...
Patch by Stefan, fixes #3324
This was SVN commit r16930.
2015-08-21 07:54:21 +00:00
c7edc09f51
Revert 7cc2d65ec7.
...
The problem caused by nested Maps is actually #3374 .
Cloning the data object saved by the !AuraManager fixes #3188 .
Also, using Map fixes a serialization problem, refs #3375 .
On top of those changes, some reordering of add/multiply to avoid any
ordering mistake.
Fixes #3164 , Refs #3374
This was SVN commit r16929.
2015-08-21 07:29:08 +00:00
a63e9c521d
Optionally limit the framerate in menus to 50 FPS, to save power. Patch by elexis, fixes #2882
...
This was SVN commit r16927.
2015-08-20 13:22:44 +00:00
ba82743777
Some range-based for loops.
...
This was SVN commit r16926.
2015-08-20 12:58:41 +00:00
b2e8a241d2
Properly check loaded scripts in the second simulation instance of a serialization test. Fixes #3238
...
This was SVN commit r16925.
2015-08-20 12:52:29 +00:00
1ab3a4a02d
Fix 6506bc20cb, refs #3238
...
This was SVN commit r16924.
2015-08-20 12:49:43 +00:00
558d43bac5
Replace some functor structs with lambdas, closures or range-based fors.
...
This was SVN commit r16923.
2015-08-19 03:33:04 +00:00
36c6b50944
Revert emplace for associative containers. Fixes #3366 .
...
GCC < 4.8.0 does not support emplace for those.
See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=44436 .
This was SVN commit r16922.
2015-08-19 03:32:47 +00:00
674f49f1a8
Remove generated test files during clean-workspaces.sh. Patch by otero. Fixes #3275 .
...
Also remove two generated and disabled test files.
This was SVN commit r16921.
2015-08-19 01:30:09 +00:00
bd8f9b7824
Fix enemy corpses visible in the fog of war. Fixes #3179 .
...
This was SVN commit r16919.
2015-08-16 09:29:34 +00:00
1c9ea56800
Fix the CheckLineMovement algorithm. Added some comments and a test to avoid problems.
...
This addresses some "stuck units" cases.
This was SVN commit r16918.
2015-08-13 16:21:39 +00:00
01de76f4be
Code improvements for the hierarchical pathfinder: cache hits and variable initialization.
...
This was SVN commit r16917.
2015-08-11 15:21:11 +00:00
28ef270571
Enhance the MakeGoalReachable algorithm to handle better non-point goals.
...
Fixes #3363 , #3297 .
This was SVN commit r16915.
2015-08-11 09:47:08 +00:00
f7a7b687fc
Don't send TerrainChanged messages when painting the terrain, as terrain texture doesn't influence passability.
...
This was SVN commit r16914.
2015-08-10 11:55:43 +00:00
e263c8f1de
Remove EnableSSE2 for Windows builds. Fixes #3361 .
...
Since we do not require SSE2 on *nix requiring it on Windows makes no
sense,
it also breaks the game for some users.
This was SVN commit r16912.
2015-08-03 19:57:42 +00:00
c333ae3fc2
Escape [ char in a gui caption.
...
This was SVN commit r16911.
2015-08-02 23:10:08 +00:00
3c8fe51712
complete b3f7b8633a for (un)packing
...
This was SVN commit r16910.
2015-08-02 17:24:04 +00:00
ec96c737ee
Actually use vpObj instead of obj, and use it in all cases. Refs #3354 .
...
This was SVN commit r16909.
2015-08-02 14:40:51 +00:00
b3f7b8633a
fix incoherent UnitAI state when changing ownership of a cheering or garrisoned unit
...
This was SVN commit r16908.
2015-08-02 09:39:08 +00:00
591771a0be
make siege tower able to capture, fixes #3356
...
This was SVN commit r16907.
2015-08-02 09:32:47 +00:00
94302a4149
Move engine version to common file. Patch by elexis. Fixes #3359 .
...
This was SVN commit r16906.
2015-08-01 23:03:13 +00:00
701f1dbb51
Fix sudden main-menu background jumps. Patch by s0600204. Fixes #3312 .
...
This was SVN commit r16905.
2015-08-01 23:02:57 +00:00
2a6eac3bd4
Petra: fix order of event processing in defenseManager
...
This was SVN commit r16904.
2015-07-31 16:55:38 +00:00
217a500d60
Add missing license headers. Fixes #3357 .
...
This was SVN commit r16903.
2015-07-31 11:28:14 +00:00
1a8096a920
Reliably send the ReplayFinished message at the very end of visual replays. Patch by elexis.
...
This was SVN commit r16902.
2015-07-30 21:55:34 +00:00
a4e606c575
TerrainTextureManager cleanup.
...
This was SVN commit r16901.
2015-07-30 21:51:01 +00:00
c5aad60776
Actually stop iterating if retval != INFO::OK. Also fix comments.
...
This was SVN commit r16900.
2015-07-30 21:50:58 +00:00
15a4c813d6
Add support for AArch64 (ARM64). Patch by tbm. Fixes #3345 .
...
This was SVN commit r16899.
2015-07-30 19:52:55 +00:00
0868d03e74
Fix previous commit.
...
This was SVN commit r16898.
2015-07-30 17:27:27 +00:00
2238a18aee
Close and free replay streams. Based on patch by elexis.
...
This was SVN commit r16897.
2015-07-30 16:43:22 +00:00
4f91b16d0f
Allow pausing during visual replays. Patch by elexis. Refs #3341 .
...
This was SVN commit r16896.
2015-07-30 15:55:19 +00:00
47336b770f
Add clipping to OList cells. Patch by elexis. Fixes #3353 .
...
This was SVN commit r16895.
2015-07-30 01:33:48 +00:00
8bfe16cac8
Use in-place construction.
...
This was SVN commit r16894.
2015-07-29 23:44:17 +00:00
c5eb9b7bb7
Range-based for for VfsPath loops.
...
This was SVN commit r16893.
2015-07-29 23:44:12 +00:00
540cf75794
L10n code cleanup.
...
This was SVN commit r16892.
2015-07-29 23:44:05 +00:00
356b08ec5d
update heroes and their auras for capture, fixes #3331
...
This was SVN commit r16891.
2015-07-29 17:54:08 +00:00
f2f3076bd7
minor cleanup
...
This was SVN commit r16890.
2015-07-29 17:50:04 +00:00
7b81f9a866
add garrison flag for wooden tower, patch from stanislas69, fixes #3059
...
This was SVN commit r16889.
2015-07-29 17:15:40 +00:00
a07add11c6
Some range-based for loops and some style cleanup.
...
This was SVN commit r16888.
2015-07-29 01:07:23 +00:00
b4d517c261
Fix infinite loop in key code to key name mapping.
...
Also make some data const and construct data in-place.
This was SVN commit r16887.
2015-07-29 01:07:18 +00:00
2cae918059
Same as previous commit, but nicer. Refs #3329
...
This was SVN commit r16886.
2015-07-27 20:39:46 +00:00
c81f243b58
Use the mirage data to determine the best attack in case of capture attack. Fixes #3329
...
This was SVN commit r16885.
2015-07-27 19:54:40 +00:00
851e863892
Remove animation name compatibility mapping.
...
10 years should have given everyone enough time to move to the new
naming scheme.
This was SVN commit r16884.
2015-07-27 01:08:29 +00:00
be36bec6df
Replace a translation string by an equivalent that is already used thrice.
...
This was SVN commit r16883.
2015-07-27 01:08:27 +00:00
da48c8c26f
Some const refs and one const function.
...
This was SVN commit r16882.
2015-07-27 01:08:25 +00:00
bd53e9d736
Remove unused ah_translate code.
...
This was SVN commit r16881.
2015-07-27 01:08:15 +00:00
2a655d1363
cleanup of 4054e5cb04
...
This was SVN commit r16880.
2015-07-26 14:54:52 +00:00
27de859f9b
Petra: minor tweaks in farming
...
This was SVN commit r16879.
2015-07-26 14:49:01 +00:00
4054e5cb04
make a wooden tower template for each civ, refs #3059
...
This was SVN commit r16878.
2015-07-26 14:43:21 +00:00
edd03ad557
disable the delete button when less than 50% cp, fixes #3300 , patch by bb
...
This was SVN commit r16877.
2015-07-22 17:06:06 +00:00
eb47670cd1
Some string fixes reported by translators.
...
This was SVN commit r16874.
2015-07-21 21:19:41 +00:00
a61c7560eb
petra: minor attack tweaks
...
This was SVN commit r16873.
2015-07-21 19:30:54 +00:00
b0a5087dda
Prevent observers from pausing the game. Patch by Stefan. Fixes #3341 .
...
This was SVN commit r16871.
2015-07-19 23:03:03 +00:00
f240374b28
Fix a number of short/long range pathfinder inconsistencies revealed by 128a603287.
...
This was SVN commit r16869.
2015-07-18 12:33:40 +00:00
1e79b3a8af
Update templates to reflect the recent obstruction changes for units.
...
Fixes #3294 .
This was SVN commit r16868.
2015-07-18 12:30:26 +00:00
128a603287
Use the terrain-only grid for terrain edges in the short pathfinder algorithm. This grid is updated on each terrain change, whereas the passability grid is updated once a turn. This caused OOS on rejoin, fixes #3292 .
...
However, using the terrain-only grid reveals one discrepancy between the
short pathfinder (which uses unit radii) and the long one (which uses
unit clearances). So I implemented the change proposed by sanderd17 in
#3294 , which is removing unit radius and using only the pathfinder
clearance. Refs #3294
Now some tweaking has to be done in the templates, so that units get a
passability class suited to their apparent size. In the meantime the
unit motion is quite bugged.
This was SVN commit r16867.
2015-07-18 08:37:49 +00:00
35071dd44b
allow changing the trading gain with tech + rework of market techs, fixes #3326
...
This was SVN commit r16866.
2015-07-17 19:27:15 +00:00
a0d21e8d9e
do not fill changedTemplateInfo when no AIs to prevent OOS, refs #3133
...
This was SVN commit r16865.
2015-07-17 17:45:15 +00:00
b471975332
improve consistency between decay and regen rates for buildings, fixes #3332
...
This was SVN commit r16864.
2015-07-16 18:29:53 +00:00
76d5374e77
Some string changes based on translators' feedback.
...
This was SVN commit r16863.
2015-07-16 17:07:55 +00:00
f9440a964a
minor petra tweaks
...
This was SVN commit r16860.
2015-07-15 17:29:06 +00:00
8fc4ecaa6b
Fix previous commit, stupid typo...
...
This was SVN commit r16859.
2015-07-15 16:57:23 +00:00
b58f8ab969
Serialize the activation flag of the scripted Visibility component.
...
Currently only preview entities are affected, and they are not
serialized, but it could break a lot of things in the future.
This was SVN commit r16858.
2015-07-15 16:55:05 +00:00
39d93ea17c
Change the handling of modified entities in the visibility update.
...
The game has to deal with situations such as: the visibility of an
entity changes, a mirage is created for it -> the mirage visibility is
updated -> the entity visibility is updated back.
All of this process now happens in the same turn, and all updates are
guaranteed to be performed. This fixes a source of serialization errors
and rejoin OOSes.
Fixes #3107
This was SVN commit r16857.
2015-07-15 16:46:59 +00:00
9f1b85d562
Remove a useless global terrain update when modifying environment settings in Atlas.
...
Also make sure that the settings are updated in the game view in a
non-hacky way.
This was SVN commit r16855.
2015-07-14 17:08:02 +00:00
b0386d7fab
Fix gamesetup for observer games. Thanks to elexis
...
This was SVN commit r16854.
2015-07-14 11:26:14 +00:00
d08279ceb6
some fixes for petra
...
This was SVN commit r16853.
2015-07-13 13:05:14 +00:00
74b600d661
modify also capture points in the civ specific techs affecting structure health, fixes #3333
...
This was SVN commit r16852.
2015-07-13 12:46:26 +00:00
c946ebbf7c
prevent structures without territory influence to decay in allied territory
...
This was SVN commit r16851.
2015-07-12 18:46:44 +00:00
04982b0bf5
Fix compiler warning
...
This was SVN commit r16849.
2015-07-12 16:49:26 +00:00
f74215e96c
rounding needed for houses with popBonus%5 != 0, fixes #3328
...
This was SVN commit r16848.
2015-07-12 15:23:34 +00:00
0f10e21ab1
Keep ownership when changing formation. Fixes #3154 , fix proposed by sanderd17.
...
This was SVN commit r16847.
2015-07-12 08:48:31 +00:00
edf6e909b2
...aaaaand I forgot this guy.
...
This was SVN commit r16846.
2015-07-12 08:11:30 +00:00
0d32afd688
Improve the style of GUI string text call functions.
...
This was SVN commit r16845.
2015-07-12 08:09:55 +00:00
0682190def
Don't postpone rendering of icons when they are at the end of a GUI string.
...
Fixes #2502
This was SVN commit r16844.
2015-07-12 07:38:04 +00:00
9161cd7e24
petra: rework of the management of captured/decaying structures
...
This was SVN commit r16843.
2015-07-11 17:00:21 +00:00
0c45e3b5d0
Correctly compute the masks for shared visibility updates. The old code was working only because of luck when shared vision was always reciprocal.
...
Refs #2055 , fixes #3327
This was SVN commit r16842.
2015-07-11 16:45:09 +00:00
c4389abceb
let petra use wooden towers in village phase
...
This was SVN commit r16841.
2015-07-09 20:46:09 +00:00
1b88eaf1cd
Do not reset victory conditions when changing map selection. The behavior is now coherent with everything else (players, etc.) when selecting random maps.
...
Patch by elexis, fixes #3209
This was SVN commit r16840.
2015-07-09 16:52:12 +00:00
b3fa75529b
All work and no play... refs #3253
...
This was SVN commit r16839.
2015-07-08 19:17:32 +00:00
cf21c34e3f
Give players and bots their actual name during the game, for better experience.
...
Patch by elexis, fixes #3253
This was SVN commit r16838.
2015-07-08 19:03:14 +00:00
542061dbed
Handle gaps in the teams list in the summary screen, plus code cleanup.
...
Patch by elexis, fixes #3323
This was SVN commit r16837.
2015-07-08 17:01:34 +00:00
4a0bb47a62
AI: various cleanings and fixes
...
This was SVN commit r16836.
2015-07-07 17:32:35 +00:00
aa78c1be66
Make the connectivity grid generation algorithm of the hierarchical pathfinder a bit less stupid.
...
This was SVN commit r16834.
2015-07-05 20:32:52 +00:00
11c9471ad6
Change back the long pathfinder to take into account non-pathfinding classes, but only when reloading, to avoid impacting the performance.
...
Also make the GetPassabilityClasses functions use references instead of
wild allocations. Use a reference when passing pass classes to the AI
worker.
This was SVN commit r16833.
2015-07-05 19:14:52 +00:00
0e4e3754e9
Update the passability grid properly when changing the map shape or the water height. Also include a fix for a possible bad memory access.
...
This was SVN commit r16832.
2015-07-04 21:25:57 +00:00
7ca2084e89
Fix #3072
...
This was SVN commit r16831.
2015-07-04 18:00:51 +00:00
b7a1b9fbd4
fixes some wonder templates
...
This was SVN commit r16830.
2015-07-04 16:46:20 +00:00
32252ea00c
fix persian conscription_cavalry which needs persian levy_cavalry
...
This was SVN commit r16829.
2015-07-03 17:01:19 +00:00
512f69379b
Fix the male variation of non-Roman healers. Fixes #3318
...
This was SVN commit r16828.
2015-07-02 16:59:16 +00:00
3018359576
Improve a little bit Atlas performance when modifying terrain elevation.
...
This was SVN commit r16827.
2015-07-01 19:13:56 +00:00
e500de4dc6
AI: clean up
...
This was SVN commit r16826.
2015-06-30 19:10:57 +00:00
30e5f032d8
Adapt Atlas to the new pathfinder. Fixes #3298
...
This was SVN commit r16824.
2015-06-29 19:59:41 +00:00
6a9019564e
AI: clean up some obsolete code
...
This was SVN commit r16823.
2015-06-28 19:08:00 +00:00
7b298cccdb
Increase bench size to meet minimum obstruction size. Fixes #3316 .
...
This was SVN commit r16822.
2015-06-28 19:05:22 +00:00
dc29884f6e
Fix a shader glitch I left in when removing conditional defines. Fixes #3119 .
...
We ought to add more anisotropic filtering on normal textures with
parallax too or it breaks the effect too quickly.
This was SVN commit r16821.
2015-06-28 13:16:05 +00:00
e0838c5326
Update the pathfinder docs.
...
This was SVN commit r16820.
2015-06-27 15:16:21 +00:00
3efa4be02c
AI completes the removal of the JS pathfinder and fixes naval transport
...
This was SVN commit r16819.
2015-06-27 13:30:44 +00:00
575d708fca
Correct the outpost tooltip for capturing.
...
Adapt the Theatron tooltip to the new specific name of the technology.
Add a final stop.
This was SVN commit r16818.
2015-06-25 20:14:45 +00:00
0b8597fd2d
Petra: improve performance of initialization in naval maps
...
This was SVN commit r16817.
2015-06-25 18:19:12 +00:00
e1a34eb4ea
Handle (de)serialization of the AI pathfinder.
...
This was SVN commit r16815.
2015-06-24 20:24:58 +00:00
0b7343dccc
Preserve the dirtiness informations of the passability grid at deserialization for proper AI updates.
...
Refs #3310
This was SVN commit r16814.
2015-06-24 20:15:06 +00:00
ae0c051e83
Petra: remove some huge spikes when profiling
...
This was SVN commit r16813.
2015-06-24 18:42:09 +00:00
152d39d8a6
Fix save/load games, and use the new code to enhance the tests.
...
This was SVN commit r16812.
2015-06-23 20:39:11 +00:00
4f331c1359
cleanup of previous commits
...
This was SVN commit r16810.
2015-06-22 20:04:11 +00:00
7ac4b53cb8
AI: start switch from the internal JS pathFinder to the c++ one, thanks to Itms implementation. Still wip
...
This was SVN commit r16809.
2015-06-22 17:19:24 +00:00
d045bb87d6
fix the market placement following new pathFinder changes
...
This was SVN commit r16808.
2015-06-22 16:49:49 +00:00
fae2caed1a
adapt AIs to changes in e6d1afe48b
...
This was SVN commit r16807.
2015-06-22 16:47:42 +00:00
e6d1afe48b
Add a terrain passability class for water. Fixes #3308
...
This was SVN commit r16806.
2015-06-22 15:30:23 +00:00
1793a96c14
Actually remove the unused expression.
...
This was SVN commit r16805.
2015-06-21 20:44:31 +00:00
495aa7bec5
Expose TemplateExists() to RM scripts.
...
This was SVN commit r16804.
2015-06-21 20:22:34 +00:00
c5814ef76c
Fixes tests adding system components without using the SYSTEM_ENTITY id - this caused assertion failures in debug builds
...
This was SVN commit r16803.
2015-06-21 19:22:12 +00:00
ae4dfe294d
Actually state the file instead of the directory in some error messages.
...
This was SVN commit r16802.
2015-06-21 18:46:33 +00:00
5a0b9b0e70
Fix some issues found by static analysis (clang-analyzer and cppcheck).
...
This was SVN commit r16801.
2015-06-21 18:46:31 +00:00
caa8f51c2e
Annotate custom assert for clang-analyzer.
...
This was SVN commit r16800.
2015-06-21 18:46:23 +00:00
30d96af5a2
a bit of cleanup in petra naval code
...
This was SVN commit r16799.
2015-06-20 20:49:31 +00:00
92832b1dc7
Petra fixes for naval maps
...
This was SVN commit r16797.
2015-06-19 21:09:41 +00:00
bbafed7fbf
Lobby code cleanup.
...
This was SVN commit r16796.
2015-06-19 17:25:28 +00:00
cc4af6d2d4
Allies only share vision when researching a tech. Based on patch by niektb. Fixes #2055
...
This was SVN commit r16795.
2015-06-19 09:24:55 +00:00
1830c6346b
Revert most of 989f164500, and add a comment to prevent people from making the same mistake.
...
This code used to make units with the pass class "ship-small" blocked
nearly everywhere.
This was SVN commit r16794.
2015-06-18 19:54:30 +00:00
eeee79e7f3
AI fix for building placement + some cleanings
...
This was SVN commit r16793.
2015-06-18 19:19:24 +00:00
c6ca83949c
Prevent players from rejoining that were not present on game start. Patch by elexis. Fixes #3305 .
...
This was SVN commit r16792.
2015-06-18 18:20:54 +00:00
9701a85554
Fix a possible problem with grid updates. Refs #3296 .
...
This was SVN commit r16791.
2015-06-18 16:31:38 +00:00
e7707f0f0c
Fix issue with OOS in replays. Patch by elexis
...
This was SVN commit r16790.
2015-06-18 15:29:03 +00:00
008fb80855
AI: remove code from old pathFinder
...
This was SVN commit r16789.
2015-06-17 21:03:49 +00:00
989f164500
Make the terrain analysis slightly more efficient for pathfinding passability classes, and fix a mistake introduced in 1709353e2c.
...
This was SVN commit r16787.
2015-06-17 20:48:41 +00:00
155c6e6ccd
Properly initialize the AI pathfinder, and clean whitespace.
...
This was SVN commit r16786.
2015-06-17 20:35:23 +00:00
1c29b21b69
adapt the AI to 1709353e2c, fixes #3295
...
This was SVN commit r16785.
2015-06-17 20:30:57 +00:00
1709353e2c
Changes the general behavior of non-pathfinding passability classes, in order to make the handling of foundation obstructions less difficult. This will allow the AI to be fixed, as reported in #3295 .
...
Also some cleanup and comments updates.
Refs #3295 .
This was SVN commit r16784.
2015-06-17 20:19:53 +00:00
4b8f0c9fb9
Change ResourceTrickle schema to match all other resource schemas. Patch by s0600204. Fixes #3303 .
...
This was SVN commit r16783.
2015-06-17 15:26:06 +00:00
b8fce56821
Implement sortable columns for the gui, and use them in the lobby. Patch by Vladislav. Fixes #2405 .
...
This was SVN commit r16781.
2015-06-17 09:10:50 +00:00
2ff4c60859
Adjusts some capturing parameters.
...
This was SVN commit r16779.
2015-06-16 19:41:08 +00:00
a568b42bf9
Code cleanup.
...
This was SVN commit r16778.
2015-06-16 14:35:16 +00:00
c8a5708654
Fix tests.
...
This was SVN commit r16777.
2015-06-15 19:48:42 +00:00
fcf7344537
Nerfs fire rate of garrisoned ships.
...
This was SVN commit r16776.
2015-06-15 16:39:42 +00:00
fdb99a5c8c
Buffs melee cavalry HP.
...
This was SVN commit r16775.
2015-06-15 16:36:26 +00:00
dc97eeb5e5
Re-enables promotions.
...
This was SVN commit r16774.
2015-06-15 16:31:26 +00:00
8380b67f94
Move GUI schemas to the mod mod. Fix some validation related errors in the mod mod.
...
Check if the used directory exists before trying to add a validator.
Refs #245 .
This was SVN commit r16773.
2015-06-15 16:00:26 +00:00
7887734ef0
Add attack notifications for capture attacks. Patch by Vladislav. Fixes #3257 .
...
This was SVN commit r16772.
2015-06-15 01:16:51 +00:00
68ea5f37f4
Remove unused ctors. Fixes compilation with GCC 4.6.
...
This was SVN commit r16771.
2015-06-14 23:50:38 +00:00
4af117434d
Fixes clang unused parameter warning
...
This was SVN commit r16770.
2015-06-14 23:45:15 +00:00
25a7d79d1e
FIXE ERROR: CCmpPosition::GetPosition called on entity when IsInWorld is false, when you save a map with garrisoned units, thx to daniel for report
...
This was SVN commit r16769.
2015-06-14 22:17:39 +00:00
0a67de37bc
Fixes clang warning about unknown warning group -Wunused-but-set-variable
...
This was SVN commit r16768.
2015-06-14 21:07:42 +00:00
47b4530245
Replaces usage of readlink -f in update-workspaces.sh with a perl one-liner, for compatibility with BSD and OS X, fixes #916
...
This was SVN commit r16767.
2015-06-14 20:43:12 +00:00
2128cfbcb8
Updates readme.txt with new visual replay option, refs #9
...
This was SVN commit r16765.
2015-06-14 19:59:19 +00:00
473b282265
Refactor the grid update code. Should give a significant performance boost to the simulation update.
...
Also fixes some bad code that could lead to hidden bugs.
Fixes #3296 , thanks elexis for testing ;)
This was SVN commit r16764.
2015-06-14 19:22:07 +00:00
0e7f0f861b
Fixes A19 map converter script to be compatible with Python 2 (uses struct instead of to_bytes and from_bytes)
...
This was SVN commit r16763.
2015-06-14 17:53:12 +00:00
d676b047a0
Move ~LongPathfinder after the declaration of LongOverlay.
...
Also improve the style.
This was SVN commit r16762.
2015-06-13 21:02:01 +00:00
c3546cbf51
Fixes Polybolos template inconsistencies.
...
Fixes Palisade Angle Spike obstruction size failing new minimum
requirement.
This was SVN commit r16761.
2015-06-13 19:01:59 +00:00
6b9b863747
Increases fortress build time and cost and nerfs attack and armour of crush-dealing Mauryan champion swordsmen.
...
This was SVN commit r16760.
2015-06-13 16:50:01 +00:00
d52a71ae31
Nerfs ranged units, though to a lesser extent for skirmishers/javelinists.
...
This was SVN commit r16759.
2015-06-13 16:48:37 +00:00
a9ac2edce5
Decrases phasing time and costs.
...
This was SVN commit r16758.
2015-06-13 16:46:29 +00:00
e5419cf19b
Decreases HP of peacocks and both HP and crush armour of female citizens.
...
This was SVN commit r16757.
2015-06-13 16:44:47 +00:00
2a657a7eb7
Fix changing ownership to -1
...
This was SVN commit r16756.
2015-06-13 13:02:10 +00:00
204dcf201c
Improve ownership changes by only giving the cp of the old owner to the new owner.
...
This was SVN commit r16755.
2015-06-13 09:53:15 +00:00
30efa73a38
FIX error: comparison between pointer and integer ('IReplayLogger *' and 'int') introduced in [16727] over osx
...
This was SVN commit r16754.
2015-06-13 02:42:21 +00:00
534b8076e4
Petra: check if the location of a new foundation is under enemy fire (only implemented for some structures for the time being)
...
This was SVN commit r16753.
2015-06-12 20:30:25 +00:00
6581796103
New long-range pathfinder.
...
Based on Philip's work located at
http://git.wildfiregames.com/gitweb/?p=0ad.git;a=shortlog;h=refs/heads/projects/philip/pathfinder
Includes code by wraitii, sanderd17 and kanetaka.
An updated version of docs/pathfinder.pdf describing the changes in
detail will be committed ASAP.
Running update-workspaces is needed after this change.
Fixes #1756 .
Fixes #930 , #1259 , #2908 , #2960 , #3097
Refs #1200 , #1914 , #1942 , #2568 , #2132 , #2563
This was SVN commit r16751.
2015-06-12 18:58:24 +00:00
aa1512a662
code cleaning in petra
...
This was SVN commit r16750.
2015-06-11 20:11:08 +00:00
1442b7e913
Petra: fix some capture cases not handled by 61f3d80ab0
...
This was SVN commit r16749.
2015-06-11 19:20:52 +00:00
fd3d697edf
Make it easier to add different backgrounds
...
This was SVN commit r16747.
2015-06-11 09:08:46 +00:00
61f3d80ab0
Petra: the AI now destroy captured buildings it can't keep
...
This was SVN commit r16746.
2015-06-10 18:16:03 +00:00
12d4209eed
fix typo
...
This was SVN commit r16745.
2015-06-10 16:41:34 +00:00
1395b441e0
Clean up advanced and elite templates by defining the modifications as technologies. This will not alter gameplay for now, as the advanced and elite units are disabled in game. Fixes #2620
...
This was SVN commit r16744.
2015-06-10 14:41:00 +00:00
1811323f95
Petra: small fixes in trade and attack
...
This was SVN commit r16743.
2015-06-09 19:06:59 +00:00
752aac16ee
Fix Seleucid actor file to be valid under the actor RNG
...
This was SVN commit r16742.
2015-06-09 15:24:46 +00:00
950d361c15
Fix the material Relax NG files.
...
This was SVN commit r16741.
2015-06-09 15:15:19 +00:00
fe0bb4ab4e
Fix Iberian tower and barracks to be valid under the actor RNG
...
This was SVN commit r16740.
2015-06-09 13:33:40 +00:00
fe71300e07
Move some fish to the sea. Fixes #3289
...
This was SVN commit r16739.
2015-06-09 13:18:24 +00:00
40f2762170
Fix healer support template
...
This was SVN commit r16738.
2015-06-08 14:50:16 +00:00
558461a792
Fix female support template
...
This was SVN commit r16737.
2015-06-08 14:44:20 +00:00
a964e83c79
Fixes button order consistency in a few places: resign confirmation, manual, splashscreen, fixes #2837 . NOTE: the convention is Cancel/Back button on the left, other action buttons are to the right. Please report any you find that don't match that!
...
Adds hotkey.cancel mapped to the Escape key, which is now used for
closing/canceling in-game dialogs, fixes #2636 , #3200 . Please report any
dialogs where Esc doesn't work!
This was SVN commit r16736.
2015-06-08 03:07:45 +00:00
7cac7cd65e
Add RNC to RNG conversion script that uses trang. Fixes #245 .
...
Also fix the material.rnc.
This was SVN commit r16734.
2015-06-07 23:52:52 +00:00
a18fbd12ec
XML validation. Based on patch by historic_bruno. Refs #245 .
...
This was SVN commit r16733.
2015-06-07 21:56:52 +00:00
f260e75499
improve display of timing options, patch by Vladislav, fixes #2894
...
This was SVN commit r16732.
2015-06-07 20:58:51 +00:00
6a1ee7137c
fix starting techs
...
This was SVN commit r16731.
2015-06-07 12:13:40 +00:00
2457b69fb3
Fix const attribute for some function parameters.
...
This was SVN commit r16730.
2015-06-07 09:24:19 +00:00
ce19d55176
AIs: remove the hardcoded athen phases
...
This was SVN commit r16729.
2015-06-06 15:41:04 +00:00
be93b31411
Visual replay of command files, patch by elexis.
...
Works with the command line argument
"-replay-visual=/path/to/commands.txt". It is not integrated to the main
menu GUI yet.
Refs #9 .
This was SVN commit r16727.
2015-06-06 08:45:49 +00:00
e9c27d4066
Fix wrong technology application as discovered by wowgetoffyourcellphone and niektb
...
This was SVN commit r16726.
2015-06-05 10:39:10 +00:00
a839adc615
Fix Carthagian healer voices. Patch by karamel. Fixes #3220
...
This was SVN commit r16725.
2015-06-05 09:12:26 +00:00
4a7994a595
improve indentation in previous tag
...
This was SVN commit r16724.
2015-06-04 21:26:01 +00:00
f1f8479ffe
fix entityLimits with replaced tech
...
This was SVN commit r16723.
2015-06-04 21:24:34 +00:00
06e71f56ca
Petra: units now have less dead time before getting their orders
...
This was SVN commit r16722.
2015-06-04 19:35:56 +00:00
3c139b1022
make the unitai idle propriety consistent with its state at unit creation
...
This was SVN commit r16721.
2015-06-04 19:00:42 +00:00
abab4a71af
Add loading-screen tip about territory decay, and update other tips to the current state of the game.
...
This was SVN commit r16720.
2015-06-04 17:24:31 +00:00
fcc992feae
Fix math
...
This was SVN commit r16719.
2015-06-04 16:06:37 +00:00
cdbc775531
Fix code style
...
This was SVN commit r16718.
2015-06-04 15:36:34 +00:00
79d2af3e26
Split up different status bars for even easier moddability + add a capture bar (thanks again to Vladislav for making this possible). Refs #3233
...
This was SVN commit r16716.
2015-06-04 13:55:45 +00:00
14bfbbf9d4
Allow sprites to have color multiplication, which allows player-colored bars. Patch by Vladislav. Fixes #3233
...
This was SVN commit r16715.
2015-06-04 12:16:52 +00:00
f6f4f83784
Fixes instant multiplayer crash on OS X Lion (10.7). libc++ had a bug where it set eofbit on reading the last character in a stringstream, we compare gcount with the expected length as a workaround to detect real eofs. Fixes #3109 .
...
This was SVN commit r16714.
2015-06-04 05:11:47 +00:00
6506bc20cb
Fixes #3238 , SetGlobal 'TriggerHelper' called multiple times
...
This was SVN commit r16713.
2015-06-03 20:34:59 +00:00
65e442eea5
this varying ceaseFireTimeRemaining was disturbing when ceasefire was inactive and display selection state activated
...
This was SVN commit r16712.
2015-06-03 17:16:11 +00:00
aa41651fda
remove a useless splice
...
This was SVN commit r16711.
2015-06-02 20:58:18 +00:00
a286091470
mostly some cleanings of AI code + a petra fix when a player is defeated
...
This was SVN commit r16710.
2015-06-02 20:52:12 +00:00
ffdacbb612
Fix issues with technologies and pop bonus/cost. Patch by Vladislav. Fixes #3236
...
This was SVN commit r16709.
2015-06-02 14:33:21 +00:00
2092ed4396
Removes use of 'register' storage class, deprecated in C++11. Fixes -Wdeprecated-register build warnings in clang, fixes #3068 .
...
This was SVN commit r16708.
2015-06-02 03:20:04 +00:00
040bdd14db
fix some selectionGroups
...
This was SVN commit r16707.
2015-06-01 21:04:31 +00:00
c3b8923ff7
Update tinygettext.
...
Updates tinygettext to upstream commit
0e34a55e514763a48f8abe7812405ffe722a31f4.
No actual code changes from the previously bundled version, but it was
relicensed to zlib.
Keeps the addition of precompiled.h and win32 dirent.
This was SVN commit r16705.
2015-06-01 01:09:19 +00:00
f71be3c764
Use iterators for XMBAttributeList and XMBElementList. Fixes #3269 .
...
This was SVN commit r16704.
2015-06-01 00:29:35 +00:00
d3da00dc99
Fix some issues found by static analysis.
...
Actually abort in case of recursive includes again. Refs #2622 .
This was SVN commit r16703.
2015-06-01 00:29:23 +00:00
9854d04794
Petra: react to PlayerDefeated events for target choice
...
This was SVN commit r16701.
2015-05-31 19:53:23 +00:00
f009b52c0f
Fix null-reference
...
This was SVN commit r16700.
2015-05-31 12:23:08 +00:00
b5e22a22ea
Fix error message missed in f680caa14f. Refs #3118 .
...
This was SVN commit r16699.
2015-05-30 22:25:54 +00:00
c1594c4bc8
Petra: add missing changes in previous commit
...
This was SVN commit r16698.
2015-05-30 19:15:36 +00:00
9408860acc
Petra: some code reshuffling + small bug fixes
...
This was SVN commit r16697.
2015-05-30 19:12:01 +00:00
b738772d65
Fix typo
...
This was SVN commit r16696.
2015-05-29 19:51:48 +00:00
2ae17391ae
Fix AI to use the same bitmask as set in e68ef21334
...
This was SVN commit r16695.
2015-05-29 18:28:46 +00:00
f1445b16c6
IsAlly -> IsMutualAlly, and move the divide-by-zero check
...
This was SVN commit r16693.
2015-05-29 07:16:54 +00:00
e68ef21334
Don't decay when connected to connected allied territory, and also allow the decay script to determine which parts of the territory should blink
...
This was SVN commit r16692.
2015-05-29 07:02:16 +00:00
f4432330e1
cleaning
...
This was SVN commit r16691.
2015-05-28 20:42:01 +00:00
f200815de4
AI: avoid creating some unused maps and cleanings
...
This was SVN commit r16690.
2015-05-28 20:35:05 +00:00
e5727980da
Adds debug output to display return code of failing SHGetFolderPathW, refs #3267
...
This was SVN commit r16688.
2015-05-27 02:02:32 +00:00
37357326f7
Petra: improve storehouse placement and fix some inconsistencies with new pathFinder refs #2960
...
This was SVN commit r16687.
2015-05-26 21:45:04 +00:00
57407172e8
Plural translations.
...
This was SVN commit r16686.
2015-05-26 16:29:22 +00:00
1d7b394752
Fix male death. Refs #3220
...
This was SVN commit r16685.
2015-05-26 16:04:26 +00:00
e638af5422
Clean up some unused variables and assignments.
...
This was SVN commit r16684.
2015-05-26 15:40:07 +00:00
4ccc9130ba
Add missing include.
...
This was SVN commit r16683.
2015-05-26 15:40:04 +00:00
60f784900a
Fix the territory influence weight to fit into an u16 number. (no idea why the buildings have so many different weights though).
...
This was SVN commit r16682.
2015-05-26 14:25:23 +00:00
2424604329
Add some structure to the voice files. Use the structure in the templates to enable parameters. Resample the voices to be mono/positional. Patch by karamel. Fixes #3220
...
This was SVN commit r16681.
2015-05-26 12:25:10 +00:00
b65c232e51
Allow setting rallypoint on enemy entities. Patch by maveric, fixes #1046
...
This was SVN commit r16680.
2015-05-26 10:59:09 +00:00
84ba6c0719
Include string fixes from Itms again
...
This was SVN commit r16679.
2015-05-25 16:06:53 +00:00
6752389c98
Let technologies replace other technologies, and use this for the town and city phase. Main implementation by niektb, structree fix by s0600204. Fixes #3208
...
This was SVN commit r16678.
2015-05-25 15:52:02 +00:00
0054486dba
Implement methods to find the neighbour of a certain territory, and use it for territory decay. Fixes #3204
...
This was SVN commit r16676.
2015-05-25 14:17:45 +00:00
c93c1c92eb
Replace std::auto_ptr uses by std::unique_ptr since the former is deprecated.
...
This was SVN commit r16674.
2015-05-25 01:23:27 +00:00
5b2e9c95e7
More encoding fixes and EOL changes, fixes #3262
...
This was SVN commit r16672.
2015-05-24 19:07:05 +00:00
3b106c352d
Upload back the reviewed technologies, two of them were badly encoded. See ce31be2055 and 04e7c99b1b.
...
This was SVN commit r16671.
2015-05-24 17:53:59 +00:00
bbf3422f01
Enhance the alert buttons by moving them to the garrisoning panel. Also add a new icon for the maximum level of alert.
...
Suggestion and testing by rogue-spectre, fixes #2474 .
This was SVN commit r16670.
2015-05-24 13:51:02 +00:00
b2e2e47205
Update some old templates in the Combat demo map.
...
This was SVN commit r16669.
2015-05-24 13:05:40 +00:00
04e7c99b1b
Temporarily revert ce31be2055 for technologies, refs #3262 .
...
Also add a forgotten change for the Athenian wonder.
This was SVN commit r16668.
2015-05-24 11:37:10 +00:00
599a2daa85
Amend previous commit, reported by qwertz
...
This was SVN commit r16667.
2015-05-24 09:37:31 +00:00
ce31be2055
General review of Greek specific names. I didn't bother to go through Seleucids, who might be modified, and I ignored the history section most of the time because we don't use it anywhere anymore AFAIK.
...
My reference was the "Abrégé du dictionnaire Grec - Français" by A.
Bailly.
This was SVN commit r16666.
2015-05-24 09:11:57 +00:00
57afd0091b
petra cleanings and tweaks
...
This was SVN commit r16664.
2015-05-21 20:23:21 +00:00
f98a1cf9ac
Show a different notification if livestock is attacked. Patch by fcxSanya. Fixes #3176 .
...
This was SVN commit r16663.
2015-05-20 22:40:10 +00:00
f64538b6ee
Actually handle multiple notifications instead of one per turn. Patch by elexis. Fixes #3222 .
...
This was SVN commit r16662.
2015-05-20 22:09:59 +00:00
ec4d0183ad
Use the actual player name in MP. Patch by elexis. Refs #3252 .
...
This was SVN commit r16661.
2015-05-20 15:02:20 +00:00
7ca255c3fa
Clarify time elapsed in summary screen. Patch by qwertz. Fixes #3128
...
This was SVN commit r16660.
2015-05-20 09:08:07 +00:00
a7b6e44717
Fix player names in trade tooltips. Patch by elexis. Fixes #3252
...
This was SVN commit r16659.
2015-05-20 08:30:19 +00:00
122155bb65
Allow observers to see the wonder victory message. Patch by elexis. Fixes #3226
...
This was SVN commit r16658.
2015-05-20 08:11:03 +00:00
1723fbcca8
Cleanup some ceasefire code. Patch by elexis. Fixes #2749
...
This was SVN commit r16657.
2015-05-20 07:25:25 +00:00
6dcf636d7c
fix attackable players in unitai, refs #2749
...
This was SVN commit r16656.
2015-05-19 20:10:19 +00:00
4947818c52
petra tweak
...
This was SVN commit r16655.
2015-05-19 17:11:09 +00:00
07351999fd
Fixes #3248 , patch by elexis
...
This was SVN commit r16654.
2015-05-17 22:11:41 +00:00
8b4b8431e3
Small cleanup, based on a change from one of Philip's old patches
...
This was SVN commit r16653.
2015-05-16 09:39:27 +00:00
ce558ddf56
petra now try to regain capture points of its own structure, plus some bug fixes
...
This was SVN commit r16652.
2015-05-14 20:09:45 +00:00
4b9e11eedd
a few fixes and tweaks for petra
...
This was SVN commit r16651.
2015-05-13 15:37:49 +00:00
d41671044a
petra: additional bugfixes and tweaks
...
This was SVN commit r16649.
2015-05-10 20:21:00 +00:00
20877632ce
Fix 1vs1 Game, Fix Resign double message
...
This was SVN commit r16648.
2015-05-10 16:12:55 +00:00
a39aa76e62
These temporary roots aren't needed anymore with SpiderMonkey 31
...
This was SVN commit r16647.
2015-05-10 09:01:39 +00:00
ae34c4a079
petra: let units avoid attacking palisades when a better target is possible
...
This was SVN commit r16644.
2015-05-09 19:05:24 +00:00
bbe4a30a56
improve the fix of b30e7ca26b for lag when failed ejection of lots of units
...
This was SVN commit r16643.
2015-05-09 18:16:41 +00:00
5a6a848eb2
some code cleaning in petra
...
This was SVN commit r16642.
2015-05-09 17:53:24 +00:00
552c3ede69
petra: add protection when no boarding point found, fix #3232
...
This was SVN commit r16641.
2015-05-09 17:23:57 +00:00
707a89dc5e
Add hotkey to select idle units only to manual. See 347ffabaeb.
...
This was SVN commit r16640.
2015-05-09 17:09:06 +00:00
1155bf589b
petra: fix bug in garrisoning following capture adaptation
...
This was SVN commit r16639.
2015-05-08 18:48:51 +00:00
c8e964f0e9
fix wrong test from d21c0026ec
...
This was SVN commit r16638.
2015-05-08 17:48:40 +00:00
074408b114
fixes #3101 , patch by elexis
...
This was SVN commit r16637.
2015-05-08 15:21:09 +00:00
b30e7ca26b
fix lag when a garrisoned ship is destroyed in the middle of water
...
This was SVN commit r16636.
2015-05-08 15:11:32 +00:00
d664fadc38
Seleucid Fortress commit
...
This was SVN commit r16635.
2015-05-08 04:12:58 +00:00
e4a5d5b4dd
Added Conquest Strutures and Conquest Units in victory modes, fixes #2976 , refs #1649
...
This was SVN commit r16634.
2015-05-08 03:06:14 +00:00
399daeddbf
prevent loading of templates in AIManager when no AIs, fixes #3101
...
This was SVN commit r16633.
2015-05-07 19:09:39 +00:00
3aad4d8e30
Revert 2b7ba4ff0b by adding a way to specify globally disabled templates.
...
Refs #3174
This was SVN commit r16632.
2015-05-06 20:43:49 +00:00
8e44687ae3
Properly fix #3223 .
...
The previous commit destroyed the context while it was still in use.
This was SVN commit r16631.
2015-05-06 20:28:28 +00:00
2b7ba4ff0b
Disable the Ptolemaic lighthouse on some maps with a lot of little water spots.
...
Refs #3174 .
This was SVN commit r16629.
2015-05-06 18:48:13 +00:00
642500b49e
Make the Ptolemaic lighthouse reveal the shore on the entire map.
...
Fixes #3174
This was SVN commit r16628.
2015-05-06 18:47:02 +00:00
4db041e3c6
Stop leaking g_ScriptStatsTable in replay mode. Fixes #3223 .
...
This was SVN commit r16627.
2015-05-05 22:34:41 +00:00
03bc22510b
fix entities deserialization in AIInterface and remove duplicates entities and templates in sharedAI, refs #3060 and fixes #1089
...
This was SVN commit r16626.
2015-05-05 20:38:43 +00:00
709c667ddd
Add different icons to the range auras. Icons by niektb. Fixes #3224
...
This was SVN commit r16625.
2015-05-05 14:09:58 +00:00
d21c0026ec
Add optional ceasefire time to the game. Patch by elexis. Fixes #2749
...
This was SVN commit r16624.
2015-05-05 13:38:36 +00:00
7f606250f8
Fix build failure on GCC 4.6.
...
This was SVN commit r16623.
2015-05-04 19:37:25 +00:00
f5107ad189
Fix OOS caused by saving build progress. Fixes #3217
...
This was SVN commit r16622.
2015-05-04 12:49:11 +00:00
b8a20c958c
Do not serialize properties for Sets. Serialization tests for Map and Set.
...
This was SVN commit r16620.
2015-05-04 01:41:09 +00:00
ee17247ee5
petra: some fixes in tech researches
...
This was SVN commit r16619.
2015-05-03 16:13:21 +00:00
0a44d24c96
Flip the overlay sprites face around to show the non-mirrored side. Now sprites are rendered correctly (which should have happened in d4794b5474).
...
This was SVN commit r16617.
2015-05-03 15:55:17 +00:00
7a70c475df
Improve rejoin messages. Patch by elexis. Fixes #1949 .
...
This was SVN commit r16614.
2015-05-03 02:06:17 +00:00
ecf229046a
String fixes.
...
This was SVN commit r16613.
2015-05-02 22:35:13 +00:00
d4794b5474
Flip aura icons correctly
...
This was SVN commit r16612.
2015-05-02 20:01:03 +00:00
27560e72fe
Visualise auras by adding status icons to affected units. Implement the visualisation for the temple aura. Fixes #3180
...
This was SVN commit r16611.
2015-05-02 16:15:59 +00:00
18a97cc82a
Add structure tree to the game session. Based on patch by Louhike. Fixes #3101
...
This was SVN commit r16610.
2015-05-02 12:22:25 +00:00
a9afa61a7b
Serialization support for ES6 Sets.
...
This was SVN commit r16608.
2015-05-01 23:04:28 +00:00
af37b00f4b
Add QueryMiragedInterface. Fixes #3189 .
...
QueryMiragedInterface allows to make writing Mirage-aware code
(GuiInterface)
simpler and less prone to error.
Replaces ResourceSupply's GetGatherers() with GetNumGatherers() as the
former
was never used in a way other than the second.
This was SVN commit r16607.
2015-05-01 17:03:37 +00:00
7d20695412
petra: fixes and tweaks of the previous commits for capture
...
This was SVN commit r16606.
2015-05-01 14:13:59 +00:00
385c47fe6b
do not transfer the unused full gatherer list to the AIs, refs #3189
...
This was SVN commit r16605.
2015-05-01 12:53:41 +00:00
7d8dee27cc
Autocomplete observer nicks in-game. Patch by elexis. Fixes #3203 .
...
This was SVN commit r16604.
2015-04-30 22:12:56 +00:00
d3de7c6594
Adjust gui Relax NG grammar for size parsing changes in 5ce12c2263.
...
Moves sound_group grammar files to the mod mod to prevent an error
loading it with #245 .
This was SVN commit r16603.
2015-04-30 22:05:46 +00:00
522bd8b37c
petra: let the ai capture gaia structures
...
This was SVN commit r16602.
2015-04-30 19:07:28 +00:00
fe9eeedd66
Serialise messages in the GuiInterface to allow players to see them on a saved game or after a rejoin. Fixes #3185
...
This was SVN commit r16601.
2015-04-30 18:01:38 +00:00
41113f6f9b
Adjust gui Relax NG grammar to <repeat> changes in 622614de02.
...
This was SVN commit r16600.
2015-04-30 04:39:50 +00:00
43a31ce494
petra: use a map instead of object for garrison bookkeeping
...
This was SVN commit r16599.
2015-04-29 19:44:41 +00:00
b0f7c00622
petra: continuation on capture adaptation
...
This was SVN commit r16598.
2015-04-29 17:59:29 +00:00
6389dba54f
Allow players to unload all their units when garrisoned in allied buildings. Patch by maveric. Fixes #2857
...
This was SVN commit r16597.
2015-04-29 17:32:17 +00:00
e758701da5
Include missing header.
...
This was SVN commit r16595.
2015-04-29 15:54:08 +00:00
7d953ff0a7
Fix compiler warning.
...
This was SVN commit r16594.
2015-04-29 00:07:48 +00:00
296d363812
Remove forgotten warning
...
This was SVN commit r16593.
2015-04-28 13:12:13 +00:00
5e5799a45a
Fix tests
...
This was SVN commit r16592.
2015-04-28 12:16:33 +00:00
7cc2d65ec7
Revert b0c74699b0 until problems with nested maps are solved. Refs #3164
...
This was SVN commit r16591.
2015-04-28 12:13:48 +00:00
1e98b7d37e
Add useful decay message for the AI, and fix a style issue
...
This was SVN commit r16590.
2015-04-27 18:38:00 +00:00
f9a025ba6b
petra: some cleanings and tweaks
...
This was SVN commit r16589.
2015-04-27 18:34:24 +00:00
04c4e666de
Put territory decay in the Capture regen timer to avoid jumpyness of GUI elements
...
This was SVN commit r16588.
2015-04-27 18:04:58 +00:00
40eb747bc4
Express tooltip for placing defensive buildings in meters. Patch by maveric. Fixes #3079
...
This was SVN commit r16587.
2015-04-27 13:47:47 +00:00
502e1a3960
Use SDL2 by default everywhere.
...
SDL1 can still be forced passing --sdl1 to update-workspaces.sh.
Eventually, if no blocking issues arise, SDL1 support could be dropped
after next release.
This was SVN commit r16586.
2015-04-27 08:49:16 +00:00
487d6a1afc
When using SDL2 recommend a >= 2.0.2 version to avoid incurring in possible bugs with older versions.
...
This was SVN commit r16585.
2015-04-27 07:56:34 +00:00
8ff8667ed0
add initialization of capturePoints in AIProxy + some cleanings
...
This was SVN commit r16584.
2015-04-26 18:07:55 +00:00
42c04cdad2
Show the maximum population setting in a tooltip. Patch by elexis. Fixes #3197
...
This was SVN commit r16583.
2015-04-26 09:42:54 +00:00
a959fcf337
Disable resign button after resigning once. Patch by elexis. Fixes #3193
...
This was SVN commit r16582.
2015-04-26 08:57:26 +00:00
8099fe01de
Drop off resources when building dropsite. Patch by maveric. Fixes #3093
...
This was SVN commit r16581.
2015-04-26 08:35:10 +00:00
604538a63a
Fix issue with preferences in BuildingAI. Refs #1731
...
This was SVN commit r16580.
2015-04-26 08:21:43 +00:00
6c13bd92fd
improve 632c8bd17e
...
This was SVN commit r16579.
2015-04-25 17:29:22 +00:00
632c8bd17e
petra: continuation of adaptation to capture
...
This was SVN commit r16578.
2015-04-25 17:00:15 +00:00
4d1dee171e
Explicitely add the UnitAI target to the BuildingAI target list to circumvent the range mismatch. Refs #1731
...
This was SVN commit r16577.
2015-04-25 12:54:34 +00:00
9a8c03093b
Fix line endings of some template files, and add the native line endings svn prop
...
This was SVN commit r16576.
2015-04-25 09:33:42 +00:00
d7960fa775
Try out some replacement animations for capturing on athenian infantry
...
This was SVN commit r16575.
2015-04-25 08:16:55 +00:00
9b5560b383
fix rounding when returning resources from aborted foundation, patch by elexis, fixes #3132
...
This was SVN commit r16574.
2015-04-24 17:51:27 +00:00
e8accbe565
petra: inform allied players when advancing to the next phase, patch by maveric, fixes #2757
...
This was SVN commit r16573.
2015-04-24 17:37:46 +00:00
e0606468df
Translate some tooltips as plurals. Unify aura tooltip code.
...
This was SVN commit r16571.
2015-04-23 18:58:39 +00:00
6e58781e51
Make Sicilia Nomad a skirmish map and fix the description.
...
This was SVN commit r16570.
2015-04-23 17:33:49 +00:00
7f74f7d218
Make capture attack visible in Atlas
...
This was SVN commit r16569.
2015-04-23 17:14:15 +00:00
5cbf2404af
Fix tower tech tooltip. Patch by elexis. Fixes #3191 .
...
This was SVN commit r16568.
2015-04-23 00:33:54 +00:00
bda45f6526
Clarify the XpartaMuPP readme. Fixes #3163 .
...
Also converts it to markdown.
This was SVN commit r16567.
2015-04-22 23:43:59 +00:00
2e6a248ade
Pass some properties as null instead of undefined to circumvent serializer limitations. Based on patch by elexis. Fixes #3187 .
...
This was SVN commit r16566.
2015-04-22 22:10:18 +00:00
d8f1f19f94
Save game type and victory scripts before random map is selected. Fixes #3184
...
This was SVN commit r16565.
2015-04-22 13:48:45 +00:00
d08fdf43d7
Fix some issues with capturing and miraged entities
...
This was SVN commit r16564.
2015-04-22 09:59:59 +00:00
6c7eb93e1c
Add temporary capture cursor
...
This was SVN commit r16563.
2015-04-22 08:20:41 +00:00
885aec20dd
fix a typo in 9be10939cb
...
This was SVN commit r16562.
2015-04-21 19:25:54 +00:00
625cfb79d3
petra: another fix for capture events
...
This was SVN commit r16561.
2015-04-21 19:00:51 +00:00
7bb30ef6b0
Fix some more flags
...
This was SVN commit r16560.
2015-04-21 17:58:07 +00:00
9be10939cb
petra: react to more capture events and some tweaks on attacks
...
This was SVN commit r16559.
2015-04-21 17:15:19 +00:00
2972cb3202
Small fix
...
This was SVN commit r16558.
2015-04-21 14:33:28 +00:00
fa878c2f31
Force attack instead of capture when the attack hotkey is pressed
...
This was SVN commit r16557.
2015-04-21 13:21:19 +00:00
701663afaa
Add minimap ping alert for capture attack
...
This was SVN commit r16556.
2015-04-21 08:27:26 +00:00
999f3e3497
Fix gui problem when selecting a combination of capturable and non-capturable entities
...
This was SVN commit r16554.
2015-04-20 16:26:58 +00:00
6766401510
Fix the resign problem with capturing
...
This was SVN commit r16553.
2015-04-20 16:22:48 +00:00
535d612e06
Small fixes.
...
This was SVN commit r16552.
2015-04-20 14:51:06 +00:00
a8c44d947c
Fix tests
...
This was SVN commit r16551.
2015-04-20 07:47:07 +00:00
ad27deeb9d
Implement building capturing. Fixes #996
...
This was SVN commit r16550.
2015-04-20 07:45:45 +00:00
751c46c60b
petra: let the AI know it can build a new base around a captured cc,refs #996
...
This was SVN commit r16549.
2015-04-18 18:28:02 +00:00
b8b3f66027
petra: improve attack management and let some parameters vary with maxpopulation, fixes #3173
...
This was SVN commit r16548.
2015-04-17 18:43:07 +00:00
a0cf780e1e
Amend 5c84c3e9e5
...
This was SVN commit r16547.
2015-04-16 13:17:58 +00:00
2042e6b2d4
Added TriggerScripts Reload(Hotloading) when you change the file and save
...
This was SVN commit r16546.
2015-04-16 04:30:51 +00:00
06916dde43
Yet another fix for the gamesetup persistent settings.
...
Patch by elexis, fixes #3165
This was SVN commit r16545.
2015-04-15 21:22:39 +00:00
5c84c3e9e5
Some entities (like birds) can have negative positions without being marked as out-of-world.
...
Refs #2430
This was SVN commit r16544.
2015-04-15 12:19:47 +00:00
120ff2c60c
Fix the structure tree a second time, this should also work on Windows.
...
This was SVN commit r16542.
2015-04-15 09:10:05 +00:00
6aa99d762f
Add a new spatial subdivision, based on an old patch by wraitii.
...
This subdivision is faster but less precise, so range queries get more
entities and are a bit slower (up to 1ms approx.), but the overall gain
on a simulation update is always positive and can reach 10ms per frame.
For now, this new subdivision is only used by the range manager,
integrating it in the obstruction manager might be sensible.
Refs #2430
This was SVN commit r16540.
2015-04-14 21:33:43 +00:00
a0340efab8
fix an unfortunate typo affecting the AIs
...
This was SVN commit r16539.
2015-04-14 20:23:42 +00:00
1ea1755ee7
Petra: follow-up on changes to deal with capture
...
This was SVN commit r16538.
2015-04-14 20:14:39 +00:00
a980d8fdfc
Fix structure tree by allowing undefined templates in the productionqueue
...
This was SVN commit r16537.
2015-04-14 18:45:02 +00:00
03506a0eec
fix typo creating 71fb9ef162
...
This was SVN commit r16536.
2015-04-13 21:04:49 +00:00
71fb9ef162
Add AI safety guard. I had a game with an undefined template, but that shouldn't happen at that point.
...
This was SVN commit r16535.
2015-04-13 10:10:38 +00:00
b6bcfdbb2e
Fixes missing newlines in debug_printf, patch by elexis, fixes #3056
...
This was SVN commit r16534.
2015-04-12 19:38:31 +00:00
d139a75de3
new button in diplomacy to request an attack to allies, works also for AIs, fix #3157
...
This was SVN commit r16533.
2015-04-11 18:46:05 +00:00
7fbab6dd10
Petra: update the target of an attack when it has been captured
...
This was SVN commit r16532.
2015-04-11 18:26:47 +00:00
01673b4c58
Add the -ooslog support for replays. Refs #3169 , see also a7b18d02bf.
...
This was SVN commit r16531.
2015-04-11 18:12:35 +00:00
528dc9179a
Fix mace and ptol skirmish replacements
...
This was SVN commit r16529.
2015-04-10 11:58:12 +00:00
41550ea849
add a missing protection following changes for capture
...
This was SVN commit r16528.
2015-04-09 19:53:03 +00:00
d41fb4612f
Fix athen archer selection
...
This was SVN commit r16527.
2015-04-09 17:36:27 +00:00
27601c5b8b
Adapt naval manager to deal with structures from different civs. Similar to 107185d7dd
...
This was SVN commit r16526.
2015-04-09 12:27:03 +00:00
eb9e7ee84d
Make all champion, hero and siege producing buildings ready for capture. Fixes #2614 (hopefully)
...
This was SVN commit r16525.
2015-04-09 09:44:24 +00:00
2700f74dd3
Make docks ready to capture. Refs #2614
...
This was SVN commit r16524.
2015-04-09 08:22:29 +00:00
bdfedb1c49
Rename Seleucid mercenary units to reflect their mercenary state
...
This was SVN commit r16523.
2015-04-09 08:08:20 +00:00
b92fac170a
Rename ptolemaic mercenary units to reflect their mercenary state
...
This was SVN commit r16522.
2015-04-09 07:44:16 +00:00
6250990bfd
Make barracks ready to capture. Refs #2614
...
This was SVN commit r16521.
2015-04-09 07:15:50 +00:00
107185d7dd
adapt the AI API to deal with structures from different civs for capture
...
This was SVN commit r16519.
2015-04-08 16:23:39 +00:00
19692c0acc
Fix entity names in map files.
...
This was SVN commit r16518.
2015-04-08 08:15:47 +00:00
358b1c06d8
Petra: start changes needed to support capture
...
This was SVN commit r16514.
2015-04-07 20:23:12 +00:00
1dcfd75e62
Fix typo
...
This was SVN commit r16513.
2015-04-07 13:34:26 +00:00
b0c74699b0
Use Maps instead of Objects in the Auramanager to improve performance. Also remove the IonMonkey v24 workaround. Refs #2684
...
This was SVN commit r16512.
2015-04-07 09:52:06 +00:00
481cf0f754
Modify ProductionQueue of Civil Centres in preparation of capturing. Refs #2614
...
This was SVN commit r16511.
2015-04-07 07:37:25 +00:00
b4cbc14490
Style fixes
...
This was SVN commit r16510.
2015-04-07 07:15:59 +00:00
abe6347554
Some cheat code cleanup.
...
This was SVN commit r16509.
2015-04-06 22:43:54 +00:00
cf527707da
Revert "Improve ARRAY_SIZE." ( 7afaacda19).
...
constexpr and noexcept are only supported by VS November 2013 CTP.
This was SVN commit r16508.
2015-04-06 21:24:53 +00:00
f2c76cc75d
Fix a number of issues related to historical messages and initial join in the multiplayer lobby. Fixes #3156
...
This was SVN commit r16507.
2015-04-06 19:33:37 +00:00
71a84682ad
Fix the productionQueue for capturing. Needs the AI to be fixed in a similar way, and still needs template changes to see the full effect. Refs #2614
...
This was SVN commit r16506.
2015-04-06 15:02:37 +00:00
c8401bd737
Rename cart mercenary units to distinguish them from regular units
...
This was SVN commit r16505.
2015-04-06 12:47:12 +00:00
165bebb00e
Rename some _2_ templates to regular names. This is possible since the pikemen were renamed too
...
This was SVN commit r16504.
2015-04-06 12:08:45 +00:00
97ef1c542d
Rename spearmen with pikes into pikemen. This avoids problems with civs that have both pikemen and spearmen.
...
This was SVN commit r16503.
2015-04-06 11:49:23 +00:00
8eebb5d118
Rename Athen marine archer as a special unit should have a non-standard name
...
This was SVN commit r16502.
2015-04-06 11:23:02 +00:00
2b57410021
Better tested summary screen update. Also make modern tooltip style more consistant with the general light on dark theme.
...
This was SVN commit r16501.
2015-04-06 06:17:09 +00:00
18ff57c316
Update version in mod.json.
...
This was SVN commit r16500.
2015-04-05 17:14:47 +00:00
7afaacda19
Improve ARRAY_SIZE.
...
This was SVN commit r16499.
2015-04-05 16:50:26 +00:00
a6a2914882
Fix error when you paste entities over another entity and you try to rotate at the same time while pressing alt/shift key
...
This was SVN commit r16497.
2015-04-04 21:45:11 +00:00
43508ce3a0
some petra code reshuffling
...
This was SVN commit r16496.
2015-04-04 15:38:53 +00:00
c735f9a579
Revert wrong commit 14b7e7568c
...
This was SVN commit r16495.
2015-04-04 09:11:05 +00:00
14b7e7568c
Rename athen archer, as it's not a default unit. Naming it as a default unit makes any capture code more difficult.
...
This was SVN commit r16494.
2015-04-04 08:56:14 +00:00
0131f2e4d5
Fix gamesetup options for lobby games
...
This was SVN commit r16493.
2015-04-03 09:40:50 +00:00
dfd7978cb2
fix typo (particate → participate)
...
This was SVN commit r16492.
2015-04-03 07:39:25 +00:00
8d3d9616a2
be more generic with starting entities of nomad maps
...
This was SVN commit r16491.
2015-04-02 21:01:19 +00:00
afbf6e8e40
cleanings of AIInterface
...
This was SVN commit r16490.
2015-04-02 20:28:02 +00:00
1482a84875
replace some slow (foreach in) loops
...
This was SVN commit r16489.
2015-04-02 20:22:33 +00:00
0e2c30c7d2
Reduce the strength of the elevation brushes in Atlas.
...
This was SVN commit r16488.
2015-04-02 13:43:47 +00:00
4e763ef26e
Move civ JSON files to simulation/data. Patch by MattDoerksen. Fixes #2562 .
...
This was SVN commit r16485.
2015-04-01 23:48:33 +00:00
7695d2fcb9
Refine checks for invalid player ids for mirages. Patch by elexis. Fixes #3149 .
...
This was SVN commit r16484.
2015-04-01 23:48:26 +00:00
41863d6ae2
Explicitly cast to unsigned to fix a warning.
...
This was SVN commit r16483.
2015-04-01 23:48:23 +00:00
96410ee9a4
Fix heightmap rectangle. Take the water plain height as the base plane, instead of a hardcoded value.
...
This was SVN commit r16482.
2015-04-01 14:17:18 +00:00
aa808baabf
Fix the stumped maps in Alpine Mountains
...
This was SVN commit r16481.
2015-03-31 17:30:59 +00:00
ebb57aa516
Fix tests by enlarging the precision bumped in 7ed45213a9
...
This was SVN commit r16479.
2015-03-31 16:56:09 +00:00
7ed45213a9
Allow heightmaps to be 8 times as high by lessening precisions. Includes conversion script and modified standard maps. Bump the map version number. Fixes #3112
...
This was SVN commit r16478.
2015-03-31 16:48:31 +00:00
a84765fc75
Add all non-structure starting entities to Unknown Nomad. Patch by elexis. Fixes #3153 .
...
This was SVN commit r16477.
2015-03-30 23:44:48 +00:00
072afdcede
Fix line endings for random maps.
...
This was SVN commit r16476.
2015-03-30 23:41:12 +00:00
b5593bf1a9
petra changes in the choice of player to be attacked
...
This was SVN commit r16475.
2015-03-30 20:21:46 +00:00
ec9a49562b
Remove debug warning + fix typo
...
This was SVN commit r16474.
2015-03-30 18:49:54 +00:00
a05f146c79
Disable data gathering in AIInterface when no AI players are loaded
...
This was SVN commit r16473.
2015-03-30 18:44:02 +00:00
8712ad835c
Fix buildingAI in case of modifications (techs, auras, ownership changes, ...) + clean up the code a bit
...
This was SVN commit r16472.
2015-03-30 09:25:20 +00:00
809cc074fa
petra: small tweaks and cleanings
...
This was SVN commit r16471.
2015-03-29 13:01:38 +00:00
569b5e244d
fix computation of foundation refund when destroyed, fixes #3132
...
This was SVN commit r16470.
2015-03-26 19:17:37 +00:00
798cd2963e
Add option to disable treasures on skirmish and random maps
...
This was SVN commit r16469.
2015-03-26 08:31:50 +00:00
1cd41e33c6
Niektb's Northern Island skirmish map.
...
This was SVN commit r16468.
2015-03-25 19:50:37 +00:00
61590f28d3
let AIProxy deal with new entities created without ownership, fixes #3142
...
This was SVN commit r16467.
2015-03-25 18:22:23 +00:00
3e98d379ab
LordGood's Alpine Mountains skirmish map with some modifications by niektb.
...
This was SVN commit r16466.
2015-03-25 15:56:30 +00:00
2fe444269e
Game Speed display over UI, Fixes #3129
...
This was SVN commit r16465.
2015-03-25 13:20:54 +00:00
6bc34da330
Emblem button states
...
This was SVN commit r16464.
2015-03-25 00:35:52 +00:00
5950d16500
Some structree improvements for issues exposed by mods. Changes by s0600204.
...
This was SVN commit r16463.
2015-03-24 18:12:42 +00:00
c73c9370ee
Update tinygettext. Fixes #2522 .
...
Updates to upstream changeset f71a8e5e84bffadd61ac93768b332262989844fd,
with some additions
that will be submitted upstream (without the addition of precompiled.h
and win32 dirent).
This was SVN commit r16462.
2015-03-24 17:47:08 +00:00
28abcb3bcc
cache some formation info in gui + some cleanings, see #3078
...
This was SVN commit r16460.
2015-03-23 18:38:27 +00:00
a430e03d1d
Petra: fix for nested loops using same loop index
...
This was SVN commit r16459.
2015-03-23 18:06:31 +00:00
58d955e426
Some cleanup.
...
This was SVN commit r16458.
2015-03-23 13:34:23 +00:00
e35970b700
Petra: rewrite of the dock placement. It should be more robust and compatible with the new pathfinder now
...
This was SVN commit r16457.
2015-03-22 22:00:59 +00:00
64adec79da
fix a wrong copy&paste in 86054bcf7e
...
This was SVN commit r16456.
2015-03-22 21:51:57 +00:00
dec4552ffe
Removes special handling of fullscreen toggle on OS X w/ SDL 1.2, which is no longer used
...
This was SVN commit r16453.
2015-03-21 21:01:01 +00:00
f680caa14f
Escape lobby game names. Fixes #3118 .
...
This was SVN commit r16452.
2015-03-21 16:24:29 +00:00
09ff1f8bea
fix some cases where a water nomad random map could end up without water
...
This was SVN commit r16451.
2015-03-19 21:43:55 +00:00
89107d1406
Fixes grayscale PNG handling, there is no need to convert them all to RGB and 4741e896c4 broke special font texture handling. Instead, only grayscale with alpha PNGs will be converted to RGBA (they fail to load otherwise).
...
Removes warning about converting grayscale textures, refs #1640 .
This was SVN commit r16449.
2015-03-19 03:04:01 +00:00
2a1fcc88e3
Expands game speed dropdown by 10 pixels to accommodate German text and hopefully most other languages
...
This was SVN commit r16448.
2015-03-19 01:43:04 +00:00
5dd3cbb254
Random nomad maps are now in default filter.
...
The number of starting units has been increased to speedup the startup
(building of cc)
Treasures are added when the starting resources are not sufficient to
either build a dock in water maps, or build a cc in land maps.
This was SVN commit r16447.
2015-03-17 22:03:33 +00:00
bed480c433
remove some obsolete variables after #16416
...
This was SVN commit r16446.
2015-03-17 21:43:48 +00:00
e288bb7c4e
Some gamesetup cleanup. Refs #3049 .
...
This was SVN commit r16445.
2015-03-16 23:56:42 +00:00
312155d22f
Use arrays for specifying StartingTechnologies, DisabledTechnologies, and DisabledTemplates.
...
Also add an example for StartingTechnologies to the Carthagian sandbox
map. Refs #1404 .
This was SVN commit r16444.
2015-03-16 21:54:32 +00:00
09796350c8
Fix changephase cheat broken in af8a6f5e8c.
...
This was SVN commit r16443.
2015-03-16 18:50:51 +00:00
46d17483db
Remove --with-system-miniupnpc.
...
It was deprecated in 776567d9b2
2015-03-16 04:35:01 +00:00
14f5eed8c7
Restores action-heal cursor from 1d3adefacc now that the engine supports indexed color PNGs, refs #2823
...
This was SVN commit r16440.
2015-03-16 02:38:03 +00:00
4741e896c4
Improves handling of PNG textures based on GdkPixbuf's setup_png_transformations. The PNG decoder should now support grayscale, RGB or indexed color; bit depth up to 16; and interlacing. Fixes #1640 , refs #2823 , #3082
...
This was SVN commit r16439.
2015-03-16 02:28:00 +00:00
b1c4e29ac8
Fixes inconsistencies in spelling of colour/color by preferring "color" (only wxWidgets remains with some API that requires "colour"), fixes #1029 .
...
NOTE: requires update-workspaces and may require correction of some
modded actors/scenarios
This was SVN commit r16438.
2015-03-15 23:59:48 +00:00
7334f76af6
Fix some issues in af8a6f5e8c.
...
This was SVN commit r16437.
2015-03-15 23:56:18 +00:00
1ae38b8d06
Deletes folder missed in 99cb4b42fd
...
This was SVN commit r16436.
2015-03-15 23:25:46 +00:00
99cb4b42fd
Deletes old autobuilder files.
...
Deletes old dds_analyse.pl script.
Updates tools LICENSE.txt
This was SVN commit r16435.
2015-03-15 22:18:02 +00:00
333c4401b9
Deletes obsolete entity converter tool.
...
Deletes unmaintained contributors.txt list, see forum topic for more
useful list: http://wildfiregames.com/forum/index.php?showtopic=15542
This was SVN commit r16434.
2015-03-15 21:38:43 +00:00
2395204011
fixes some typos in previous commits
...
This was SVN commit r16433.
2015-03-15 20:58:33 +00:00
2b6bde800c
some changes to let Petra build structures with the new PathFinder branch
...
This was SVN commit r16432.
2015-03-15 18:25:03 +00:00
caf89fa04e
Rename ps/Overlay(.h|.cpp) to ps/Shapes(.h|.cpp), fixes a TODO located in graphics/Overlay.h.
...
The file name did not match the content.
Also little cleanup of some unnecessary includes.
This was SVN commit r16431.
2015-03-15 18:06:32 +00:00
f29d059617
Remove conditional defines as those served a very doubtful purpose with parallax, replacing it with something dynamic in the shader. This cleans the C++ side of the renderer as conditional defines were very ugly.
...
This was SVN commit r16430.
2015-03-15 12:22:36 +00:00
5a4ddb52a2
Change the tooltip for number of builders to give more useful information and add one on the healthbar of foundations.
...
This was SVN commit r16429.
2015-03-15 12:00:28 +00:00
5d6f95321d
Fix actor errors revealed by 618fe81814.
...
This was SVN commit r16428.
2015-03-15 11:45:33 +00:00
618fe81814
Check when loading an actor that it defines all the texture samplers required by its material. Print out a readable error otherwise. Fixes #1613 (note that this does not check for unnecessary samplers as that is non-trivial and does not lead to graphical glitches).
...
Also add a shortcut for some defines to clean-up material files slightly
and make the link between sampler and shader more explicit.
This was SVN commit r16427.
2015-03-15 11:37:26 +00:00
372a016311
do not let animals be preferredTarget
...
This was SVN commit r16426.
2015-03-15 11:30:04 +00:00
24cdf6b851
Petra: check EjectHealth level before trying to garrison
...
This was SVN commit r16425.
2015-03-15 10:57:04 +00:00
866e00d154
Petra AI now warns its allies when in need of a tribute
...
This was SVN commit r16424.
2015-03-15 10:28:48 +00:00
cb2da36527
few tunings for Petra
...
This was SVN commit r16423.
2015-03-15 10:20:20 +00:00
86054bcf7e
reduce time of some rndm map generation, i.e. alpine_lakes is about 3 times faster now
...
This was SVN commit r16422.
2015-03-15 10:08:16 +00:00
a3335b39e5
fix AI init crash when more than 255 disconnected regions in some random maps
...
This was SVN commit r16421.
2015-03-15 10:00:16 +00:00
09dc9e6f1d
fix rounding problem in AI health, fixes #2446
...
This was SVN commit r16420.
2015-03-15 09:54:48 +00:00
47cb6c01db
fix #16416
...
This was SVN commit r16419.
2015-03-15 09:52:15 +00:00
e41ec77eb6
Remove unused file.
...
This was SVN commit r16417.
2015-03-15 04:16:31 +00:00
af8a6f5e8c
Removes generic hele and celt civs. Based on patch by prodigalson and
...
comments by s0600204. Fixes #2619 .
Also removes the theb civ json file.
This was SVN commit r16416.
2015-03-15 04:16:24 +00:00
82b08db6ec
Remove grouping from civ info screen. Only show playable civs. Refs #2619 .
...
Does not use loadCivData(true) as the civ info screen can also be opened
from the
gamesetup screen and both use g_CivData.
This was SVN commit r16415.
2015-03-15 04:15:59 +00:00
38a007f6fa
Properly escape a string.
...
This was SVN commit r16414.
2015-03-15 04:15:57 +00:00
6f3e682484
Extract strings from the structree. Fixes #3064 .
...
This was SVN commit r16413.
2015-03-15 04:15:53 +00:00
3c093ef741
Update lobby room.
...
This was SVN commit r16412.
2015-03-15 04:15:45 +00:00
1303b4d39b
Fix a couple oversights and address cavalry skirmishers.
...
This was SVN commit r16409.
2015-03-09 02:05:32 +00:00
1a4176ebcf
Updates OS X icon with multiple sizes and slightly reduced transparency to make it more easily clickable.
...
Updates OS X bundle build script, disables broken testing, refs #2780
This was SVN commit r16408.
2015-03-09 00:24:15 +00:00
eaa8f89ffc
Reverts action-heal cursor from 1d3adefacc, it was modified to indexed color not currently supported by the engine, fixes #3082 , refs #1640 . Reapplies the transparent color removal, refs #2823 .
...
Deletes unused test-old cursor
This was SVN commit r16407.
2015-03-06 22:01:11 +00:00
206aeaf99f
Revert 37da37dbd5. Refs #3072 .
...
This was SVN commit r16406.
2015-03-03 23:56:00 +00:00
c3f62542a4
Expands area for release name slightly, as it was cut off at 1024x768 resolution
...
This was SVN commit r16404.
2015-03-03 21:37:59 +00:00
54e806e3c6
Slight ranged cavalry health nerf and cost adjustment for cavalry archer.
...
This was SVN commit r16402.
2015-03-03 04:12:30 +00:00
2b5de1df93
Do not send VisionRangeChanged messages when deserializing. Fixes #3075 .
...
This was SVN commit r16401.
2015-03-03 01:59:42 +00:00
7901f4087d
Revert 1d3adefacc on unused test-old.png (and optimize with optipng and advdef anyway), apparently imagemagick trick mess it up. It could be eventually be removed if not needed.
...
Refs #2823 .
This was SVN commit r16400.
2015-03-02 10:26:12 +00:00
a5db659ce4
Update translations to be included in the release.
...
This was SVN commit r16399.
2015-03-02 00:10:00 +00:00
607bbcc2f1
Fixes invisible particles (clouds, dust storms) due to incorrect bounds calculations on the emitters, fixes #2643 .
...
Makes the emitters a little more efficient by only setting
position/rotation when their transform changes.
This was SVN commit r16397.
2015-03-01 23:58:53 +00:00
e4bf24dc9a
Adjusts female citizen attack.
...
This was SVN commit r16395.
2015-03-01 19:58:06 +00:00
839264b279
Adds missing GLSL normal definitions to terrain_decal effect (no visible difference on my system but technically correct), refs #2046
...
This was SVN commit r16394.
2015-03-01 19:33:04 +00:00
8a2638a8f5
Nerfs bolt shooters, especially against buildings.
...
This was SVN commit r16392.
2015-02-28 20:56:19 +00:00
37da37dbd5
Cleanup post-game summary page again. Fixes #3072
...
This was SVN commit r16391.
2015-02-28 18:32:50 +00:00
ea2eb2bd57
Removes some outdated techs due to string freeze.
...
This was SVN commit r16390.
2015-02-28 16:55:28 +00:00
aab15123f1
I hate myself.
...
This was SVN commit r16389.
2015-02-28 14:11:21 +00:00
2d7d5b446d
Fix Atlas so that changing water type will actually change water type.
...
Fix the water shader so that object reflections are more visible. Looks
better.
This was SVN commit r16388.
2015-02-28 13:50:52 +00:00
b04761f1b8
binaries/data/mods/mod/art/textures/cursors/test.png and binaries/data/mods/public/art/textures/cursors/arrow-default.png were previously a copy of the same file (same md5), during conversion in 1d3adefacc they were indipendently converted and had different md5 (just the date inside the png was different). Use again the same file just to make obvious they are identical.
...
Refs: #2823 .
This was SVN commit r16387.
2015-02-28 08:09:30 +00:00
1d3adefacc
Fixes cursor with dirty transparency.
...
I used elexis script and also optimized pngs with optipng -o 5 and
advdef -z -4
Thanks elexis for the imagemagick script!
Fixes #2823 .
This was SVN commit r16386.
2015-02-27 10:13:24 +00:00
3a25256960
Revert d69ecad481. Refs #3072 .
...
This was SVN commit r16385.
2015-02-25 19:10:10 +00:00
d69ecad481
Cleanup post-game summary page. Fixes #3072
...
This was SVN commit r16384.
2015-02-25 14:51:52 +00:00
72b0f5aaed
Increases swordsmen damage slightly to match spear.
...
This was SVN commit r16383.
2015-02-25 07:33:51 +00:00
7ce48dda69
Adds macmouse config option, this enables SDL2's Ctrl+Click emulation of right-clicking on OS X. NOTE: enabling this option will affect game hotkeys (e.g. garrisoning), so they should be reassigned to something like Super in that case
...
This was SVN commit r16380.
2015-02-22 21:24:27 +00:00
1ac24adde2
Disables some SpiderMonkey-related build warnings with clang
...
This was SVN commit r16379.
2015-02-22 21:15:47 +00:00
8bf1fe1437
Disables water in actor viewer, as a temporary workaround for the "red water" bug, see #2692 for proper fix
...
This was SVN commit r16378.
2015-02-22 19:49:06 +00:00
fc58b52396
Building defense adjustments for health/armor values for organic units.
...
This was SVN commit r16377.
2015-02-22 18:55:22 +00:00
18a115e772
Forces using libc++ on OS X, to fix pre-Mavericks build given the game's new C++11 requirements, fixes #3062 .
...
Forces using C++11 in build-osx-libs.sh, for consistency
This was SVN commit r16375.
2015-02-22 01:19:39 +00:00
7fe9eb956f
Fixes error in SMBIOS::InitStructures by not warning on invalid header size, fixes #2985
...
This was SVN commit r16374.
2015-02-22 00:42:11 +00:00
21f3be7df5
Always select a texture unit before calling glEnable(GL_TEXTURE_2D).
...
Without this, some code will enable (and set other parameters for)
whatever random texture unit the previous stage had selected. This can
break any fixed-function rendering, since either it will not have
enabled the correct texture unit, or its correct setup will be
interfered with by another texture unit that shouldn't be enabled. (This
doesn't affect ARB/GLSL shader rendering, since they don't care about
the enabled state, but the GUI (and some debug things) are still FFP in
the default ARB mode.)
Fixes #2833 (in which the fancy water shader selected texture units 5/6,
which then got enabled, and remained enabled forever).
This was SVN commit r16372.
2015-02-21 21:40:10 +00:00
4860957fa6
Adjusts skirmisher cavalry closer to that of their infantry counterpart.
...
This was SVN commit r16371.
2015-02-21 19:37:06 +00:00
b9cf610562
Makes palisade fort cheaper than defense tower.
...
This was SVN commit r16370.
2015-02-21 19:08:26 +00:00
cdc9d98e00
do not apply multiple leavefoundation orders, fix #3010
...
This was SVN commit r16369.
2015-02-21 17:40:59 +00:00
e67379a25f
Buffs rams for better durability.
...
This was SVN commit r16368.
2015-02-21 15:14:04 +00:00
0817808e9b
Check visibility of units before moving the camera to their position, when using selection groups.
...
Fixes #3065 .
This was SVN commit r16367.
2015-02-21 10:53:56 +00:00
f8ff206169
Recreate some tech modified values upon deserialization. Fixes #3055 .
...
Also check for some possible null pointers.
This was SVN commit r16364.
2015-02-21 01:41:24 +00:00
0da0b062e1
Return the correct projectile id to fix serialization test failure.
...
This was SVN commit r16363.
2015-02-21 01:41:09 +00:00
8ecfa6cf7c
Nerfs skirmishers slightly.
...
This was SVN commit r16361.
2015-02-20 15:17:29 +00:00
00da480b83
Trigger a global visibility update after shared LoS changes. Fixes the entities of new mutual allies not visible.
...
Also add some player-dependent logic to avoid performance bottlenecks.
This was SVN commit r16359.
2015-02-20 14:35:19 +00:00
e48e330db7
Sets SDL2 as default and only build option on Windows.
...
Removes remnants of WSDL. Refs #2041
This was SVN commit r16357.
2015-02-20 05:52:18 +00:00
d644845ae5
Fixes Atlas on Linux with SDL2 by reordering OpenGL init, based on patch by yashi, fixes #2847
...
This was SVN commit r16356.
2015-02-20 05:46:24 +00:00
6b364ad240
Reverts half of 6317e320f2 due to string freeze.
...
This was SVN commit r16355.
2015-02-18 19:32:08 +00:00
6317e320f2
Nerfs hero aura and deletes hardcoded health.
...
This was SVN commit r16354.
2015-02-18 19:30:22 +00:00
27e4122d44
fix damages on nearby units which, because of wrong argument (3d instead of 2d) was tested on x-y distance instead of x-z, resulting in faraway entities being damaged
...
This was SVN commit r16353.
2015-02-18 19:20:14 +00:00
3dbe3a364f
Adds "demo" keyword to some unplayable, unfinished maps so they are hidden in game setup, patch by thamlett, refs #2881
...
This was SVN commit r16352.
2015-02-17 21:26:24 +00:00
a5e940430f
Suppresses libpng warning "iCCP: known incorrect sRGB profile" by manually handling warning messages (errors still use default handler), fixes #2184
...
This was SVN commit r16350.
2015-02-17 10:50:19 +00:00
70219ab61f
Fixes GLSL terrain decal flicker by initializing normal vectors, fixes #2064
...
This was SVN commit r16349.
2015-02-17 08:13:24 +00:00
4b921d89da
prevent JS warning
...
This was SVN commit r16348.
2015-02-16 19:40:27 +00:00
5871c2c16d
fix #3058 , patch from Stan
...
This was SVN commit r16347.
2015-02-16 19:02:40 +00:00
6a12dab20f
Some hacks to fix game setup persisting problems, patch by @aBothe.
...
Fixes #3033 , #3034 .
The whole gamesetup.js system should be eventually re-factored to remove
those hacks and to improve the robustness of the code: see #3049 .
This was SVN commit r16346.
2015-02-16 17:48:27 +00:00
6f9c5efd76
Nerfs the robustness of ranged siege against melee units.
...
This was SVN commit r16344.
2015-02-16 15:19:41 +00:00
ba210c4d59
Fix c229b46ac2.
...
This was SVN commit r16343.
2015-02-16 14:38:13 +00:00
72ff88880c
Buffs walkspeed of pikemen slightly.
...
This was SVN commit r16341.
2015-02-16 00:26:43 +00:00
f8bd862512
Updated a few structure icons. Some new tech icons.
...
This was SVN commit r16340.
2015-02-15 12:32:55 +00:00
a3374d3164
Icons for palisade wall and palisade fort
...
This was SVN commit r16339.
2015-02-15 11:17:18 +00:00
c229b46ac2
Move visibility component activation check to C++. Patch by Itms.
...
This improves performance quite a lot because it avoids a huge number of
calls from C++ to JS. Check the ticket for performance measurements.
Refs #2913
This was SVN commit r16337.
2015-02-14 17:13:50 +00:00
f18a6981bb
Fixes extraneous attack. Reported by zzippy.
...
This was SVN commit r16336.
2015-02-14 14:55:32 +00:00
49222a4c6a
Fix Windows build
...
This was SVN commit r16334.
2015-02-14 02:22:22 +00:00
bb9de80dd4
Convert CConsole to take UTF-8 strings.
...
This avoids vswprintf failures when printing non-ASCII char* strings
from CLogger into the console.
Also convert ScriptInterface::ToString to return UTF-8, to avoid some
utf8_from_wstring calls.
Also remove some unused and redundant CConsole functions.
This was SVN commit r16333.
2015-02-14 01:49:34 +00:00
e06a7b37d8
Convert debug_printf to take UTF-8 strings instead of wchar_t.
...
This fixes the problem where passing a non-ASCII string to
debug_printf(L"%hs", s) caused vswprintf_s to fail on Linux (because it
doesn't know what encoding the char* is meant to have). Now debug
messages will remain as UTF-8 until they reach the OS.
Fixes #3021 .
This was SVN commit r16332.
2015-02-14 01:45:13 +00:00
bf4b8bfe9c
Siege balancing.
...
This was SVN commit r16331.
2015-02-13 07:05:54 +00:00
682a944d7e
Little code tweak without performance impact
...
This was SVN commit r16329.
2015-02-12 23:24:48 +00:00
bd7b07cc80
Make the visibility cache a bit more clever, by making LoS tiles as dirty separately for each player.
...
It is necessary to rely on shared los masks, else some visibility
updates will be missing.
Refs #2913 , see this ticket for a performance graph.
This was SVN commit r16328.
2015-02-12 23:22:29 +00:00
5725ceda9d
Petra: really fix the bug supposed to be fixed in 04fa2dd4ec
...
This was SVN commit r16327.
2015-02-12 21:04:29 +00:00
c049b0ae27
Treat \t as whitespace in config files. Fixes #3050 .
...
This was SVN commit r16326.
2015-02-12 17:31:10 +00:00
1e54289aa8
Only check binaries/data for po/pot files.
...
This was SVN commit r16324.
2015-02-12 00:25:47 +00:00
5775485421
Fix a bug that triggered errors when loading Roman champion cavalry.
...
This was SVN commit r16322.
2015-02-11 22:21:11 +00:00
e407b97d0e
Updates pikemen counter bonus to match that of spearmen.
...
This was SVN commit r16321.
2015-02-11 22:20:29 +00:00
42d96cfde7
...
...
This was SVN commit r16320.
2015-02-11 22:06:41 +00:00
b239bcd8b9
protection against JS warning
...
This was SVN commit r16319.
2015-02-11 20:27:04 +00:00
cd9eeef1b7
force garrisoned units as turrets to have stance standground, fixes #2905
...
This was SVN commit r16318.
2015-02-11 18:34:06 +00:00
04fa2dd4ec
Petra: more tunings for new ranges and fix a bug in attack preparation
...
This was SVN commit r16317.
2015-02-11 18:20:30 +00:00
51a37e6d0f
String changes, based on input from Transifex users:
...
- Fix a typo in the options screen
- Add an indication to Persian heroes dates, that are actually dates of
reign.
This was SVN commit r16316.
2015-02-11 15:08:09 +00:00
143e199d45
Add a new function to update the water renderer textures when resizing the renderer window. Patch by pendingchaos.
...
This fixes #2692 though the same issue might appear in some other cases
(possibly Atlas) and those will have to be checked.
This was SVN commit r16315.
2015-02-10 19:41:29 +00:00
cf30c90732
Nerfs melee cavalry slightly and increases spearman bonus.
...
This was SVN commit r16313.
2015-02-10 00:37:21 +00:00
a8f726df55
fix #3043 by increasing the minimum distance between civs
...
This was SVN commit r16312.
2015-02-09 19:21:56 +00:00
cc0c21d46b
Update the Survival of the Fittest map description for more clarity. Refs #2817
...
This was SVN commit r16310.
2015-02-09 18:06:46 +00:00
bb99c42aa5
Increase max VBO size back to 4MB.
...
Some meshes (e.g. pers_gardens_struct with gentangents enabled) have
>32K vertexes, and won't fit in a 2MB VBO. 0ef6c7555eFixes #3026 , #3042 .
This was SVN commit r16309.
2015-02-08 23:39:02 +00:00
26d303d854
Improve mod support of the structree. Patch by s0600204.
...
Adapt structree for changes from the balancing branch.
This was SVN commit r16308.
2015-02-08 23:07:18 +00:00
5d447432ec
fix previous fix
...
This was SVN commit r16307.
2015-02-08 23:03:47 +00:00
1f52d98856
fix game description of unknown_nomad
...
This was SVN commit r16306.
2015-02-08 22:58:19 +00:00
1af4a60b7c
Petra: some tweaks for new ranges from balance brabnch
...
This was SVN commit r16305.
2015-02-08 21:32:55 +00:00
c58a2a3c79
Hero balancing.
...
This was SVN commit r16302.
2015-02-08 20:54:34 +00:00
d09beef3de
Allow cavalry spearmen to do a little more hack to better counter siege.
...
This was SVN commit r16301.
2015-02-08 20:49:24 +00:00
001179da6e
Lessens the range difference between units and adjusts vision accordingly.
...
This was SVN commit r16300.
2015-02-08 20:12:07 +00:00
e1f61ea8f8
Fix tab/space issues with 6e37d6698b.
...
This was SVN commit r16299.
2015-02-08 18:17:56 +00:00
6bdd912146
Fix double-escape in the lobby chat.
...
This was SVN commit r16298.
2015-02-08 17:37:33 +00:00
75d295b25e
Add /allies to chat with mutual allies. Patch by trompetin17. Refs #1767 .
...
This was SVN commit r16297.
2015-02-08 17:37:24 +00:00
92701639f6
Update g_Players on diplomacy changes so the GUI actually knows about them.
...
This was SVN commit r16296.
2015-02-08 17:37:15 +00:00
a11bf075b1
Some text fixes reported by translators.
...
This was SVN commit r16295.
2015-02-08 15:46:26 +00:00
1b82389cf8
Reduces cavalry vision and makes palisade fort count as a village structure instead of town.
...
This was SVN commit r16294.
2015-02-08 15:07:35 +00:00
6e37d6698b
MessageBox cleanup.
...
This was SVN commit r16293.
2015-02-08 05:48:33 +00:00
f9c95b6953
Do not send gaia stats for rated games.
...
This was SVN commit r16292.
2015-02-08 01:59:02 +00:00
486094298e
Properly escape user chat.
...
This was SVN commit r16291.
2015-02-08 01:24:23 +00:00
37912c05ca
Increases tower range and nerfs archer accuracy.
...
This was SVN commit r16290.
2015-02-07 22:53:36 +00:00
f28c3b2392
fix the fix of 9ccd986bde
...
This was SVN commit r16289.
2015-02-07 22:47:09 +00:00
e882479e1a
Add tab-completition to game setup screen. Patch by trompetin17.
...
This was SVN commit r16288.
2015-02-07 21:57:57 +00:00
19ec4ced91
Clean up the splashscreen. More concise wording, only modern styling, alignment fixes, larger click/touch targets, and code cleanup.
...
This was SVN commit r16287.
2015-02-07 19:18:06 +00:00
f56102967f
Balance branch merge.
...
This was SVN commit r16285.
2015-02-07 18:50:36 +00:00
3c2a450679
Updates splashscreen. Fixes #3025 .
...
This was SVN commit r16284.
2015-02-07 18:30:16 +00:00
5e7b55996c
Fixes build with libmozjs-31-dev package from Ubuntu PPA. Fixes #3039 .
...
This was SVN commit r16283.
2015-02-07 18:28:44 +00:00
0f98bdb7ee
Fix a typo.
...
This was SVN commit r16282.
2015-02-07 15:51:45 +00:00
da0f33f137
Reduce drastically the number of mirages by making fogging conditional: entities will be miraged only if their health/resource amount is modified, or if they have a non-gaia owner.
...
Fixes the animals hidden in the FoW, and adds the missing status bars
for mirages.
Also small cleanup of the code.
Refs #2913
This was SVN commit r16281.
2015-02-07 15:48:32 +00:00
b66465de73
Improve code clarity after 0a53c5e06a by removing a fall-through.
...
Also fix the indentation to follow the coding conventions.
This was SVN commit r16280.
2015-02-07 15:38:22 +00:00
dab6836378
modified version of the skirmish/Sicilia map, to feature news in A18: starting without cc and with units garrisoned
...
This was SVN commit r16279.
2015-02-07 13:15:14 +00:00
9ccd986bde
fix initialization when changing maps, refs #2803
...
This was SVN commit r16278.
2015-02-07 12:49:00 +00:00
08827a9d64
fix a typo
...
This was SVN commit r16277.
2015-02-07 12:44:51 +00:00
932dbc7221
Import s0600204's structree.
...
Taken from https://github.com/s0600204/0ad-structree-mod with some
improvements from my fork.
On small resolutions some buildings might not be fully visible (see
#3038 ).
This was SVN commit r16276.
2015-02-07 01:37:05 +00:00
f6903393bd
Add various rotation modes for multiple object selections (individual rotation, global rotation with or without individual rotation).
...
Patch by trompetin17, fixes #1213
This was SVN commit r16275.
2015-02-06 22:23:50 +00:00
0a53c5e06a
Fix hero selection ring not cleared when the unit goes out of the world (when garrisoning for instance).
...
Patch by trompetin17, fixes #2627 .
This was SVN commit r16274.
2015-02-06 20:47:31 +00:00
18a1820d9c
Remove stray character.
...
This was SVN commit r16273.
2015-02-06 16:50:22 +00:00
766d2f833f
Fix gather rally points for formations (batches). Patch by stanislas69. Fixes #3037 .
...
Also clean up some whitespace.
This was SVN commit r16272.
2015-02-06 02:11:39 +00:00
846fdc1ed8
Provide explicit spezializations of hash_value for CTexturePtr and CTextureProperties. Fixes #3036 .
...
This was SVN commit r16271.
2015-02-06 02:03:20 +00:00
f0ae351158
read starting tech, disabled tech, ... from map JSON file, refs #1404
...
This was SVN commit r16270.
2015-02-05 22:29:36 +00:00
e12f53c48d
Some more gui cleanup.
...
This was SVN commit r16269.
2015-02-05 17:42:16 +00:00
94507bf7ee
Remove entirely the unit in the Celt outpost. Also clean out the dae model to remove the associated prop point.
...
Fix by stanislas69, fixes #2876 .
This was SVN commit r16268.
2015-02-04 17:39:24 +00:00
bf6323a71f
Amend 7020d17886 and also fix observer mode. Fixes #3032 .
...
This was SVN commit r16267.
2015-02-04 09:20:00 +00:00
d5aab3f056
hotkey button should have no effect when button is disabled, fix #3031
...
This was SVN commit r16266.
2015-02-03 18:22:41 +00:00
2eff0348c5
remove unused argument
...
This was SVN commit r16265.
2015-02-03 18:19:14 +00:00
b08941ba8d
Add back some data to the basic simulation state, works around 2ef3c0c42e.
...
Fixes #3016 .
This was SVN commit r16264.
2015-02-03 17:35:34 +00:00
0aa7e882b7
More gui cleanup.
...
This was SVN commit r16263.
2015-02-03 02:37:42 +00:00
e1b13dead9
Clean up tooltip code a bit more.
...
Remove useless tooltip from spart citizen, as the classes should be done
using visible classes.
This was SVN commit r16262.
2015-02-03 02:02:51 +00:00
53b335f5ae
Improve auto-completition of nick names and add it to the in-game chat. Patch by trompetin17. Refs #1767 .
...
This was SVN commit r16261.
2015-02-02 23:44:06 +00:00
3ee30f125c
update online manual
...
This was SVN commit r16260.
2015-02-02 21:18:39 +00:00
0038fb2e1e
Petra: small tweaks in defense
...
This was SVN commit r16259.
2015-02-02 20:52:45 +00:00
e75498a655
Fix d71161fe4c on WxWidgets 2.8
...
This was SVN commit r16258.
2015-02-02 20:20:37 +00:00
ec7c8f2d65
Move gain config setting retrieval to the sound manager. Fixes #3030 .
...
Also clean up the sound manager a bit.
This was SVN commit r16257.
2015-02-02 13:44:06 +00:00
d71161fe4c
Add a list of selected entities, grouped by template.
...
Patch by trompetin17, fixes #1392
This was SVN commit r16255.
2015-02-01 21:23:06 +00:00
3225e564fe
Fix 1564a10120, plus code cleanup
...
This was SVN commit r16254.
2015-02-01 19:04:21 +00:00
e1e5979d73
Petra: garrison siege units when useful
...
This was SVN commit r16252.
2015-01-30 18:41:33 +00:00
ad4e995bd4
clean 499d41ad80
...
This was SVN commit r16251.
2015-01-30 18:15:03 +00:00
7020d17886
Fix Gaia perspective, in which one could only see entities with a dirty visibility cache.
...
This was SVN commit r16250.
2015-01-30 18:08:16 +00:00
f52e3ea052
Fix uninitialized variable, fix by trompetin17, fixes #3027 .
...
This was SVN commit r16249.
2015-01-30 17:37:40 +00:00
1564a10120
Move back the computation of most of the visibilities from JS to engine, to improve performance.
...
Also fix the remaining TODO left by #958 , as a use case of the scripted
Visibility component.
Refs #2913 , #958 .
This was SVN commit r16248.
2015-01-30 15:28:06 +00:00
7d282f6bb1
Petra: improve late game when resources rely mainly on trade
...
This was SVN commit r16246.
2015-01-29 21:49:38 +00:00
499d41ad80
Shift key when deleting a saved game do not need confirmation, addresses #3018
...
This was SVN commit r16245.
2015-01-29 21:18:48 +00:00
df2e077870
Trailing spaces cleanup, based on patch by trompetin17, refs #1767 .
...
This was SVN commit r16244.
2015-01-29 16:10:03 +00:00
c654be8796
Extend ac8124b332 and avoid /delayload warnings in Windows builds when building Atlas and Collada.
...
This was SVN commit r16243.
2015-01-29 14:02:58 +00:00
6a70e3a62f
Updates checkrefs.pl to support mod mod and GUI XML change
...
This was SVN commit r16242.
2015-01-28 03:26:39 +00:00
0ef6c7555e
Optimise VBO updates.
...
Some drivers (at least the Intel drivers on Windows) are slow at
incrementally updating a VBO with hundreds of calls to glBufferSubData
every frame. Performance is significantly better if you use
glBufferData(NULL) to tell it to discard all the previous contents, and
then re-upload all the data at once.
Update CVertexBuffer so that GL_DYNAMIC_DRAW/GL_STREAM_DRAW buffers are
handled with the new mechanism. This requires the caller to hold onto
the backing store so it can be re-uploaded when necessary, and needs a
bit more signalling to indicate exactly what needs uploading.
I see an improvement from roughly 60 to 75 fps on Intel HD Graphics
3000, Windows, 1024x768, Siwa Oasis.
This was SVN commit r16241.
2015-01-28 00:48:00 +00:00
c599f92875
Big cleanup of the summary page internals, making use of nested tags in the xml and organizing the logic in a more flexible way.
...
Patch by trompetin17, fixes #2952 .
This was SVN commit r16240.
2015-01-27 21:38:05 +00:00
965a6f3838
update online manual, refs #3018
...
This was SVN commit r16239.
2015-01-27 18:24:33 +00:00
8af1c907fa
Reset victory conditions on map change. Refs #3001 .
...
This was SVN commit r16238.
2015-01-27 17:46:57 +00:00
0a34e6106d
Improve readability printing a single error message.
...
This was SVN commit r16237.
2015-01-27 09:14:30 +00:00
b38a6e9383
add hotkey for deleting saved games, addresses #3018
...
This was SVN commit r16236.
2015-01-26 21:05:31 +00:00
c61981793c
Fixes some missing replacements of mozjs24 with mozjs31
...
This has caused the bundled library to be built even if
--with-system-mozjs31 is specified (but actually it has still correctly
used the system library after building the bundled library).
Refs #2462
This was SVN commit r16235.
2015-01-26 18:19:24 +00:00
ee08dff5ad
Updates Windows installer config, making the SM debug dll exclusion more generic
...
This was SVN commit r16234.
2015-01-26 05:01:53 +00:00
2eabb799b9
Clear the victory conditions properly. Refs #3001 .
...
This was SVN commit r16232.
2015-01-25 20:52:10 +00:00
4473ed5c88
glext_funcs: Support glMapBuffer, glMapBufferRange
...
This was SVN commit r16231.
2015-01-25 16:36:23 +00:00
a8499e89eb
Pad vertex data to power-of-two sizes.
...
This reduces the total number of different vertex sizes in the system,
allowing more data to share a single CVertexBuffer, therefore reducing
the amount of wasted space in each CVertexBuffer and reducing VRAM
usage.
This was SVN commit r16230.
2015-01-25 15:38:51 +00:00
0423f6cc29
Petra: tweaks the starting strategy for scenarios with lot of units
...
This was SVN commit r16229.
2015-01-25 11:23:06 +00:00
123bab6793
Replace use of safe bool by explicit bool operator.
...
This was SVN commit r16228.
2015-01-25 03:11:24 +00:00
4c1903500b
Switch to std::shared_ptr and std::weak_ptr.
...
This was SVN commit r16227.
2015-01-25 03:10:58 +00:00
0843100d11
Remove partial emulation of some C++11 features for older compilers.
...
This was SVN commit r16226.
2015-01-24 20:37:18 +00:00
0261d12727
Remove some checks for usupported VS versions (<2013).
...
This was SVN commit r16225.
2015-01-24 20:37:16 +00:00
fc902df07c
Remove checks for unsupported GCC versions (<4.6).
...
This was SVN commit r16224.
2015-01-24 20:37:07 +00:00
59503b9ae9
Add basic support for GUI scaling factor, to help with high-res displays (e.g. 4K monitors and 1080p tablets).
...
Use the config setting "gui.scale = 0.5" to make the GUI bigger.
This was SVN commit r16223.
2015-01-24 20:06:37 +00:00
c976366590
Added a script for i18n maintenance tasks
...
The script updates the local repository, regenerates the POT files,
downloads the
latest PO files, reverts any change that Pology determines as not
meaningful, and
adds the modified files to the local VCS.
The script does not actually perform the final commit, that is left for
the user.
Ref #2492
This was SVN commit r16222.
2015-01-24 19:57:44 +00:00
ac8124b332
Avoid /delayload warnings in Windows build.
...
This was SVN commit r16220.
2015-01-24 18:54:47 +00:00
67956f969e
Make ARRAY_SIZE(pointer) complain in GCC, not just in MSVC.
...
The ArraySizeDeducer trick has worked since at least GCC 4.4, so it's
fine to rely on it now.
This was SVN commit r16218.
2015-01-24 17:35:25 +00:00
de25e536c3
Update NONCOPYABLE to use C++11 "=delete".
...
This gives slightly better error messages.
This was SVN commit r16217.
2015-01-24 17:33:49 +00:00
3ce38e536e
Update cassert to use C++11 static_assert.
...
This gives clearer error messages, and simplifies the code.
This was SVN commit r16216.
2015-01-24 17:29:19 +00:00
15e8637b67
Fix build with Visual Studio
...
I've reverted this workaround before the SM31 commit because I thought
it's only a problem with VS2010. Actually VS2013 still doesn't support
C++11 well enough and still requires the workaround.
Refs #2669 , #2462
This was SVN commit r16215.
2015-01-24 16:33:27 +00:00
c02a7e1a7b
SpiderMonkey 31 upgrade
...
This upgrade also introduces exact stack rooting (see to the wiki:
JSRootingGuide) and fixes problems with moving GC. This allows us to
enable generational garbage collection (GGC).
Measurements a few months ago have shown a performance improvement of a
non-visual replay of around 13.5%. This probably varies quite a bit, but
it should be somewhere between 5-20%. Memory usage has also been
improved. Check the forum thread for details.
Thanks to everyone from the team who helped with this directly or
indirectly (review, finding and fixing issues, the required C++11
upgrade, the new autobuilder etc.)! Also thanks to the SpiderMonkey
developers who helped on the #jsapi channel or elsewhere!
Fixes #2462 , #2415 , #2428 , #2684 , #1374
Refs #2973 , #2669
This was SVN commit r16214.
2015-01-24 14:46:52 +00:00
b9e46f386b
Disable online reporting of profiler data.
...
Nobody ever looks at the data, and it takes up a lot of server disk
space. The feature should probably be restored in the future once we've
fixed all the obvious performance problems, since a wider range of data
lets us search for system-dependent issues (e.g. some GL drivers are
particularly slow with particular features), but it's not worthwhile
now.
This was SVN commit r16213.
2015-01-24 14:29:05 +00:00
236f67d45f
Petra: fix defensive garrison by using GarrisonArrowClasses + several small fixes
...
This was SVN commit r16212.
2015-01-24 13:28:17 +00:00
f1f36232d8
fix limit changer when stating limit = 0
...
This was SVN commit r16211.
2015-01-24 12:03:31 +00:00
8f0ace2658
Make Android %ls/%hs workaround work on secure_crt as well as wsecure_crt.
...
Refs #2996 .
This was SVN commit r16210.
2015-01-24 00:22:12 +00:00
4d4ddb5978
Add workaround for Android libc++ swprintf bug.
...
Based on patch by BogDan. Refs #2996 .
This was SVN commit r16209.
2015-01-24 00:20:15 +00:00
8ca674d461
cppformat: Fix Android build.
...
The NDK only exposes the BSD-style strerror_r, not the GNU-style, so
select the appropriate code path.
This was SVN commit r16208.
2015-01-23 21:15:48 +00:00
2e01b157d6
Fix build error in GLES configurations
...
This was SVN commit r16207.
2015-01-23 20:54:14 +00:00
c9dee72667
GLES doesn't have glDisable(GL_TEXTURE_2D).
...
Patch by BogDan. Refs #2996 .
This was SVN commit r16206.
2015-01-23 20:40:02 +00:00
8a39ea5543
Avoid misaligned pointer dereferences, which can fail on ARM.
...
Based on patch by BogDan. Refs #2996 .
This was SVN commit r16205.
2015-01-23 20:39:40 +00:00
c9c80a9d94
SDL_SetWindowGammaRamp fails on Android, so don't bother using it.
...
Based on patch by BogDan. Refs #2996 .
This was SVN commit r16204.
2015-01-23 20:39:02 +00:00
ad3e330861
Workaround for limitations of Android's vswprintf implementation.
...
Based on patch by BogDan. Refs #2996 .
This was SVN commit r16203.
2015-01-23 20:38:13 +00:00
b64ff8d09a
Remove Android hack to autoload a map.
...
Patch by BogDan. Refs #2996 .
This was SVN commit r16202.
2015-01-23 20:36:52 +00:00
a2efd97476
fix js error
...
This was SVN commit r16201.
2015-01-23 17:34:46 +00:00
adcd9191a6
Updates Windows installer config for 65cc47f6c0
...
This was SVN commit r16200.
2015-01-23 03:38:02 +00:00
65cc47f6c0
Deletes unused bundled MSVC runtime libs for old 2005 and 2008 versions.
...
Removes VC80 manifest info.
This was SVN commit r16199.
2015-01-23 03:21:48 +00:00
5fa3318bbf
Adds premake build vs2013 workspace, since that's now our only supported version, and removes workspaces for old unsupported versions.
...
Rebuilds premake win32 binary with VC++ 2013.
This was SVN commit r16195.
2015-01-23 01:46:28 +00:00
f3f2717c66
Fix tests on 32-bit builds.
...
This was SVN commit r16193.
2015-01-22 21:13:09 +00:00
f350a24c73
Disable "assignment operator could not be generated" warning globally on Windows, since it's never useful.
...
This was SVN commit r16192.
2015-01-22 21:09:33 +00:00
d7926eb612
Add basic tests for %s/%hs/%ls in sprintf_s, swprintf_s.
...
This was SVN commit r16191.
2015-01-22 20:39:53 +00:00
ef2a358f87
Remove sys_vswprintf.
...
The implementation on Windows was gross. The only user was CLogger,
which no longer uses it.
Also fix vswprintf_s to handle truncated output correctly (by returning
"") on Linux, now that CLogger is no longer relying on the buggy
behaviour.
This was SVN commit r16190.
2015-01-22 20:39:28 +00:00
afa492f473
Preprocessor: Avoid using "%.*hs" in log format string, since cppformat doesn't support it.
...
This was SVN commit r16189.
2015-01-22 20:38:16 +00:00
568c415d0a
Convert wchar_t*/wstring arguments to UTF-8 strings in CLogger messages.
...
This was SVN commit r16188.
2015-01-22 20:37:38 +00:00
e02d7ad949
Automatically replace %hs/%ls with %s in CLogger format strings.
...
Everything is char* now, so we don't need to mess around with different
string types.
Done with:
ag -ls 'LOG(MESSAGE|MESSAGERENDER|WARNING|ERROR)' source | xargs perl
-pi -e'1 while
s/(LOG(MESSAGE|MESSAGERENDER|WARNING|ERROR).*)%[hl]s/$1%s/g'
This was SVN commit r16187.
2015-01-22 20:36:24 +00:00
38a8e2e0d6
Automatically convert most path.string().c_str() to path.string8()
...
Done with:
ag -l 'LOG.*string\(\).c_str\(\)' source | xargs perl -pi -e'1 while
s/(LOG.*string)\(\)\.c_str\(\)/${1}8()/g'
This was SVN commit r16186.
2015-01-22 20:35:17 +00:00
b90bc147c9
Add Path::string8 (which returns a UTF-8 encoded std::string).
...
This saves the hassle of writing utf8_from_wstring(path.string()) in
places like log messages, and can be extended to better handle
non-ISO-8859-1 paths on Linux.
This was SVN commit r16185.
2015-01-22 20:33:11 +00:00
e9a33b71ae
Manually fix the less trivial CLogger format strings.
...
This was SVN commit r16184.
2015-01-22 20:32:06 +00:00
49e2ecea63
Automatically convert all CLogger format strings from wchar_t* to char*.
...
Done with:
ag -ls 'LOG(MESSAGE|MESSAGERENDER|WARNING|ERROR)' source | xargs sed
-i 's/LOG\(MESSAGE\|MESSAGERENDER\|WARNING\|ERROR\)(L/LOG\1(/g'
This was SVN commit r16183.
2015-01-22 20:31:30 +00:00
dcf5a2667f
CLogger: Use cppformat instead of sys_vswprintf.
...
sys_vswprintf relies on platform-specific printf implementations, which
vary widely between platforms (in handling of truncation, return values,
use of %s/%S/%hs/%ls for mixing char and wchar_t strings, etc) and are
therefore a pain.
Use cppformat's fmt::sprintf instead, which has very similar syntax to
sprintf but is more C++ish and is portable.
Also, wchar_t is stupid, so use char* strings (which are expected to be
UTF-8) in CLogger. This creates a bit of a pain with changing all
callers to convert to char* strings, but that's their fault for not
using UTF-8 already.
Refs #3011 .
This was SVN commit r16182.
2015-01-22 20:30:05 +00:00
ca7b890e16
cppformat: Add basic tests for the functionality we use.
...
This was SVN commit r16181.
2015-01-22 20:28:57 +00:00
47b9a043b2
cppformat: Permit NULL arguments for %s.
...
Throwing exception on NULL is a bit extreme, and unhelpful when it
happens in rarely-tested error paths. Printing "(null)" is safer and
provides compatibility with glibc sprintf.
This was SVN commit r16180.
2015-01-22 20:27:58 +00:00
9c8798b592
cppformat: Remove support for CUSTOM types.
...
These cause a lot of type-safety trouble - unsupported types passed into
fmt::sprintf (like CStr or enums) will be accepted at compile time, but
trigger an exception at runtime. Remove them, so we'll get either an
implicit conversion to a supported type, or a compile-time error.
This was SVN commit r16179.
2015-01-22 20:27:34 +00:00
8875ae9cdf
cppformat: Fix compatibility with our build system on Windows.
...
This was SVN commit r16178.
2015-01-22 20:26:58 +00:00
f16407f6e9
cppformat: Fix -Wundef build warnings from GCC.
...
This was SVN commit r16177.
2015-01-22 20:26:32 +00:00
f96593a9f3
Import cppformat v0.11.0
...
Refs #3011 .
This was SVN commit r16176.
2015-01-22 20:25:10 +00:00
f8bfe3eafb
Clean up redundancies in templates for the Visibility component, refs #2913
...
This was SVN commit r16175.
2015-01-22 17:23:25 +00:00
ad1adbe027
Implement the Rotary Mill aura for Celtic factions. Patch by niektb, fixes #2900 .
...
Also remove the placeholder technology and the rotary mill generic
Celtic template, and rename the rotary mill portrait. Refs #2619 .
This was SVN commit r16174.
2015-01-22 10:16:26 +00:00
1857c33602
Remove use of __attribute__ that breaks the Windows build. Refs #2522 .
...
This was SVN commit r16172.
2015-01-21 22:37:25 +00:00
b5b9c0f2ae
Improve template code style for the Decay component.
...
This was SVN commit r16171.
2015-01-21 21:45:05 +00:00
b65dcaba48
Prevent observers from using the team chat. Patch by trompetin17, fixes #2879 .
...
This was SVN commit r16170.
2015-01-21 21:18:55 +00:00
76120d888b
Add some tinygettext changes from SuperTuxKart. Refs #2522 .
...
Move some data to RO. Pass some parameters as references.
Taken from https://github.com/Grumbel/tinygettext/issues/3 .
This was SVN commit r16169.
2015-01-21 21:17:45 +00:00
aeb18239c3
Update tinygettext to upstream commit ca0f3ff640. Refs #2522 .
...
Keeps our addition of precompiled.h (fd3d3352654c9d99ff68de6823d23f8fc14655b5
2015-01-21 20:37:37 +00:00
df3222a073
Petra: improve choice of target when attacking, to prevent cases where most units would follow the same target
...
This was SVN commit r16167.
2015-01-20 18:31:57 +00:00
852cd11305
Improve the performance of the GetLosVisibility function by using the cache (currently used for mirages only) whenever possible.
...
This was SVN commit r16166.
2015-01-20 16:29:50 +00:00
7a48606471
GLES compatibility for particle shader
...
This needs to use the model-view matrix, not model-view-projection (the
transform uniform), else the axes won't be unit vectors and the particle
sizes will be wrong. But GLES doesn't have the pre-defined matrices, so
pass it in explicitly.
This was SVN commit r16165.
2015-01-19 21:44:53 +00:00
e1e163b3f7
Improve ogl_WarnIfError() to report the file/line where the error was detected
...
This was SVN commit r16164.
2015-01-19 20:06:16 +00:00
b74e853144
Fix typo which caused GLES errors
...
This was SVN commit r16163.
2015-01-19 20:04:46 +00:00
4554ed676e
continue to display research overlay after victory, fixes #2983
...
This was SVN commit r16161.
2015-01-18 16:55:52 +00:00
09bbc9c35c
Enable C++11 by default.
...
Don't generate workspaces and remove checks for unsupported compier/IDE
version$
Refs #2669
This was SVN commit r16160.
2015-01-18 13:44:03 +00:00
10f90fd8cf
Petra: fix missing line in 0a5089c841
...
This was SVN commit r16159.
2015-01-18 10:28:30 +00:00
a72d490759
Fix Atlas compile problems with C++11 and clang. Thanks to trompetin17 for investigating this.
...
Refs #2669
This was SVN commit r16158.
2015-01-18 09:48:41 +00:00
840c8215b6
Fixes build error 'no viable conversion' on OS X with clang, libc++ and c++11, refs #2462 .
...
Removes explicit use of _Unwrap(), prefer deference operator * instead
This was SVN commit r16157.
2015-01-18 06:36:15 +00:00
8976fb7646
Fixes MSVC warning C4100 unreferenced formal parameter
...
This was SVN commit r16156.
2015-01-18 06:26:00 +00:00
4ca156e2d8
Updates build-osx-libs.sh to use wxWidgets 3.0.2.
...
Adds patch to fix wxWidgets build on Yosemite (based on
http://trac.wxwidgets.org/changeset/76743 ), fixes #2924 .
Removes patch for previous version of wxWidgets.
This was SVN commit r16155.
2015-01-18 03:31:26 +00:00
0a5089c841
Petra: prevent melee units to try to attack ships + tweaks on buildings
...
This was SVN commit r16154.
2015-01-17 17:50:27 +00:00
ba14819191
Use future-proof lib path in build-osx-libs.sh. Patch by trompetin17.
...
There are symbolic links to the library binaries in the directory
dist/lib. It's better to use these links rather than the location they
point to for the copy command (they point to a different location in
ESR31).
Refs #2462
This was SVN commit r16153.
2015-01-17 14:03:22 +00:00
993d9c72d3
Petra: various small tweaks
...
This was SVN commit r16152.
2015-01-17 12:53:33 +00:00
02a50fce62
Notify map makers when they are placing obstructed entities (overlapping other ones or placed outside the borders of the map). Patch by trompetin17
...
Fix #1163 , refs #2829 .
This was SVN commit r16149.
2015-01-14 09:11:11 +00:00
755ec45a14
Use correct format specifiers. Patch by bog_dan_ro.
...
This was SVN commit r16148.
2015-01-13 18:37:50 +00:00
702fb7344e
allow maps to handle garrisoned units, fixes #2984
...
This was SVN commit r16147.
2015-01-13 17:59:55 +00:00
f2d71164e6
Fixes game mode defaulting to Conquest when Endless mode is selected.
...
Patch by niektb, thanks!
Fixes #3001 .
This was SVN commit r16146.
2015-01-13 12:08:54 +00:00
528ed2d15e
prevent error when switching perspective to gaia
...
This was SVN commit r16145.
2015-01-12 22:03:03 +00:00
e916c7e91f
add display of trading goods when multiple selection
...
This was SVN commit r16144.
2015-01-12 21:39:31 +00:00
9855717840
Petra fix js warning when building cart super_dock, addresses #2998
...
This was SVN commit r16143.
2015-01-12 20:47:14 +00:00
320cfa0bfc
Petra: complete the rework of starting game to allow more flexibility (i.e. support of nomad maps)
...
This was SVN commit r16142.
2015-01-11 22:47:24 +00:00
851d3d964a
Fixes MSVC build warnings about unhanded cases in switch statement (C4062) and missing parameter in macro (C4003)
...
This was SVN commit r16141.
2015-01-11 21:37:53 +00:00
8fc14655b5
Improve 524a942b52. Refs #2637 .
...
This was SVN commit r16140.
2015-01-11 19:14:03 +00:00
95fa46304f
Don't specify wxwidgets lib names in extern_libs4.lua
...
It works without specifying them and this way it builds with wxwidgets
2.8 and 3 on Windows
Refs #2891
This was SVN commit r16139.
2015-01-11 17:25:24 +00:00
524a942b52
Only print add_translation warning when translations do not match
...
FIXES 2637
This was SVN commit r16138.
2015-01-11 14:08:01 +00:00
873399b294
fix a typo, addresses #2998
...
This was SVN commit r16136.
2015-01-10 19:41:02 +00:00
731e3dd13c
Petra: continue rework of starting game to allow more game type
...
This was SVN commit r16135.
2015-01-10 14:34:26 +00:00
77dba7a8bb
Remove some duplication in the gui tooltip code.
...
This was SVN commit r16134.
2015-01-09 17:08:12 +00:00
539b4d8372
Remove an old, useless and possibly broken call.
...
This was SVN commit r16133.
2015-01-09 16:59:01 +00:00
c681174fad
Adds a notice about a known issue in premake4.lua with the icc compiler
...
Refs #2994
This was SVN commit r16132.
2015-01-09 12:48:42 +00:00
5cf2086a33
Fix the initial exploration of territories, which shouldn't be performed in Atlas.
...
Also clean up the code a bit.
Fixes #2969
This was SVN commit r16129.
2015-01-08 22:36:13 +00:00
006faaeaeb
Petra: tunings for 9b79b5b844
...
This was SVN commit r16128.
2015-01-08 22:01:38 +00:00
0f21151c4b
Some gui code cleanup/restructuring.
...
Moving some tooltip code that only needs templates to common/ to
allow to use that for the structree mod.
This was SVN commit r16127.
2015-01-08 21:37:59 +00:00
57033850a8
Check for unsaved changes in Atlas. Patch by trompetin17, fixes #2819 .
...
This was SVN commit r16126.
2015-01-08 21:29:27 +00:00
57ecf88ac2
Move some technology template and template information retrieval code
...
to globalscripts, so that the gui is able to use it without needing the
simulation.
This helps remove code duplication in the structree mod.
This was SVN commit r16125.
2015-01-08 19:55:10 +00:00
e8fb23e940
Fix tests broken in bd31f83587.
...
This was SVN commit r16124.
2015-01-08 19:20:34 +00:00
bdb1145f63
remove some debug printout forgotten in 9b79b5b844
...
This was SVN commit r16123.
2015-01-07 21:55:21 +00:00
9b79b5b844
Petra: first step of base management rework needed for nomad maps
...
This was SVN commit r16122.
2015-01-07 21:40:10 +00:00
bb6003ea0c
rename civ specific player template following 4243433f94 convention
...
This was SVN commit r16121.
2015-01-07 21:18:59 +00:00
bd31f83587
Check if components exist before using them.
...
Remove EntityLimits and TechnologyManager from the gaia player template.
This was SVN commit r16120.
2015-01-07 20:48:36 +00:00
4243433f94
Use a gaia specific player entity.
...
Fix some code that assumed components exist instead of testing for them.
EntityLimits and TechnologyManager are not needed for gaia and will be
removed in the future.
This was SVN commit r16119.
2015-01-07 20:33:19 +00:00
c6bb3df43a
following #2877 , civilCentre must be disabled for this kind of scenario
...
This was SVN commit r16118.
2015-01-07 20:29:01 +00:00
01fb25fdab
Fix variable name.
...
This was SVN commit r16117.
2015-01-07 19:52:33 +00:00
a8c85035f8
Ignore gaia in PlayerData when loading maps.
...
This was SVN commit r16116.
2015-01-06 00:16:06 +00:00
b36c78b4c4
Fix build warning
...
This was SVN commit r16115.
2015-01-05 20:05:53 +00:00
d8b1549883
Seleucid farmstead
...
This was SVN commit r16114.
2015-01-04 12:46:57 +00:00
045fea23aa
Properly adjust Atlas for the init changes.
...
This was SVN commit r16112.
2015-01-03 17:42:42 +00:00
c21514b844
Do not include domestic animals in military selection. Patch by trompetin17. Fixes #2978 .
...
This was SVN commit r16111.
2015-01-03 15:44:28 +00:00
dadfcb06d2
Specify icons for base phase techs.
...
This was SVN commit r16110.
2015-01-03 15:15:55 +00:00
d13821fa7d
Village phase icon
...
This was SVN commit r16109.
2015-01-03 12:01:21 +00:00
0195cdb374
Seleucid storehouse
...
This was SVN commit r16108.
2015-01-03 04:03:22 +00:00
abb62b0662
fix a typo in petra, thanks to brian
...
This was SVN commit r16106.
2015-01-02 19:35:35 +00:00
21f525c966
Seleucid temple now has fully articulated stairs!
...
This was SVN commit r16105.
2015-01-02 14:43:07 +00:00
f0d7346b8f
Happy New Year! :D
...
This was SVN commit r16103.
2015-01-02 14:22:23 +00:00
5bad08d66b
Seleucid civ center placeholder
...
This was SVN commit r16102.
2015-01-02 13:21:40 +00:00
8441a3f8d6
Fix compilation failure with GCC and C++98/03.
...
Local types shall not be used as a template argument. So move it
to a higher scope. This restriction was lifted in C++11, so we
might want to change this back when we switch to that.
This was SVN commit r16101.
2015-01-01 23:57:04 +00:00
8097eeb8ab
Fix RMS library forgotten in the previous commit.
...
Changes some direct accesses to use the library function.
This was SVN commit r16100.
2015-01-01 23:57:00 +00:00
a472944689
Clean up LoadPlayerSettings.
...
Include gaia to make iteration easier.
Add TemplateExists() to the TemplateLoader. Refs #2877 .
This was SVN commit r16099.
2015-01-01 23:10:24 +00:00
8e30410109
Improve PickEntitiesAtPoint
...
First, do a ray intersection test with the bounding-sphere for all
entities on the map and then check the more detailed selection shape for
the remaining candidates. Do checks that require component lookups after
the ray intersection tests because these are relatively expensive.
The old method for figuring out which entities are below the mouse
cursor was incorrect because it does a 2D check to filter out the first
candidates which can lead to incorrect results with lower camera angles
and high buildings or buildings with a large footprint. Such problems
were avoided with quite a large radius for this 2D test and resulted in
a large number of candiate entities after this first test (200-500).
Also rename PickEntitiesAtPoint to PickEntityAtPoint and make it return
only one (the closest) match.
I've tested performance with the tracelogger by starting a map and then
moving the mouse in circles for one minute. The results were relatively
stable. I've compared the total time percentage of input.js:836, which
spends nearly all of the time in PickEntityAtPoint.
Ardennes Forest - Normal size: Original: 41.46% Patched: 31.6%
Ardennes Forest - Giant size: Original: 40.59% Patched: 51.55%
As we see, it's faster on normal map sizes but slower on giant maps with
a lot of entities.
This approach can be further improved with some kind of spatial
subdivision for the culling (like an octree), which would help the unit
renderer too. This way it should be possible to make it faster (and
still correct) on all map sizes and with a large total numbers of
entities.
This was SVN commit r16098.
2015-01-01 23:05:26 +00:00
7ac837fb90
allow the removal of entity limits when some requirements are satisfied. This allows to have starting games without cc
...
This was SVN commit r16097.
2015-01-01 18:28:21 +00:00
95e0763ac9
Seleucid temple commit! Minor edits to Sele_struct_2 texture file.
...
This was SVN commit r16096.
2015-01-01 16:28:32 +00:00
e8d1acfa41
preserve random civ in saved game settings, refs #2963
...
This was SVN commit r16095.
2014-12-31 15:34:48 +00:00
802320e753
some petra cleanings
...
This was SVN commit r16094.
2014-12-31 09:59:47 +00:00
9329506e0d
add support for civ specific player template, see #2877
...
This was SVN commit r16092.
2014-12-31 09:31:41 +00:00
f984ba40ee
Seleucid house commit
...
This was SVN commit r16091.
2014-12-31 07:27:07 +00:00
913674a202
Remove useless call.
...
This was SVN commit r16090.
2014-12-31 00:21:41 +00:00
2c20936ce3
Save map settings. Patch by @aBothe. Fixes #2963 .
...
This was SVN commit r16089.
2014-12-31 00:21:24 +00:00
8f387e0044
Remove code duplication and some cleanup.
...
This was SVN commit r16088.
2014-12-30 18:21:02 +00:00
992169c3ab
Fix indentation in daaddaf433.
...
This was SVN commit r16087.
2014-12-30 17:27:18 +00:00
555601fe51
Petra: avoid creating unused entitycollections
...
This was SVN commit r16085.
2014-12-29 23:56:37 +00:00
daaddaf433
Stop music in Atlas when reloading a map, patch by trompetin17, fixes #1712 .
...
This was SVN commit r16084.
2014-12-29 21:01:54 +00:00
f337905f14
Actually focus the group instead of following it. Patch by trompetin17. Fixes #2972 .
...
This was SVN commit r16083.
2014-12-29 20:40:37 +00:00
53023b7efc
This was SVN commit r16082.
2014-12-29 19:26:37 +00:00
9a17a96054
Fix warning when following units. Fixes #2971 .
...
This was SVN commit r16081.
2014-12-29 18:56:00 +00:00
354bd8b088
Only delete/create players until the needed number is reached. Patch by trompetin17. Fixes #1953 .
...
Previously we removed all players and created them anew. This caused
issues in Atlas,
as some components were recreated, but did not get informed about
already existing
entities (eg cmpTechnologyManager). By only creating/deleting players
until we obtain
the new number of players we do not have this issue.
This was SVN commit r16080.
2014-12-29 17:33:39 +00:00
f2edd35989
Enable LoadCivData to only load playable civs. Patch taken from s0600204's structree work.
...
This was SVN commit r16079.
2014-12-29 16:24:42 +00:00
8608b0fe89
Seleucid Tower and textures
...
This was SVN commit r16078.
2014-12-29 12:29:41 +00:00
d68a057153
Fix warning.
...
This was SVN commit r16077.
2014-12-28 16:45:06 +00:00
0406f62ea0
Fix a typo, reported by t4nk004 on IRC.
...
This was SVN commit r16076.
2014-12-28 16:35:32 +00:00
4c12440868
Give access to the templates to the GUI. This will be useful for eventually displaying factions specificities in main menus.
...
This was SVN commit r16075.
2014-12-28 16:21:07 +00:00
92af594986
Petra: rewrite a stupidly inefficient function spotted by the traceLogger
...
This was SVN commit r16073.
2014-12-27 18:44:34 +00:00
0dd6711afa
make Petra support passability and territory maps of different resolutions, addresses #2960
...
This was SVN commit r16072.
2014-12-27 15:23:20 +00:00
2ef3c0c42e
Compute the actual percentage of map explored by the team in the summary screen.
...
Fixes #2587 .
This was SVN commit r16071.
2014-12-26 19:13:40 +00:00
dbb4b2c920
Update the Greek Acropolis (4) map description to remove the reference to the old non-skirmish map.
...
This was SVN commit r16070.
2014-12-26 18:07:10 +00:00
1e17cbe33c
Use the range manager to pick entities when drawing a selection box during a game. This allows for a significant performance improvement.
...
Fixes #2961 , patch by @aBothe.
This was SVN commit r16068.
2014-12-26 13:07:49 +00:00
ec9e0dfeed
Add missing file in 286112e0aa.
...
Refs: #2937 .
This was SVN commit r16065.
2014-12-25 14:22:15 +00:00
286112e0aa
Fixes #2937 . Thanks to Lion_Kanzen and Pureon for making icons.
...
This was SVN commit r16064.
2014-12-25 05:12:39 +00:00
b2650e08ba
Fixes obelisks for player 2 and player 3 that were inverted.
...
Patch by silure, thanks!
Fixes #2962 .
This was SVN commit r16063.
2014-12-24 15:26:45 +00:00
9684bcd360
add AI support of maps of different dimensions, see #2960
...
This was SVN commit r16062.
2014-12-23 14:17:52 +00:00
49187dd990
Drop support for AIs that are not using modules.
...
This was SVN commit r16061.
2014-12-23 01:20:50 +00:00
d21cf8f3aa
Clarify some comments.
...
This was SVN commit r16060.
2014-12-23 00:46:00 +00:00
ce0c1e4302
Report names of components or interfaces in case of error when registering those.
...
This was SVN commit r16059.
2014-12-23 00:29:14 +00:00
efce88b97b
Call setlocale(3) on BSDs so that we can log unicode strings. Patch by Teiresias. Fixes #1142 .
...
This was SVN commit r16058.
2014-12-22 00:23:07 +00:00
4ce667412b
Improve performance when looking for new targets.
...
Tested in combat demo huge where nearly 50% of the replay time is spent
looking for new targets, and GetPreference is called a lot as used to
sort possible targets.
Caching the preferred classes before the second loop, the replay time of
combat demo huge is reduced by about 15%. Replacing the "for each" loops
by "for of" loops gains an additionnal 7%.
This was SVN commit r16057.
2014-12-21 14:30:47 +00:00
96c45eac61
Fix missing escapes.
...
This was SVN commit r16056.
2014-12-21 02:23:17 +00:00
71ba68e3a3
Fix performance problem with unnecessary global message subscription
...
On my ESR31 branch, I've made two measurements with different replays
(both around 15000 turns).
In the first, I got around 3% performance improvement and in the second
about 7.5%. It mainly depends on how often aura changes related to the
female citizen aura happen.
This was SVN commit r16055.
2014-12-21 01:44:00 +00:00
01e2a33486
various small improvements in petra (choice of units in start game, ram management and team warnings when new trade route available)
...
This was SVN commit r16054.
2014-12-19 17:57:24 +00:00
39f6a8d3cd
reshuffle the petra deserialization to prevent it to modify the metadata infos
...
This was SVN commit r16053.
2014-12-16 21:33:07 +00:00
a13cc54fc3
Use correct variable. Fix #2957 .
...
This was SVN commit r16052.
2014-12-16 21:05:24 +00:00
a143c847e2
small fixes for petra
...
This was SVN commit r16051.
2014-12-14 21:35:24 +00:00
a9c6b7080a
Fixes intermittent error messages caused by uninitialized variable
...
This was SVN commit r16049.
2014-12-14 17:43:40 +00:00
9b6981465a
improve a bit the fix of 639a174388
...
This was SVN commit r16048.
2014-12-13 21:30:13 +00:00
639a174388
petra: fix choice of target when enemy resigned + some cleanings
...
This was SVN commit r16047.
2014-12-13 16:47:37 +00:00
add113a2a1
Remove duplicated layers of unescaping which required multiple escapes in some places.
...
This was SVN commit r16043.
2014-12-13 01:08:29 +00:00
a22f30c9b0
Improve AI performances thanks to traceLogger diagnostics. The gain is about 10% of AI time. The patch includes also some code cleanings.
...
This was SVN commit r16042.
2014-12-12 17:41:10 +00:00
34855896d0
fix typo in 30fb8d0f57
...
This was SVN commit r16041.
2014-12-12 07:36:34 +00:00
30fb8d0f57
ResourceGatherer cleanup.
...
s/var/let/, check if cmpPlayer != null before using it, some whitespace.
This was SVN commit r16039.
2014-12-12 01:11:06 +00:00
92ee34d76f
Properly localize tribute messages.
...
This was SVN commit r16038.
2014-12-12 01:11:04 +00:00
eb8a6c9427
Explictly use GMT when displaying a localized time that is not a date. Patch by lafferjm. Fixes #2938 .
...
Also make some parameters const references.
This was SVN commit r16037.
2014-12-12 01:11:00 +00:00
539046f750
Improves performance for the ResourceGatherer component
...
The tracelogger has shown one of the functions as 4.9% and one as 2.2%
before the patch. After the patch, both functions were below 0.5%. 100%
is the time for all JS code being executed during a non-visual replay,
including GC, overhead for the tracelogger and JIT code compiling.
This was SVN commit r16036.
2014-12-11 23:12:08 +00:00
e435ef2704
several optimisations on the ai, refs #2370
...
This was SVN commit r16035.
2014-12-11 20:24:33 +00:00
622614de02
Allow nesting repeat tags in the GUI.
...
This was SVN commit r16034.
2014-12-10 20:10:02 +00:00
fd93e4ae74
Remove testing of some special templates. We need to find a good way to generate template subsets, refs #2951 .
...
This fixes the tests fail introduced in b05879e151
2014-12-09 23:20:31 +00:00
21ecb22432
remove some now empty functions following previous patch
...
This was SVN commit r16032.
2014-12-09 20:30:27 +00:00
bce404adf2
Fixes the translation of the map size in the rihgt sidebar of the lobby
...
Fixes #2547
This was SVN commit r16031.
2014-12-09 20:11:16 +00:00
ae7c2f9586
ai: entitycollections switch to maps, see #2370
...
This was SVN commit r16030.
2014-12-09 19:55:37 +00:00
36187ea64a
petra: allow replacing civ center in game
...
This was SVN commit r16029.
2014-12-08 18:23:27 +00:00
6a785f791a
additional fix for inefficient EC, thanks to Yves for noticing
...
This was SVN commit r16028.
2014-12-07 22:19:59 +00:00
3e09cf4797
improve petra performances, see #2370
...
This was SVN commit r16027.
2014-12-07 16:36:56 +00:00
37ae9f4ad2
fix previous tag
...
This was SVN commit r16026.
2014-12-06 16:13:13 +00:00
0facb07ca6
petra: changes in farms and tributes management
...
This was SVN commit r16025.
2014-12-06 14:48:06 +00:00
f80adad667
Fixes some inconsistent line endings and EOL-related SVN properties.
...
This was SVN commit r16024.
2014-12-06 12:11:42 +00:00
b05879e151
Move template items GetRetainInFog and AlwaysVisible from Vision to Visibility.
...
Refs #2913
This was SVN commit r16022.
2014-12-05 18:33:59 +00:00
0df90c5c2b
ai common api : use maps for entitycollection lists + cleanings
...
This was SVN commit r16019.
2014-12-03 20:22:13 +00:00
7e0e566346
Fix typo in include. Refs #2086 .
...
This was SVN commit r16018.
2014-12-03 16:43:51 +00:00
4931652263
Non-fighting ships should not be agressive by default
...
This was SVN commit r16017.
2014-12-01 20:58:46 +00:00
5403c19cf0
petra: internal functions are now serialized
...
This was SVN commit r16016.
2014-11-30 19:05:39 +00:00
3c45599be5
fix default ai difficulty when using autostart, was easy since f90841cf78
...
This was SVN commit r16015.
2014-11-30 16:35:32 +00:00
1cc19e9176
Specify that my templatesanalyzer tool is distributed under the MIT license. Thanks to leper for noticing that it was currently unspecified.
...
This was SVN commit r16014.
2014-11-30 16:28:04 +00:00
759a6701f6
Fix test build.
...
The parser that extracts the methods to call does not care about
defines.
This was SVN commit r16013.
2014-11-29 21:26:01 +00:00
c0092aaca5
petra: some cleanings + (small) timing optimizations
...
This was SVN commit r16012.
2014-11-29 18:53:17 +00:00
049312e5a2
various small tunings for petra
...
This was SVN commit r16011.
2014-11-26 22:01:40 +00:00
89cc0fd0e1
Add support to escape dots (.) by using double dots (..) for aura keys. Fixes #2945 (I think)
...
This was SVN commit r16010.
2014-11-26 19:59:08 +00:00
1430efa9d6
Properly handle auto-research promotion techs at game start.
...
This was SVN commit r16009.
2014-11-25 22:47:02 +00:00
7102f86de3
petra: avoid updating some no-more-used entitycollections
...
This was SVN commit r16008.
2014-11-25 19:00:17 +00:00
347ffabaeb
Change the way we filter out selected entities when we draw a selection box. Add a hotkey to allow selecting only idle units.
...
Patch by Rolf Sievers, fixes #2407 .
This was SVN commit r16007.
2014-11-24 16:46:05 +00:00
882c1383e1
Add wall style for Seleucids in the random map scripts. Currently, Hellenic walls are used. Fixes a bug in the Fortress random map.
...
Patch by FeXoR.
Fixes #2942 , refs #2619 .
This was SVN commit r16006.
2014-11-24 16:19:17 +00:00
04343a8407
Fix a comment written too quickly
...
This was SVN commit r16005.
2014-11-23 21:47:15 +00:00
a7cc670a2d
petra: stop (after some time) to try gathering inaccessible resources (i.e. chicken inside buildings in random maps) + some cleanings
...
This was SVN commit r16004.
2014-11-23 14:48:26 +00:00
5f9c908abb
Allow techs to modify the resources that can be dropped of at dropsite. Patch by niektb. Fixes #2629 .
...
This was SVN commit r16003.
2014-11-22 23:21:11 +00:00
87d5d37488
Some source string fixes.
...
This was SVN commit r16002.
2014-11-22 22:21:54 +00:00
c385a88c88
Remove unused overload of GetSavedGameData
...
This was SVN commit r16001.
2014-11-22 19:46:24 +00:00
d1cdf8f952
display victory conditions when selecting a map, fixes #2727
...
This was SVN commit r16000.
2014-11-21 18:30:17 +00:00
0cc9cfd40c
fix a JS error in petra
...
This was SVN commit r15999.
2014-11-21 17:46:07 +00:00
2734982657
Escape a character.
...
This was SVN commit r15998.
2014-11-20 22:19:35 +00:00
504e23acb8
Make some things static.
...
This was SVN commit r15997.
2014-11-20 22:19:33 +00:00
335ac3d0cb
Query /proc for the executable path on Linux. Patch by starslayer. Refs #2086 .
...
Factor out unix_ExecutablePathname() which is used by BSDs and Linux (as
a fallback).
This was SVN commit r15996.
2014-11-20 22:19:21 +00:00
8a66a732c7
Add "Copy" and "Paste" entries to the Atlas "Edit" menu. Patch by stilz_, fixes #2642 .
...
This was SVN commit r15994.
2014-11-20 20:52:32 +00:00
1abd5669c9
Replace spaces in source file paths with non-breaking spaces. Refs #2539 .
...
This way our map file paths are not split due to word wrapping in the po
files.
This was SVN commit r15993.
2014-11-19 23:10:51 +00:00
f90841cf78
add a very-easy level for AI, addresses #2899
...
This was SVN commit r15990.
2014-11-18 21:21:21 +00:00
da1af993f7
petra: better AI recovery after its economy is badly damaged + some fixes
...
This was SVN commit r15989.
2014-11-18 19:56:23 +00:00
3589aa39b9
Update documentation on how to generate the entity component documentation.
...
This was SVN commit r15987.
2014-11-18 03:57:21 +00:00
afecbf02f3
Extend the config parser to support ini-style config files. Refs #1810 .
...
Config settings in a section are stored as "sectionname.setting"
internally.
Do not write section headers when writing config files as we would need
to write
settings without a dot first or ignore them. This can be changed once
all settings
belong to a section.
This was SVN commit r15986.
2014-11-18 03:57:07 +00:00
73de625089
Also change GameSetup.cpp.
...
This was SVN commit r15985.
2014-11-18 00:24:29 +00:00
9407dbe45e
Remove useless parameter from CFG_GET_VALUE.
...
This was SVN commit r15984.
2014-11-17 23:29:49 +00:00
3e4c701ab6
ensure that there are no dupes in buildable list
...
This was SVN commit r15983.
2014-11-17 23:07:57 +00:00
6695f1a3e8
Remove CParser. Fixes #2589 .
...
This was SVN commit r15981.
2014-11-17 01:04:24 +00:00
b995135138
Use an FSM to parse our config files instead of using CParser. Refs #2589 .
...
Properly write config settings with multiple values back to files. Refs
#1810 .
Print error messages if we encountered an invalid setting.
This was SVN commit r15980.
2014-11-17 01:03:59 +00:00
334f391446
Oxford comma.
...
(We seem to use it elsewhere in the UI, so be consistent.)
This was SVN commit r15979.
2014-11-16 23:44:40 +00:00
cbc49f43e6
The show full games filter in the lobby should be off by default.
...
This was SVN commit r15978.
2014-11-16 22:40:00 +00:00
947abde749
Flip the buttons in the leave game confirmation dialog to the no/yes order to match other dialogs.
...
Per the Apple Human Interface Guidelines the confirmation button should
be on the right. We do that for all(?) other dialogs, but not this one.
This was SVN commit r15977.
2014-11-16 22:21:57 +00:00
caed74df23
Fix line endings.
...
This was SVN commit r15976.
2014-11-16 22:21:06 +00:00
1b91421e5e
Escape special character.
...
This was SVN commit r15975.
2014-11-16 22:06:18 +00:00
30b7a34112
Rename Arcadia 2 to Arcadia, because there doesn't seem to be an Arcadia 1 any more.
...
This was SVN commit r15974.
2014-11-16 22:03:47 +00:00
f88ee2766e
use by default a random seed for the AI to make it less repetitive
...
This was SVN commit r15973.
2014-11-16 19:53:29 +00:00
94e6e29a34
Properly escape a character and remove a stray tag.
...
This was SVN commit r15972.
2014-11-16 18:00:02 +00:00
ccb5366e40
fixes #2935
...
This was SVN commit r15971.
2014-11-16 10:09:20 +00:00
59676dfc84
Update tools/LICENSE.txt
...
This was SVN commit r15970.
2014-11-16 02:10:31 +00:00
df4c07238d
Change GUI tag parsing to use a FSM instead of using CParser. Refs #2589 .
...
Parameters now have to be quoted with ".
Supports " in parameters by escaping them with \.
Tag start characters can be included in normal text by escaping them
with \.
Better error handling and a error messages to help with fixing
invalid/malformed strings.
This was SVN commit r15969.
2014-11-16 02:10:28 +00:00
d15e2f0cf6
Check for availability of XmppClient.
...
Move Lobby script function registration to the lobby JS interface.
This was SVN commit r15968.
2014-11-16 02:10:24 +00:00
d58189d510
Parse terrain properties without CParser. Refs #2589 .
...
This was SVN commit r15967.
2014-11-16 02:09:02 +00:00
fc1fe174cd
Amend the "Reveal All" behavior by always hiding mirages.
...
This was SVN commit r15966.
2014-11-14 20:29:35 +00:00
4d89820f1c
Fixes build errors on Windows introduced in c813a11427 and 1a0f9b086e.
...
This was SVN commit r15964.
2014-11-13 22:37:43 +00:00
8a290b3204
Fix mirages not flushed properly, introduced in 9ad2fc9fac.
...
This was SVN commit r15963.
2014-11-13 21:04:40 +00:00
49a31c5de2
prevent events from the first turn after deserialization to be thrown away
...
This was SVN commit r15962.
2014-11-13 20:21:00 +00:00
c813a11427
Split ScriptRuntime and ScriptInterface code to separate files.
...
The runtime is becoming more and more important in the JSAPI. As a
result, we also have more functionality on the runtime level and having
the whole ScriptRuntime class hidden in ScriptInterface.cpp doesn't make
sense anymore. ScriptInterface.cpp also has become quite a large file
and pulling out the runtime part makes it a bit smaller.
Refs #2462
This was SVN commit r15961.
2014-11-13 11:19:28 +00:00
1a0f9b086e
GUI cleanup.
...
Remove toTitleCase(). Unify iColorToString() and rgbToGuiColor().
Translate XMPP errors (displayed when connecting).
This was SVN commit r15960.
2014-11-13 01:26:36 +00:00
6e788fb15e
Clean up JSON parsing code. Refs #1374 .
...
Fix Engine.ReadJSONFile() which did throw a JS exception that was not
caught. Discovered by s0600204.
Expose Engine.ReadJSONFile() to the gui scripts.
This was SVN commit r15959.
2014-11-13 01:26:22 +00:00
e1c77bb487
Fix tests.
...
This was SVN commit r15958.
2014-11-12 19:51:28 +00:00
6556aa8c1e
fix petra serialization
...
This was SVN commit r15957.
2014-11-12 18:44:43 +00:00
9ad2fc9fac
Slightly improve fogging performance by avoiding the constant deletion/re-creation of mirages.
...
This makes the simulation update faster per entity but also makes the
number of entities greater at a given moment. The performance gain is
positive.
This was SVN commit r15956.
2014-11-12 15:56:45 +00:00
7130997df9
still more fixes on ai serialization + some cleanings
...
This was SVN commit r15954.
2014-11-11 22:08:28 +00:00
b596f7a893
additional fixes for petra serialization
...
This was SVN commit r15953.
2014-11-11 19:02:35 +00:00
13a71f6ae4
some fixes and cleaning in petra saved game support
...
This was SVN commit r15952.
2014-11-11 11:07:57 +00:00
6bab40c139
some bugfixes on ai serialization
...
This was SVN commit r15951.
2014-11-10 20:22:10 +00:00
e4774066e2
complete the support of saved games by Petra. It is playable now, but still needs cleaning and bug fixes.
...
This was SVN commit r15950.
2014-11-10 18:35:52 +00:00
c236e8a877
further steps towards saved games support, but still wip
...
This was SVN commit r15948.
2014-11-10 09:03:03 +00:00
e108b162b6
Add hotloading for translation files. Fixes #2915 .
...
This was SVN commit r15947.
2014-11-09 16:58:14 +00:00
8b9847e007
Replace CScriptValRooted with JS::Heap<T> and custom tracer for CNetClient
...
Refs #2462
This was SVN commit r15946.
2014-11-09 15:16:00 +00:00
e1f354024a
Persian temple upgrade
...
This was SVN commit r15945.
2014-11-09 11:30:50 +00:00
8e2d514228
Exact stack rooting for CParamNode
...
Refs #2415
Refs #2462
This was SVN commit r15944.
2014-11-09 11:08:53 +00:00
9040f8a3d3
Persian stables upgrade
...
This was SVN commit r15941.
2014-11-08 23:51:33 +00:00
edd9622050
wip petra support of saved games, still incomplete
...
This was SVN commit r15940.
2014-11-08 19:23:29 +00:00
b5c8646cea
Fix actors not retained in FoW after d07d1a17f3.
...
Refs #2913 .
This was SVN commit r15939.
2014-11-08 18:14:45 +00:00
db2f570ef6
Added several missing files of previous commit
...
This was SVN commit r15938.
2014-11-08 13:21:10 +00:00
e3e829c4b1
Upgraded persian fortress variation B.
...
Upgraded all cypress variations.
Added six tropical shrubs.
This was SVN commit r15937.
2014-11-08 13:07:45 +00:00
f4b5054815
Fix valgrind warning about uninitialized variable. Patch by Echelon9. Fixes #2878 .
...
This was SVN commit r15936.
2014-11-08 00:37:42 +00:00
2db1f14015
Cart_fortress recentered.
...
This was SVN commit r15935.
2014-11-07 11:27:59 +00:00
259fcdd8ed
Roman vesta temple and triumphal arch AO maps.
...
Added missing actor for persian barracks
This was SVN commit r15934.
2014-11-07 10:56:41 +00:00
a4b209bf2c
Set text align for options to left, increase the size for labels for boolean options. Fixes #2918 .
...
This was SVN commit r15933.
2014-11-07 01:24:13 +00:00
1d1c086e2a
Allow translating some strings in the mod selector. Fixes #2919 .
...
Also change column size so that the gd translation fits. (Verified with
long strings)
This was SVN commit r15932.
2014-11-07 00:57:09 +00:00
cbc151cb1e
Persian barracks upgrade.
...
This was SVN commit r15931.
2014-11-07 00:29:31 +00:00
8200182399
Persian fortress variation upgrade. Second variation upgrade soon.
...
This was SVN commit r15930.
2014-11-06 11:29:14 +00:00
6ae21e1ce7
some ai cleaning
...
This was SVN commit r15929.
2014-11-05 21:03:25 +00:00
7dad37c78f
Some cleanup. Fix a comment.
...
This was SVN commit r15928.
2014-11-05 00:22:14 +00:00
518d2d0c2a
Translation fixes.
...
This was SVN commit r15927.
2014-11-05 00:22:11 +00:00
d07d1a17f3
Add a new Visibility component that will eventually allow scripted components and mods to influence an entity's visibility.
...
This first commit only refactors code and does not add any new feature.
Refs #2913 (see this ticket for more information about the change)
This was SVN commit r15925.
2014-11-04 20:53:25 +00:00
0855c1169b
Upgraded persian Civic centre. Added new shrubs. New pers_cc variation in process
...
This was SVN commit r15924.
2014-11-04 11:45:20 +00:00
2cfab37485
Persian market variations upgrade. Added ao/normal/spec and made the stalls conform to the terrain.
...
This was SVN commit r15923.
2014-11-02 21:58:57 +00:00
6e30381acd
petra: push priority of first market and remove some unnecessary ===
...
This was SVN commit r15922.
2014-11-02 20:45:57 +00:00
f9d7335e12
simplify the way petra deals with worker
...
This was SVN commit r15921.
2014-11-02 20:27:13 +00:00
7cdbd7a6fd
Fixed ao map for the roman short wall segment
...
This was SVN commit r15920.
2014-11-02 17:00:29 +00:00
221d93da91
Upgraded persian buildings:
...
blacksmith, dock, farmstead, defense tower, wonder
This was SVN commit r15919.
2014-11-01 11:36:01 +00:00
69c1e4fc52
prevent petra to build siege towers as it does not know how to use them
...
This was SVN commit r15918.
2014-10-31 17:22:44 +00:00
772024a10c
fix a JS error
...
This was SVN commit r15917.
2014-10-30 20:16:59 +00:00
f756cab1f8
Update sprintf.js to the latest version 1.0.2 ( https://github.com/alexei/sprintf.js ).
...
Update suggested and patch generated by Shane, fixes #2859 .
This was SVN commit r15916.
2014-10-29 23:23:11 +00:00
5491faffba
New unit mesh variations and heads with some example animations and units xmls
...
This was SVN commit r15915.
2014-10-29 22:48:48 +00:00
199eb46d86
Fixes GLES build
...
This was SVN commit r15914.
2014-10-29 02:36:42 +00:00
10d13a991c
Use fitplural added in upstream revision 1404284. Refs #2539 .
...
This was SVN commit r15913.
2014-10-28 16:03:19 +00:00
7f1fd01174
Moves some includes out of Renderer.h to slightly optimize compilation
...
This was SVN commit r15912.
2014-10-28 03:57:22 +00:00
2b841f56ae
petra: cleaning of the code for dock placement
...
This was SVN commit r15911.
2014-10-27 19:53:06 +00:00
ff50b0b74c
Fixes incorrect input handling in dropdowns and lists, they were manually handling all events, but should only handle certain key presses. Fixes #2885 .
...
Fixes bug where lists/dropdowns could select an invalid index.
This was SVN commit r15909.
2014-10-27 04:37:06 +00:00
570b0374f4
Convert path separator after building the full path.
...
This was SVN commit r15908.
2014-10-27 03:09:36 +00:00
d06ecc1b89
Fixes some errors in i18n scripts: use ASCII quotes to avoid charset errors in Windows command line, and use function form of print
...
This was SVN commit r15907.
2014-10-27 02:42:06 +00:00
e2536ae4bc
Internationalizes in-game menu text, based on patch by Jaison, fixes #2540 .
...
Fixes inconsistent use of "Settings" to refer to game options dialog
This was SVN commit r15906.
2014-10-27 01:32:11 +00:00
e3e86e2a29
Fixes init of post processing effects, so they can be cleanly enabled/disabled at runtime. Fixes #2890 , refs #2672 , #2893 .
...
Updates descriptions on options screen and fixes comment in default.cfg
(smoothlos does not require preferglsl)
This was SVN commit r15905.
2014-10-27 00:53:31 +00:00
4a68170aeb
Add msgstrs for plural forms to pots.
...
This was SVN commit r15904.
2014-10-26 17:25:12 +00:00
466942fc29
fix the choice of target in attacks + start changes in dock placement + some cleanings
...
This was SVN commit r15903.
2014-10-26 13:10:20 +00:00
b4997dc7c6
Fixes minimap GLES compatibility by making point size a uniform and passing into the shaders
...
This was SVN commit r15901.
2014-10-26 04:37:26 +00:00
21b83734f9
Fixes shader type error with some compilers
...
This was SVN commit r15900.
2014-10-26 01:44:58 +00:00
7f247580b3
Remove outdated bundled transifex client. Fixes #2789 .
...
Anyone wanting to pull updates from transifex should install the client.
This was SVN commit r15896.
2014-10-26 00:28:41 +00:00
23cabedec8
Translate map size of lobby games on the client.
...
This was SVN commit r15895.
2014-10-26 00:28:38 +00:00
ae10d34d99
Switch i18n scripts to use Pology. Fixes #2539 .
...
Still requires a patch to Pology to keep the source file ordering.
This was SVN commit r15894.
2014-10-26 00:28:35 +00:00
cf3e42f6fb
Make map description end with a full stop.
...
This was SVN commit r15893.
2014-10-26 00:28:26 +00:00
c524542477
Make map description end with a full stop.
...
This was SVN commit r15892.
2014-10-21 20:03:06 +00:00
b2f9dc305c
check that selected units still exist when rebuilding the selection
...
This was SVN commit r15891.
2014-10-21 16:26:27 +00:00
6334ee3f8b
Reverts 03eaf9b461 due to licensing issues (source/lib is MIT licensed) and replaces with compatible FreeBSD/clang-based solution, patch by pstumpf. Refs #2675
...
This was SVN commit r15890.
2014-10-18 20:45:11 +00:00
2a7c3a95f9
improve gui performance, refs #2179 comment 28
...
This was SVN commit r15889.
2014-10-18 16:37:53 +00:00
c65817829f
Adds compatibility for XMPP differences between platforms that can cause case inconsistencies.
...
This was SVN commit r15888.
2014-10-18 14:28:46 +00:00
d4884a2099
Removes empty valgrind lib directory and linker setting from extern_libs4.lua. Fixes linker warning with Git repos, since empty directories aren't included
...
This was SVN commit r15887.
2014-10-18 04:59:53 +00:00
03eaf9b461
Fixes cpuid to work with i386 CPUs and PIE/PIC, based on old GCC cpuid.h source and patch by pstumpf, fixes #2675
...
This was SVN commit r15886.
2014-10-18 03:07:24 +00:00
1631b8de14
Fixes Atlas error when using the map open/save dialog on Linux, based on patch by njm, fixes #2858
...
This was SVN commit r15885.
2014-10-18 01:53:06 +00:00
3c33a8a072
Add back the VS2013 project files to the files generated by update-workspaces.bat on Windows, as Boost libs were updated to 1.56.
...
Fixes #2271 , addresses d672d9625d
2014-10-17 17:50:53 +00:00
620399270d
various small petra tunings
...
This was SVN commit r15880.
2014-10-17 17:15:06 +00:00
a29e233fdf
Remove another leftover "Counter" string, see also d3351a645f.
...
Patch by thamlett, fixes #2830
This was SVN commit r15879.
2014-10-17 14:19:32 +00:00
c981dc4e9d
Adds missing l10n folder to OS X bundle build script, fixes #2689
...
This was SVN commit r15878.
2014-10-17 02:59:11 +00:00
ba5685eff3
cleaning of the Petra configuration
...
This was SVN commit r15877.
2014-10-15 20:52:23 +00:00
f7a64d4abc
Prevents gaul defense_tower_a from showing a unit when not garrisoned. Fixes #2876
...
This was SVN commit r15876.
2014-10-15 19:08:15 +00:00
a63328d859
Upgraded persian struct texture missing in previous commit.
...
This was SVN commit r15875.
2014-10-15 16:20:59 +00:00
18ab827886
Change L10n code to use ps/Singleton, so that we can recreate it.
...
This allows for adding locales in mods.
This was SVN commit r15874.
2014-10-15 16:04:37 +00:00
f5179930f5
Remove leftovers from bundled miniupnpc. Refs #2552 .
...
Fix cleanup of SM24.
This was SVN commit r15873.
2014-10-15 15:34:32 +00:00
c1575e8f48
Upgraded persian houses and palace with normal and AO.
...
Upgraded persian textures (diffuse normal and spec) WIP
This was SVN commit r15872.
2014-10-15 13:59:55 +00:00
776567d9b2
Removes bundled MiniUPnPc source, it is now a required system library on *nix. NOTE: update-workspaces must be run. See the updated BuildInstructions for details.
...
Adds precompiled MiniUPnPc 1.9 libs for win32, fixes #2552 .
Updates build-osx-libs.sh for these changes, including patch to fix
clang symbol visibility (fixed upstream).
Updates LICENSE.txt.
Fixes bug in build-osx-libs.sh where downloaded files might not have the
expected filename.
Fixes problem with building wxWidgets for 32-bit OS X targets,
apparently ARCH is ignored sometimes, but --enable-macosx_arch works.
This was SVN commit r15870.
2014-10-15 03:47:13 +00:00
227d828b67
Updates Windows version strings for 8.1 and 10 (technical preview)
...
This was SVN commit r15869.
2014-10-14 21:37:19 +00:00
78896154fe
Change a scope for a bunch of variables in the Attack component. This simple change allows modders to modify the whole attack schema.
...
Patch by Radagast, fixes #2671
This was SVN commit r15868.
2014-10-14 20:44:17 +00:00
d3351a645f
Remove some "Counters/Countered by" tooltips as the hard counters system has been disabled.
...
Patch by thamlett, fixes #2830
This was SVN commit r15867.
2014-10-14 20:37:15 +00:00
8ce7c818f5
internationalization of ai chat messages
...
This was SVN commit r15866.
2014-10-14 19:43:19 +00:00
1f8cd485d4
fix translation of ai chat messages (allowing for parameters)
...
This was SVN commit r15865.
2014-10-14 18:58:41 +00:00
bb02dcd0e9
Fix broken tests.
...
This was SVN commit r15864.
2014-10-14 01:25:32 +00:00
7090334756
fix previous commit
...
This was SVN commit r15863.
2014-10-13 19:55:12 +00:00
20a9c9ab62
prevent the AI from using disabled templates
...
This was SVN commit r15862.
2014-10-13 19:52:03 +00:00
4ecfa25c5e
Sync minimal-flags with what Gentoo uses.
...
This was SVN commit r15861.
2014-10-12 23:40:05 +00:00
4ef63e8673
Change tooltips with incorrect garrison count. Patch by thamlett. Fixes #2748 .
...
This was SVN commit r15860.
2014-10-12 23:15:28 +00:00
affdd9f548
Petra now send (if enough resources) tributes to allies in difficulty
...
This was SVN commit r15859.
2014-10-12 22:12:15 +00:00
443158869c
let the AIs know when a tribute is sent
...
This was SVN commit r15858.
2014-10-12 22:00:19 +00:00
6ec902ec20
Fix a typo in the packaging scripts.
...
This was SVN commit r15857.
2014-10-12 20:53:13 +00:00
ec8e240e81
redesign of the trading for Petra, should me more efficient and supports naval trading
...
This was SVN commit r15856.
2014-10-12 20:21:47 +00:00
5d9029a1d9
stop trying to build when not enough resources, fixes #2835
...
This was SVN commit r15855.
2014-10-12 20:09:03 +00:00
7fd407ca1f
update correctly the tradeRoute set on market foundations
...
This was SVN commit r15854.
2014-10-12 19:56:24 +00:00
3df4799dea
enable test on tech for AI
...
This was SVN commit r15853.
2014-10-12 19:55:15 +00:00
849cbc13ee
Fix path in fontbuilder.
...
This was SVN commit r15852.
2014-10-12 19:27:55 +00:00
46fd718ac1
Initialize some variables. Patch by Echelon9. Fixes #2862 .
...
This was SVN commit r15851.
2014-10-12 19:27:49 +00:00
3c8ef99007
Switch lobby room. Update mod version.
...
This was SVN commit r15850.
2014-10-12 19:27:42 +00:00
elexis
