Compare commits

...

5789 Commits

Author SHA1 Message Date
Itms 816aab94fb Use Sunrise for Gauls.
This was SVN commit r19921.
2017-07-16 08:42:00 +00:00
OmriLahav ad09018d0d This was SVN commit r19919. 2017-07-15 05:10:28 +00:00
elexis 9ec42a77a1 Play more music tracks.
Register the new track "Tale Of Warriors" from 11c6dec383 with the game.
Register "Calm Before the Storm" and "Tavern in the Mist",  which were
not heard in the previous releases.
Play some peace tracks for all civilizations, as intended by Omri (thus
play some music for observers too, refs #4298).
Add more background tracks to the menu as agreed with WhiteTreePaladin.
Keep "Honor Bound" the first one, as proposed by Itms and leper.
Add some tracks that are played only for one civ to other civs, to
reduce the repetition.
Remove duplicate, now unused music code.

Differential Revision: https://code.wildfiregames.com/D732
Fixes #4565.

This was SVN commit r19918.
2017-07-14 18:57:33 +00:00
Itms d56692d9e1 Rewrite the pathfinder dirtiness information system.
Remove all hacks while keeping most optimizations in memory management.
This fixes incomplete grid updates that could cause OOS on rejoin, fixes
#4596.

Tested by: elexis, ffffffff
Reviewers: leper, wraitii
Differential Revision: https://code.wildfiregames.com/D675
This was SVN commit r19916.
2017-07-14 10:09:32 +00:00
elexis 812750ddd7 Cathaginian and Ptolemian Brracks cost 300 resources, just like the other Barracks.
Differential Revision: https://code.wildfiregames.com/D725
Patch By: Grugnas
Reviewed By: borg-, temple
This was SVN commit r19914.
2017-07-13 12:32:15 +00:00
Itms 918a693f0f Update the list of bundled languages for A22.
This was SVN commit r19913.
2017-07-12 13:56:28 +00:00
elexis 930eff1f26 Remove unused function (from 0aaddf62aa) after the only call to it was removed in 78e9fecf92.
Refs #910, D736
Discussed with: Deiz, bb

This was SVN commit r19910.
2017-07-11 00:38:04 +00:00
elexis 81de8a2866 Fix JS error when pressing the unload key when not having selected a garrison holder.
Differential Revision: https://code.wildfiregames.com/D736
Fixes #4674
Patch By: bb
This was SVN commit r19909.
2017-07-10 23:56:31 +00:00
elexis cb268f4a8e The mercenary upgrade technology from D407 is not expected to affect Mercenary Champions since those can't take advantage of the tech.
String should be fixed after the release.

Differential Revision: https://code.wildfiregames.com/D734
Patch By: Grugnas
This was SVN commit r19908.
2017-07-10 22:12:44 +00:00
elexis 53eaef0746 Don't change the copyright headers of other software groups, as reported by leper.
Refs 43137fef3f / D716

This was SVN commit r19907.
2017-07-10 21:53:47 +00:00
elexis 9ba2ba7f5f Fix missing death animation of the rider of the celtic chariots.
Refs #4662, 83680b0dee
Patch By: Stan
This was SVN commit r19906.
2017-07-10 21:40:05 +00:00
elexis 64d1ea9817 Fix a typo in dd9a8706f9.
Differential Revision: https://code.wildfiregames.com/D735
Fixes #4673
Patch By: bb
This was SVN commit r19905.
2017-07-10 19:57:01 +00:00
elexis 37b1ddd2de Revert the Phalanx formation animation change from 83680b0dee that only causes the units to not have any animation while moving, for both Delenda Est and the public mod.
This was SVN commit r19904.
2017-07-10 18:33:45 +00:00
elexis dc12fe1869 Revert the production cost addition of peacocks in 83680b0dee since, contrary to Delenda Est, the mauryan corral (nor any other building) can currently train peacocks in the public mod.
This was SVN commit r19903.
2017-07-10 18:19:40 +00:00
mimo 5a7bf9daf4 Petra: Move land traders to safety when a trade route is destroyed instead of leaving them idle in the open
Patch by Sandarac

Reviewed By: mimo
Differential Revision: https://code.wildfiregames.com/D730
This was SVN commit r19902.
2017-07-10 16:22:29 +00:00
mimo 5db17931c8 fix comment in 1196ececed
This was SVN commit r19901.
2017-07-10 16:19:13 +00:00
mimo 1196ececed protect possible infinite loop when an order is issued on the same turn as garrisoning is effectively processed
Reviewed By: O2 JS Simulation, elexis, s0600204, bb
Differential Revision: https://code.wildfiregames.com/D686
This was SVN commit r19900.
2017-07-10 16:10:50 +00:00
elexis 43137fef3f Make all Wildfire Games copyright headers consistent by always ending with a period and using (C) instead of (c).
Differential Revision: https://code.wildfiregames.com/D716
Refs 09e974e1cb
Reviewed By: bb
Change in agreement with leper.

This was SVN commit r19899.
2017-07-10 14:26:24 +00:00
elexis d49bf8b1bf Ensure the camera position being above the water level (without smoothing the water level with the terrain).
Differential Revision: https://code.wildfiregames.com/D700
Fixes #3892, D229, D638

This was SVN commit r19896.
2017-07-10 02:16:57 +00:00
mimo 6b37f9bbdb Allow the AI to research techs in captured structures
Reviewed By: Sandarac
Differential Revision: https://code.wildfiregames.com/D708
This was SVN commit r19894.
2017-07-09 08:23:28 +00:00
elexis 319809ea9a Chat window size beautification.
Use the entire available screen height for easier chat history reading.
Use the golden ratio for the chat history frame size, so that the ratio
looks appealing with all screen size ratios.

Differential Revision: https://code.wildfiregames.com/D713
Refs #4069
Patch By: temple
This was SVN commit r19893.
2017-07-08 23:39:21 +00:00
elexis 43f1dcdc2a Add missing semicolons and remove unneeded template definition following D722 reported by temple.
This was SVN commit r19892.
2017-07-08 22:54:38 +00:00
OmriLahav 11c6dec383 This was SVN commit r19887. 2017-07-08 18:19:10 +00:00
elexis c6200201c8 Update Mesa software renderer detection.
Fixes #4670
Refs  #623, D86,
https://cgit.freedesktop.org/mesa/mesa/commit/?id=92b4ca45504e7ffc5f4fa385ada1be48e6123181
Patch By: fabio
This was SVN commit r19886.
2017-07-08 16:30:30 +00:00
elexis fbd1ba390d Women Attack balancing fixes.
Allow (not only spartan but) all women to attack (so that it's more
obvious that they can be used to destroy siege engines if no military
units are available).
(Proposed by scythetwirler in irc on 2017-03-13.)

Remove the celtic woman (3.5x!) attack bonus and their (+50%) health
bonus (they had since the introduction of the britons in 52af3369ba).
(Because woman health is most relevant in the beginning of the game and
at that stage celts already have the population bonus advantage.)

Set Spartan women to Passive instead of Standground, so that they flee.
Convert Spartan woman 2.5x siege bonus to a general +50% Attack bonus
and nerf their 80% HP bonus to +40% (i.e. 40HP instead of 25HP).
Keep Spartan woman ability to patrol and build towers for now.

Differential Revision: https://code.wildfiregames.com/D722
Patch By: borg-
Reviewed By: Grugnas
This was SVN commit r19885.
2017-07-08 16:22:54 +00:00
leper a5e253162b Fix undefined macro usage in cppformat.
This is quite noisy with -Wexpansion-to-defined in both clang 3.9 and
gcc 7.
(Refs #3190 and #4148. Upstream might have fixed this, but somewhat
clean build logs seem worth it.)

Reviewed By: echotangoecho
Differential Revision: https://code.wildfiregames.com/D680
This was SVN commit r19884.
2017-07-08 00:15:03 +00:00
elexis 7e3ff3af64 Don't display the friendly fire tooltip since it was entirely disabled in the public mod.
Allow us and modders to enable or disable the string without changing
the code.

Differential Revision: https://code.wildfiregames.com/D198
Refs: Tooltip added by 22b72a362b, friendly-fire removed in ba2bb82406,
patch discussed in D142
Reviewed By: Imarok
This was SVN commit r19883.
2017-07-07 18:52:41 +00:00
elexis 8a38229903 Buff Carthaginian Naval Shipyard capturing defense (4x more capture points, 2x more regeneration rate to compensate the 1/4th garrison capacity).
Buff by 5 pierce armor levels to be equal to the regular dock.

Differential Revision: https://code.wildfiregames.com/D714
Reviewed By: Grugnas, mimo
This was SVN commit r19882.
2017-07-07 16:25:24 +00:00
elexis 23d8bc11a5 Prohibit lobby nick registration with some previously not-filtered characters between 32 and 127, in particular parentheses.
Use whitelist instead of blacklist, remove dead options and noisy
unneeded gui/common/ function.
Still allow existing players with now prohibited characters to login.
This could be enforced in ejabberd too and then the now incomplete JS
string can be replaced with a more general one.

Differential Revision: https://code.wildfiregames.com/D715
Refs #4671
Reviewed By: Imarok
This was SVN commit r19881.
2017-07-07 16:04:38 +00:00
Imarok f876eb86fa Fix unload-all hotkey for allied buildings
Reviewed by: causative
Differential Revision: https://code.wildfiregames.com/D648
This was SVN commit r19878.
2017-07-06 20:51:22 +00:00
Itms 9aad0137ba Stop using WMI for detecting the sound card, and use OpenAL instead. Delete WMI code altogether now it is unused.
This fixes #4561 and makes sound card detection work on non-Windows
platforms.

Reviewed By: echotangoecho
Tested By: Imarok, elexis
Differential Revision: https://code.wildfiregames.com/D636
This was SVN commit r19877.
2017-07-06 17:29:49 +00:00
mimo 3cc2eed989 Petra: Fix bug in a case when an army captures its target and then tries to help another army
Patch by Sandarac

Reviewed By: mimo
Differential Revision: https://code.wildfiregames.com/D709
This was SVN commit r19876.
2017-07-06 17:13:28 +00:00
Imarok 5c6f3505e8 Fix replay cache performance (broken by ea250b3d25). Also remove a TODO fixed by fca844eef6.
Reviewed by elexis.

This was SVN commit r19875.
2017-07-06 16:20:18 +00:00
elexis d5a15384cc Ensure the starting trees on extinct volcano.
This was SVN commit r19874.
2017-07-06 12:32:46 +00:00
elexis 3ecc90cd2e Fix a reference error in 6141c5c4fa / D514 reported by causative.
This was SVN commit r19873.
2017-07-06 01:05:03 +00:00
mimo 4c954e2b13 Be less restrictive for building shipyards for mods support
Reviewed By: Sandarac
Differential Revision: https://code.wildfiregames.com/D705
This was SVN commit r19872.
2017-07-05 20:03:38 +00:00
elexis e16f5711f7 Reduce resource cost of the female health technology (Loom) because it was too expensive to be used reasonably.
Differential Revision: https://code.wildfiregames.com/D703
Patch By: borg-
Reviewed By: Grugnas, mimo, temple
This was SVN commit r19871.
2017-07-05 09:39:39 +00:00
mimo 4fadd75ace fix back-to-work button for garrisoned units
Reviewed By: fatherbushido
Differential Revision: https://code.wildfiregames.com/D685
This was SVN commit r19869.
2017-07-04 17:57:20 +00:00
Imarok 7a860cc48e Fix player color dropdown in gamesetup
Reviewed by: elexis
Differential Revision: https://code.wildfiregames.com/D702
This was SVN commit r19867.
2017-07-02 10:07:17 +00:00
mimo 4cc1257476 reduce the cost of home garden tech
Reviewed By: fatherbushido, elexis
Differential Revision: https://code.wildfiregames.com/D701
This was SVN commit r19865.
2017-07-01 18:04:40 +00:00
elexis 14e1b79a0f Insert cinematic path nodes after the currently selected node instead of before (so paths are not created in the opposite of the expected order).
Differential Revision: https://code.wildfiregames.com/D656
Refs #3871
Patch By: Vladislav
This was SVN commit r19864.
2017-07-01 15:49:59 +00:00
elexis c67d79d9f3 Recompute water graphics when changing the water level and upon deserialization to fix a graphical (non-simulation) OOS on rejoin.
Differential Revision: https://code.wildfiregames.com/D638
Refs #4596
Contains a fix mentioned by leper.

This was SVN commit r19862.
2017-07-01 04:15:49 +00:00
elexis 36b315ca32 Rebuild heal range visualization after deserialization.
Since the RangeVisualization component is deserialized before the
TechnologyManager, upgraded healers had shown a wrong range.

Differential Revision: https://code.wildfiregames.com/D698
Fixes #4632
Refs D432
Patch By: Sandarac
This was SVN commit r19861.
2017-07-01 01:07:34 +00:00
elexis 96df0ad875 Show the session page again after disconnecting while playing a cinematic path.
This was SVN commit r19860.
2017-06-30 21:15:35 +00:00
elexis f9f137eea9 Remove placeholder rubble templates from bf55acadaa which just contain a foundation and thus would (as readers of previous commit messages might have guessed already) just confuse players if they were used.
Differential Revision: https://code.wildfiregames.com/D693
Split from D643
Refs #1166
Patch By: temple
This was SVN commit r19859.
2017-06-30 20:09:47 +00:00
elexis 8ba0b90b4f Revert the use of foundations as rubble placeholders for palisade walls from bf55acadaa as it just confuses players.
Use the 2x2 stone rubble for now (which is definitely too big but
doesn't confuse anyone).
Use it for spikes and the celtic hut too, which had no rubble prior.

Differential Revision: https://code.wildfiregames.com/D691
Split from: D643
Refs #1166
Patch By: temple
This was SVN commit r19858.
2017-06-30 19:59:31 +00:00
elexis deee779039 Revert the use of foundations as rubble placeholders for some random buildings from bf55acadaa as it just confuses players.
Do not use the legit rubble_3x3 actor from 439f67b5d8 as it isn't as
appealing as rubble_stone_3x3.
Rename it to make it more obvious that the template stands out.

Split from: https://code.wildfiregames.com/D643
Refs #1166
Patch By: temple
This was SVN commit r19857.
2017-06-30 19:32:47 +00:00
fatherbushido 22726a1e68 Nerf a bit pierce damage of javelin units. Make those damages a bit more consistent with archers ones. Patch by borg-. Viewed by elexis. Reviewed by Grugnas.
Differential Revision: https://code.wildfiregames.com/D666
This was SVN commit r19856.
2017-06-30 19:16:04 +00:00
elexis 3538f06c0b Revert the use of foundation placeholders for (mauryan) docks from bf55acadaa as it only leads to confusion.
Use regular stone rubble instead for the time being.
Don't use the hellenic dock actors in the rubble of non-hellenic docks.

Split From: ​https://code.wildfiregames.com/D643
Refs #1166
Patch By: temple
This was SVN commit r19855.
2017-06-30 18:58:30 +00:00
elexis b3b27afc99 Revert the use foundations as rubble placeholders for corrals from bf55acadaa, as that just confuses players.
Use stone instead of wooden rubble for all corrals, as the models all
contain stone.

Differential Revision: https://code.wildfiregames.com/D643
Refs #1166
Patch By: temple
This was SVN commit r19854.
2017-06-30 18:30:05 +00:00
elexis e59ec473cf Use more fitting civic center rubble entities.
Split from: https://code.wildfiregames.com/D643
Patch By: temple
This was SVN commit r19853.
2017-06-30 18:17:30 +00:00
mimo dca572fbcd petra: fix number of defenders against champion elephant which can be used as siege unit
This was SVN commit r19852.
2017-06-30 16:41:29 +00:00
fatherbushido f6ca98450b Increase sentry tower attack range to prevent archers to fire at it whithout being shot at. Patch by Grugnas. Reviewed by elexis.
Differential Revision: https://code.wildfiregames.com/D652
This was SVN commit r19851.
2017-06-30 11:06:34 +00:00
elexis 8ceb7142fa Update OSX libraries to the most recently released versions.
Remove wxWidgets patch from 4ca156e2d8 that had been merged with the new
release.

Differential Revision: https://code.wildfiregames.com/D679
Refs #4362
Based On Patch By: fabio
Discussed With: leper
Tested By: Tobbi, Itms
This was SVN commit r19848.
2017-06-30 00:33:11 +00:00
elexis e96ba442ec Remove leftover following cfd08bbf28.
This was SVN commit r19847.
2017-06-30 00:16:34 +00:00
elexis 6f7a5fb773 Allow the JS GUI to subscribe to the window resized event and use it to conditionally update the observer panel (refs D689).
Differential Revision: https://code.wildfiregames.com/D694
Tested By: temple
Proofread By: Vladislav
This was SVN commit r19846.
2017-06-30 00:04:29 +00:00
elexis 5e6b502eab Fix dropdown list height after resizing the window (in case there is an item that used wordwrapping before but not after the resize or vice versa).
Differential Revision: https://code.wildfiregames.com/D692
Tested By: temple
Proofread by: Vladislav
Refs #3571

This was SVN commit r19845.
2017-06-29 23:39:12 +00:00
mimo 9317eb126e Petra: Fix possible inconsistent response when trying to become allies
Patch by Sandarac

Reviewed By: mimo
Differential Revision: https://code.wildfiregames.com/D695
This was SVN commit r19844.
2017-06-29 17:52:27 +00:00
elexis 2ee5eb0893 Fix observermode GUI for 1024x768.
Display the follow-player label only if it fits entirely (i.e. >=
1280x1024), otherwise display the checkbox only.
Increase the size of the player dropdown for resolutions >= 1280x1024.

Differential Revision: https://code.wildfiregames.com/D689
Patch By: temple
Refs:
  Issues introduced by #3743 and 20e7d2224a
  This is affected by D692 D694

This was SVN commit r19843.
2017-06-29 17:25:24 +00:00
elexis ca2390d70e JS lobby cleanup, fixes and lobby bot performance improvements:
Do not send a wasteful rating request if the same player is selected
again when someone joined the lobby, when changing the sorting order or
when clicking on the same user again
by moving the player-selection change test from updatePlayerList to
onPlayerListSelection.

That test should have been done here in 8f4daa9dd0 already and fixes
#3840 well enough.

This change also fixes an unintentional behavior of the code, where the
game the currently selected player is playing in would be selected if
someone else joined the lobby, even if a different game was selected
manually.
Furthermore it allows simplification of the code of 655ce95468 by
removing selectGameFromPlayername which did almost the same as
selectGameFromPlayername.

To still select the game the current player is playing in if the
selected player didn't change, subscribe to the (new) event that is
called when clicking on an item.

Differential Revision: https://code.wildfiregames.com/D688
Reviewed By: ffffffff (fpre)
This was SVN commit r19841.
2017-06-29 02:58:04 +00:00
elexis 00173a6e13 Group starting positions of players by team on the new random map sripts in Alpha 20 and 21, making them much more playable.
Use stronghold starting position style with 33% instead of 50%
probability.

Differential Revision: https://code.wildfiregames.com/D664
Reviewed but not accepted by: bb (everything) and fatherbushido (Heaps
permutations)
Catch: This must become more efficient if the playercount will be
greater than 8, refs #4004.

This was SVN commit r19840.
2017-06-28 17:09:21 +00:00
fatherbushido 7c50093470 Use PlacementType instead of Category in BuildRestriction for the hardcoded dock special constraint. AI patch by mimo. Reviewed by leper and s0600204. Final review by mimo.
Fix #4290.
Differential Revision: https://code.wildfiregames.com/D387
This was SVN commit r19839.
2017-06-28 07:30:22 +00:00
elexis 67ae3481ed Autocomplete playernames before everything else, as that is the most expected use case.
Differential Revision: https://code.wildfiregames.com/D678
Refs D322.
Reviewed By: Vladislav
This was SVN commit r19837.
2017-06-27 21:25:16 +00:00
elexis 6b80ca0c68 Prevent a tribute exploit (gaining infinite resources by sending a tribute of NaN resources to a player).
Differential Revision: https://code.wildfiregames.com/D677
Refs #4459

This was SVN commit r19836.
2017-06-27 21:17:33 +00:00
mimo 4241cf441d Petra: use moveToRange() instead of move() in some cases
Patch by Sandarac

Reviewed By: mimo
Differential Revision: https://code.wildfiregames.com/D676
This was SVN commit r19834.
2017-06-26 18:25:18 +00:00
fatherbushido be2b2faa77 Properly apply texture to the last quad of an overlay textured line. Reviewed by vladislavbelov.
Fix #4617.
Differential Revision: https://code.wildfiregames.com/D663
This was SVN commit r19833.
2017-06-26 13:04:21 +00:00
fatherbushido 26e6f901f1 Remove a useless value cap in Foundation code. Reviewed by wraitii.
Differential Revision: https://code.wildfiregames.com/D550
This was SVN commit r19832.
2017-06-26 12:48:00 +00:00
fatherbushido 8ba425d89f Limit the bartered amount in the simulation. Advices from mimo. Reviewed by elexis.
Refs #4655.
Differential Revision: https://code.wildfiregames.com/D381
This was SVN commit r19831.
2017-06-26 11:56:31 +00:00
elexis 1fe9532680 Allow lobby players to rejoin games, even if the rating changed meanwhile or if the lobby bot didn't provide the most recent rating.
Refs #3686
Differential Revision: https://code.wildfiregames.com/D670
Reviewed By: Imarok
This was SVN commit r19828.
2017-06-25 20:56:03 +00:00
elexis e948d5f37f JS Lobby cleanup.
Don't return 1200 in splitRatingFromNick if the player has no rating
yet, so that it can be reused for playername construction.

Refs https://code.wildfiregames.com/D670
Reviewed By: Imarok
This was SVN commit r19827.
2017-06-25 18:00:54 +00:00
elexis 2e3ac4cf20 Prevent players from gaining unlimited resources by setting the batch-train-modifier to a non numeric value.
Differential Revision: https://code.wildfiregames.com/D66
Refs #4459
Reviewed By: fatherbushido (wraitii, leper)
This was SVN commit r19826.
2017-06-25 16:05:06 +00:00
elexis d7c4c20aa8 Update OSX zlib version to the most recent and now only one hosted.
Fixes #4639
Refs #4362
Differential Revision: https://code.wildfiregames.com/D644
Tested By: Tobbi
This was SVN commit r19825.
2017-06-25 14:58:51 +00:00
elexis e7ab22286e Fix the replay menu for people with non-latin characters in their username.
Use OsPath instead of CStr and CStrW where possible,
wstring_from_utf8(OsPath.string8()) to pass printable strings to the
JSAPI,
OsString when opening a filestream and
off_t instead of int for filesizes.

Fixes #4320
Differential Revision: https://code.wildfiregames.com/D518
Reviewed By: Imarok
Tested By: Imarok on Windows, wraitii on OSX
Special thanks to Philip for advice and the lib/path.h fix in
47cc447322.

This was SVN commit r19824.
2017-06-25 14:54:00 +00:00
elexis 47cc447322 Fix OsPath string8 function on Unix to account for characters that aren't covered by ISO-8859-1,
thus allow proper printing of such paths.

Fixes #4647
Refs #4320 D518
Patch By: Philip
Tested By: Imarok on Windows, wraitii on OSX
This was SVN commit r19823.
2017-06-25 14:30:26 +00:00
Imarok e1b43137fe Fix incompatible value for WaterUgly warning on opening the options screen.
Reviewed by: vladislavbelov, Imarok. Patch by echotangoecho. Fixes:
#4230.
Differential Revision: https://code.wildfiregames.com/D89
This was SVN commit r19822.
2017-06-25 11:13:17 +00:00
mimo 3faf65c232 petra: fix a case when ptol or sele have their cc destroyed while they already had a colony, they would no more try to build a cc
Differential Revision: https://code.wildfiregames.com/D660
This was SVN commit r19820.
2017-06-22 22:13:13 +00:00
Imarok c67da6a93e Improve minimap colors
Patch by niektb and Grugnas. Reviewed by elexis. Fixes #763.

This was SVN commit r19819.
2017-06-22 21:18:09 +00:00
elexis 495d219d99 Don't always reset the Capture The Relic victory timer upon diplomacy change following 35377c51a7.
Only reset it if any of the original allies changes the diplomatic
relation to one of the other original allies.

Differential Revision: https://code.wildfiregames.com/D305
Fixes #4529
Patch By: Sandarac
This was SVN commit r19818.
2017-06-22 11:00:10 +00:00
elexis c4975452f0 Buff sentry tower damage.
Differential Revision: https://code.wildfiregames.com/D646
Patch By: Grugnas
Reviewed By: causative
This was SVN commit r19816.
2017-06-21 23:56:27 +00:00
mimo 26159c3f80 Tutorial still not translated. Hopefully done now!
Reviewed By: elexis
Differential Revision: https://code.wildfiregames.com/D669
This was SVN commit r19815.
2017-06-21 17:31:55 +00:00
Imarok abe5d9205a Remove useless file entry in replays list
Reviewed by: elexis
Differential Revision: https://code.wildfiregames.com/D668
This was SVN commit r19814.
2017-06-21 15:43:57 +00:00
elexis ea250b3d25 Don't crash if there is a replay subdirectory without commands.txt following 80635665f7 / D39.
Differential Revision: https://code.wildfiregames.com/D667
Reviewed By: Imarok
This was SVN commit r19813.
2017-06-21 14:44:26 +00:00
elexis 487078e07c Slightly buff pikeman walk speed (less than alpha 17 13b229d503, more than alpha 18 72ff88880c).
Differential Revision: https://code.wildfiregames.com/D633
Patch By: Grugnas
This was SVN commit r19811.
2017-06-20 18:53:38 +00:00
Itms 9ac13bf3d4 Download .po files for the Tutorials translation resource, and put them under version control.
Fix alphabetical order in the transifex client config.

Based on patch by elexis, fixes #4637.

This was SVN commit r19810.
2017-06-20 18:05:14 +00:00
mimo 8b8f6187ea Fix an oversight in structure min distances.
As civil centre and colony are civil centre, the current distance test
of colonies should be versus civil centre

Reviewed By: fatherbushido
Differential Revision: https://code.wildfiregames.com/D661
This was SVN commit r19809.
2017-06-20 17:17:42 +00:00
FeXoR eee5cbd845 Prevent height based forests to grow into player start locations.
Differential Revision: https://code.wildfiregames.com/D662
Reviewed By: elexis
This was SVN commit r19808.
2017-06-20 00:15:55 +00:00
elexis d597b5866a Move duplicate rmgen functions from caledonian meadows and wild lake to the rmgen libraries.
Differential Revision: https://code.wildfiregames.com/D659
Reviewed By: FeXoR
This was SVN commit r19807.
2017-06-19 21:43:27 +00:00
elexis 499b4a4b1d Remove unused player starting position angle from rmgen2 which is meaningless in every case but the radial placement.
This was SVN commit r19806.
2017-06-19 13:05:19 +00:00
elexis 47f7da6201 Fix caledonian meadows thumbnail scaling.
Differential Revision: https://code.wildfiregames.com/D658
Reviewed By: FeXoR
This was SVN commit r19805.
2017-06-19 12:06:56 +00:00
elexis fe4ffa3558 JS Date cleanup.
Use Date.now() to get the current timestamp instead of doing arithmetic
with Date objects and avoid needless object instantiation.

Differential Revision: https://code.wildfiregames.com/D554
Eyeballed By: causative
This was SVN commit r19802.
2017-06-18 19:11:24 +00:00
elexis 6141c5c4fa Correct lobby chat timestamps.
Only historic messages were timestamped in C++ prior.
Other messages showed the timestamp when they were displayed in JS,
which is wrong in case of returning to the lobby from a game.

Differential Revision: https://code.wildfiregames.com/D514
Fixes #3832.
Reverts the revert of 1f34a004e5 in 572847ddd4.
Patch By: Josh
Tested By: Itms
This was SVN commit r19801.
2017-06-18 18:48:18 +00:00
fatherbushido d5caf97185 Fix Valgrind complaints in CRenderer by properly intializing some members values introduced in ab30e0d4fb. Refs #3922, #4492. Patch by Sandarac. Reviewed by vladislavbelov.
Differential Revision: https://code.wildfiregames.com/D536
This was SVN commit r19800.
2017-06-18 14:52:54 +00:00
elexis cfd08bbf28 Cinema Path GUI hiding and silhouettes fixes.
Let the JS GUI take care of hiding the GUI and silhouettes and remove
the according hardcoding in the engine following 89aef0b6eb.
Thereby fix some bugs (like not having hid the GUI if there was a
message box or different page shown while playing a path) and
fix these two hotkeys broken by 5d49e6c456.

Differential Revision: https://code.wildfiregames.com/D631
Fixes #4633
Reviewed By: Vladislav
This was SVN commit r19797.
2017-06-17 14:17:30 +00:00
mimo 2cd7c62c0f 9d919f4369 was too fast
This was SVN commit r19796.
2017-06-17 10:36:55 +00:00
mimo 9d919f4369 cleanup of 0e887a686a following elexis comments
This was SVN commit r19795.
2017-06-17 10:34:15 +00:00
mimo 0e887a686a petra: revisit the serialization of functions, to fix 5403c19cf0
Differential Revision: https://code.wildfiregames.com/D617
This was SVN commit r19794.
2017-06-17 08:42:04 +00:00
mimo 00b60e2132 Petra: Fix behavior of guards when the guarded entity becomes garrisoned
Patch by Sandarac

Reviewed By: mimo
Differential Revision: https://code.wildfiregames.com/D640
This was SVN commit r19793.
2017-06-17 08:36:08 +00:00
fatherbushido 3004a7a134 Fix a Damage bug. Don't try to damage the main target when it doesn't have DamageReceiver, instead of doing an early return, continue and try to damage another hit target. For the mirage case, the actual entity will be hit. Reviewed by elexis.
Differential Revision: https://code.wildfiregames.com/D605
This was SVN commit r19791.
2017-06-16 20:06:03 +00:00
elexis e6dafe9efc Fix a map exploration OOS on rejoin when starting with territory at the map boundaries.
6aeb5c64de forgot to add a LosIsOffWorld check in ExploreTerritories
(aka UpdateTerritoriesLos) and thus marked tiles outside of the world as
explored.
f5e60157bf transformed the bug into a non-simulation desynchronization,
causing rejoined players to see a different score,
  as they excluded off-world tiles when filling the cache in
ResetDerivedData upon rejoin.
4a0673e44e transformed the bug into an actual simulation OOS by
serializing that map exploration percentage based on that cache.

Also tiles at the map border in square maps are not rendered as
expected, so this commit hides refs #4267.

Differential Revision: https://code.wildfiregames.com/D630
Fixes #4598
Proofread by: Itms
Tested By: Imarok
This was SVN commit r19790.
2017-06-16 19:39:30 +00:00
elexis d01f908ebf Apply previous commit to scenario maps.
Differential Revision: https://code.wildfiregames.com/D649
Patch By: Phormio
Refs D647

This was SVN commit r19789.
2017-06-16 18:50:56 +00:00
elexis 98532a1600 Fix starting units on random and skirmish maps.
Always spawn that cavalry that can be trained at the civic center, not
the other one from the barracks.
Spawn 2 melee and 2 ranged infantry units for Seleucids just as for any
other civ.

Differential Revision: https://code.wildfiregames.com/D647
Reviewed By: Grugnas, fatherbushido
Refs D649

This was SVN commit r19788.
2017-06-16 16:51:30 +00:00
Imarok 34f41dbe52 Style text alignment cleanup
Reviewed by: vladislavbelov
Differential Revision: https://code.wildfiregames.com/D174
This was SVN commit r19787.
2017-06-16 12:47:10 +00:00
elexis c237b1a1c5 Prevent unintentional selection of all units following 8f36ca47a1 / D326 when doubleclicking while not in selection input mode.
Differential Revision: https://code.wildfiregames.com/D634
Fixes #4631.
Refs #4414.
Patch By: causative
This was SVN commit r19786.
2017-06-16 11:06:06 +00:00
elexis be91dde045 Don't place muskox on mountains on arctic summer.
This was SVN commit r19783.
2017-06-16 00:34:09 +00:00
elexis ee6a3b0094 Hide rubble in the fog of war except to the owner, so that other players don't see deleted buildings, especially civic center foundations.
Should use a special filter once the AI supports it (#4611), so that
decorative rubble can be placed by maps too.

Differential Revision: https://code.wildfiregames.com/D635
Reviewed By: fatherbushido
Refs #3601 #3910 #3179

This was SVN commit r19782.
2017-06-16 00:13:49 +00:00
elexis bedb13ea28 Delete gui/common/functions_utility_error.js.
Move the one function in it that is globally called from the engine to
the other function that is called equally.

This was SVN commit r19781.
2017-06-15 22:44:24 +00:00
elexis ab67d1a6f3 Delete gui/common/init.xml.
It became almost unused throughout the years and just causes confusion
when reading include lists.

Refs D619.

This was SVN commit r19780.
2017-06-15 22:11:48 +00:00
elexis 18b876bd55 Delete common/l10n.js.
It held resource strings when introduced by 0f21151c4b, but those were
moved to json files in 52f311da2b. 9b041467a2 moved two trivial
functions of this file to tooltips.js.
Remove a wrong comma from the JSdoc comment.
Alwas return a string.

Differential Revision: https://code.wildfiregames.com/D618
Confirmed by Itms in a forum PM that this doesn't break string freeze.

This was SVN commit r19779.
2017-06-15 20:42:03 +00:00
mimo 4ca1379bd9 petra: additional tunings following d5dcb0c61e + fix a warning when army defense 0 is turned into an attack
Differential Revision: https://code.wildfiregames.com/D632
This was SVN commit r19778.
2017-06-15 19:50:17 +00:00
Itms 860b5bbfce Revert an unfortunate early break introduced in 2527aabd5d, patch by Sandarac.
Reviewed By: Itms
Differential Revision: https://code.wildfiregames.com/D641
This was SVN commit r19777.
2017-06-15 17:45:16 +00:00
mimo 0179915f21 remove an unused computation in petra
This was SVN commit r19775.
2017-06-14 17:40:58 +00:00
Imarok b94a54b18a Use direct gui.scale instead of reciprocal gui.scale
Patch by Dariost.

Differential Revision: https://code.wildfiregames.com/D328
This was SVN commit r19774.
2017-06-14 17:13:44 +00:00
Imarok 2729596624 Gamesetup - Hide mapfilter option if there are no maps matching the filter
Reviewed by: elexis. Fixes: #4423.
Differential Revision: https://code.wildfiregames.com/D365
This was SVN commit r19773.
2017-06-13 09:42:16 +00:00
elexis 9b041467a2 More comfortable and safe resource name translation without breaking translation freeze.
Throw a reference error instead of silently using an untranslated string
if someone would have passed a non-existing translation context.
Throw a property undefined warning if someone passed a non-existing
resource when trying to translate it.
Both warnings had been introduced in 0f21151c4b, were removed by
52f311da2b but now occur without adding code explicitly.

Differential Revision: https://code.wildfiregames.com/D625
Reviewed By: s0600204
This was SVN commit r19771.
2017-06-13 03:12:51 +00:00
elexis ca9b3799b4 Remove an unneeded complicated resource-not-found warning in the ResourceSupply component which is already covered by template validation.
It was a leftover from s0600204's proposal from 52f311da2b (refs #3934)
to disable resources with a boolean property.

Differential__Revision: https://code.wildfiregames.com/D625
Reviewed By: s0600204
This was SVN commit r19770.
2017-06-13 03:11:43 +00:00
elexis 74512ef01c Remove emptyinit.xml workaround file for atlas introduced in abaea508ac that silenced an engine warning stating that the GUI page doesn't provide a JS init function.
Still throw that error if the function exists but could not be called
with JS_CallFunction.

Differential Revision: https://code.wildfiregames.com/D620
This was SVN commit r19769.
2017-06-13 02:50:41 +00:00
elexis 28de0fc775 Fix undefined resource warnings in 33b331f9fa / D23 (that occur in filter functions but not if statements) reported by fabio.
Fixes #4629
Differential Revision: https://code.wildfiregames.com/D629
Reviewed By: s0600204
This was SVN commit r19768.
2017-06-12 15:15:43 +00:00
elexis f3a00b9e65 Train bireme at the briton crannog for consistency with the regular dock and allow researching the town phase at a captured one.
Differential Revision: https://code.wildfiregames.com/D627
Reviewed By: mimo
This was SVN commit r19766.
2017-06-11 16:46:08 +00:00
Imarok 707897e5af Correctly init the statistics sequences.
Fixes #4620. refs 4a0673e44e, 31a41ab735. Reviewed by: elexis.
Differential Revision: https://code.wildfiregames.com/D616
This was SVN commit r19765.
2017-06-11 16:06:07 +00:00
elexis 03550f7595 Fix whitespace and lineendings in few recent commits.
This was SVN commit r19763.
2017-06-11 00:51:11 +00:00
elexis 33b331f9fa Correct resource order in the GUI.
Differential Revision: https://code.wildfiregames.com/D23
Reviewed By: s0600204
This was SVN commit r19762.
2017-06-11 00:17:59 +00:00
mimo e8008aa4fa fix error in 57fbcab3bf spotted by Sandarac, fixes #4627
This was SVN commit r19761.
2017-06-10 08:16:16 +00:00
elexis 561f66600c Actually display the gamesetup autocomplete tooltip string from D322 / b4e5858f6d.
Reported by echotangoecho.

This was SVN commit r19760.
2017-06-10 01:21:50 +00:00
elexis f882bfd56a Remove lobby MapPlayerList style from bffe917914 which overshadows the duplicate theme from common/ (only difference was scroll_bottom which isn't helpful).
This was SVN commit r19759.
2017-06-09 22:04:30 +00:00
elexis 17e26fae99 Remove unused deprecated label styles following 0cd825e552 (that if ever used again, should be added to a directory for that specific theme).
This was SVN commit r19758.
2017-06-09 21:55:33 +00:00
Imarok 6de6ae66d3 Fix selected graphs in summary always reset, when switching tabs
Patch by: mmoanis, Fixes: #4555
Differential Revision: https://code.wildfiregames.com/D599
This was SVN commit r19757.
2017-06-09 17:08:49 +00:00
mimo 57fbcab3bf petra: fix a side effect of d5dcb0c61e
Differential Revision: https://code.wildfiregames.com/D607
This was SVN commit r19756.
2017-06-09 17:07:50 +00:00
mimo 395fe8a86d Petra: do not create trade route crossing enemy territory
Differential Revision: https://code.wildfiregames.com/D600
This was SVN commit r19755.
2017-06-09 17:04:50 +00:00
elexis 81088344cb Purge embarassing typo in 026dcf10eb / D204 that made gaia ships on Danubius ignore instead of focus players ships.
This was SVN commit r19752.
2017-06-09 00:06:45 +00:00
Imarok b2801979c8 Fix typo in a397f9bccb.
This was SVN commit r19751.
2017-06-08 21:12:55 +00:00
elexis 1af6203b9c Stop spawning gaia attackers from civic centers if these were captured (not only upon destruction).
Differential Revision: https://code.wildfiregames.com/D608
Refs D380 /d724347812
Reviewed By: fatherbushido
This was SVN commit r19750.
2017-06-08 15:10:30 +00:00
elexis bb3638a9b5 Always set the Seed property from autostarted games, because it is required and used to initialize the RNG of the simulation following 6eaf76d653.
Differential Revision: https://code.wildfiregames.com/D592
Refs #4127, #3965

This was SVN commit r19749.
2017-06-08 14:47:55 +00:00
elexis 1e1ba6e284 Alternative player placement on River Archipelago: left strip vs right strip.
Differential Revision: https://code.wildfiregames.com/D610
Reviewed By: FeXoR
This was SVN commit r19748.
2017-06-08 12:16:59 +00:00
elexis 5d4cff9ec4 Remove fake minimum attack distances.
These structures can always attack near enemies because the minimum
attack range is within the building obstruction.
Thus prevent the minimum attack distance tooltip from D267 to show
misleading numbers, refs D111.
Remove the effective minimum attack distance of the hero cavalry archer
too for consistency with all other units following 5f78bb7318.

Differential Revision: https://code.wildfiregames.com/D611
Reviewed By: fatherbushido
This was SVN commit r19747.
2017-06-08 11:39:45 +00:00
fatherbushido 6d9e9bc54c Fix a broken texture call in an atlas only actor. Follow up of 5f67763e97. Refs #3796.
This was SVN commit r19746.
2017-06-08 07:42:20 +00:00
mimo 9b7dfdaa23 remove some unused AI var and rename a function to better reflects its use
This was SVN commit r19745.
2017-06-07 18:26:15 +00:00
elexis 15408203b2 Reload gamesetup maplist each GUI update (as was the case before D322 / b4e5858f6d), fixes a bug reported by causative (the clients always showed Map: Unknown).
This was SVN commit r19742.
2017-06-05 20:57:43 +00:00
elexis b19612c31a Fix whitespace and three refs instead of copies in the glooxwrapper/StunClient code identified by leper in 61261d14fc.
This was SVN commit r19741.
2017-06-05 20:44:00 +00:00
mimo 766f3ee8f5 petra: fix 72f6e02747 when a unit is promoted the same turn the attack is launched
Differential Revision: https://code.wildfiregames.com/D601
This was SVN commit r19740.
2017-06-05 14:13:31 +00:00
mimo 3a75da6008 petra: following d5db047c9a, avoid to choose a decaying structure as target
Differential Revision: https://code.wildfiregames.com/D586
This was SVN commit r19739.
2017-06-05 13:50:20 +00:00
Imarok 57b6e6a2bd Change toggle buddy button caption dynamically
Reviewed by: elexis
Differential Revision: https://code.wildfiregames.com/D578
This was SVN commit r19736.
2017-06-04 22:25:54 +00:00
Itms b6beb07255 Improve the strings from 6b743e30b3.
Reviewed by: scythetwirler, elexis
Differential Revision: https://code.wildfiregames.com/D603
This was SVN commit r19735.
2017-06-04 21:47:36 +00:00
Itms e59a304358 Reveal the Alpha 22 name!
This was SVN commit r19734.
2017-06-04 21:30:40 +00:00
Itms 4d31ff14eb Spelling corrections for Gauls.
Rename Britomartus to Viridomarus.
Patch by Phormio.

Differential Revision: https://code.wildfiregames.com/D493
This was SVN commit r19733.
2017-06-04 20:59:55 +00:00
Itms 2527aabd5d Fix hero selection rings becoming unsaturated when moving. Patch by Sandarac, refs 0a53c5e06a, #2627.
Differential Revision: https://code.wildfiregames.com/D563
This was SVN commit r19732.
2017-06-04 13:04:04 +00:00
mimo a63d7cc430 fix tutorial not translated
Reviewed By: Itms
Differential Revision: https://code.wildfiregames.com/D602
This was SVN commit r19730.
2017-06-04 12:23:48 +00:00
mimo ba10046350 revert some unwanted changes in previous commit
This was SVN commit r19728.
2017-06-03 19:01:38 +00:00
mimo e9e7922b5d Don't send useless "Invalid command" debug warnings when regaining capture points
Patch by Sandarac

Reviewed By: mimo
Differential Revision: https://code.wildfiregames.com/D430
This was SVN commit r19727.
2017-06-03 18:59:21 +00:00
Itms db0570e71e String changes, based on feedback from translators.
Reviewed By: Phormio
Differential Revision: https://code.wildfiregames.com/D561
This was SVN commit r19726.
2017-06-03 16:30:18 +00:00
fatherbushido 67d0a6a2ad Cleanup of 8387195fd2: use relative templates and change prepare times. Noticed by elexis.
This was SVN commit r19725.
2017-06-03 16:14:26 +00:00
elexis 0a1d669a0b Reduce rabbit health from 100HP to 10HP to make them more realistically huntable and have them consistent with chicken (5HP).
Increase footprint slightly for both artistic and gameplay reasons.

Differential Revision: https://code.wildfiregames.com/D562
Patch By: borg-
Refs #3786, D540

This was SVN commit r19723.
2017-06-03 01:11:52 +00:00
elexis ac6ca9d50a Prevent animals and resources on lava on Pompeii.
Refs: https://code.wildfiregames.com/D588
Patch By: Phormio
This was SVN commit r19722.
2017-06-03 00:49:36 +00:00
elexis dd9a8706f9 Complete the move of random number helper functions from the random map library (0e0ed94926, refs #6) to globalscripts.
Differential Revision: https://code.wildfiregames.com/D596
Patch By: bb
3c56638e8b introduced pickRandom and its petra chat application,
08fbf223f6 used the randFloat function more often, introduced randBool
and randIntInclusive/Exclusive
        to replace randInt (whose behavior and argument meaning depended
on the number of arguments) calls in the GUI and simulation,
ddfc985586 changed randInt to pickRandom for random maps,
da2b89583a introduced randBool with a probability and replaced
deprecated randInt calls for random maps,
175cded64a replaced randInt calls with randIntInclusive/Exclusive for
random maps except the Unknown,
a227a7f45b removed optional arguments of randFloat,
this commit replaces the remaining occurances in the Unknown maps,
thus fixes #4326 (old patch from refs #3102).

This was SVN commit r19721.
2017-06-03 00:28:34 +00:00
elexis 467824e727 Fix JSdoc, a missing explicit return, a missing warning, a typo and a jshint redeclaration warning of one rmgen2 function.
Fixes #4608
Differential Revision: https://code.wildfiregames.com/D593
Reviewed By: mimo
This was SVN commit r19720.
2017-06-02 22:25:33 +00:00
elexis 01710cd0be Rename the late observer setting "no one" to "disabled".
Revert the unintentional revert of 9b28ce3463 in 31d1536e52.

Differential Revision: https://code.wildfiregames.com/D583
Reviewed By: causative
This was SVN commit r19719.
2017-06-02 22:11:05 +00:00
elexis 51f62818f7 Fix all broken checks for the absent (random-mapgen+simulation) Seed property in the engine, refs #3965.
Hence display the originally intended useful warnings (instead of the
characterless JS "Script value conversion check failed" warning and
skipping the intended warnings).

This was SVN commit r19718.
2017-06-02 15:07:58 +00:00
mimo a219f59108 fix 72f6e02747 with two missing lines
This was SVN commit r19715.
2017-06-01 19:34:42 +00:00
mimo 6dfa20c745 petra: fix an garrison/ungarrison loop due to d1108516af
Reviewed By: Sandarac
Differential Revision: https://code.wildfiregames.com/D579
This was SVN commit r19714.
2017-06-01 19:31:35 +00:00
s0600204 f38c0c3876 Fix df89091c48 not handling upgradeable units correctly.
Tested By: wowgetoffyourcellphone
Refs: #4079
Differential Revision: https://code.wildfiregames.com/D517
This was SVN commit r19711.
2017-06-01 18:28:49 +00:00
mimo 862f2e08b1 petra: remove an unused var
This was SVN commit r19710.
2017-06-01 18:04:40 +00:00
mimo dde0d9e3b1 Fix formation problems reported in #4599: fix units not removed from formation when switching to the null formation and fix the display of formation icon when only one entity selected
Reviewed By: fatherbushido
Differential Revision: https://code.wildfiregames.com/D582
This was SVN commit r19709.
2017-06-01 18:03:24 +00:00
Imarok e6d782c2e9 Plus symbol for heal range overlay
Reviewed by: Sandarac
Differential Revision: https://code.wildfiregames.com/D571
This was SVN commit r19708.
2017-06-01 17:53:41 +00:00
elexis d724347812 Spawn attackers at the gaia civic centers on Danubius, so as to make the more frightening and incentivize its destruction.
Differential Revision: https://code.wildfiregames.com/D380
Reviewed By: Sandarac
This was SVN commit r19707.
2017-06-01 17:33:07 +00:00
elexis f4ba646972 Technology to rank up mercenaries, making them a more reasonable choice.
Differential Revision: https://code.wildfiregames.com/D407
Patch By: Grugnas
Reviewed By: fatherbushido
Numbers confirmed by borg-

This was SVN commit r19706.
2017-06-01 15:55:42 +00:00
elexis 23b02c31ed Danubius bugfixes, refs D380, D371, D204.
Fix broken targetClass parsing as reported by bb on 2017-04-19.

More space between islands and the shoreline as proposed by causative.

Fix typo reported by Sandarac.

Revert the terrible decision to set attackers to violent,
which caused siege engines to change the target from the civic center to
the units that attacked it and
ships to become stuck at the shoreline more often trying to fight back
against unreachable towers.

This was SVN commit r19705.
2017-06-01 13:29:08 +00:00
FeXoR ca654e3f79 Add random map Wild Lake. Patch by FeXoR. Reviewed by elexis and Imarok.
Differential Revision: https://code.wildfiregames.com/D548
This was SVN commit r19704.
2017-06-01 08:46:00 +00:00
elexis 61261d14fc STUN + XMPP ICE implementation.
Allows lobby players to host games without having to configure their
router.

Differential Revision: https://code.wildfiregames.com/D364
Fixes #2305
Patch By: fcxSanya.
StunClient based on code by SuperTuxKart, relicensed with approval of
the according authors hilnius, hiker, Auria, deveee, Flakebi, leper,
konstin and KroArtem.
Added rfc5245 (ejabberd) support, a GUI option, refactoring and segfault
fixes by myself.

Tested By: user1, Sandarac, Sestroretsk1714, Vladislav, Grugnas,
javiergodas
Partially Reviewed By: leper, Philip, echotangoecho
This was SVN commit r19703.
2017-06-01 06:33:52 +00:00
mimo cc2440c00b Petra: diplomacyManager cleanup
Patch by Sandarac

Reviewed By: mimo
Differential Revision: https://code.wildfiregames.com/D581
This was SVN commit r19701.
2017-05-31 19:08:39 +00:00
elexis f011b7d18e Fix a typo in b052831529 that caused sprintf errors as reported by Sandarac.
This was SVN commit r19700.
2017-05-31 18:01:31 +00:00
elexis 77c4e649af Replace hardcoded copies of a C++ simulation constant in JS used to compute the mapsize with a call to a new getter in the C++ interface.
Differential Revision: https://code.wildfiregames.com/D577
Patch By: Sandarac
This was SVN commit r19699.
2017-05-31 16:43:57 +00:00
mimo 72f6e02747 petra: fight back when a cc is captured instead of retreating
Reviewed By: Sandarac
Differential Revision: https://code.wildfiregames.com/D575
This was SVN commit r19698.
2017-05-31 16:27:31 +00:00
fatherbushido 2e5138bad9 Reduce slightly armor of gaul fanatic unit and make the run speed more consistent. The purpose is to balance it a bit more but also keep and emphasize the specificity of that unit. Reviewed by elexis.
Differential Revision: https://code.wildfiregames.com/D569
This was SVN commit r19697.
2017-05-30 21:45:54 +00:00
mimo 80b5c2dae1 fix a ai error following d5dcb0c61e, fixes #4602
This was SVN commit r19696.
2017-05-30 19:45:09 +00:00
fatherbushido 5a30156bb3 Use multiplication instead of addition in the steel working technology. Patch by temple.
Differential Revision: https://code.wildfiregames.com/D552
This was SVN commit r19695.
2017-05-30 17:13:59 +00:00
fatherbushido d5db047c9a Allow walls and fields to be captured by territory but not by capture attack, by using restricted classes. Reviewed by mimo and Imarok.
Differential Revision: https://code.wildfiregames.com/D450
This was SVN commit r19694.
2017-05-29 20:27:09 +00:00
fatherbushido 5de66b24b1 Tweak many auras. Do some cleaning, increase or decrease some effects to induce more choices. Add an aura to Alexander. Change the effect of the effect of Marcellus and add an aura to Scipio based on a design doc. Fix some strings. Commented by elexis. Largelly discussed and reviewed by Grugnas and borg-.
Differential Revision: https://code.wildfiregames.com/D541
This was SVN commit r19693.
2017-05-29 20:18:08 +00:00
mimo b43f6e519a petra cleanup following 0f6cc9ee62: code cleanup + distant berries gatherer are reallowed in maps with disabled field and corrals.
Reviewed By: Sandarac
Differential Revision: https://code.wildfiregames.com/D566
This was SVN commit r19692.
2017-05-29 18:22:24 +00:00
fatherbushido 8387195fd2 Rework heros costs. Make their costs more consistent with champions costs and so make them more expensive. Use relative templates for costs and armor. Adjust attack repeat time with last champions changes. Patch by Grugnas.
Differential Revision: https://code.wildfiregames.com/D225
This was SVN commit r19691.
2017-05-29 17:22:40 +00:00
elexis a7c09a500d That what leper said. Refs 9ff7ec3465, 31d1536e52.
This was SVN commit r19688.
2017-05-29 02:56:34 +00:00
elexis 7b92b518f3 Rephrase a hero tooltip and update the roman army camp description following D405 as reported by Hannibal Barca.
Differential Revision: https://code.wildfiregames.com/D564
Reviewed By: fatherbushido
This was SVN commit r19687.
2017-05-29 02:25:01 +00:00
s0600204 10f8d019e5 Add a test for the Upgrade Component, focusing on tech modifications.
Also tests the appropriate function in `globalscripts/Templates.js`.

Reviewed By: fatherbushido
Differential Revision: https://code.wildfiregames.com/D519
This was SVN commit r19686.
2017-05-28 21:09:16 +00:00
elexis 31d1536e52 Optionally allow late observers for buddies only.
Differential Revision: https://code.wildfiregames.com/D549
Fixes #4528
Reviewed By: fpre
This was SVN commit r19685.
2017-05-28 18:05:08 +00:00
elexis d44a407fc4 That what mimo said.
This was SVN commit r19684.
2017-05-28 17:45:17 +00:00
mimo feedca18cd fix an absurd concern due to a crazy rule which push people to raise a concern for such thing, causing much more effort to raise and then accept the fix rather than simply fix it
This was SVN commit r19683.
2017-05-28 17:34:18 +00:00
elexis 87305cc727 Give the mauryan hero healer Chanakya a heal aura just like the briton hero Cunobelin has,
because that aura is an order of magnitude more useful, making that hero
a viable choice.
Nerf Cunobelin aura by 20%, since 100 units can fit easily into the aura
range and heal while fighting and moving too.

Differential Revision: https://code.wildfiregames.com/D565
Reviewed By: fatherbushido
Numbers contested by borg-, PhyZic (proposed 0.5) and Grugnas and
nigel87 (proposed 1.0)

This was SVN commit r19682.
2017-05-28 14:58:57 +00:00
mimo 0f6cc9ee62 petra: do not gather berries too far
Reviewed By: Sandarac
Differential Revision: https://code.wildfiregames.com/D560
This was SVN commit r19681.
2017-05-28 09:02:00 +00:00
elexis 097d76f319 Heal range visualization.
Differential Revision: https://code.wildfiregames.com/D432
Patch By: Sandarac
This was SVN commit r19679.
2017-05-28 05:07:10 +00:00
elexis f99adf65a2 Disable the diplomacy buttons of the current diplomatic stance to prevent useless diplo changes in the GUI.
Differential Revision: https://code.wildfiregames.com/D461
Patch By: Sandarac
This was SVN commit r19678.
2017-05-28 02:45:21 +00:00
elexis 247e4c6451 Add fish to the map Gear.
Fixes #4240
Patch By: odoaker
This was SVN commit r19677.
2017-05-28 02:32:29 +00:00
elexis 8b7438af5d Fix impassable berries on Ardennes Forest.
Fixes #4295
Patch By: odoaker
This was SVN commit r19676.
2017-05-28 01:20:37 +00:00
Imarok ed38491622 Allow to show capture, resource and health bar at the same time. (needed for D450)
Reviewed by: elexis
Differential Revision: https://code.wildfiregames.com/D516
This was SVN commit r19675.
2017-05-27 20:38:05 +00:00
Imarok 80635665f7 Fix replay menu loading time by using a cache file
Reviewed by: elexis
Fixes #3433
Differential Revision: https://code.wildfiregames.com/D39
This was SVN commit r19674.
2017-05-27 20:17:57 +00:00
Imarok d096c2f09c Update teamboni in civ.jsons
Reviewed by: fatherbushido
refs #4082
Differential Revision: https://code.wildfiregames.com/D460
This was SVN commit r19673.
2017-05-27 20:14:29 +00:00
elexis e63dc65594 Add raindrops to Extinct Volcano.
Differential Revision: https://code.wildfiregames.com/D539
Reviewed By: FeXoR
This was SVN commit r19672.
2017-05-27 20:00:23 +00:00
mimo 743609289a Adjust size of tutorial window by increasing its width and decrease height, to make it a bit less intrusive.
Reviewed By: elexis
Differential Revision: https://code.wildfiregames.com/D559
This was SVN commit r19671.
2017-05-27 14:09:29 +00:00
Itms 3d53614bce Add a script to lint the translations with Dennis.
Two of our printf calls are not compatible with python-format and will
be ignored until Dennis supports the corresponding formats. Also removed
meaningless enclosing characters that were wrongly considered HTML.

Reviewed By: leper
Differential Revision: https://code.wildfiregames.com/D214
This was SVN commit r19669.
2017-05-27 12:26:26 +00:00
FeXoR 4a78efe0e3 Fixes an error while placing Cartaginian walls ingame.
Differential Revision: https://code.wildfiregames.com/D343
Patch By: Grugnas
This was SVN commit r19668.
2017-05-27 10:59:29 +00:00
elexis 9ff7ec3465 Scale the cursor according to the GUI scale (HiDPI support).
Differential Revision: https://code.wildfiregames.com/D320
Fixes #3875
Patch By: Dariost
Reviewed By: domdomegg
This was SVN commit r19667.
2017-05-27 09:24:04 +00:00
elexis a3913080cc Option to prevent joining clients from becoming automatically assigned to unused playerslots.
Thus the controller doesn't have to unassign every unwanted client
immediately in order to minimize frustration for those clients.
Option to automatically assign joining buddies to playerslots as a
better approximation for frequent players.

Differential Revision: https://code.wildfiregames.com/D546
Reviewed By: fpre
This was SVN commit r19666.
2017-05-27 08:09:10 +00:00
elexis b366ae0829 Swap the colors too when swapping players in the gamesetup.
Differential Revision: https://code.wildfiregames.com/D287
Patch By: fpre
This was SVN commit r19665.
2017-05-27 07:31:15 +00:00
fatherbushido 3a0e1bc52a Use multiplication instead of addition in some Persian technology. Patch by temple. Reviewed by scythetwirler.
Differential Revision: https://code.wildfiregames.com/D551
This was SVN commit r19664.
2017-05-26 20:46:05 +00:00
elexis 53c596ea41 Display chat correctly and allow opening the diplomacy manager, trade page and menu while waiting for other clients to finish the loading screen and after becoming disconnecting.
Remove unused useless related styles.

Differential Revision: https://code.wildfiregames.com/D556
Reviewed By: fatherbushido
This was SVN commit r19663.
2017-05-26 15:20:11 +00:00
elexis db0cf8d467 Arctic Summer random map script.
Differential Revision: https://code.wildfiregames.com/D465
Refs #4354
Patch By: Hannibal_Barca
This was SVN commit r19662.
2017-05-26 15:09:17 +00:00
fatherbushido 0fd12dbfe1 Update variants rnc and rng files. Reviewed by elexis.
Differential Revision: ​https://code.wildfiregames.com/D530
This was SVN commit r19661.
2017-05-26 13:20:39 +00:00
fatherbushido a789b5555d Update the xml validator tool to handle mods. Reviewed by leper.
Differential Revision: https://code.wildfiregames.com/D425
This was SVN commit r19660.
2017-05-26 12:43:58 +00:00
elexis d2c481912d Actually toggle the status bars when pressing the tab hotkey (instead of showing them for duration the key is pressed), so that less user input is required to use the feature.
Recalculate the entities on screen less often than each keyboard or GUI
tick event.

Differential Revision: https://code.wildfiregames.com/D537
Patch By: causative
This was SVN commit r19658.
2017-05-26 01:47:48 +00:00
elexis 19a635a5bc Show the number of seconds remaining instead of the percental progress in the tooltip of researched technologies and queued units.
Differential Revision: https://code.wildfiregames.com/D542
Patch By: temple
This was SVN commit r19657.
2017-05-26 01:04:55 +00:00
Imarok e40ee632a0 Intendation fix singleDetailsSelection
Reviewed by: elexis
Differential Revision: https://code.wildfiregames.com/D553
This was SVN commit r19656.
2017-05-25 22:24:38 +00:00
mimo d5dcb0c61e Petra: fix a case where the AI loose control of its units (they become only driven by UnitAI)
Reviewed By: Sandarac
Differential Revision: https://code.wildfiregames.com/D545
This was SVN commit r19655.
2017-05-25 20:26:22 +00:00
mimo a2d87af95d Petra: Send diplomacy requests to other players on occasion
On occasion Petra will request to become allies or neutral with other
players (regardless if they are an AI or not).

Patch by Sandarac

Reviewed By: mimo
Differential Revision: https://code.wildfiregames.com/D544
This was SVN commit r19654.
2017-05-25 19:22:50 +00:00
elexis 6b743e30b3 Fix typo that prevented the Disable Treasures label of the objectives dialog from showing the correct value.
Remove the double negation "Disable Treasure: Disabled".

Differential Revision: https://code.wildfiregames.com/D523
String accepted by: Sandarac
This was SVN commit r19652.
2017-05-24 16:53:36 +00:00
elexis 6606e89b99 Allow opening of the developer overlay in replay mode following 6e549bfed2.
This was SVN commit r19651.
2017-05-24 14:14:38 +00:00
elexis 8680f79d48 Display the filename of the selected replay in the replay menu to ease sharing of replays.
Differential Revision: https://code.wildfiregames.com/D495
Reviewed By: Sandarac
This was SVN commit r19650.
2017-05-24 13:53:00 +00:00
elexis b20c33221f Display the selection details tooltip immediately.
Differential Revision: https://code.wildfiregames.com/D547
Proposed and reviewed by: temple
This was SVN commit r19649.
2017-05-24 13:34:56 +00:00
elexis e32697e6a0 River Archipelago random map script.
Differential Revision: https://code.wildfiregames.com/D467
Refs #4354
Patch By: Hannibal_Barca
Description by: Phormio
This was SVN commit r19647.
2017-05-23 23:06:24 +00:00
elexis a2f167aec1 Fix tow spleling mistakes.
Differential Revision: https://code.wildfiregames.com/D498
Patch By: Phormio
This was SVN commit r19646.
2017-05-23 22:14:16 +00:00
leper a533fff883 Add a -autostart-nonvisual option. Patch by sacha_vrand. Fixes #4577.
This allows automated testing of AIs without any GUI or sound (similar
to non-visual replays).

Differential Revision: https://code.wildfiregames.com/D379
This was SVN commit r19645.
2017-05-23 19:26:33 +00:00
mimo 1bcad4698d Petra: Improve relic capturing
Patch by Sandarac

Summary: As suggested in D333, Petra should prioritize capturing gaia
relics that are within its territory.

Reviewed By: mimo
Differential Revision: https://code.wildfiregames.com/D532
This was SVN commit r19644.
2017-05-23 17:22:29 +00:00
elexis b763bae0f4 Fix a typo in the Punjab (2) skirmish map in fe6d508a82.
Differential Revision: https://code.wildfiregames.com/D538
Patch By: phormio
This was SVN commit r19643.
2017-05-23 13:04:04 +00:00
elexis 7b0f6f530c Don't translate the yet unused victory condition field sent to the lobby bot (the case since the introduction of the lobby in bffe917914).
This was SVN commit r19642.
2017-05-23 12:51:16 +00:00
elexis 6c7b0fde3d Vastly reduce the number of gamelist lobby updates sent by the 0 A.D. client (by waiting 2 seconds for the gamesettings to not change before sending an update).
An empty lobby with single client scrolling with the mousewheel through
the skirmish maps for few seconds was sufficient to delay the server
updates globally for more than 15 seconds.

Based on patch by: sbirmi
Fixes #3847

This was SVN commit r19641.
2017-05-22 15:22:27 +00:00
fatherbushido 016fa1c679 Fix xml sound files which doesn't validate. Reviewed by phormio.
Differential Revision: https://code.wildfiregames.com/D535
This was SVN commit r19640.
2017-05-22 11:07:14 +00:00
fatherbushido f83897d4b2 Fix an issue with technology modifications. Modifications for the player entity were handle by auras but not by technologies. Reviewed by mimo.
Differential Revision: https://code.wildfiregames.com/D504
This was SVN commit r19637.
2017-05-22 05:21:40 +00:00
fatherbushido 9387bcc92d Add a test for the ValueModification helper. Catch a bug when the tech affects the player entity.
This was SVN commit r19636.
2017-05-22 05:19:26 +00:00
elexis bac0652ea0 Extinct Volcano random map script with rising water.
Minimap updated by Sandarac in D344.

Differential Revision: https://code.wildfiregames.com/D229
Refs #4354
Map generation based on patch by: Hannibal_Barca
Calling it Reviewed By: bb
This was SVN commit r19635.
2017-05-22 03:47:08 +00:00
elexis bd347cad0f Fix a warning when clicking on offline players in the leaderboard following D339 / 76bc9b579a.
Fix some whitespace and missing semicolons.

This was SVN commit r19634.
2017-05-22 02:42:15 +00:00
elexis 324cb72ec1 Delete variously broken lobby spamfilter, which did not filter spammers but filtered non-spammers, conceptually can't filter in a way that all clients see the same chat messages and should instead be implemented on a serverside or moderation level.
Differential Revision: https://code.wildfiregames.com/D512
Refs #3832
Accepted By: scythetwirler
This was SVN commit r19633.
2017-05-22 02:38:26 +00:00
elexis 20a090e14b Place the previously unused arctic fox model on polar sea following D524.
Replace dead tree actors with actual trees.
Replace shark actor with actual sharks on Necropolis (should have been
done in D511).
Remove actor fish that would still be misleading on Tuscan Acropolis (4)
(the river is too small for ships).

Differential Revision: https://code.wildfiregames.com/D525
Patch By: phormio
This was SVN commit r19632.
2017-05-22 01:47:45 +00:00
elexis 3957ebf51f Option to disable garrisoning of heroes in regicide gamemode.
Accomplish this by adding a Garrisonable component that can be removed
from individual units or templates.

Differential Revision: https://code.wildfiregames.com/D104
Refs #2160
Patch By: Sandarac
This was SVN commit r19631.
2017-05-22 01:18:51 +00:00
mimo c8c68387be Petra: Account for relics and wonder in last man standing mode
Patch by: Sandarac
Reviewed By: mimo
Differential Revision: https://code.wildfiregames.com/D528
This was SVN commit r19630.
2017-05-21 18:34:40 +00:00
mimo b1559dfb4a Rename the Introductory Tutorial map to Introductory_Tutorial to overcome phabricator problems
This was SVN commit r19629.
2017-05-21 18:14:01 +00:00
mimo 61b243fdc6 fixes to the economic tutorial (D194) following 15e2b42525
Reviewed By: Itms
Differential Revision: https://code.wildfiregames.com/D520
This was SVN commit r19628.
2017-05-21 16:41:39 +00:00
fatherbushido aa4c542926 Fix an oversight noticed by leper in 1558272fd2.
This was SVN commit r19627.
2017-05-21 14:57:41 +00:00
Itms f0a008c821 Refactor NONCOPYABLE to remove unneeded semicolons. Remove visibility keywords that were hidden in the macro. Patch by echotangoecho.
Reviewed By: Itms
Differential Revision: https://code.wildfiregames.com/D481
This was SVN commit r19626.
2017-05-21 13:11:07 +00:00
wraitii cde8d503df Fix the building construction rate for multiple units.
Because of a floor operation, tasking another unit to a building could
actually slow the construction down.

Patch by temple.

Differential Revision: https://code.wildfiregames.com/D521
This was SVN commit r19625.
2017-05-21 08:11:34 +00:00
wraitii 3d7784d2af Try to recognise unknown hotkey mappings using SDL2.
This improves our international keyboard until we completely rework the
hotkey system which seems to be quite legacy at this point.

Reviewed by Itms.
Differential Revision: https://code.wildfiregames.com/D303
This was SVN commit r19624.
2017-05-21 08:05:52 +00:00
fatherbushido 5deaa5df53 Fix an oversight in dc17836fe5.
This was SVN commit r19623.
2017-05-21 06:00:13 +00:00
fatherbushido 1558272fd2 Fix some formal issues noticed by elexis in dc17836fe5.
This was SVN commit r19622.
2017-05-21 05:48:05 +00:00
elexis 2d8d082289 Fox templates and portraits for the existing models.
Differential Revision: https://code.wildfiregames.com/D524
Fixes #4580
Patch By: Phormio
This was SVN commit r19621.
2017-05-21 00:49:03 +00:00
elexis 85cfd7effb Remove all spaces from music tracks.
Differential Revision: https://code.wildfiregames.com/D508
Patch By: Phormio
Reviewed By: Vladislav
This was SVN commit r19620.
2017-05-20 22:58:22 +00:00
elexis 7c716918ff Replace the "full games" filter with an "open games" filter and exclude running games from the results (since the use-case is to help players finding a game they can join as a player).
Revert cbc49f43e6 because the reasons for hiding non-open games don't
apply or don't apply anymore:
* The filter doesn't actually prevent unwanted clients to join the
server.
* The host can kick or ban unwanted clients now.
* Many users are interested in joining games as observer (either for the
sake of observing or to meet up with buddies).
 So for many players the first action after entering the lobby was to
uncheck this checkbox.

Differential Revision: https://code.wildfiregames.com/D218
Reviewed By: mapkoc
This was SVN commit r19619.
2017-05-20 22:44:08 +00:00
elexis d6c028923e Increase size of the civ selection dropdowns so that the scrollbar disappears.
Increase vertical size of the player selection dropdown in the observer
menu.

Differential Revision: https://code.wildfiregames.com/D527
Proposed and reviewed by: temple
This was SVN commit r19618.
2017-05-20 22:19:04 +00:00
fatherbushido f264552359 Add Macedonian team bonus. Refs #4082. Reviewed by mimo.
Differential Revision: ​https://code.wildfiregames.com/D480
This was SVN commit r19616.
2017-05-20 18:31:19 +00:00
fatherbushido dc17836fe5 Add barter multiplier for barter prices. They can be altered by technologies or auras. Reviewed by mimo.
Differential Revision: https://code.wildfiregames.com/D478
This was SVN commit r19615.
2017-05-20 18:01:49 +00:00
mimo d8490b8c2e Petra: gameTypeManager cleanup
Summary:
In regicide, data.garrisonEmergency was not reset when retreating a hero
to a base when the hero couldn't find a place to garrison.
Transfer the stance info to the AI

Reviewed By: mimo
Differential Revision: https://code.wildfiregames.com/D515
This was SVN commit r19614.
2017-05-19 20:28:21 +00:00
leper aa025b514b Fix out of bounds access in Hotkey.cpp. Patch by echotangoecho.
Differential Revision: https://code.wildfiregames.com/D211
This was SVN commit r19613.
2017-05-19 18:01:22 +00:00
leper 7c88529b45 Call std::terminate() instead of throwing in a destructor.
We don't catch this specific exception, so no behavioural change, but we
do no longer violate the implicit noexcept for destructors in C++11.
(Fixes a GCC6 and VS2015 warning.)

Reviewed By: Itms
Differential Revision: https://code.wildfiregames.com/D416
This was SVN commit r19612.
2017-05-19 17:48:43 +00:00
elexis 3bebd1a21f Replace shark actors with actual sharks on the skirmish map Thessalian Plains (4).
Differential Revision: https://code.wildfiregames.com/D511
Patch By: Phormio
This was SVN commit r19611.
2017-05-19 08:23:37 +00:00
elexis 8cfd494b88 Add selection-dependent gamesetup tooltips for the chosen map, map filter, map size, civilization and population capacity.
The tooltips of the larger mapsizes and higher population capacities
(depending on the number of players) warn the controller of potential
performance issues.

Differential Revision: https://code.wildfiregames.com/D505
Reviewed By: Hannibal_Barca
This was SVN commit r19609.
2017-05-18 20:49:29 +00:00
mimo 1e5757a0ac Petra: cleanup of the 7dd3cf7543 cleanup (to avoid mixing attackManager and gametypeManager stuff)
This was SVN commit r19607.
2017-05-18 17:29:27 +00:00
elexis 4c693589d3 Rating column in the gamelist allowing players to sort by and filter games with players of approximately equal (to have a challenging opponent) or better skill (to learn or become entertained from when observing).
Differential Revision: https://code.wildfiregames.com/D125
Based on patch by: fpre
This was SVN commit r19606.
2017-05-18 11:50:33 +00:00
s0600204 9da0db50ee Revert change to datatype of resource costs in Cost.js made in 52f311da2b
Refs: #3934
Change agreed by: fatherbushido, wraitii
This was SVN commit r19604.
2017-05-18 01:30:01 +00:00
elexis 7a91d330d3 Add GetMicroseconds function to allow microsecond precise timing in the JS GUI.
Differential Revision: https://code.wildfiregames.com/D190
Reviewed By: Vladislav, echotangoecho
This was SVN commit r19603.
2017-05-17 22:10:09 +00:00
elexis 5302e3e1f7 Prevent players and AIs being assigned to the same slot simultaneously in SP and MP if persist-match-settings were enabled
following the wrong move of this clearance from updatePlayerList to
handlePlayerAssignmentMessage.

Differential Revision: https://code.wildfiregames.com/D434
Reviewed By: Imarok
This was SVN commit r19602.
2017-05-17 22:01:23 +00:00
elexis 4bacd6f38e Buff elephant archer after f15abb066c made it slow, 38c7d7224a removed the capturing ability, 30c7a2ef18 removed the resource gathering ability and c279283d82 made it fat.
Double the damage output, HP and cost.
Add armor and metal cost for consistency with the War Elephant.

Differential Revision: https://code.wildfiregames.com/D436
Reviewed By: fatherbushido
Tested By: borg-
Values agreed with: Grugnas, nigel87

This was SVN commit r19601.
2017-05-17 21:55:35 +00:00
s0600204 df89091c48 Show entity upgrades in the Structure Tree
Reviewed By: bb
Trac Tickets: #4079
Differential Revision: https://code.wildfiregames.com/D92
This was SVN commit r19600.
2017-05-17 18:41:23 +00:00
mimo 15e2b42525 New economic tutorial based on triggers, accessible from the "learn to play" button
Reviewed By: elexis
Differential Revision: https://code.wildfiregames.com/D194
This was SVN commit r19599.
2017-05-17 17:33:36 +00:00
mimo 7dd3cf7543 petra captureRelics cleanup following 921c89d3a6
This was SVN commit r19598.
2017-05-17 17:21:05 +00:00
elexis 24de93e39a Sort lobby games by status, then by name when clicking on the name column.
Differential Revision: https://code.wildfiregames.com/D300
Patch By: fpre
This was SVN commit r19597.
2017-05-16 23:44:19 +00:00
mimo 921c89d3a6 Petra: Capture gaia relics
Summary:
Petra will capture gaia relics on occasion. Because the AI has access to
all of the map and all entities in the game, these gaia capture events
have to be spaced out quite a bit to make things fair.

Reviewed By: mimo
Differential Revision: https://code.wildfiregames.com/D333
This was SVN commit r19596.
2017-05-16 17:33:31 +00:00
elexis 8156d297ea Display the minimum, maximum and current value of sliders in the options page and round to at most 2 decimal places.
Differential Revision: https://code.wildfiregames.com/D459
Reviewed By: Vladislav
This was SVN commit r19595.
2017-05-16 16:38:41 +00:00
elexis 29dfcda35f Change the options page dropdown implementation to use a textual identifier instead of the numerical dropdown array index in the config file and code.
Differential Revision: https://code.wildfiregames.com/D402
Patch By: Polakrity
This was SVN commit r19594.
2017-05-16 15:52:01 +00:00
fatherbushido 7cfef7cf9f Tooltip mistake in a589b067a9. Noticed by elexis.
This was SVN commit r19593.
2017-05-16 12:15:08 +00:00
fatherbushido a589b067a9 Team bonuses for Britons, Gauls and Romans. Reviewed by elexis. Refs #4082.
Differential Revision: https://code.wildfiregames.com/D502
This was SVN commit r19591.
2017-05-16 05:16:41 +00:00
elexis 576754566d Revert the decision from 903460994d to let cavalry units prefer siege engines over human units, because they most often don't reach the siege engines before being massacred by the attackers.
Differential Revision: https://code.wildfiregames.com/D394
Fixes #4543
Refs #4194
Patch By: causative
Reviewed By: Grugnas
Reported By: borg-, ffm
This was SVN commit r19590.
2017-05-16 02:51:02 +00:00
elexis 90beda96f8 Fix atlas clicking following 8f36ca47a1 / D326 by adding the missing clicks property to the wxWidgets SDL event construction.
Differential Revision: https://code.wildfiregames.com/D452
Fixes #4557
Patch By: causative
This was SVN commit r19589.
2017-05-16 00:09:16 +00:00
elexis 2599d0374e Get the index of the hovered element in GUI lists and use it to display item-specific tooltips in the gamesetup for the victory condition, maptype and starting resources.
Differential Revision: https://code.wildfiregames.com/D316
Fixes #3699
Patch By: Vladislav
This was SVN commit r19588.
2017-05-15 21:49:10 +00:00
Imarok aa302dcb2d Fix whitespace in 202e567492
This was SVN commit r19587.
2017-05-15 19:30:00 +00:00
elexis d8c0492ddb Fix the readystate following D322 / b4e5858f6d.
Differential Revision: https://code.wildfiregames.com/D487
Reviewed By: Imarok
This was SVN commit r19586.
2017-05-15 19:14:51 +00:00
s0600204 f325452f2d Add missing check of phase techs' tech requirements in Structure Tree.
Reviewed By: elexis
Differential Revision: https://code.wildfiregames.com/D500
This was SVN commit r19585.
2017-05-15 18:56:10 +00:00
Imarok 202e567492 Fix economy and military score
Reviewed by: causative
Differential Revision: https://code.wildfiregames.com/D494
This was SVN commit r19584.
2017-05-15 18:43:38 +00:00
elexis 1eae8d0a95 Fix doubleclicking if the unit died between the clicks following 8f36ca47a1, refs #4414, https://code.wildfiregames.com/D326
Differential Revision: https://code.wildfiregames.com/D469
Patch By: causative
This was SVN commit r19583.
2017-05-15 11:51:01 +00:00
elexis a73d59720e Add hint to the manual that the batch train size can be changed in the options.
Differential Revision: https://code.wildfiregames.com/D501
Reviewed By: echotangoecho
This was SVN commit r19580.
2017-05-14 22:57:55 +00:00
Itms 62195c28f2 Fix out of range access in CInput, patch by vladislavbelov. Fixes #4570.
Some invalid cursor positions were not checked, resulting in a crash in
Debug mode. This was revealed by e1e4ef0370, refs #4401.

Reviewed By: echotangoecho, Itms
Differential Revision: https://code.wildfiregames.com/D484
This was SVN commit r19579.
2017-05-14 19:02:03 +00:00
fatherbushido 000e39629f Make initialization of phase techs for AI more robust. Refs ae3b66a778. Fix #4573. Reviewed by mimo.
Differential Revision: https://code.wildfiregames.com/D491
This was SVN commit r19578.
2017-05-14 18:01:27 +00:00
mimo 62259e34e4 Petra: Fix missing check for getEntityById, patch by Sandarac
Reviewed By: mimo
Differential Revision: https://code.wildfiregames.com/D496
This was SVN commit r19577.
2017-05-14 09:44:16 +00:00
elexis d5c9725dc3 Revert the wrong "insufficient permissions to remove an account" error message from 9281aaf25e to the previous "Registration forbidden" which is shown when lobby registrations are disabled or restricted to some IP range.
Differential Revision: https://code.wildfiregames.com/D319
Refs #3047
Reviewed By: scythetwirler, leper
This was SVN commit r19575.
2017-05-14 03:18:21 +00:00
elexis 08b23d0164 Sooner network timeout warnings.
Reviewed By: echotangoecho
This was SVN commit r19574.
2017-05-13 22:52:11 +00:00
elexis aa5f3e7d32 Fix the most annoying instance of the persist-matchsettings-bugs that prevented players to build the Ptolemian lighthouse in case of previously having selected a map where that template is disabled.
Most recently reported by nigel87.

Differential Revision: https://code.wildfiregames.com/D489
Reviewed By: Grugnas
Refs #3883

This was SVN commit r19573.
2017-05-13 17:15:16 +00:00
mimo 1f1b179202 petra: take restricted classes into account
This patch implements some changes needed to take restricted classes
into account for example for D450, but it does not claim to be complete.
This will have to be fully tested when these restrictions are really
used.
Tested by fatherbushido using D450

Differential Revision: https://code.wildfiregames.com/D473
This was SVN commit r19572.
2017-05-13 15:14:23 +00:00
mimo fe2e0fa02f follow-up and complement of D446 to adapt garrisoning to the structure attackers
Summary:
- take the healthLevel of the units into account
- take Sandarac comments on D446 into account

Differential Revision: https://code.wildfiregames.com/D468
This was SVN commit r19571.
2017-05-13 15:04:04 +00:00
mimo e8c6b09c4f Reset the alert of ProductionQueues when ownerShip changes, fixes #4571
This was SVN commit r19570.
2017-05-13 14:52:23 +00:00
fatherbushido ae3b66a778 Make phase technology researchable in all captured civic center. Reviewed by elexis. Fix #4572.
This was SVN commit r19569.
2017-05-13 13:58:27 +00:00
elexis 57e767ac08 Gamesetup cleanup: Merge two adjacent identical loops in sanitizePlayerData.
Reviewed By: Imarok
This was SVN commit r19567.
2017-05-12 18:08:14 +00:00
fatherbushido ac83155197 Remove reference to range in aura description. Patch by Grugnas.
Differential Revision: https://code.wildfiregames.com/D464
This was SVN commit r19566.
2017-05-12 17:09:07 +00:00
fatherbushido 5f4d5cdf76 Remove a leftover argument in GetSimulationState call. Refs 00ea7763f7. Reviewed by elexis and echotangoecho.
Differential Revision: https://code.wildfiregames.com/D479
This was SVN commit r19565.
2017-05-12 16:20:56 +00:00
Imarok 31a41ab735 Fix warning when quitting the game during loading. Patch by bb.
Also contains some `StatistcTracker` cleanup.

Differential Revision: https://code.wildfiregames.com/D475
This was SVN commit r19564.
2017-05-12 14:21:28 +00:00
Imarok 77246af17a Avoid NetClient FSM error when pausing while loading the game.
Patch by echotangoecho. Closes ec1696ded3. Fixes #4261.

Differential Revision: https://code.wildfiregames.com/D472
This was SVN commit r19563.
2017-05-12 13:22:29 +00:00
elexis 00c4adfae8 Add missing Hexify call to the OOS dialog in D105 that became required with the hash comparison in JS. Reported by causative.
Differential Revision: https://code.wildfiregames.com/D476
Reviewed By: leper
This was SVN commit r19562.
2017-05-12 08:50:20 +00:00
leper 51f7502bb1 Don't move temporaries, so possibly allowing for copy elision.
Pointed out by clang's -Wpessimizing-move.

Reviewed By: wraitii
Differential Revision: https://code.wildfiregames.com/D421
This was SVN commit r19559.
2017-05-11 23:24:54 +00:00
elexis 6e549bfed2 Prohibit cheats if cheats are disabled,
i.e. developer cheats to control enemy units, revealing the map and
promoting units too.

Open the developer overlay only if cheats are enabled (which is always
the case in singleplayer mode and only the case in multiplayer mode if
explicitly enabled).
(This doesn't make it harder for developers to "debug", since they
previously had to remember to disable the rated game setting too. Also
every bug had to be reproduced with the replay either way)

Reverts 3cbbf31173 which reverted 6e0e607b20 (since as of c288278229,
the autostart gamesetup enables cheats too).

Differential Revision: https://code.wildfiregames.com/D455
Fixes #3551
Reviewed By: echotangoecho
Agreed with Itms and Imarok in the last staff meeting.

This was SVN commit r19558.
2017-05-11 22:49:54 +00:00
elexis c288278229 Enable cheats in autostarted games because the JS gamesetup enables them in singleplayer and because the autostarted multiplayer mode relies on the change-perspective feature to control players.
Differential Revision: https://code.wildfiregames.com/D453
Refs #2676
Reviewed By: echotangoecho
This was SVN commit r19557.
2017-05-11 22:32:41 +00:00
elexis 3cd2055ca7 Use self-closing tags for empty elements everywhere (refs d21c0026ec and 06bbcd6b76).
This was SVN commit r19556.
2017-05-11 22:11:25 +00:00
elexis 9ef3447b2a Fix missing escaping in 06bbcd6b76. Reported by Vladislav, patch by Phormio.
This was SVN commit r19555.
2017-05-11 21:37:27 +00:00
elexis d074c4d809 Use GUISize constructor instead of string concatenation when only passing absolute values.
Differential Revision: https://code.wildfiregames.com/D471
Reviewed By: bb
This was SVN commit r19554.
2017-05-10 22:29:55 +00:00
elexis 3d8fd6e740 Fix the position of a treasure which couldn't be picked up on the skirmish map Mediterranean Cove.
Patch By: Phormio
Fixes #4566

This was SVN commit r19553.
2017-05-10 16:53:41 +00:00
elexis bbc7852df8 Use let keyword for cmpTrigger consistently, so that this reference to the component before deserialization can't be reused inside the Trigger component after deserialization which would cause an OOS on rejoin / savegame loading as experienced prior 53570da065.
Differential Revision: https://code.wildfiregames.com/D195
Refs #4310, 53570da065, d124b32f6a
Reviewed By: Sandarac
This was SVN commit r19552.
2017-05-10 14:03:51 +00:00
fatherbushido 11f90549c7 Add missing roundings for garrisoned arrows tooltips. Reviewed by elexis.
Differential Revision: https://code.wildfiregames.com/D470
This was SVN commit r19551.
2017-05-10 13:04:35 +00:00
fatherbushido bba42de375 Add Iberian heroes auras. Patch by Grugnas.
Differential Revision: https://code.wildfiregames.com/D397
This was SVN commit r19550.
2017-05-10 11:32:26 +00:00
elexis 51655081d8 Botswanan Haven random map.
Differential Revision: https://code.wildfiregames.com/D362
Patch By: Hannibal_Baraq
This was SVN commit r19548.
2017-05-09 20:09:18 +00:00
mimo d1108516af petra: adapt garrisoning to the attackers
Summary: When a structure with arrow was attacked, it was garrisoned
independently of the attacker, which was not the best answer when
atacked by a ram for example. This patch tries to adapt the garrisoning
to the attackers.

Reviewed By: Sandarac
Differential Revision: https://code.wildfiregames.com/D446
This was SVN commit r19547.
2017-05-09 17:53:59 +00:00
mimo 0517bbb83f cleanup of da4e03b7ad
This was SVN commit r19546.
2017-05-09 16:58:53 +00:00
elexis 8bf732453e Ignore color and font tags when typing something in a Dropdown gui element to select an item.
Differential Revision: https://code.wildfiregames.com/D462
Refs D435
Reviewed By: Vladislav
This was SVN commit r19545.
2017-05-09 13:29:19 +00:00
fatherbushido 228ba51d5c Aura Range tooltip. Reviewed by elexis.
Differential Revision: https://code.wildfiregames.com/D458
This was SVN commit r19544.
2017-05-09 12:55:56 +00:00
elexis 9cfe30c92a Add missing pair of braces as reported by mimo in b4e5858f6d.
This was SVN commit r19542.
2017-05-08 23:40:44 +00:00
elexis 2423e85a88 Add an optional color field to the gamesetup dropdown values, so that autocompleted text of the setting values (especially observernames) doesn't contain the color tag.
Differential Revision: https://code.wildfiregames.com/D435
Reviewed By: Imarok
This was SVN commit r19541.
2017-05-08 23:34:25 +00:00
elexis 36a16a4576 Remove debug breakpoint that is triggered whenever an unsupported UTF32 character is encountered,
for example when someone would send a lobby chat message containing such
a character, it effectively ended the game of the recipients.

Differential Revision: https://code.wildfiregames.com/D456
Fixes #4433
Reviewed By: leper
Reported and tested by: Hannibal_Barca
This was SVN commit r19540.
2017-05-08 22:29:00 +00:00
Imarok af2f8a95fb Improve training tooltip with multiple selection
Reviewed by: bb. Fixes #4264.
Differential Revision: https://code.wildfiregames.com/D43
This was SVN commit r19538.
2017-05-08 18:13:26 +00:00
Imarok 30823d8988 Make g_EntityCommands use all entities but not only the first
Reviewed by: bb. Fixes #4273.
Differential Revision: https://code.wildfiregames.com/D45
This was SVN commit r19537.
2017-05-08 18:04:43 +00:00
elexis 6826a1355e Display aura tooltips for the entities in the top panel (currently heroes and relics).
Differential Revision: https://code.wildfiregames.com/D340
Reviewed By: fatherbushido (and leper and sanderd17 too basically)
This was SVN commit r19536.
2017-05-08 07:16:43 +00:00
leper 25b1837603 Pass CVector3D as const reference in a few places.
Reviewed By: Sandarac
Differential Revision: https://code.wildfiregames.com/D424
This was SVN commit r19534.
2017-05-08 04:04:45 +00:00
leper bdfe500f98 Draw paths only when cinematics isn't playing. Patch by Vladislav.
Also show the GUI after the cinematics stopped playing in Atlas.

Differential Revision: https://code.wildfiregames.com/D411
This was SVN commit r19533.
2017-05-08 04:02:33 +00:00
leper c5ab9925d4 Fix possible null dereferences.
Reviewed By: vladislavbelov
Differential Revision: https://code.wildfiregames.com/D420
This was SVN commit r19532.
2017-05-08 02:41:23 +00:00
leper 631fa4b376 Remove unused old code for triggers in atlas.
Actually implementing atlas support for triggers will most likely
require a different interface, so no use keeping it.

Reviewed By: vladislavbelov
Differential Revision: https://code.wildfiregames.com/D418
This was SVN commit r19531.
2017-05-08 02:40:22 +00:00
Imarok a397f9bccb Sanitize playername in sanitizePlayerData in gamesetup and remove some hardcodings.
Fixes #4501

Reviewed by: elexis
Differential Revision: https://code.wildfiregames.com/D426
This was SVN commit r19530.
2017-05-07 22:28:56 +00:00
Itms 06bbcd6b76 Revamp of the quotes in the game loading screen, research and patch by Phormio.
Remove the "Quote of the Day" titling which did not make a lot of sense.

Undocumented or misleading quotes removed, new quotes, more historical
context, and literary source for all of them.

Reviewed By: Gallaecio, Itms
Differential Revision: https://code.wildfiregames.com/D296
This was SVN commit r19529.
2017-05-07 22:05:11 +00:00
fatherbushido 1c64742edc Add a type argument for CanAttack method of Attack component. Patch by bb. Fixes #4220.
Differential Revision: https://code.wildfiregames.com/D122
This was SVN commit r19528.
2017-05-07 19:32:59 +00:00
fatherbushido ca89fa35b9 Edit many aura names. Remove "aura" from the name, use more flavouring name, replace placeholder or generic names. Patch by Hannibal_Barca. Reviewed by elexis.
Differential Revision: https://code.wildfiregames.com/D447
This was SVN commit r19527.
2017-05-07 18:56:14 +00:00
fatherbushido 17aa212c93 Clean a bit auras gui info parsing
Summary: (Title is clumsy)

Test Plan:
Check for example auras tooltip:
structree
entity tooltip
construction panel
wall tooltip too

Reviewers: elexis

Reviewed By: elexis
Subscribers: Vulcan

Differential Revision: https://code.wildfiregames.com/D447
This was SVN commit r19526.
2017-05-07 18:38:41 +00:00
Itms 7d00501a90 Make 81c57e8a28 compatible with wxWidgets 2.8, patch by vladislavbelov.
Reviewed By: Itms
Differential Revision: https://code.wildfiregames.com/D427
This was SVN commit r19525.
2017-05-07 15:49:55 +00:00
Itms a857ee441e Enable other languages than English in the Windows installer, patch by vladislavbelov.
Reviewed By: Itms
Differential Revision: https://code.wildfiregames.com/D314
This was SVN commit r19524.
2017-05-07 14:38:29 +00:00
mimo da4e03b7ad petra: hunters/gatherers improvments
Summary:
- better detection (hopefully less false positive due to pathfinder
problems) of inaccessible targets
- prevent hunters from drifting too much when chasing their target

Differential Revision: https://code.wildfiregames.com/D400
This was SVN commit r19523.
2017-05-07 09:25:03 +00:00
fatherbushido ed72056fb5 Actually delete files in 07233d8cd6.
This was SVN commit r19522.
2017-05-06 14:39:10 +00:00
fatherbushido 07233d8cd6 Remove a not validating unused sound marker template. While at it remove another unused template in the same folder. Patch by Stan.
Differential Revision: https://code.wildfiregames.com/D412
This was SVN commit r19521.
2017-05-06 14:36:06 +00:00
elexis e6b909bb51 Rename the map Rouen to Ratumacos and make it circular.
Description by Hannibal_Barca.

Differential Revision: https://code.wildfiregames.com/D177
Reviewed By: Grugnas
This was SVN commit r19520.
2017-05-06 01:20:49 +00:00
elexis ee5bb1fd61 RangeVisualization component and use it to visualize Aura ranges.
Differential Revision: https://code.wildfiregames.com/D238
Fixes #4349
Patch By: Sandarac
This was SVN commit r19519.
2017-05-06 00:47:21 +00:00
elexis f4ff462449 Select the number of relics to spawn in the gamesetup.
Differential Revision: https://code.wildfiregames.com/D410
Reviewed By: Sandarac
This was SVN commit r19518.
2017-05-05 20:41:37 +00:00
Imarok 4a0673e44e Show all summary values as a graph
Reviewed by: bb
Differential Revision: https://code.wildfiregames.com/D144
This was SVN commit r19517.
2017-05-05 18:52:20 +00:00
Imarok 2f67b2da61 Correctly center ally command buttons
Reviewed by: bb
Differential Revision: https://code.wildfiregames.com/D428
This was SVN commit r19516.
2017-05-05 15:10:12 +00:00
elexis 76bc9b579a Clientside Lobby support for muted players (visitor role).
Displays a chat message and a notification in the player details to
everyone if someone was muted and
hides the chat input to visitors.

Differential Revision: https://code.wildfiregames.com/D339
Reviewed By: user1
This was SVN commit r19514.
2017-05-05 01:13:12 +00:00
mimo ba37ff9907 petra: remove some unneeded parentheses
This was SVN commit r19513.
2017-05-04 18:48:13 +00:00
Imarok dad3e3d1bd Add the select all idle workers/fighters hotkey to the manual
Acked by elexis

This was SVN commit r19512.
2017-05-04 12:14:43 +00:00
leper 329f9e0957 Remove broken atlas error reporting code.
This has been disabled for nearly 10 years (44f5288a1d), so remove it.

Reviewed By: fatherbushido, vladislavbelov
Differential Revision: https://code.wildfiregames.com/D423
This was SVN commit r19511.
2017-05-04 09:29:24 +00:00
fatherbushido bd73588935 Add the missing file in c707999bec. Refs #2524.
This was SVN commit r19510.
2017-05-04 09:17:29 +00:00
fatherbushido c707999bec Fix Missing props for the old athen fortress. Patch by Stan.
Refs #2524.
Differential Revision: https://code.wildfiregames.com/D352
This was SVN commit r19509.
2017-05-04 09:13:54 +00:00
leper f794a14610 Declare variable when actually initialized.
Reviewed By: wraitii
Differential Revision: https://code.wildfiregames.com/D417
This was SVN commit r19508.
2017-05-04 06:53:21 +00:00
elexis 4a5f302ce1 Optional FPS Limiter for running games too, use the Slider GUI object in the config to specify custom limits.
Make it way more accurate by excluding the SDL_Wait time and microsecond
precision.

Differential Revision: https://code.wildfiregames.com/D109
Refs #2882
Reviewed By: Vladislav
This was SVN commit r19507.
2017-05-03 23:44:13 +00:00
elexis dd9b83626e Roman Entrenched Army Camp balancing.
Prevent building it in player owned territory, so as to
  highlight its usage as a building to dominate the enemy in his own
territory and
  prevent the player from building it as a defensive structure right
besides a fortress and civic center.

Increase CapturePoints from 500 to 1500, and RegenRate to 10, so that it
doesn't convert to gaia in 14 seconds but 50.
Reduce GarrisonRegenRate from 5 to 3.
Add minimum distance between two camps.
Increase cost to 500 wood and buff crush armor from 10% to 19%.
Reduce maximum range from 80 meters to 50 meters.

Differential Revision: https://code.wildfiregames.com/D405
Reviewed By: fatherbushido
Reported by PhyZic, discussed with Grugnas.

This was SVN commit r19505.
2017-05-03 12:32:48 +00:00
elexis b4e5858f6d Unify gamesetup option handling, fixes #3994, refs #3049.
Removes a lot of duplication and ugly GUI handling code with very
similar, yet different code paths.
Move the setting specific logic to the functions of that setting and
keep the universal logic in global atomic functions.
Make gamesetup.xml agnostic of all gamesetup settings.

Adding a new gamesetup option now only requires adding one hunk with the
titles and values and one line in g_OptionOrderGUI.
Opens up the possibility to iterate over all settings, refs #3806,
#3883.

Allow starting singleplayer games in observermode with only AIs
assigned, fixes #4078.
Autocomplete translations of all setting titles and selected title
values like playernames and victory conditions.

Transfer the AI difficulty when swapping with a player.
Move logic from onTick to the GUI handling functions.
Change some global consts to var, so that contributors become invited to
change them from a different place.
Add missing startGameButton tooltip translation.

Differential Revision: https://code.wildfiregames.com/D322
Reviewed By: wraitii
Some strings reviewed By: leper
This was SVN commit r19504.
2017-05-02 20:57:14 +00:00
elexis 09e974e1cb Bump year number of files changed this year in the license headers.
This was SVN commit r19503.
2017-05-01 14:28:22 +00:00
Itms bb81905245 Add text linting to Arcanist.
This introduces a .arclint file used by Arcanist to run a handful of
checks on patches submitted to Phabricator. To keep it portable and
avoid annoying contributors, most of the linting will happen through
Jenkins. This commit uses built-in text linting that checks trailing
whitespace and end of files.

Reviewed By: leper
Differential Revision: https://code.wildfiregames.com/D6
This was SVN commit r19502.
2017-05-01 14:26:50 +00:00
elexis 0a09bde961 JS lobby cleanup.
Hide chat input and disable buddy toggle button upon disconnect.
Imrpove user profile fetching code readability, move and merge code from
XML.

Differential Revision: https://code.wildfiregames.com/D396
Reviewed By: Vladislav
This was SVN commit r19501.
2017-05-01 13:36:10 +00:00
FeXoR b22b58f13d Fix scenario .rnc/.rng validation errors.
Patch by vladislavbelov
Differential Revision: https://code.wildfiregames.com/D391
This was SVN commit r19500.
2017-05-01 10:26:36 +00:00
mimo 08c40e23db fix error when civData has no music (as gaia), fixes #4538
This was SVN commit r19499.
2017-05-01 10:03:15 +00:00
wraitii 6ee830068a Print the name of OpenGL errors when they occur.
Patch by vladislavbelov
Differential Revision: https://code.wildfiregames.com/D313
This was SVN commit r19496.
2017-05-01 07:19:39 +00:00
elexis ba5ab40c66 Fix lineendings, two missing semicolons and a string fix.
This was SVN commit r19494.
2017-05-01 05:08:00 +00:00
elexis d7b5f28fad Don't save an empty string to the user config if the lobby buddy list is empty, since ConfigDB doesn't support empty strings.
Differential Revision: https://code.wildfiregames.com/D393
Reviewed By: causative, Vladislav
Refs #3990

This was SVN commit r19492.
2017-05-01 04:59:04 +00:00
elexis 37da3b008a Translate the Out-Of-Sync error message and send it to the JS GUI for convenience and future extension.
Add a hint that multiplayer games with AI are currently not supported.

Differential Revision: https://code.wildfiregames.com/D105
Reviewed By: leper
Refs #3858

This was SVN commit r19491.
2017-05-01 04:55:56 +00:00
leper 7d6bfe27ab Clean up FromJSProperty a little. Patch by Vladislav.
Differential Revision: https://code.wildfiregames.com/D399
This was SVN commit r19489.
2017-05-01 00:58:35 +00:00
leper c14a7a0b0b Builder component tests and some cleanup. Patch by Stan.
Reviewed By: leper, bb
Differential Revision: https://code.wildfiregames.com/D99
This was SVN commit r19488.
2017-05-01 00:44:08 +00:00
elexis 2ad6dc478c JS l10n cleanup.
Remove unneeded variable creation and duplicate comments, simplify
isTranslatableString and capitalize globals.

Differential Revision: https://code.wildfiregames.com/D390
Reviewed By: leper
This was SVN commit r19487.
2017-05-01 00:09:13 +00:00
leper 234aa36b25 Update the documentation on how to write simulation components.
Mention how to handle const methods (be1a205f91, D75).
Note that parameters are passed as const references (1a66f510d0).
Also remove mention of jsval (which is deprecated).

Reviewed By: wraitii
Differential Revision: https://code.wildfiregames.com/D374
This was SVN commit r19484.
2017-04-30 23:48:54 +00:00
leper ecaa8434b1 Cinematic path node moving tool for Atlas. Patch by Vladislav.
Differential Revision: https://code.wildfiregames.com/D369
This was SVN commit r19483.
2017-04-30 23:47:16 +00:00
elexis bbf7321ec0 Use the slider for the number of shader graphics setting.
Thereby remove the only hardcoded reference of options.json from
options.js.
Rename Gain to Volume, refs #4039.

Differential Revision: https://code.wildfiregames.com/D398
Reviewed By: Vladislav
This was SVN commit r19482.
2017-04-30 21:51:00 +00:00
elexis 0ab4660e83 Fix Iberian Sandbox map that was flooded after some change after Alpha 19 before Alpha 20.
Reported by cc, patch accepted by wraitii.

This was SVN commit r19481.
2017-04-30 17:35:30 +00:00
wraitii c016a74309 Add sliders to the GUI. Use them for the sound/music volume controls.
Patch by vladislavbelov, based on a patch by dpiquet.

Fixes #4039.
Differential Revision: https://code.wildfiregames.com/D325
This was SVN commit r19479.
2017-04-30 16:51:18 +00:00
elexis ca90b3b22a Nerf briton hero Cunobelin.
Differential Revision: https://code.wildfiregames.com/D395
Reviewed By: fatherbushido
Discussed with: Grugnas, causative, Hannibal_Barca, borg-

This was SVN commit r19478.
2017-04-30 16:18:13 +00:00
elexis b5afc040ef Catafalque aura finetuning and some string fixes reported on transifex.
Buff Athenian and Persian catafalque, fix Gaul and Spartan catafalque,
nerf Iberian catafalque.

Differential Revision: https://code.wildfiregames.com/D331
Patch By: Hannibal_Barca and translators
This was SVN commit r19477.
2017-04-30 16:08:26 +00:00
elexis 1235b0b8fe Nerf Iberian fireships as they are much cheaper than garrisoned WarShips, easier to spam and destroy docks 5 times faster.
Double decay rate, so that the lifespan becomes 1min 23sec instead of
the original 2min 46sec.
Increase train time form 20 to 30.
Increase cost from 200 wood to 300.

Differential Revision: https://code.wildfiregames.com/D388
Numbers By: Hannibal_Barca
Reviewed By: fatherbushido
Discussed with: causative, Grugnas and scythetwirler

This was SVN commit r19476.
2017-04-29 20:00:44 +00:00
elexis 7f573cb86d Move lobby chat commands in a global object and add /help command to explain the usage on these commands.
Differential Revision: https://code.wildfiregames.com/D323
Based on patch and reviewed by: Vladislav
This was SVN commit r19475.
2017-04-29 18:58:56 +00:00
elexis 5a4cbc9261 Move CinemaManager includes forgotton in 5d49e6c456 to the right place, thus fixing the build without precompiled headers.
Refs https://code.wildfiregames.com/D385
Reported by: leper
Fix proposed by: Vladislav
This was SVN commit r19473.
2017-04-29 18:08:06 +00:00
elexis a8ac5ccede Add support for resource descriptions and display them in the tooltip of the resource counts shown in the top panel.
Differential Revision: https://code.wildfiregames.com/D199
Proposed and tested by: wowgetoffyourcellphone
This was SVN commit r19472.
2017-04-29 17:57:10 +00:00
mimo 185261275f Fixed lost selection in the load game page. Patch by Vladislavbelov
Summary: When delete a selected row, selection didn't appear after
10b49f9c18.

Reviewed By: mimo
Differential Revision: https://code.wildfiregames.com/D392
This was SVN commit r19471.
2017-04-29 16:42:12 +00:00
elexis 53eed3b50d Restore selected mod and fix reset button in the mod selection screen.
Differential Revision: https://code.wildfiregames.com/D312
Fixes #4397
Patch By: Vladislav
This was SVN commit r19470.
2017-04-29 01:54:44 +00:00
elexis 2d999a746e Actually stop connecting to the lobby if the user cancelled the login.
Fixes #4438
Patch By: sbirmi
This was SVN commit r19469.
2017-04-29 00:03:41 +00:00
elexis 41d4649c6d Remove unused, deprecated SendGetGameList from the lobby.
Differential Revision: https://code.wildfiregames.com/D389
Reviewed By: scythetwirler
Refs D207

This was SVN commit r19467.
2017-04-28 23:22:41 +00:00
elexis a227a7f45b Remove optional arguments from randFloat, since the function can be called from the simulation and that should explicitly specify arguments if the defaults aren't entirely self-evident.
Make a lot of calls easier to read.

Differential Revision: https://code.wildfiregames.com/D372
Patch By: bb
Refs #4326 D121

This was SVN commit r19464.
2017-04-27 14:57:21 +00:00
elexis e6a0c7ae77 Remove SendGetRatingList lobby function which is deprecated and ignored serverside since 1a15131d2d because it caused performance issues and therefore shouldn't be used anymore.
Fixes #4151
Patch by: sbirmi
This was SVN commit r19463.
2017-04-27 11:42:51 +00:00
elexis b9583aefb7 Sort aura templates into a more clear directory structure.
Differential Revision: https://code.wildfiregames.com/D288
Reviewed By: bb
This was SVN commit r19462.
2017-04-26 21:14:16 +00:00
elexis 72d4f41467 Fix beach painting on the Corsica vs Sardinia map that broke everything on tiny sizes.
Differential Revision: https://code.wildfiregames.com/D384
Fixes #4531
Reviewed By: bb
This was SVN commit r19461.
2017-04-26 20:35:08 +00:00
elexis 8cb4551051 Add asian elephant infant template and use it for the India map.
Differential Revision: https://code.wildfiregames.com/D376
Reviewed By: Hannibal_Barca
This was SVN commit r19460.
2017-04-26 20:30:00 +00:00
mimo 42759d94a2 petra should be less demanding when low resources available if it already starts with a market
Summary: as the title say. In addition, with the patch, it can already
use the available market at phase 1 while before, it waited for phase 2.

Checked by Sandarac and elexis

Differential Revision: https://code.wildfiregames.com/D349
This was SVN commit r19459.
2017-04-26 18:29:36 +00:00
fatherbushido d57e3cd743 Sort and update help list of category build and training restrictions. Reviewed by elexis.
Differential Revision: https://code.wildfiregames.com/D386
This was SVN commit r19458.
2017-04-26 13:54:41 +00:00
elexis f399e68654 Fix the lobby bot following the entity class rename in ad17e320be
Differential Revision: https://code.wildfiregames.com/D383
Patch By: user1
Refs #4536 D244

This was SVN commit r19457.
2017-04-25 16:53:42 +00:00
fatherbushido 40d219f342 Add Spartan team bonus. Patch by Grugnas.
Differential Revision: https://code.wildfiregames.com/D382
This was SVN commit r19456.
2017-04-25 14:30:40 +00:00
elexis 9f8e1eb59d Add UnitAI CanPatrol boolean property to selectively disable patroling for some units, in particular animals, traders, fishing ships and female citizens.
Differential Revision: https://code.wildfiregames.com/D192
Reviewed By: Vladislav
This was SVN commit r19455.
2017-04-25 11:22:41 +00:00
elexis d1dae4fa12 Fix a rare map generation bug on India occuring if the map decided to place a stone mine one tile too far at the map border.
Refs https://code.wildfiregames.com/D363

This was SVN commit r19454.
2017-04-25 11:07:41 +00:00
elexis 24e51f96eb Remove useless terrain painting that is overwritten with the paintTerrainBasedOnHeight calls following that.
Prevent rare resource collision of the starting trees with the civic
centers.

Refs https://code.wildfiregames.com/D363

This was SVN commit r19453.
2017-04-25 10:46:50 +00:00
mimo e3daa35075 force the eject when renaming a garrisoned entity, fixes #4532
This was SVN commit r19452.
2017-04-24 20:38:39 +00:00
fatherbushido 03d4606416 Don't try to get capture points and add capture bar of a destroyed entity in StatusBar. Reviewed by Sanderd17.
Differential Revision: https://code.wildfiregames.com/D360
This was SVN commit r19451.
2017-04-24 19:31:17 +00:00
fatherbushido b4aaa63508 Add tests to Barter component. Replace constants by prototype attributes in Barter component. Patch by Stan.
Differential Revision: https://code.wildfiregames.com/D377
This was SVN commit r19450.
2017-04-24 10:18:57 +00:00
elexis 738a0651cf Reveal the map on the wall demo map (so that it isn't entirely nor partially invisible independent of the selected gamemode and ownership).
Fixes #4535
Reviewed By: sanderd17
This was SVN commit r19449.
2017-04-23 19:32:34 +00:00
fatherbushido 46a5b0c83f Remove duplicated, unused, leftover wall templates and actors. Fix the related references. Patch by Grugnas. Reviewed by s0600204.
Differential Revision: https://code.wildfiregames.com/D342
This was SVN commit r19448.
2017-04-23 17:56:57 +00:00
elexis a6fce141b0 Random map script India.
Differential Revision: https://code.wildfiregames.com/D363
Patch By: Hannibal Barca
Refs #4354

This was SVN commit r19447.
2017-04-23 02:02:44 +00:00
elexis ec58e50a09 Remove a duplicate TechnologyManager getter introduced by e33d4a52e9.
Differential Revision: https://code.wildfiregames.com/D373
Patch By: Polakrity
This was SVN commit r19446.
2017-04-23 00:30:24 +00:00
elexis 51d189c767 Display a chat notification if an ally has reached a new phase, optionally also if started or aborted.
Remove the equivalent AI chat notifications.

Differential Revision: https://code.wildfiregames.com/D354
Patch By: Polakrity
Fixes #3512

This was SVN commit r19445.
2017-04-23 00:00:14 +00:00
elexis 8f36ca47a1 Replace input.js doubleclick hack and ease doubleclicking on moving units.
Differential Revision: https://code.wildfiregames.com/D326
Patch By: causative
Refs #4414

This was SVN commit r19444.
2017-04-22 01:24:03 +00:00
elexis 175cded64a Replace deprecated randInt calls (besides those in the Unknown maps).
Differential Revision: https://code.wildfiregames.com/D278
Patch By: bb
Refs #4326

This was SVN commit r19443.
2017-04-21 21:45:00 +00:00
elexis 9027a46112 Fix player assignments, few ungatherable trees on Corinthian Isthmus (4) and place another lighthouse on the other side of the river for fairness.
Differential Revision: https://code.wildfiregames.com/D350
Patch By: Stan
This was SVN commit r19442.
2017-04-21 12:56:04 +00:00
elexis a3ccbba4a2 Update credits entries, refs ed5d8f749e
This was SVN commit r19441.
2017-04-21 12:16:06 +00:00
fatherbushido 1d7b9a434f Fix 234513ae51, one template did not validate. Noticed by phormio.
This was SVN commit r19440.
2017-04-21 08:35:17 +00:00
fatherbushido e960b0ef61 Add Identity component unit tests. Some code cleanup. Patch by Stan. Commented and reviewed by bb.
Differential Revision: https://code.wildfiregames.com/D98
This was SVN commit r19439.
2017-04-20 19:51:10 +00:00
fatherbushido 234513ae51 Use per 100 meters spread values. Fix a bit the related help. Change and use simpler template values. Units will be a bit more accurate. Reviewed by wraitii.
Differential Revision: https://code.wildfiregames.com/D361
This was SVN commit r19438.
2017-04-20 17:01:47 +00:00
fatherbushido 6401203116 Clean identation and sorting in xml templates.
This was SVN commit r19437.
2017-04-20 06:36:38 +00:00
fatherbushido b942e4d406 Make some wooden structures give a wood loot instead of a stone one. Patch by Grugnas.
Differential Revision: https://code.wildfiregames.com/D265
This was SVN commit r19436.
2017-04-20 06:13:11 +00:00
Pureon 922ece9302 Icon updates
This was SVN commit r19435.
2017-04-19 20:42:43 +00:00
elexis 026dcf10eb Danubius random map script with reoccuring gaia ships that take control of the river and ungarrison units to attack the players.
Places a fortified gaia village, some gaia units performing a ritual and
some towers garrisoned on islands.
The attacker and ship count increases over time.
The attacker composition is randomized per ship and switches from
citizen soldiers to champions, heroes and siege engines.
One in three matches takes place at night.

Differential Revision: https://code.wildfiregames.com/D204
Map generation based on patch by Hannibal Barca
Reviewed By: bb, FeXoR
Refs #4354

This was SVN commit r19434.
2017-04-19 14:50:48 +00:00
elexis dcf12abe8c Mark players as buddies in the lobby and add a symbol to identify them in the lobby playerlist, gamelist and in the game description panel of the lobby, replay and load/save screen.
Differential Revision: https://code.wildfiregames.com/D209
Patch By: fpre aka. ffffffff
Reviewed By: causative
This was SVN commit r19433.
2017-04-19 11:51:29 +00:00
fatherbushido 89c413031f Fix the aiming code when performing an attack. Reviewed by wraitii.
Differential Revision: https://code.wildfiregames.com/D20
This was SVN commit r19432.
2017-04-19 07:39:19 +00:00
FeXoR d5e254014a Make random map Caledonian Meadows circular and some style changes. Reviewed by elexis.
Differential Revision: https://code.wildfiregames.com/D180
This was SVN commit r19431.
2017-04-18 21:51:25 +00:00
fatherbushido 7e77e3789d Make projectile speed templates values more consistent. Reviewed by wraitii.
Differential Revision: https://code.wildfiregames.com/D356
This was SVN commit r19430.
2017-04-18 20:12:08 +00:00
fatherbushido 79a9b05b0c Don't tag an entity as packing when the packing is completed. Reviewed by leper.
Differential Revision: https://code.wildfiregames.com/D357
This was SVN commit r19429.
2017-04-18 19:44:43 +00:00
wraitii 4d2508ecf4 Fix prepare times.
Several ranged units had prepare times as high as their repeat time,
making them feel sluggish and animating weirdly. Melee units had none,
resulting in an odd discrepancy betwee n animation and time of damage,
and also weird animations.

Reviewed by fatherbushido.
Differential Revision: https://code.wildfiregames.com/D258
This was SVN commit r19428.
2017-04-18 14:50:29 +00:00
elexis 81c57e8a28 List, add and delete cinematic paths in Atlas.
Doesn't provide a way to add/delete nodes of paths yet.

Differential Revision: https://code.wildfiregames.com/D348
Patch By: Vladislav
This was SVN commit r19427.
2017-04-18 03:30:16 +00:00
elexis 80626db3dc Make that StatisticsTracker code from 045dcd4823 a bit more readable and consistent.
Differential Revision: https://code.wildfiregames.com/D355
Reviewed By: leper
This was SVN commit r19426.
2017-04-18 00:10:25 +00:00
wraitii 1db8562d05 Revert and fix 4523c50850: fix water disappearing in Atlas when clicking on the object tab.
Reviewed by wraitii.
Differential Revision: https://code.wildfiregames.com/D329
This was SVN commit r19425.
2017-04-17 08:59:12 +00:00
wraitii 1ec41f6dd0 Fix crash in dynamic subscriptions when components unsubscribe during deletion.
Discussed with Philip.
Reviewed by fatherbushido
Differential Revision: https://code.wildfiregames.com/D264
This was SVN commit r19424.
2017-04-17 08:00:41 +00:00
fatherbushido de9e76cbf1 Add a test to the component manager to show a crash in dynamic subscriptions when components unsubscribe during deletion. Reviewed by wraitii.
Differential Revision: https://code.wildfiregames.com/D346
This was SVN commit r19423.
2017-04-17 07:55:44 +00:00
elexis adf60c7c49 Support cinematic path creation from trigger scripts.
Differential Revision: https://code.wildfiregames.com/D317
Patch By: Vladislav
Refs #3814

This was SVN commit r19422.
2017-04-17 01:42:11 +00:00
elexis ce5c10c7bb Add FromJSProperty helper function that gets the property of a JS object, thus reducing duplicate checks when getting many properties.
Differential Revision: https://code.wildfiregames.com/D338
Patch By: Vladislav
Refs: https://code.wildfiregames.com/D317

This was SVN commit r19421.
2017-04-16 23:59:20 +00:00
elexis b856ec5ea4 Update the Minimap texture if the waterheight has changed.
Differential Revision: https://code.wildfiregames.com/D344
Patch By: Sandarac
Reviewed By: Vladislav
Refs https://code.wildfiregames.com/D229

This was SVN commit r19420.
2017-04-16 22:13:32 +00:00
elexis 045dcd4823 Allow units without Cost component and use it for the Catafalque template.
Differential Revision: https://code.wildfiregames.com/D334
Reviewed By: Sandarac
This was SVN commit r19419.
2017-04-16 20:46:03 +00:00
fatherbushido 3731490e5a Use armor instead of armour in some strings reported by translators. Reviewed by wraitii and domdomegg.
Differential Revision: https://code.wildfiregames.com/D335
This was SVN commit r19418.
2017-04-16 11:42:15 +00:00
mimo 1639a88627 petra: fix typo from 3c56638e8b
This was SVN commit r19417.
2017-04-15 16:16:58 +00:00
wraitii e7c9559c21 Fix a small mistake in GarrisonHolder.JS that prevented healing-while-garrisoned in rare cases.
Reviewed by fatherbushido.

Differential Revision: https://code.wildfiregames.com/D336
This was SVN commit r19416.
2017-04-15 09:19:36 +00:00
elexis 5462f26aba Move CinemaPath class to the simulation helper directory, because it contains predominantly simulation data that is already serialized.
The remaining graphics code should be moved or removed.

Differential Revision: https://code.wildfiregames.com/D324
Patch By: Vladislav
This was SVN commit r19414.
2017-04-14 23:20:49 +00:00
mimo 78121ff82c fix request-attack broken by d9d1f1bbeb
This was SVN commit r19413.
2017-04-14 19:00:14 +00:00
mimo ed5d8f749e Fix in-game bandbox when gui.scale is not 1
Patch by Dariost
Differential Revision: https://code.wildfiregames.com/D321
This was SVN commit r19411.
2017-04-13 08:11:29 +00:00
wraitii d15b35357e Show effects of game-start tech modifications in Structure Tree.
This also refactors code so that external callers will have an easier
time getting a template value as modified by technologies.

Patch by s0600204.

Reviewed by bb and wraitii.
Differential Revision: https://code.wildfiregames.com/D154
This was SVN commit r19410.
2017-04-11 14:36:30 +00:00
Imarok 16afbf32c8 Fix CChart scaling edgecases (constant value and infinity)
Reviewed by: vladislavbelov
Differential Revision: https://code.wildfiregames.com/D167
This was SVN commit r19408.
2017-04-11 12:27:21 +00:00
elexis 2e37e6a8d9 Remove redundant path name argument from the CinemaManager AddPath function.
Differential Revision: https://code.wildfiregames.com/D310
Patch By: Vladislav
This was SVN commit r19406.
2017-04-11 01:37:00 +00:00
elexis 65cbf12b7e Don't throw NetServer FSM errors if a client presses not-ready just before the host launches the game.
Differential Revision: https://code.wildfiregames.com/D290
Reviewed By: Imarok
Refs #3199

This was SVN commit r19404.
2017-04-10 16:52:52 +00:00
Imarok ee987d3b0d Add some consts to ShaderProgram functions
Reviewed by: vladislavbelov
Differential Revision: https://code.wildfiregames.com/D315
This was SVN commit r19403.
2017-04-10 15:44:33 +00:00
elexis 023e6ca072 Allow the host to pause the game, even if in observer mode.
Patch By: andy5995
Fixes #4520

This was SVN commit r19401.
2017-04-10 00:09:33 +00:00
elexis e4b4126293 Fix Units demo map following the addition of the special filter templates in D215 / d093f714d7.
Expose the FindAllPlaceableTemplates function to the simulation to
remove the hardcoded directory checks as suggested by fatherbushido.
Add the new special template directory from D176 / cd6c31e76e.
Move the code from XML to JS.

Differential Revision: https://code.wildfiregames.com/D277
Reviewed By: Vladislav
This was SVN commit r19399.
2017-04-09 23:46:31 +00:00
elexis 1b3f92d6e4 Display relics in the hero panel.
Rename the buttonset to panelEntities and unify related health tooltips.

Differential Revision: https://code.wildfiregames.com/D289
Reviewed By: Sandarac
Refs #3000

This was SVN commit r19398.
2017-04-09 23:10:50 +00:00
elexis af4466bc99 Update ready state immediately when receiving the message.
Differential Revision: https://code.wildfiregames.com/D304
Reviewed By: Vladislav
Refs #2447

This was SVN commit r19396.
2017-04-09 22:59:04 +00:00
elexis 2f02fb4535 Move OpenGL CinemaPath rendering code to the CinemaManager, so that the remaining simulation data can be moved to the simulation directory.
Add height indicator so that we can actually estimate the location of
the paths in atlas.

Differential Revision: https://code.wildfiregames.com/D306
Patch By: Vladislav
This was SVN commit r19394.
2017-04-09 17:21:01 +00:00
elexis 290e67dc32 Add cinematic page to the atlas editor with one option to enable rendering of existing paths.
Differential Revision: https://code.wildfiregames.com/D301
Patch By: Vladislav
This was SVN commit r19391.
2017-04-09 02:12:20 +00:00
elexis ab2aa4b91b Nerf champion infantry spearmen slightly, so that they lose in direct combat versus champion infantry swordsmen but win against the same if equally backed up by citizen soldiers.
Differential Revision: https://code.wildfiregames.com/D186
Patch By: Grugnas
Reviewed By: borg-
This was SVN commit r19390.
2017-04-08 23:24:44 +00:00
Itms 32c0dc773e Fix memory leak in CCmpPathfinder, patch by Sandarac.
The terrain grid can be renewed without proper deallocation, which
happens at least at the start of a game when MT_TerrainChanged is sent.

Reviewers: wraitii, Itms

Differential Revision: https://code.wildfiregames.com/D247
This was SVN commit r19388.
2017-04-08 15:58:10 +00:00
elexis 2aae9eaaf1 Resource Trickle tooltip.
Add early return to hide loot tooltip if there is no loot (for mods).

Differential Revision: https://code.wildfiregames.com/D292
Reviewed By: fatherbushido
Fixes #4118

This was SVN commit r19387.
2017-04-08 06:45:22 +00:00
elexis d88775017c ...and keep the naming consistent.
This was SVN commit r19386.
2017-04-08 06:11:24 +00:00
elexis 81e267c5f4 Add selection group for catafalque relics as proposed by fatherbushido.
This way they are bundled when selecting them and doubleclicking on them
will select all of them.

This was SVN commit r19385.
2017-04-08 05:28:52 +00:00
elexis 43d627a723 Fix three catafalque auras.
The looter one didn't work at all, the armor one wasn't working as
intended and the max pop one worked but didn't use the proper type.
Order resources in the usual way.
Remove second newline at the end of XML files.

Differential Revision: https://code.wildfiregames.com/D291
Patch By: Hannibal Baraq
This was SVN commit r19384.
2017-04-08 03:39:53 +00:00
elexis 7f07237bba Serialize the queue of cinematic paths playing and resume upon deserialization. Thereby fix an OOS on rejoin when a cinematic path is playing.
Move path de/serialization to private helper functions.

Differential Revision: https://code.wildfiregames.com/D299
Patch By: Vladislav
Refs #3814

This was SVN commit r19382.
2017-04-08 00:10:02 +00:00
elexis 35f7dddbf8 Fix copy & past error in the initial petra AI relic support of 5dcc52f46a. Reported by bb, patch by Sandarac.
This was SVN commit r19381.
2017-04-07 17:23:08 +00:00
elexis ee41e3fd16 Move multiplayer host and join page to a new directory, as it is not related nor doesn't share anything with the gamesetup.
Differential Revision: https://code.wildfiregames.com/D298
Reviewed By: wraitii
This was SVN commit r19380.
2017-04-07 16:44:09 +00:00
fatherbushido 874ee51337 Fix application of tech modifications within the Upgrade component. Patch by s0600204.
Differential Revision: https://code.wildfiregames.com/D146
This was SVN commit r19379.
2017-04-05 15:27:59 +00:00
elexis 2ce840bab3 Handle relics that are destroyed for any reason and maps that have no gaia entities at all.
Differential Revision: https://code.wildfiregames.com/D283
Reviewed By: Sandarac
This was SVN commit r19378.
2017-04-05 04:14:19 +00:00
elexis ffea346abb Atlas camera controls should be disabled too if a cinematic path is paused.
Reviewed By: Vladislav
This was SVN commit r19376.
2017-04-05 04:00:19 +00:00
elexis 5d49e6c456 Move most cinematic path simulation data and control from the graphics class to the simulation component and solve the hash mimatch in non-visual replay.
Move graphics code to smaller helper functions UpdateSessionVisibility,
UpdateSilhouettesVisibility and DrawPaths.
Remove the hotkey TODO code which should be implemented differently.
Mark voids as const.

Differential Revision: https://code.wildfiregames.com/D271
Patch By: Vladislav
This was SVN commit r19375.
2017-04-05 03:59:20 +00:00
Itms c0708da215 Fix the Mustang template. Add tests for the UnitMotionFlying component.
Patch by bb.
Reviewers: Itms

Differential Revision: https://code.wildfiregames.com/D139
This was SVN commit r19373.
2017-04-03 09:58:01 +00:00
Pureon 9c7188ea02 Icon updates
This was SVN commit r19371.
2017-04-02 21:05:10 +00:00
elexis 7f8d57a1f0 Catafalque templates and auras for each civilization.
Patch By: Hanibal Barca aka Hannibal_Baraq
Differential Revision: https://code.wildfiregames.com/D269
Strings Reviewed By: Gallaecio
Balancing Reviewed By: borg-, Grugnas
Addresses few issues found by fatherbushido

This was SVN commit r19370.
2017-04-02 20:50:30 +00:00
fatherbushido 369943426f Make Builder list of some units more consistent. Patch by Grugnas. Reviewed by elexis and wraitii.
Differential Revision: https://code.wildfiregames.com/D262
This was SVN commit r19369.
2017-04-02 09:16:25 +00:00
elexis 6289cd9e99 Fix an error on Survival of the Fittest in 18e7d8a518 in case a player has won and lost the civic center.
Patch By: bb
Differential Revision: https://code.wildfiregames.com/D275
This was SVN commit r19368.
2017-04-01 21:16:59 +00:00
elexis 1e07787e76 Revert 64bit number conversions added in c0ca70efd2, don't add the previous long and unsigned long conversions back and use double in the Replay menu.
64bit conversions (including the long ones) are not safe, because not
every number can be converted to the 2^53 JS numbers and pretending to
do so is asking for bugs.
Explicitly use the double type in the Replay menu, because std::time_t
is unspecified and some platforms like Ubuntu yakkety:i386 fail to
build, looking for long.
Double should work for the next 285 million years, becomes consistent
with SavedGame.cpp, is tested by test_ScriptConversions.cpp and doesn't
pretend to cover all 64bit numbers.

Patch By: echotangoecho
Differential Revision: https://code.wildfiregames.com/D205
Refs #3848 D84 D112

This was SVN commit r19367.
2017-04-01 21:06:55 +00:00
fatherbushido c664fb7b6d Split the automatic aiming function of PerfomAttack for ranged attacks.
Summary:
PerformAttack uses an automatic aiming logic for ranged attacks.
Splitting it would allow to fix some issues with that function, to test
it individually, make it usable as a globalscript for other logic (or
even to disable the automatic aiming based on template).
That patch is just about the splitting, I didn't change it.
Also use only the max range and not the elevation adapted one to scale
the spread (which makes more sense and also avoid computation).

Test Plan: send a javelin?

Reviewers: O2 JS Simulation, wraitii, elexis

Reviewed By: O2 JS Simulation, wraitii, elexis
Subscribers: Vulcan, elexis, leper

Differential Revision: https://code.wildfiregames.com/D272
This was SVN commit r19366.
2017-04-01 07:16:46 +00:00
wraitii 173a7dc214 Change clearance of large land units from 4 to 3, clearance of large ships from 12 to 10. This makes these units far more usable.
Reviewed by Elexis and Fatherbushido.
Differential Revision: https://code.wildfiregames.com/D253
This was SVN commit r19365.
2017-03-31 14:50:04 +00:00
fatherbushido 38a30ea563 Remove useless TemplateManager existence check and extend the related test
Summary: cf c9b0db7f5f

Test Plan: -

Reviewers: vladislavbelov, elexis

Reviewed By: vladislavbelov, elexis
Subscribers: Vulcan

Differential Revision: https://code.wildfiregames.com/D279
This was SVN commit r19363.
2017-03-30 19:53:25 +00:00
fatherbushido dcecda399f Remove some cost leftover in civ specific templates. Patch by Grugnas.
Differential Revision: https://code.wildfiregames.com/D197
This was SVN commit r19362.
2017-03-30 17:05:23 +00:00
elexis 4f3891fa3a Merge the wolf with the snow wolf template.
Rename the special wolf template that reacts to UnitAI attack orders to
fauna_wolf_snow_attack, so that the name becomes agnostic of the way how
it achieves that.

Differential Revision: https://code.wildfiregames.com/D257
Reviewed By: fatherbushido
This was SVN commit r19361.
2017-03-30 11:59:46 +00:00
elexis 96f5edf32d Minimum attack range tooltip.
Differential Revision: https://code.wildfiregames.com/D267
Reviewed By: Gallaecio
Refs #4421 D111

This was SVN commit r19360.
2017-03-29 21:40:56 +00:00
elexis 18e7d8a518 Survival Of The Fittest Overhaul
Exponential attacker increase to prevent boring endless games.
Add a gaia hero per player at later stages of the game (if the previous
one isn't alive anymore).
Remove hardcoded template array and include gimmick templates (gaia),
most notably the fireraiser which we never saw before and the siege
tower.
Remove treasure picker female after defeat to prevent confusion with
treasure on the minimap.
Add flag to the spawnpoints, so that new players know where the enemies
actually come from, as proposed by bbleft and Hannibal Barca.
Move all balancing constants to the top of the file.
Actively chose attacker composition instead of having it relate to the
number of templates that exist.
Add debug output option, so that we can replay games and see which enemy
wave composition attacked at which time.
Add dry run, so that we can test the balancing effects from a non-visual
replay instead of having to play some game.
Remove many unused variables and some pointless tile classes from the
mapgen.
Whitespace and various code style cleanup, moving code to shorter, more
readable functions.

Reviewed By: bb
Differential Revision: https://code.wildfiregames.com/D145
This was SVN commit r19359.
2017-03-29 16:06:11 +00:00
elexis f7a2c3d02c Fix a934dfad5f, add an early return when pressing the massbarter hotkey in observermode.
Differential Revision: https://code.wildfiregames.com/D273
Reviewed By: user1
This was SVN commit r19358.
2017-03-28 23:36:55 +00:00
mimo d0f6489526 counter espionage
New tech to increase the cost for other players to bribe your units (by
50%).
Move the spy tech and this new one to the cicil center.
Decrease the spy cost to 500 metal.
Include the patch from D173 because of conflicts.

Reviewed By: elexis, Gallaecio
Differential Revision: https://code.wildfiregames.com/D179
This was SVN commit r19357.
2017-03-28 21:37:53 +00:00
mimo 5dcc52f46a Petra: Initial Capture The Relic support
Patch by Sandarac
Differential Revision: https://code.wildfiregames.com/D236
This was SVN commit r19356.
2017-03-28 18:51:10 +00:00
elexis da2b89583a Replace many deprecated randInt calls with randBool.
Add optional probability to randBool to receive true and use where
applicable.

Patch By: bb
Differential Revision: https://code.wildfiregames.com/D235
Refs #4326 D121

This was SVN commit r19355.
2017-03-28 04:28:55 +00:00
elexis a934dfad5f Add barter buttons to the trade window for quicker access and to support mods with more than four resource types.
The dialog is resized automatically and can be opened with a new hotkey.

Patch By: s0600204
Differential Revision: https://code.wildfiregames.com/D88
Fixes #4366
Refs #3934

This was SVN commit r19354.
2017-03-28 02:34:32 +00:00
elexis dbd56403b9 Allow hiding of list columns via XML or JS.
Differential Revision: https://code.wildfiregames.com/D228
Reviewed By: Vladislav
This was SVN commit r19353.
2017-03-28 00:25:17 +00:00
elexis bc3ed4f474 Keep RELAX NG compact syntax file describing the GUI properties in sync with the RELAX NG XML schema counterpart following b8fce56821.
Difference reproducible with trang.

Reviewed By: Vladislav
Refs #2405

This was SVN commit r19352.
2017-03-28 00:12:05 +00:00
elexis 10b49f9c18 Add sortable columns to the loading screen and a compatibility filter for saved games.
Replace the unexplained orange and red colorization and replace it with
the greyout equal to the replay menu,
as the difference between compatibility types is explained when trying
to load the game.
Rename the ambiguous generateLabel to generateSavegameLabel.

Patch By: Vladislav
Differential Revision: https://code.wildfiregames.com/D246
This was SVN commit r19351.
2017-03-27 12:55:43 +00:00
fatherbushido cedf7a33aa Unit tests for JS Pack component
Summary: Unit tests.

Test Plan: Irrelevant.

Reviewers: O2 JS Simulation, Itms, wraitii

Reviewed By: O2 JS Simulation, wraitii
Subscribers: O8 JS GUI, O14 Maps, O6 AI, Sandarac, Vulcan

Differential Revision: https://code.wildfiregames.com/D240
This was SVN commit r19350.
2017-03-27 12:40:49 +00:00
elexis 32655c0e38 Pillar / Monument cleanup.
Prevent Iberian players from covering their entire territory with the
attack bonus giving monument as proposed by mimo.
Indirect aura range indication with the build restrictions for the trade
bonus yielding mauryan pillar.
Disable capturing of mauryan pillar equally to the iberian one following
60a2af2988 (so that the entire territory doesn't switch ownership
quickly).
Add the missing name for the mauryan pillar, so that the aura bonus
tooltip shows up, as reported by Grugnas.

Differential Revision: https://code.wildfiregames.com/D196
Reviewed By: Grugnas
Fixes #4412

This was SVN commit r19348.
2017-03-26 01:09:21 +00:00
wraitii 4523c50850 Fix a vertex shader data pielup in the actor editor. It was reloading the shaders far too often.
Patch by Echotangoecho.
Differential Revision: https://code.wildfiregames.com/D93
This was SVN commit r19346.
2017-03-25 07:44:31 +00:00
elexis 35377c51a7 Capture The Relic gamemode.
Patch By: Sandarac
Differential Revision: https://code.wildfiregames.com/D152
This was SVN commit r19345.
2017-03-25 07:01:07 +00:00
elexis 27f37ccd21 Cleanup the rest of the mess introduced with the NonGaiaEntities functions in 8c7b6dceaa.
Add a test for the GetNonGaiaEntities function of the RangeManager
broken by that commit that was fixed by f3e4e619bc.
Don't call one script function from another, but directly call into the
Selection helper like the others.
Don't make a loop around that RangeManager function for all players but
call the function once for all players.
The pointless virtual keywords were removed by 8827db201a.

Differential Revision: https://code.wildfiregames.com/D166
Reviewed By: leper
This was SVN commit r19344.
2017-03-25 02:42:51 +00:00
leper b9441a6a8d Ensure m_Territory in cmpTerriotryManager.IsTerritoryBlinking. Fixes #4466.
Patch By: Sandarac
Differential Revision: https://code.wildfiregames.com/D261
This was SVN commit r19343.
2017-03-25 01:43:14 +00:00
leper e69e10ef5f Small RangeManager cleanup.
Use std::set's logarithmic find instead of a linear loop.
Early return and some whitespace for getParabolicRangeForm.

Reviewed By: elexis
Differential Revision: https://code.wildfiregames.com/D260
This was SVN commit r19342.
2017-03-25 00:11:08 +00:00
leper 9e6571c461 Some cinema path cleanup.
Could possibly fix a compilation failure with some compilers in
36330732fa.

Patch By: Vladislav
Differential Revision: https://code.wildfiregames.com/D250
This was SVN commit r19341.
2017-03-24 22:49:06 +00:00
leper 9f50bf3f1e Only dereference cmpWaterManager if it is non-null.
Reviewed By: elexis
Differential Revision: https://code.wildfiregames.com/D259
This was SVN commit r19340.
2017-03-24 21:32:49 +00:00
leper 3648ba448d Some const for scriptinterface.
Reviewed By: Itms
Differential Revision: https://code.wildfiregames.com/D155
This was SVN commit r19339.
2017-03-24 18:47:03 +00:00
fatherbushido 9cf84c6800 Fix documentation of non system component.
Summary: -

Test Plan: -

Reviewers: Itms, leper

Reviewed By: leper
Subscribers: Vulcan, O1 C++ Simulation

Differential Revision: https://code.wildfiregames.com/D221
This was SVN commit r19337.
2017-03-24 07:09:28 +00:00
Pureon d7b32a5c25 Farming tech icon update
This was SVN commit r19336.
2017-03-23 23:11:01 +00:00
elexis 71f3fdd859 Whale should not break naval gameplay by blocking ships in the middle of an improtant battle.
Differential Revision: https://code.wildfiregames.com/D188
Reviewed By: wraitii, Enrique
Also valuable input from Sandarac and bb

This was SVN commit r19334.
2017-03-23 22:44:43 +00:00
elexis c279283d82 Large passability class for hero elephants.
Elephant now a VisibleClass so that players know which of the heroes the
elephant one is.

Differential Revision: https://code.wildfiregames.com/D251
Reviewed By: fatherbushido
This was SVN commit r19333.
2017-03-23 22:14:38 +00:00
Pureon e8ae384eb6 Updates + cleanup tech icons
This was SVN commit r19332.
2017-03-23 21:56:01 +00:00
elexis ba86a79c44 Buff war dogs slightly and make them slower to train.
Limit them to 50 because they have no pop cost attached.
Their use was nerfed a bit too much in 13b229d503.

Patch By: Grugnas
Differential Revision: https://code.wildfiregames.com/D234
Reviewed By: fatherbushido, borg-
This was SVN commit r19331.
2017-03-23 21:43:52 +00:00
elexis 46320a5447 Only britons should be able to train war dogs from captured kennels.
This was the last building with this capturing bug.

Differential Revision: https://code.wildfiregames.com/D255
Reviewed By: fatherbushido, Grugnas
This was SVN commit r19330.
2017-03-23 21:37:34 +00:00
elexis ad17e320be Rename the Female identity class to FemaleCitizen, because it is intended for female support units only.
Thus prevent template editors from adding that tag to female military
units and
allow modders to add a Female class for wider purposes.
Remove the FemaleCitizen training restriction category that was added
for debug purposes but forgotton to be removed in 7e21db08d5.

Differential Revision: https://code.wildfiregames.com/D244
Reviewed By: fatherbushido
Refs: #1432 #4490

This was SVN commit r19329.
2017-03-23 17:54:36 +00:00
elexis 9f018c48e0 Revert the addition of the Female identity class to the Boudica heroine from 83680b0dee, because that tag is only intended for female support citizens.
Differential Revision: https://code.wildfiregames.com/D242
Reviewed By: fatherbushido
This was SVN commit r19328.
2017-03-23 17:44:27 +00:00
elexis 676a9ccb40 Move catafalque actor to global (as it is not civ specific).
As recommended by Enrique and Pureon.

This was SVN commit r19327.
2017-03-23 03:50:02 +00:00
Pureon 159ae93beb A few icon updates
This was SVN commit r19326.
2017-03-22 23:24:17 +00:00
elexis ff452de1f7 Mark GetAnimationName as const
Differential Revision: https://code.wildfiregames.com/D248
Reviewed By: leper
This was SVN commit r19325.
2017-03-22 23:07:01 +00:00
elexis 0c68147e1a Fix a broken string in the User Report panel of the main menu.
Differential Revision: https://code.wildfiregames.com/D239
Reviewed By: Gallaecio
This was SVN commit r19324.
2017-03-22 22:51:42 +00:00
elexis cd6c31e76e Revert UnitAI changes of 79fb493da3 (besides the patrol comment) and use an exotic template instead.
The originally intended approach to support move-orders independent of
the Identity classes can be discussed in an independent proposal.

Reviewed By: fatherbushido
Differential Revision: https://code.wildfiregames.com/D176
This was SVN commit r19323.
2017-03-22 22:38:22 +00:00
elexis 19f9fa17fa Resource trickle for wonders, highlighting their trait of being the most magnificent building.
Differential Revision: https://code.wildfiregames.com/D243
Reviewed By: fatherbushido
Idea by borg-, numbers confirmed by Hannibal Barca, floating point
number format confirmed by wraitii.

This was SVN commit r19322.
2017-03-22 15:01:26 +00:00
Imarok fdda57565b Display which clients are still in the loading screen
Reviewed by: elexis
Differential Revision: https://code.wildfiregames.com/D120
Fixes #4375

This was SVN commit r19320.
2017-03-21 18:50:29 +00:00
elexis a3ea45509b Cinematic path demo map
Patch By: Vladislav
Refs #3301 #3814

This was SVN commit r19319.
2017-03-21 00:33:44 +00:00
elexis b675a0154a Fix a warning in 655ce95468 when opening the leaderboard in the lobby and returning without having a player selected.
Reported by: Vladislav
Patch By: fpre
This was SVN commit r19318.
2017-03-20 23:55:02 +00:00
elexis 36330732fa Allow Cinematic Path nodes that only specify a camera position or direction and group them by deltatime.
Remove the support of saving the rotation of camera position nodes,
because that should be rewritten to use a custom spline.

Patch By: Vladislav
Differential Revision: https://code.wildfiregames.com/D124
Refs #3814

This was SVN commit r19317.
2017-03-20 15:26:34 +00:00
Enrique 76c7731076 Catafalque wagon unit
This was SVN commit r19316.
2017-03-20 13:16:15 +00:00
elexis 9b28ce3463 Enable late observers by default.
Differential Revision: https://code.wildfiregames.com/D217
Reviewed By: scythetwirler, Imarok, bb, echotangoecho, Hannibal_Barca,
fpre

This was SVN commit r19314.
2017-03-19 22:56:13 +00:00
mimo a4c9fd193a Petra: Let getBestBase optionally check for fully-constructed bases
Patch by Sandarac
Reviewed By: mimo
Differential Revision: https://code.wildfiregames.com/D237
This was SVN commit r19313.
2017-03-19 10:35:22 +00:00
Pureon 19c828f050 New victory + defeat icons. Fertilizer tech icon
This was SVN commit r19312.
2017-03-19 00:08:46 +00:00
elexis 33a0af2e57 Display the formations panel if and only if the selected units can enter a formation (instead of hiding it if any domestic animal is part of the selection).
Differential Revision: https://code.wildfiregames.com/D191
Reviewed By: mimo
This was SVN commit r19311.
2017-03-17 22:46:42 +00:00
elexis 4bcae3190b Fix a reference error in ddfc985586 noticed by Sandarac.
Reviewed By: bb
This was SVN commit r19309.
2017-03-17 13:07:23 +00:00
elexis da5463d135 Prevent lobby players from hosting games with empty servernames.
Display a notification instead of using the default port if an invalid
one was specified.

Patch By: Vladislav
Refs #4402

This was SVN commit r19307.
2017-03-17 01:51:54 +00:00
elexis 208b5b6dd8 Use a minimum height of at least one space character of the current font size when drawing list rows.
Use the maximum height of all cells of the current row.
Lobby games with empty servernames are not rendered weirdly anymore.

Patch By: Vladislav
Fixes #4402

This was SVN commit r19306.
2017-03-17 01:10:49 +00:00
elexis ddfc985586 Use pickRandom in random map scripts.
Avoids helper index variables, replacing deprecated randInt calls,
making the code shorter and nicer to read.

Patch By: bb
Differential Revision: https://code.wildfiregames.com/D222
Refs #4326 https://code.wildfiregames.com/D121

This was SVN commit r19305.
2017-03-16 21:30:10 +00:00
elexis f1e31cb823 Fix an oversight in 3d61854fc3: Spartan females should remain able to attack heroes.
Differential Revision: D226
Patch By: Grugnas
Refs #1487

This was SVN commit r19303.
2017-03-16 20:06:48 +00:00
elexis d093f714d7 Use XML files instead of hardcoded C++ code in the template manager to universally change template properties at load time.
Patch By: leper
Differential Revision: https://code.wildfiregames.com/D215
Fixes #2951

This was SVN commit r19302.
2017-03-16 19:56:12 +00:00
elexis 59efb76966 Don't show Boudica as an idle worker.
Patch By: Boudica
Differential Revision: https://code.wildfiregames.com/D223
This was SVN commit r19301.
2017-03-16 19:16:36 +00:00
elexis 8c2a5f7bc8 Ensure that the quote of the day isn't empty by filtering blank lines.
Patch By: Sandarac
Differential Revision: https://code.wildfiregames.com/D224
This was SVN commit r19300.
2017-03-16 19:11:27 +00:00
elexis c288a91c6d Add a GetAnimationName getter function for the VisualActor component, so that the simulation can not only set an animation but also find out which one is currently being played.
Differential Revision: https://code.wildfiregames.com/D219
Reviewed By: bb
This was SVN commit r19299.
2017-03-15 14:27:51 +00:00
mimo fd22da55ce few tunings on houses
Summary:
- currently a fully garrisoned small house (as gaul) decays when outside
territory while a big house (as athen) doesn't because of the
garrisoning capacity. I propose to prevent both from decaying by
decreasing by half their TerritoryDecay.DecayRate (as we may understand
that an invading influence will quickly spread through official
buildings, but not inside houses where people will follow their
traditions).
- futhermore, as all garrisoned structures, the garrisoned units inside
houses have a GarrisonRegenRate of 5, which imo is too big for houses
(specially that currently only support units can be garrisoned inside)
and could be decreased a bit, although keeping
maxGarrison*GarrisonRegenRate > TerritoryDecay.DecayRate to prevent the
decay. Going from 5 to 4 works (could also be further decreased  if we
also further decrease the DecayRate).
- popBonus tech: there is currently a tech to increase the popBonus of
houses by 20% already available in village phase. But for village phase,
its price is quite high and it's better to build houses. So i propose to
switch it to town phase and to add another one at city phase so that
each phase upgrade will allow to improve this house popBonus
- finally, as we have a loom icon, better use it for the loom technology
from the houses

Reviewed By: elexis and fatherbushido
Differential Revision: https://code.wildfiregames.com/D220
This was SVN commit r19298.
2017-03-14 18:53:32 +00:00
mimo 34cbbfa371 increase size of victory/defeat icon from 26x27 to 32x32
This was SVN commit r19297.
2017-03-13 22:35:26 +00:00
elexis 3d61854fc3 Prevent animals from attacking siege engines and ships, prevent females from attacking ships and heroes.
Overviewed by fatherbushido, refs #1487.

This was SVN commit r19296.
2017-03-13 17:51:37 +00:00
elexis 6e4e396cb5 Merge duplicate elephant templates to a new inherited template. Patch by fatherbushido, refs #1487.
Prevent these elephants from attacking structures, which can happen
incidentally if the animal is attacked by garrisoned arrows that were
meant to hit attacking players and because that is unexpected to players
and had been reported as a bug and cheating players.
Prevent them from attacking ships, because they can't reach them in most
cases.

Unifty their Attack stats that had neglible differences, besides the
missing Crush damage of the North African Elephant variant, forgotton to
make consistent in 4ca43e453e with 71108ff458.
Add the large passability class to the North African and Asian elephant,
which was forgotton by 1e79b3a8af.

This was SVN commit r19295.
2017-03-13 17:02:50 +00:00
Pureon 4673b6a371 Tech icon updates
This was SVN commit r19293.
2017-03-12 23:46:16 +00:00
Pureon ee41b83b7a Tech icon updates
This was SVN commit r19292.
2017-03-12 21:09:34 +00:00
elexis c09b0e863a Fix 39fcd1d031 and move handleKick below init, because the last should remain the first.
Reviewed By: Imarok
Differential-Revision: https://code.wildfiregames.com/D216

This was SVN commit r19291.
2017-03-12 16:14:09 +00:00
elexis d2948646f3 Skirmish map Corinthian Isthmus (4) by Stan, fixes #2881.
This was SVN commit r19290.
2017-03-12 05:00:21 +00:00
Pureon 9b88a1d389 Tech icon updates
This was SVN commit r19289.
2017-03-11 23:59:29 +00:00
FeXoR b220d174c5 Fixes a bug that caused an error when distributeEntitiesByHeight() in hightmap.js was called with arguments that didn't result in any return value.
Differential Revision: https://code.wildfiregames.com/D114
Revieved by: elexis
Fixed #4152.

This was SVN commit r19288.
2017-03-11 14:54:24 +00:00
elexis 655ce95468 Upon selecting a player in the lobby, select the game where he/she is currently playing, observing or offline.
Select in that order to account for players that occur in multiple
games.

Patch By: fpre (a.k.a. ffffffff)
Feature design reviewed by: scythetwirler
Differential Revision: https://code.wildfiregames.com/D208
This was SVN commit r19287.
2017-03-11 06:37:00 +00:00
elexis b843da7384 Use pickRandom for setSkySet calls.
Patch By: bb
D1fferental-Revision: https://code.wildfiregames.com/D121

This was SVN commit r19286.
2017-03-11 04:36:41 +00:00
scythetwirler f430406e7f Remove extra SendGameList call
Reviewed By: elexis
Differential Revision: https://code.wildfiregames.com/D207
This was SVN commit r19285.
2017-03-11 02:42:55 +00:00
scythetwirler a6bdce8341 Remove Macedonian Fortress cost bonus
Patch by Grugnas
Reviewed By: elexis, scythetwirler, fatherbushido
Differential Revision: https://code.wildfiregames.com/D203
This was SVN commit r19284.
2017-03-11 02:12:48 +00:00
elexis f98100bdaf Replace more than 30 duplicate grass tuft placement calls with a single function call.
Remove few obsolete hillSize variables.
Remove one duplicate undesired grass tuft placement call from flood.

Differential Revision: https://code.wildfiregames.com/D201
Reviewed By: bb
This was SVN commit r19282.
2017-03-09 12:18:14 +00:00
mimo 5b699e29ea Petra: do not uselessly assign citizen-soldier guards
Summary: This further improves Petra's handling of citizen-soldier
guards, so that it does not repeatedly add guards when there are few
available workers.
Patch by Sandarac, follow up of aadf9d70f6 (D165)
Differential Revision: https://code.wildfiregames.com/D202
This was SVN commit r19281.
2017-03-08 18:16:32 +00:00
Enrique 265bdd192d Fixed a problem with the hellenic faction fortresses, where old version of the props was used on the fortress death variation reported by elexis.
This was SVN commit r19280.
2017-03-08 08:39:41 +00:00
mimo 00aa8b3c02 switch to the new bribe icon
This was SVN commit r19279.
2017-03-06 22:42:03 +00:00
Pureon 8f01868cce Bribes icon
This was SVN commit r19278.
2017-03-06 22:13:07 +00:00
Pureon a6bd32c0c0 Updated Wonder structure icon
This was SVN commit r19277.
2017-03-06 21:52:03 +00:00
mimo caabffd70a create maps/tutorials folder and move the starting_economy_walkthrough map there for the tutorial patch (D179) as these maps are currently useless (tutorialAI broken) and phabricator does not deal correctly with such changes
This was SVN commit r19276.
2017-03-06 21:29:45 +00:00
mimo 21798caa45 petra support of disabled technologies, fixes #4500
Reviewed By: Sandarac
Differential Revision: https://code.wildfiregames.com/D178
This was SVN commit r19275.
2017-03-06 19:23:18 +00:00
elexis 46eb20c5ea Ships should not heal units. Patch Stan, fixes #4398.
This was SVN commit r19274.
2017-03-06 14:18:21 +00:00
elexis 0b20e8c5f0 Private chat hotkey.
Patch by: OptimusShepard
Differential Revision: https://code.wildfiregames.com/D163
Fixes #4422.

This was SVN commit r19272.
2017-03-04 21:24:14 +00:00
elexis 08fbf223f6 Unify random integer and float helper functions of GUI, Simulation and AI.
Patch By: bb
Differential Revision: D121
Refs: #4326

Removes the Random.js simulation helper and randomFloat function of the
random map scripts library.
Adds randomIntInclusive and randomIntExclusive to make the calls more
readable and fix and prevent off-by-one mistakes.
Adds randBool and use it in an AI occurance. It will be used in many
places by the random map scripts.
Use the pickRandom function introduced in 3c56638e8b in more applicable
occurances.
Replace remaining occurances of Math.random() with the new functions to
easily test completeness.

Cleanup of the random map script functions will come in a separate
commit.

This was SVN commit r19270.
2017-03-03 21:13:10 +00:00
mimo 487737b407 petra: fix an undefined variable, and remove some unneeded array conversion
This was SVN commit r19269.
2017-03-03 17:35:35 +00:00
elexis 380a429fc9 Move ingame time and ceasefire timer code from gui/common/ to gui/session/.
Use an array instead of string concatenation to avoid duplication and to
enforce newlines on the syntax layer.
Move closeDiplomacy and toggleDiplomacy to openDiplomacy.

Differential Revision: https://code.wildfiregames.com/D183
Reviewed By: bb
This was SVN commit r19268.
2017-03-03 15:12:50 +00:00
elexis 399ba92058 Update the Offline hint in the selection panel immediately when a player rejoins or disconnects instead of waiting for the next turn.
Differential Revision: https://code.wildfiregames.com/D182
Reviewed By: Imarok
This was SVN commit r19266.
2017-03-03 00:10:40 +00:00
elexis e75fc5080d Display a phase name tooltip in the structure tree.
Remove duplication and use ES6 startsWith instead of substr.

Differential Revision: https://code.wildfiregames.com/D110
Reviewed By: s0600204
This was SVN commit r19265.
2017-03-03 00:04:38 +00:00
scythetwirler 17068bbf82 Update Lobby Bot README.
Reviewers: Itms

Reviewed By: Itms
Differential Revision: https://code.wildfiregames.com/D79
This was SVN commit r19264.
2017-03-02 19:19:45 +00:00
elexis 38aefa96d4 Remove Iberian walls from Polar Sea, make debug messages optional and make wolves ignore sheep in their initial attack.
Start the first wave minute 5 instead of 3 so that players have more
time to invest their initial wood.
Add two missing semicolons.

Differential Revision: https://code.wildfiregames.com/D184
Reviewed By: Hannibal_Barca
This was SVN commit r19263.
2017-03-02 18:50:19 +00:00
mimo aadf9d70f6 Petra: improve dynamic management of guard units
Summary:
Petra will not add guards when it has a low population, and will remove
any citizen-soldier guards so they can be used for other tasks.
Petra will also use a healer queue for training healer guards, and this
is done mainly so that Petra doesn't clog the villager queue with
healers, as villages should always have a higher priority. Also this
queue could be used in the future for training healer units for other
purposes.

Patch by Sandarac

Differential Revision: https://code.wildfiregames.com/D165
This was SVN commit r19262.
2017-03-02 18:37:40 +00:00
mimo c5d515721d add some missing semicolon
This was SVN commit r19261.
2017-03-02 18:12:22 +00:00
elexis 716af19f1c Add a GUI notification when the ceasefire ended so that devs and modders can do fancy things with that event and
use it to fix an oversight in 1022619d98 (the diplomacy dialog wasn't
updated).

Differential Revision: https://code.wildfiregames.com/D181
Reviewed By: mimo
This was SVN commit r19260.
2017-03-02 18:02:59 +00:00
fatherbushido 89e9c90ebc Unit test for VisionSharing component.
Summary: Following D117

Test Plan: -

Reviewers: mimo, Itms

Reviewed By: Itms
Subscribers: elexis, Vulcan

Differential Revision: https://code.wildfiregames.com/D170
This was SVN commit r19258.
2017-03-02 09:13:03 +00:00
mimo 1022619d98 cleanup of the updateDiplomacy functions
Summary: Following d9d1f1bbeb the diplomacy window is updated on each
tick, so we can remove the old updateDiplomacy function which now only
updates the player data, and rename updateDiplomacyPanel to
updateDiplomacy for consistency with other windows.

Reviewed By: elexis
Differential Revision: https://code.wildfiregames.com/D172
This was SVN commit r19257.
2017-03-01 20:15:12 +00:00
elexis 3be6460e88 Remove a TODO which was fixed by f3e4e619bc / D164.
This was SVN commit r19256.
2017-03-01 11:21:24 +00:00
mimo b80ea8bf07 Fix ambiguous tooltip in the trade window help
Reviewed By: Gallaecio
Differential Revision: https://code.wildfiregames.com/D168
This was SVN commit r19255.
2017-02-28 22:27:31 +00:00
elexis 79fb493da3 Polar Sea random map script.
Based on map by Hannibal Baraq.
Differential Revision: https://code.wildfiregames.com/D156
Map generation reviewed by FeXoR
Trigger Script and UnitAI change reviewed by Sandarac
Environment settings reviewed by niektb and wowgetoffyourcellphone

This was SVN commit r19254.
2017-02-28 20:53:51 +00:00
mimo 0c058d7d05 AddSpy should always return something
Reviewed By: fatherbushido
Differential Revision: https://code.wildfiregames.com/D175
This was SVN commit r19253.
2017-02-28 19:53:24 +00:00
Imarok e07b02980b Merge player caption and label in replay menu
Reviewed by elexis

https://code.wildfiregames.com/P29

This was SVN commit r19252.
2017-02-28 12:25:48 +00:00
Imarok cd1b190938 Some small replaymenu gui fixes
Reviewed by: elexis
Differential Revision: https://code.wildfiregames.com/D85
This was SVN commit r19251.
2017-02-28 12:06:37 +00:00
elexis 39fcd1d031 Implement clientside kick/ban support for the lobby.
Displays a chat notification for all lobby clients if a client is kicked
or banned, pop up a message box for the affected one, including the kick
reason.
Clean the player- and gamelist upon disconnect and disable the control
elements.

Reviewed By: Imarok
Differential Revision: https://code.wildfiregames.com/D116
This was SVN commit r19250.
2017-02-28 11:16:46 +00:00
elexis e14ad3c771 Focus camera on the spy after bribing it.
Reviewed By: mimo, Imarok
Differential Revision: https://code.wildfiregames.com/D169
This was SVN commit r19249.
2017-02-27 21:14:47 +00:00
Imarok 52d5c62f61 Fix oversight in 5f8f7bae20
Spotted and reviewed by elexis

This was SVN commit r19248.
2017-02-27 20:36:04 +00:00
mimo d9d1f1bbeb Add spying to the game
Summary:
With c2d0327af9 we can now add spying into the game: you have first to
research a tech (available in phase 3, espionage), and then you can
bribe a random unit (defined as Bribable in its template) from a chosen
player and share its vision during 15s.
There is also an option in the gamesetup to disable this feature,
analoguous to the treasure disabling option.
In the current version, only traders (land and naval ones) are
bribables.
Reviewed By: Itms, elexis
Differential Revision: https://code.wildfiregames.com/D117
This was SVN commit r19247.
2017-02-27 18:17:40 +00:00
mimo f3e4e619bc RangeManager returns Gaia entities in GetNonGaiaEntities
refs #4495
Reviewed By: leper, elexis
Differential Revision: https://code.wildfiregames.com/D164
This was SVN commit r19245.
2017-02-26 10:26:35 +00:00
elexis b6e9514029 Remove the (only) inconsistent UnitMotion walk speed entry in the civ specific unit templates (cavalry) and an unneeded one (ship).
Patch by: Grugnas
Differential Revision: https://code.wildfiregames.com/D162
This was SVN commit r19244.
2017-02-26 07:27:16 +00:00
leper b062fbef17 Stop relying on the internal structure of the current Trader component.
Get the required information by returning it in the proper places.
Also clean up some pointless modulo operations.
This code is pulled out of the Silk Road code (refs #4314).

Reviewed By: mimo
Differential Revision: https://code.wildfiregames.com/D161
This was SVN commit r19243.
2017-02-24 21:59:23 +00:00
mimo 360ba27865 Cleanup of CCmprangeManager
Summary: Following discussions in https://code.wildfiregames.com/D60 the
use of u8 to store each boolean has been cleanup up. Now only one u8 is
used, thus reducing the size of the struct.

Reviewed By: leper
Differential Revision: https://code.wildfiregames.com/D101
refs #3834

This was SVN commit r19242.
2017-02-24 19:15:54 +00:00
mimo b6d2fad596 Petra: assign guards to the hero in regicide games
Summary:
Petra will assign military units as guards to the hero in the regicide
victory condition, preferring any available Champion units.

Also this diff fixes a broken loop through a Map in D140/a443bcfa65 that
was introduced when switching `criticalEnts.guards` from a Set to a Map.

Patch by Sandarac

Differential Revision: https://code.wildfiregames.com/D157
This was SVN commit r19241.
2017-02-24 18:26:53 +00:00
leper a0a0895a12 Pass some strings and a vector as const refs.
Reviewed By: Imarok
Differential Revision: https://code.wildfiregames.com/D160
This was SVN commit r19240.
2017-02-24 17:02:10 +00:00
leper 1aa5ecb8a7 Remove entity if spawning fails.
Reviewed By: fatherbushido
Differential Revision: https://code.wildfiregames.com/D159
This was SVN commit r19239.
2017-02-24 15:41:19 +00:00
elexis b2c3fc83da Nuke session/utility_functions.js since the file is much shorter than the others and since the functions are not logically related.
Slight cleanup while moving the affected code.

Differential Revision: https://code.wildfiregames.com/D108
Reviewed By: shookes
This was SVN commit r19238.
2017-02-23 23:34:35 +00:00
elexis fb6e694fdd Show the tribute chat notification if a team member sends to another and if teams are locked. Fixes #4308.
Add a new options panel for the chat notifications (attack, barter,
tribute), so that players and observers can disable them if they appear
too noisy.

Patch By: Sandarac
Differential Revision: https://code.wildfiregames.com/D106
This was SVN commit r19237.
2017-02-23 19:35:55 +00:00
elexis 2c86b54838 Remove non-functional shallow generation code from the Unknown random maps.
The code paints far below the waterheight and the potential shallow
generation on that central river variation is done by the passageMaker
call some lines above.

Reviewed By: bb
(on #0ad-dev today)

Also add a declaration forgotton in 6036b48c1d.

This was SVN commit r19236.
2017-02-22 22:49:21 +00:00
leper 5e5b5be656 Improve component cache lookup performance slightly.
We do not need iteration order, and this makes this explicit.

Reviewed By: echotangoecho
Differential Revision: https://code.wildfiregames.com/D82
This was SVN commit r19235.
2017-02-22 19:27:58 +00:00
elexis e1e4ef0370 Add UpdateAutoScroll calls to some events where they were missing. For example when deleting, cutting, pasting, autocompleting or doubleclicking text. Patch by Vladislav, fixes #4401.
This was SVN commit r19234.
2017-02-22 15:28:09 +00:00
elexis baea68def2 Copy the victory and defeat icons, so that they can be replaced easily by artists without changing the code or even looking at it.
Differential Revision: https://code.wildfiregames.com/D131
Reviewed By: leper
This was SVN commit r19233.
2017-02-22 03:50:05 +00:00
mimo 3894902bec Check the capturePoint state when diplomacyChanged, fixes #4491
Reviewed by elexis

This was SVN commit r19232.
2017-02-21 20:42:28 +00:00
elexis 7536afe2ee Fix lineendings of new files added in recent months.
This was SVN commit r19231.
2017-02-21 01:26:12 +00:00
mimo fa257c285b Petra: cleanup of the gameTypeManager (follow up of a443bcfa65)
Patch by Sandarac
Differential Revision: https://code.wildfiregames.com/D149
This was SVN commit r19230.
2017-02-20 18:13:04 +00:00
Imarok ef46059796 Splash Damage shape tooltip
Reviewed by: elexis
Differential Revision: https://code.wildfiregames.com/D142
Fixes #4328

This was SVN commit r19229.
2017-02-20 15:39:36 +00:00
mimo d0224c913e petra: finetuning of builder number
This was SVN commit r19228.
2017-02-19 16:06:07 +00:00
mimo 997d0fb6ee petra: fix a bug preventing petra to build additionnal markets if its second market was destroyed while still a foundation
This was SVN commit r19227.
2017-02-14 17:36:58 +00:00
mimo a443bcfa65 Petra: assign guards to wonders in wonder games
Patch by Sandarac
Differential Revision: https://code.wildfiregames.com/D140
This was SVN commit r19226.
2017-02-14 17:21:54 +00:00
elexis e0f7578fbe Ensure unique client GUIDs. Patch by sbirmi, fixes #3949.
Two clients chosing the same GUID is highly unlikely, yet possible.
A malicious client chosing an existing GUID would have resulted in
unassigning the player with that GUID.

This was SVN commit r19225.
2017-02-14 16:54:34 +00:00
elexis e436af56ce Different description for African Plains by Hannibal Baraq.
This was SVN commit r19224.
2017-02-14 10:51:16 +00:00
mimo 0baf6d350a petra: be more incline to help an ally when getAlliedVictory
and deposit resources (if any) before starting to build

This was SVN commit r19223.
2017-02-13 16:19:12 +00:00
mimo 9dea08d179 petra: improve the use of garrisoning
Reviewed By: Sandarac
Differential Revision: https://code.wildfiregames.com/D141
This was SVN commit r19222.
2017-02-13 16:03:50 +00:00
elexis 1179b6298c African Plains random map script by Hannibal Baraq (a.k.a. Hannibal Barca).
Differential Revision: https://code.wildfiregames.com/D134
Reviewed By: FeXoR
Accepted By: niektb
This was SVN commit r19221.
2017-02-13 02:24:54 +00:00
elexis 4d00643ee3 Allow Romans to build the sentry tower, revealing the new model from 5d4604e767.
The faction couldn't build it before as the wooden tower added to all
factions except Romans in f56102967f was logically a part of the
palisade which Romans couldn't build either following 3bb1c01ccc.

Differential Revision: https://code.wildfiregames.com/D129
Patch By: fatherbushido
Accepted by: LordGood, scythetwirler, wowgetoffyourcellphone
This was SVN commit r19220.
2017-02-12 19:04:20 +00:00
mimo 50b5e4317f petra: fix a rare deserialization bug, when a dropsite change ownership between the last AI turn and the turn where serialization occurs (each AI is currently run only every 8 turns)
This was SVN commit r19219.
2017-02-11 16:06:00 +00:00
mimo 92164c8622 petra: remove a left over, used only for debug
This was SVN commit r19218.
2017-02-11 16:00:08 +00:00
elexis cc8f991e2a Reset the RallyPoint in case the building changes Ownership to Gaia, so as to prevent the execution of commands like gathering resources or attacking someone if the garrisoned building becomes destroyed.
Add RallyPoint tests.

Reviewed By: mimo, Sandarac
Differential Revision: https://code.wildfiregames.com/D132
This was SVN commit r19217.
2017-02-10 18:47:25 +00:00
Imarok 5f8f7bae20 Stay ready button
Reviewed by: elexis
Differential Revision: https://code.wildfiregames.com/D49
Fixes #4369.

This was SVN commit r19216.
2017-02-10 16:09:10 +00:00
Imarok 94b0e5c0f3 Reset ready state when non-observers join in gamesetup
Reviewed by: elexis
Differential Revision: https://code.wildfiregames.com/D50
Fixes #4452. Refs #2529. Refs dfc7567561, a939b49de7, 903803ceec.

This was SVN commit r19215.
2017-02-10 15:52:04 +00:00
Imarok 821657eff6 Correct siege wall icon
Reviewed by: elexis, Stan
Differential Revision: https://code.wildfiregames.com/D137
Refs #4487

This was SVN commit r19214.
2017-02-10 14:29:15 +00:00
elexis b20b8250a5 Fix three tech tree bugs, relevant for mods like Delenda Est.
Parse paired techs correctly that appear as a tech requirement.
Don't list units with an empty production queue in the trainer panel.
Display a nice warning if a tech requires a technology that can't be
researched anywhere.

Patch By: s0600204
Differential Revision: https://code.wildfiregames.com/D113
This was SVN commit r19213.
2017-02-10 14:04:55 +00:00
elexis c53c2edbed Remove the second, confusing and non-promotable skirmisher cavalry template from the Seleucid faction (which was a duplicate from the persian template).
Based on patch by: fatherbushido
Idea accepted by: scythetwirler
Differential Revision: https://code.wildfiregames.com/D128
This was SVN commit r19212.
2017-02-10 07:55:53 +00:00
elexis 8a99e0d639 Rename wooden tower template to sentry tower.
Patch By: fatherbushido
Differential Revision: https://code.wildfiregames.com/D130
This was SVN commit r19211.
2017-02-10 07:02:45 +00:00
mimo ecde67c19a Cleanup of GetBonusAttack function and use it inside petra
simulation part reviewed by fatherbushido
Differential Revision: https://code.wildfiregames.com/D138
This was SVN commit r19210.
2017-02-09 20:20:59 +00:00
mimo 689d5ed562 petra: improve the switch between attack and capture
Differential Revision: https://code.wildfiregames.com/D133
This was SVN commit r19209.
2017-02-09 18:41:03 +00:00
mimo a82fe62747 Fix an ambiguity in the ai info text.
Reviewed By: elexis
Differential Revision: https://code.wildfiregames.com/D136
This was SVN commit r19208.
2017-02-08 18:10:50 +00:00
LordGood f185817a1c This was SVN commit r19207. 2017-02-08 03:55:26 +00:00
Pureon d1e6205b70 Spy tech icon
This was SVN commit r19206.
2017-02-07 21:44:18 +00:00
Imarok 0e2d2610c9 Display a nice error message when trying to register too many lobby accounts
(This is a workaround that will be removed when gloox has fixed the
issue.)

Reviewed by: elexis
Refs #3771
Differential Revision: https://code.wildfiregames.com/D87
This was SVN commit r19205.
2017-02-07 15:05:26 +00:00
elexis 2fabe80b20 Increase catapult and bolt shooter health by factor 2.5 and 2 (as rams have 4 times that health and still vanish quickly enough when encountering sword units).
Make catapults more affordable by reducing their stone cost from 350 to
250 per unit.

Differential Revision: https://code.wildfiregames.com/D102
Reviewed By: scythetwirler, fatherbushido
This was SVN commit r19204.
2017-02-07 13:18:04 +00:00
elexis 7487d27467 Fix infinite loop detection when placing players randomly on the newer random map scripts (and prevent them surely, not only almost surely).
Reviewed By: FeXoR
Differential Revision: https://code.wildfiregames.com/D118
This was SVN commit r19203.
2017-02-06 23:21:39 +00:00
Imarok 20d34d4a97 Properly sort selected entities by owner
Fixes #4425. Refs #1807, #4167. Fixes a8b9416725

Reviewed by: mimo
Differential Revision: https://code.wildfiregames.com/D123
This was SVN commit r19202.
2017-02-06 22:17:21 +00:00
elexis 5130bb69d3 Use std::time_t in the replay menu (as 64bit integer conversion are implemented now) and remove the unused filemoddate fallback.
Differential Revision: https://code.wildfiregames.com/D112
Reviewed By: echotangoecho
This was SVN commit r19200.
2017-02-05 02:18:33 +00:00
Imarok 39bb057ec5 Show the defeat/active state of players in the diplomacy window
Patch by javiergodas, rebased and negative review by elexis. Fixes
#4237.

This was SVN commit r19199.
2017-02-03 15:08:32 +00:00
fatherbushido 863b8da240 Fix GarrisonHolder wich doesn't start to heal garrisoned units when the related technology is researched.
Summary:
When the heal technology is researched in a barrack, a wounded unit
garrisoned in it is not healed.
Indeed the component doesn't listen to value modification.
The patch fixes that.

Test Plan: Reproduce what is above and see that the patch fix it.

Reviewers: O2 JS Simulation, wraitii

Reviewed By: wraitii
Subscribers: wraitii, mimo, Vulcan

Differential Revision: https://code.wildfiregames.com/D63
This was SVN commit r19197.
2017-02-02 09:15:05 +00:00
fatherbushido 17b8e60cc7 Fix ProjectileSpeed entry in Attack schema
Summary:
The documentation is imo misleading.
Projectile speed 0 is not supported anywhere in the code and doesn't
lead to a melee attack.

Test Plan: -

Reviewers: O2 JS Simulation, leper

Reviewed By: O2 JS Simulation, leper
Subscribers: leper, Vulcan

Differential Revision: https://code.wildfiregames.com/D115
This was SVN commit r19196.
2017-02-02 08:32:57 +00:00
fatherbushido 223da5216b Don't increase entity limit counter when we upgrade to an entity with the same restriction category.
Summary:
In some mods (for hero) or in the current game (for sentry tower), when
we have reach the entity limit related to a restriction category, we
can't upgrade any entity wich have that restriction category to one with
the same restriction category (for example, upgrading an hero to an hero
as the 1 max limit is yet reached).
That diff should allow that in the gui and the sim.
Code could be concatenated. So comments are welcome.

Test Plan:
For in game testing, you can for example in the Player template reduce
the DefenseTower limit to 2. Then build 2 sentry towers.
Without the patch you can't upgrade any of them. With you can upgrade
them to defense tower.

Reviewers: wraitii, O8 JS GUI, O2 JS Simulation

Reviewed By: wraitii, O8 JS GUI, O2 JS Simulation
Subscribers: leper, mimo, wraitii, Vulcan, O8 JS GUI

Differential Revision: https://code.wildfiregames.com/D81
This was SVN commit r19195.
2017-02-01 16:35:08 +00:00
Gallaecio b052831529 Improve AI chat messages
Differential Revision: https://code.wildfiregames.com/D59
This was SVN commit r19194.
2017-01-31 18:03:36 +00:00
fatherbushido 67b00a7232 Add a linear splash damage for boltshooters. Reviewed by elexis.
Differential Revision: https://code.wildfiregames.com/D107
This was SVN commit r19193.
2017-01-31 14:46:57 +00:00
Imarok 79da98aa75 Remove all out-of-scope usages in binaries/data/mods/public/gui/common/functions_utility.js
Reviewed by elexis

This was SVN commit r19192.
2017-01-30 16:30:59 +00:00
Itms 83a2e810da Remove all occurrences of for each in JS scripts.
This will allow us to use some linters that would otherwise crash on
this non-standard SpiderMonkey feature. Refs #4419.

Special thanks to elexis for thoroughly checking and testing all the
changes!
Reviewed By: leper, elexis
Differential Revision: https://code.wildfiregames.com/D40
This was SVN commit r19191.
2017-01-30 12:47:08 +00:00
Itms c0ca70efd2 Fix 64-bit integer script conversions by removing the discrepancy between Windows and Linux.
Patch by echotangoecho, fixes #3848.
Reviewed By: Itms
Differential Revision: https://code.wildfiregames.com/D84
This was SVN commit r19189.
2017-01-30 10:21:08 +00:00
Itms 73bda917bb Cleanup of NASM. It has been unused for ages (153357f640) and we still have legacy code lines in our premake scripts. We also carry an unused binary for Windows.
By removing this we don't need to add NASM support to premake5, refs
#3729.

Reviewed By: leper
Differential Revision: https://code.wildfiregames.com/D97
This was SVN commit r19188.
2017-01-30 09:19:59 +00:00
elexis d183d1913d Nerf slingers, since infantry should not be able to destroy buildings easily, in particular in village phase.
Differential Revision: https://code.wildfiregames.com/D103
Reviewed By: fatherbushido
This was SVN commit r19186.
2017-01-29 19:01:01 +00:00
Imarok d2b9236388 Colorize the playername with rating in the lobby user profile
Reviewed by: elexis
Differential Revision: https://code.wildfiregames.com/D48
This was SVN commit r19185.
2017-01-29 17:31:18 +00:00
leper 584ccd690e Remove lib/pointer_typedefs.h. Patch by echotangoecho.
Reviewed By: Itms, leper
Differential Revision: https://code.wildfiregames.com/D83
This was SVN commit r19184.
2017-01-29 00:06:28 +00:00
leper 6ae2db53db Employ some variadic macros to make some of the C++ -> JS function calling code nicer.
Template-ize CallFunctionVoid.
Changes CallFunction parameter order to make template parameter
deduction with
variadic parameters work nicely.

Reviewed By: Itms, wraitii, Yves
Differential Revision: https://code.wildfiregames.com/D77
This was SVN commit r19183.
2017-01-28 23:37:15 +00:00
elexis fd5bd8e301 Fix 9964bee5bb.
Differential Revision: https://code.wildfiregames.com/D100
Reviewed By: Imarok
This was SVN commit r19182.
2017-01-28 20:47:26 +00:00
elexis 9a6c5eac60 Colorize playernames in the wonder victory time notification.
Differential Revision: https://code.wildfiregames.com
Reviewed By: Imarok
This was SVN commit r19181.
2017-01-28 20:30:30 +00:00
Imarok a74fcdcb35 Durations over 1 hour aren't displayed correctly
Reviewed by: elexis
Differential Revision: https://code.wildfiregames.com/D44
refs #4418, #3350

This was SVN commit r19180.
2017-01-28 10:59:53 +00:00
mimo 9b819645f5 fix typo in 82faae8637
This was SVN commit r19179.
2017-01-28 10:22:03 +00:00
mimo c2d0327af9 Implement shared vision at the entity level
Summary:
To fix tickets like #3335, having a shared vision at the entity level is
needed. This patch implements that in CCmpRangeManager, interfaced with
a new JS component VisionSharing to manage the shared entities visions.
As an example of use case (in addition to garrisoning in allied
structure without the sharedLos tech), we can think of bribing enemy
units: there is a part about it in the patch, but this one is very wip
and not intended to be committed but rather for test purposes of the
feature.
So when garrisoning a unit in another player's building, the vision of
the garrisonHolder is shared (part intended for review). In addition,
for tests of the feature, when clicking on the new bribe icon in the
diplomacy window, a random unit of the chosen player is bribed and share
its vision during 15 s.

Test Plan: Garrison a unit in an allied structure without the sharedLos
tech, or test the wip bribe feature from the diplomacy window.

Reviewers: Itms

Reviewed By: Itms
Subscribers: Stan, leper, O11 Templates, wraitii, elexis, fatherbushido,
Itms, Vulcan, O1 C++ Simulation

Differential Revision: https://code.wildfiregames.com/D60
This was SVN commit r19175.
2017-01-26 21:10:46 +00:00
mimo ff743bc928 Reshuffling of AI management of territory maps
Reviewed By: Sandarac
Differential Revision: https://code.wildfiregames.com/D96
This was SVN commit r19174.
2017-01-26 18:17:31 +00:00
elexis 7b04c74043 Fix inconsistent disabled resign and pause button
Summary:
The pause button displays an additional GUI element on top of the button
containing the text.
This apparently unneeded element uses a style forcing the button text to
be white, even if the element is disabled.

Test Plan:
Start a multiplayergame with all players in the same team, winning it
instantly.
The resign and pause button become disabled, but have different text
colors.
Apply the patch and notice the issue is gone and that the XML is more
consistent.
Try pausing to see that the pause button caption still updates.
Convince yourself that there are no other occurances of
`pauseButtonText`.


Reviewers: fatherbushido

Reviewed By: fatherbushido
Subscribers: Vulcan

Differential Revision: https://code.wildfiregames.com/D91
This was SVN commit r19173.
2017-01-26 00:22:38 +00:00
elexis 9964bee5bb Change the NetServer Broadcast function to send the given message to clients that are in one of the states specified by the caller.
Thus remove the peculiarity to broadcast to clients that are in the
gamesetup, loading screen or ingame, but not rejoining ones.

Fix "unknown player" errors in the GUI by broadcasting player
assignments to rejoining players too. Fixes #4036.

Differential Revision: D17
Reviewed By: Imarok
This was SVN commit r19171.
2017-01-25 19:04:17 +00:00
Enrique f958c6a168 The rest of the structure icons upgrade by wowgetoffyourcellphone. Thanks!
This was SVN commit r19170.
2017-01-25 16:31:32 +00:00
fatherbushido 49d86dcd9f Fix a portrait icon reference. Accepted by Enrique.
This was SVN commit r19169.
2017-01-25 15:24:53 +00:00
Enrique d10f84a157 Improved structure icons by wowgetoffyourcellphone. Thanks!
This was SVN commit r19168.
2017-01-24 22:47:52 +00:00
Enrique 528f38f4dd Fixed ptolemaic skirmisher portrait as mercenary
Fixed mauritarian archer portrait as citizen soldier
Fixed judean slingers portrait as citizen soldier
Thanks wowgetoffyourcellphone for the portraits!

This was SVN commit r19167.
2017-01-24 22:03:49 +00:00
fatherbushido 90e876f328 Some changes for Ptolemies. Allow training their new champion pikeman in the fortress. Train their heros in civic center instead of fortress. Replace the Nubian archer with the more historically accurate Cretan one. Train mercenary skirmisher at the civic center and the archer at the barrack. Accepted by scythetwirler and elexis.
Differential Revision: https://code.wildfiregames.com/D56
This was SVN commit r19166.
2017-01-24 15:51:00 +00:00
elexis 4f01db4831 Split TurnManager classes into individual files per class. Patch by echotangoecho, fixes #4095.
Remove the "Net" prefix from the non-networked classes.
Use variadic macros and mark the client turnmanager as NONCOPYABLE.

Differential Revision: D16
Reviewed By: leper
This was SVN commit r19165.
2017-01-24 02:04:50 +00:00
mimo 43c7551202 fix a typo in 8adc6b0a04, noticed by Sandarac
This was SVN commit r19164.
2017-01-23 22:33:21 +00:00
mimo 8adc6b0a04 petra: cleanup and improve regicide support, patch by Sandarac, refs #4142
This was SVN commit r19163.
2017-01-23 20:36:12 +00:00
mimo 5725542fc4 petra: respond to neutral requests from enemies, patch by Sandarac, refs #4431
This was SVN commit r19161.
2017-01-21 10:59:18 +00:00
wraitii 8fec942e8a Fix Atlas under macOS Sierra.
We were polling SDL messages from two different threads (by mistake),
and Sierra now refuses to do that.
Tested by Stan, Itms, Fatherbushido, and discussed with Philip for the
code change itself.
Fixes #4408.
Differential Revision: https://code.wildfiregames.com/D42
This was SVN commit r19160.
2017-01-21 09:54:08 +00:00
Imarok 8813888fe0 Color the garrison panel buttons more nicely
Reviewed by: elexis
Differential Revision: https://code.wildfiregames.com/D52
This was SVN commit r19159.
2017-01-20 11:16:20 +00:00
fatherbushido 0901167349 Remove an unused duplicated unit. Accepted by Itms.
Differential Revision: ​https://code.wildfiregames.com/D58
This was SVN commit r19158.
2017-01-20 10:16:12 +00:00
leper be1a205f91 Add support for const methods in components and make those that can be const const.
Reviewed By: Itms
Differential Revision: https://code.wildfiregames.com/D75
This was SVN commit r19156.
2017-01-20 02:25:19 +00:00
elexis 678e082230 Remove the "quit" simulation command and restrict the "set-shading-color" simulation command to AIs,
since they are only useful for AI debugging and counterproductive in
multiplayer mode, refs #3551.

Instead, enable AI developers to exit the game from a new AI API
command,
allowing to batch simulate matches. Refs #2755.

Differential Revision: D65
Reviewed By: leper
Consulted: mimo

This was SVN commit r19155.
2017-01-19 14:45:32 +00:00
fatherbushido 13529b04a3 Fix 03ecf8508f. Bug noticed by mimo. Some objects are not instance of Vector3D after deserialization.
This was SVN commit r19154.
2017-01-18 13:25:38 +00:00
Enrique 5c2495db52 Small improvement in Carthaginian normal map.
Fixed carthaginian market actors.
Fixed gate structure template. Patch by Stanislas69
fixes #2524

This was SVN commit r19153.
2017-01-18 00:51:07 +00:00
elexis 3448a98d1f Remove three unused AI helper functions, likely remains of the AEGIS bot removed in 3f1db1ef01.
Reviewed By: mimo
Differential Revision: D74
This was SVN commit r19152.
2017-01-17 20:45:16 +00:00
Imarok c791b9ade3 Add the confirm hotkey to the prelobby window
This was SVN commit r19151.
2017-01-17 14:33:26 +00:00
Imarok 42204dce46 Cleanup of Batch training
This was SVN commit r19150.
2017-01-17 10:41:32 +00:00
wraitii b3b47c1718 Avoid recreating the dirtiness grid every turn by swapping. Significantly reduces the number of allocations, and slight speedup (particularly on larger maps). Reviewed by Leper.
Differential Revision: https://code.wildfiregames.com/D70
This was SVN commit r19149.
2017-01-17 07:24:41 +00:00
fatherbushido 5f859c5784 Don't send MT_Attacked message when an ally help capturing back.
Differential Revision: https://code.wildfiregames.com/D69
This was SVN commit r19148.
2017-01-16 14:17:38 +00:00
fatherbushido 03ecf8508f Remove a useless function in AttackDetection. Accepted by wraitii.
Differential Revision: https://code.wildfiregames.com/D68
This was SVN commit r19147.
2017-01-16 12:19:38 +00:00
wraitii 0a6a42321d Improve cache efficiency of CcmpPathfinder::UpdateGrid substantially. On very large maps, this can be a very substantial improvement (I have measured up to 30ms)
This was SVN commit r19146.
2017-01-16 10:41:35 +00:00
wraitii ad76352cef Prevent the AI manager from copying the pathfindinder dirtiness grid every turn.
Review by Itms

Differential Revision: https://code.wildfiregames.com/D25
This was SVN commit r19145.
2017-01-16 08:38:31 +00:00
Imarok df1b542c5a CLeanup the nickNotify in gamesetup
This was SVN commit r19143.
2017-01-15 22:40:59 +00:00
leper 3a85d0b3fa Remove unused parameter from template loading code
Templates should be the same for all players, techs can be used to
provide
different lists of templates if that is needed.

Reviewed By: Itms
Differential Revision: https://code.wildfiregames.com/D25
This was SVN commit r19142.
2017-01-15 18:41:53 +00:00
fatherbushido ba76f60c53 Fix portraits icon leftovers in templates. Accepted by enrique.
Differential Revision: https://code.wildfiregames.com/D67
This was SVN commit r19141.
2017-01-15 11:56:32 +00:00
fatherbushido 6b9725892e Remove remaining colour occurence in art files as done in b1c4e29ac8. Patch by stanislas69. Refs #4458.
This was SVN commit r19140.
2017-01-14 16:14:00 +00:00
fatherbushido 103a59ec1e Fix a space tab inconsistency detected by python3.
This was SVN commit r19139.
2017-01-13 08:40:54 +00:00
fatherbushido 19e1be6e7b Remove a target moving spread factor for ranged attack. That one was a bit redundant as a moving target has yet a big advantage. Accepted by wraitii.
Differential Revision: https://code.wildfiregames.com/D61
This was SVN commit r19136.
2017-01-12 11:33:25 +00:00
fatherbushido 0706fe8410 Add history tag to Carthaginians units from design docs. Replace a generic one by the specific one. Remove a TBD tooltip.
This was SVN commit r19135.
2017-01-12 10:58:35 +00:00
Enrique b84be743fa Adds garrisoned variant to carthage super dock. Patch by Stanislas69
Improves carthage market obstruction and rubble actor. Patch by
Stanislas69

This was SVN commit r19134.
2017-01-10 23:08:31 +00:00
fatherbushido dc1835bb1d Add missing history entries to Macedonian units and set their slinger as mercenary in agreement of design doc.
This was SVN commit r19133.
2017-01-10 20:41:07 +00:00
Enrique 4f7b4e97d8 Improved slinger attack animation.
fixed build animation mallet placement.
fixed iberian helmet to fit new head meshes.
fixed mauryan turbans to fit new head meshes.
fixed persian camel trader prop placement
fixed female carry meat prop placement
fixed tool prop gather grain placement

This was SVN commit r19132.
2017-01-10 19:26:02 +00:00
Enrique ef7fcd4674 Batch of patches from Stanislas69
Fixes #3813
Refs #2524 and #4440

-Fixes stoyas foundations
-Fixes walls foundations
-Fixes carth superdock foundation
-Fixes cape_chariot variant
-Fixes missing referenced files in #2524

This was SVN commit r19131.
2017-01-10 19:22:54 +00:00
Enrique 0a68ace52d Upgraded Carthaginian market from Stanislas69. Thanks!
This was SVN commit r19130.
2017-01-10 19:17:17 +00:00
Enrique 004c8679d4 Updated unit portraits from wowgetoffyourcellphone. Thanks!
This was SVN commit r19129.
2017-01-10 19:13:47 +00:00
fatherbushido d51ad4fbdf Remove useless empty specific name and history entries in templates. Refs fd4e899f11. Fix #4445.
This was SVN commit r19128.
2017-01-10 15:39:19 +00:00
fatherbushido 8229ca499c Handle case where diminishing returns equal to 1. Accepted by mimo.
Differential Revision: https://code.wildfiregames.com/D57
This was SVN commit r19127.
2017-01-10 14:05:43 +00:00
mimo 2e636af9bc fix missing semicolons
This was SVN commit r19126.
2017-01-09 19:03:24 +00:00
Gallaecio b096728618 “an huge army” → “a huge army”
Differential Revision: https://code.wildfiregames.com/D55
This was SVN commit r19124.
2017-01-08 22:22:31 +00:00
Gallaecio 449ea2b6ed “setting a game” → “setting up a game”
Differential Revision: https://code.wildfiregames.com/D54
This was SVN commit r19123.
2017-01-08 22:19:24 +00:00
fatherbushido 0e77bdd911 Add some missing auras and remove some tooltip. Accepted by elexis.
Differential Revision: https://code.wildfiregames.com/D37
This was SVN commit r19122.
2017-01-08 16:06:20 +00:00
fatherbushido 4ad6890cad Add a simulation test to the previous commit of s0600204's patch. Refs #4263.
This was SVN commit r19121.
2017-01-08 14:04:23 +00:00
fatherbushido 6c97d8118b Merge different logics of technology requirements and fix the related bugs. Create a global script which derive the technology requirements objects in a form usable for structure tree, gui, simulation and AI. Reviewed by mimo (for AI) and fatherbushido. Fixes #3993, #1646, #4263, #4217. Refs #4108.
This was SVN commit r19120.
2017-01-08 14:00:20 +00:00
leper b5991e188b TemplateLoader cleanup.
Reviewed By: elexis
Differential Revision: https://code.wildfiregames.com/D26
This was SVN commit r19119.
2017-01-07 17:52:32 +00:00
mimo a859f3cd91 Fix double-click on hero button when the hero is garrisoned in a ram garrisoned somewhere, refs #4291
Reviewed By: Imarok
Differential Revision: https://code.wildfiregames.com/D46
This was SVN commit r19118.
2017-01-07 10:33:30 +00:00
fatherbushido d73d656cc5 Adress a Todo in auras code. Add player type aura. Improve tests. Accepted by mimo.
Differential Revision: https://code.wildfiregames.com/D41
This was SVN commit r19117.
2017-01-06 20:14:39 +00:00
mimo 32d2375e55 petra: start implementing responses to alliance requests, patch by sandarac, refs #4431
This was SVN commit r19116.
2017-01-06 19:24:15 +00:00
wraitii 2bae30c454 Fix [19027] by using generic code for conversions and fixing a few other issues. Refs #3403. Reviewed by leper.
Also fix some of the warnings that jenkins showed.

Differential Revision: https://code.wildfiregames.com/D24
This was SVN commit r19115.
2017-01-06 11:14:03 +00:00
mimo 1a038b1735 fixes a typo in 3c56638e8b, spotted by sandarac
This was SVN commit r19113.
2017-01-05 18:00:53 +00:00
elexis 3c8fc4f263 Return "local" from GetPlayerGUID to avoid duplicate checks and allow AIs to send private messages to the single player. Refs #4431.
Reviewed By: mimo
Differential Revision: https://code.wildfiregames.com/D38
This was SVN commit r19112.
2017-01-05 10:22:39 +00:00
Itms 4068f2e14a Fix warning with GCC in our lowlevel PNG texture code.
Ensure a variable is not clobbered by libpng's use of longjmp. Make code
more consistent.

Differential Revision: https://code.wildfiregames.com/D35
This was SVN commit r19111.
2017-01-04 21:05:08 +00:00
Itms 81eb74163e Happy New Year *cough*(Years)*cough*!
Also fix some whitespace.

This was SVN commit r19110.
2017-01-04 21:00:16 +00:00
mimo 3c56638e8b petra: cleanup of chat messages based on patch by bb, refs #4326
This was SVN commit r19109.
2017-01-04 20:02:56 +00:00
mimo 92ea4af49e Trade with neutral should be allowed in the gui
Reviewed By: leper
Differential Revision: https://code.wildfiregames.com/D34
This was SVN commit r19108.
2017-01-04 18:28:50 +00:00
fatherbushido 0664c5f868 Fix a typo in a comment. Accepted by leper.
Differential Revision: https://code.wildfiregames.com/D28
This was SVN commit r19107.
2017-01-04 13:22:17 +00:00
fatherbushido d68cfb508a Fix alphabetical order in simulation templates. Accepted by elexis.
Differential Revision: https://code.wildfiregames.com/D33
This was SVN commit r19106.
2017-01-04 13:19:18 +00:00
leper dedbdc384c Stop marking the player as won on endless games. Patch by Vladislav. Fixes #4323.
This was SVN commit r19105.
2017-01-03 23:12:52 +00:00
mimo 947e087820 petra cleanup, taken from sandarac, refs #4431
This was SVN commit r19104.
2017-01-03 20:30:03 +00:00
fatherbushido aa6ba459d8 Fix identation issues, line endings and remove a not working entry in templates. Refs 83680b0dee. Refs #4440.
This was SVN commit r19103.
2017-01-03 16:24:52 +00:00
fatherbushido f8aec9214a Add Persian and Carthaginian team bonus. Reviewed by mimo.
Differential Revision: https://code.wildfiregames.com/D32
This was SVN commit r19102.
2017-01-03 14:03:15 +00:00
mimo faa2090146 cleanup
This was SVN commit r19101.
2017-01-02 19:18:06 +00:00
wraitii ffb157dae7 Fixes an issue with miraging. Fixes #4297. Reviewed by leper and Itms.
Differential Revision: https://code.wildfiregames.com/D10
-This line, and those below, will be ignored--

M    binaries/data/mods/public/simulation/components/Fogging.js

This was SVN commit r19100.
2017-01-02 12:32:16 +00:00
mimo ccf4972bc5 petra cleanup (remove some capitalization)
This was SVN commit r19099.
2017-01-02 10:28:41 +00:00
fatherbushido 3a92b322b5 Replace tab with spaces. Refs 9a4fcd55a8.
This was SVN commit r19098.
2017-01-02 09:08:08 +00:00
Enrique 7c295704be Fix an error message when units with capes used props.
This was SVN commit r19096.
2017-01-01 21:08:50 +00:00
Enrique 83680b0dee Let's start the year with the right foot.
Implemented new unit meshes with animations. (thanks
wowgetoffyourcellphone for helping out with actors)
Added Tobi95's capitoline jupiter building as roman wonder
Added Stanislas69's Stupa upgrade, terrain textures, and kausia cap
helmet.
Several updated textures from wowgetoffyourcellphone Delenda Est mod,
improved smoke and rain particles, and tech icons & portraits (some not
used yet)
Added new death screams from opengameart.org

This was SVN commit r19095.
2017-01-01 18:10:09 +00:00
fatherbushido 553ab4f961 Fix messy identation in my previous commit. Noticed by leper. Refs 6d318d0869.
This was SVN commit r19094.
2017-01-01 17:39:18 +00:00
fatherbushido 6d318d0869 Remove team bonus when the source player is defeated. Reviewed by wraitii.
Differential Revision: https://code.wildfiregames.com/D12
This was SVN commit r19093.
2017-01-01 17:23:29 +00:00
fatherbushido feb22d7626 Don't use range queries for global auras. Fix related team bonus. Add Mauryan team bonus. Based on a sanderd17 patch. Reviewed by wraitti.
Differential Revision: https://code.wildfiregames.com/D19
This was SVN commit r19092.
2017-01-01 16:52:24 +00:00
leper 852221f595 Commands.js cleanup.
Reviewed By: fatherbushido
Differential Revision: https://code.wildfiregames.com/D29
This was SVN commit r19091.
2016-12-31 21:28:28 +00:00
Enrique d8f87e1ec1 female healer animations, syntagma mid row animation and celt chariot rider animations
staff props for new female healers and new trader.

This was SVN commit r19090.
2016-12-31 20:27:18 +00:00
mimo 3c3e2b4c65 petra: add healer guards in regicide mode, patch by Sandarac, refs #4142
This was SVN commit r19089.
2016-12-31 12:18:01 +00:00
mimo 86cf621def petra: prevent UnitAI to give a useless capture attack
This was SVN commit r19088.
2016-12-31 11:22:48 +00:00
leper 11ce52f8c5 Fix a few mistakes in the lobby readme.
Differential Revision: https://code.wildfiregames.com/D27
This was SVN commit r19087.
2016-12-31 00:11:30 +00:00
mimo 78a3734716 Petra: improve regicide support, patch by Sandarac, refs #4142
add a gametypeManager and improve garrisoning of hurt hero

This was SVN commit r19085.
2016-12-29 15:08:50 +00:00
Imarok 29367a9d98 Fix translation comment typo. refs #4410
This was SVN commit r19084.
2016-12-29 12:59:18 +00:00
fatherbushido 9e3dcb6f89 Add tooltip and icon to some autoresearched techs to allow displaying them in the structure tree. Patch by sanderd17. Refs #3801.
This was SVN commit r19083.
2016-12-29 11:27:17 +00:00
Imarok d4b893c15c Don't say late observers are rejoining. fixes #4410
Reviewed by: elexis
Differential Revision: https://code.wildfiregames.com/D5
This was SVN commit r19082.
2016-12-28 16:31:21 +00:00
mimo 93105bf933 This was SVN commit r19081. 2016-12-28 09:25:40 +00:00
mimo 75dc300c78 petra: fixes typos introduced in 1dd7f6d32a
This was SVN commit r19080.
2016-12-28 09:18:42 +00:00
Enrique 70d3a754e0 prop-point error fix from previous commit
This was SVN commit r19079.
2016-12-28 02:32:12 +00:00
Enrique fd9babfdc9 lightly increase size of pikemens aspis
This was SVN commit r19078.
2016-12-28 02:24:46 +00:00
Enrique ee148e6bb9 Sling weapon for attack mesh and animation
This was SVN commit r19077.
2016-12-28 01:26:53 +00:00
fatherbushido 0a82149e62 Add missing file in previous commit.
This was SVN commit r19076.
2016-12-27 10:12:05 +00:00
fatherbushido b622457b2e Use another boxmuller transform for getting normal distribution in Attack.js and move that function to globalscripts. Differential Revision: https://code.wildfiregames.com/D3
This was SVN commit r19075.
2016-12-27 10:10:05 +00:00
Itms 6680dd14ef Small updates to build scripts, refs #4419.
Tweak the coverage script.
Update the clean-workspaces script to be able to avoid rebuilding
libraries.

Differential Revision: https://code.wildfiregames.com/D2
This was SVN commit r19074.
2016-12-27 09:49:41 +00:00
fatherbushido fd8df9143b Remove some semicolons at end of line in a python script.
This was SVN commit r19073.
2016-12-27 09:42:02 +00:00
Enrique b4357e9a19 renaming last commit file
This was SVN commit r19072.
2016-12-27 02:22:09 +00:00
Enrique 222d39630d capturing animation
This was SVN commit r19071.
2016-12-27 02:21:08 +00:00
Enrique 7b73b31b33 Samnite shield tilt fix in preparation for new meshes.
This was SVN commit r19070.
2016-12-27 00:42:19 +00:00
Enrique 22ffbfb7e9 Praying animation
This was SVN commit r19069.
2016-12-27 00:22:12 +00:00
Enrique 6e652a6e0f Fixed Carthage civic center interior reported by av93. Improved AO map with more samples.
This was SVN commit r19068.
2016-12-26 23:00:53 +00:00
fatherbushido 55e9fee616 Add ptol civ and hero class to template analyzer tool.
This was SVN commit r19067.
2016-12-26 20:31:01 +00:00
Enrique 6133168fe0 Added some missing lines in the actors referencing to AO textures.
fixes #2524 , #4394 and #4415

This was SVN commit r19066.
2016-12-26 19:06:03 +00:00
Enrique b77259b638 Improved UV mapping for athen_cc, kart_fortress, roman farmstead
Added remaining animations of spear_shieldsmall variations
Updated seleucid champion texture adding pink painted ears
Minor tweaks to hoplite and pikemen spears

This was SVN commit r19065.
2016-12-26 18:17:10 +00:00
mimo 8e768f5cef Petra: fix ungarrisoning of ranged siege units
Differential Revision: https://code.wildfiregames.com/D4
This was SVN commit r19064.
2016-12-26 09:13:08 +00:00
Itms 490a3a27f6 Fix the cache directory appearing during tests.
Summary: Refs #4419.

Test Plan: When running tests, make sure nothing is created.

Reviewers: leper

Reviewed By: leper
Subscribers: leper, Vulcan

Differential Revision: https://code.wildfiregames.com/D1
This was SVN commit r19062.
2016-12-25 22:03:30 +00:00
Enrique e39d86769a New unit meshes and animations files. Animated capes files. Not set in actors yet. Merry Christmas!
This was SVN commit r19061.
2016-12-24 15:21:25 +00:00
fatherbushido b5633fd4d4 Fix some mistakes I did in templates.
This was SVN commit r19059.
2016-12-24 09:48:52 +00:00
mimo c4123b7155 add some optional info on ai level in the gamesetup panel, fixes #4406
redefine the splashscreen options
reviewed by elexis

This was SVN commit r19057.
2016-12-22 09:50:03 +00:00
Itms 0540be72dc Add an Arcanist configuration file to interact with Phabricator.
This was SVN commit r19056.
2016-12-22 08:26:18 +00:00
fatherbushido e7c3580393 Fix previous commit. Try to be consistent with case in aura description by using low case. If someone finds something better, do it. At last, +5 attack bonus was replaced by +25% attack bonus for some auras heros, tweak it to +20% wich is more moderate.
This was SVN commit r19055.
2016-12-22 08:07:29 +00:00
wraitii 40fd373c83 Revert [19043]
This was SVN commit r19054.
2016-12-21 12:36:41 +00:00
fatherbushido b581c9771f Use relative template for non champion mercenaries costs. It prevents some inconsistencies like for cart slingers noticed by Vercingetorix. Apply that policy to all non champion mercenaries.
This was SVN commit r19053.
2016-12-21 11:45:52 +00:00
fatherbushido 539f132237 Use multiplications instead of addition in auras files for most of the attack modifications to avoid inconsistencies. Try to use consistent case and tweak some details like modifying run speed when walk speed is. Agreed by scythetwirler.
This was SVN commit r19052.
2016-12-21 10:02:26 +00:00
mimo c9139704cd petra: improve treasure gathering
This was SVN commit r19051.
2016-12-20 16:41:53 +00:00
mimo 1dd7f6d32a petra cleanup
This was SVN commit r19050.
2016-12-19 20:39:48 +00:00
Itms a4c68b664b Add the executable flag to the translation maintenance script
This was SVN commit r19047.
2016-12-18 17:36:40 +00:00
Itms 58e5642c48 Do not print things outside of the standard TS_FAIL output, or garbage will be added to the XML output when running the tests under Jenkins.
This patch has the extra benefit that the stack trace actually appears
on Windows now, instead of going into the void.

Tested by Vladislav, refs #4419

This was SVN commit r19045.
2016-12-18 11:16:19 +00:00
Itms f622ab0905 Fix tests following the changes to aiInfluenceGroups in the GuiInterface.
Patch by elexis, fixes #4385.

This was SVN commit r19044.
2016-12-18 11:03:03 +00:00
wraitii 8e8da9aee4 Fix a bug introduced by a fix of a bug introduced by a fix of a bug (x100) in the vertex pathfinder. Revealed by automated tests on another branch of mine. Revert back to pre-new pathfinder behavior of not returning paths in some cases, since that is most likely less broken than now - but probably still a little broken.
This was SVN commit r19043.
2016-12-18 10:02:36 +00:00
wraitii 9288837472 Fix misleading indentation warning on gcc, introduced by [19024]. Reported by elexis. Fixes #3785
This was SVN commit r19041.
2016-12-13 13:34:31 +00:00
Imarok e7eeb6927d Remove deprecated water parameters. Patch by paulobezerr. Partial review by FeXoR. Fixes #4292.
This was SVN commit r19040.
2016-12-12 23:46:46 +00:00
Imarok ef30cedb5d Improve lobby's user profile lookup. Patch from vladislavbelov. Also reviewed by elexis. Fixes #4396.
This was SVN commit r19039.
2016-12-12 18:20:13 +00:00
Enrique 846d1af3b5 Garrison flag smoothing fix from Stan
This was SVN commit r19038.
2016-12-12 16:22:23 +00:00
wraitii 507ecff2ed Scroll to the top when switching between tabs in the credits. Patch by vladislavbelov
This was SVN commit r19036.
2016-12-11 21:15:50 +00:00
mimo 818bd07bc7 fix initialization of survivalofthefittest trigger map, refs #3102
This was SVN commit r19035.
2016-12-11 15:17:17 +00:00
mimo 9f6da1cc74 fix splashscreen management, fixes #4391
This was SVN commit r19033.
2016-12-09 18:49:38 +00:00
wraitii 06333708f8 Fix animation syncronisation between actor props. Fixes #2324 one more time. Refs [18568] and [18265]. Reported by
wowgetoffyourcellphone

This was SVN commit r19031.
2016-12-08 23:16:54 +00:00
mimo d6d45fc53d fix a wrong copy/paste in 82faae8637
This was SVN commit r19030.
2016-12-08 18:05:44 +00:00
LordGood b733bd113a stan's drop prop foundations
This was SVN commit r19029.
2016-12-07 23:10:38 +00:00
wraitii 78bc56f33e Display the updated batch size immediately when using the batch-train/barter hotkey, instead of waiting for the next turn. Patch by elexis. Fixes #3194
This was SVN commit r19028.
2016-12-07 19:18:57 +00:00
wraitii 977a5c7ca2 Add C++ GUI code for drawing charts. Patch by vladislavbelov. JS will come later. Refs #3403
This was SVN commit r19027.
2016-12-07 19:03:54 +00:00
mimo 82faae8637 Speed up the guard component by removing OnGlobal calls, based on a patch from wraitii, fixes #4333
This was SVN commit r19026.
2016-12-07 18:08:26 +00:00
mimo f01e932ce3 fixes a few missing semicolon
This was SVN commit r19025.
2016-12-07 18:06:12 +00:00
wraitii e7e5631135 Better fix to #3785. Fixes #3785
This was SVN commit r19024.
2016-12-06 23:25:26 +00:00
mimo de6de69c08 modify color text of disabled buttons, refs #4350, patch by vladislavbelov
This was SVN commit r19023.
2016-12-06 20:34:58 +00:00
LordGood f1bf3ef35e broke a thing, fixing it
This was SVN commit r19022.
2016-12-06 12:30:00 +00:00
LordGood 9929d9c684 Stan's Gaul storehouse, metropolitan Seleucid cc actor, Cart wall foundation and scaffold actors
This was SVN commit r19021.
2016-12-06 11:48:19 +00:00
mimo fe77783145 Change color of disabled labels and dropdowns, patch by vladislavbelov, fixes #4350
This was SVN commit r19020.
2016-12-05 17:21:51 +00:00
LordGood da2a021b64 Sling skeleton
This was SVN commit r19018.
2016-12-04 22:47:16 +00:00
LordGood 697c8c6b03 3D stairs on the seleucid civic center
This was SVN commit r19017.
2016-12-04 18:59:50 +00:00
elexis ac836c860c Fix errors when using the developer overlay to change the perspective while in building placement preview. Patch by Vladislav.
This was SVN commit r19015.
2016-12-01 02:17:28 +00:00
elexis b60f26983c Finish previous commit (selected wrong search scope modifier in eclipse yesterday).
This was SVN commit r19014.
2016-11-30 15:35:06 +00:00
elexis 5e92a139f5 Rename costIcon to resourceIcon.
This was SVN commit r19013.
2016-11-29 16:45:26 +00:00
elexis d67ada09c9 Use strings instead of integers for the values of aiAnalysisInfluenceGroup (used by petra to position dropsites). Reviewed by mimo, fixes #4377.
This was SVN commit r19012.
2016-11-28 20:50:42 +00:00
elexis 7702908a52 Remove an unused variable following 1b20ac7671 and fix some missing and some redundant semicolons found with jshint.
This was SVN commit r19011.
2016-11-28 14:47:13 +00:00
elexis 041c456999 Don't ask the host to exit the game upon defeat if other humans are still playing.
Remove the now unneeded disconnect warning (which is still present for
the menu exit button).

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

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

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

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

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

This was SVN commit r18996.
2016-11-25 03:30:16 +00:00
elexis 30598bd451 Remove an unused function that is redundant with GetGameType from the EndGameManager.
This was SVN commit r18995.
2016-11-24 19:37:38 +00:00
Itms 6ae374dbee Fix the update of shared dirty visibility masks when changing diplomacy.
The previous code worked in case new mutual allies were added, but, when
some were removed, it was suboptimal in terms of performance and it made
some units visible in the FoW.

Fixes #4266

This was SVN commit r18994.
2016-11-24 14:57:09 +00:00
Itms a27dc31b0e Remove some obsolete backref logic from the deserializer. It was introduced in earlier versions of the SpiderMonkey API.
Name some variables more logically in one test.

Fixes #4244

This was SVN commit r18993.
2016-11-24 14:47:49 +00:00
elexis 808dd347b6 Play cinematic paths on arbitrary cameras to prepare previews of the camera frustum in atlas. Patch by Vladislav, refs #3814.
This was SVN commit r18992.
2016-11-23 14:50:47 +00:00
elexis 417c84870c Actually remove trailing tabs from source/.
This was SVN commit r18991.
2016-11-23 14:09:58 +00:00
elexis c49c665edb Disable SDL text input events before actually focusing a text input element. Patch by echotangoecho, refs #3870.
Thus don't add a "t" to the chat input after opening it with the hotkey
on unix.
The bug still occurs on Windows due to an SDL bug reported upstream by
echotangoecho.

This was SVN commit r18990.
2016-11-23 13:29:47 +00:00
elexis 6149dd3841 Actually remove trailing whitespace for non-header files as well.
This was SVN commit r18989.
2016-11-23 13:02:58 +00:00
elexis 944ba16eb4 End source files with a newline.
This was SVN commit r18988.
2016-11-23 11:27:54 +00:00
elexis b18f74da44 Remove trailing whitespace and whitespace in empty lines of source/ except source/third_party/.
This was SVN commit r18987.
2016-11-23 11:18:37 +00:00
mimo b4b4404c64 petra: a few adjustement when switching from town to city phase
This was SVN commit r18986.
2016-11-22 19:16:23 +00:00
mimo af85c1bfdc change the diminishingReturns (used for farms) to make it more intuitive and mod-friendly, reviewed by fatherbushido, fixes #4356
This was SVN commit r18985.
2016-11-22 18:34:37 +00:00
elexis aa7e2fce49 Don't subtract the scrollbar size from GUI dropdowns when there is no scrollbar. Patch by Imarok, reviewed by mimo, refs #3571.
Remove unused button_width.

This was SVN commit r18984.
2016-11-22 13:05:56 +00:00
elexis 0b03713b3b Unify duplicate patrol target types hardcodings. Reviewed by fatherbushido long ago, refs #4253.
This was SVN commit r18983.
2016-11-22 12:46:46 +00:00
elexis c390dee14c Hide the resources of defeated allies in the top panel tooltips, refs #3841.
This was SVN commit r18982.
2016-11-22 12:36:13 +00:00
elexis fd5ba1e882 Timer component cleanup. Patch by Stan, fixes #4158.
Use objects instead of arrays to achieve more readable code.
Use two for-of loops, a continue instead of an if-else pattern and
remove an unneeded variable dt.

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

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

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

This was SVN commit r18964.
2016-11-19 14:29:45 +00:00
elexis 7ff7fcd240 Support hardcoded translation comments when extracting strings from JSON files.
Correct the function description of extractFromFile introduced in
ae10d34d99.

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

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

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

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

This was SVN commit r18939.
2016-11-15 00:09:04 +00:00
wraitii cc4d68c68d micro optimisation of water shader
This was SVN commit r18938.
2016-11-14 23:41:48 +00:00
elexis f3ab043c91 Rename isReplay to isNonVisualReplay becuase it is false for visual replays.
This was SVN commit r18937.
2016-11-14 17:19:53 +00:00
elexis 948d2a4635 Clear particle emitters when ending a game so they don't leak into new games. Patch by Vladislav, fixes #4111.
This was SVN commit r18936.
2016-11-14 17:16:59 +00:00
elexis 3f5648767d Scroll to the selected element after the selection changes. Fixes #4254, refs #3742.
This was SVN commit r18935.
2016-11-14 15:28:49 +00:00
elexis a89f521e08 GUI cleanup.
Remove sprintf from untranslated error messages, unneeded braces and
comments, add missing quotes.

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

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

This was SVN commit r18919.
2016-11-11 01:46:12 +00:00
elexis 41a338ca3e Translate the reveal map cheat notification following the lift of the string freeze.
This was SVN commit r18918.
2016-11-11 01:16:55 +00:00
wraitii fc0e2a2f72 Fixes [18916]. Obviously I left over some code from my bundling of OSX. Update copyright to 2016.
This was SVN commit r18917.
2016-11-10 22:56:16 +00:00
wraitii 12ad190a51 Allow .Deleted to work on directories. Fixes #2641. Patch by leper.
This was SVN commit r18916.
2016-11-10 22:52:39 +00:00
elexis 01b667ab86 Invincible women on survival of the fittest to prevent women fights and cheap tower kills. Based on patch by bb, refs #3102.
This was SVN commit r18915.
2016-11-06 03:11:04 +00:00
elexis 9468cfdc8c Don't use black for gaia on survival of the fittest, refs #3102.
Some GUI elements use white until the first diplomacy change.
The choice black is confusing, problematic as there is a dark gray
player color and
problematic as black words in the chat have no contrast to the black
background.
Changing playercolors in running games is a questionable feature, thus
don't attempt to inform the GUI via a GUIInterface notification now.

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

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

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

 refering to the actual Trigger component instead of

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

This was SVN commit r18906.
2016-11-04 14:53:57 +00:00
elexis b83168cfbf Revert 9846f374a0 as it doesn't work with the packaged version, refs #4313, because that comes with DDS files instead of PNGs and FileExists does not translate that like the sprite attribute does.
This was SVN commit r18905.
2016-11-04 12:18:11 +00:00
elexis 661cb8c932 Add URLs and keywords for the software search in the gnome software center and it's derivates used by many linux flavors, fixes #3734.
Add a menu entry for atlas.
Add some translations for the product description provided by native
speaking players and contributors.

This was SVN commit r18904.
2016-11-01 18:07:21 +00:00
elexis 6d81ba0476 Tag persian skirmishers as mercenaries and make their cost consistent with the other mercenary champions. Patch by fatherbushido.
This was SVN commit r18901.
2016-11-01 16:35:56 +00:00
Itms aba2e53714 Update the list of bundled languages for A21.
This was SVN commit r18900.
2016-11-01 16:33:33 +00:00
elexis b08113b0bb Fix some weird water colors on some maps (like green on latium) that were revealed by the new water shader in ead8436b3d. Patch by Imarok, reviewed by Stan, fixes #4288.
This was SVN commit r18897.
2016-11-01 09:57:53 +00:00
elexis aad0ef4673 Nerf population bonus of all celtic civs, not only britons, refs 48e5101239, reviewed by fatherbushido.
This was SVN commit r18896.
2016-11-01 09:37:33 +00:00
fatherbushido 27e2a33573 Change order of preferred classes for ships attack. Refs #4194.
This was SVN commit r18895.
2016-10-31 19:10:54 +00:00
elexis 4c0dbcf51b Nerf mauryan chariot spam by allowing them to be trained only at the fortress. Suggestion by nigel87.
This was SVN commit r18894.
2016-10-31 17:24:10 +00:00
elexis bc9bdc151f Sentry tower icon by Lion.Kanzen, refs #3959.
This was SVN commit r18893.
2016-10-31 16:00:08 +00:00
elexis 569424d9f7 Add missing preferred classes to ships. Reviewed by fatherbushido, refs #4194.
This was SVN commit r18892.
2016-10-31 13:59:55 +00:00
elexis 48e5101239 Nerf british population bonus for town phase buildings, in agreement with borg and fatherbushido.
This was SVN commit r18891.
2016-10-31 13:56:40 +00:00
elexis 0db69d55fb Don't use multilayered textures on Ngorongoro as the blending is broken. Patch by Vladislav, refs #4219.
This was SVN commit r18890.
2016-10-31 13:43:02 +00:00
elexis 7dbd225783 Fix mistake in c1774bc4f2.
This was SVN commit r18889.
2016-10-31 13:32:18 +00:00
mimo 06d6410ac3 complete 0c8c879ed1 in case the stats of the original and upgraded structures are different
This was SVN commit r18888.
2016-10-30 12:29:26 +00:00
fatherbushido 42b42e8d64 Slightly nerf champion cavalry archers by reducing a bit accuracy and pierce damage. Reduce a bit accuracy of basic cavalry archer to keep consistency. Agreed by scythetwirler.
This was SVN commit r18887.
2016-10-29 18:11:06 +00:00
FeXoR af40768b14 Fixes an oversight in 37e5d6a5af that made random map Latium throw an error. Fixes #4296
This was SVN commit r18886.
2016-10-29 12:53:35 +00:00
elexis f15f49c93b Add Open Age Ratings Service metadata to the appdata file, allowing the Gnome Software Center to show an accurate age rating depending on the country of the user. Patch by Jeru, reviewed by feneur, refs #3734.
This was SVN commit r18885.
2016-10-28 18:10:57 +00:00
mimo 02bf76bbdc petra: check that the foundation still exist when builders approach it
This was SVN commit r18884.
2016-10-28 18:08:48 +00:00
mimo 0c8c879ed1 petra: take into account possible upgrade in garrison manager
This was SVN commit r18883.
2016-10-28 18:04:52 +00:00
elexis 4898e94c81 Remove unneeded braces and whitespace in empty lines.
This was SVN commit r18882.
2016-10-28 16:11:59 +00:00
elexis d8665adf42 Random map script cleanup.
Remove many unneeded parenthesis when assigning variables.
Use min and max to avoid ternaries.
Simplify ternaries that return booleans.
Remove == true from checks.

This was SVN commit r18881.
2016-10-28 16:01:02 +00:00
elexis 5a384f4eaf Fix an OOS on rejoin when a ptolemian lighthouse revealing the shoreline was built prior. Patch by Itms and wraitii, fixes #4277.
Serialize the mapsize in the pathfinder and the reveal shoreline flag in
the range manager.
Reload the rangemanager data after other components have been
deserialized.
Use the SerializeCommon pattern in the pathfinder to avoid code
duplication.
Move the shoreline logic from the Vision component to the range manager.
Remove unused interface mocks from the rangemanager test following
b05879e151.

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

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

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

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

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

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

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

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

This was SVN commit r18862.
2016-10-24 12:53:23 +00:00
elexis 85d357e182 Notify players of who used the reveal map developer cheat.
This was SVN commit r18861.
2016-10-23 21:36:07 +00:00
elexis 6b983bbf06 Change the perspective to "observer" to reveal the map to observers who watched a player resign, while keeping the choice to see the old territory from d5b85c7ffc.
This was SVN commit r18860.
2016-10-23 16:21:33 +00:00
elexis 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
elexis 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
elexis 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
niektb 6056ebb64f Fix png encoding
This was SVN commit r18856.
2016-10-23 13:58:30 +00:00
niektb 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
elexis 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
fatherbushido 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
elexis 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
elexis 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
fatherbushido 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
elexis 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
elexis 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
elexis 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
elexis 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
elexis d5b85c7ffc See the explored territory of defeated players in observermode.
This was SVN commit r18845.
2016-10-20 16:31:52 +00:00
fatherbushido 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
elexis 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
elexis 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
elexis d1f4a6ab40 Give the Sentry Tower some territory influence. Reviewed by fatherbushido.
This was SVN commit r18841.
2016-10-18 16:42:27 +00:00
elexis 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
elexis f24fd75577 Add missing semicolons found with jshint to all map scripts.
This was SVN commit r18839.
2016-10-18 12:52:00 +00:00
fatherbushido 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
elexis f7ddad6455 Use native lineendings.
This was SVN commit r18836.
2016-10-16 21:21:45 +00:00
wraitii 7f8f820e35 Fix an oversight in d8c11434a8/18823, fixes #4270 .
This was SVN commit r18835.
2016-10-16 20:17:31 +00:00
elexis 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
mimo c24831387a Initialize UnitAI component of initial garrisoned units, fixes #4281
This was SVN commit r18832.
2016-10-13 17:38:13 +00:00
elexis c5e87628fb Remove the unneeded hardcoding of the Alt+F4 hotkey which causes 0AD on linux to exit unintentionally after receiving the window focus from another window which was closed with that hotkey (with multiple tiling window managers). Reviewed by Philip, tested by Imarok and Itms, fixes #4272.
The hotkey introduced in 5135bcb899 was likely a workaround for the
custom windows SDL (wsdl) implementation which is no longer in use.

This was SVN commit r18830.
2016-10-11 15:48:02 +00:00
fatherbushido 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
fatherbushido 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
fatherbushido 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
mimo 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
Itms 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
Itms 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
Itms 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
Itms 79b37bd4dc Improve style and whitespace in CCmpVisualActor.
Refs #4270

This was SVN commit r18821.
2016-10-10 10:37:58 +00:00
FeXoR 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
fatherbushido 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
elexis 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
elexis 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
elexis 1f8c75db08 Don't break string freeze.
This was SVN commit r18815.
2016-10-08 18:05:37 +00:00
elexis 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
Itms 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
fatherbushido 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
fatherbushido 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
elexis 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
fatherbushido bb438eca09 Removes useless divsions in Damage. Read by elexis.
This was SVN commit r18808.
2016-10-07 10:05:38 +00:00
elexis 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
elexis 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
elexis d7e51f2a4f Fix an OOS without rejoin after selecting the first unit.
Introduced by 46ead523b8, caused by serializing the aura cache which is
initialized by the tooltip calls from the GUI.
Reviewed by Itms, in combination with 09e775446e fixes #4239.

This was SVN commit r18804.
2016-10-06 14:11:56 +00:00
elexis 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
elexis 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
FeXoR 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
Itms 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
fatherbushido 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
niektb 902a0f5914 New icon for the Persian Hall made by Lion.Kanzen
This was SVN commit r18795.
2016-09-30 19:53:56 +00:00
Itms c1b28ba1e0 Fix some strings reported by translators.
This was SVN commit r18793.
2016-09-29 20:54:13 +00:00
Itms fd8d918764 Reveal the name of the new Alpha.
This was SVN commit r18792.
2016-09-29 19:54:51 +00:00
elexis 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
elexis 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
fatherbushido 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
elexis 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
elexis 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
elexis 7c3c5f6173 Fix some string issues reported on transifex.
This was SVN commit r18786.
2016-09-27 18:29:32 +00:00
elexis 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
elexis a29f18968a Fix broken string as noticed by fatherbushido, refs #1720.
This was SVN commit r18784.
2016-09-26 12:13:08 +00:00
elexis 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
FeXoR 8d4af29faf Adding random map Caledonian Meadows. Fixes #4245
This was SVN commit r18781.
2016-09-25 21:53:39 +00:00
elexis 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
elexis 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
fatherbushido 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
fatherbushido 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
elexis 24f149237f Show bartered resources to observers, fixes #3839.
This was SVN commit r18776.
2016-09-25 20:26:25 +00:00
elexis 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
elexis 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
elexis 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
elexis 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
elexis 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
fatherbushido 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
elexis 58f7e9d5fb Patrol icon by Stan, refs #1720.
This was SVN commit r18769.
2016-09-25 13:33:47 +00:00
elexis 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
fatherbushido 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
fatherbushido 903460994d Adds missing preferred classes in some templates. Fixes #4194.
This was SVN commit r18765.
2016-09-25 06:54:56 +00:00
elexis 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
elexis 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
Itms 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
Itms 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
LordGood 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
Itms 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
Itms fd8f689f35 Whitespace and indentation fix for readme.txt
This was SVN commit r18756.
2016-09-24 10:37:21 +00:00
elexis b8f1ad155b Delete two orphaned templates.
This was SVN commit r18755.
2016-09-24 00:47:25 +00:00
elexis 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
elexis 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
Itms 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
elexis 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
elexis 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
elexis 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
elexis 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
elexis 19002a1396 Back to work hotkey. Patch by Imarok, refs #4008.
This was SVN commit r18747.
2016-09-23 15:16:33 +00:00
elexis 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
elexis 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
elexis 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
fatherbushido 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
fatherbushido 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
elexis 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
elexis 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
elexis 94791c53c6 Loot balancing overhaul and cleanup. Based on patch by fatherbushido, refs #4193.
Add missing loot entry to many new buildings that were added after
d7b31da2dc and ships.
Give civic centers and wonders a significant amount.
Food related structures contain some food.
Temples somehow yielded 500 metal loot previously.
Remove experience point loot from non-defensive buildings.
Merge loot for cavalry and hero templates.
Swordsmen and sword cavalry loot 5 metal, slingers 5 stone, other units
5 wood.
Remove some duplicate Looter, MiniMap, Selectable and
TrainingRestriction entries.
Remove pointless sentence "Special Building." from persian hall tooltip.

This was SVN commit r18738.
2016-09-20 01:58:44 +00:00
elexis 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
elexis 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
elexis 0c6cc228c0 Unify siege armor. Buff bolt shooters and siege towers slightly. Reviewed by fatherbushido.
Increase crush armor of most siege from 1 to 5,
decrease crush armor of rams from 10 to 5.

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

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

This was SVN commit r18735.
2016-09-19 14:08:48 +00:00
elexis 3b816e82ab Loot tooltips. Patch by Mate-86, fixes #4193.
This was SVN commit r18733.
2016-09-19 01:21:09 +00:00
elexis 85efeaac5a Crannog icon by LionKanzen, refs #3959.
This was SVN commit r18732.
2016-09-19 01:13:01 +00:00
elexis 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
Itms 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
Itms 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
elexis 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
Itms 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
elexis 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
elexis 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
elexis 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
fatherbushido 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
elexis 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
elexis 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
Itms 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
elexis ca51672225 Fix typo in a68881dd0f.
This was SVN commit r18717.
2016-09-11 15:30:06 +00:00
fatherbushido 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
elexis 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
elexis f63cef5ad0 Fix few typos in comments.
This was SVN commit r18713.
2016-09-07 17:02:25 +00:00
Itms 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
FeXoR 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
fatherbushido a673a330a5 Fixes a typo in 8c6944f58f.
This was SVN commit r18709.
2016-09-06 13:14:51 +00:00
fatherbushido 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
fatherbushido 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
fatherbushido 58c8812cc7 Removes duplicated entries in crannog template. Noticed by Imarok.
This was SVN commit r18706.
2016-09-05 14:08:55 +00:00
fatherbushido 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
Itms b60cf4663d Whitespace fixes, patch by echotangoecho, refs #1619
This was SVN commit r18704.
2016-09-05 08:34:19 +00:00
elexis 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
elexis 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
elexis f61f051d74 New random map script Marmara by _kali, reviewed by niektb.
This was SVN commit r18700.
2016-09-04 22:30:03 +00:00
elexis c118467c33 Fix broken transparency of the mediterranean mappreview image.
This was SVN commit r18699.
2016-09-04 22:25:57 +00:00
fatherbushido 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
elexis 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
elexis 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
fatherbushido 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
elexis 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
fatherbushido 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
elexis 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
elexis 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
Itms 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
Itms 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
Itms 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
Itms 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
Itms 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
Itms 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
Itms 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
Itms 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
Itms 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
Itms 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
Itms 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
Itms 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
Itms 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
Itms 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
Itms 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
Itms 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
Itms 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
Itms 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
Itms 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
Itms 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
Itms 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
Itms 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
Itms 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
Itms 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
Itms 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
Itms 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
Itms 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
Itms 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
Itms 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
Itms 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
Itms ca80797dcc SpiderMonkey 38 upgrade: 05/35
Update premake scripts.

This was SVN commit r18659.
2016-09-02 16:18:57 +00:00
Itms 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
fatherbushido add6b0206c Adds a missing civ requirement for a pair technology.
This was SVN commit r18653.
2016-09-01 07:35:13 +00:00
elexis 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
elexis a4a99bc129 Fix a lot of whitespace in gui/.
This was SVN commit r18650.
2016-08-27 15:33:22 +00:00
leper 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
leper 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
leper 2366d36f54 Remove unneeded includes.
Refs #4161.
Reviewed by: fatherbushido
This was SVN commit r18647.
2016-08-27 15:27:13 +00:00
leper 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
leper 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
fatherbushido 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
leper 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
elexis eb20661e34 Fix an oversight in 84bde41394, as reported by gameboy.
This was SVN commit r18642.
2016-08-26 14:19:01 +00:00
elexis 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
elexis 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
elexis 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
elexis 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
elexis 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
elexis eab5436d55 Fix oversight in 42cef1d29f.
This was SVN commit r18635.
2016-08-25 18:12:24 +00:00
elexis 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
elexis 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
fatherbushido 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
elexis 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
elexis 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
elexis 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
elexis 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
elexis 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
leper 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
leper 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
leper 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
leper e4c527d5c5 Fix indentation.
This was SVN commit r18622.
2016-08-21 20:35:13 +00:00
leper 4ed7d6c202 Fix compilation failure.
This was SVN commit r18621.
2016-08-21 20:35:10 +00:00
leper 9998592542 Remove unused variable.
This was SVN commit r18620.
2016-08-21 20:35:08 +00:00
leper e7df8edc7d Mark method const.
This was SVN commit r18619.
2016-08-21 20:35:06 +00:00
fatherbushido f79a9bd4c4 Removes 3 redundant numerical informations in tooltips. Reviewed by elexis.
This was SVN commit r18618.
2016-08-21 16:22:42 +00:00
fatherbushido 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
fatherbushido 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
elexis 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
elexis 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
scythetwirler 3a2b418c0e Fixes off-by-one error.
This was SVN commit r18612.
2016-08-17 00:30:57 +00:00
elexis 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
scythetwirler 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
scythetwirler 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
Itms 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
fatherbushido 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
elexis 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
elexis 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
elexis 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
elexis 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
elexis 416049e4b4 Remove charge attack from the templates which isn't implemented nor designed yet. Patch by fatherbushido, fixes #4139.
Remove the unused "recharge" attack timer which was introduced in
b21e798243 but should have been removed with 4e5c5e2d8f.

This was SVN commit r18599.
2016-08-11 14:35:50 +00:00
elexis 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
elexis 7a0703872f Remove a wrong argument from e3b3261a62.
This was SVN commit r18597.
2016-08-11 13:20:31 +00:00
fatherbushido 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
fatherbushido 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
fatherbushido 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
niektb 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
niektb 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
Itms 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
Itms 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
Itms 162535c7b7 Tiny whitespace cleanup.
This was SVN commit r18587.
2016-08-07 17:44:27 +00:00
fatherbushido 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
Yves 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
elexis e3b3261a62 Attack component tests, reviewed by sanderd17.
This was SVN commit r18583.
2016-08-05 18:44:00 +00:00
fatherbushido 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
Itms 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
Itms 72ca6c5f80 Style cleanup by leper, preparing the SpiderMonkey update. Refs #3708
This was SVN commit r18579.
2016-08-02 16:12:11 +00:00
elexis 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
Itms 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
fatherbushido 335b55d49b Add tests to AuraManager component. Fixes #4123
This was SVN commit r18576.
2016-08-02 12:19:40 +00:00
sanderd17 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
elexis 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
elexis 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
elexis 105e1484fb The repair button is expected to work with construction sites.
This was SVN commit r18571.
2016-07-30 23:52:09 +00:00
elexis edd5d20733 Hide unassigned hotkeys. Patch by Imarok, refs #3051.
This was SVN commit r18570.
2016-07-30 16:30:07 +00:00
sanderd17 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
sanderd17 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
sanderd17 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
elexis c70975b116 Pompeii random map script by _kali.
This was SVN commit r18564.
2016-07-27 11:35:19 +00:00
fatherbushido 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
fatherbushido 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
elexis 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, as
reported by Imarok.

(SVN throws an error when trying to set the native filending property on
a file with mixed fileendings. However when recursing it hides this
error).

This was SVN commit r18561.
2016-07-25 12:58:47 +00:00
elexis 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
elexis 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
elexis 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
elexis ba25ffef74 rmlib2 simplifications.
This was SVN commit r18556.
2016-07-24 04:25:45 +00:00
elexis 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
elexis 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
elexis 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
elexis 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
elexis 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
elexis 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
LordGood 6543e78cce Seleucid dock
This was SVN commit r18549.
2016-07-23 10:15:46 +00:00
elexis 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
elexis 9da74739d4 Gah, refs fb8f360ef0.
This was SVN commit r18547.
2016-07-22 15:12:11 +00:00
elexis 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
elexis 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
elexis 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
elexis 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
mimo 26b29e1de7 fix fa7e0c10ba
This was SVN commit r18541.
2016-07-21 07:44:28 +00:00
elexis 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
elexis 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
elexis c84d41dc41 Hide walk speed tooltip for unpacked siege engines.
This was SVN commit r18538.
2016-07-21 00:04:42 +00:00
elexis 1bb3438450 Add missing round to cf04bad4bc, refs #3841.
This was SVN commit r18537.
2016-07-20 23:55:25 +00:00
elexis 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
elexis 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
elexis 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
mimo 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
mimo 01ff2fb0e0 petra: reset some collections only if needed
This was SVN commit r18531.
2016-07-19 17:26:03 +00:00
elexis 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
elexis 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
elexis 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 d38adc7cd0 and 27c46a0a68.

Remove undocumented garrisoned healrate of rams introduced in
d1ed264c9b.
That commit introduced it in many places, which were removed in later
commits.

Leave the positive garrisoned healrate of ships and special buildings
for now,
assuming that there are supplies on ships (but not in rams).

Add garrisoned healrate tooltips in the following commit.

This was SVN commit r18528.
2016-07-19 13:17:02 +00:00
mimo 9132fd4406 petra: try to improve detection of inaccessible targets
This was SVN commit r18526.
2016-07-17 18:28:20 +00:00
mimo df55f73894 ai: remove a useless argument
This was SVN commit r18525.
2016-07-17 17:10:01 +00:00
elexis 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
elexis 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
elexis 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
elexis 82f1987114 Clean an out-of-scope variable usage. Patch by Stan.
This was SVN commit r18520.
2016-07-14 01:58:05 +00:00
elexis 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
elexis 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
elexis 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
mimo 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
Itms 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
Itms 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
elexis 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
elexis 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
elexis 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
elexis 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
elexis c1eff53eab Complete the previous commit to account for both rmlib2 files.
This was SVN commit r18508.
2016-07-11 18:01:01 +00:00
Itms 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
Itms 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
sanderd17 4eea798d79 Add descriptions for the Shift modifier. Patch by andy5995
This was SVN commit r18504.
2016-07-10 18:02:16 +00:00
mimo 73d62fb903 make the ai use allied dropsites when shared, fixes #4085
This was SVN commit r18503.
2016-07-10 17:44:48 +00:00
fatherbushido 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
mimo ca76fb5053 finetune the load savedgame layout of f7ff2f2e99
This was SVN commit r18501.
2016-07-09 18:24:00 +00:00
fatherbushido 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
mimo ff4e751dce petra cleanup
This was SVN commit r18499.
2016-07-08 15:13:04 +00:00
elexis 84fae4baeb Fix lineendings for all map files.
This was SVN commit r18498.
2016-07-08 08:42:49 +00:00
fatherbushido c8c7dbc6a4 Fix missing actor.
This was SVN commit r18497.
2016-07-08 08:28:16 +00:00
fatherbushido 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
elexis 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
elexis 888a281552 Complete rename of 9d20881ef4.
This was SVN commit r18493.
2016-07-07 01:22:03 +00:00
elexis 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
mimo 20866bd9d8 petra cleanup
This was SVN commit r18491.
2016-07-06 18:51:43 +00:00
LordGood 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
Itms ec2e2a84a4 Fix and improve 001c411cc2.
This was SVN commit r18489.
2016-07-05 20:23:12 +00:00
mimo 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
elexis 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
elexis 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
elexis 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
elexis de8bb7fe28 Skirmish map "Dueling Cliffs" by scythetwirler, reworked by niektb.
This was SVN commit r18483.
2016-07-04 02:45:27 +00:00
elexis afa4b0cba1 Fix autocomplete in gamesetup, see 09fdf716e9. Thanks echotangoecho for reporting.
This was SVN commit r18482.
2016-07-03 20:53:43 +00:00
elexis 437cc13b95 Make charge attack unavailable from the simulation.
The order change to GetAttackTypes in a09c59e044 revealed that it was
only the GUI not triggering the buggy code.
Eliminate for-each of UnitAI calling that function.

This was SVN commit r18481.
2016-07-03 20:41:03 +00:00
elexis 0f38095dfd Remove the outdated tooltip following 0624045e6c.
This was SVN commit r18480.
2016-07-03 20:40:19 +00:00
elexis d99c5ce064 Fix typo.
This was SVN commit r18479.
2016-07-03 11:25:59 +00:00
mimo 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
elexis 22b72a362b Splash damage tooltip.
This was SVN commit r18477.
2016-07-03 04:08:52 +00:00
elexis 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
elexis 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
elexis 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
elexis 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
elexis 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
elexis 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
wraitii 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
niektb 967a500d37 Fix Roman Siege Wall after b2f4b0f494. Patch by fatherbushido.
This was SVN commit r18469.
2016-07-02 08:35:31 +00:00
wraitii 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
elexis 1276b98965 Argh.
This was SVN commit r18466.
2016-07-01 15:18:09 +00:00
elexis 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
elexis 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
elexis 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
elexis 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
elexis 1e5d67b6bb Fix missing replacement in 4d9565297d. Thanks Imarok for reporting.
This was SVN commit r18460.
2016-06-30 12:30:36 +00:00
elexis b134047abe Also add a reset-teams button for consistency, refs #3805.
This was SVN commit r18459.
2016-06-30 12:03:37 +00:00
elexis 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
elexis 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
elexis ef9eb787be Remove wrong space from 4d9565297d.
This was SVN commit r18456.
2016-06-30 02:11:30 +00:00
elexis 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
elexis 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
elexis 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
elexis 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
elexis 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
FeXoR 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
FeXoR 0f1cef8766 Code cleanup of random map lib map.js.
This was SVN commit r18449.
2016-06-27 22:42:12 +00:00
wraitii 9b3ec336fe Make non-refraction water less transparent.
This was SVN commit r18448.
2016-06-27 13:50:54 +00:00
wraitii 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
elexis 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
mimo 307ed87829 petra: fix some rare case trying to attack an ally
This was SVN commit r18444.
2016-06-26 18:18:29 +00:00
wraitii 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
wraitii a4a45e4dc4 Fix compiler warning, thanks to elexis. Refs #4056
This was SVN commit r18442.
2016-06-26 16:51:52 +00:00
elexis 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
elexis 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
wraitii 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
FeXoR 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
wraitii 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
wraitii 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
mimo 98f8541581 remove a useless leftover var
This was SVN commit r18434.
2016-06-24 18:03:19 +00:00
elexis d8e9642d09 Fix lineendings of all files in simulation/.
This was SVN commit r18433.
2016-06-24 12:39:22 +00:00
elexis 989df9cb3b Fix lineendings of JS simulation components.
This was SVN commit r18432.
2016-06-24 12:23:39 +00:00
elexis 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
mimo 9c980173e3 petra cleanup
This was SVN commit r18429.
2016-06-23 18:25:27 +00:00
elexis 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 (since it's
not the maptype).
Notice mapInfoName still shouldn't be colored.

This was SVN commit r18428.
2016-06-23 14:33:28 +00:00
elexis 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
wraitii 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
wraitii 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
wraitii 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
elexis 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
elexis 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
niektb 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
elexis 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
wraitii 9e526614be Accidentally left a change from #4056 in in 7c21a0cf8e.
This was SVN commit r18418.
2016-06-21 11:13:00 +00:00
wraitii 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
elexis 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
elexis 4fde34c168 Revert be5f2d2bb5 since the implicit conversion throws a warning.
This was SVN commit r18415.
2016-06-21 00:06:14 +00:00
mimo 600f21578f cleanup of some replay and savedgame stuff
This was SVN commit r18414.
2016-06-20 17:43:16 +00:00
elexis be5f2d2bb5 Remove an unneeded String() conversion.
This was SVN commit r18413.
2016-06-20 16:09:57 +00:00
elexis 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
elexis 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
mimo f7ff2f2e99 improve load game UI, fixes #1090
This was SVN commit r18409.
2016-06-19 21:01:25 +00:00
niektb 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
niektb 24b2a2b828 Three new fauna portraits made by Foaly
This was SVN commit r18407.
2016-06-19 18:08:39 +00:00
elexis 5186560466 Suppress a warning.
This was SVN commit r18406.
2016-06-19 14:37:38 +00:00
elexis 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
mimo dbe985cd78 petra: remove some useless return
This was SVN commit r18404.
2016-06-18 17:34:02 +00:00
mimo e8291130bd petra: update list of enemy structures when diplomacy changes
This was SVN commit r18403.
2016-06-18 16:59:34 +00:00
elexis 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
elexis 64d14b9fc6 Fix "supersedes" indentation issue of technologies in 4c22d4631a.
This was SVN commit r18401.
2016-06-18 11:07:44 +00:00
elexis 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
elexis 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
elexis 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
elexis 8c69309e7c Missing semicolon, rephrase comment, refs #3216.
This was SVN commit r18397.
2016-06-17 12:08:40 +00:00
elexis 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
elexis 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
elexis 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
elexis 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
elexis a874b3c1c3 Colorize playernames in the kick/ban chat notification, refs #3241.
This was SVN commit r18391.
2016-06-16 17:13:02 +00:00
sanderd17 450973a624 Clean up some code-style issues reported by leper
This was SVN commit r18390.
2016-06-16 14:51:12 +00:00
elexis 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
elexis 8aea8d0849 Replace magic number with a readable string, refs #3436.
This was SVN commit r18388.
2016-06-16 00:40:21 +00:00
mimo 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
mimo 6da94fef96 petra cleanup, spotted by leper
This was SVN commit r18386.
2016-06-15 21:06:09 +00:00
elexis 156b360f06 Print engine version to the logfiles.
This was SVN commit r18385.
2016-06-15 19:26:28 +00:00
elexis 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
elexis 8302eeaf73 Rest of the previous commit.
This was SVN commit r18383.
2016-06-15 16:16:55 +00:00
elexis 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.
Remove unused variables and access to undefined ones identified using
jshint.
Rename cmpPlayerMan.

This was SVN commit r18382.
2016-06-15 16:13:08 +00:00
elexis 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
elexis 997ea01b2b Fix typo in 366085e037 as reported by mimo.
This was SVN commit r18380.
2016-06-14 21:29:37 +00:00
elexis 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
elexis 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
elexis 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
elexis 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
elexis fb5e738920 Lobby cleanup. Patch by scythetwirler, refs #3865.
Replace an ugly workaround of ccb534259d with a proper check.

This was SVN commit r18375.
2016-06-14 12:17:37 +00:00
elexis 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
elexis 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
elexis 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
elexis 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
elexis 31decd6274 Messed up variable name in 9dc66a27d8.
This was SVN commit r18368.
2016-06-12 15:29:43 +00:00
sanderd17 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
elexis 9dc66a27d8 Pass pointer by ref.
This was SVN commit r18366.
2016-06-12 14:37:13 +00:00
elexis 6e2106edd8 Fix whitespace, refs #3000.
This was SVN commit r18365.
2016-06-12 13:54:00 +00:00
elexis 38c7d7224a Elephants are not expected to capture buildings.
This was SVN commit r18363.
2016-06-11 16:07:28 +00:00
elexis 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
elexis 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
FeXoR 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
elexis 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
wraitii 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
elexis c94cd66a57 Savegame cleanup.
Remove the player assignments altogether (506350d6fa) as the C++ part
already saves the playerID.
Grab the playerID directly from the game instead of passing it around
needlessly.

This was SVN commit r18357.
2016-06-10 19:04:57 +00:00
elexis 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
elexis 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
mimo a792503cab completes the ai adaptation to cost multipliers, fixes #4003
This was SVN commit r18353.
2016-06-09 19:28:54 +00:00
mimo dd823dd572 ai cleanup
This was SVN commit r18352.
2016-06-09 19:25:40 +00:00
wraitii 41bc367bd1 Messed up 01603708de
This was SVN commit r18350.
2016-06-09 17:45:50 +00:00
wraitii 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
elexis 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
elexis 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
elexis 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
elexis 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
wraitii 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
elexis 2165250316 Clarify translated string, as reported on transifex.
This was SVN commit r18343.
2016-06-08 11:12:10 +00:00
elexis 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
elexis 70e6be5196 GUI engine cleanup.
Remove unneeded parenthesis and few whitespace changes.

This was SVN commit r18341.
2016-06-07 15:57:33 +00:00
sanderd17 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
elexis a7b310f3bd GUI engine cleanup.
Fix typos, remove unneeded comments.

This was SVN commit r18339.
2016-06-07 12:02:33 +00:00
mimo 29a069b6fb petra cleanup
This was SVN commit r18337.
2016-06-05 20:52:21 +00:00
Itms 260f925ad9 Some fixes and improvements suggested by leper
This was SVN commit r18336.
2016-06-05 20:48:22 +00:00
LordGood ee8061d867 fixed market actor and seleucid spec texture
This was SVN commit r18335.
2016-06-05 15:31:48 +00:00
mimo d3ffa91fa9 petra cleanup
This was SVN commit r18334.
2016-06-05 14:44:17 +00:00
mimo e260fab9a0 petra: first part of adaptation to cost multipliers, ref #4003
This was SVN commit r18333.
2016-06-05 14:39:37 +00:00
sanderd17 98f1d02d88 Fix garrison flag on new seleucid blacksmith
This was SVN commit r18332.
2016-06-05 08:47:22 +00:00
LordGood 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
mimo 756d23c987 petra cleanup
This was SVN commit r18330.
2016-06-04 17:36:14 +00:00
sanderd17 f6b9cbf280 Remove duplicate temple actors
This was SVN commit r18329.
2016-06-04 14:15:52 +00:00
sanderd17 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
sanderd17 279a9ed785 Move old Persian building
This was SVN commit r18327.
2016-06-04 13:29:08 +00:00
sanderd17 e573ea54a2 Move some old hellenistic actors to the old directory
This was SVN commit r18326.
2016-06-04 13:25:30 +00:00
mimo 04123e7725 some cleanup, reported by leper
This was SVN commit r18325.
2016-06-04 12:43:02 +00:00
sanderd17 c08bde9100 Fix garrison flags on Spartan buildings + clean up some actors
This was SVN commit r18323.
2016-06-04 12:18:47 +00:00
elexis 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.

This was SVN commit r18322.
2016-06-04 12:08:30 +00:00
sanderd17 1871213496 Fix garrison flags on Seleucid buildings + clean up some actors
This was SVN commit r18321.
2016-06-04 12:06:48 +00:00
sanderd17 9a38ae6455 Fix garrison flags on Roman buildings + clean up some actors
This was SVN commit r18320.
2016-06-04 11:58:10 +00:00
sanderd17 c0f0f6fb53 Fix garrison flags on Ptolemaeic buildings + clean up some actors
This was SVN commit r18319.
2016-06-04 11:31:21 +00:00
elexis 6377670543 Simulation cleanup.
Fix previous commit and add missing semicolon.

This was SVN commit r18318.
2016-06-04 02:33:53 +00:00
elexis 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
elexis a84b9a087c Fix some string issues pointed out by leper.
This was SVN commit r18316.
2016-06-04 00:59:46 +00:00
elexis 4110fee44e Session cleanup and bugfix.
Rename "hosts" following 903803ceec in session and join dialog.
Move join/leave code to new functions OnClientJoin and OnClientLeave.

This was SVN commit r18315.
2016-06-03 16:54:00 +00:00
elexis 80ea90ec4b Summary screen cleanup.
Use 8b30273a50 to remove hardcoding of the available panels.
Access the summary panels by name instead of numerical index.
Move nested function to global scope.
Add newlines.
Remove unneeded comments.
Use join(" ") to construct the size property.

This was SVN commit r18314.
2016-06-03 16:22:02 +00:00
elexis 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
FeXoR 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
sanderd17 3cf766126b Fix garrison flags on Persian buildings + clean up some actors
This was SVN commit r18311.
2016-06-03 15:12:07 +00:00
sanderd17 4048c0e03c Fix garrison flags on Mauryan buildings + clean up some actors
This was SVN commit r18310.
2016-06-03 14:21:07 +00:00
sanderd17 81eb22d01a Fix garrison flags on Macedonian buildings + clean up some actors
This was SVN commit r18309.
2016-06-03 14:00:59 +00:00
sanderd17 03060c4307 Fix skirmish replacements
This was SVN commit r18308.
2016-06-03 13:49:26 +00:00
sanderd17 81512a5558 Fix garrison flags on iberian buildings + clean up some actors
This was SVN commit r18307.
2016-06-03 13:11:47 +00:00
sanderd17 8e2fb41f92 Rename the not-so-new celtic actors
This was SVN commit r18306.
2016-06-03 11:38:04 +00:00
sanderd17 80ffd7ecb6 Move old celtic actors to a separate directory
This was SVN commit r18305.
2016-06-03 11:26:03 +00:00
sanderd17 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
sanderd17 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
sanderd17 df622b5614 Remove magic number from credits code.
This was SVN commit r18301.
2016-06-03 09:37:58 +00:00
elexis 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
elexis 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
elexis 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
elexis 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
elexis 31a7181eb8 Hide the continue button from d9caf157e2 once pressed, refs #4031.
This was SVN commit r18295.
2016-06-02 22:39:02 +00:00
sanderd17 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
sanderd17 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
sanderd17 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
sanderd17 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
mimo 5be948019b ai cleanup
This was SVN commit r18290.
2016-06-02 18:08:14 +00:00
elexis 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
elexis 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
elexis 00c3b09008 Patch by Sandarac and bb, fixes #3859.
This was SVN commit r18287.
2016-06-02 12:14:32 +00:00
elexis 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
elexis 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
elexis 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
elexis 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
sanderd17 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
mimo 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
sanderd17 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
elexis 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
elexis 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
elexis 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
mimo 3eea0df931 ai cleanup
This was SVN commit r18274.
2016-05-31 21:06:53 +00:00
mimo 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
elexis 246c758085 All wonders should have rallypoints. Patch by Sandarac, fixes #4002.
This was SVN commit r18271.
2016-05-31 09:49:14 +00:00
elexis 2bcb5f7d18 Actually delete it, refs #4016.
This was SVN commit r18270.
2016-05-31 02:16:11 +00:00
elexis 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
elexis 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
sanderd17 b18c4ac217 Code style improvements to df971c3885
This was SVN commit r18267.
2016-05-30 17:05:39 +00:00
sanderd17 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
sanderd17 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
mimo 92e28ba947 more petra cleanup
This was SVN commit r18263.
2016-05-29 18:37:02 +00:00
sanderd17 25e637dcac Fix issue with undefined newValue while origValue is defined.
This was SVN commit r18262.
2016-05-29 18:10:57 +00:00
elexis 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
sanderd17 a8c05c8df3 Revert ba071f8b4e as it is unsafe for serialization
This was SVN commit r18260.
2016-05-29 14:51:15 +00:00
sanderd17 1a8f5f3490 Move rallypoint waypoints smoothly with moving targets
This was SVN commit r18259.
2016-05-29 12:49:32 +00:00
mimo 3d6c48e357 ai cleanup, mainly var -> let
This was SVN commit r18258.
2016-05-29 12:26:41 +00:00
mimo 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
sanderd17 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
elexis d238128960 Balance the wonder and improve unique building tooltips.
Increase the armor of buildings following 27c46a0a68.
Triple the research time for the population tech, as it is the most
powerful tech in the game.
Mention that unique building auras stack.
Fix a bad tooltip in pop_wonder.json.

This was SVN commit r18255.
2016-05-28 20:49:45 +00:00
sanderd17 50ba14d16d Restructure unit_actions.js. Fixes #4007
This was SVN commit r18254.
2016-05-28 14:46:20 +00:00
elexis 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
elexis 6162c6388f Show hotkeys in the tooltips of six buttons.
This was SVN commit r18252.
2016-05-27 23:49:14 +00:00
elexis 39bf451d49 Use relative template for 0b2f0ea042.
This was SVN commit r18251.
2016-05-27 23:42:34 +00:00
mimo 1b598eaccf ai: remove some redundant get functions
This was SVN commit r18250.
2016-05-27 19:59:27 +00:00
elexis 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
elexis 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
elexis 06b77c1522 Update manual with some new hotkeys.
This was SVN commit r18247.
2016-05-27 17:01:18 +00:00
elexis 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
elexis 038e45cba8 Rotate icon, refs #3805.
This was SVN commit r18244.
2016-05-27 13:22:10 +00:00
elexis 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
sanderd17 f422b67eb0 Fix issue with hidden techs after researching it
This was SVN commit r18242.
2016-05-27 08:37:44 +00:00
elexis 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
elexis 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
elexis 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
sanderd17 dacecd0f33 Better syntax for e84e0611b0
This was SVN commit r18237.
2016-05-26 20:04:20 +00:00
sanderd17 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
sanderd17 4bf0dddace Add javelin to samnite skirmisher projectile attachpoint. Fixes #4005
This was SVN commit r18235.
2016-05-26 18:10:22 +00:00
mimo 0856dde011 fix a typo in 58e356babb, plus a missing semicolon
This was SVN commit r18234.
2016-05-26 17:58:08 +00:00
sanderd17 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
mimo 9c67cd6743 transfer the entities angles to the AIs
This was SVN commit r18231.
2016-05-25 19:03:41 +00:00
mimo 07007f1963 some cleanup in ai
This was SVN commit r18230.
2016-05-25 18:43:48 +00:00
LordGood 3d27d47d54 Seleucid corral
This was SVN commit r18229.
2016-05-25 12:39:16 +00:00
Itms 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
elexis 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
elexis 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
elexis a99f314a61 Session cleanup.
Use let instead of var.

This was SVN commit r18225.
2016-05-24 12:06:22 +00:00
elexis 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
elexis 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
sanderd17 33f6713f94 New attempt to get the aura translations included. See 1606d40f68
This was SVN commit r18221.
2016-05-23 10:40:26 +00:00
mimo 6171f66d06 AI: fix serialization of template changes, fixes #3993, refs #3858
This was SVN commit r18219.
2016-05-22 20:25:41 +00:00
sanderd17 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
elexis 38de20c989 Add missing init, refs #3991.
This was SVN commit r18217.
2016-05-21 20:24:38 +00:00
mimo 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
mimo 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
elexis 4b5f8dfca6 Remove trailing whitespace and simplify some length checks. Refs #252.
This was SVN commit r18214.
2016-05-21 16:20:27 +00:00
sanderd17 a2bd82d171 Complete phase tooltips. Patch by fatherbushido. Fixes #3451
This was SVN commit r18213.
2016-05-21 11:18:06 +00:00
sanderd17 1606d40f68 I18n of auras. Based on patch by fatherbushido. Fixes #3982
This was SVN commit r18212.
2016-05-21 09:18:05 +00:00
FeXoR 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
sanderd17 a84b923380 Fix timing of previous patch
This was SVN commit r18210.
2016-05-20 14:05:19 +00:00
sanderd17 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
elexis 7cd43ba8cf Fix whitespace and remove duplicate comment, refs #1950.
This was SVN commit r18208.
2016-05-20 12:51:27 +00:00
sanderd17 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
elexis 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
elexis 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
elexis 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
elexis 1b3a12ea92 Also update this file following 1c5a7f6267.
This was SVN commit r18200.
2016-05-19 17:51:56 +00:00
sanderd17 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
FeXoR 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
elexis 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
mimo b57a103e81 petra cleanup, mainly unneeded parentheses
This was SVN commit r18196.
2016-05-17 19:35:33 +00:00
mimo 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
elexis 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
elexis 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
elexis 67cdbedb24 Fix an option comment.
This was SVN commit r18192.
2016-05-17 16:35:48 +00:00
elexis 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
sanderd17 0501ff9f59 Fix Seleucus aura
This was SVN commit r18190.
2016-05-17 11:44:29 +00:00
elexis 23a43cb0f6 Allow more choices for the wonder timeout, refs #3234.
This was SVN commit r18189.
2016-05-16 18:32:24 +00:00
elexis 2de117618b Fix typo in 46ead523b8. Patch by fatherbushido, refs #3792.
This was SVN commit r18188.
2016-05-16 13:57:45 +00:00
elexis 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
mimo 0b6c7ca1b0 ai: remove some unneeded parentheses
This was SVN commit r18186.
2016-05-16 10:48:52 +00:00
mimo 7ddfc89c18 petra: fix buildLimit when it is 0, reported by fatherbushido
This was SVN commit r18185.
2016-05-16 10:23:35 +00:00
elexis 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
elexis 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
elexis 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
elexis 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
elexis 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
elexis b562db2f27 Update the loading screen tooltips following 60a2af2988.
This was SVN commit r18177.
2016-05-15 01:14:33 +00:00
elexis 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
sanderd17 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
mimo 6dbdaf1160 fix 58e356babb
This was SVN commit r18174.
2016-05-14 18:25:35 +00:00
elexis dd26d683c6 Summary screen cleanup.
Few simplifications, newlines for sprintf calls.

This was SVN commit r18173.
2016-05-14 13:10:50 +00:00
mimo 58e356babb allow trade with mirage markets, fixes #3894
This was SVN commit r18172.
2016-05-14 12:27:48 +00:00
elexis 866d04a22b Fix typo.
This was SVN commit r18171.
2016-05-14 12:15:41 +00:00
mimo ac525fcd2a some cleanup in petra
This was SVN commit r18170.
2016-05-14 12:14:12 +00:00
elexis 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
mimo 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
mimo 0b8845eb4f fix 7f300bbf3d
This was SVN commit r18167.
2016-05-13 20:14:02 +00:00
sanderd17 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
mimo 148f485172 remove some unused var
This was SVN commit r18164.
2016-05-12 17:42:27 +00:00
mimo a4cb84c8e0 ai cleanup, mainly trailing spaces
This was SVN commit r18163.
2016-05-12 17:38:58 +00:00
elexis 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
elexis 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
elexis 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
elexis 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
elexis 0e5815b78f Remove trailing whitespace.
This was SVN commit r18158.
2016-05-12 11:27:21 +00:00
elexis 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
sanderd17 b0000da90e Fix small issue discovered by fatherbushido
This was SVN commit r18156.
2016-05-11 09:35:52 +00:00
elexis 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
elexis 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
fabio 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
elexis 2b0fa71d23 Session cleanup.
Use colorizePlayernameByID instead of replica.

This was SVN commit r18152.
2016-05-10 03:14:51 +00:00
elexis 71c441b092 GUI cleanup.
Remove a wrong translation comment.
Nuke duplicate calls.

This was SVN commit r18151.
2016-05-10 02:35:12 +00:00
LordGood 6ba0d86ab6 Seleucid market commit
This was SVN commit r18150.
2016-05-09 22:45:50 +00:00
elexis 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
elexis 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
mimo b45e3e46f7 add non-blocking obstruction to mirages, fixes #3957, refs #2951
This was SVN commit r18145.
2016-05-08 17:26:43 +00:00
elexis 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
FeXoR cf7a71965b Removing function euclid_distance as duplication of getDistance. Fixes #3968
This was SVN commit r18142.
2016-05-08 15:15:43 +00:00
FeXoR 7471a0db63 Separate global heightmap manipulation functions to a library. Fixes #3764
This was SVN commit r18141.
2016-05-08 14:58:57 +00:00
elexis 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
sanderd17 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
sanderd17 09fd6da38e Update credits
This was SVN commit r18136.
2016-05-06 07:26:51 +00:00
mimo 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
sanderd17 503cc428b4 Add team option to autostart. Patch by Jonbaer
This was SVN commit r18133.
2016-05-04 06:51:34 +00:00
mimo dfad4ec7d7 fix petra typo reported by falsevision, fixes #3955
This was SVN commit r18132.
2016-05-03 18:49:33 +00:00
sanderd17 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
sanderd17 77224548bf Use references instead of copies
This was SVN commit r18130.
2016-05-02 19:03:19 +00:00
sanderd17 eaed715a13 Fix typo in aura tooltip
This was SVN commit r18129.
2016-05-02 18:02:24 +00:00
sanderd17 a2c3a8a8db Fix typo in AuraManager
This was SVN commit r18128.
2016-05-02 17:32:04 +00:00
elexis 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
elexis 36d8e0bf5b Remove unused function.
This was SVN commit r18126.
2016-05-02 16:53:38 +00:00
sanderd17 58569aa573 Fix some auras. Patch by fatherbushido. Fixes #3947
This was SVN commit r18125.
2016-05-02 16:26:27 +00:00
elexis 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
sanderd17 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
sanderd17 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
Enrique 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
mimo bc19818e86 some petra cleaning
This was SVN commit r18118.
2016-05-01 15:03:23 +00:00
elexis 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
sanderd17 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
sanderd17 32d8c60239 Implement team bonuses. Patch by fatherbushido. Fixes #2445
This was SVN commit r18115.
2016-05-01 08:38:59 +00:00
LordGood 4471e0bf18 Colonnade for Seleucid city building
This was SVN commit r18114.
2016-05-01 04:35:24 +00:00
FeXoR 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
elexis 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
elexis 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
elexis 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
mimo d420717eba add some missing semicolon from b88f63b699
This was SVN commit r18109.
2016-04-29 19:56:58 +00:00
mimo 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
mimo b780073e24 petra cleanup
This was SVN commit r18105.
2016-04-28 17:14:07 +00:00
elexis c76b2a6c92 Session cleanup.
Remove an occurance of a hardcoded playerlimit.

This was SVN commit r18104.
2016-04-28 16:39:09 +00:00
elexis 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
sanderd17 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
sanderd17 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
LordGood f7a618d233 Seleucid barracks edit
Seleucid wonder commit

This was SVN commit r18098.
2016-04-27 04:43:47 +00:00
mimo 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
mimo fd4d5cce64 petra: recomputes territory only when receiving some events, refs #3858
This was SVN commit r18096.
2016-04-26 18:26:18 +00:00
mimo 76a076e776 fix petra typos reported by falseVision, fixes #3926
This was SVN commit r18095.
2016-04-26 18:15:57 +00:00
sanderd17 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
Itms 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
Itms 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
sanderd17 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
Itms 644b3e6fa1 Improve the UI icon for the patrol button, refs #1720.
This was SVN commit r18088.
2016-04-23 10:48:14 +00:00
Enrique 2f1c08de64 Greek rooftiles texture update
This was SVN commit r18087.
2016-04-23 09:04:22 +00:00
elexis 72421f97d8 Fix a typo (compability -> compatibility).
This was SVN commit r18086.
2016-04-22 22:32:20 +00:00
elexis 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
Enrique f0263086c4 Roman textures transparency fix
This was SVN commit r18084.
2016-04-22 16:47:56 +00:00
sanderd17 11d150ce59 Move animations for female citizens to separate variant files.
This was SVN commit r18083.
2016-04-22 12:51:09 +00:00
Enrique f9a7494d3f Roman rooftile update
This was SVN commit r18082.
2016-04-22 11:01:50 +00:00
sanderd17 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
LordGood c226517f2f Seleucid walls, finally
Placeholder normalmaps and specmaps added too

This was SVN commit r18079.
2016-04-22 06:10:01 +00:00
elexis 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
sanderd17 c2e42f0e55 Add capture animation to champion infantry of different civs
This was SVN commit r18077.
2016-04-21 09:05:13 +00:00
elexis 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
elexis 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
sanderd17 46443f92c9 Define animations for Spartan infantry in separate variant files.
This was SVN commit r18074.
2016-04-20 10:55:02 +00:00
sanderd17 d305371782 Define animations for Seleucid infantry in separate variant files.
This was SVN commit r18073.
2016-04-20 10:47:24 +00:00
sanderd17 2b3aa81c0e Define animations for Ptolemy infantry in separate variant files.
This was SVN commit r18072.
2016-04-20 09:58:34 +00:00
sanderd17 9ee2f75390 Define animations for Roman infantry in separate variant files.
This was SVN commit r18071.
2016-04-20 09:49:54 +00:00
sanderd17 a40857556a Define animations for Persian infantry in separate variant files.
This was SVN commit r18070.
2016-04-20 08:51:11 +00:00
sanderd17 532d495e6d Define animations for Mauryan infantry in separate variant files.
This was SVN commit r18069.
2016-04-20 08:33:59 +00:00
sanderd17 a032d5c8b5 Define animations for Macedonian infantry in separate variant files.
This was SVN commit r18068.
2016-04-20 08:03:13 +00:00
sanderd17 70feece690 Define animations for Iberian infantry in separate variant files.
This was SVN commit r18067.
2016-04-20 07:07:05 +00:00
sanderd17 5602454fe2 Correctly support different javelin types for different javelinists
This was SVN commit r18066.
2016-04-20 06:51:50 +00:00
sanderd17 bdabc459b0 Define animations for Hellenistic infantry in separate variant files.
This was SVN commit r18065.
2016-04-20 06:21:07 +00:00
sanderd17 481f90d107 Define animations for Celtic infantry in separate variant files.
This was SVN commit r18064.
2016-04-19 19:09:05 +00:00
sanderd17 8311472a5c Change include into forward declaration
This was SVN commit r18063.
2016-04-19 17:48:06 +00:00
sanderd17 2dea3f2ec4 Remove two more build limit tooltips. Patch by fatherbushido
This was SVN commit r18062.
2016-04-19 16:22:48 +00:00
sanderd17 61fcf29a9e Define animations for Carthagian infantry in separate variant files.
This was SVN commit r18061.
2016-04-19 16:15:01 +00:00
elexis 04794599ed GUI cleanup.
Use logical AND instead of the conditional operator.

This was SVN commit r18060.
2016-04-19 15:41:14 +00:00
sanderd17 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
sanderd17 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
sanderd17 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
sanderd17 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
sanderd17 1e6c12de7b Allow variants to be defined in external files. Fixes #3286
This was SVN commit r18054.
2016-04-19 07:51:59 +00:00
Enrique 5d8e5edbfb Improved farms from LordGood.
This was SVN commit r18053.
2016-04-18 22:46:46 +00:00
sanderd17 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
sanderd17 a60abaa1c8 Disable building most structures in unconnected territory. Fixes #3526
This was SVN commit r18049.
2016-04-18 07:00:22 +00:00
sanderd17 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
Itms de0500e274 Fix the shared dropsites unit action icon. Refs #3791
This was SVN commit r18047.
2016-04-17 21:00:51 +00:00
scythetwirler 07b368f064 Thanks, IDE, for proper indentation detection...
This was SVN commit r18046.
2016-04-17 20:29:02 +00:00
scythetwirler 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
sanderd17 c25dc39b86 Distribute XP per hit. Fixes #3889
This was SVN commit r18044.
2016-04-17 17:52:22 +00:00
scythetwirler c9eb2fd05c Adds a build limit to Persian Halls.
This was SVN commit r18043.
2016-04-17 17:46:57 +00:00
mimo 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
sanderd17 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
mimo 9c6e9f70b5 ai: fix typo from 317e2b259d
This was SVN commit r18039.
2016-04-16 17:52:50 +00:00
mimo 259af9effc adapt the ai to recent changes in phase tech requirements
This was SVN commit r18038.
2016-04-16 13:15:41 +00:00
scythetwirler d38adc7cd0 Makes siege less useless.
This was SVN commit r18037.
2016-04-15 17:37:38 +00:00
elexis 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
sanderd17 15e44a89ff Fix structree with new 'notciv' tech requirement
This was SVN commit r18034.
2016-04-14 18:23:32 +00:00
sanderd17 3ddfa1695e Fix tests
This was SVN commit r18033.
2016-04-14 17:25:22 +00:00
sanderd17 ec3fb36602 Fix build for gcc 4.6. Patch by Vladislav
This was SVN commit r18032.
2016-04-14 16:36:12 +00:00
elexis 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
sanderd17 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
mimo 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
mimo 8f4dffe3f0 add a new market component, fixes #3277
This was SVN commit r18028.
2016-04-13 19:56:18 +00:00
sanderd17 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
Itms 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
scythetwirler b5bf0c7e86 Nerfs champions and slows champion production speed.
This was SVN commit r18025.
2016-04-12 18:51:14 +00:00
scythetwirler 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
mimo 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
FeXoR 8aa5b1fa9e Center lake in random map schwarzwald
This was SVN commit r18022.
2016-04-12 12:03:48 +00:00
sanderd17 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
mimo 8c870f8633 petra: remove a leftover test
This was SVN commit r18020.
2016-04-11 17:20:45 +00:00
elexis 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
elexis 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
Itms 5ac76ecf89 Some style fixes reported by leper.
This was SVN commit r18016.
2016-04-10 16:57:12 +00:00
mimo 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
sanderd17 3183a4ea4a Improve selection rings for animals. Patch by Palaxin. Fixes #3786
This was SVN commit r18014.
2016-04-10 08:31:11 +00:00
sanderd17 f8e986d057 Fix territory not being updated when diplomacy changes. Fixes #3891
This was SVN commit r18012.
2016-04-09 19:57:34 +00:00
Itms 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
sanderd17 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
sanderd17 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
mimo e93c1e6bca add diversity to corral production, fixes #3877
This was SVN commit r18008.
2016-04-08 20:51:24 +00:00
mimo 2392f6fe8e lock/unlock simultaneously multiple dropsites when selected
This was SVN commit r18007.
2016-04-08 20:48:10 +00:00
mimo 90cb6ff6b6 petra: improve the sharing between support units and citizen soldiers
This was SVN commit r18006.
2016-04-08 18:31:09 +00:00
Itms 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
mimo 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
sanderd17 a4f10d53f2 Fix indentation due to pastebin patch losing a newline
This was SVN commit r18003.
2016-04-08 14:43:06 +00:00
sanderd17 59c6fd44a0 Remove stamina completely. Patch by fatherbushido
This was SVN commit r18002.
2016-04-08 14:36:18 +00:00
sanderd17 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
sanderd17 524d35ffdc Stop defense tower techs from affecting wall tower stats
This was SVN commit r17999.
2016-04-07 16:57:00 +00:00
mimo 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
sanderd17 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
elexis 3c40131c61 Player component cleanup.
Remove unneeded parenthesis.
Restore indentation.

This was SVN commit r17996.
2016-04-07 10:57:11 +00:00
sanderd17 f7099d364c Fix typo
This was SVN commit r17995.
2016-04-07 08:23:06 +00:00
sanderd17 ffe2c7bbb4 Add methods to check for strickt alliance. Patch by fatherbushido
This was SVN commit r17994.
2016-04-07 08:12:15 +00:00
sanderd17 f8ce6819b9 Add s1lence to credits
This was SVN commit r17993.
2016-04-07 07:24:14 +00:00
sanderd17 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
Itms 9aa829d034 Add female Greek voice and musicians credits.
This was SVN commit r17991.
2016-04-06 16:56:29 +00:00
sanderd17 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
sanderd17 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
sanderd17 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
elexis 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
elexis 138724ce0f Random-map-script cleanup.
Rename biomeID to g_BiomeID.

This was SVN commit r17986.
2016-04-05 18:49:37 +00:00
mimo 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
mimo 7029ddc2dd fix autostart in maps with gaia in PlayerData, fixes #3880
This was SVN commit r17984.
2016-04-05 18:21:10 +00:00
sanderd17 8b0d24048a First unit test for auras
This was SVN commit r17983.
2016-04-05 15:28:38 +00:00
sanderd17 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
elexis 70a3201b23 Remove triple X comment pollution from maps.
This was SVN commit r17981.
2016-04-05 11:53:05 +00:00
elexis 62b7c07353 Remove unused author and version tag from ardennes forest.
This was SVN commit r17980.
2016-04-05 11:22:16 +00:00
scythetwirler bfa94b87ae Bumps up version number.
This was SVN commit r17978.
2016-04-04 21:20:45 +00:00
Itms a7806675fb This was SVN commit r17977. 2016-04-04 21:18:58 +00:00
Itms 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
sanderd17 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
sanderd17 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
mimo 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
mimo f057eb5aba petra now uses corrals on maps with low starting resources
This was SVN commit r17971.
2016-04-03 09:16:14 +00:00
mimo 63fad07905 nerf a bit wall towers
This was SVN commit r17970.
2016-04-03 09:13:13 +00:00
mimo 1d0c0e00e5 allows destroying animals when controlAllUnits is set
This was SVN commit r17969.
2016-04-02 14:58:31 +00:00
mimo 8211f95978 petra cleanup
This was SVN commit r17968.
2016-04-02 14:49:08 +00:00
mimo 18960ddcf8 fix petra training of support units, fixes #3864
This was SVN commit r17967.
2016-04-02 14:23:14 +00:00
mimo 42b93c45b8 fix playerData of Forest Battle map
This was SVN commit r17966.
2016-04-02 14:21:20 +00:00
Itms 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
Itms a517184150 Update the creditTranslators script for the A20 languages.
This was SVN commit r17963.
2016-03-28 00:18:13 +00:00
elexis 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
Itms 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
elexis 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
Itms 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
Itms 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
sanderd17 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
mimo 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
elexis 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
sanderd17 6f0d0ff8f4 Round max hp of units in simulation. Refs #3855
This was SVN commit r17951.
2016-03-25 12:51:48 +00:00
Itms 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
elexis 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
elexis 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
elexis 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
elexis 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.

This was SVN commit r17945.
2016-03-24 14:54:47 +00:00
elexis 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
elexis 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
Itms 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, refs #3350.

This was SVN commit r17941.
2016-03-23 21:58:23 +00:00
elexis 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
sanderd17 82fa9d8f5b Fix counting issue with previous commit
This was SVN commit r17939.
2016-03-23 10:01:27 +00:00
sanderd17 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
elexis 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
elexis 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
sanderd17 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
mimo c43ce2ca55 cleanup of missing semicolon
This was SVN commit r17934.
2016-03-21 20:33:05 +00:00
elexis 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
mimo 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
sanderd17 820846b56b Completely initialise Auras even before ownership is set. Fixes #3843
This was SVN commit r17931.
2016-03-21 16:22:40 +00:00
elexis 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
elexis 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
elexis 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
elexis 86a309ad76 Show replay path in commandline interface.
This was SVN commit r17927.
2016-03-21 12:09:21 +00:00
LordGood f8a09cf5c1 Seleucid barracks model, actor, AO
This was SVN commit r17926.
2016-03-21 10:25:01 +00:00
elexis 8f4daa9dd0 Lobby performance improvement.
Since 8b437a0b1c, updatePlayerList() is called everytime a muc-message
is received, calling playersBox.SelectionChange(), calling
displayProfile() which requests the profile from the server again.
Similar cases should be handled in #3840.

This was SVN commit r17924.
2016-03-21 03:44:01 +00:00
elexis 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
elexis 9e338f4461 Barter component cleanup. Replace deprecated for-each.
This was SVN commit r17922.
2016-03-21 00:45:32 +00:00
elexis 10b6022557 Convert string to int conversion in the lobby-leaderboard.
This was SVN commit r17921.
2016-03-21 00:38:31 +00:00
elexis 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
Itms b84b9a374a Improve some strings based on translators' feedback.
This was SVN commit r17919.
2016-03-20 18:58:59 +00:00
mimo 81948477df fix the test when changing markets, fixes #3838
This was SVN commit r17918.
2016-03-20 14:00:49 +00:00
scythetwirler 3025b4b8e3 Reduce query time of rating sorts.
This was SVN commit r17917.
2016-03-20 05:17:15 +00:00
sanderd17 01b963b259 Update version names to A20
This was SVN commit r17915.
2016-03-19 08:21:00 +00:00
elexis d5059e8e23 Don't use that variable outside of scope.
This was SVN commit r17913.
2016-03-18 17:54:22 +00:00
elexis 31fe2770f6 Update credits, refs #3234.
This was SVN commit r17912.
2016-03-18 14:58:13 +00:00
elexis 5c6ba10626 Remove blood from skeletons, refs #3455.
This was SVN commit r17911.
2016-03-18 14:02:47 +00:00
elexis 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
elexis 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
sanderd17 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
sanderd17 d44c4fd5c6 Update manual to mention skirmish maps
This was SVN commit r17906.
2016-03-17 08:13:52 +00:00
Itms f7045b23ce Fix some errors reported by translators on Transifex.
This was SVN commit r17905.
2016-03-16 23:27:17 +00:00
Itms 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
Itms 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
sanderd17 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
mimo 29e0a23c8e fix gui for non-sharable dropsites
This was SVN commit r17901.
2016-03-16 16:13:18 +00:00
sanderd17 d033038d69 Also translate specific name in strucTree (translations already exist)
This was SVN commit r17900.
2016-03-16 12:22:23 +00:00
mimo c3324765d2 improved icon from niektb
This was SVN commit r17899.
2016-03-15 20:22:19 +00:00
mimo 0863f20722 cleanup
This was SVN commit r17898.
2016-03-15 18:27:17 +00:00
elexis 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
elexis 518ae4fcb2 Lock diplomacy for all players if the locked-teams setting is enabled, fixes #3702.
GUI fix in 17e6b316fa, simulation fix here.

Remove quadruplicated code!
Check in Commands.js as this one handles user input.
Don't check in Player.js as the function should be versatile enough to
change diplomacy from all components, even if teams are locked or
ceasefire active.

This was SVN commit r17896.
2016-03-15 04:53:13 +00:00
elexis 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
elexis a2ecee4168 Rest of the previous commit, refs #3743.
This was SVN commit r17894.
2016-03-15 04:08:07 +00:00
elexis 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
Itms 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
mimo dd07241ef7 Petra: fix a bug in attackPlan spotted by leper
This was SVN commit r17891.
2016-03-14 18:08:51 +00:00
elexis 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
sanderd17 87da09bf1b Fix tests broken in 028e573759
This was SVN commit r17889.
2016-03-14 17:50:56 +00:00
elexis bedce1e617 Observer fix for shared-dropsites, refs #3791.
This was SVN commit r17887.
2016-03-14 01:23:09 +00:00
elexis 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
Itms a7b31398b0 Revert dbbc600dc3, refs #3745, refs #3823
This was SVN commit r17885.
2016-03-13 22:18:31 +00:00
mimo f7ea533ab9 better icon from niektb, refs #3791
This was SVN commit r17884.
2016-03-13 17:38:23 +00:00
Itms 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
Itms d84ad7799a Limit arrows on certain buildings and ships. Patch by sanderd17, fixes #3196.
Balancing by elexis, reverts fcf7344537 in favor of the new total arrow
limit.

This was SVN commit r17882.
2016-03-13 17:02:18 +00:00
elexis 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
Itms 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
elexis 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
mimo 2022aad5d1 decrease the hack armour of fields to favor rushes
This was SVN commit r17878.
2016-03-13 14:09:52 +00:00
elexis 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
elexis 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
mimo 028e573759 allow the use of allied dropsites using tech, fixes #3791
This was SVN commit r17875.
2016-03-13 13:33:21 +00:00
Itms bcfa626bc4 Improve 27b4df0978.
This was SVN commit r17874.
2016-03-12 22:20:15 +00:00
Itms 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
Itms 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
sanderd17 753a79ff67 Fix messages.json
This was SVN commit r17868.
2016-03-12 17:48:16 +00:00
Itms 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
Itms 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
Itms 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
mimo 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
elexis 18829e17c2 Fix comment following e0a9dfd5a2.
This was SVN commit r17862.
2016-03-10 17:11:36 +00:00
elexis 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
elexis 2305218d9f Optionnames are in lower case, refs #3604.
This was SVN commit r17860.
2016-03-10 11:16:15 +00:00
elexis b71e7e3538 Petra chathelper cleanup.
Inline variables used only once.

This was SVN commit r17859.
2016-03-10 10:44:52 +00:00
elexis aa1e3f6d06 Session cleanup
Simpler errorhandling when fetching GUIInterface-notifications.

This was SVN commit r17858.
2016-03-10 10:15:23 +00:00
Itms 4b636fc407 Add a precision to the instructions included in default.cfg.
This was SVN commit r17857.
2016-03-09 21:48:41 +00:00
mimo 212d8e7dd0 cleanup of 98b4fe6d00
This was SVN commit r17856.
2016-03-09 21:45:14 +00:00
elexis 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
mimo 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
elexis 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
elexis 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
elexis 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
elexis 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
mimo 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
mimo a1c6d9149b fix typo from 8725c3ae7a
This was SVN commit r17848.
2016-03-08 18:49:06 +00:00
elexis 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
elexis 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
elexis 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
elexis 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
elexis 35a13c5080 Remove trailing whitespace.
This was SVN commit r17843.
2016-03-07 17:28:31 +00:00
elexis 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
elexis dd5cc3d02e Gamesetup cleanup.
Inline initializaiton of g_ServerName and fix a typo in e05c8263c5.

This was SVN commit r17841.
2016-03-07 15:05:16 +00:00
elexis fc0f496e3d Fix indentation, refs #3803.
This was SVN commit r17840.
2016-03-07 11:44:03 +00:00
elexis 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
Itms 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
elexis 49c30ae4b8 Give credit to three awesome contributors, refs #3802.
This was SVN commit r17837.
2016-03-07 10:24:38 +00:00
elexis 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
elexis 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
elexis 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
mimo 5a8d7d1a58 petra cleanup
This was SVN commit r17831.
2016-03-05 16:20:49 +00:00
Itms bcf2c75513 New in-game Credits page, fixes #3744.
This was SVN commit r17830.
2016-03-05 11:52:08 +00:00
Itms 1504115c14 I shouldn't rename things.
This was SVN commit r17829.
2016-03-05 11:43:14 +00:00
Itms dfbf874d8b Some string fixes.
This was SVN commit r17828.
2016-03-05 11:30:27 +00:00
mimo 6451a4c3c1 Petra: improve choice of workers, fixes #3586, patch from otero
This was SVN commit r17827.
2016-03-04 17:08:45 +00:00
mimo 6b19eefdcb cleanup of some foreach
This was SVN commit r17826.
2016-03-04 16:51:52 +00:00
mimo 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
mimo d3e9aa2101 petra: complete changes started in 8d0223d6aa + some cleanup"
This was SVN commit r17823.
2016-03-03 16:18:12 +00:00
mimo 7403b92785 petra cleanup: use some arrow functions for sort
This was SVN commit r17822.
2016-03-02 17:10:26 +00:00
mimo 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
elexis 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
elexis 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
elexis 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
mimo 23d37f188a cleanup of some missing tabs
This was SVN commit r17817.
2016-03-02 16:25:14 +00:00
elexis 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
elexis 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
elexis 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
elexis 012b686e7c Two early returns. Refs #3265.
This was SVN commit r17813.
2016-03-02 13:42:47 +00:00
mimo 163af24a6c cleanup in petra, patch by otero
This was SVN commit r17812.
2016-03-01 17:57:19 +00:00
mimo 9c6082ec23 fix garrison aura from heros, patch by fatherbushido
This was SVN commit r17811.
2016-03-01 17:19:16 +00:00
mimo 04c94da3cb add some missing spaces in previous commit
This was SVN commit r17810.
2016-03-01 17:12:38 +00:00
mimo 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
mimo b88fd4fe09 fix typo from 8a3bbdf4db
This was SVN commit r17808.
2016-02-29 17:21:35 +00:00
mimo ba0700f612 garrisoning only works between mutual allies
This was SVN commit r17806.
2016-02-28 12:58:52 +00:00
Itms 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
elexis 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
mimo 652ec4f8e5 fix some resetting of gatherer walk animation
This was SVN commit r17802.
2016-02-24 18:57:23 +00:00
mimo ec43274e2b drop carried resources when finishing to build a dropsite
This was SVN commit r17801.
2016-02-24 18:49:28 +00:00
mimo 05cf535c58 do not drop resources when garrisoning in allied structure
This was SVN commit r17800.
2016-02-24 17:45:13 +00:00
elexis 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
elexis 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
elexis 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
elexis 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
elexis df42b9caba Commands.js cleanup.
This was SVN commit r17795.
2016-02-23 15:51:09 +00:00
elexis 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
elexis b60c6f6b15 Commands.js cleanup - fix whitespace.
This was SVN commit r17793.
2016-02-23 14:52:20 +00:00
elexis 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
elexis e953ca23ba Commands.js cleanup. Replace deprecated for-each.
This was SVN commit r17791.
2016-02-23 14:36:50 +00:00
elexis 3a502c0d21 Commands.js cleanup, use fat-arrows.
This was SVN commit r17790.
2016-02-23 14:13:46 +00:00
elexis 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
elexis 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
elexis c6804aad35 Small RMS library style improvement.
This was SVN commit r17787.
2016-02-23 10:46:32 +00:00
elexis fc298eb3f5 Show time-notifications to observers, refs #3168.
This was SVN commit r17786.
2016-02-22 22:53:48 +00:00
elexis b68654b52d Inlining this is not possible due to the closure.
This was SVN commit r17785.
2016-02-22 17:23:46 +00:00
elexis 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
elexis 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
elexis 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
elexis 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
mimo 6e9fd4ccf2 fix the ungarrison-all command from allied structures
This was SVN commit r17779.
2016-02-20 15:04:00 +00:00
elexis 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
elexis 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
elexis 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
elexis 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
elexis 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
elexis 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
elexis 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
mimo 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
mimo 4584a81656 be less restrictive with fix for #3785
This was SVN commit r17768.
2016-02-17 18:31:01 +00:00
elexis 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
mimo 41d7e64271 prevent short pathfinder to go into impassable region, fixes #3785
This was SVN commit r17765.
2016-02-15 21:24:27 +00:00
mimo 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
elexis 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
elexis 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
elexis 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
elexis 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.

This was SVN commit r17760.
2016-02-15 15:38:56 +00:00
elexis 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
elexis 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
elexis e3bd2e3fa8 Session cleanup, some simplifications.
This was SVN commit r17757.
2016-02-15 11:39:02 +00:00
elexis 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
mimo 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
mimo ecb65cd58d petra cleanup
This was SVN commit r17753.
2016-02-13 16:28:23 +00:00
elexis 2695e7c77b Remove trailing whitespace, refs #3586.
This was SVN commit r17752.
2016-02-13 11:44:46 +00:00
elexis 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
mimo 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
Itms 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
elexis cd9106b664 Fix / finish previous commit.
This was SVN commit r17747.
2016-02-09 14:34:59 +00:00
elexis ca9d06d6ad Correct handling of replays with no turns or only turn 0.
Add a comment for 3ec3f0b160.
Some style fixes.

This was SVN commit r17746.
2016-02-09 12:09:17 +00:00
elexis 4ac89001f4 Fix compile error for gcc 4.6, refs #3168.
This was SVN commit r17745.
2016-02-08 22:44:23 +00:00
mimo ca19d42a68 fix typos in renderer's initialization, refs #3737
This was SVN commit r17744.
2016-02-08 18:27:56 +00:00
elexis ac1f935bad Split GUI updates from onSimulationUpdate.
This was SVN commit r17743.
2016-02-08 14:01:21 +00:00
mimo a9de2bf397 cleanup of 971d70fa99
This was SVN commit r17741.
2016-02-07 19:06:15 +00:00
mimo 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
mimo 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
mimo 26f7a3df96 init configDB with renderer initial values, refs #3737
This was SVN commit r17737.
2016-02-07 11:24:09 +00:00
elexis a2f7d4d82a Show fog of war in observermode, fixes #3168.
This was SVN commit r17735.
2016-02-06 12:56:41 +00:00
elexis 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
elexis b973eebeda Add color indicator to the playerselection in observermode, refs #3168.
This was SVN commit r17733.
2016-02-06 12:19:02 +00:00
elexis 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
mimo 4d41bd9622 reorganize options, adding dependences, refs #3737
This was SVN commit r17729.
2016-02-02 21:50:00 +00:00
elexis 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 0e0ed94926,
chooseRand and its helper argsToArray since before 34f1817869).
Inline local calls to GetMapSize() and IsCircularMap(). Keep unused
isCircularMap for API access. Cache variables when retrying.
Map-generation can finish 2% faster.

This was SVN commit r17728.
2016-02-02 16:33:36 +00:00
elexis 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
elexis b1fbc5b6bd Add newlines, remove unneeded braces.
This was SVN commit r17726.
2016-02-02 11:23:01 +00:00
elexis 254f6357f6 Fix a typo (terreins -> terrains).
This was SVN commit r17725.
2016-02-02 10:56:39 +00:00
mimo 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
mimo 30bd2baeeb fix Migration scenario map
This was SVN commit r17722.
2016-01-29 18:53:09 +00:00
mimo b65f2a338c petra cleanup
This was SVN commit r17720.
2016-01-28 19:44:18 +00:00
mimo c46e64c4d2 fix dropdown option
This was SVN commit r17719.
2016-01-28 18:44:50 +00:00
mimo 30d0bcd350 petra remove some useless code
This was SVN commit r17718.
2016-01-28 18:30:39 +00:00
mimo 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
mimo 06eadf2bc4 petra cleanup + some tweaks
This was SVN commit r17716.
2016-01-27 18:17:55 +00:00
mimo 564941c477 fix wall buildings after f34dc412b6, refs #3647
This was SVN commit r17715.
2016-01-26 19:04:29 +00:00
mimo 91ed318f0d fix typo
This was SVN commit r17714.
2016-01-26 18:36:59 +00:00
mimo 08d326cef5 clone the rallypoint data from cmd, fixes #3751
This was SVN commit r17713.
2016-01-26 18:03:06 +00:00
elexis 090f2ccfe5 Don't modify the command object. Refs #3647.
This was SVN commit r17712.
2016-01-26 17:58:15 +00:00
mimo bb8ceba632 completes f34dc412b6 for non visual replays, refs #3751
This was SVN commit r17711.
2016-01-25 20:37:26 +00:00
elexis 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
elexis 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
elexis e683751b4f Delete code which became obsolete with 56bb858802.
This was SVN commit r17708.
2016-01-25 09:57:33 +00:00
elexis 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
mimo 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
elexis 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
Yves 199d38dfec Work around clang bug to fix compiling.
This was SVN commit r17703.
2016-01-24 10:34:38 +00:00
historic_bruno 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
elexis 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
Yves 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
Yves 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
historic_bruno 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
elexis 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
elexis 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
elexis 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
elexis 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
mimo 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
mimo c955d74330 petra cleanup (thanks to leper's suggestion)
This was SVN commit r17687.
2016-01-22 18:45:28 +00:00
mimo 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
mimo edb16dafbb petra cleanup
This was SVN commit r17684.
2016-01-21 20:38:56 +00:00
mimo df7da846ad some cleanup in ai api
This was SVN commit r17683.
2016-01-21 20:23:19 +00:00
elexis 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
mimo cccd33e7fe petra cleanup
This was SVN commit r17679.
2016-01-20 19:45:47 +00:00
mimo 87886b7b03 fix the AI for the switch to the Repairable component
This was SVN commit r17678.
2016-01-20 19:04:38 +00:00
mimo dd545bdbf1 petra cleanup
This was SVN commit r17677.
2016-01-19 23:19:40 +00:00
elexis 0a64bf25cd Sort globals, add JSDoc comments, remove trailing whitespace.
This was SVN commit r17676.
2016-01-19 18:09:34 +00:00
elexis 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
elexis 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
leper f34dc412b6 Deep freeze simulation commands to prevent accidental updates. Fixes #3647.
This was SVN commit r17673.
2016-01-18 22:24:50 +00:00
elexis 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
mimo a6f8b3b3d7 rename the Close button, refs #3737
This was SVN commit r17671.
2016-01-18 19:44:48 +00:00
elexis 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
mimo 9481c168bd petra cleanup
This was SVN commit r17669.
2016-01-18 19:20:09 +00:00
elexis 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.

This was SVN commit r17668.
2016-01-18 18:29:16 +00:00
fabio f8941ac668 boost_signals was removed in 940868398c.
This was SVN commit r17667.
2016-01-18 16:46:32 +00:00
fabio 5d00d0ff8b Update libpng to 1.6.21 + comments cleanup.
This was SVN commit r17666.
2016-01-18 16:42:54 +00:00
elexis 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
elexis 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
elexis 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
historic_bruno 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
mimo 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
mimo dc9d1fff11 restore sorting in template, refs #3741
This was SVN commit r17656.
2016-01-17 15:44:38 +00:00
leper 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
mimo b4d11cf747 let farms have the terrain ownership, fixes #3741
This was SVN commit r17654.
2016-01-16 12:47:33 +00:00
mimo c4d9b64fe5 fix undef var when in petra debug
This was SVN commit r17653.
2016-01-15 19:12:34 +00:00
leper 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
elexis 327c0d0d00 Remove trailing whitespace. Refs #118.
This was SVN commit r17650.
2016-01-14 00:04:32 +00:00
elexis 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
elexis 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
leper c33d1e3741 Remove commented out code and comments invalid since 9542ecdd7e.
This was SVN commit r17647.
2016-01-13 22:39:09 +00:00
mimo aa7ef01105 rename reload to revert
This was SVN commit r17646.
2016-01-13 22:32:42 +00:00
mimo 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
elexis 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
elexis 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
leper fb92761c92 Use explicit types instead of auto.
This was SVN commit r17642.
2016-01-13 00:42:55 +00:00
leper 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
leper e6a8cd8c5e Do not redeclare a variable.
This was SVN commit r17640.
2016-01-12 20:04:33 +00:00
elexis ee6a5fd915 Extend defensive-stance tooltip and add quotes to object keys.
This was SVN commit r17639.
2016-01-12 18:32:30 +00:00
elexis 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
leper 4107c2abb9 Fix link to documentation.
This was SVN commit r17637.
2016-01-11 23:56:51 +00:00
mimo 83efc8363e fix old typos in sound config
This was SVN commit r17636.
2016-01-11 22:39:03 +00:00
leper 2ec4d87abf Use .assign instead of operator=.
This was SVN commit r17634.
2016-01-11 20:57:03 +00:00
leper 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 47a03c3397.
https://bugzilla.mozilla.org/show_bug.cgi?id=1094176

This was SVN commit r17633.
2016-01-11 20:03:33 +00:00
leper 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
leper 775f856421 Use .assign instead of operator=.
This was SVN commit r17631.
2016-01-11 20:03:28 +00:00
leper 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
leper 785acdb1c6 Fix test failure on Windows.
This was SVN commit r17629.
2016-01-11 20:03:01 +00:00
mimo f0fc36138d cleanup of previous patches
This was SVN commit r17627.
2016-01-10 22:46:37 +00:00
mimo 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
mimo 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
elexis e9511d21d5 Fix bug in d4d05c6236.
This was SVN commit r17624.
2016-01-10 17:25:40 +00:00
elexis 8c7b6dceaa Show status-bars of all players to observers, fixes #3215.
This was SVN commit r17623.
2016-01-10 16:47:57 +00:00
elexis 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
fabio 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
elexis 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
elexis 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
elexis 9a623a8e00 Style fixes.
This was SVN commit r17618.
2016-01-09 23:01:07 +00:00
elexis 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
Itms 9b922ebadd Remove invisible character introduced in deaa224785.
This was SVN commit r17616.
2016-01-09 12:12:42 +00:00
Itms 629e73a768 Fix a compiler warning.
This was SVN commit r17615.
2016-01-09 09:52:51 +00:00
leper 491cba314a Translate some notification messages. Refs #3665.
This was SVN commit r17614.
2016-01-08 23:22:45 +00:00
leper caa81a1d31 Remove garrison code duplication.
This was SVN commit r17613.
2016-01-08 23:02:26 +00:00
Itms 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
leper 87a93b2498 Add version command line option. Fixes #2965.
This was SVN commit r17611.
2016-01-08 19:35:33 +00:00
elexis 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
elexis 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
fabio 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
elexis 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
mimo a7743e95b9 cleanup of unused counters
This was SVN commit r17605.
2016-01-06 21:15:58 +00:00
elexis 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
leper 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
mimo 4c4beb8450 cleanup
This was SVN commit r17602.
2016-01-04 18:10:04 +00:00
elexis 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
leper ab4668ac79 Remove legacy error codes from strings.
This was SVN commit r17600.
2016-01-04 17:58:28 +00:00
leper 7a3f011587 Fix a typo.
This was SVN commit r17599.
2016-01-04 17:05:43 +00:00
leper 5033fd6cbf Some const and fix the indentation.
This was SVN commit r17598.
2016-01-04 17:05:39 +00:00
mimo 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
Yves 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
Yves 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
mimo a32aa3b6cf petra: use the proper attack number when deserializing, refs #3720
This was SVN commit r17592.
2016-01-02 18:16:50 +00:00
elexis 036f985017 Add missing semicolons.
Update timestamp.

This was SVN commit r17591.
2016-01-02 18:12:02 +00:00
mimo 8773d816ae add specific regeneration when idle, fixes #3606, patch by Guuts
This was SVN commit r17590.
2016-01-02 18:10:10 +00:00
mimo 1d00164b6b petra: make better use of the new fishing tech
This was SVN commit r17589.
2016-01-02 17:50:56 +00:00
leper 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
JoshuaJB 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
mimo 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
mimo 7c89cfb3ba fix typo in petra debug outputs
This was SVN commit r17585.
2016-01-01 17:41:49 +00:00
JoshuaJB 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
elexis 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
elexis 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
elexis 75eed7cc79 Missing semicolons, two wrong commata, jshint ftw.
This was SVN commit r17579.
2015-12-31 14:02:59 +00:00
Yves 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
elexis 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
elexis f7a262fa4a Remove trailing whitespace. Based on patch by otero, refs #3268.
This was SVN commit r17576.
2015-12-31 11:45:13 +00:00
Yves 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
fabio 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
mimo 36c08193ba optimizes range queries, fixes #3717
This was SVN commit r17573.
2015-12-30 13:44:51 +00:00
elexis 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
elexis 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
elexis 6cdd99474a Fix fail.
This was SVN commit r17570.
2015-12-30 11:17:50 +00:00
elexis 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
elexis 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
elexis 9f65e90b60 Fix wrong errormessage in case of encountering a broken replay.
This was SVN commit r17567.
2015-12-29 14:00:30 +00:00
elexis 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
elexis 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
mimo 2a0d403b4b let promotion improve a bit the capture strength of citizen
This was SVN commit r17564.
2015-12-28 18:51:49 +00:00
elexis 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
mimo 543472b77b Optimization of isBoxVisible + cleanup, fixes #3712
This was SVN commit r17561.
2015-12-28 16:27:31 +00:00
mimo 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
mimo 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
elexis 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
elexis 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
elexis 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
elexis 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
elexis 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
elexis b154056266 Those globals were removed in 5aae5ee55a.
This was SVN commit r17550.
2015-12-24 20:54:47 +00:00
elexis 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
elexis 39ffb0a6bd Session menu cleanup.
Rename globals to g_Foo.
Remove unused variable playerID from updateTimeNotifications which
became obsolete in fe9eeedd66.
Use let instead of var.
Add some missing semicolons.
Fix whitespace, quote object keys.

This was SVN commit r17548.
2015-12-24 02:53:18 +00:00
elexis 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
elexis 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
elexis 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
elexis 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
mimo 48f72aacc9 petra: some defense tweaks + cleanup
This was SVN commit r17543.
2015-12-23 16:17:05 +00:00
elexis 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
elexis 03adf0111a Session chat cleanup
Remove g_PlayerAssignments from calls to findGuidForPlayerID, since the
argument was removed in ae92736b02.
Simplify formatChatMessage by moving playercolor-detection to
formatDefeatMessage and formatChatCommand.

This was SVN commit r17541.
2015-12-22 21:45:09 +00:00
leper 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
leper 3fd4d07ca1 Test \0 in object property names for serializing.
This was SVN commit r17539.
2015-12-22 19:01:18 +00:00
mimo 67b7366528 petra: remove hyphen in file names
This was SVN commit r17538.
2015-12-22 18:21:37 +00:00
elexis 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
mimo 3ba50b4ed4 decrease the repair rate of walls, refs #3707
This was SVN commit r17536.
2015-12-22 17:37:00 +00:00
leper 6970ebba16 Test non-ASCII string conversions.
This was SVN commit r17535.
2015-12-22 17:30:05 +00:00
elexis 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
mimo 385101bbe7 petra: cleanup of defenseManager
This was SVN commit r17533.
2015-12-22 16:58:53 +00:00
elexis dca07f9ddd Fix e9bc3e2089.
This was SVN commit r17532.
2015-12-22 16:44:27 +00:00
elexis 4212777334 Session chat cleanup.
Correct indentation.

This was SVN commit r17531.
2015-12-22 16:05:27 +00:00
elexis 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
elexis 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
elexis 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
leper 848efb56b3 Make a method const.
This was SVN commit r17527.
2015-12-22 14:08:32 +00:00
elexis 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
elexis b790403c87 Strip trailing whitespace from network code.
This was SVN commit r17524.
2015-12-21 13:58:32 +00:00
elexis 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
elexis 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
mimo 0dda3b579c drop resources before switching to next queued order, fixes #1670
This was SVN commit r17521.
2015-12-20 21:30:34 +00:00
elexis d4d05c6236 Session cleanup. Patch by Stan.
Eliminate the deprecated for-each.

This was SVN commit r17520.
2015-12-20 21:20:05 +00:00
mimo 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
elexis 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
elexis eb8e381934 GuiInterface Cleanup
Remove trailing whitespace.

This was SVN commit r17517.
2015-12-20 19:18:39 +00:00
elexis 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
elexis 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
scythetwirler 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
leper 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
leper 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
leper 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
elexis e80e37cb21 Fix whitespace.
This was SVN commit r17509.
2015-12-19 02:03:30 +00:00
leper 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
elexis 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
leper 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
leper 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
leper 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
elexis 825a2fcc34 Summary screen cleanup. Based on patch by bb, fixes #3518.
This was SVN commit r17503.
2015-12-19 01:00:32 +00:00
elexis a381334976 Gamesetup cleanup
Unify the gameattributes-update of checkboxes.

This was SVN commit r17502.
2015-12-18 22:40:56 +00:00
elexis 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
elexis abce6cb737 Pathfinder optimization, fixes #3541.
Simplify the math of Geometry::TestRayAASquare.

This was SVN commit r17500.
2015-12-18 15:05:33 +00:00
elexis 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
elexis 2d34b198df Remove a wrong tag from two skirmish maps.
This was SVN commit r17497.
2015-12-17 21:10:20 +00:00
elexis 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
mimo dca32228b5 fix dead tree actor, patch by stanislas69, fixes #3705
This was SVN commit r17495.
2015-12-16 20:45:08 +00:00
mimo 3196df663f some petra cleanup
This was SVN commit r17494.
2015-12-16 17:57:39 +00:00
mimo 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
elexis 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
fabio 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
elexis 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
elexis 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
elexis 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
elexis 6873a5e5a9 Gamesetup cleanup
Unify switch-statement and remove unused variables.

This was SVN commit r17487.
2015-12-15 23:57:45 +00:00
elexis f99de00779 Fix an operator precedence bug in the previous commit.
This was SVN commit r17486.
2015-12-15 23:19:01 +00:00
elexis 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
elexis 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
elexis 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
elexis 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
elexis 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
elexis 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
fabio 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
elexis 931f5f752b Gamesetup cleanup.
Resolve if-statements in initMultiplayerSettings.

This was SVN commit r17478.
2015-12-15 00:21:27 +00:00
mimo 5a7a56da41 more cleanup on petra
This was SVN commit r17477.
2015-12-14 21:17:22 +00:00
mimo 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
elexis 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
elexis 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
elexis 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
elexis 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
elexis 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
fabio 9a2d0f803e Remove disabled by default SDL1 support.
Refs #2041.

This was SVN commit r17470.
2015-12-14 10:52:21 +00:00
elexis 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
elexis 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
elexis 4dbc9b8b1d Cleanup color.js
Move some shared color-code to color.js.
Remove shuffleArray() as it's unused since bbc325fb5a.
Add JSdoc comments and use let.

This was SVN commit r17466.
2015-12-14 03:53:48 +00:00
elexis 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
elexis 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
mimo 45c7d1681f petra cleanup, mainly renaming stuff for better readability
This was SVN commit r17463.
2015-12-13 22:04:09 +00:00
elexis 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
wraitii b87b3ff3dc Left some debug code in.
This was SVN commit r17460.
2015-12-13 17:39:19 +00:00
elexis 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
wraitii 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
wraitii 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
elexis 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
elexis 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
Enrique 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
elexis 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
elexis 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.

This was SVN commit r17450.
2015-12-12 20:29:54 +00:00
elexis 745b1aae8d Correctly hide the mapsize-description (see 0b4308bbc8).
This was SVN commit r17449.
2015-12-12 18:07:39 +00:00
mimo 47a23904e5 adding more diversity in petra warnings
This was SVN commit r17448.
2015-12-12 15:45:02 +00:00
elexis 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
elexis 2e54fee44d Fix oversight in 3006904403.
This was SVN commit r17446.
2015-12-12 15:27:07 +00:00
elexis 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
elexis 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
elexis 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
elexis 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
mimo ead4caaa41 do mot modify the cmd object, refs #3467
This was SVN commit r17441.
2015-12-11 20:15:10 +00:00
elexis 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
leper 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
mimo eacbdd4dfb cleanup in the petra queueManager
This was SVN commit r17438.
2015-12-11 18:45:03 +00:00
mimo 489822e384 some cleanup in the ai common-api
This was SVN commit r17437.
2015-12-11 18:35:01 +00:00
elexis 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
elexis 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
wraitii 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
elexis 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
elexis 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
elexis 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
elexis 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
elexis 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
mimo d07f16ed80 petra: fix resource translations, fixes #3691
This was SVN commit r17427.
2015-12-10 20:35:24 +00:00
mimo afa07325a1 petra: improve the detection of stuck gatherers, refs #3562
This was SVN commit r17426.
2015-12-10 20:02:37 +00:00
mimo a74d9be130 make const the new method introduced in 2451872731
This was SVN commit r17425.
2015-12-10 19:23:50 +00:00
elexis 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
wraitii 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
elexis 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
elexis 9b4e359d64 Gah.
This was SVN commit r17421.
2015-12-10 13:28:57 +00:00
elexis 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
elexis 7a8c37a885 Use map function instead of deprecated for-each.
This was SVN commit r17419.
2015-12-10 13:06:36 +00:00
elexis 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
elexis 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
leper 349b5786dd Fix test failure. Refs #3590.
This was SVN commit r17416.
2015-12-09 22:52:33 +00:00
mimo b6dbb2bff0 fix tabs of 2451872731
This was SVN commit r17415.
2015-12-09 20:56:53 +00:00
mimo 2451872731 improve performance of hierarchical pathfinder, refs #3588
This was SVN commit r17413.
2015-12-09 19:56:30 +00:00
fabio 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
fabio 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
fabio 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
mimo 6a73dc2e16 fix multiple (useless) insertion in grid update of hierarchical pathfinder
This was SVN commit r17409.
2015-12-08 22:58:04 +00:00
leper b4f0227f1b Add support for undeletable entities. Fixes #3590.
This was SVN commit r17408.
2015-12-08 22:34:32 +00:00
mimo 82ca673e0a petra: retune the dock placement criteria, fixes #3469
This was SVN commit r17407.
2015-12-08 19:16:50 +00:00
leper 489e41362a Use placeholder in plural string.
This was SVN commit r17406.
2015-12-08 18:13:09 +00:00
leper 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
leper 61886f0e7a Use inheritance instead of redefining properties.
This was SVN commit r17404.
2015-12-08 18:05:06 +00:00
JoshuaJB 80663a6c8a Add gray, stone-esc modern button type.
This was SVN commit r17403.
2015-12-07 18:47:41 +00:00
elexis 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
elexis 780a1de136 Don't comment out code. Refs #3486.
This was SVN commit r17400.
2015-12-07 12:27:52 +00:00
elexis 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
elexis 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
leper 66bb4deef8 Use the tech name as it is used everywhere else.
This was SVN commit r17397.
2015-12-06 21:29:09 +00:00
mimo 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
leper 3483a2d226 Extract attack notification strings. Refs #3691.
This was SVN commit r17395.
2015-12-06 20:51:32 +00:00
leper 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
elexis 2bd22bb6a8 Fix whitespace.
This was SVN commit r17393.
2015-12-06 17:13:47 +00:00
elexis 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
elexis 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
elexis 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
elexis 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
elexis 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
elexis 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
scythetwirler 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
mimo 8813cb3133 petra: some fixes (buildrestrictions min distance) and some cleanup
This was SVN commit r17385.
2015-12-05 15:02:45 +00:00
mimo 99c0d0493c remove warnings in structtree, fixes #3682, patch from s0600204
This was SVN commit r17384.
2015-12-05 14:57:09 +00:00
elexis 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
elexis 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
elexis 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
elexis 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
elexis 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
elexis 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
elexis 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
elexis 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
elexis e8bb6f5974 Actually remove the old file from the repository. Refs #3355
This was SVN commit r17374.
2015-12-04 12:30:24 +00:00
elexis 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
elexis d50075adc4 Lobby cleanup. Fixes #3383
This was SVN commit r17371.
2015-12-04 00:22:15 +00:00
elexis 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
elexis 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
elexis 88816a1043 Fix two oversights and simplify mapfilter-initialization. Refs #3383
This was SVN commit r17368.
2015-12-03 14:10:28 +00:00
elexis 2e69872b11 Remove debug parser from replay menu. Refs #3440
This was SVN commit r17367.
2015-12-03 03:12:43 +00:00
elexis 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
historic_bruno 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
elexis 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
elexis a88e8e3e5c Remove obfuscated easteregg in the lobby.
This was SVN commit r17363.
2015-12-02 17:21:08 +00:00
elexis 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
elexis e6840f5fca Remove useless global g_SpecialKey. Refs #3383
This was SVN commit r17360.
2015-12-02 16:00:20 +00:00
elexis 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
elexis 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
elexis 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
elexis 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
elexis 0553a74884 Remove wrong semicolons. Refs #3424
This was SVN commit r17353.
2015-12-02 03:24:04 +00:00
mimo cd635f9615 cleanup of df6d30a910
This was SVN commit r17352.
2015-12-01 21:03:24 +00:00
mimo df6d30a910 fix affordable gui of gates
This was SVN commit r17351.
2015-12-01 19:41:52 +00:00
mimo 0a8fc4bb08 improve pathFinder by optimizing the DistanceToSquare computation, refs #3588
This was SVN commit r17350.
2015-12-01 19:01:41 +00:00
elexis b657eb05e2 Remove the unused and broken function GetBaseSpeed. Fixes #3672.
This was SVN commit r17349.
2015-12-01 13:17:34 +00:00
fabio 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
fabio 418318ea88 Properly read preferglsl in user config files.
This was SVN commit r17347.
2015-12-01 09:00:12 +00:00
elexis 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
elexis 45723b1293 Don't break the translation of the playerdefaults. Refs #3355
This was SVN commit r17345.
2015-11-30 20:51:20 +00:00
mimo 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
leper 2008f3e3a9 Plural translation since that is needed for some languages.
This was SVN commit r17343.
2015-11-30 20:47:42 +00:00
mimo 66bd932374 gives repair a lower priority compared to capture, fixes #3443
This was SVN commit r17342.
2015-11-30 20:26:10 +00:00
leper 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
fabio 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
fabio 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
elexis f8f8a1eb6a Increases the gatherer limit for some special resources. Fixes #3583.
This was SVN commit r17336.
2015-11-30 04:20:30 +00:00
elexis 324179e2b9 Show icon for the female inspiration aura. Fixes #3384
This was SVN commit r17335.
2015-11-30 03:58:19 +00:00
elexis d7e444b862 Loot resources that killed enemies carried. Fixes #2732
This was SVN commit r17334.
2015-11-30 03:41:18 +00:00
elexis 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
elexis 700859b2c3 Move the playerdefaults to the settings directory. Refs #3355
This was SVN commit r17332.
2015-11-30 01:33:59 +00:00
wraitii 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
elexis ff30dc2ba4 Forgot to add the JSON file. Refs #3477.
This was SVN commit r17330.
2015-11-29 16:53:32 +00:00
elexis 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
wraitii 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
mimo c9f40be84e improve indentation of 34b0c6d779
This was SVN commit r17327.
2015-11-29 16:13:13 +00:00
mimo 34b0c6d779 add a NOT when checking classes matching, fixes #3611
This was SVN commit r17326.
2015-11-29 15:59:52 +00:00
wraitii 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
wraitii 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
elexis 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
mimo 9f75b78a84 fix nearGatherPosition, fixes #3658
This was SVN commit r17322.
2015-11-29 14:43:28 +00:00
mimo 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
elexis 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
elexis 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
elexis 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
elexis 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
elexis 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
elexis 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
elexis 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
elexis 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
wraitii 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
mimo 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
mimo be9b6fa59c improves performance of hierarchical pathFinder, refs #3588
This was SVN commit r17310.
2015-11-28 13:06:44 +00:00
mimo 0d27dbf5a3 some petra cleanup
This was SVN commit r17309.
2015-11-28 11:46:45 +00:00
mimo ca3828f9ac some simulation cleanup
This was SVN commit r17308.
2015-11-28 11:43:14 +00:00
mimo be2ddb9c63 some gui cleanup
This was SVN commit r17307.
2015-11-28 11:23:04 +00:00
mimo 2548187474 fix selection when owner change, ref #3645
This was SVN commit r17306.
2015-11-28 11:16:13 +00:00
mimo 2d4ec03019 update packing flag, fixes #3628
This was SVN commit r17305.
2015-11-28 11:11:40 +00:00
mimo 0d1b595fa0 fix UnitAI state, fix #3630
This was SVN commit r17304.
2015-11-28 11:09:29 +00:00
leper 432df9b38e Use two range based for loops to fix two TODOs.
This was SVN commit r17303.
2015-11-28 08:27:42 +00:00
leper c0c19db94e Null serialization functions for some components without dynamic state.
This was SVN commit r17302.
2015-11-28 08:27:41 +00:00
leper e4834e8a0d Some JS component cleanup.
This was SVN commit r17301.
2015-11-28 08:27:38 +00:00
leper 5d243d0ce8 Clarify font licenses.
This was SVN commit r17300.
2015-11-28 08:27:36 +00:00
leper 9a40d1284e Update version numbers. Switch lobby room.
This was SVN commit r17299.
2015-11-28 08:27:33 +00:00
leper 082af749f0 Actually remove all unlisted translations.
This was SVN commit r17298.
2015-11-21 20:00:20 +00:00
Itms 229e850dba Fix a compiler warning.
This was SVN commit r17296.
2015-11-20 20:42:45 +00:00
mimo fc6af83c2a cleanup 5b335442fb
This was SVN commit r17294.
2015-11-20 19:47:08 +00:00
mimo 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
leper 08df9e8533 Update built on OS X to 1.6.19.
This was SVN commit r17291.
2015-11-19 23:47:41 +00:00
leper ee8f9516eb Update translations to be included in the release.
This was SVN commit r17290.
2015-11-19 23:09:49 +00:00
mimo 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
mimo 0b2da13dea never edit a patch before commiting !
This was SVN commit r17287.
2015-11-19 22:17:00 +00:00
mimo 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
mimo 9b0ed97d05 fixes and performance improvements in hierarchical pathfinder, fixes #3621
This was SVN commit r17284.
2015-11-19 22:02:25 +00:00
mimo 4a2a155090 petra: do not sent a tribute to a defeated player
This was SVN commit r17283.
2015-11-19 20:04:21 +00:00
wraitii 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
wraitii 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
mimo 83191580c0 cleanup of 34fd23e920 to make l.... happy
This was SVN commit r17277.
2015-11-16 18:59:10 +00:00
wraitii 9819b23529 I should not commit half-finished debug code.
This was SVN commit r17276.
2015-11-16 18:48:05 +00:00
scythetwirler 09285ec257 Fixes #3507. Patch by Palaxin.
This was SVN commit r17275.
2015-11-16 18:37:00 +00:00
wraitii 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
scythetwirler 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
JoshuaJB 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
scythetwirler 2e3b7f5906 Lessens the effect of another very powerful aura.
This was SVN commit r17269.
2015-11-15 20:38:56 +00:00
scythetwirler 678cd646bd Lessens the effect of a very powerful aura.
This was SVN commit r17268.
2015-11-15 20:26:37 +00:00
mimo 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
mimo 025e28be83 fix test broken in 34fd23e920, fix #3614
This was SVN commit r17266.
2015-11-15 17:48:25 +00:00
wraitii 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
mimo 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
leper 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
wraitii f1f0fa1f8f Fix a typo. Thanks stan for noticing.
This was SVN commit r17260.
2015-11-14 21:46:05 +00:00
leper fcb1008fa3 Fix wolfhound actor. Patch by stanislas69. Fixes #3608.
This was SVN commit r17259.
2015-11-14 21:45:27 +00:00
scythetwirler 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
Enrique 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
wraitii 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
wraitii 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
scythetwirler 3473828735 Makes some powerful techs harder to obtain or less effective.
This was SVN commit r17253.
2015-11-14 17:29:00 +00:00
wraitii ebbabb01f5 Other small JS performance improvement.
This was SVN commit r17252.
2015-11-14 16:07:48 +00:00
wraitii 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
mimo 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
wraitii e7fb75a680 Initialize new variables correctly.
This was SVN commit r17247.
2015-11-12 23:07:54 +00:00
wraitii 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
wraitii 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
wraitii 9357cce112 Math is hard
This was SVN commit r17242.
2015-11-12 17:32:33 +00:00
wraitii 3febc387d5 Styling fixes.
This was SVN commit r17241.
2015-11-12 17:23:50 +00:00
wraitii 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
fabio 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
wraitii 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
wraitii 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
wraitii 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
wraitii 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
wraitii 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
fabio 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
wraitii 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
wraitii 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
wraitii 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
wraitii 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
wraitii 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
wraitii 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
Itms 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
fabio 8b0bca0556 Fix action-capture icon transparency.
Refs: #2823

This was SVN commit r17222.
2015-11-11 11:45:39 +00:00
leper 9e0ef737b2 Fix Athenian town phase description.
This was SVN commit r17219.
2015-11-11 03:27:38 +00:00
leper 5f7ce1089a Fix translation comments.
This was SVN commit r17218.
2015-11-11 03:27:34 +00:00
leper 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
wraitii 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
leper f0deeab899 Rename commands to g_Commands.
This was SVN commit r17213.
2015-11-09 23:25:34 +00:00
mimo 51ec6f4728 improve function RasterizeRectWithClearance, about 40% faster, ref #3588
This was SVN commit r17212.
2015-11-09 21:16:46 +00:00
leper 35b0478f70 Improve Mauryan corral specific name. Patch by stanislas69. Fixes #3555.
This was SVN commit r17211.
2015-11-09 16:49:53 +00:00
wraitii 0ba9fa1cc1 Optimize RasterizeRectWithClearance slightly further. Thanks mimo for noticing.
This was SVN commit r17209.
2015-11-08 18:08:49 +00:00
wraitii 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
wraitii 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
scythetwirler cb025bb725 Removes extraneous check from XpartaMuPP. Fixes #3568.
This was SVN commit r17206.
2015-11-08 17:09:59 +00:00
wraitii dd6d09521c Not sure how but I messed up the previous commit.
This was SVN commit r17205.
2015-11-08 16:44:08 +00:00
wraitii 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
mimo cd025b2069 fix typo
This was SVN commit r17203.
2015-11-08 13:09:49 +00:00
mimo 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
wraitii 8f00293a58 Assign proper alternatives to some terrian materials. Fixes #3585
This was SVN commit r17200.
2015-11-07 19:43:41 +00:00
mimo 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
wraitii 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
wraitii 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
mimo ad4edba3dc move a bit an unreachable tree, fixes #3584
This was SVN commit r17196.
2015-11-07 14:22:10 +00:00
wraitii 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
wraitii 2d7074e8d6 Fix unused variables left behind.
This was SVN commit r17194.
2015-11-06 20:42:12 +00:00
wraitii 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
wraitii 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
wraitii 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
wraitii 1ed3761859 Fix style issues and redundant code in [17161] and [17163].
This was SVN commit r17189.
2015-11-06 19:48:08 +00:00
scythetwirler 2126b53b9d Fixes interpolation of flying objects.
This was SVN commit r17187.
2015-11-06 16:56:39 +00:00
mimo 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
mimo 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
wraitii 05547bf36f Fix an oversight.
This was SVN commit r17182.
2015-11-05 16:52:19 +00:00
wraitii 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
JoshuaJB 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
wraitii 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
wraitii 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
wraitii 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
wraitii 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
leper 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
scythetwirler 9138bff64e Increases pierce armour of ranged siege.
This was SVN commit r17174.
2015-11-03 20:14:04 +00:00
scythetwirler 9b8180ffe8 Slight nerf reduction.
This was SVN commit r17173.
2015-11-03 18:46:12 +00:00
scythetwirler 54b405a0d0 Reduces effectiveness of early camel rush
This was SVN commit r17172.
2015-11-03 18:19:11 +00:00
JoshuaJB 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
JoshuaJB 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
mimo 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
wraitii 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
wraitii 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
mimo 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
mimo d9e9345be2 fix some indentation of 6e05a00929
This was SVN commit r17164.
2015-11-01 16:47:53 +00:00
wraitii 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
wraitii 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
JoshuaJB 4428c1e690 Fix #3537 with better rating state enforcement. Patch by elexis.
This was SVN commit r17160.
2015-10-31 21:19:58 +00:00
JoshuaJB 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
wraitii 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
wraitii 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
mimo 4d804cf26b fix typo in 6e05a00929
This was SVN commit r17155.
2015-10-31 13:42:14 +00:00
mimo 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
mimo 9a623cb302 only decay towards connected tiles, fixes #3558
This was SVN commit r17153.
2015-10-31 13:26:59 +00:00
wraitii 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
JoshuaJB e895b044e7 Fix #3553 by removing a superfluous warning. Patch by elexis.
This was SVN commit r17151.
2015-10-31 07:21:09 +00:00
JoshuaJB 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
JoshuaJB 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
JoshuaJB 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
JoshuaJB 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
mimo 2a26db2dc2 fix passability of mauryan support elephant, refs #3539
This was SVN commit r17146.
2015-10-26 23:14:26 +00:00
mimo 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
mimo 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
mimo 70d5e4e318 fix the INVERTED_CIRCLE and INVERTED_SQUARE PathGoal, fixes #3405
This was SVN commit r17142.
2015-10-18 20:21:20 +00:00
mimo 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
mimo cb7c25768a Petra: some cleanups
This was SVN commit r17140.
2015-10-17 17:01:26 +00:00
mimo 496dc13952 remove orphan function after ef4a1e261c, patch by stanislas69
This was SVN commit r17139.
2015-10-17 16:55:21 +00:00
historic_bruno 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
mimo 82590753d7 fix a moved function, fixes #3531
This was SVN commit r17137.
2015-10-16 17:14:39 +00:00
historic_bruno 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
historic_bruno 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
historic_bruno 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
historic_bruno 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
mimo 32dafe707d cleanup and simplification of 38af159598, fixes #3519
This was SVN commit r17130.
2015-10-12 17:12:36 +00:00
historic_bruno 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
historic_bruno 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
scythetwirler 4994dfb26a Avoids RuntimeError: dictionary changed size during iteration
This was SVN commit r17127.
2015-10-11 20:47:52 +00:00
mimo 9db4fb5ddb fix typo in Game.cpp
This was SVN commit r17126.
2015-10-11 11:12:27 +00:00
mimo 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
mimo b0f267b61c fix typo in UnitMotion, fixes #3474
This was SVN commit r17124.
2015-10-11 11:00:11 +00:00
sanderd17 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
historic_bruno 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
mimo 1ac5ccff0b fix the ceaseFire gui, patch by elexis, fixes #3413
This was SVN commit r17118.
2015-10-10 16:51:52 +00:00
historic_bruno 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
historic_bruno 02628b8902 Removes unused pathfinder consts, patch by stanislas69. Fixes #3500
This was SVN commit r17115.
2015-10-10 06:48:42 +00:00
mimo 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
mimo 412779684c improves 38af159598
This was SVN commit r17113.
2015-10-09 18:14:53 +00:00
mimo d73734ff50 fix wrong chat colors, patch by AlThePhoenix, fixes #3489
This was SVN commit r17112.
2015-10-09 17:54:39 +00:00
mimo 38af159598 fix UnitAI state of turrets, fix #3481
This was SVN commit r17111.
2015-10-08 21:59:52 +00:00
mimo 1b3ee1195c remove some useless ternary operators in ai api
This was SVN commit r17110.
2015-10-08 21:19:00 +00:00
mimo ef4a1e261c fix standGround units not attacking, patch by karamel, fixes #3284
This was SVN commit r17109.
2015-10-08 20:48:05 +00:00
mimo 03b00b0041 revert d5c758eef3 and better fix of #3430, fixes #3466
This was SVN commit r17108.
2015-10-06 20:59:13 +00:00
mimo 3bf05c81fc temple aura should only affect healable units, fixes #3482
This was SVN commit r17107.
2015-10-05 20:45:39 +00:00
mimo 86d81c5baa fix attackAsFormation of special formations, fixes #3086
This was SVN commit r17106.
2015-10-05 20:40:14 +00:00
historic_bruno 2767ae83d7 Fixes button order in delete unit confirmation dialog, fixes #3483
This was SVN commit r17105.
2015-10-05 01:47:20 +00:00
Itms 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
mimo 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
Itms 2505a2ec70 Remove a preprocessor ambiguity, fixes #3480.
This was SVN commit r17101.
2015-10-04 17:21:36 +00:00
mimo 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
mimo b2ed9d79cc fix Aegean sea RMS, patch by stanislas69
This was SVN commit r17099.
2015-10-03 17:45:17 +00:00
Itms cfe4a2e568 Fix a cause of serialization problems. Fixes #3450.
This was SVN commit r17097.
2015-10-03 11:02:12 +00:00
Itms bb997f6cae Fix previous commit.
This was SVN commit r17096.
2015-10-03 10:32:30 +00:00
Itms d60940ac59 Code improvements and style fixes.
This was SVN commit r17095.
2015-10-03 08:27:19 +00:00
Itms dc69aed954 Remove some old and unused code.
This was SVN commit r17094.
2015-10-02 18:27:10 +00:00
mimo 4e95efacb8 temporarily disable the AttackAsFormation, refs #3086
This was SVN commit r17093.
2015-10-01 20:38:02 +00:00
leper 9a8c88216a Copy capture points for mirages. Fixes #3475.
This was SVN commit r17092.
2015-10-01 16:32:48 +00:00
leper 102358a5cb Fix build for recent versions of miniupnpc.
This was SVN commit r17091.
2015-09-30 21:32:54 +00:00
leper 061c7f6058 Const ref.
This was SVN commit r17090.
2015-09-30 20:28:23 +00:00
leper b0a6979242 Source the spidermonkey patch script. Fixes #3462.
This was SVN commit r17089.
2015-09-30 20:28:13 +00:00
mimo 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
mimo 3a06d3a08b fix team chat, patch by elexis, fixes #3464
This was SVN commit r17087.
2015-09-29 18:53:30 +00:00
mimo 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
Itms 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
mimo 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
mimo 31b29b98ad petra: implement first choice between capture and attack, fixes #3459
This was SVN commit r17081.
2015-09-26 22:25:37 +00:00
mimo 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
mimo 1f5bb8d62e fix some flaws revealed by the fix #3430
This was SVN commit r17079.
2015-09-26 21:41:35 +00:00
mimo 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
mimo 82f3ee7384 fix typo in previous commit
This was SVN commit r17076.
2015-09-24 21:57:43 +00:00
mimo 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
mimo aceff9ab15 fix rallyPoint on market foundation
This was SVN commit r17074.
2015-09-24 21:06:06 +00:00
Itms 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
Itms 0e80c9c945 Make the territory decay rate a decimal value. Fixes #3449.
This was SVN commit r17072.
2015-09-24 19:52:36 +00:00
Itms b19d900a02 Fix fb6b86f928, fixes #3218.
This was SVN commit r17071.
2015-09-24 17:40:49 +00:00
Itms 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
Itms 315143424c New berry bush colors, texture updated by stanislas69. Fixes #3377.
This was SVN commit r17069.
2015-09-24 17:21:45 +00:00
Itms dcf8e66aca Update the goal serialization for 03d2c5e40b. Fixes #3425.
This was SVN commit r17068.
2015-09-24 17:13:39 +00:00
Yves a1a61be547 Also patch SpiderMonkey on OSX.
This was SVN commit r17067.
2015-09-24 12:04:15 +00:00
Itms 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
Itms de2f97a9cc Fix translation of starting resources, patch by elexis, refs #3355
This was SVN commit r17064.
2015-09-23 21:12:31 +00:00
mimo 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
mimo 1456db00fc reduce the increase of decayRate from 5060b1bb4f
This was SVN commit r17062.
2015-09-22 18:53:29 +00:00
mimo 71c52f15e9 reduce the increase of decayRate from 5060b1bb4f
This was SVN commit r17061.
2015-09-22 18:52:57 +00:00
scythetwirler 5060b1bb4f Make loyalty drain on decaying buildings much more punishing.
This was SVN commit r17060.
2015-09-22 03:05:16 +00:00
mimo 14aaa7c640 add some missing semicolon
This was SVN commit r17059.
2015-09-21 21:08:58 +00:00
mimo 676358e634 some cleanups of the AIs
This was SVN commit r17057.
2015-09-21 17:26:19 +00:00
Itms b830233498 Fix previous commit, some new files didn't pass through.
This was SVN commit r17055.
2015-09-21 17:14:26 +00:00
Itms d64b95b28c An awesome Visual Replay menu, made by elexis. Fixes #3258.
This was SVN commit r17054.
2015-09-21 17:00:21 +00:00
scythetwirler 7002af5b9c Some capturing nerfs.
This was SVN commit r17053.
2015-09-20 19:09:02 +00:00
Itms ff7aa57931 Complete c19903936b.
This was SVN commit r17052.
2015-09-20 14:26:21 +00:00
mimo 107015861c move map description, refs #3258, patch by elexis
This was SVN commit r17051.
2015-09-20 12:44:01 +00:00
mimo 3317e6c68b rename autostart visualreplay, refs #3258, patch by elexis
This was SVN commit r17050.
2015-09-20 12:29:59 +00:00
Itms 2971852f27 Fix map selection in the lobby gamesetup. Patch by elexis.
This was SVN commit r17049.
2015-09-20 10:44:29 +00:00
Itms 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
mimo 0db7ea2dd2 still another bunch of missing semicolon signaled by jshint
This was SVN commit r17047.
2015-09-19 13:04:33 +00:00
mimo 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
mimo 0b86bbd424 another bunch of cleanup (mainly missing semicolon) signaled by jshint
This was SVN commit r17045.
2015-09-19 12:50:48 +00:00
mimo e42e02d4fe bunch of cleanup (mainly missing semicolon) signaled by jshint
This was SVN commit r17044.
2015-09-19 12:41:21 +00:00
mimo e2bfba740b sanitize matchsettings, patch by elexis, fixes #3431
This was SVN commit r17043.
2015-09-19 12:35:10 +00:00
Itms 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
Itms 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
mimo 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
Itms c24f2b1414 Revert a wrongly committed WIP change.
This was SVN commit r17038.
2015-09-18 19:54:19 +00:00
Itms 7b84c26a44 Fix some issues reported on Transifex.
This was SVN commit r17037.
2015-09-18 19:51:56 +00:00
Itms 0c043b5bdb Fix edge case in the UnitAI state machine. Fixes #3429.
This was SVN commit r17036.
2015-09-18 17:07:32 +00:00
Itms 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
mimo 4655196d6f petra: exit immediately when no entities, fix #3110
This was SVN commit r17033.
2015-09-17 18:19:06 +00:00
mimo 57a094268c petra: some tweaks and cleanings
This was SVN commit r17032.
2015-09-17 17:58:34 +00:00
mimo 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
Itms 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
Itms 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
mimo 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
mimo 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
mimo 4e716699d7 cleanup of EntityState caching
This was SVN commit r17025.
2015-09-15 21:34:31 +00:00
mimo 7e18c0fd9e determineAction only when needed
This was SVN commit r17024.
2015-09-15 18:39:03 +00:00
mimo 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
leper 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
leper a65a8472f9 Mark some const functions as such.
This was SVN commit r17021.
2015-09-13 20:59:10 +00:00
mimo 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
mimo ae3aad704d fix previous commit
This was SVN commit r17018.
2015-09-13 19:06:14 +00:00
mimo 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
mimo 7ac0a4a3db petra: improve detection of threatening enemy units
This was SVN commit r17016.
2015-09-13 17:25:18 +00:00
mimo 4964303f54 petra: be more restrictive to attack a field, refs #3406
This was SVN commit r17015.
2015-09-13 17:21:48 +00:00
Itms 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
Itms 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 that disappeared with the
committing of the new pathfinder. Refs #1537.

Also includes some style improvements to the UnitMotion code.

This was SVN commit r17013.
2015-09-13 09:33:09 +00:00
leper 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
leper 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
leper 73c210f6fb Clean up line endings.
This was SVN commit r17010.
2015-09-12 20:58:59 +00:00
leper bdd6dd0f2f JS component cleanup.
This was SVN commit r17009.
2015-09-12 20:58:57 +00:00
mimo 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
mimo 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
Itms 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
mimo 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
leper 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
leper 558695365d Add some documentation about system components. Fixes #3315.
This was SVN commit r17003.
2015-09-11 04:10:26 +00:00
leper 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
mimo 7842aa0468 petra: do not loose time attacking useless structures
This was SVN commit r17001.
2015-09-10 19:27:18 +00:00
mimo dff16f664e make fences not capturable (as walls and palisades)
This was SVN commit r17000.
2015-09-10 19:26:06 +00:00
Itms 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
JoshuaJB 8b437a0b1c Fix #3386, patch by elexis.
This was SVN commit r16997.
2015-09-10 05:30:18 +00:00
mimo 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
mimo 6213db17dd petra: some tweaks in trade techs
This was SVN commit r16995.
2015-09-09 18:00:53 +00:00
mimo ec6ae9d601 avoid that ships block allied docks, fix #3402
This was SVN commit r16994.
2015-09-09 17:37:44 +00:00
Itms 3f37ac44d6 Correctly fix the splashscreen typo.
This was SVN commit r16993.
2015-09-08 19:23:47 +00:00
mimo bd355c531a petra: fix and complete c1efebab15
This was SVN commit r16992.
2015-09-07 18:14:50 +00:00
mimo a40fdd52d9 fix typo in 19d8c631be
This was SVN commit r16991.
2015-09-07 18:00:59 +00:00
leper 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
mimo 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
Itms 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
historic_bruno 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
Itms 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
Itms 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
mimo 2a7dc39d07 some cleanups of gui code
This was SVN commit r16984.
2015-09-04 17:50:04 +00:00
mimo 9e3ee0e849 Petra: make a bit more use of cavalry
This was SVN commit r16983.
2015-09-04 17:47:54 +00:00
Itms 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
leper 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
Itms 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
mimo c0d8645a6d remove some unnecessary object<->array copies + some parentheses cleanup
This was SVN commit r16978.
2015-09-02 18:14:26 +00:00
Itms 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
Itms 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
Itms 8dde1cda94 Style cleanup, and remove a wrong TODO.
This was SVN commit r16974.
2015-09-02 17:40:31 +00:00
Itms 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
mimo bcc75b2156 fix buggy test
This was SVN commit r16972.
2015-09-02 17:11:29 +00:00
Itms 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 1c9ea56800,
it can be safely used.

Fixes #3376.

This was SVN commit r16971.
2015-09-02 15:50:16 +00:00
mimo 5ff31a1e33 small cleanup of unit_actions.js
This was SVN commit r16970.
2015-09-01 20:49:37 +00:00
mimo 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
mimo 025391db35 fix behavior when under alert, fixes #3273
This was SVN commit r16968.
2015-08-31 19:54:06 +00:00
leper 2c87ccb66e Fix typo causing errors for building placement.
This was SVN commit r16967.
2015-08-30 23:07:25 +00:00
historic_bruno 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
Itms 8a8a3b8377 Revert a wrong piece of code from 63e42fbd31. Refs #3293
This was SVN commit r16965.
2015-08-30 20:32:22 +00:00
scythetwirler 1a15131d2d Lobby bot optimizations.
This was SVN commit r16964.
2015-08-30 17:50:16 +00:00
Itms 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
Itms 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
JoshuaJB 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
leper 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
leper 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
leper 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
leper 8befb23db3 In-game chat code cleanup. Based on patches by elexis.
This was SVN commit r16956.
2015-08-30 02:21:17 +00:00
leper 57f340f906 Fix player rejoins. Refs #3242.
This was SVN commit r16955.
2015-08-30 02:03:50 +00:00
leper c9893b3dd0 Test serialization of nested maps. Refs #3164, #3374.
This was SVN commit r16954.
2015-08-30 00:06:39 +00:00
leper 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
leper 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
leper 8217fa1a0e Warn about range queries that can never return any results.
This was SVN commit r16951.
2015-08-29 22:49:49 +00:00
leper 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
leper 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
leper 5a7b4e380a Rename some occurences of *Man to cmp*Manager.
This was SVN commit r16948.
2015-08-29 22:49:42 +00:00
leper 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
leper 39343a8c84 Fix test failure.
This was SVN commit r16946.
2015-08-29 22:49:32 +00:00
Itms 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
Itms 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
mimo 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
leper 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
Itms 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
mimo 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
leper 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
Itms 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
Itms 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
Itms 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
Itms 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
Itms 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
leper 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
Itms 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
Itms 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
Itms 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
Itms ba82743777 Some range-based for loops.
This was SVN commit r16926.
2015-08-20 12:58:41 +00:00
Itms 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
Itms 1ab3a4a02d Fix 6506bc20cb, refs #3238
This was SVN commit r16924.
2015-08-20 12:49:43 +00:00
leper 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
leper 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
leper 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
Itms 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
Itms 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
Itms 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
Itms 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
Itms 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
leper 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
leper c333ae3fc2 Escape [ char in a gui caption.
This was SVN commit r16911.
2015-08-02 23:10:08 +00:00
mimo 3c8fe51712 complete b3f7b8633a for (un)packing
This was SVN commit r16910.
2015-08-02 17:24:04 +00:00
leper 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
mimo 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
mimo 591771a0be make siege tower able to capture, fixes #3356
This was SVN commit r16907.
2015-08-02 09:32:47 +00:00
leper 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
leper 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
mimo 2a6eac3bd4 Petra: fix order of event processing in defenseManager
This was SVN commit r16904.
2015-07-31 16:55:38 +00:00
leper 217a500d60 Add missing license headers. Fixes #3357.
This was SVN commit r16903.
2015-07-31 11:28:14 +00:00
Itms 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
leper a4e606c575 TerrainTextureManager cleanup.
This was SVN commit r16901.
2015-07-30 21:51:01 +00:00
leper c5aad60776 Actually stop iterating if retval != INFO::OK. Also fix comments.
This was SVN commit r16900.
2015-07-30 21:50:58 +00:00
leper 15a4c813d6 Add support for AArch64 (ARM64). Patch by tbm. Fixes #3345.
This was SVN commit r16899.
2015-07-30 19:52:55 +00:00
leper 0868d03e74 Fix previous commit.
This was SVN commit r16898.
2015-07-30 17:27:27 +00:00
leper 2238a18aee Close and free replay streams. Based on patch by elexis.
This was SVN commit r16897.
2015-07-30 16:43:22 +00:00
leper 4f91b16d0f Allow pausing during visual replays. Patch by elexis. Refs #3341.
This was SVN commit r16896.
2015-07-30 15:55:19 +00:00
leper 47336b770f Add clipping to OList cells. Patch by elexis. Fixes #3353.
This was SVN commit r16895.
2015-07-30 01:33:48 +00:00
leper 8bfe16cac8 Use in-place construction.
This was SVN commit r16894.
2015-07-29 23:44:17 +00:00
leper c5eb9b7bb7 Range-based for for VfsPath loops.
This was SVN commit r16893.
2015-07-29 23:44:12 +00:00
leper 540cf75794 L10n code cleanup.
This was SVN commit r16892.
2015-07-29 23:44:05 +00:00
mimo 356b08ec5d update heroes and their auras for capture, fixes #3331
This was SVN commit r16891.
2015-07-29 17:54:08 +00:00
mimo f2f3076bd7 minor cleanup
This was SVN commit r16890.
2015-07-29 17:50:04 +00:00
mimo 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
leper a07add11c6 Some range-based for loops and some style cleanup.
This was SVN commit r16888.
2015-07-29 01:07:23 +00:00
leper 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
Itms 2cae918059 Same as previous commit, but nicer. Refs #3329
This was SVN commit r16886.
2015-07-27 20:39:46 +00:00
Itms 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
leper 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
leper 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
leper da48c8c26f Some const refs and one const function.
This was SVN commit r16882.
2015-07-27 01:08:25 +00:00
leper bd53e9d736 Remove unused ah_translate code.
This was SVN commit r16881.
2015-07-27 01:08:15 +00:00
mimo 2a655d1363 cleanup of 4054e5cb04
This was SVN commit r16880.
2015-07-26 14:54:52 +00:00
mimo 27de859f9b Petra: minor tweaks in farming
This was SVN commit r16879.
2015-07-26 14:49:01 +00:00
mimo 4054e5cb04 make a wooden tower template for each civ, refs #3059
This was SVN commit r16878.
2015-07-26 14:43:21 +00:00
mimo 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
leper eb47670cd1 Some string fixes reported by translators.
This was SVN commit r16874.
2015-07-21 21:19:41 +00:00
mimo a61c7560eb petra: minor attack tweaks
This was SVN commit r16873.
2015-07-21 19:30:54 +00:00
leper 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
Itms 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
Itms 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
Itms 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
mimo 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
mimo 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
mimo 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
Itms 76d5374e77 Some string changes based on translators' feedback.
This was SVN commit r16863.
2015-07-16 17:07:55 +00:00
mimo f9440a964a minor petra tweaks
This was SVN commit r16860.
2015-07-15 17:29:06 +00:00
Itms 8fc4ecaa6b Fix previous commit, stupid typo...
This was SVN commit r16859.
2015-07-15 16:57:23 +00:00
Itms 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
Itms 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
Itms 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
wraitii b0386d7fab Fix gamesetup for observer games. Thanks to elexis
This was SVN commit r16854.
2015-07-14 11:26:14 +00:00
mimo d08279ceb6 some fixes for petra
This was SVN commit r16853.
2015-07-13 13:05:14 +00:00
mimo 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
mimo c946ebbf7c prevent structures without territory influence to decay in allied territory
This was SVN commit r16851.
2015-07-12 18:46:44 +00:00
Itms 04982b0bf5 Fix compiler warning
This was SVN commit r16849.
2015-07-12 16:49:26 +00:00
mimo f74215e96c rounding needed for houses with popBonus%5 != 0, fixes #3328
This was SVN commit r16848.
2015-07-12 15:23:34 +00:00
Itms 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
Itms edf6e909b2 ...aaaaand I forgot this guy.
This was SVN commit r16846.
2015-07-12 08:11:30 +00:00
Itms 0d32afd688 Improve the style of GUI string text call functions.
This was SVN commit r16845.
2015-07-12 08:09:55 +00:00
Itms 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
mimo 9161cd7e24 petra: rework of the management of captured/decaying structures
This was SVN commit r16843.
2015-07-11 17:00:21 +00:00
Itms 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
mimo c4389abceb let petra use wooden towers in village phase
This was SVN commit r16841.
2015-07-09 20:46:09 +00:00
Itms 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
Itms b3fa75529b All work and no play... refs #3253
This was SVN commit r16839.
2015-07-08 19:17:32 +00:00
Itms 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
Itms 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
mimo 4a0bb47a62 AI: various cleanings and fixes
This was SVN commit r16836.
2015-07-07 17:32:35 +00:00
Itms 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
Itms 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
Itms 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
JoshuaJB 7ca2084e89 Fix #3072
This was SVN commit r16831.
2015-07-04 18:00:51 +00:00
mimo b7a1b9fbd4 fixes some wonder templates
This was SVN commit r16830.
2015-07-04 16:46:20 +00:00
mimo 32252ea00c fix persian conscription_cavalry which needs persian levy_cavalry
This was SVN commit r16829.
2015-07-03 17:01:19 +00:00
Itms 512f69379b Fix the male variation of non-Roman healers. Fixes #3318
This was SVN commit r16828.
2015-07-02 16:59:16 +00:00
Itms 3018359576 Improve a little bit Atlas performance when modifying terrain elevation.
This was SVN commit r16827.
2015-07-01 19:13:56 +00:00
mimo e500de4dc6 AI: clean up
This was SVN commit r16826.
2015-06-30 19:10:57 +00:00
Itms 30e5f032d8 Adapt Atlas to the new pathfinder. Fixes #3298
This was SVN commit r16824.
2015-06-29 19:59:41 +00:00
mimo 6a9019564e AI: clean up some obsolete code
This was SVN commit r16823.
2015-06-28 19:08:00 +00:00
leper 7b298cccdb Increase bench size to meet minimum obstruction size. Fixes #3316.
This was SVN commit r16822.
2015-06-28 19:05:22 +00:00
wraitii 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
Itms e0838c5326 Update the pathfinder docs.
This was SVN commit r16820.
2015-06-27 15:16:21 +00:00
mimo 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
Itms 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
mimo 0b8597fd2d Petra: improve performance of initialization in naval maps
This was SVN commit r16817.
2015-06-25 18:19:12 +00:00
Itms e1a34eb4ea Handle (de)serialization of the AI pathfinder.
This was SVN commit r16815.
2015-06-24 20:24:58 +00:00
Itms 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
mimo ae0c051e83 Petra: remove some huge spikes when profiling
This was SVN commit r16813.
2015-06-24 18:42:09 +00:00
Itms 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
mimo 4f331c1359 cleanup of previous commits
This was SVN commit r16810.
2015-06-22 20:04:11 +00:00
mimo 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
mimo d045bb87d6 fix the market placement following new pathFinder changes
This was SVN commit r16808.
2015-06-22 16:49:49 +00:00
mimo fae2caed1a adapt AIs to changes in e6d1afe48b
This was SVN commit r16807.
2015-06-22 16:47:42 +00:00
Itms e6d1afe48b Add a terrain passability class for water. Fixes #3308
This was SVN commit r16806.
2015-06-22 15:30:23 +00:00
leper 1793a96c14 Actually remove the unused expression.
This was SVN commit r16805.
2015-06-21 20:44:31 +00:00
leper 495aa7bec5 Expose TemplateExists() to RM scripts.
This was SVN commit r16804.
2015-06-21 20:22:34 +00:00
historic_bruno 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
leper 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
leper 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
leper caa8f51c2e Annotate custom assert for clang-analyzer.
This was SVN commit r16800.
2015-06-21 18:46:23 +00:00
mimo 30d96af5a2 a bit of cleanup in petra naval code
This was SVN commit r16799.
2015-06-20 20:49:31 +00:00
mimo 92832b1dc7 Petra fixes for naval maps
This was SVN commit r16797.
2015-06-19 21:09:41 +00:00
leper bbafed7fbf Lobby code cleanup.
This was SVN commit r16796.
2015-06-19 17:25:28 +00:00
sanderd17 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
Itms 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
mimo eeee79e7f3 AI fix for building placement + some cleanings
This was SVN commit r16793.
2015-06-18 19:19:24 +00:00
leper 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
Itms 9701a85554 Fix a possible problem with grid updates. Refs #3296.
This was SVN commit r16791.
2015-06-18 16:31:38 +00:00
sanderd17 e7707f0f0c Fix issue with OOS in replays. Patch by elexis
This was SVN commit r16790.
2015-06-18 15:29:03 +00:00
mimo 008fb80855 AI: remove code from old pathFinder
This was SVN commit r16789.
2015-06-17 21:03:49 +00:00
Itms 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
Itms 155c6e6ccd Properly initialize the AI pathfinder, and clean whitespace.
This was SVN commit r16786.
2015-06-17 20:35:23 +00:00
mimo 1c29b21b69 adapt the AI to 1709353e2c, fixes #3295
This was SVN commit r16785.
2015-06-17 20:30:57 +00:00
Itms 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
leper 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
sanderd17 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
scythetwirler 2ff4c60859 Adjusts some capturing parameters.
This was SVN commit r16779.
2015-06-16 19:41:08 +00:00
leper a568b42bf9 Code cleanup.
This was SVN commit r16778.
2015-06-16 14:35:16 +00:00
Itms c8a5708654 Fix tests.
This was SVN commit r16777.
2015-06-15 19:48:42 +00:00
scythetwirler fcf7344537 Nerfs fire rate of garrisoned ships.
This was SVN commit r16776.
2015-06-15 16:39:42 +00:00
scythetwirler fdb99a5c8c Buffs melee cavalry HP.
This was SVN commit r16775.
2015-06-15 16:36:26 +00:00
scythetwirler dc97eeb5e5 Re-enables promotions.
This was SVN commit r16774.
2015-06-15 16:31:26 +00:00
leper 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
leper 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
leper 68ea5f37f4 Remove unused ctors. Fixes compilation with GCC 4.6.
This was SVN commit r16771.
2015-06-14 23:50:38 +00:00
historic_bruno 4af117434d Fixes clang unused parameter warning
This was SVN commit r16770.
2015-06-14 23:45:15 +00:00
trompetin17 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
historic_bruno 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
historic_bruno 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
historic_bruno 2128cfbcb8 Updates readme.txt with new visual replay option, refs #9
This was SVN commit r16765.
2015-06-14 19:59:19 +00:00
Itms 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
historic_bruno 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
Itms 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
historic_bruno 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
scythetwirler 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
scythetwirler 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
scythetwirler a9ac2edce5 Decrases phasing time and costs.
This was SVN commit r16758.
2015-06-13 16:46:29 +00:00
scythetwirler 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
sanderd17 2a657a7eb7 Fix changing ownership to -1
This was SVN commit r16756.
2015-06-13 13:02:10 +00:00
sanderd17 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
trompetin17 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
mimo 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
Itms 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
mimo aa1512a662 code cleaning in petra
This was SVN commit r16750.
2015-06-11 20:11:08 +00:00
mimo 1442b7e913 Petra: fix some capture cases not handled by 61f3d80ab0
This was SVN commit r16749.
2015-06-11 19:20:52 +00:00
sanderd17 fd3d697edf Make it easier to add different backgrounds
This was SVN commit r16747.
2015-06-11 09:08:46 +00:00
mimo 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
mimo 12d4209eed fix typo
This was SVN commit r16745.
2015-06-10 16:41:34 +00:00
sanderd17 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
mimo 1811323f95 Petra: small fixes in trade and attack
This was SVN commit r16743.
2015-06-09 19:06:59 +00:00
sanderd17 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
sanderd17 950d361c15 Fix the material Relax NG files.
This was SVN commit r16741.
2015-06-09 15:15:19 +00:00
sanderd17 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
sanderd17 fe71300e07 Move some fish to the sea. Fixes #3289
This was SVN commit r16739.
2015-06-09 13:18:24 +00:00
sanderd17 40f2762170 Fix healer support template
This was SVN commit r16738.
2015-06-08 14:50:16 +00:00
sanderd17 558461a792 Fix female support template
This was SVN commit r16737.
2015-06-08 14:44:20 +00:00
historic_bruno 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
leper 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
leper a18fbd12ec XML validation. Based on patch by historic_bruno. Refs #245.
This was SVN commit r16733.
2015-06-07 21:56:52 +00:00
mimo f260e75499 improve display of timing options, patch by Vladislav, fixes #2894
This was SVN commit r16732.
2015-06-07 20:58:51 +00:00
mimo 6a1ee7137c fix starting techs
This was SVN commit r16731.
2015-06-07 12:13:40 +00:00
Itms 2457b69fb3 Fix const attribute for some function parameters.
This was SVN commit r16730.
2015-06-07 09:24:19 +00:00
mimo ce19d55176 AIs: remove the hardcoded athen phases
This was SVN commit r16729.
2015-06-06 15:41:04 +00:00
Itms 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
sanderd17 e9c27d4066 Fix wrong technology application as discovered by wowgetoffyourcellphone and niektb
This was SVN commit r16726.
2015-06-05 10:39:10 +00:00
sanderd17 a839adc615 Fix Carthagian healer voices. Patch by karamel. Fixes #3220
This was SVN commit r16725.
2015-06-05 09:12:26 +00:00
mimo 4a7994a595 improve indentation in previous tag
This was SVN commit r16724.
2015-06-04 21:26:01 +00:00
mimo f1f8479ffe fix entityLimits with replaced tech
This was SVN commit r16723.
2015-06-04 21:24:34 +00:00
mimo 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
mimo 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
sanderd17 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
sanderd17 fcc992feae Fix math
This was SVN commit r16719.
2015-06-04 16:06:37 +00:00
sanderd17 cdbc775531 Fix code style
This was SVN commit r16718.
2015-06-04 15:36:34 +00:00
sanderd17 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
sanderd17 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
historic_bruno 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
trompetin17 6506bc20cb Fixes #3238, SetGlobal 'TriggerHelper' called multiple times
This was SVN commit r16713.
2015-06-03 20:34:59 +00:00
mimo 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
mimo aa41651fda remove a useless splice
This was SVN commit r16711.
2015-06-02 20:58:18 +00:00
mimo 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
sanderd17 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
historic_bruno 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
mimo 040bdd14db fix some selectionGroups
This was SVN commit r16707.
2015-06-01 21:04:31 +00:00
leper 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
leper f71be3c764 Use iterators for XMBAttributeList and XMBElementList. Fixes #3269.
This was SVN commit r16704.
2015-06-01 00:29:35 +00:00
leper 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
mimo 9854d04794 Petra: react to PlayerDefeated events for target choice
This was SVN commit r16701.
2015-05-31 19:53:23 +00:00
sanderd17 f009b52c0f Fix null-reference
This was SVN commit r16700.
2015-05-31 12:23:08 +00:00
leper b5e22a22ea Fix error message missed in f680caa14f. Refs #3118.
This was SVN commit r16699.
2015-05-30 22:25:54 +00:00
mimo c1594c4bc8 Petra: add missing changes in previous commit
This was SVN commit r16698.
2015-05-30 19:15:36 +00:00
mimo 9408860acc Petra: some code reshuffling + small bug fixes
This was SVN commit r16697.
2015-05-30 19:12:01 +00:00
sanderd17 b738772d65 Fix typo
This was SVN commit r16696.
2015-05-29 19:51:48 +00:00
sanderd17 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
sanderd17 f1445b16c6 IsAlly -> IsMutualAlly, and move the divide-by-zero check
This was SVN commit r16693.
2015-05-29 07:16:54 +00:00
sanderd17 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
mimo f4432330e1 cleaning
This was SVN commit r16691.
2015-05-28 20:42:01 +00:00
mimo f200815de4 AI: avoid creating some unused maps and cleanings
This was SVN commit r16690.
2015-05-28 20:35:05 +00:00
historic_bruno 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
mimo 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
leper 57407172e8 Plural translations.
This was SVN commit r16686.
2015-05-26 16:29:22 +00:00
sanderd17 1d7b394752 Fix male death. Refs #3220
This was SVN commit r16685.
2015-05-26 16:04:26 +00:00
leper e638af5422 Clean up some unused variables and assignments.
This was SVN commit r16684.
2015-05-26 15:40:07 +00:00
leper 4ccc9130ba Add missing include.
This was SVN commit r16683.
2015-05-26 15:40:04 +00:00
sanderd17 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
sanderd17 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
sanderd17 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
sanderd17 84ba6c0719 Include string fixes from Itms again
This was SVN commit r16679.
2015-05-25 16:06:53 +00:00
sanderd17 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
sanderd17 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
leper 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
Itms 5b2e9c95e7 More encoding fixes and EOL changes, fixes #3262
This was SVN commit r16672.
2015-05-24 19:07:05 +00:00
Itms 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
Itms 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
Itms b2e2e47205 Update some old templates in the Combat demo map.
This was SVN commit r16669.
2015-05-24 13:05:40 +00:00
Itms 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
Itms 599a2daa85 Amend previous commit, reported by qwertz
This was SVN commit r16667.
2015-05-24 09:37:31 +00:00
Itms 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
mimo 57afd0091b petra cleanings and tweaks
This was SVN commit r16664.
2015-05-21 20:23:21 +00:00
leper 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
leper 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
leper 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
sanderd17 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
sanderd17 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
sanderd17 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
sanderd17 1723fbcca8 Cleanup some ceasefire code. Patch by elexis. Fixes #2749
This was SVN commit r16657.
2015-05-20 07:25:25 +00:00
mimo 6dcf636d7c fix attackable players in unitai, refs #2749
This was SVN commit r16656.
2015-05-19 20:10:19 +00:00
mimo 4947818c52 petra tweak
This was SVN commit r16655.
2015-05-19 17:11:09 +00:00
trompetin17 07351999fd Fixes #3248, patch by elexis
This was SVN commit r16654.
2015-05-17 22:11:41 +00:00
Itms 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
mimo 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
mimo 4b9e11eedd a few fixes and tweaks for petra
This was SVN commit r16651.
2015-05-13 15:37:49 +00:00
mimo d41671044a petra: additional bugfixes and tweaks
This was SVN commit r16649.
2015-05-10 20:21:00 +00:00
trompetin17 20877632ce Fix 1vs1 Game, Fix Resign double message
This was SVN commit r16648.
2015-05-10 16:12:55 +00:00
Yves a39aa76e62 These temporary roots aren't needed anymore with SpiderMonkey 31
This was SVN commit r16647.
2015-05-10 09:01:39 +00:00
mimo 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
mimo 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
mimo 5a6a848eb2 some code cleaning in petra
This was SVN commit r16642.
2015-05-09 17:53:24 +00:00
mimo 552c3ede69 petra: add protection when no boarding point found, fix #3232
This was SVN commit r16641.
2015-05-09 17:23:57 +00:00
leper 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
mimo 1155bf589b petra: fix bug in garrisoning following capture adaptation
This was SVN commit r16639.
2015-05-08 18:48:51 +00:00
mimo c8e964f0e9 fix wrong test from d21c0026ec
This was SVN commit r16638.
2015-05-08 17:48:40 +00:00
mimo 074408b114 fixes #3101, patch by elexis
This was SVN commit r16637.
2015-05-08 15:21:09 +00:00
mimo 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
LordGood d664fadc38 Seleucid Fortress commit
This was SVN commit r16635.
2015-05-08 04:12:58 +00:00
trompetin17 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
mimo 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
Itms 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
leper 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
Itms 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
Itms 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
leper 4db041e3c6 Stop leaking g_ScriptStatsTable in replay mode. Fixes #3223.
This was SVN commit r16627.
2015-05-05 22:34:41 +00:00
mimo 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
sanderd17 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
sanderd17 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
leper 7f606250f8 Fix build failure on GCC 4.6.
This was SVN commit r16623.
2015-05-04 19:37:25 +00:00
sanderd17 f5107ad189 Fix OOS caused by saving build progress. Fixes #3217
This was SVN commit r16622.
2015-05-04 12:49:11 +00:00
leper 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
mimo ee17247ee5 petra: some fixes in tech researches
This was SVN commit r16619.
2015-05-03 16:13:21 +00:00
sanderd17 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
leper 7a70c475df Improve rejoin messages. Patch by elexis. Fixes #1949.
This was SVN commit r16614.
2015-05-03 02:06:17 +00:00
leper ecf229046a String fixes.
This was SVN commit r16613.
2015-05-02 22:35:13 +00:00
sanderd17 d4794b5474 Flip aura icons correctly
This was SVN commit r16612.
2015-05-02 20:01:03 +00:00
sanderd17 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
sanderd17 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
leper a9afa61a7b Serialization support for ES6 Sets.
This was SVN commit r16608.
2015-05-01 23:04:28 +00:00
leper 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
mimo 7d20695412 petra: fixes and tweaks of the previous commits for capture
This was SVN commit r16606.
2015-05-01 14:13:59 +00:00
mimo 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
leper 7d8dee27cc Autocomplete observer nicks in-game. Patch by elexis. Fixes #3203.
This was SVN commit r16604.
2015-04-30 22:12:56 +00:00
leper 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
mimo 522bd8b37c petra: let the ai capture gaia structures
This was SVN commit r16602.
2015-04-30 19:07:28 +00:00
sanderd17 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
leper 41113f6f9b Adjust gui Relax NG grammar to <repeat> changes in 622614de02.
This was SVN commit r16600.
2015-04-30 04:39:50 +00:00
mimo 43a31ce494 petra: use a map instead of object for garrison bookkeeping
This was SVN commit r16599.
2015-04-29 19:44:41 +00:00
mimo b0f7c00622 petra: continuation on capture adaptation
This was SVN commit r16598.
2015-04-29 17:59:29 +00:00
sanderd17 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
leper e758701da5 Include missing header.
This was SVN commit r16595.
2015-04-29 15:54:08 +00:00
leper 7d953ff0a7 Fix compiler warning.
This was SVN commit r16594.
2015-04-29 00:07:48 +00:00
sanderd17 296d363812 Remove forgotten warning
This was SVN commit r16593.
2015-04-28 13:12:13 +00:00
sanderd17 5e5799a45a Fix tests
This was SVN commit r16592.
2015-04-28 12:16:33 +00:00
sanderd17 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
sanderd17 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
mimo f9a025ba6b petra: some cleanings and tweaks
This was SVN commit r16589.
2015-04-27 18:34:24 +00:00
sanderd17 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
sanderd17 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
fabio 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
fabio 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
mimo 8ff8667ed0 add initialization of capturePoints in AIProxy + some cleanings
This was SVN commit r16584.
2015-04-26 18:07:55 +00:00
sanderd17 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
sanderd17 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
sanderd17 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
sanderd17 604538a63a Fix issue with preferences in BuildingAI. Refs #1731
This was SVN commit r16580.
2015-04-26 08:21:43 +00:00
mimo 6c13bd92fd improve 632c8bd17e
This was SVN commit r16579.
2015-04-25 17:29:22 +00:00
mimo 632c8bd17e petra: continuation of adaptation to capture
This was SVN commit r16578.
2015-04-25 17:00:15 +00:00
sanderd17 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
sanderd17 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
sanderd17 d7960fa775 Try out some replacement animations for capturing on athenian infantry
This was SVN commit r16575.
2015-04-25 08:16:55 +00:00
mimo 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
mimo 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
leper e0606468df Translate some tooltips as plurals. Unify aura tooltip code.
This was SVN commit r16571.
2015-04-23 18:58:39 +00:00
leper 6e58781e51 Make Sicilia Nomad a skirmish map and fix the description.
This was SVN commit r16570.
2015-04-23 17:33:49 +00:00
sanderd17 7f74f7d218 Make capture attack visible in Atlas
This was SVN commit r16569.
2015-04-23 17:14:15 +00:00
leper 5cbf2404af Fix tower tech tooltip. Patch by elexis. Fixes #3191.
This was SVN commit r16568.
2015-04-23 00:33:54 +00:00
leper 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
leper 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
trompetin17 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
sanderd17 d08fdf43d7 Fix some issues with capturing and miraged entities
This was SVN commit r16564.
2015-04-22 09:59:59 +00:00
sanderd17 6c7eb93e1c Add temporary capture cursor
This was SVN commit r16563.
2015-04-22 08:20:41 +00:00
mimo 885aec20dd fix a typo in 9be10939cb
This was SVN commit r16562.
2015-04-21 19:25:54 +00:00
mimo 625cfb79d3 petra: another fix for capture events
This was SVN commit r16561.
2015-04-21 19:00:51 +00:00
sanderd17 7bb30ef6b0 Fix some more flags
This was SVN commit r16560.
2015-04-21 17:58:07 +00:00
mimo 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
sanderd17 2972cb3202 Small fix
This was SVN commit r16558.
2015-04-21 14:33:28 +00:00
sanderd17 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
sanderd17 701663afaa Add minimap ping alert for capture attack
This was SVN commit r16556.
2015-04-21 08:27:26 +00:00
sanderd17 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
sanderd17 6766401510 Fix the resign problem with capturing
This was SVN commit r16553.
2015-04-20 16:22:48 +00:00
leper 535d612e06 Small fixes.
This was SVN commit r16552.
2015-04-20 14:51:06 +00:00
sanderd17 a8c44d947c Fix tests
This was SVN commit r16551.
2015-04-20 07:47:07 +00:00
sanderd17 ad27deeb9d Implement building capturing. Fixes #996
This was SVN commit r16550.
2015-04-20 07:45:45 +00:00
mimo 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
mimo 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
Itms a0cf780e1e Amend 5c84c3e9e5
This was SVN commit r16547.
2015-04-16 13:17:58 +00:00
trompetin17 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
Itms 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
Itms 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
sanderd17 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
Itms 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
mimo a0340efab8 fix an unfortunate typo affecting the AIs
This was SVN commit r16539.
2015-04-14 20:23:42 +00:00
mimo 1ea1755ee7 Petra: follow-up on changes to deal with capture
This was SVN commit r16538.
2015-04-14 20:14:39 +00:00
sanderd17 a980d8fdfc Fix structure tree by allowing undefined templates in the productionqueue
This was SVN commit r16537.
2015-04-14 18:45:02 +00:00
mimo 03506a0eec fix typo creating 71fb9ef162
This was SVN commit r16536.
2015-04-13 21:04:49 +00:00
sanderd17 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
historic_bruno 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
mimo 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
mimo 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
Itms 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
sanderd17 528dc9179a Fix mace and ptol skirmish replacements
This was SVN commit r16529.
2015-04-10 11:58:12 +00:00
mimo 41550ea849 add a missing protection following changes for capture
This was SVN commit r16528.
2015-04-09 19:53:03 +00:00
sanderd17 d41fb4612f Fix athen archer selection
This was SVN commit r16527.
2015-04-09 17:36:27 +00:00
sanderd17 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
sanderd17 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
sanderd17 2700f74dd3 Make docks ready to capture. Refs #2614
This was SVN commit r16524.
2015-04-09 08:22:29 +00:00
sanderd17 bdfedb1c49 Rename Seleucid mercenary units to reflect their mercenary state
This was SVN commit r16523.
2015-04-09 08:08:20 +00:00
sanderd17 b92fac170a Rename ptolemaic mercenary units to reflect their mercenary state
This was SVN commit r16522.
2015-04-09 07:44:16 +00:00
sanderd17 6250990bfd Make barracks ready to capture. Refs #2614
This was SVN commit r16521.
2015-04-09 07:15:50 +00:00
mimo 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
sanderd17 19692c0acc Fix entity names in map files.
This was SVN commit r16518.
2015-04-08 08:15:47 +00:00
mimo 358b1c06d8 Petra: start changes needed to support capture
This was SVN commit r16514.
2015-04-07 20:23:12 +00:00
sanderd17 1dcfd75e62 Fix typo
This was SVN commit r16513.
2015-04-07 13:34:26 +00:00
sanderd17 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
sanderd17 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
sanderd17 b4cbc14490 Style fixes
This was SVN commit r16510.
2015-04-07 07:15:59 +00:00
leper abe6347554 Some cheat code cleanup.
This was SVN commit r16509.
2015-04-06 22:43:54 +00:00
leper 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
JoshuaJB 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
sanderd17 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
sanderd17 c8401bd737 Rename cart mercenary units to distinguish them from regular units
This was SVN commit r16505.
2015-04-06 12:47:12 +00:00
sanderd17 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
sanderd17 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
sanderd17 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
JoshuaJB 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
leper 18ff57c316 Update version in mod.json.
This was SVN commit r16500.
2015-04-05 17:14:47 +00:00
leper 7afaacda19 Improve ARRAY_SIZE.
This was SVN commit r16499.
2015-04-05 16:50:26 +00:00
trompetin17 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
mimo 43508ce3a0 some petra code reshuffling
This was SVN commit r16496.
2015-04-04 15:38:53 +00:00
sanderd17 c735f9a579 Revert wrong commit 14b7e7568c
This was SVN commit r16495.
2015-04-04 09:11:05 +00:00
sanderd17 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
sanderd17 0131f2e4d5 Fix gamesetup options for lobby games
This was SVN commit r16493.
2015-04-03 09:40:50 +00:00
Gallaecio dfd7978cb2 fix typo (particate → participate)
This was SVN commit r16492.
2015-04-03 07:39:25 +00:00
mimo 8d3d9616a2 be more generic with starting entities of nomad maps
This was SVN commit r16491.
2015-04-02 21:01:19 +00:00
mimo afbf6e8e40 cleanings of AIInterface
This was SVN commit r16490.
2015-04-02 20:28:02 +00:00
mimo 1482a84875 replace some slow (foreach in) loops
This was SVN commit r16489.
2015-04-02 20:22:33 +00:00
sanderd17 0e2c30c7d2 Reduce the strength of the elevation brushes in Atlas.
This was SVN commit r16488.
2015-04-02 13:43:47 +00:00
leper 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
leper 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
leper 41863d6ae2 Explicitly cast to unsigned to fix a warning.
This was SVN commit r16483.
2015-04-01 23:48:23 +00:00
sanderd17 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
sanderd17 aa808baabf Fix the stumped maps in Alpine Mountains
This was SVN commit r16481.
2015-03-31 17:30:59 +00:00
sanderd17 ebb57aa516 Fix tests by enlarging the precision bumped in 7ed45213a9
This was SVN commit r16479.
2015-03-31 16:56:09 +00:00
sanderd17 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
leper 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
leper 072afdcede Fix line endings for random maps.
This was SVN commit r16476.
2015-03-30 23:41:12 +00:00
mimo b5593bf1a9 petra changes in the choice of player to be attacked
This was SVN commit r16475.
2015-03-30 20:21:46 +00:00
sanderd17 ec9a49562b Remove debug warning + fix typo
This was SVN commit r16474.
2015-03-30 18:49:54 +00:00
sanderd17 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
sanderd17 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
mimo 809cc074fa petra: small tweaks and cleanings
This was SVN commit r16471.
2015-03-29 13:01:38 +00:00
mimo 569b5e244d fix computation of foundation refund when destroyed, fixes #3132
This was SVN commit r16470.
2015-03-26 19:17:37 +00:00
sanderd17 798cd2963e Add option to disable treasures on skirmish and random maps
This was SVN commit r16469.
2015-03-26 08:31:50 +00:00
leper 1cd41e33c6 Niektb's Northern Island skirmish map.
This was SVN commit r16468.
2015-03-25 19:50:37 +00:00
mimo 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
leper 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
trompetin17 2fe444269e Game Speed display over UI, Fixes #3129
This was SVN commit r16465.
2015-03-25 13:20:54 +00:00
Pureon 6bc34da330 Emblem button states
This was SVN commit r16464.
2015-03-25 00:35:52 +00:00
leper 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
leper 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
mimo 28abcb3bcc cache some formation info in gui + some cleanings, see #3078
This was SVN commit r16460.
2015-03-23 18:38:27 +00:00
mimo a430e03d1d Petra: fix for nested loops using same loop index
This was SVN commit r16459.
2015-03-23 18:06:31 +00:00
leper 58d955e426 Some cleanup.
This was SVN commit r16458.
2015-03-23 13:34:23 +00:00
mimo 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
mimo 64adec79da fix a wrong copy&paste in 86054bcf7e
This was SVN commit r16456.
2015-03-22 21:51:57 +00:00
historic_bruno 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
leper f680caa14f Escape lobby game names. Fixes #3118.
This was SVN commit r16452.
2015-03-21 16:24:29 +00:00
mimo 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
historic_bruno 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
historic_bruno 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
mimo 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
mimo bed480c433 remove some obsolete variables after #16416
This was SVN commit r16446.
2015-03-17 21:43:48 +00:00
leper e288bb7c4e Some gamesetup cleanup. Refs #3049.
This was SVN commit r16445.
2015-03-16 23:56:42 +00:00
leper 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
leper 09796350c8 Fix changephase cheat broken in af8a6f5e8c.
This was SVN commit r16443.
2015-03-16 18:50:51 +00:00
leper 46d17483db Remove --with-system-miniupnpc.
It was deprecated in 776567d9b2. Either use a system provided miniupnpc,
or use --without-miniupnpc.

This was SVN commit r16442.
2015-03-16 04:35:01 +00:00
historic_bruno 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
historic_bruno 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
historic_bruno 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
leper 7334f76af6 Fix some issues in af8a6f5e8c.
This was SVN commit r16437.
2015-03-15 23:56:18 +00:00
historic_bruno 1ae38b8d06 Deletes folder missed in 99cb4b42fd
This was SVN commit r16436.
2015-03-15 23:25:46 +00:00
historic_bruno 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
historic_bruno 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
mimo 2395204011 fixes some typos in previous commits
This was SVN commit r16433.
2015-03-15 20:58:33 +00:00
mimo 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
Itms 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
wraitii 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
wraitii 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
wraitii 5d6f95321d Fix actor errors revealed by 618fe81814.
This was SVN commit r16428.
2015-03-15 11:45:33 +00:00
wraitii 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
mimo 372a016311 do not let animals be preferredTarget
This was SVN commit r16426.
2015-03-15 11:30:04 +00:00
mimo 24cdf6b851 Petra: check EjectHealth level before trying to garrison
This was SVN commit r16425.
2015-03-15 10:57:04 +00:00
mimo 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
mimo cb2da36527 few tunings for Petra
This was SVN commit r16423.
2015-03-15 10:20:20 +00:00
mimo 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
mimo 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
mimo 09dc9e6f1d fix rounding problem in AI health, fixes #2446
This was SVN commit r16420.
2015-03-15 09:54:48 +00:00
mimo 47cb6c01db fix #16416
This was SVN commit r16419.
2015-03-15 09:52:15 +00:00
leper e41ec77eb6 Remove unused file.
This was SVN commit r16417.
2015-03-15 04:16:31 +00:00
leper 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
leper 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
leper 38a007f6fa Properly escape a string.
This was SVN commit r16414.
2015-03-15 04:15:57 +00:00
leper 6f3e682484 Extract strings from the structree. Fixes #3064.
This was SVN commit r16413.
2015-03-15 04:15:53 +00:00
leper 3c093ef741 Update lobby room.
This was SVN commit r16412.
2015-03-15 04:15:45 +00:00
scythetwirler 1303b4d39b Fix a couple oversights and address cavalry skirmishers.
This was SVN commit r16409.
2015-03-09 02:05:32 +00:00
historic_bruno 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
historic_bruno 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
leper 206aeaf99f Revert 37da37dbd5. Refs #3072.
This was SVN commit r16406.
2015-03-03 23:56:00 +00:00
historic_bruno 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
scythetwirler 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
leper 2b5de1df93 Do not send VisionRangeChanged messages when deserializing. Fixes #3075.
This was SVN commit r16401.
2015-03-03 01:59:42 +00:00
fabio 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
leper a5db659ce4 Update translations to be included in the release.
This was SVN commit r16399.
2015-03-02 00:10:00 +00:00
historic_bruno 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
scythetwirler e4bf24dc9a Adjusts female citizen attack.
This was SVN commit r16395.
2015-03-01 19:58:06 +00:00
historic_bruno 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
scythetwirler 8a2638a8f5 Nerfs bolt shooters, especially against buildings.
This was SVN commit r16392.
2015-02-28 20:56:19 +00:00
JoshuaJB 37da37dbd5 Cleanup post-game summary page again. Fixes #3072
This was SVN commit r16391.
2015-02-28 18:32:50 +00:00
scythetwirler ea2eb2bd57 Removes some outdated techs due to string freeze.
This was SVN commit r16390.
2015-02-28 16:55:28 +00:00
wraitii aab15123f1 I hate myself.
This was SVN commit r16389.
2015-02-28 14:11:21 +00:00
wraitii 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
fabio 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
fabio 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
leper 3a25256960 Revert d69ecad481. Refs #3072.
This was SVN commit r16385.
2015-02-25 19:10:10 +00:00
JoshuaJB d69ecad481 Cleanup post-game summary page. Fixes #3072
This was SVN commit r16384.
2015-02-25 14:51:52 +00:00
scythetwirler 72b0f5aaed Increases swordsmen damage slightly to match spear.
This was SVN commit r16383.
2015-02-25 07:33:51 +00:00
historic_bruno 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
historic_bruno 1ac24adde2 Disables some SpiderMonkey-related build warnings with clang
This was SVN commit r16379.
2015-02-22 21:15:47 +00:00
historic_bruno 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
scythetwirler fc58b52396 Building defense adjustments for health/armor values for organic units.
This was SVN commit r16377.
2015-02-22 18:55:22 +00:00
historic_bruno 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
historic_bruno 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
Ykkrosh 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
scythetwirler 4860957fa6 Adjusts skirmisher cavalry closer to that of their infantry counterpart.
This was SVN commit r16371.
2015-02-21 19:37:06 +00:00
scythetwirler b9cf610562 Makes palisade fort cheaper than defense tower.
This was SVN commit r16370.
2015-02-21 19:08:26 +00:00
mimo cdc9d98e00 do not apply multiple leavefoundation orders, fix #3010
This was SVN commit r16369.
2015-02-21 17:40:59 +00:00
scythetwirler e67379a25f Buffs rams for better durability.
This was SVN commit r16368.
2015-02-21 15:14:04 +00:00
Itms 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
leper 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
leper 0da0b062e1 Return the correct projectile id to fix serialization test failure.
This was SVN commit r16363.
2015-02-21 01:41:09 +00:00
scythetwirler 8ecfa6cf7c Nerfs skirmishers slightly.
This was SVN commit r16361.
2015-02-20 15:17:29 +00:00
Itms 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
historic_bruno 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
historic_bruno 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
scythetwirler 6b364ad240 Reverts half of 6317e320f2 due to string freeze.
This was SVN commit r16355.
2015-02-18 19:32:08 +00:00
scythetwirler 6317e320f2 Nerfs hero aura and deletes hardcoded health.
This was SVN commit r16354.
2015-02-18 19:30:22 +00:00
mimo 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
historic_bruno 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
historic_bruno 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
historic_bruno 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
mimo 4b921d89da prevent JS warning
This was SVN commit r16348.
2015-02-16 19:40:27 +00:00
mimo 5871c2c16d fix #3058, patch from Stan
This was SVN commit r16347.
2015-02-16 19:02:40 +00:00
Itms 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
scythetwirler 6f9c5efd76 Nerfs the robustness of ranged siege against melee units.
This was SVN commit r16344.
2015-02-16 15:19:41 +00:00
Itms ba210c4d59 Fix c229b46ac2.
This was SVN commit r16343.
2015-02-16 14:38:13 +00:00
scythetwirler 72ff88880c Buffs walkspeed of pikemen slightly.
This was SVN commit r16341.
2015-02-16 00:26:43 +00:00
Pureon f8bd862512 Updated a few structure icons. Some new tech icons.
This was SVN commit r16340.
2015-02-15 12:32:55 +00:00
Pureon a3374d3164 Icons for palisade wall and palisade fort
This was SVN commit r16339.
2015-02-15 11:17:18 +00:00
Yves 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
scythetwirler f18a6981bb Fixes extraneous attack. Reported by zzippy.
This was SVN commit r16336.
2015-02-14 14:55:32 +00:00
Ykkrosh 49222a4c6a Fix Windows build
This was SVN commit r16334.
2015-02-14 02:22:22 +00:00
Ykkrosh 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
Ykkrosh 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
scythetwirler bf4b8bfe9c Siege balancing.
This was SVN commit r16331.
2015-02-13 07:05:54 +00:00
Itms 682a944d7e Little code tweak without performance impact
This was SVN commit r16329.
2015-02-12 23:24:48 +00:00
Itms 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
mimo 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
leper c049b0ae27 Treat \t as whitespace in config files. Fixes #3050.
This was SVN commit r16326.
2015-02-12 17:31:10 +00:00
leper 1e54289aa8 Only check binaries/data for po/pot files.
This was SVN commit r16324.
2015-02-12 00:25:47 +00:00
scythetwirler 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
scythetwirler e407b97d0e Updates pikemen counter bonus to match that of spearmen.
This was SVN commit r16321.
2015-02-11 22:20:29 +00:00
leper 42d96cfde7 ...
This was SVN commit r16320.
2015-02-11 22:06:41 +00:00
mimo b239bcd8b9 protection against JS warning
This was SVN commit r16319.
2015-02-11 20:27:04 +00:00
mimo 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
mimo 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
Itms 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
wraitii 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
scythetwirler cf30c90732 Nerfs melee cavalry slightly and increases spearman bonus.
This was SVN commit r16313.
2015-02-10 00:37:21 +00:00
mimo a8f726df55 fix #3043 by increasing the minimum distance between civs
This was SVN commit r16312.
2015-02-09 19:21:56 +00:00
Itms 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
Ykkrosh 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. 0ef6c7555e had reduced them
from 4MB to 2MB. So just make the VBOs bigger again, and try not to
worry about the waste of memory.

Fixes #3026, #3042.

This was SVN commit r16309.
2015-02-08 23:39:02 +00:00
leper 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
mimo 5d447432ec fix previous fix
This was SVN commit r16307.
2015-02-08 23:03:47 +00:00
mimo 1f52d98856 fix game description of unknown_nomad
This was SVN commit r16306.
2015-02-08 22:58:19 +00:00
mimo 1af4a60b7c Petra: some tweaks for new ranges from balance brabnch
This was SVN commit r16305.
2015-02-08 21:32:55 +00:00
scythetwirler c58a2a3c79 Hero balancing.
This was SVN commit r16302.
2015-02-08 20:54:34 +00:00
scythetwirler 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
scythetwirler 001179da6e Lessens the range difference between units and adjusts vision accordingly.
This was SVN commit r16300.
2015-02-08 20:12:07 +00:00
JoshuaJB e1f61ea8f8 Fix tab/space issues with 6e37d6698b.
This was SVN commit r16299.
2015-02-08 18:17:56 +00:00
leper 6bdd912146 Fix double-escape in the lobby chat.
This was SVN commit r16298.
2015-02-08 17:37:33 +00:00
leper 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
leper 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
leper a11bf075b1 Some text fixes reported by translators.
This was SVN commit r16295.
2015-02-08 15:46:26 +00:00
scythetwirler 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
JoshuaJB 6e37d6698b MessageBox cleanup.
This was SVN commit r16293.
2015-02-08 05:48:33 +00:00
leper f9c95b6953 Do not send gaia stats for rated games.
This was SVN commit r16292.
2015-02-08 01:59:02 +00:00
leper 486094298e Properly escape user chat.
This was SVN commit r16291.
2015-02-08 01:24:23 +00:00
scythetwirler 37912c05ca Increases tower range and nerfs archer accuracy.
This was SVN commit r16290.
2015-02-07 22:53:36 +00:00
mimo f28c3b2392 fix the fix of 9ccd986bde
This was SVN commit r16289.
2015-02-07 22:47:09 +00:00
leper e882479e1a Add tab-completition to game setup screen. Patch by trompetin17.
This was SVN commit r16288.
2015-02-07 21:57:57 +00:00
JoshuaJB 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
scythetwirler f56102967f Balance branch merge.
This was SVN commit r16285.
2015-02-07 18:50:36 +00:00
scythetwirler 3c2a450679 Updates splashscreen. Fixes #3025.
This was SVN commit r16284.
2015-02-07 18:30:16 +00:00
scythetwirler 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
Itms 0f98bdb7ee Fix a typo.
This was SVN commit r16282.
2015-02-07 15:51:45 +00:00
Itms 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
Itms 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
mimo 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
mimo 9ccd986bde fix initialization when changing maps, refs #2803
This was SVN commit r16278.
2015-02-07 12:49:00 +00:00
mimo 08827a9d64 fix a typo
This was SVN commit r16277.
2015-02-07 12:44:51 +00:00
leper 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
Itms 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
Itms 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
leper 18a1820d9c Remove stray character.
This was SVN commit r16273.
2015-02-06 16:50:22 +00:00
leper 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
leper 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
mimo 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
leper e12f53c48d Some more gui cleanup.
This was SVN commit r16269.
2015-02-05 17:42:16 +00:00
Itms 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
Itms bf6323a71f Amend 7020d17886 and also fix observer mode. Fixes #3032.
This was SVN commit r16267.
2015-02-04 09:20:00 +00:00
mimo 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
mimo 2eff0348c5 remove unused argument
This was SVN commit r16265.
2015-02-03 18:19:14 +00:00
Itms 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
leper 0aa7e882b7 More gui cleanup.
This was SVN commit r16263.
2015-02-03 02:37:42 +00:00
leper 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
leper 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
mimo 3ee30f125c update online manual
This was SVN commit r16260.
2015-02-02 21:18:39 +00:00
mimo 0038fb2e1e Petra: small tweaks in defense
This was SVN commit r16259.
2015-02-02 20:52:45 +00:00
JoshuaJB e75498a655 Fix d71161fe4c on WxWidgets 2.8
This was SVN commit r16258.
2015-02-02 20:20:37 +00:00
leper 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
Itms 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
Itms 3225e564fe Fix 1564a10120, plus code cleanup
This was SVN commit r16254.
2015-02-01 19:04:21 +00:00
mimo e1e5979d73 Petra: garrison siege units when useful
This was SVN commit r16252.
2015-01-30 18:41:33 +00:00
mimo ad4e995bd4 clean 499d41ad80
This was SVN commit r16251.
2015-01-30 18:15:03 +00:00
Itms 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
Itms f52e3ea052 Fix uninitialized variable, fix by trompetin17, fixes #3027.
This was SVN commit r16249.
2015-01-30 17:37:40 +00:00
Itms 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
mimo 7d282f6bb1 Petra: improve late game when resources rely mainly on trade
This was SVN commit r16246.
2015-01-29 21:49:38 +00:00
mimo 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
Itms df2e077870 Trailing spaces cleanup, based on patch by trompetin17, refs #1767.
This was SVN commit r16244.
2015-01-29 16:10:03 +00:00
Itms 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
historic_bruno 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
Ykkrosh 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
Itms 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
mimo 965a6f3838 update online manual, refs #3018
This was SVN commit r16239.
2015-01-27 18:24:33 +00:00
leper 8af1c907fa Reset victory conditions on map change. Refs #3001.
This was SVN commit r16238.
2015-01-27 17:46:57 +00:00
fabio 0a34e6106d Improve readability printing a single error message.
This was SVN commit r16237.
2015-01-27 09:14:30 +00:00
mimo b38a6e9383 add hotkey for deleting saved games, addresses #3018
This was SVN commit r16236.
2015-01-26 21:05:31 +00:00
Yves 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
historic_bruno 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
leper 2eabb799b9 Clear the victory conditions properly. Refs #3001.
This was SVN commit r16232.
2015-01-25 20:52:10 +00:00
Ykkrosh 4473ed5c88 glext_funcs: Support glMapBuffer, glMapBufferRange
This was SVN commit r16231.
2015-01-25 16:36:23 +00:00
Ykkrosh 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
mimo 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
leper 123bab6793 Replace use of safe bool by explicit bool operator.
This was SVN commit r16228.
2015-01-25 03:11:24 +00:00
leper 4c1903500b Switch to std::shared_ptr and std::weak_ptr.
This was SVN commit r16227.
2015-01-25 03:10:58 +00:00
leper 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
leper 0261d12727 Remove some checks for usupported VS versions (<2013).
This was SVN commit r16225.
2015-01-24 20:37:16 +00:00
leper fc902df07c Remove checks for unsupported GCC versions (<4.6).
This was SVN commit r16224.
2015-01-24 20:37:07 +00:00
Ykkrosh 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
Gallaecio 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
Ykkrosh ac8124b332 Avoid /delayload warnings in Windows build.
This was SVN commit r16220.
2015-01-24 18:54:47 +00:00
Ykkrosh 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
Ykkrosh 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
Ykkrosh 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
Yves 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
Yves 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
Ykkrosh 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
mimo 236f67d45f Petra: fix defensive garrison by using GarrisonArrowClasses + several small fixes
This was SVN commit r16212.
2015-01-24 13:28:17 +00:00
mimo f1f36232d8 fix limit changer when stating limit = 0
This was SVN commit r16211.
2015-01-24 12:03:31 +00:00
Ykkrosh 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
Ykkrosh 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
Ykkrosh 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
Ykkrosh 2e01b157d6 Fix build error in GLES configurations
This was SVN commit r16207.
2015-01-23 20:54:14 +00:00
Ykkrosh 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
Ykkrosh 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
Ykkrosh 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
Ykkrosh 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
Ykkrosh 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
mimo a2efd97476 fix js error
This was SVN commit r16201.
2015-01-23 17:34:46 +00:00
historic_bruno adcd9191a6 Updates Windows installer config for 65cc47f6c0
This was SVN commit r16200.
2015-01-23 03:38:02 +00:00
historic_bruno 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
historic_bruno 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
Ykkrosh f3f2717c66 Fix tests on 32-bit builds.
This was SVN commit r16193.
2015-01-22 21:13:09 +00:00
Ykkrosh 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
Ykkrosh 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
Ykkrosh 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
Ykkrosh 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
Ykkrosh 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
Ykkrosh 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
Ykkrosh 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
Ykkrosh 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
Ykkrosh e9a33b71ae Manually fix the less trivial CLogger format strings.
This was SVN commit r16184.
2015-01-22 20:32:06 +00:00
Ykkrosh 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
Ykkrosh 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
Ykkrosh ca7b890e16 cppformat: Add basic tests for the functionality we use.
This was SVN commit r16181.
2015-01-22 20:28:57 +00:00
Ykkrosh 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
Ykkrosh 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
Ykkrosh 8875ae9cdf cppformat: Fix compatibility with our build system on Windows.
This was SVN commit r16178.
2015-01-22 20:26:58 +00:00
Ykkrosh f16407f6e9 cppformat: Fix -Wundef build warnings from GCC.
This was SVN commit r16177.
2015-01-22 20:26:32 +00:00
Ykkrosh f96593a9f3 Import cppformat v0.11.0
Refs #3011.

This was SVN commit r16176.
2015-01-22 20:25:10 +00:00
Itms 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
Itms 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
leper 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
Itms b5b9c0f2ae Improve template code style for the Decay component.
This was SVN commit r16171.
2015-01-21 21:45:05 +00:00
Itms 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
leper 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
leper aeb18239c3 Update tinygettext to upstream commit ca0f3ff640. Refs #2522.
Keeps our addition of precompiled.h (fd3d335265), win32/dirent,
4c9d99ff68, de6823d23f, and 8fc14655b5.

This was SVN commit r16168.
2015-01-21 20:37:37 +00:00
mimo 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
Itms 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
Ykkrosh 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
Ykkrosh 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
Ykkrosh b74e853144 Fix typo which caused GLES errors
This was SVN commit r16163.
2015-01-19 20:04:46 +00:00
mimo 4554ed676e continue to display research overlay after victory, fixes #2983
This was SVN commit r16161.
2015-01-18 16:55:52 +00:00
Yves 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
mimo 10f90fd8cf Petra: fix missing line in 0a5089c841
This was SVN commit r16159.
2015-01-18 10:28:30 +00:00
Yves 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
historic_bruno 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
historic_bruno 8976fb7646 Fixes MSVC warning C4100 unreferenced formal parameter
This was SVN commit r16156.
2015-01-18 06:26:00 +00:00
historic_bruno 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
mimo 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
Yves 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
mimo 993d9c72d3 Petra: various small tweaks
This was SVN commit r16152.
2015-01-17 12:53:33 +00:00
Itms 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
leper 755ec45a14 Use correct format specifiers. Patch by bog_dan_ro.
This was SVN commit r16148.
2015-01-13 18:37:50 +00:00
mimo 702fb7344e allow maps to handle garrisoned units, fixes #2984
This was SVN commit r16147.
2015-01-13 17:59:55 +00:00
fabio 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
mimo 528ed2d15e prevent error when switching perspective to gaia
This was SVN commit r16145.
2015-01-12 22:03:03 +00:00
mimo e916c7e91f add display of trading goods when multiple selection
This was SVN commit r16144.
2015-01-12 21:39:31 +00:00
mimo 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
mimo 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
historic_bruno 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
leper 8fc14655b5 Improve 524a942b52. Refs #2637.
This was SVN commit r16140.
2015-01-11 19:14:03 +00:00
Yves 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
Gallaecio 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
mimo 873399b294 fix a typo, addresses #2998
This was SVN commit r16136.
2015-01-10 19:41:02 +00:00
mimo 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
leper 77dba7a8bb Remove some duplication in the gui tooltip code.
This was SVN commit r16134.
2015-01-09 17:08:12 +00:00
Itms 539b4d8372 Remove an old, useless and possibly broken call.
This was SVN commit r16133.
2015-01-09 16:59:01 +00:00
Yves 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
Itms 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
mimo 006faaeaeb Petra: tunings for 9b79b5b844
This was SVN commit r16128.
2015-01-08 22:01:38 +00:00
leper 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
Itms 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
leper 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
leper e8fb23e940 Fix tests broken in bd31f83587.
This was SVN commit r16124.
2015-01-08 19:20:34 +00:00
mimo bdb1145f63 remove some debug printout forgotten in 9b79b5b844
This was SVN commit r16123.
2015-01-07 21:55:21 +00:00
mimo 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
mimo bb6003ea0c rename civ specific player template following 4243433f94 convention
This was SVN commit r16121.
2015-01-07 21:18:59 +00:00
leper 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
leper 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
mimo 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
leper 01fb25fdab Fix variable name.
This was SVN commit r16117.
2015-01-07 19:52:33 +00:00
leper a8c85035f8 Ignore gaia in PlayerData when loading maps.
This was SVN commit r16116.
2015-01-06 00:16:06 +00:00
Ykkrosh b36c78b4c4 Fix build warning
This was SVN commit r16115.
2015-01-05 20:05:53 +00:00
LordGood d8b1549883 Seleucid farmstead
This was SVN commit r16114.
2015-01-04 12:46:57 +00:00
leper 045fea23aa Properly adjust Atlas for the init changes.
This was SVN commit r16112.
2015-01-03 17:42:42 +00:00
leper 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
leper dadfcb06d2 Specify icons for base phase techs.
This was SVN commit r16110.
2015-01-03 15:15:55 +00:00
Pureon d13821fa7d Village phase icon
This was SVN commit r16109.
2015-01-03 12:01:21 +00:00
LordGood 0195cdb374 Seleucid storehouse
This was SVN commit r16108.
2015-01-03 04:03:22 +00:00
mimo abb62b0662 fix a typo in petra, thanks to brian
This was SVN commit r16106.
2015-01-02 19:35:35 +00:00
LordGood 21f525c966 Seleucid temple now has fully articulated stairs!
This was SVN commit r16105.
2015-01-02 14:43:07 +00:00
Itms f0d7346b8f Happy New Year! :D
This was SVN commit r16103.
2015-01-02 14:22:23 +00:00
LordGood 5bad08d66b Seleucid civ center placeholder
This was SVN commit r16102.
2015-01-02 13:21:40 +00:00
leper 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
leper 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
leper 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
Yves 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
mimo 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
LordGood 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
mimo e8d1acfa41 preserve random civ in saved game settings, refs #2963
This was SVN commit r16095.
2014-12-31 15:34:48 +00:00
mimo 802320e753 some petra cleanings
This was SVN commit r16094.
2014-12-31 09:59:47 +00:00
mimo 9329506e0d add support for civ specific player template, see #2877
This was SVN commit r16092.
2014-12-31 09:31:41 +00:00
LordGood f984ba40ee Seleucid house commit
This was SVN commit r16091.
2014-12-31 07:27:07 +00:00
leper 913674a202 Remove useless call.
This was SVN commit r16090.
2014-12-31 00:21:41 +00:00
leper 2c20936ce3 Save map settings. Patch by @aBothe. Fixes #2963.
This was SVN commit r16089.
2014-12-31 00:21:24 +00:00
leper 8f387e0044 Remove code duplication and some cleanup.
This was SVN commit r16088.
2014-12-30 18:21:02 +00:00
leper 992169c3ab Fix indentation in daaddaf433.
This was SVN commit r16087.
2014-12-30 17:27:18 +00:00
mimo 555601fe51 Petra: avoid creating unused entitycollections
This was SVN commit r16085.
2014-12-29 23:56:37 +00:00
Itms 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
leper 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
LordGood 53023b7efc This was SVN commit r16082. 2014-12-29 19:26:37 +00:00
leper 9a17a96054 Fix warning when following units. Fixes #2971.
This was SVN commit r16081.
2014-12-29 18:56:00 +00:00
leper 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
leper 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
LordGood 8608b0fe89 Seleucid Tower and textures
This was SVN commit r16078.
2014-12-29 12:29:41 +00:00
leper d68a057153 Fix warning.
This was SVN commit r16077.
2014-12-28 16:45:06 +00:00
Itms 0406f62ea0 Fix a typo, reported by t4nk004 on IRC.
This was SVN commit r16076.
2014-12-28 16:35:32 +00:00
Itms 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
mimo 92af594986 Petra: rewrite a stupidly inefficient function spotted by the traceLogger
This was SVN commit r16073.
2014-12-27 18:44:34 +00:00
mimo 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
Itms 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
Itms 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
Itms 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
fabio ec9e0dfeed Add missing file in 286112e0aa.
Refs: #2937.

This was SVN commit r16065.
2014-12-25 14:22:15 +00:00
scythetwirler 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
fabio 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
mimo 9684bcd360 add AI support of maps of different dimensions, see #2960
This was SVN commit r16062.
2014-12-23 14:17:52 +00:00
leper 49187dd990 Drop support for AIs that are not using modules.
This was SVN commit r16061.
2014-12-23 01:20:50 +00:00
leper d21cf8f3aa Clarify some comments.
This was SVN commit r16060.
2014-12-23 00:46:00 +00:00
leper 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
leper 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
mimo 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
leper 96c45eac61 Fix missing escapes.
This was SVN commit r16056.
2014-12-21 02:23:17 +00:00
Yves 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
mimo 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
mimo 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
leper a13cc54fc3 Use correct variable. Fix #2957.
This was SVN commit r16052.
2014-12-16 21:05:24 +00:00
mimo a143c847e2 small fixes for petra
This was SVN commit r16051.
2014-12-14 21:35:24 +00:00
Yves a9c6b7080a Fixes intermittent error messages caused by uninitialized variable
This was SVN commit r16049.
2014-12-14 17:43:40 +00:00
mimo 9b6981465a improve a bit the fix of 639a174388
This was SVN commit r16048.
2014-12-13 21:30:13 +00:00
mimo 639a174388 petra: fix choice of target when enemy resigned + some cleanings
This was SVN commit r16047.
2014-12-13 16:47:37 +00:00
leper 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
mimo 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
mimo 34855896d0 fix typo in 30fb8d0f57
This was SVN commit r16041.
2014-12-12 07:36:34 +00:00
leper 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
leper 92ee34d76f Properly localize tribute messages.
This was SVN commit r16038.
2014-12-12 01:11:04 +00:00
leper 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
Yves 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
mimo e435ef2704 several optimisations on the ai, refs #2370
This was SVN commit r16035.
2014-12-11 20:24:33 +00:00
leper 622614de02 Allow nesting repeat tags in the GUI.
This was SVN commit r16034.
2014-12-10 20:10:02 +00:00
Itms 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.

This was SVN commit r16033.
2014-12-09 23:20:31 +00:00
mimo 21ecb22432 remove some now empty functions following previous patch
This was SVN commit r16032.
2014-12-09 20:30:27 +00:00
Gallaecio 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
mimo ae7c2f9586 ai: entitycollections switch to maps, see #2370
This was SVN commit r16030.
2014-12-09 19:55:37 +00:00
mimo 36187ea64a petra: allow replacing civ center in game
This was SVN commit r16029.
2014-12-08 18:23:27 +00:00
mimo 6a785f791a additional fix for inefficient EC, thanks to Yves for noticing
This was SVN commit r16028.
2014-12-07 22:19:59 +00:00
mimo 3e09cf4797 improve petra performances, see #2370
This was SVN commit r16027.
2014-12-07 16:36:56 +00:00
mimo 37ae9f4ad2 fix previous tag
This was SVN commit r16026.
2014-12-06 16:13:13 +00:00
mimo 0facb07ca6 petra: changes in farms and tributes management
This was SVN commit r16025.
2014-12-06 14:48:06 +00:00
Itms f80adad667 Fixes some inconsistent line endings and EOL-related SVN properties.
This was SVN commit r16024.
2014-12-06 12:11:42 +00:00
Itms 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
mimo 0df90c5c2b ai common api : use maps for entitycollection lists + cleanings
This was SVN commit r16019.
2014-12-03 20:22:13 +00:00
leper 7e0e566346 Fix typo in include. Refs #2086.
This was SVN commit r16018.
2014-12-03 16:43:51 +00:00
mimo 4931652263 Non-fighting ships should not be agressive by default
This was SVN commit r16017.
2014-12-01 20:58:46 +00:00
mimo 5403c19cf0 petra: internal functions are now serialized
This was SVN commit r16016.
2014-11-30 19:05:39 +00:00
mimo 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
wraitii 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
leper 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
mimo c0092aaca5 petra: some cleanings + (small) timing optimizations
This was SVN commit r16012.
2014-11-29 18:53:17 +00:00
mimo 049312e5a2 various small tunings for petra
This was SVN commit r16011.
2014-11-26 22:01:40 +00:00
sanderd17 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
leper 1430efa9d6 Properly handle auto-research promotion techs at game start.
This was SVN commit r16009.
2014-11-25 22:47:02 +00:00
mimo 7102f86de3 petra: avoid updating some no-more-used entitycollections
This was SVN commit r16008.
2014-11-25 19:00:17 +00:00
Itms 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
Itms 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
Itms 04343a8407 Fix a comment written too quickly
This was SVN commit r16005.
2014-11-23 21:47:15 +00:00
mimo 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
leper 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
leper 87d5d37488 Some source string fixes.
This was SVN commit r16002.
2014-11-22 22:21:54 +00:00
Yves c385a88c88 Remove unused overload of GetSavedGameData
This was SVN commit r16001.
2014-11-22 19:46:24 +00:00
mimo d1cdf8f952 display victory conditions when selecting a map, fixes #2727
This was SVN commit r16000.
2014-11-21 18:30:17 +00:00
mimo 0cc9cfd40c fix a JS error in petra
This was SVN commit r15999.
2014-11-21 17:46:07 +00:00
leper 2734982657 Escape a character.
This was SVN commit r15998.
2014-11-20 22:19:35 +00:00
leper 504e23acb8 Make some things static.
This was SVN commit r15997.
2014-11-20 22:19:33 +00:00
leper 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
Itms 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
leper 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
mimo f90841cf78 add a very-easy level for AI, addresses #2899
This was SVN commit r15990.
2014-11-18 21:21:21 +00:00
mimo 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
leper 3589aa39b9 Update documentation on how to generate the entity component documentation.
This was SVN commit r15987.
2014-11-18 03:57:21 +00:00
leper 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
leper 73de625089 Also change GameSetup.cpp.
This was SVN commit r15985.
2014-11-18 00:24:29 +00:00
leper 9407dbe45e Remove useless parameter from CFG_GET_VALUE.
This was SVN commit r15984.
2014-11-17 23:29:49 +00:00
mimo 3e4c701ab6 ensure that there are no dupes in buildable list
This was SVN commit r15983.
2014-11-17 23:07:57 +00:00
leper 6695f1a3e8 Remove CParser. Fixes #2589.
This was SVN commit r15981.
2014-11-17 01:04:24 +00:00
leper 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
alpha123 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
alpha123 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
alpha123 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
leper caed74df23 Fix line endings.
This was SVN commit r15976.
2014-11-16 22:21:06 +00:00
leper 1b91421e5e Escape special character.
This was SVN commit r15975.
2014-11-16 22:06:18 +00:00
alpha123 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
mimo 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
leper 94e6e29a34 Properly escape a character and remove a stray tag.
This was SVN commit r15972.
2014-11-16 18:00:02 +00:00
mimo ccb5366e40 fixes #2935
This was SVN commit r15971.
2014-11-16 10:09:20 +00:00
leper 59676dfc84 Update tools/LICENSE.txt
This was SVN commit r15970.
2014-11-16 02:10:31 +00:00
leper 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
leper 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
leper d58189d510 Parse terrain properties without CParser. Refs #2589.
This was SVN commit r15967.
2014-11-16 02:09:02 +00:00
Itms fc1fe174cd Amend the "Reveal All" behavior by always hiding mirages.
This was SVN commit r15966.
2014-11-14 20:29:35 +00:00
Yves 4d89820f1c Fixes build errors on Windows introduced in c813a11427 and 1a0f9b086e.
This was SVN commit r15964.
2014-11-13 22:37:43 +00:00
Itms 8a290b3204 Fix mirages not flushed properly, introduced in 9ad2fc9fac.
This was SVN commit r15963.
2014-11-13 21:04:40 +00:00
mimo 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
Yves 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
leper 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
leper 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
Itms e1c77bb487 Fix tests.
This was SVN commit r15958.
2014-11-12 19:51:28 +00:00
mimo 6556aa8c1e fix petra serialization
This was SVN commit r15957.
2014-11-12 18:44:43 +00:00
Itms 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
mimo 7130997df9 still more fixes on ai serialization + some cleanings
This was SVN commit r15954.
2014-11-11 22:08:28 +00:00
mimo b596f7a893 additional fixes for petra serialization
This was SVN commit r15953.
2014-11-11 19:02:35 +00:00
mimo 13a71f6ae4 some fixes and cleaning in petra saved game support
This was SVN commit r15952.
2014-11-11 11:07:57 +00:00
mimo 6bab40c139 some bugfixes on ai serialization
This was SVN commit r15951.
2014-11-10 20:22:10 +00:00
mimo 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
mimo c236e8a877 further steps towards saved games support, but still wip
This was SVN commit r15948.
2014-11-10 09:03:03 +00:00
leper e108b162b6 Add hotloading for translation files. Fixes #2915.
This was SVN commit r15947.
2014-11-09 16:58:14 +00:00
Yves 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
Enrique e1f354024a Persian temple upgrade
This was SVN commit r15945.
2014-11-09 11:30:50 +00:00
Yves 8e2d514228 Exact stack rooting for CParamNode
Refs #2415
Refs #2462

This was SVN commit r15944.
2014-11-09 11:08:53 +00:00
Enrique 9040f8a3d3 Persian stables upgrade
This was SVN commit r15941.
2014-11-08 23:51:33 +00:00
mimo edd9622050 wip petra support of saved games, still incomplete
This was SVN commit r15940.
2014-11-08 19:23:29 +00:00
Itms b5c8646cea Fix actors not retained in FoW after d07d1a17f3.
Refs #2913.

This was SVN commit r15939.
2014-11-08 18:14:45 +00:00
Enrique db2f570ef6 Added several missing files of previous commit
This was SVN commit r15938.
2014-11-08 13:21:10 +00:00
Enrique 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
leper 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
Enrique 2db1f14015 Cart_fortress recentered.
This was SVN commit r15935.
2014-11-07 11:27:59 +00:00
Enrique 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
leper 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
leper 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
Enrique cbc151cb1e Persian barracks upgrade.
This was SVN commit r15931.
2014-11-07 00:29:31 +00:00
Enrique 8200182399 Persian fortress variation upgrade. Second variation upgrade soon.
This was SVN commit r15930.
2014-11-06 11:29:14 +00:00
mimo 6ae21e1ce7 some ai cleaning
This was SVN commit r15929.
2014-11-05 21:03:25 +00:00
leper 7dad37c78f Some cleanup. Fix a comment.
This was SVN commit r15928.
2014-11-05 00:22:14 +00:00
leper 518d2d0c2a Translation fixes.
This was SVN commit r15927.
2014-11-05 00:22:11 +00:00
Itms 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
Enrique 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
Enrique 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
mimo 6e30381acd petra: push priority of first market and remove some unnecessary ===
This was SVN commit r15922.
2014-11-02 20:45:57 +00:00
mimo f9d7335e12 simplify the way petra deals with worker
This was SVN commit r15921.
2014-11-02 20:27:13 +00:00
Enrique 7cdbd7a6fd Fixed ao map for the roman short wall segment
This was SVN commit r15920.
2014-11-02 17:00:29 +00:00
Enrique 221d93da91 Upgraded persian buildings:
blacksmith, dock, farmstead, defense tower, wonder

This was SVN commit r15919.
2014-11-01 11:36:01 +00:00
mimo 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
mimo 772024a10c fix a JS error
This was SVN commit r15917.
2014-10-30 20:16:59 +00:00
Itms 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
Enrique 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
historic_bruno 199eb46d86 Fixes GLES build
This was SVN commit r15914.
2014-10-29 02:36:42 +00:00
leper 10d13a991c Use fitplural added in upstream revision 1404284. Refs #2539.
This was SVN commit r15913.
2014-10-28 16:03:19 +00:00
historic_bruno 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
mimo 2b841f56ae petra: cleaning of the code for dock placement
This was SVN commit r15911.
2014-10-27 19:53:06 +00:00
historic_bruno 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
leper 570b0374f4 Convert path separator after building the full path.
This was SVN commit r15908.
2014-10-27 03:09:36 +00:00
historic_bruno 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
historic_bruno 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
historic_bruno 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
leper 4a68170aeb Add msgstrs for plural forms to pots.
This was SVN commit r15904.
2014-10-26 17:25:12 +00:00
mimo 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
historic_bruno 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
historic_bruno 21b83734f9 Fixes shader type error with some compilers
This was SVN commit r15900.
2014-10-26 01:44:58 +00:00
leper 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
leper 23cabedec8 Translate map size of lobby games on the client.
This was SVN commit r15895.
2014-10-26 00:28:38 +00:00
leper 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
leper cf3e42f6fb Make map description end with a full stop.
This was SVN commit r15893.
2014-10-26 00:28:26 +00:00
leper c524542477 Make map description end with a full stop.
This was SVN commit r15892.
2014-10-21 20:03:06 +00:00
mimo b2f9dc305c check that selected units still exist when rebuilding the selection
This was SVN commit r15891.
2014-10-21 16:26:27 +00:00
historic_bruno 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
mimo 2a7c3a95f9 improve gui performance, refs #2179 comment 28
This was SVN commit r15889.
2014-10-18 16:37:53 +00:00
scythetwirler 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
historic_bruno 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
historic_bruno 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
historic_bruno 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
Itms 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.

This was SVN commit r15883.
2014-10-17 17:50:53 +00:00
mimo 620399270d various small petra tunings
This was SVN commit r15880.
2014-10-17 17:15:06 +00:00
Itms 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
historic_bruno 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
mimo ba5685eff3 cleaning of the Petra configuration
This was SVN commit r15877.
2014-10-15 20:52:23 +00:00
Enrique 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
Enrique a63328d859 Upgraded persian struct texture missing in previous commit.
This was SVN commit r15875.
2014-10-15 16:20:59 +00:00
leper 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
leper 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
Enrique 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
historic_bruno 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
historic_bruno 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
Itms 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
Itms 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
mimo 8ce7c818f5 internationalization of ai chat messages
This was SVN commit r15866.
2014-10-14 19:43:19 +00:00
mimo 1f8cd485d4 fix translation of ai chat messages (allowing for parameters)
This was SVN commit r15865.
2014-10-14 18:58:41 +00:00
leper bb02dcd0e9 Fix broken tests.
This was SVN commit r15864.
2014-10-14 01:25:32 +00:00
mimo 7090334756 fix previous commit
This was SVN commit r15863.
2014-10-13 19:55:12 +00:00
mimo 20a9c9ab62 prevent the AI from using disabled templates
This was SVN commit r15862.
2014-10-13 19:52:03 +00:00
leper 4ecfa25c5e Sync minimal-flags with what Gentoo uses.
This was SVN commit r15861.
2014-10-12 23:40:05 +00:00
leper 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
mimo 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
mimo 443158869c let the AIs know when a tribute is sent
This was SVN commit r15858.
2014-10-12 22:00:19 +00:00
Itms 6ec902ec20 Fix a typo in the packaging scripts.
This was SVN commit r15857.
2014-10-12 20:53:13 +00:00
mimo 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
mimo 5d9029a1d9 stop trying to build when not enough resources, fixes #2835
This was SVN commit r15855.
2014-10-12 20:09:03 +00:00
mimo 7fd407ca1f update correctly the tradeRoute set on market foundations
This was SVN commit r15854.
2014-10-12 19:56:24 +00:00
mimo 3df4799dea enable test on tech for AI
This was SVN commit r15853.
2014-10-12 19:55:15 +00:00
leper 849cbc13ee Fix path in fontbuilder.
This was SVN commit r15852.
2014-10-12 19:27:55 +00:00
leper 46fd718ac1 Initialize some variables. Patch by Echelon9. Fixes #2862.
This was SVN commit r15851.
2014-10-12 19:27:49 +00:00
leper 3c8ef99007 Switch lobby room. Update mod version.
This was SVN commit r15850.
2014-10-12 19:27:42 +00:00
historic_bruno 9c92f45c61 Fixes typo in OS X bundle build script.
Changes SDL2 version in build-osx-libs.sh to Hg snapshot SDL-2.0.4-9134,
refs #2852

This was SVN commit r15849.
2014-10-06 23:45:34 +00:00
historic_bruno 0b0184af1d Removes SDL1 from OS X libraries build script
This was SVN commit r15848.
2014-10-06 01:05:46 +00:00
Itms a028027f75 Fix previous commit.
This was SVN commit r15847.
2014-10-05 22:46:24 +00:00
Itms 41ea9539a2 Update the translations selection script to match our choices for A17.
This was SVN commit r15846.
2014-10-05 22:05:22 +00:00
Itms 5d9d9a67bf Allow enabling the post processing filters during a game.
Includes numerous code updates, also updated the copyright for
cd5de73f3a.

Patch by dan@sstrev.com, fixes #2672.

This was SVN commit r15843.
2014-10-05 20:50:10 +00:00
Itms cd5de73f3a Allow setting the "Smoothing LoS" option during a game.
Patch by dan@sstrev.com, fixes #2513

This was SVN commit r15841.
2014-10-05 20:02:04 +00:00
mimo 2af4272c07 allow war dogs to garrison in ships
This was SVN commit r15840.
2014-10-05 19:25:27 +00:00
mimo 807fd8c236 fix bonus caption display, thanks to Polakrity
This was SVN commit r15839.
2014-10-05 13:57:59 +00:00
leper 642011e6c0 Fixes tests broken in e91215d5c9.
This was SVN commit r15838.
2014-10-04 15:37:33 +00:00
scythetwirler 90c0957cef Fixes cavalry upgrade inconsistencies.
This was SVN commit r15837.
2014-10-04 14:13:14 +00:00
mimo e91215d5c9 improve gui performance, refs #2179 comment 21
This was SVN commit r15836.
2014-10-04 11:40:53 +00:00
scythetwirler 8a3435915b Slightly buffs swordsmen and fixes a couple inconsistencies.
This was SVN commit r15835.
2014-10-04 05:31:29 +00:00
scythetwirler 54bc1c7173 Fixes #2831. Patch by prodigalson.
This was SVN commit r15834.
2014-10-04 05:17:36 +00:00
historic_bruno 69c8b89f84 Fixes blank window after maximizing, minimizing, then restoring the game on Windows. In SDL2, this is an SDL_WINDOWEVENT_EXPOSED event, which we must handle to reset the game's minimized state. Refs #2041
This was SVN commit r15832.
2014-10-04 00:46:53 +00:00
Yves 5a985e18f4 Modify GC scheduling and reduce VFS cache size.
It seems like there is a memory leak if we haven't finished with the
marking phase of an incremental GC and SpiderMonkey has to trigger a
full GC because it runs out of memory. With this patch we stop trying to
make incremental GCs if we are above 1/2 of the runtime size and do Full
GCs instead. This should make such low memory conditions even less
likely than they were already after the previous patch. Also reduce the
maximum VFS cache size to 400 MB.
Refs #2808

This was SVN commit r15831.
2014-10-04 00:43:04 +00:00
historic_bruno 9c4eb0295a Fixes some bugs related to IME text input in SDL2, including a possible crash, refs #2041. Behavior seems reasonably consistent now on Windows and OS X
This was SVN commit r15830.
2014-10-03 23:33:41 +00:00
mimo 5c97a681d4 fix typo in Petra, thanks niektb for noticing
This was SVN commit r15829.
2014-10-02 19:01:26 +00:00
historic_bruno a86231240d Fixes some bugs in OS X bundle build script.
Logs most build output to file using simple redirects for now.
Hides output of pushd/popd commands

This was SVN commit r15828.
2014-09-29 04:33:51 +00:00
historic_bruno f10bdf5089 Fixes some issues when toggling fullscreen mode with SDL2, refs #2041:
* SDL_WINDOW_RESIZABLE must be set when creating the window, apparently
only fullscreen flags take effect in SDL_SetWindowFullscreen
* Stores window position, so a window can be restored to both its
original position and size, rather than defaults
* Changes initial window position from undefined to centered, it caused
some problems with window positioning returning from fullscreen mode

This was SVN commit r15827.
2014-09-28 22:10:09 +00:00
leper 2afeec0c01 Unify removal of incomplete translations in packaging scripts. Fixes #2825.
This was SVN commit r15826.
2014-09-28 21:51:48 +00:00
historic_bruno 436eb18397 Updates precompiled win32 gloox lib to 1.0.11 and rebuilt glooxwrapper with VC++ 2010. Note: gloox 1.0.3 and later changed the license from GPL v2 to v3.
Updates LICENSE.txt accordingly.

This was SVN commit r15825.
2014-09-28 21:44:48 +00:00
historic_bruno db71b74d7d Clarifies some license versions in LICENSE.txt and makes formatting more consistent
This was SVN commit r15824.
2014-09-28 21:37:03 +00:00
historic_bruno 001f32e080 Removes lib path for cxxtest from extern_libs4.lua, to avoid clang linker warning
This was SVN commit r15823.
2014-09-28 21:18:44 +00:00
Itms a18107aa7c Fix placing of some entities in various maps, refs #2560.
This was SVN commit r15822.
2014-09-28 16:53:19 +00:00
historic_bruno 5200ea0365 Fixes starting Atlas from in-game on OS X, patch by trompetin17, refs #2427
This was SVN commit r15821.
2014-09-28 07:03:51 +00:00
historic_bruno 9148e5609f Updates library LICENSE.txt for new cxxtest version and addition of SDL2
This was SVN commit r15820.
2014-09-28 01:58:37 +00:00
leper 857698e231 Fix memory leak when loading mods from config.
This was SVN commit r15818.
2014-09-28 00:13:55 +00:00
scythetwirler e07305fd9f Buffs melee cavalry attack by 20% and overall cavalry speed by 2.0.
This was SVN commit r15817.
2014-09-27 22:01:50 +00:00
historic_bruno 0caab0429f Fixes Reset Water Data button position in Atlas, fixes #2820
This was SVN commit r15815.
2014-09-27 02:42:42 +00:00
historic_bruno ea2db5386b Fixes water rendering and crashes on GPUs without FBO support, fixes #2667
This was SVN commit r15814.
2014-09-27 01:32:03 +00:00
scythetwirler 2f8ed7980d Makes the bot more lenient on case sensitivity due to inconsistencies in case between Windows and Unix.
This was SVN commit r15813.
2014-09-27 01:06:28 +00:00
mimo b524f59657 check ResourceGatherer interface before trying to gather, fixes #2801
This was SVN commit r15812.
2014-09-26 21:23:32 +00:00
mimo 119aad9da9 fix a debug message
This was SVN commit r15811.
2014-09-26 17:07:17 +00:00
leper 20956c94b0 Update some strings.
This was SVN commit r15809.
2014-09-26 14:26:21 +00:00
historic_bruno 8f039bfb44 Fixes translation inclusion regex for build-osx-bundle.sh, fixes #2764
This was SVN commit r15808.
2014-09-26 01:06:21 +00:00
leper 7ca08e2485 Fix type errors in cmpAttack by switching parameter and object.
This was SVN commit r15805.
2014-09-25 16:33:38 +00:00
Itms eda8f3cc18 Tweak some strings, addressing concerns pointed out by translators on Transifex.
This was SVN commit r15804.
2014-09-25 15:36:18 +00:00
leper fe30c0e6a1 Switch to ErrorPrinter on Windows. Refs #2488.
This was SVN commit r15803.
2014-09-25 15:17:30 +00:00
Itms d7d1607021 Fix GUI errors when a client joins a multiplayer game setup room.
Based on a patch by cwprogger, fixes #2779

This was SVN commit r15802.
2014-09-25 15:05:10 +00:00
historic_bruno b155d4f7e3 Updates OS X bundle build script. Adds --release flag which can be used to build a proper release bundle, including SVN export, at the expense of time and disk space. Moves SVN-specific logic to this mode, otherwise the script works with git or no source control at all.
Removes obsolete instructions for building a 32-bit 10.5 bundle.

This was SVN commit r15801.
2014-09-25 02:18:19 +00:00
historic_bruno d1a31b3f54 Fixes regex for excluding translations from release packages, refs #2494
This was SVN commit r15800.
2014-09-25 02:07:46 +00:00
historic_bruno 5ad07045e2 Sets OS X build to use SDL2 by default, refs #2041
This was SVN commit r15799.
2014-09-25 01:54:58 +00:00
scythetwirler a815ca0de9 Nerfs sele hero aura, transitions a tech, and fix spaces.
This was SVN commit r15798.
2014-09-25 00:53:48 +00:00
leper d67ffa039c Handle an error of no suitable tiles being found gracefully in Schwarzwald RMS. Fixes #2787.
This was SVN commit r15797.
2014-09-24 20:48:19 +00:00
leper 533fb6f7bc Load the public mod by default. Fixes #2754.
This was SVN commit r15796.
2014-09-24 17:49:22 +00:00
leper 4753a0c1c2 Replace usage of "GUIs" in cxxtest with the command line,
and extend that to support -libdir <dir> and -disabled. Fixes #2488.

This was SVN commit r15795.
2014-09-24 15:35:31 +00:00
leper 29effb5089 Build fixes and improvements for BSDs. Fixes #2804.
This was SVN commit r15793.
2014-09-24 14:11:13 +00:00
leper d6709d3e08 Ignore mods (in the modmod) that do not specify required properties. Fixes #2822. Refs #2794.
Fixes description display if filters are used.

This was SVN commit r15792.
2014-09-24 01:36:57 +00:00
leper 091b958344 Fix an issue with filters and translations in the modmod.
This was SVN commit r15791.
2014-09-24 00:26:13 +00:00
historic_bruno b5a0e2ec5c Updates OS X DMG background image, by He who must not be named
This was SVN commit r15790.
2014-09-23 02:48:23 +00:00
historic_bruno 1a2c9835c9 Adds patch for wxWidgets build on OS X, fixes Atlas crash on VMs with software rendering.
Cleans up wxWidgets config flags

This was SVN commit r15788.
2014-09-23 00:33:14 +00:00
Yves 3b49576fa6 Tunes GC scheduling a bit to reduce memory usage.
The main problem was that GC was only called from the simulation before
this patch. This means when you were waiting in the multiplayer lobby or
just had the GUI open, it only called GC when getting close to the JS
runtime size limit (I assume). Another problem was the Net Server
runtime which didn't GC either. Here the runtime size limit is 16 MB
though, so it's not too terrible. These issues have both been addressed
and GC has been given a bit more time per incremental slice to make sure
it gets done in time. It's still far from perfect, but there are too
many changes in SpiderMonkey related to GC, so I don't want to spend too
much time on this yet.

Refs #2808

This was SVN commit r15787.
2014-09-22 20:13:04 +00:00
historic_bruno 3f75e5db0e Adds --sdl2 flag to update-workspaces.bat, making SDL2 the default on Windows, refs #2041
This was SVN commit r15786.
2014-09-22 19:42:55 +00:00
historic_bruno 5593f573f4 Cleans up handling of SDL2 text input events, no behavior change expected.
Implements SDL2 text editing handler for input fields, this is for IME
support, so users entering CJK text can see what they're composing
before committing it. Should have no effect on SDL1 or normal text
input.

This was SVN commit r15785.
2014-09-22 19:00:20 +00:00
mimo 03dd6908ec Petra: decreases size of attacking armies in easy level
This was SVN commit r15784.
2014-09-22 18:53:54 +00:00
historic_bruno 9592c59704 Fixes crash in Atlas color picker tool, noticeable with wxWidgets 3.0. Colors returned by wxColourData::GetCustomColour aren't always valid, so we have to test them with IsOk() before accessing them. Fixes #2805
This was SVN commit r15782.
2014-09-21 21:25:51 +00:00
Yves a89d0190bd Use ES6 Maps in the AI API for applying tech and aura modification to entity templates.
This should improve performance a bit (check the ticket for details).

Refs #2475

This was SVN commit r15781.
2014-09-21 21:02:15 +00:00
Itms b1ca37eead Extend visibility update to all tiles around LoS vertices. Incidentally prevent an issue from arising on square maps. Also improve a code comment.
This should be enough to fix #2760.

This was SVN commit r15779.
2014-09-21 20:29:54 +00:00
mimo bce96c99bb small fixes/improvments to the AI
This was SVN commit r15776.
2014-09-21 12:02:33 +00:00
Itms 357fa957c8 Add a translation comment for "Join Game" buttons in the main menu and the lobby, to clarify the translation context.
Fixes #2548

This was SVN commit r15775.
2014-09-21 08:35:21 +00:00
historic_bruno 8f61e36352 Adds SDL2 to build-osx-libs.sh, but leave SDL1 as the default while we test, refs #2041.
Note: SDL2_CONFIG is now the variable to override the path to
sdl2-config, SDL_CONFIG remains to override the path to sdl-config

This was SVN commit r15774.
2014-09-20 19:02:24 +00:00
Yves a8d8c6d101 Reverts the use of Set in f5336c42b8.
Sets don't support multiple elements with the same key which is required
here to fire timers multiple times per turn.
Refs #2475

This was SVN commit r15773.
2014-09-20 18:48:12 +00:00
Yves f5336c42b8 Adds Serialization support for ES6 Maps.
Also includes the patch from Sanderd17 to use Maps and Sets for the
Timer components. Sets can't be serialized yet, but in this case they
don't require serialization.
Refs #2475

This was SVN commit r15770.
2014-09-20 17:14:53 +00:00
scythetwirler 6b2677a3fd Adds profiles to the multiplayer lobby. Fixes #2504.
This was SVN commit r15768.
2014-09-20 15:35:26 +00:00
historic_bruno d62e3729d5 Improves SDL2 support, includes patch by yashi and fabio, refs #2041:
* Adds SDL color cursor implementation
* Adds config option for choosing preferred display in multimonitor
setup
* Uses text input API to better handle CJK input
* Fixes various hotkey and input bugs

SDL 1.2 is still the default and recommended, to test experimental SDL2
support, pass the --sdl2 flag to update-workspaces

This was SVN commit r15767.
2014-09-20 12:12:35 +00:00
Itms 801d13aa8b Address some possible causes of bad handling of visibility updates. Also includes a little code tweaking allowing the global update of all visibility data.
Refs #2760

This was SVN commit r15765.
2014-09-20 08:26:45 +00:00
scythetwirler 55b12857b3 Buffs ranged units slightly as massing melee units was slightly overpowered.
This was SVN commit r15764.
2014-09-19 03:39:24 +00:00
scythetwirler 6999295b7e Fixes #2768.
This was SVN commit r15763.
2014-09-19 03:14:46 +00:00
historic_bruno aa5fded9ae This was SVN commit r15762. 2014-09-17 23:22:20 +00:00
historic_bruno c56407a1f8 Fixes autostart init of player data, patch by mimo, fixes #2798.
Cleans up some of the autostart logic, removes and renames a few options
for clarity.
Updates readme.txt to reflect these changes and include some examples

This was SVN commit r15761.
2014-09-17 01:15:03 +00:00
Itms b5f32e720f Rename the Briton hero Cynvelin to Cunobelin, which is a more common appellation, and is coherent with the historical data of the game. Also fix some typos by this mean.
Fixes #2639

This was SVN commit r15759.
2014-09-16 09:13:26 +00:00
historic_bruno 809189d953 Fixes "quit" command and GUI notification for AI debugging, fixes #2755
This was SVN commit r15758.
2014-09-16 02:50:49 +00:00
mimo b2a479cc74 reset some map attribute, addresses #2803
This was SVN commit r15757.
2014-09-15 21:59:51 +00:00
mimo 3f1db1ef01 remove aegis bot
This was SVN commit r15756.
2014-09-15 20:19:00 +00:00
leper 66a2fe6308 Unload hotkeys on shutdown.
Fixes double registration of hotkeys on engine restart.

This was SVN commit r15755.
2014-09-15 01:27:06 +00:00
scythetwirler 28c0b00b2e Sorts games in gamesList by status, then name. Refs #2463, #2448.
This was SVN commit r15754.
2014-09-14 22:11:03 +00:00
scythetwirler 7b80c86645 Updates a comment forgotten in 113f72a503. Refs #2463, #2448.
This was SVN commit r15753.
2014-09-14 21:23:49 +00:00
historic_bruno 16a99e5ad3 Fixes some untranslated text in the multiplayer lobby (map name, type, and description), refs #2547
This was SVN commit r15752.
2014-09-14 21:10:49 +00:00
scythetwirler 113f72a503 Makes running games visible in the lobby. These will be colored in red. Refs #2463, #2448.
This was SVN commit r15751.
2014-09-14 20:59:35 +00:00
mimo 67c3a80c42 reset the trigger script when changing map, fix #2793
This was SVN commit r15750.
2014-09-14 16:52:33 +00:00
mimo 4f7a935f44 fix a rare case where a Petra attack would not know its target is already destroyed
This was SVN commit r15749.
2014-09-14 13:43:11 +00:00
historic_bruno 0f0f4f7b03 Fixes crash on OS X if dir_watch_Poll is called during init before dir_watch_Add, refs #2427, #2650
This was SVN commit r15748.
2014-09-14 00:27:38 +00:00
Itms 0605232aaf Updated the welcome screen to inform players about the temporary removal of formations.
This was SVN commit r15747.
2014-09-13 20:34:27 +00:00
historic_bruno 60d92b643d Fixes some unused variables in Atlas
This was SVN commit r15746.
2014-09-13 19:34:04 +00:00
historic_bruno 01395ce96d Fixes clang warning about hidden overloaded virtual function
This was SVN commit r15745.
2014-09-13 19:06:55 +00:00
mimo fe381158fb fix ptol_trader camel sounds, patch by thamlett
This was SVN commit r15744.
2014-09-13 17:54:40 +00:00
mimo 2acfbb04a5 fix a stupid typo, fixes #2797
This was SVN commit r15743.
2014-09-13 17:25:33 +00:00
historic_bruno 70d81040cb Fixes Atlas copy/paste not copying actor seeds, patch by trompetin17, fixes #2791
This was SVN commit r15742.
2014-09-13 16:53:43 +00:00
Itms ab4a1952f5 Small tweak for the options page, requesting game restart when enabling postproc effects.
This was SVN commit r15740.
2014-09-13 10:13:48 +00:00
mimo b0c14154ee prevent a warning message of undefined variable
This was SVN commit r15739.
2014-09-13 09:57:12 +00:00
scythetwirler 8c5470daf1 Fixes #2795. Refs #2792
This was SVN commit r15738.
2014-09-13 00:39:56 +00:00
leper acd86047dc Only split strings if they are non-empty. Fixes previous commit.
This was SVN commit r15737.
2014-09-12 23:11:03 +00:00
mimo dd6b6779af trained animals in corral should not respond to alert, adresses #2792
This was SVN commit r15736.
2014-09-12 22:01:21 +00:00
leper 134e3c84b0 Clean up some code.
Fixes linker error on OSX.

This was SVN commit r15735.
2014-09-12 21:45:30 +00:00
Itms a8189f89e5 Stop music when resetting the simulation test mode in Atlas.
Patch by trompetin17, fixes #1712

This was SVN commit r15734.
2014-09-12 21:38:10 +00:00
leper 83dda90662 Remove last traces of removed persian background images. Patch by dan@sstrev.com. Fixes #2777.
This was SVN commit r15733.
2014-09-12 21:14:07 +00:00
leper d0abd6628b Add messages.json file to the modmod. Fixes #2790.
This was SVN commit r15732.
2014-09-12 20:08:38 +00:00
mimo 87e0d9e6c1 Petra: some tunings in tech research following the merge of balance branch
This was SVN commit r15728.
2014-09-10 17:56:19 +00:00
mimo 9ba74f5b5f fix heal_barracks tech
This was SVN commit r15727.
2014-09-10 17:51:51 +00:00
historic_bruno e4d7586cdd Sets default compiler for OS X build to clang, using hack that should be replaced if we upgrade premake.
Fixes linking error in ICU build from build-osx-libs.sh (it was setting
the C++ compiler to clang, which is the C compiler, so it wouldn't
automatically link to the c++ lib). Now build-osx-libs.sh and the game
should use clang and whichever c++ lib is the default

This was SVN commit r15725.
2014-09-09 23:56:39 +00:00
Itms 7ada7dd2a8 Some tweaks to profiler2:
* separate the HTTP profiling server from the on-screen profiler
* allow shutting down the HTTP profiler
* print messages when enabling/disabling HTTP and GPU profilers

Patch by kingbasil, fixes #1862

This was SVN commit r15723.
2014-09-09 18:17:08 +00:00
mimo bdd8bc1f44 update the in-game hotkeys page following 2f1d143dc2
This was SVN commit r15722.
2014-09-09 17:22:13 +00:00
historic_bruno fee304d789 Fixes crash from 41b98a6f12 where a VBChunk* was released but not set to NULL
This was SVN commit r15721.
2014-09-09 04:13:50 +00:00
mimo 7b3476e104 fix #2783
This was SVN commit r15720.
2014-09-08 20:37:04 +00:00
historic_bruno 9c683af1e4 Fixes undefined property reference in Atlas after generating random map.
Fixes crash after failed random map generation in Atlas

This was SVN commit r15719.
2014-09-08 03:48:24 +00:00
historic_bruno 881ad4090b Fixes weird unconventional use of logical not operator that also triggered a warning in clang
This was SVN commit r15717.
2014-09-08 00:19:35 +00:00
historic_bruno 3d1cd08a4c Suppresses noisy clang/libc++ warnings from SpiderMonkey headers on OS X
This was SVN commit r15716.
2014-09-07 23:58:22 +00:00
historic_bruno 41b98a6f12 Fixes incorrect reuse of a member variable in WaterManager, caused a crash when starting a new map in Atlas after loading a water map. Fixes #2784.
Fixes likely mem leaks from not cleaning up vertex buffer allocations

This was SVN commit r15715.
2014-09-07 23:49:24 +00:00
historic_bruno e027981f95 Fixes missing functions_utility_list.js in initial mod selector screen
This was SVN commit r15714.
2014-09-07 23:29:33 +00:00
scythetwirler 13b229d503 Gameplay rebalance after a long period of testing and rebalancing. See https://github.com/scythetwirler/0ad for details on changes.
This was SVN commit r15713.
2014-09-07 21:47:26 +00:00
mimo 7ce9097d1c small cleaning of d0472b021b
This was SVN commit r15710.
2014-09-07 10:28:18 +00:00
Itms 640f898377 Move some animals outside of deep water in the skirmish map "Watering Holes (4)".
Fixes #2013

This was SVN commit r15709.
2014-09-07 09:27:36 +00:00
OmriLahav 5b51ca862f 2014 remake (A17)
This was SVN commit r15708.
2014-09-06 23:21:06 +00:00
Itms be98e31de2 Improve the description of the British hero Kunobelinos in the History panel.
New text by Haommin, fixes #2639.

This was SVN commit r15706.
2014-09-06 20:09:07 +00:00
Itms d0472b021b Supersede the "Reveal all" flag when displaying mirages, to avoid seeing other players' mirages. This is especially problematic when switching perspective to an AI player.
Fixes #2712, thanks mimo for the report and for having looked into the
related code.

This was SVN commit r15705.
2014-09-06 19:59:49 +00:00
Itms 76a5be4c4c Fix previous commit.
This was SVN commit r15704.
2014-09-06 15:31:36 +00:00
Itms 2b1efa5035 Revert an unoptimized GUI update from f7e591c9f2. Instead, notify directly the GUI in case of miraged entities, and treat them the same way we treat renamed entities.
Fixes #2778

This was SVN commit r15703.
2014-09-06 13:34:54 +00:00
Enrique 001e6f6ca3 Fixed iberian fortress garrison flag and smooth groups. Patch by stanislas69. Removed kennel mud mesh. Fixes #2765
This was SVN commit r15702.
2014-09-05 15:59:36 +00:00
Enrique 72ee7a12de fixed kennel crash. Patch by stanislas69. Fixes #2766
This was SVN commit r15701.
2014-09-05 15:37:44 +00:00
Pureon bafb300bf8 Updated Persian Civic structure. Fixes #2630
This was SVN commit r15700.
2014-09-03 21:27:55 +00:00
Itms c56089a082 Reference a missing script file in the mod selector.
Reported and patched by Radagast, fixes #2762

This was SVN commit r15699.
2014-09-03 16:58:08 +00:00
historic_bruno 69bd930219 Excludes debug DLLs from Windows installer, fixes #855
This was SVN commit r15697.
2014-09-01 01:44:10 +00:00
historic_bruno 8034a677e5 Fixes build-osx-libs.sh to rebuild SpiderMonkey when its README.txt changes, fixes #2551
This was SVN commit r15696.
2014-08-31 04:19:13 +00:00
mimo 032d031729 Petra: revisit the attacks + several bugfixes + add some more debug printouts
This was SVN commit r15695.
2014-08-30 20:06:48 +00:00
mimo 611d20016a fixes error with GetPosition2D called while out of world
This was SVN commit r15694.
2014-08-30 17:03:04 +00:00
Itms 5bfe2a4b65 Don't call miraging codes while iterating through the range manager's entities map.
I already had made that mistake when working on the fogging system so I
documented it in the code.

Fixes #2756

This was SVN commit r15692.
2014-08-29 09:01:08 +00:00
mimo c069a6555c prevent js error
This was SVN commit r15691.
2014-08-28 08:59:45 +00:00
mimo 52e9551957 Petra: prevent infinite loop in mods where units are their own promotion
This was SVN commit r15690.
2014-08-28 08:01:25 +00:00
Itms c0621ee28f Stop updating some data after the end of a game.
This prevents game music from being played again, just after
defeat/victory.

Fixes #2714, #2744

This was SVN commit r15689.
2014-08-27 18:37:20 +00:00
Itms 30b5fb6c41 Pass map settings also to Scenario games, including in particular trigger scripts for victory conditions.
Fixes #2715

This was SVN commit r15688.
2014-08-27 15:25:16 +00:00
Yves 179162069e Updated cxxtestgen.exe for cxxtest4.4 (created as described in #2450).
This was SVN commit r15686.
2014-08-27 12:39:04 +00:00
Itms 6942edb788 Fix a misplaced block of code from ea78d97989 that caused Atlas to show errors at startup.
This was SVN commit r15685.
2014-08-27 12:30:29 +00:00
mimo a994053a6a Petra: fix for some units which stay idle when their base is destroyed
This was SVN commit r15684.
2014-08-27 12:21:13 +00:00
mimo b2d07d5e5a complete 2f1d143dc2 for moveAttack in rallyPoint + some cleaning
This was SVN commit r15682.
2014-08-26 19:35:43 +00:00
Itms ea78d97989 Explore the map inside a player's territory border at the beginning of a game.
Also handle properly the "Explore Map" option with the new fogging
system.

Fixes #2709

This was SVN commit r15681.
2014-08-26 10:01:04 +00:00
mimo 4cd7dd77c1 add missing files from dd189ffe1f
This was SVN commit r15680.
2014-08-26 09:53:29 +00:00
mimo dd189ffe1f fix #15678 when preferglsl=true
This was SVN commit r15679.
2014-08-26 09:41:14 +00:00
leper be2f0e69fc Make the modmod standalone.
Mount public in case we are starting Atlas and no mods are specified in
the config.
If users remove all mods and save this to the config and try to start
Atlas it will
crash, as it cannot find some needed files.

This was SVN commit r15678.
2014-08-25 16:38:54 +00:00
leper 64bfa089af Add mod selection mod.
Includes some contributions by rada and sanderd17.

This was SVN commit r15677.
2014-08-25 16:02:54 +00:00
leper 523d220ac5 Add engine support to load mods from config and restart into mods.
Restructure mod mounting code a bit to make it reusable, and use it for
replays. Fixes #2703.

This was SVN commit r15676.
2014-08-25 16:02:40 +00:00
mimo 09e6d5ae02 fix 2f1d143dc2, which fixes #2747
This was SVN commit r15674.
2014-08-24 19:56:50 +00:00
leper c5c394fd17 Fix some disabled tests.
This was SVN commit r15673.
2014-08-24 15:29:53 +00:00
leper 2b7e9728b6 Fix failure in TestNetComms::test_basic_DISABLED. Patch by Echelon9. Fixes #2426.
This was SVN commit r15672.
2014-08-24 12:02:52 +00:00
mimo 2f1d143dc2 give possibility to choose type of targets in moveAttack, fixes #2740
This was SVN commit r15671.
2014-08-24 11:51:03 +00:00
mimo ac9d4f1036 various small fixes and cleanings to Petra
This was SVN commit r15670.
2014-08-24 11:35:08 +00:00
leper 0e01f20d29 Upgrades cxxtest.
Replaces cxxtest-4.3 with cxxtest-4.4 (without .gitignore or .cvsignore
files) (see [[SVN:14817]]).
Applies the same changes as done in c8bdd993c0 to the new version.

This was SVN commit r15667.
2014-08-24 08:19:24 +00:00
leper da2050793d Fix some greek unit names. Patch by pstumpf2. Fixes #2746.
This was SVN commit r15666.
2014-08-24 07:04:39 +00:00
leper 057bef91f2 Fix undefined property warning. Fixes #2742.
This was SVN commit r15665.
2014-08-23 17:23:15 +00:00
mimo efe21b85da Garrison orders canceled in the ai were not properly canceled in the simulation. Fixes #2741 and #2743.
This was SVN commit r15664.
2014-08-23 13:40:56 +00:00
Spahbod 811e38a833 Fixes for survival of the fittest map.
This was SVN commit r15663.
2014-08-22 05:33:12 +00:00
mimo e4194af0c2 fixes some non-working techs (was in reverted 40365ee815)
This was SVN commit r15661.
2014-08-21 09:09:08 +00:00
mimo 5616221c99 improve comment, see #2737
This was SVN commit r15660.
2014-08-21 09:00:42 +00:00
mimo 6fe9af70cf remove debug output from previous commit
This was SVN commit r15659.
2014-08-19 09:41:38 +00:00
mimo 14b7472c15 petra: prevent JS errors when expected buildings do not exist (for mods)
This was SVN commit r15658.
2014-08-19 09:34:34 +00:00
LordGood 36d205035e New Iberian tower models
This was SVN commit r15657.
2014-08-18 19:30:56 +00:00
sanderd17 edcc4d3ec5 Change the vision range together with the attack range for some techs. Refs #2736. Patch by serveurix
This was SVN commit r15656.
2014-08-18 19:20:46 +00:00
wraitii d9fcebd433 Revert Surprise commits by Mythos_Ruler, 4f7549b4f8 and 40365ee815 following team decision. They will be put in a separate git branch. This is done to avoid conflict with scythetwirler's balance branch and potential other work in that area.
This was SVN commit r15655.
2014-08-18 10:35:30 +00:00
mimo f939f7953d petra: first step towards use of heroes
This was SVN commit r15654.
2014-08-18 09:44:32 +00:00
Enrique 6c8fd6b3dd Fix the rotary mill animation
This was SVN commit r15653.
2014-08-17 17:34:43 +00:00
LordGood d112902b99 fixing ngon glitch on iberian wonder
This was SVN commit r15651.
2014-08-17 13:53:01 +00:00
LordGood cb1612ad8a Iberian wonder
This was SVN commit r15650.
2014-08-17 13:19:27 +00:00
Mythos_Ruler 4f7549b4f8 fix'd attack elements in these templates
This was SVN commit r15647.
2014-08-16 02:32:58 +00:00
leper 12771edb0e Delete dynamic message subscriptions on simulation reset.
This was SVN commit r15646.
2014-08-16 01:23:50 +00:00
leper 422b9d79dc Fixes the cataphract helmet. Textures by stanislas69.
This was SVN commit r15645.
2014-08-15 23:54:09 +00:00
Mythos_Ruler 40365ee815 Surprise.
100% brand new rebalance for every unit in the game, after lengthy
discussion with Enrique.

Some updated portraits.

A couple new tips.

Stan's "cataphract" mask and helmet (the helmet needs a texture).

This was SVN commit r15644.
2014-08-15 23:10:44 +00:00
leper aa6de51793 Fix FPS, real time, and game time overlay hotkeys. Fixes 704d0f9511.
This was SVN commit r15643.
2014-08-15 22:03:12 +00:00
mimo 1a33003538 AI should not use EntityRenamed messages coming from mirages, addresses #2724
This was SVN commit r15642.
2014-08-15 16:18:57 +00:00
Enrique d5cacb027f Snow wolf. Texture edited by stanislas69
This was SVN commit r15641.
2014-08-15 12:14:45 +00:00
Enrique fef9b87381 Ptolemy I hero for ptolemaics by stanislas69
This was SVN commit r15640.
2014-08-15 12:04:52 +00:00
Enrique 302b67049c Gaul farmstead reshape (smaller) by stanislas69
This was SVN commit r15639.
2014-08-15 11:49:23 +00:00
Enrique 8c1a7d5d4c Ptolemaic blacksmith update by stanislas69
This was SVN commit r15638.
2014-08-15 11:35:07 +00:00
LordGood 4f44416bb0 New Iberian houses
This was SVN commit r15637.
2014-08-14 21:01:04 +00:00
Spahbod a4be909094 Temporary fixing the victory bug in survival of the fittest map. Refs #2721.
This was SVN commit r15636.
2014-08-14 09:50:51 +00:00
JoshuaJB b67a6f230b Fix typo from 704d0f9511.
This was SVN commit r15635.
2014-08-13 19:02:59 +00:00
JoshuaJB 704d0f9511 Add config settings for FPS, realtime, and gametime overlays.
This was SVN commit r15634.
2014-08-13 18:56:07 +00:00
LordGood c13547c9a0 Stan's rotary mill
This was SVN commit r15633.
2014-08-13 17:55:14 +00:00
wraitii a4df483f60 Forgot to make a variable unused.
This was SVN commit r15631.
2014-08-13 14:52:38 +00:00
JoshuaJB ada7691bce Add current time counter which can be triggered using Alt+T. Fixes #2718. Patch by thamlett.
This was SVN commit r15630.
2014-08-13 02:35:29 +00:00
mimo abef0673bd fixes some typos
This was SVN commit r15629.
2014-08-12 20:45:06 +00:00
wraitii 0b385384aa Fix terrain overlay rendering after water.
This was SVN commit r15628.
2014-08-12 15:58:03 +00:00
LordGood f7cab71243 Iberian barracks replacement
This was SVN commit r15627.
2014-08-12 03:42:59 +00:00
Yves 8593825eee Modifies 23c708f72a to use the NONCOPYABLE macro as suggested by leper.
This was SVN commit r15626.
2014-08-09 21:16:25 +00:00
Yves 23c708f72a Prevent copying of ScriptInterface objects.
Copying a ScriptInterface is not allowed. The destructor destroys the
JSContext and if there's a copy around that still uses it, that causes
crashes which can be quite hard to debug. This change prevents copying
by of ScriptInterface objects by making the copy constructor private,
which will reveal such errors at compile time.

This was SVN commit r15625.
2014-08-09 20:20:32 +00:00
Yves 83aa817f71 Exact stack rooting for simulation message type conversions.
Also replaces some deprecated API (jsval typedef and OBJECT_TO_JSVAL) in
that part of the code.

Refs #2415

This was SVN commit r15624.
2014-08-09 20:02:49 +00:00
Yves 8ce8e6ba9a Exact stack rooting for IGUIObject.
Refs #2415
Refs #2462

This was SVN commit r15623.
2014-08-08 13:41:47 +00:00
Yves 9872f5741f Exact stack rooting for ScriptInterface::FreezeObject.
Refs #2415

This was SVN commit r15622.
2014-08-08 11:59:49 +00:00
Spahbod 7471662ddc A small change that increases the performance of most random map generation noticeably.
This was SVN commit r15621.
2014-08-07 09:27:22 +00:00
wraitii 403b3b68af Fix some errors in WaterManager.
This was SVN commit r15620.
2014-08-06 15:24:38 +00:00
leper e578d215ea Fix free() of not allocated struct in the UPnP code. Patch by Echelon9. Fixes #2338, #2418.
This was SVN commit r15619.
2014-08-06 14:11:04 +00:00
leper 5ae040ea54 Fix non-PCH build.
This was SVN commit r15618.
2014-08-06 13:23:02 +00:00
wraitii e865dc797d Revert RedFox's changes to Spatial subdivisions in the simplest possible way (hopefully won't cause OOS, but at least we'll get reports). Fixes #2573, Refs #2430 . There probably are opportunities to remove more things.
This was SVN commit r15617.
2014-08-06 09:21:00 +00:00
Itms c0e7208130 Fixes 016d4599e1 by registering the new DisabledTemplatesChanged message.
Also fixes a typo.

This was SVN commit r15616.
2014-08-05 21:21:06 +00:00
Yves c662a4e9e9 Fixes #2713
This was SVN commit r15615.
2014-08-05 19:03:10 +00:00
Spahbod 016d4599e1 Added the ability to disable training/building of entities by triggers. Changes survival of the fittest random map to work with this. Refs #52
This was SVN commit r15614.
2014-08-05 12:49:12 +00:00
Itms f7e591c9f2 Hide changes to buildings in the fog-of-war.
To achieve this, mirage entities are created per player, to replace the
real entities when these ones fall into the fog-of-war. These mirage
entities are created on-the-fly, and destroyed when they get back in
sight.
This depends heavily on the VisibilityChanged message added in
2174eaaeee.

As a temporary adjustment, territories do not explore the map anymore
when their borders change. See #2709.

Fixes #599

This was SVN commit r15612.
2014-08-04 22:49:19 +00:00
Yves e41f010f91 Fixes crash when loading maps in Atlas.
The ScriptInterface pointer can be NULL there, so using it without
checking is not safe.
This fixes the problem by continuing with the exact stack rooting
changes, which makes the temporary solution unnecessary.

Fixes #2707
Refs #2415

This was SVN commit r15611.
2014-08-04 20:14:17 +00:00
JoshuaJB 30fa275f9d Fixed some keys not being recognized after a719696658. Refs #195.
This was SVN commit r15610.
2014-08-04 16:48:54 +00:00
JoshuaJB a719696658 Support more mouse buttons. Fixes #195. Patch by 01d55 with some minor cleanup.
This was SVN commit r15609.
2014-08-04 01:06:36 +00:00
JoshuaJB be9d69fd24 Link actor editor built in debug mode to debug version of atlasUI. Fixes #2655. Patch by Echelon9.
This was SVN commit r15608.
2014-08-03 22:46:20 +00:00
Yves efb889b79a Exact stack rooting for WriteStructuredClone and functions that use it.
Refs #2415

This was SVN commit r15607.
2014-08-03 19:32:39 +00:00
Yves f4d62152e7 Exact stack rooting for GetClass and GetPrivate.
Refs #2415

This was SVN commit r15606.
2014-08-03 17:53:21 +00:00
Yves 169174824f Exact stack rooting for ScriptInterface::ToString.
I had to change a few other functions to take JS::MutableHandleValue
because JS::Stringify takes a JS::MutableHandleValue as input parameter.
That seems a bit strange because it should not change that value.
I assume it has historical reasons.

Refs #2415
Refs #2462

This was SVN commit r15605.
2014-08-03 17:29:49 +00:00
wraitii 1561f55b27 Batch-change RM map water type and waviness settings. Again, this errs on the "not enough" side.
This was SVN commit r15604.
2014-08-03 11:01:41 +00:00
Yves a2bd44b23a Exact stack rooting for JSON related ScriptInterface functions.
Refs #2415
Refs #2462

This was SVN commit r15603.
2014-08-02 22:21:50 +00:00
wraitii 15fa9e2c2e (semi-auto) update scenarios and skirmishes water settings (type and waviness). Probably errs on the "not enough" side.
This was SVN commit r15602.
2014-08-02 17:08:42 +00:00
Yves c818b8e475 Exact rooting for CallConstructor.
Refs #2415
Refs #2462

This was SVN commit r15601.
2014-08-02 16:30:15 +00:00
Yves 736d934107 Removes an unused codepath for AI deserialization and related ScriptInterface code.
It might actually be needed again in the future, but I think even then
it would be easier to rewrite it than having to update the code in the
meantime.

Refs #2462

This was SVN commit r15600.
2014-08-02 13:22:02 +00:00
wraitii 4028cd425e Actually fix bugs on ATI cards. Switch reflection and refractions to use POT textures in an attempt to improve compatibility.
This was SVN commit r15598.
2014-08-02 12:54:45 +00:00
Yves 608c27fe10 Exact stack rooting for structured cloning functions.
Refs #2415
Refs #2462

This was SVN commit r15597.
2014-08-01 20:55:16 +00:00
mimo 7dbbb4e419 some cleaning of petra code
This was SVN commit r15596.
2014-08-01 14:32:31 +00:00
wraitii 2b0af756f6 Temporary reversion for a graphic problems with some ATI cards when disabling water reflections.
This was SVN commit r15595.
2014-08-01 13:26:45 +00:00
wraitii e50147fd96 Metaprogramming 9ce51f4357.
Change something on water shaders to see if it works better on ATI
cards.

This was SVN commit r15594.
2014-08-01 10:15:29 +00:00
mimo ec6b098dd4 Petra: some adjustements on naval transport
This was SVN commit r15593.
2014-07-31 21:35:28 +00:00
Yves 5c07a25ddc More exact stack rooting (CallFunction object).
Changes CallFunction and CallFunctionVoid to use a HandleValue as object
parameter. Also changes some JS serialization/deserialization functions
to only support the JSAPI rooted types (drop support for CScriptVal and
CScriptValRooted there). Some other functions got changed too because
they were closely related.

Refs #2415
Refs #2462

This was SVN commit r15592.
2014-07-31 19:18:40 +00:00
Yves d677a30c39 Adds support for passing JS::HandleValue and JS::RootedValue& to CallFunction.
Also adds tests for these cases.

Refs #2415

This was SVN commit r15591.
2014-07-31 16:34:15 +00:00
Itms af8b76e227 Avoids dividing by zero when generating Gulf of Bothnia random map with one player. Patch by FeXoR, fixes #2699.
This was SVN commit r15590.
2014-07-31 16:03:35 +00:00
Yves 2ae74221c7 Fixes saving/loading problems introduced in 28bdd8540f.
* CGameLoader created a new JS::Value when assigning to m_Metadata.
This means it didn't actually update metadata in SavedGames::Load. The
new approach solves this problem and should work well if
CScriptValRooted gets replaced in the future.
 * The cloning in ScriptFunctions.cpp was required. Removing it caused
compartment mismatches.
 * Now CGameLoader loads the metadata unconditinally because we didn't
actually use the option to not load load it.

Ref #2415

This was SVN commit r15589.
2014-07-31 14:44:51 +00:00
wraitii cf563657b6 Add some information about gathered resources to the multiple selection panel's tooltips. Refs #2695
This was SVN commit r15588.
2014-07-31 12:46:33 +00:00
mimo cf121baa1d Petra: small changes in naval transport to (hopefully) make it more robust
This was SVN commit r15587.
2014-07-30 21:36:48 +00:00
Itms f85272e3de Small code style fix, related to a typo in the documentation. Also updates the Example component's copyright to match the current year.
This was SVN commit r15586.
2014-07-30 17:34:40 +00:00
mimo 15e536dbb6 remove the hardcoded StartingCamera of player 3 which was pointing to player 1 location
This was SVN commit r15585.
2014-07-30 16:56:45 +00:00
Itms cd3b35ed52 Handle callback functions when using the "leave" hotkey (by default Esc) to close a message box.
Fixes #2635

This was SVN commit r15584.
2014-07-30 09:27:46 +00:00
mimo 707b255e2b Petra: prevent overseas attack to try to start before dock construction
This was SVN commit r15583.
2014-07-29 20:55:16 +00:00
mimo 58a19e8e30 Petra: prevent stuck units when a transport ship is destroyed
This was SVN commit r15582.
2014-07-29 17:32:59 +00:00
sanderd17 c2579c3c22 let allies build and repair stuff
This was SVN commit r15581.
2014-07-29 15:57:42 +00:00
wraitii 00b072ea14 Fix a UnitAI issue where a builder would become idle if, upon completion of a foundation, it was close enough to immediately start working on another foundation. This was particularly infuriating with palisades.
This was SVN commit r15580.
2014-07-29 11:34:58 +00:00
mimo a57747472c Petra: proper fix for the juggernaut limit reported by brian
This was SVN commit r15579.
2014-07-28 20:15:06 +00:00
mimo 3ed6681aa4 fix #2691, Petra should not try to unload allied garrisoned inside its buildings
This was SVN commit r15578.
2014-07-28 18:13:49 +00:00
wraitii 9ce51f4357 Commit coastal waves when activating fancy effects, and incidentally completely change how this effect work. Refs #48.
This was SVN commit r15576.
2014-07-28 10:14:00 +00:00
mimo 91ead32b1a petra: temporary fix, waiting to be able to deal with training restrictions
This was SVN commit r15575.
2014-07-27 21:48:02 +00:00
mimo afa769f873 fixes #2690 in Petra AI
This was SVN commit r15574.
2014-07-27 20:45:40 +00:00
Yves 2be86ef79e Fix crash when starting Atlas (introduced in 28bdd8540f).
This was SVN commit r15573.
2014-07-27 18:38:31 +00:00
Yves 07653c9a70 Fixes crash when generating random maps.
We must not be in a request when calling the ScriptInterface destructor.

This was SVN commit r15572.
2014-07-27 18:17:16 +00:00
Yves cef9e7d4f0 Fixes crash in replay mode introduced in 28bdd8540f.
This was SVN commit r15571.
2014-07-27 17:28:36 +00:00
mimo fe8e19ebfe Bunch of petra bug fixes: fixes #2685, #2686 and makes 074cf06803 really working
This was SVN commit r15570.
2014-07-27 15:25:26 +00:00
Yves 64efbfeae3 Fixes small memory leak introduced in 28bdd8540f.
Thanks to leper for pointing it out.

This was SVN commit r15569.
2014-07-26 23:09:24 +00:00
Yves 28bdd8540f Quite a lot of stack rooting related changes.
Changes GetProperty, SetProperty and HasProperty and a few other
functions to take handles. The conversions to CScriptVal or
CScriptValRooted at some places should be removed in the future. I've
done that to avoid an even larger patch.

Refs #2415
Refs #2462

This was SVN commit r15568.
2014-07-26 22:33:16 +00:00
Yves e818b08344 Better support for SpiderMonkey rooted types in the ScriptInterface.
* Adds additional overloads/specializations which are required when
passing JS::Handle<T>/JS::MutableHandle<T> types to different functions.
* Replaces GetPropertyJS with a GetProperty specialization.
* Allows us to avoid the implementation of ToJSVal specializations for
JS::Value and JS::HandleValue. Such conversions should only happen if
there's no way around it and if you are aware of it.
* Adds test to make sure that all potentially required specializations
with custom implementations are instantiated. This should help prevent
introducing bugs in temporarily unused code.

Refs #2415

This was SVN commit r15567.
2014-07-26 20:31:29 +00:00
sanderd17 30f7837c44 Should be workaround for issue #2684
This was SVN commit r15566.
2014-07-26 17:12:45 +00:00
sanderd17 9cd75067bc Workaround for issue #2486
This was SVN commit r15565.
2014-07-26 17:09:49 +00:00
Itms ea708e14bf Some changes on the VisibilityUpdate message system, aimed at correcting recent OOS problems.
I still experience troubles with serialization tests but I played a few
games without OOS. At least these changes will help us to debug more
efficiently the remaining problems.

Fixes initialization of visibility data and update order for LoS-related
systems (territory borders, etc).
Also removes a C-like array and fixes a player ID shifting.

Refs #599

This was SVN commit r15563.
2014-07-26 16:02:18 +00:00
Yves e3888448c4 Removes rooting test.
Rooting works different now and the CScriptVal types are going to be
removed. We will need rooting tests again, but they will have to work
completely different than this test implementation.

Refs #2415

This was SVN commit r15562.
2014-07-26 14:07:56 +00:00
Yves f41d4fa48e Fixes compartment mismatch introduced in a5ebd8dafd.
Also modifies some related functions to use SpiderMonkey stack rooting
types instead of CScriptValRooted.

Refs #2415

This was SVN commit r15561.
2014-07-26 10:58:24 +00:00
mimo 5c3f1b6dba fix previous commit
This was SVN commit r15560.
2014-07-25 21:24:05 +00:00
mimo 074cf06803 Petra: deals more efficiently with naval transport
This was SVN commit r15559.
2014-07-25 18:16:33 +00:00
leper 05de9def0b Remove unused --with-system-enet option (see 6bec648833) from premake.
Sort options in premake.

This was SVN commit r15558.
2014-07-25 13:50:59 +00:00
JoshuaJB f017922910 Update system icons to the newer logo and add higher resolution images to the ico/icns sets. (the OS X icon might need to be checked as I had to use an online converter to get that.)
This was SVN commit r15557.
2014-07-24 23:12:46 +00:00
leper 7c82e59ce5 Replace or remove uses of Engine.Console_Write. Patch by Adrian Fatol. Fixes #2141.
Cleans up list utility functions a bit.
Removes Engine.Console_Write.

This was SVN commit r15556.
2014-07-24 21:27:24 +00:00
mimo 4278e93b97 Petra: improve AI behaviour in scenarios without building possibility
This was SVN commit r15555.
2014-07-24 21:26:53 +00:00
mimo f8cbef8379 fix previous commit
This was SVN commit r15554.
2014-07-24 21:05:16 +00:00
mimo c5929ca7d5 make tooltip agree with buildrestrictions
This was SVN commit r15553.
2014-07-24 20:59:25 +00:00
mimo a574ca2e8f Petra: improve use of garrisoning for defense + some cleanings
This was SVN commit r15552.
2014-07-23 17:57:32 +00:00
mimo 2eb12c13ec give war ships at dock for carthage, for better balance of naval maps
This was SVN commit r15551.
2014-07-23 17:18:22 +00:00
wraitii 600e0a4081 Fix an oversight in CcmpPosition from the turret changes. Reported on IRC by Falsevision.
This was SVN commit r15550.
2014-07-23 13:02:42 +00:00
leper a5ebd8dafd Load trigger scripts in serialization test mode.
This was SVN commit r15549.
2014-07-22 23:30:27 +00:00
mimo bfe1e9f182 fix #2603
This was SVN commit r15548.
2014-07-22 21:23:25 +00:00
leper a7b18d02bf Add serialization test support for replays.
This was SVN commit r15547.
2014-07-22 19:41:49 +00:00
mimo b41289807a fix a rare JS warning
This was SVN commit r15546.
2014-07-22 18:20:47 +00:00
sanderd17 68121f387c Don't cache (and serialise) all technology templates multiple times. It's still cached once in the TechnologyTemplateManager.
This was SVN commit r15545.
2014-07-22 16:18:37 +00:00
mimo 9d505f2fd1 fixes petra javascript warnings
This was SVN commit r15543.
2014-07-21 16:19:59 +00:00
Yves a9048fa43d Adds support for passing JS::HandleValue to SetProperty and CallFunctionVoid without using ugly casing.
Also includes one little "demo-usecase", but additional code will be
changed to use that in future commits.

Refs #2415
Refs #2462

This was SVN commit r15542.
2014-07-20 19:45:18 +00:00
Yves 31f9ca9ebf Implements CallFunction with JS::MutableHandle<T> return type.
Changes the CallFunction implementation to use macros because otherwise
we'd have to write twice as many functions manually.
Adapts GetSavedGameData to use the new function template. Additional
callers will be changed in future commits.

Refs #2415
Refs #2462

This was SVN commit r15541.
2014-07-20 15:08:28 +00:00
mimo 3782857333 Petra: small fixes + reformat debug outputs
This was SVN commit r15540.
2014-07-19 16:17:09 +00:00
mimo 1d35d22a7b let the AI know when a building is decaying
This was SVN commit r15539.
2014-07-17 19:56:54 +00:00
Itms e1d4c10f13 Recompute the number of LoS tiles whenever these tiles are reset (especially when loading serialized data).
Also add a verification about LoS tiles in the tests.

Fixes #2678
Refs #599

This was SVN commit r15538.
2014-07-17 19:08:06 +00:00
mimo 98281689f2 Petra: fix a rare bug where the AI would never attack + some attack tunings
This was SVN commit r15537.
2014-07-17 17:04:13 +00:00
mimo de9ae66326 Petra: improve support for wonder games
This was SVN commit r15535.
2014-07-15 19:07:11 +00:00
Yves 52f4cda439 Changes ToJSVal to take JS::MutableHandleValue instead of JS::Value&.
JS::MutableHandleValue is similar to JS::HandleValue, but the whole
JS::Value it points to can be replaced.
This change is needed for support of exact stack rooting and moving GC.
Contains a few other trivial API adjustments and style improvements too.

Refs #2462
Refs #2415

This was SVN commit r15534.
2014-07-14 19:52:35 +00:00
JoshuaJB 17634d7507 Move the minimap to only use the shader pipeline. Should make it OpenGL ES compatible (untested).
This was SVN commit r15533.
2014-07-14 17:15:22 +00:00
wraitii 47426b2dad Per scythetwirler's suggestion, add some tables on my template analyzer script to compare units to their parent template.
This was SVN commit r15532.
2014-07-14 16:25:39 +00:00
Yves 09e04cb741 Adds missing request (fixes tests in debug mode).
This was SVN commit r15530.
2014-07-13 22:08:29 +00:00
historic_bruno 882f3406e3 Syncs _test.sim required simulation data with public mod, copies RelaxNG schemas for future use
This was SVN commit r15528.
2014-07-13 21:29:30 +00:00
historic_bruno a47dda7d66 Disables MSVC CRT deprecation warnings when building Atlas w/ wxWidgets 3.0
This was SVN commit r15527.
2014-07-13 21:19:30 +00:00
historic_bruno a82d32bd3c Fixes MSVC warning C4189: 'componentManager' : local variable is initialized but not referenced (Script_RegisterComponentType_Common is a static member function, so an instance of CComponentManager isn't needed)
This was SVN commit r15526.
2014-07-13 20:38:34 +00:00
historic_bruno 7b15b526ac Fixes tests.
Changes direct access of EndGameManager.gameType to getter function, by
convention

This was SVN commit r15525.
2014-07-13 19:45:44 +00:00
Yves 1b5ab8142e Makes custom JS objects compatible with SpiderMonkey ESR31.
In v24 you called JS_InitClass and passed in a definition of JSNative
functions. Later you could call JS_NewObject with this class and the
object would get a prototype with the specified JSNative functions.
In ESR31 you now have to explicitly store the prototype object returned
by JS_InitClass and pass it as prototype argument to JS_NewObject to
achieve the same.
This change modifies our existing ScriptInterface implementation for
custom object types a bit and uses it at places where the JSAPI was used
directly before.

Refs #2462

This was SVN commit r15524.
2014-07-13 15:31:48 +00:00
wraitii f4949c82ff Fix how the template analyzer scripts takes walkspeed into account to some extent for ranged units, add a new script to create a RM to check balance using triggers, and add a readme file to try and explain the outputs and parameters better.
This was SVN commit r15523.
2014-07-13 14:22:32 +00:00
wraitii 0cf5f57a68 Update of the template analyzer tool with more parameters and probably a more accurate representation of civs (with the right settings).
This was SVN commit r15522.
2014-07-13 10:20:35 +00:00
sanderd17 83d37f7857 Re-allow placing skirmish entities in Atlas. Refs #1696
This was SVN commit r15521.
2014-07-13 09:35:00 +00:00
sanderd17 7531a417e5 Fix re-garrisoning on visible garrison points after killing the units on that spot. Issue found by Stan.
This was SVN commit r15520.
2014-07-12 21:38:10 +00:00
sanderd17 eebc2f07bb Move some trees to accessible locations. Issue found by willsmith182.
This was SVN commit r15519.
2014-07-12 20:08:43 +00:00
Yves 5a3f07b3d9 Forgot to use excnObj in db9c20e0a9. Also roots an additional jsval.
This was SVN commit r15518.
2014-07-12 19:46:12 +00:00
Yves db9c20e0a9 Changes FromJSVal to take a JS::HandleValue instead of JS::Value.
JS::HandleValue is basically a wrapper around a JS::Value that is safe
for exact stack rooting and moving GC.
I've tried to keep this changeset rather small and isolated and
therefore create additional JS::Rooted<T> values at some places where
the function should eventually directly take a JS::Handle<T>.
The functions "CallFunction" and "CallFunctionVoid" put their arguments
inside a JS::AutoValueVector because this will be passed directly to
"CallFunction_" with ESR31.

Refs #2462
Refs #2415

This was SVN commit r15517.
2014-07-12 19:08:39 +00:00
Yves cfa59fc4e1 Changes our JSNative functions to use JS::CallReceiver/JS::CallArgs.
This is the new way for working with arguments in JSNative functions.
JS_THIS_VALUE, JS_ARGV, JS_SET_RVAL and direct access to vp or argc are
deprecated and will probably be removed in future versions of
SpiderMonkey.
CallArgs also takes care of proper rooting and you can get the values as
Handles or MutableHandles. The interface changes a little bit for ESR
31, but commiting this now still makes it easier and the changes shout
be straigtforward (search and replace more or less).

Refs #2462
Refs #2415

This was SVN commit r15516.
2014-07-12 16:55:09 +00:00
wraitii 7a1b92bffc Update my "Template Analyzer" script to have output about civ too. Try to guess if they are balanced against each other.
This was SVN commit r15515.
2014-07-12 16:08:35 +00:00
Itms 319cf16b5a Small cleanup, including a correction in the templates documentation, and the removal of residues from the culling changes.
This was SVN commit r15514.
2014-07-12 16:03:37 +00:00
wraitii 5279f9625e Add a new tool to make some quick template analysis to try and detect imbalances or see if our balancing works. WIP.
This was SVN commit r15513.
2014-07-11 22:24:58 +00:00
Itms 42591ef4cb Fix previous commit, refs #1257
This was SVN commit r15512.
2014-07-11 18:29:18 +00:00
Itms f5cc99f78b Fix OOS problems caused by an unwanted modification of the simulation state by the GUI.
Refs #1257

This was SVN commit r15511.
2014-07-11 18:11:32 +00:00
sanderd17 a4e3422a22 Fix the hero flickering overlay after healing. Fixes #2666. Patch by Adrian
This was SVN commit r15510.
2014-07-11 17:48:01 +00:00
Itms 2174eaaeee Add a VisibilityChanged message sent by the range manager whenever an entity changes visibility for any player.
This will be necessary for hiding buildings/trees/etc in fog-of-war, and
may be useful for AIs and for UnitAI.

Refs #599.

This was SVN commit r15508.
2014-07-10 20:51:39 +00:00
sanderd17 9d335f2e22 Fix typos found by FalseVision
This was SVN commit r15507.
2014-07-10 19:17:45 +00:00
mimo 255ab52725 fix previous commit
This was SVN commit r15506.
2014-07-10 06:30:08 +00:00
mimo e2d893103b make the AI aware of the game type and start interfacing with wonder victory condition + some fixes
This was SVN commit r15505.
2014-07-09 21:41:14 +00:00
leper 689272d4bd Remove collision in global namespace.
Fixes config/vfs deadlocks on OSX.

This was SVN commit r15504.
2014-07-09 19:16:03 +00:00
mimo 77e9e58a32 Petra: fixes + changes on the attack management
This was SVN commit r15503.
2014-07-08 19:01:27 +00:00
wraitii 7e81f4f52a Update the "number of builders" tooltip to be slightly more helpful.
This was SVN commit r15502.
2014-07-08 18:48:08 +00:00
wraitii 3ba325f9e8 Remove the HQDOF since it did not really work properly and we already have DOF. Fixes #2111
This was SVN commit r15501.
2014-07-08 18:23:53 +00:00
sanderd17 56bcbd59a0 Fix allied garrison issue.
This was SVN commit r15500.
2014-07-07 09:28:34 +00:00
mimo 27c700ce3a Petra: various small tunings or fixes
This was SVN commit r15499.
2014-07-06 17:31:02 +00:00
leper 8b45f453e5 Fix non-PCH build.
This was SVN commit r15498.
2014-07-06 16:35:41 +00:00
wraitii 62c1ac310d It would appear like I inadvertently committed a version of the water with some debug information in that made it look black.
This was SVN commit r15497.
2014-07-06 15:22:44 +00:00
Yves 334ba4b740 SpiderMonkey now supports default parameters!
I've just modified those places with TODO comments, but there are most
likely others that could benefit of the feature to make the code a bit
cleaner and easier to understand.
Thanks to Fabio for pointing it out.
Refs #1886

This was SVN commit r15496.
2014-07-05 13:58:51 +00:00
Yves 8b493c2739 Revert obsolete workaround for structured clones.
Reverts 8195e767ef because that workaround isn't needed anymore with
SpiderMonkey 24 (and 31).

Refs #2241
Refs #1886

This was SVN commit r15495.
2014-07-05 11:35:00 +00:00
Yves de6823d23f Makes tinygettext handle missing plural forms more sanely.
Print an error to the console and return the original (untranslated)
string instead of triggering an assertion in debug builds or a crash and
memory corruption in release builds.
Works around a crash on the history screen. Why the plural form is
missing is another topic and will have to be solved separately.

This was SVN commit r15493.
2014-07-05 10:29:24 +00:00
wraitii 5571f7a7f9 Fix "Wind Angle" parameter not working properly. Add a precomputed "wind strength" variable so that waves look smaller behind islands. Some tweaks. Refs #48 as usual.
This was SVN commit r15492.
2014-07-05 10:20:30 +00:00
wraitii aa99f98fce Fix rmgen for my changes, I had missed that, thanks mimo.
This was SVN commit r15491.
2014-07-04 18:24:39 +00:00
mimo 4852fad86a Petra: adapt the AI to gaia now able to launch attacks (with triggers) + cleaning of unused functions
This was SVN commit r15490.
2014-07-04 16:12:09 +00:00
wraitii 9d4665248b Check water FBOs creation correctly to detect some errors. Use two depth textures since I have a hunch the issues people encounter are caused by my using only one.
This was SVN commit r15488.
2014-07-04 10:14:35 +00:00
wraitii 991d5bbd63 Fix random maps for my water changes. Fix the replay mode after I had broken it. Fix an occasional crash (that might have crashed Atlas, need someone to check).
Improve debugging slightly in case of framebuffer errors. Fix a few
style issues.

This was SVN commit r15486.
2014-07-04 09:03:21 +00:00
wraitii 326290463e Further WIP water improvements. Add 3 different textures for different looks. Update some oasis maps for that. Streamline water settings (some removed, some added). Update Atlas for those (needs to be tested). Fix an issue with HQ water effects.
Please report any issue and/or crash. Those will get fixed in commits to
come. Refs #48.

This was SVN commit r15484.
2014-07-03 20:07:15 +00:00
Ykkrosh eb7955599a Optimise silhouette rendering.
Do some intersection tests on the CPU so that the silhouette render
passes only have to draw models/patches that might actually contribute
to silhouettes, saving the CPU and GPU cost of rendering more objects
than necessary.

This was SVN commit r15483.
2014-07-03 01:00:25 +00:00
leper ffd6e10edf Make CGUIManager register a callback function for hotloading instead of specifically calling it.
This was SVN commit r15482.
2014-07-02 23:44:39 +00:00
Ykkrosh 30e851ab90 Forward-declare CShaderProgramPtr, to avoid pulling in more headers than necessary and to hypothetically reduce build times by a minuscule amount.
This was SVN commit r15481.
2014-07-02 22:36:45 +00:00
sanderd17 404e808ed5 Add yes-no dialog and general dialog code to present choices to players. Can be used by triggers.
This was SVN commit r15480.
2014-07-02 14:48:22 +00:00
JoshuaJB c844589f48 Add missing translate() call.
This was SVN commit r15479.
2014-07-01 21:05:33 +00:00
mimo a5065b523d Petra: refrain AI to build/repair under enemy fire and few fixes on economy management
This was SVN commit r15478.
2014-07-01 19:48:38 +00:00
leper 343066040f Remove inconsistent checks for pSimulation2 when saving maps and ensure that it is set.
Remove commented out code writing triggers that has nothing to do with
the actual triggers implementation.
Free memory that was allocated for error reporting when when fork()
fails.
Remove dead initialization.

This was SVN commit r15477.
2014-07-01 19:00:41 +00:00
wraitii 89c6487ffe Forgot to remove my fake radiosity changes.
This was SVN commit r15476.
2014-07-01 16:53:13 +00:00
wraitii f8d53d9a1d Clean up of the last commit.
This was SVN commit r15474.
2014-07-01 16:15:03 +00:00
wraitii ab30e0d4fb Change the water texture to a new, bigger one, created in Blender (thanks to Enrique). Change settings so that they are more logical, yet allow reverting back to an even lower quality setting. Add a WIP high setting (with foam) which isn't finished yet.
Change the shader itself so that the effects look nicer and are more
consistent across settings.
Rework the water mesh generation (simpler system). Fix a few issues.

May work oddly with Atlas since I haven't been able to compile yet.

Refs #1875 (maybe fix), Fixes #2077 (I'll assume it does), Fixes #2114
(assumption again), refs #48.

This was SVN commit r15473.
2014-07-01 16:05:05 +00:00
sanderd17 0bde61fa5b Simplify 'survival of the fittest' map by using Gaia as attacker, and using the trigger point ownership to differentiate between different players, instead of hardcoding a list.
This was SVN commit r15471.
2014-07-01 09:29:45 +00:00
leper fa5b373698 Add some missing semicolons.
This was SVN commit r15470.
2014-06-30 21:38:45 +00:00
JoshuaJB 66485bcd17 Check that at least one assignment exists before tryintg to copy it.
This was SVN commit r15469.
2014-06-30 17:21:12 +00:00
Spahbod 00fa45161d Added "Survival of the Fittest", a demo random map with triggers. Refs #52
This was SVN commit r15468.
2014-06-30 13:59:34 +00:00
sanderd17 c339928c6f Disallow placing some special entities in Atlas. Fixes #1696. Patch by trompetin17
This was SVN commit r15467.
2014-06-30 10:20:20 +00:00
leper b4fc393f18 Change camera rotation in Atlas to be the same as in the game. Refs #1066.
This was SVN commit r15466.
2014-06-29 21:30:51 +00:00
mimo fd91398a95 Petra: fix the fix preventing the AI to be stuck trying to produce unavailable units
This was SVN commit r15465.
2014-06-29 19:16:18 +00:00
mimo 6ed07ef4d9 Petra: hopefully improve the gatherers management + some cleanings
This was SVN commit r15464.
2014-06-28 20:02:18 +00:00
mimo 97118f39b3 remove predefined AI in some skirmish maps, so that the default is taken
This was SVN commit r15463.
2014-06-28 19:46:10 +00:00
LordGood d90020e88e This was SVN commit r15462. 2014-06-28 11:01:59 +00:00
wraitii c626cf66f9 Fix build-osx-libs properly for mavericks after learning some Bash.
Fix a long-standing typo in TerrainRenderer for water rendering that
apparently had no effect.
Don't compress the water textures to make it look better. They will be
changed anyhow.

This was SVN commit r15461.
2014-06-28 08:54:59 +00:00
historic_bruno 789922b15a Updates LICENSE.txt files for recent changes
This was SVN commit r15459.
2014-06-28 06:21:27 +00:00
historic_bruno 59b2493990 Missed changes from 304a7c1201
This was SVN commit r15458.
2014-06-28 05:50:32 +00:00
historic_bruno 6bec648833 Removes bundled ENet source. NOTE: system libenet (1.3) is now required on *nix, see BuildInstructions for updates. This change requires running update-workspaces. Fixes #1568.
Updates update-workspaces.sh and build-osx-libs.sh for this change.
Updates precompiled win32 ENet to 1.3.12, built with VC++ 2010, and
moves it to libraries/win32, refs #864.

This was SVN commit r15457.
2014-06-28 05:48:51 +00:00
historic_bruno 304a7c1201 Updates precompiled win32 libpng to 1.6.12, built with VC++ 2010, refs #864.
Removes unused ffmpeg definition from extern_libs4.lua

This was SVN commit r15456.
2014-06-28 05:34:39 +00:00
JoshuaJB dd3fdf6800 Correct assignment dropdowns to always be adjustable by the game controller.
This was SVN commit r15454.
2014-06-28 05:02:29 +00:00
LordGood c2763dca24 This was SVN commit r15453. 2014-06-27 05:31:47 +00:00
mimo b1307c83be fix guard command broken in recent commits
This was SVN commit r15452.
2014-06-26 21:15:16 +00:00
mimo 58932825a6 Petra: some tunings and cleanings
This was SVN commit r15451.
2014-06-26 20:50:24 +00:00
Yves ae93c02ba8 Fixes a bug that caused script filenames to be defined as properties of the global object.
This was SVN commit r15450.
2014-06-26 17:08:46 +00:00
LordGood 217a399ee3 Carthaginian ballista
This was SVN commit r15449.
2014-06-26 12:10:36 +00:00
LordGood 05693744cc Hellenistic ranged siege animations commit
This was SVN commit r15448.
2014-06-26 06:37:08 +00:00
wraitii fd6b199606 Fix compiling on Mavericks. Users on older systems will need to change a few lines in either of those scripts, but it should not break their build. For now, I'm saying it Fixes #2304 .
This was SVN commit r15447.
2014-06-25 18:01:00 +00:00
fabio 3b35afeeee typo
This was SVN commit r15446.
2014-06-25 15:19:31 +00:00
Ykkrosh b1b96a89d6 Fix culling for shadows and reflections.
Previously we had a single culling frustum based on the main camera, and
any object outside the frustum would never get rendered, even if it
should actually contribute to shadows or reflections/refractions. This
caused ugly pop-in effects in the shadows and reflections while
scrolling.

Extend the renderer to support multiple cull groups, each with a
separate frustum and with separate lists of submitted objects, so that
shadows and reflections will render the correctly culled sets of
objects.

Update the shadow map generation to compute the (hopefully) correct
bounds and matrices for this new scheme.

Include terrain patches in the shadow bounds, so hills can cast shadows
correctly.

Remove the code that tried to render objects slightly outside the camera
frustum in order to reduce the pop-in effect, since that was a
workaround for the lack of a proper fix.

Remove the model/patch filtering code, which was used to cull objects
that were in the normal camera frustum but should be excluded from
reflections/refractions, since that's redundant now too.

Inline DistanceToPlane to save a few hundred usecs per frame inside
CCmpUnitRenderer::RenderSubmit.

Fixes #504, #579.

This was SVN commit r15445.
2014-06-25 01:11:10 +00:00
JoshuaJB bb4b911e99 Remove remaining warnings about AI naval map support. Also hide player assignment dropdowns on network clients.
This was SVN commit r15444.
2014-06-24 22:53:02 +00:00
mimo ec5215f843 Petra: avoid doing some unused stuff
This was SVN commit r15443.
2014-06-24 20:44:37 +00:00
Pureon 067a1d4829 Latin female sound files from Itms
This was SVN commit r15442.
2014-06-24 19:40:48 +00:00
wraitii 06c1f9f972 Fix canyon rms when you for some reason want to start as the only player.
This was SVN commit r15441.
2014-06-24 19:12:44 +00:00
mimo 3013b35c13 Petra fixes
This was SVN commit r15440.
2014-06-24 18:31:36 +00:00
sanderd17 be767e7983 Fix dog bark xml files
This was SVN commit r15439.
2014-06-24 11:14:13 +00:00
sanderd17 5509e8e51c This shouldn't have been comitted
This was SVN commit r15438.
2014-06-24 11:09:04 +00:00
sanderd17 006bf42809 Fix segmentation fault in the sound destructor. Happened when the sound file doesn't exist. Errors are shown by other code.
This was SVN commit r15437.
2014-06-24 11:07:39 +00:00
wraitii 7d8a4c3a88 Improve the hawk with a gliding animation and a better flapping animation.
This was SVN commit r15436.
2014-06-24 11:06:04 +00:00
Pureon 4ad2677920 Adding latin voice files by Itms
This was SVN commit r15435.
2014-06-23 23:41:23 +00:00
Pureon ed1fb3058f Small audio folder restructure and further deletes
This was SVN commit r15434.
2014-06-23 23:22:53 +00:00
Pureon a6e6fd6591 Removing redundant placeholder audio
This was SVN commit r15433.
2014-06-23 22:59:43 +00:00
Yves 3746d7c3d9 Adds a playable trigger demo mission for multiplayer and TreasureCollected events.
Search treasures on small islands and on water. Collect more treasures
than your opponent to win.
I've used the Cycladic Archipelago scenario map with some minor
adjustments, mainly treasure placement and civ preselection for even
chances (both need townphase to build trading boats that can collect
floating treasures).
There's still some room for improvement to make it more fun and add
additional triggers, but I'll leave that for modders. :)

This was SVN commit r15432.
2014-06-23 20:14:43 +00:00
Yves 7e9d6f8ebe Adds translation message extraction for map specific trigger scripts.
This was SVN commit r15431.
2014-06-23 19:59:37 +00:00
sanderd17 692cc8240d Remove empty comment + turn delay times into 0.
This was SVN commit r15430.
2014-06-23 18:25:19 +00:00
sanderd17 17c473f2f3 Add a trigger to the gallic fields map + fix a typo.
This was SVN commit r15429.
2014-06-23 18:12:51 +00:00
mimo fcc4d7433a Petra: fix a bug and some typos
This was SVN commit r15428.
2014-06-23 17:54:32 +00:00
sanderd17 8915037631 Turn victory conditions into trigger scripts. Gui needs to be updated to allow combining of different victory conditions + to allow different lists per map. So there are no specific missions yet.
This was SVN commit r15427.
2014-06-23 17:37:27 +00:00
sanderd17 b811066b85 Add ownership changed event to Triggers.
This was SVN commit r15426.
2014-06-23 16:32:44 +00:00
sanderd17 e33e70e626 Change trigger initialisation as it's not compatible with multiple trigger files (functions would overwrite each other)
This was SVN commit r15425.
2014-06-23 15:55:07 +00:00
sanderd17 49c7efad4f Add demo triggers map. Showing all triggers with a minimum amount of code.
This was SVN commit r15423.
2014-06-23 14:19:42 +00:00
sanderd17 f94491a1d1 Forgot to remove some debug info
This was SVN commit r15422.
2014-06-23 13:52:52 +00:00
sanderd17 9f47ed536d Add engine support to triggers + a component to provide an easy interface and to be extended by triggers. Thanks to SpahBod for the biggest part of the code, and Yves for the review.
This was SVN commit r15421.
2014-06-23 13:42:59 +00:00
historic_bruno 213732d5af Updates some precompiled win32 libraries with VC++ 2010 (note: requires update-workspaces), refs #864:
Updates libiconv to v1.14.
Updates libxml2 to v2.9.1.
Updates zlib to v1.2.8.
Rebuilds FCollada.
Updates libxml2 to use same libiconv as tinygettext.
Cleans up unneeded libiconv files.

This was SVN commit r15416.
2014-06-23 01:07:16 +00:00
historic_bruno 600e8bd226 Fixes MSVC warning about uninitialized playerId in Atlas entity pasting code (using 0 as a sensible default value), refs #96
This was SVN commit r15415.
2014-06-22 22:19:02 +00:00
leper 09637ea0cf Fix selection issue with mace champ cav.
This was SVN commit r15414.
2014-06-22 21:45:00 +00:00
sanderd17 7b781f82d3 Fix capitalisation issue
This was SVN commit r15413.
2014-06-22 20:35:16 +00:00
sanderd17 f1e077d7e9 Fix hero overlay by requiring at least one unit to be trained
This was SVN commit r15412.
2014-06-22 20:00:34 +00:00
mimo 144cb0e44a Petra: fix trying to barter while market is still a foundation
This was SVN commit r15411.
2014-06-22 12:10:51 +00:00
wraitii 0e6f6576dc Fix compilation on Mavericks when running build-osx-bundle.sh.
Fixes to build-osx-libs.sh.
Support gloox properly on OSX.
Refs #2304 (not fixed since afaik xCode still runs into some issues)

This was SVN commit r15410.
2014-06-22 08:27:58 +00:00
sanderd17 4e996de883 Fix UnitAI bug found by FalseVision
This was SVN commit r15409.
2014-06-21 21:03:44 +00:00
mimo 67d81996f6 petra: various (small) changes in attack and economic management + cleanings
This was SVN commit r15408.
2014-06-21 16:21:11 +00:00
sanderd17 8f0772034e Don't process tokens starting with a '-' into translatable strings.
This was SVN commit r15407.
2014-06-21 08:09:24 +00:00
JoshuaJB c793da5368 Don't allow changeing disabled dropdowns using the scrollwheel. Also corrects some things in b9a4af4cc6.
This was SVN commit r15406.
2014-06-21 00:25:12 +00:00
JoshuaJB b9a4af4cc6 Fix #2595 by validating cheats are disabled in rated games. Also forces locked teams in ranked games and adds a scrollbar to the lobby subject.
This was SVN commit r15405.
2014-06-20 23:59:04 +00:00
JoshuaJB 160a83b73f Bits of cleanup
This was SVN commit r15403.
2014-06-20 03:45:19 +00:00
JoshuaJB 1659a28aa0 Correctly remove players who cancel while rejoining. Fixes #2240
This was SVN commit r15402.
2014-06-20 03:22:40 +00:00
Ykkrosh 754e76e4a1 Fix non-PCH build
This was SVN commit r15401.
2014-06-19 23:36:09 +00:00
Ykkrosh d936bde74a Dynamic message subscriptions.
Allow components to individually subscribe/unsubscribe to messages,
instead of statically subscribing the entire component type. Use this
for most Interpolate/RenderSubmit messages, to avoid the performance
cost of passing those messages to a large number of components that will
just ignore them anyway.

On Azure Coast this reduces total time per frame by about 30% on a
CPU-bound system.

This was SVN commit r15400.
2014-06-19 23:20:12 +00:00
JoshuaJB ec7a452d4e Convert multiplayer connection dialog to only use 'modern' styles and make it larger for languge-friendliness and consistancy.
This was SVN commit r15399.
2014-06-19 19:22:31 +00:00
Yves bee865416b Fixes small issues in 81d1f5f71f.
This was SVN commit r15398.
2014-06-19 18:50:41 +00:00
Gallaecio b8078deea8 Splitted the PO and POT files
Fixes #2494

This was SVN commit r15397.
2014-06-19 18:45:11 +00:00
Yves 8817bd394b Fix the check if the script is beeing exectued as root for sh (== comparision seems to work for bash but not for sh).
This was SVN commit r15396.
2014-06-19 15:19:08 +00:00
sanderd17 e529e551d9 fix typo
This was SVN commit r15395.
2014-06-19 14:48:48 +00:00
sanderd17 81d1f5f71f Clean up notifications. Merge the timed and untimed text notifications, allow passing a list of players to all notifications, make modification types moddable. Refs #52
This was SVN commit r15394.
2014-06-19 14:37:08 +00:00
sanderd17 6d5039791f Fix barter panel. Reported by Gameboy
This was SVN commit r15393.
2014-06-19 12:34:52 +00:00
mimo 12c7fe2bc7 fix a bug in petra attack preparation
This was SVN commit r15392.
2014-06-18 20:22:18 +00:00
sanderd17 c9f2ac4b12 Fix giving foundations a population bonus after a tech research. Reported by bouke
This was SVN commit r15391.
2014-06-18 15:58:04 +00:00
sanderd17 a76364f825 fix previous commit
This was SVN commit r15390.
2014-06-18 15:42:19 +00:00
sanderd17 7baaf382ed Organise the session helper functions a bit per topic
This was SVN commit r15389.
2014-06-18 15:27:28 +00:00
sanderd17 1307a9038a Split the selection panels in session.xml into multiple xml files
This was SVN commit r15388.
2014-06-18 13:03:59 +00:00
sanderd17 7266ea681b Allow mixing the buttons for the right pane, so make it possible to have a structure that can pack and produce units. Refs #1919
This was SVN commit r15387.
2014-06-18 11:23:22 +00:00
sanderd17 054706a114 Allow showing the productionqueue for multiple selected buildings at once
This was SVN commit r15386.
2014-06-18 10:46:41 +00:00
historic_bruno 7d92890900 Updates wxWidgets to 3.0.1 in OS X libs build script (hopefully fixes the crash when starting Atlas), refs #2356
This was SVN commit r15385.
2014-06-18 01:32:39 +00:00
sanderd17 f1379a77b5 Fix build for wxWidgets version 2.8.10 and older.
This was SVN commit r15383.
2014-06-17 19:32:33 +00:00
sanderd17 94b49a01a9 Adapt the relaxNG files to new gui changes
This was SVN commit r15382.
2014-06-17 18:45:40 +00:00
sanderd17 7d265cec80 Add copy-paste (CTRL+C/V) to Atlas. Patch by trompetin17. Fixes #96
This was SVN commit r15381.
2014-06-17 13:14:25 +00:00
sanderd17 02fd235bbd Make hotkeys and top panel fully moddable by splitting up the xml file. Allow entire directories to be loaded via an 'include' to provide extra moddability (modders don't have to edit any files, they can just add new ones).
This was SVN commit r15380.
2014-06-17 13:03:55 +00:00
historic_bruno 8c547a3fad Fixes a few other invalid XML files reported by the validator script, refs #245
This was SVN commit r15379.
2014-06-17 03:53:13 +00:00
historic_bruno aa04b6d782 Fixes invalid actors reported by XML validator script. Some were only technically invalid but others were broken. Refs #245
This was SVN commit r15378.
2014-06-17 03:49:37 +00:00
historic_bruno 2c9939ac74 Adds Relax NG Compact syntax grammars for most of the XML formats in the engine.
Adds converted Relax NG XML grammars for each (Note: don't edit these
directly, modify the compact syntax .rnc files instead, then use a
conversion tool http://relaxng.org/#conversion to generate the .rng
files).
Adds Perl script to validate the XML files using the new grammars

This was SVN commit r15377.
2014-06-17 03:31:40 +00:00
mimo d11e48cd85 Petra: bugfixes + improved attack/defense behaviour
This was SVN commit r15376.
2014-06-16 22:03:30 +00:00
sanderd17 013ab4bda7 Make the barter panel uniform with the others, clean up more gui code.
This was SVN commit r15375.
2014-06-16 18:34:27 +00:00
mimo ce3b11a3fe fix the fix of setHeldPosition in b17ffaeb7e
This was SVN commit r15374.
2014-06-15 17:27:03 +00:00
leper 190f3b0ce1 Exclude .git dirs when adding subfolders to the VFS.
This was SVN commit r15373.
2014-06-15 17:06:24 +00:00
leper f115759901 Handle mods specified on the command line when using the archive builder.
This was SVN commit r15372.
2014-06-15 16:43:08 +00:00
mimo bec1e1edfd fix b17ffaeb7e + fixes from FalseVision on setHeldPosition
This was SVN commit r15371.
2014-06-15 16:41:01 +00:00
mimo 74e5c8ae26 fix e2b493bb67
This was SVN commit r15370.
2014-06-15 16:13:12 +00:00
sanderd17 519c00c1a6 Don't allow users to build workspaces as root user
This was SVN commit r15369.
2014-06-15 15:23:03 +00:00
sanderd17 86aa30e0d9 Remove useless line in UnitAI, found by FalseVision
This was SVN commit r15368.
2014-06-15 14:38:25 +00:00
sanderd17 1e38fa7b58 UnitAI fix by FalseVision
This was SVN commit r15367.
2014-06-15 14:23:49 +00:00
mimo ef7e19c13e reset petra debug left in previous commit
This was SVN commit r15365.
2014-06-15 12:59:19 +00:00
mimo b17ffaeb7e Petra: make better use of garrisoning when attacked
This was SVN commit r15364.
2014-06-15 12:57:12 +00:00
sanderd17 9a743d65fe Fix to unitAI by FalseVision + fix a mistake of my own
This was SVN commit r15363.
2014-06-15 12:43:52 +00:00
sanderd17 89f33e7579 Fix group number rendering
This was SVN commit r15362.
2014-06-15 12:08:58 +00:00
sanderd17 e042fa8768 Make trigger points templates
This was SVN commit r15361.
2014-06-15 11:25:25 +00:00
sanderd17 beaf3139c0 Move position calculation of buttons to something cleaner.
This was SVN commit r15360.
2014-06-15 09:56:54 +00:00
sanderd17 5064f2728f Fix tech pairing visuals + hiding
This was SVN commit r15359.
2014-06-15 07:56:40 +00:00
leper e12d4b880a Add XMB file format version to the XMB files and check it when loading a file.
This was SVN commit r15358.
2014-06-14 23:41:33 +00:00
leper f460057700 Fix error for entities that require a technology to be trainable.
This was SVN commit r15357.
2014-06-14 22:28:06 +00:00
Pureon 2766ae7eb5 Marker objects for Atlas
This was SVN commit r15356.
2014-06-14 18:44:18 +00:00
sanderd17 e152223a53 fix fix
This was SVN commit r15355.
2014-06-14 18:21:48 +00:00
leper b93877571f Add missing quotation mark to quote.
This was SVN commit r15354.
2014-06-14 17:20:09 +00:00
sanderd17 b469983c58 Fix for 89f5e7b260. Refs #2622
This was SVN commit r15353.
2014-06-14 16:12:41 +00:00
sanderd17 86ca3b2142 Small cleanup: i, numbButtons and numberOfItems all contain the same value anyway
This was SVN commit r15352.
2014-06-14 15:57:42 +00:00
sanderd17 7f172037ac Clean up a big part of unit_commands.js, and bring most data to a separate JS object (instead of having deep nests of switches and if-else structures)
This was SVN commit r15351.
2014-06-14 15:35:13 +00:00
mimo 5903935e4a let the AIs know when a training has started
This was SVN commit r15350.
2014-06-14 14:34:37 +00:00
mimo 4e6a21e9da fix promotion of autogarrisoned units (forgot in previous tag)
This was SVN commit r15349.
2014-06-14 14:26:51 +00:00
mimo e2b493bb67 fix double-click on a garrisoned hero button should select its holder, even if from autogarrison
This was SVN commit r15348.
2014-06-14 14:21:30 +00:00
mimo 7cf927baec fix typo from 2b8758745f
This was SVN commit r15347.
2014-06-14 14:14:33 +00:00
leper 8d164ca5d1 Add civ requirement to tech that was missed in the previous commit. Refs #2580.
This was SVN commit r15346.
2014-06-13 21:02:32 +00:00
leper 121f14d521 Add civ requirements to civ specific techs. Patch by s0600204. Refs #2580.
This was SVN commit r15345.
2014-06-13 16:16:31 +00:00
leper 1142fc55ca Clean up Commands.js a bit.
This was SVN commit r15344.
2014-06-13 16:16:25 +00:00
leper 58e628338c Also check if a technology was already researched when checking requirements. Fixes #2580.
This was SVN commit r15343.
2014-06-13 16:16:10 +00:00
leper 9990d4c885 Actually call the function instead of testing if it exists. Patch by falsevision. Fixes #2626.
This was SVN commit r15342.
2014-06-13 12:54:57 +00:00
sanderd17 55247e926a Remove legacy trading pane
This was SVN commit r15341.
2014-06-13 12:06:57 +00:00
sanderd17 2b8758745f put the unit commands in a JS object
This was SVN commit r15340.
2014-06-13 11:35:16 +00:00
sanderd17 2b408e766b Fix problem with setting up trade routes
This was SVN commit r15339.
2014-06-13 08:01:06 +00:00
mimo 350d4a6b7e add rally points for the AIs
This was SVN commit r15338.
2014-06-12 18:41:13 +00:00
mimo e3f3051b2a Petra: code cleaning and minor improvments
This was SVN commit r15337.
2014-06-12 16:47:43 +00:00
sanderd17 2e00628562 Take the action definitions out of input.js, and in a separate JS object that can be edited by other scripts. This makes it possible to easier add new actions by editing this new script, or (in mods) even by editing the object in other scripts.
This was SVN commit r15336.
2014-06-12 13:47:37 +00:00
fabio 2e4441b528 Minor typos in text strings
This was SVN commit r15335.
2014-06-12 13:24:36 +00:00
Ykkrosh 85e2e72eb7 Fix TestHeaderless failure on GCC 4.9.
Once 'delete' is called on an object, that object no longer exists, and
accessing its member variables is undefined behaviour. GCC 4.9's
optimiser recognises this, and eliminates any writes to member variables
inside the destructor, since it knows they cannot legally be read later.

BoundaryTagManager relied on ~FreedBlock resetting its memory to 0, so
this optimisation broke it. Replace the placement new/delete with plain
non-magic Setup/Reset functions, to avoid the optimisation.

Fixes #2481.

This was SVN commit r15334.
2014-06-11 19:50:38 +00:00
JoshuaJB 548f50b071 Give gaia back it's vision.
This was SVN commit r15332.
2014-06-11 18:20:02 +00:00
sanderd17 89f5e7b260 Improve gui moddability by allowing to load an entire directory of scripts at once, and being able to split up big gui XML files. Fixes #2622
This was SVN commit r15330.
2014-06-11 17:14:35 +00:00
sanderd17 791eba9451 Fix Splash damage calculation. Patch by falsevision. Fixes #2623
This was SVN commit r15329.
2014-06-11 14:02:02 +00:00
sanderd17 b289303c25 Fix setting rallypoint via the minimap + fix out-of-world problem when the targeted entity for a rallypoint disappeared
This was SVN commit r15328.
2014-06-11 13:36:12 +00:00
sanderd17 49194819f6 Schwarzwald random map. Script by niektb, with random terrain generation from FeXoR.
This was SVN commit r15327.
2014-06-10 19:59:17 +00:00
sanderd17 6d0df59697 Fix theatrons
This was SVN commit r15326.
2014-06-10 14:27:43 +00:00
mimo 8551a799d0 Petra: prevent gatherers to stay blocked when UnitAI make them return resource in an inaccessible dropsite, see #2563
This was SVN commit r15325.
2014-06-10 13:45:23 +00:00
mimo 57a7bbcb90 fix javascript warning
This was SVN commit r15324.
2014-06-10 13:34:49 +00:00
mimo 3b519b132a fix undefined variable in petra
This was SVN commit r15323.
2014-06-10 13:27:49 +00:00
sanderd17 60212b0418 Fix Iberian monument.
This was SVN commit r15322.
2014-06-10 13:18:33 +00:00
mimo 7cb6768132 fix productionTime computation on AI common-api
This was SVN commit r15321.
2014-06-10 12:59:42 +00:00
sanderd17 9723f73262 Fix tests
This was SVN commit r15320.
2014-06-09 18:13:29 +00:00
sanderd17 1d7001c8cd Fix walls + remove debug warning
This was SVN commit r15319.
2014-06-09 17:51:23 +00:00
sanderd17 2fb0262142 Futher clean up heroes tooltips + move auras to the templates. Hope they have a bigger chance of staying consistent now.
This was SVN commit r15318.
2014-06-09 17:35:37 +00:00
sanderd17 3a2670f7fa Take aura descriptions out of tooltip, let auras be defined in the entity template rather than in JSON files, as they can't be reused anyway. Fix tooltips and auras for all heroes from athen to gaul.
This was SVN commit r15317.
2014-06-09 14:15:05 +00:00
mimo d6b8f1989e Petra: complete and improve 2c0daaf80b
This was SVN commit r15316.
2014-06-09 13:30:41 +00:00
sanderd17 1776aa4750 Continue the transition to the usage of visible classes. Fix Hero inheritance for that.
This was SVN commit r15315.
2014-06-09 09:32:36 +00:00
mimo 2c0daaf80b Petra: improve choice of ships to train and some style cleaning
This was SVN commit r15314.
2014-06-09 07:54:59 +00:00
mimo 5f42834710 some aegis fixes, patch by falsevision, close #2617
This was SVN commit r15313.
2014-06-09 07:48:29 +00:00
mimo 91a511560c remove code dupplication for dock angle computation
This was SVN commit r15312.
2014-06-08 16:00:00 +00:00
sanderd17 049caba9f9 Let the timer hold the latest turnLength instead of the Attack component. Reduces a lot of messages
This was SVN commit r15311.
2014-06-08 09:39:57 +00:00
historic_bruno cb9d0733ef Changes XMB format to store UTF-8 strings and removes pointless UTF-16 conversions, refs #204, #244.
Bumps XMB version to 2.

This was SVN commit r15309.
2014-06-08 03:23:37 +00:00
historic_bruno 40b351a99a Fixes error in silhouettes hotkey handler
This was SVN commit r15308.
2014-06-08 02:04:29 +00:00
Mythos_Ruler 72706f708b Some unfinished maps for others to finish if they wish.
Tweaked Siwa Oasis.

This was SVN commit r15307.
2014-06-07 14:39:01 +00:00
sanderd17 567917bf41 Give RMS access to the simulation templates. Fixes #1589. Patch by Itms.
This was SVN commit r15306.
2014-06-07 12:12:53 +00:00
Mythos_Ruler 27ca5fe19d Iberians now have the Celtic war barge.
This was SVN commit r15304.
2014-06-07 11:21:42 +00:00
mimo 67a4af0fe0 fix typo from a4f2c2ac90
This was SVN commit r15303.
2014-06-05 18:29:11 +00:00
mimo a96953efea remove dupplicated (and buggy) line introduced in 0fcc074a65
This was SVN commit r15302.
2014-06-05 17:51:06 +00:00
leper 53ea269af0 Add the ability to specify a log level when using dlopen and change it to normal for Atlas.
This way we do not have two error messages when starting Atlas, but the
dynamic Atlas lib is not available.
Patch by Gallaecio. Fixes #1540.

This was SVN commit r15301.
2014-06-05 17:07:04 +00:00
JoshuaJB fd8ffb506b Remove commented out code and add licence headers to COList.cpp/.h.
This was SVN commit r15300.
2014-06-05 14:33:44 +00:00
leper c699409246 Add translation context to stances.
This was SVN commit r15299.
2014-06-05 14:06:15 +00:00
sanderd17 55760f6413 cache the affected players in order to remove the template bonuses given by auras from the right players before adding them again.
This was SVN commit r15298.
2014-06-05 11:24:31 +00:00
sanderd17 2d1f9c33dc Bring healable classes to the uniform class matching
This was SVN commit r15297.
2014-06-05 10:34:41 +00:00
leper 638123950c Check if the position changed before updating it for rally points set on entities. Refs #1257.
This was SVN commit r15296.
2014-06-05 10:27:40 +00:00
leper fd615c4c54 Round some alpha values for overlays.
This was SVN commit r15295.
2014-06-05 10:22:16 +00:00
sanderd17 a4f2c2ac90 Allow for unification in identity class matching + add the opportunity to combine with AND and OR. Fixes #2612
This was SVN commit r15294.
2014-06-05 09:39:36 +00:00
sanderd17 cbfbc72d36 Other auras fix
This was SVN commit r15293.
2014-06-05 07:57:05 +00:00
leper 02c68064ed Fix syntax errors in two auras.
Some code style cleanup in aura related files.

This was SVN commit r15290.
2014-06-04 22:27:36 +00:00
leper d5b4dbcb71 Retain corpses in FoW. Patch by Itms. Fixes #1366.
This was SVN commit r15289.
2014-06-04 22:13:47 +00:00
leper b09a702c60 Recompute rally point lines when the rally point is set on a moving unit.
Does not account for setting rally points on units that can move into
the FoW/SoD.
Recalculates paths even if the rally points are not displayed.
Refactors UpdateMarkers() to remove some indentation levels.
Based on patch by Itms. Fixes #1257.

This was SVN commit r15288.
2014-06-04 22:07:58 +00:00
mimo 6b015e935e remove a forgotten debug warning in petra
This was SVN commit r15287.
2014-06-04 20:52:21 +00:00
mimo 0fcc074a65 Petra: try to improve cart shipyard placement
This was SVN commit r15286.
2014-06-04 20:13:15 +00:00
sanderd17 d883fc332d Correct mime-types and end-of-lines for the XML files in simulation/templates
This was SVN commit r15285.
2014-06-04 17:21:24 +00:00
leper b67aca01c8 Fix color fade to not go beyond 255 and be integer.
This was SVN commit r15284.
2014-06-04 16:23:56 +00:00
Mythos_Ruler 8d2835d9e0 Fixed resource balance for players 3 and 4. (they didn't have chickens or huntable fauna before).
This was SVN commit r15283.
2014-06-04 15:59:43 +00:00
JoshuaJB 685d5e0197 Switch default AI to Petra and remove an old Aegis warning.
This was SVN commit r15282.
2014-06-04 15:29:20 +00:00
sanderd17 9a7984c544 Fix class checking for technologies
This was SVN commit r15281.
2014-06-04 12:07:35 +00:00
sanderd17 b6870bf415 Move the extraction of the classes from templates to the global scripts, and let the AI use it to reduce redundancy.
This was SVN commit r15280.
2014-06-04 08:42:48 +00:00
JoshuaJB c07d394999 Fix GCC build of 2c14d94559. Refs #2589
This was SVN commit r15279.
2014-06-04 03:03:58 +00:00
leper 2c14d94559 Replace usage of CParser for CColor.
Switches format to use integers only.
Adds logging if the string is invalid.
Refs #2589.

This was SVN commit r15278.
2014-06-04 00:58:05 +00:00
Ykkrosh db39d742f0 Fix units falling off the edge of the world.
I guess changes to the map loading sequence caused the TerrainChanged
message to be sent before the map was switched from square to circular
instead of after. The pathfinder didn't notice the switch, so it
continued treating the map as if it were square, allowing units to walk
into the permanent map-corner SOD and vanish, and allowing territories
to expand into the SOD.

Tell the pathfinder explicitly when the map shape changes, so it can
discard its cached data correctly.

This was SVN commit r15277.
2014-06-03 22:35:40 +00:00
mimo 0900005e5b fix #2605
This was SVN commit r15276.
2014-06-03 19:41:11 +00:00
mimo 86a99b745e Petra: code rearrangement + small improvments
This was SVN commit r15275.
2014-06-02 20:21:28 +00:00
leper 4f6afbc0bf Fix non-PCH build.
This was SVN commit r15274.
2014-06-02 20:06:27 +00:00
sanderd17 b4f3b503f2 code style cleanup
This was SVN commit r15273.
2014-06-02 15:48:37 +00:00
sanderd17 a500826ae4 Since the VFS logs the missing files now, there's no reason to crash on it.
This was SVN commit r15272.
2014-06-02 15:41:41 +00:00
sanderd17 49ca719049 Reinitialize music when hotloading. Fixes crash when hotloading GUI files.
This was SVN commit r15271.
2014-06-02 15:13:16 +00:00
historic_bruno a63ed4e4c4 Fixes rare crash in sound manager, due to worker thread dereferencing global pointer before it had been assigned. Fixes #2333, refs #2387, #2317.
Fixes potential infinite loop if worker thread was running but not
enabled.
Fixes apparent bug in fading sound smoothness.
Cleans up worker class slightly.
Cleans up weird and inconsistent whitespace.

This was SVN commit r15269.
2014-06-02 02:09:58 +00:00
Ykkrosh c17bf75cbb Fix bad merge.
This was SVN commit r15268.
2014-06-01 19:06:58 +00:00
Ykkrosh fb0b4572ab Fix Valgrind complaint about delete vs delete[].
This was SVN commit r15267.
2014-06-01 18:46:14 +00:00
Ykkrosh e6b8339103 Minor optimisation for non-animated units.
This was SVN commit r15266.
2014-06-01 18:25:20 +00:00
Ykkrosh 1882f28504 New unit renderer.
Instead of each CCmpVisualActor rendering itself individually, collect
all the units in a single CCmpUnitRenderer. This avoids the overhead of
doing Interpolate/RenderSubmit calls every frame for every object in the
world. It also allows more efficient culling.

CCmpUnitRenderer knows the positions of each object at the start and end
of each turn, and computes the bounding sphere of the object along that
path. That allows quick culling without recomputing the precise
interpolated transform every frame. (In the future it could be improved
much more.)

Clarify and clean up the sending of PositionChanged messages, and add
new InterpolatedPositionChanged.

Remove the forceFloating parameter from GetInterpolatedTransform, since
it doesn't fit the new design. Replace it with a (non-synchronised) flag
in CCmpPosition.

Move construction progress from CCmpVisualActor to CCmpPosition, so that
it consistently affects all position/transform computation.

Refs #2337.

This was SVN commit r15265.
2014-06-01 18:24:50 +00:00
Ykkrosh d117d96d22 Simplify component deserialization.
Deserialize SYSTEM_ENTITY before any other entities. This makes it safe
for Deserialize() methods to access system components (mirroring how
Init() can already access system components).

Add a Deserialized message, sent after all entities have been
deserialized, to help with some other sequencing problems.

This was SVN commit r15264.
2014-06-01 18:14:09 +00:00
Ykkrosh b30a9a6384 Remove m_NeedInitialXZRotation - not needed after changes to map loading order.
This was SVN commit r15263.
2014-06-01 18:10:00 +00:00
Ykkrosh ceb3c3d366 MapReader: Load terrain before entities.
This allows component Init functions to make use of the terrain
immediately, instead of delaying some computations until the first
frame.

This was SVN commit r15262.
2014-06-01 18:08:11 +00:00
Ykkrosh fe3315376c Add BoundingSphere, SOverlaySphere.
BoundingSphere is similar to a bounding box, but more spherical.

SOverlaySphere is useful for visualising BoundingSphere (it's quite
inefficient and should only be used for debug functionality).

Normalise the camera frustum clipping planes, so that IsSphereVisible
gives the correct result.

This was SVN commit r15261.
2014-06-01 18:05:46 +00:00
Mythos_Ruler 3b0fee9073 This was SVN commit r15260. 2014-06-01 13:15:16 +00:00
mimo ac925ed1b6 fix 8efc3b0241
This was SVN commit r15259.
2014-06-01 12:49:34 +00:00
mimo 8efc3b0241 code rearrangement
This was SVN commit r15258.
2014-06-01 09:47:12 +00:00
sanderd17 6f11097c00 Allow the CLI to load skirmish maps. From now on, the directory must be included in the map path to load any maps (see the readme). Patch by Teiresias. Fixes #2572
This was SVN commit r15257.
2014-06-01 08:18:46 +00:00
Mythos_Ruler 38130e5b94 Brit woman can build rotary mill now.
Spartan commando can build the Theatron now.

Sibylline Books tech from Roman Wonder to Roman Temple.

This was SVN commit r15256.
2014-06-01 04:13:19 +00:00
sanderd17 608ab456d5 fix tests
This was SVN commit r15255.
2014-05-31 14:57:14 +00:00
sanderd17 59c9ae670f Stop VFS from causing a crash when the AI player isn't found. Patch by Itms. Fixes #2558
This was SVN commit r15254.
2014-05-31 14:55:09 +00:00
sanderd17 bb16a8ee98 Fix ungarrisoning via ungarrisoning pane
This was SVN commit r15253.
2014-05-31 14:03:00 +00:00
sanderd17 17d83a8b4c Add ungarrison button to ungarrison specific entities
This was SVN commit r15252.
2014-05-31 13:58:16 +00:00
sanderd17 e2aa24fc9a Clean up the turret interface a bit + fix serialisation for turrets
This was SVN commit r15250.
2014-05-31 11:35:07 +00:00
sanderd17 8ef7278306 Add a bonus to units on walls + disable placing units on palisades (which was enabled by accident due to inheritance)
This was SVN commit r15249.
2014-05-31 11:02:58 +00:00
mimo f5c5bbe26d some fixes for Petra AI
This was SVN commit r15247.
2014-05-30 15:24:19 +00:00
sanderd17 cfec28e553 Add the Engine code for turrets + use them to get units on walls. The scripted TurretHolder isn't included due to lack of usability for now. Refs #2577
This was SVN commit r15246.
2014-05-30 14:46:06 +00:00
Mythos_Ruler d05bd656e7 Added Sibylline Books tech for Romans.
Tweaked Roman Logistics tech. Tweaked Siwa Oasis skirmish.

Balance changes: -5 attack, -4 range, -10 health for cavalry
skirmishers, after discussion with alpha123.

This was SVN commit r15245.
2014-05-30 04:18:05 +00:00
mimo 84d799ed9f Petra: reduce the CPU time for building placement
This was SVN commit r15244.
2014-05-29 20:39:09 +00:00
mimo 7105dabca7 fix failing unit training in Aegis and Petra
This was SVN commit r15243.
2014-05-29 20:18:29 +00:00
sanderd17 e0218fff8d New final fix?
This was SVN commit r15242.
2014-05-27 14:54:51 +00:00
sanderd17 7c39259ee5 Now I should get it right
This was SVN commit r15241.
2014-05-27 14:00:21 +00:00
sanderd17 5762721b09 Strange how I'm able to make that many mistakes
This was SVN commit r15240.
2014-05-27 13:42:04 +00:00
sanderd17 82db905b8e Fix previous commit
This was SVN commit r15239.
2014-05-27 12:32:57 +00:00
sanderd17 3413dc84a1 make it possible for mods to add new unit commands
This was SVN commit r15238.
2014-05-27 11:17:29 +00:00
sanderd17 b9f3a95e17 Make UnitAI moddable by exposing the FSM spec and calculated FSM as part of the prototype
This was SVN commit r15237.
2014-05-27 07:24:07 +00:00
JoshuaJB e4d3189494 Lots of GUI fixes to issues pointed out by alpha123 on IRC.
This was SVN commit r15235.
2014-05-27 05:34:28 +00:00
mimo a75342e2c7 minor changes in petra: cleanings and timing optimization
This was SVN commit r15234.
2014-05-26 19:52:51 +00:00
sanderd17 a0913cbc75 Fix the interpolation changes from the previous commit, as they weren't smooth
This was SVN commit r15232.
2014-05-26 17:12:05 +00:00
Ykkrosh 85a1f880ab Fix compatibility with LLVM libc++ (used on OS X).
libc++ vector asserts that allocator::value_type is correct, so we have
to pass in the correct types.

This was SVN commit r15231.
2014-05-26 16:48:28 +00:00
sanderd17 5ae9f678b0 Clean up position height methods + add new. Now we have the ability to losslessly read and write positions to entities from the scripts.
This was SVN commit r15230.
2014-05-26 16:23:46 +00:00
Ykkrosh c3a0ac43bf Broadcast TerrainChanged message, so CCmpSelectable can actually see it.
This was SVN commit r15229.
2014-05-26 15:44:35 +00:00
Ykkrosh 4ca40116ed Fix building selection rings not being recomputed when the terrain or water under them is changed.
This was SVN commit r15228.
2014-05-26 13:45:49 +00:00
Ykkrosh 1871daab0d Fix pathfinding and territories not being recomputed when water height changes.
This was SVN commit r15227.
2014-05-26 13:45:10 +00:00
Ykkrosh 41f62cd3ff Add WaterChanged message, for things that need to be recomputed when the water height changes.
This was SVN commit r15226.
2014-05-26 13:44:24 +00:00
Ykkrosh 6407b593d6 Make displayFrustum controllable from scripts.
This was SVN commit r15225.
2014-05-26 13:42:32 +00:00
Ykkrosh 1936abad98 Remove length limits on script output in console.
This was SVN commit r15224.
2014-05-26 13:39:45 +00:00
Ykkrosh b78c38b935 Disable GCC warning triggered by wxWidgets.
This was SVN commit r15223.
2014-05-26 13:38:09 +00:00
Mythos_Ruler b7281c629c Rocks -> Arrows. Fixes #2565.
This was SVN commit r15222.
2014-05-26 04:48:33 +00:00
Mythos_Ruler bc8792ba96 Proper double-click behavior for these champion units. Fixes #2586.
This was SVN commit r15221.
2014-05-26 04:41:35 +00:00
historic_bruno 39cfb6748d Fixes flickering in main menu backgrounds on old Intel GPUs, by manually setting the z-values for each layer, fixes #2143
This was SVN commit r15220.
2014-05-26 04:38:47 +00:00
Mythos_Ruler 4dd90a1ef3 A new skirmish map.
This was SVN commit r15219.
2014-05-26 04:23:10 +00:00
Mythos_Ruler d7f1427c9b Tweaked Ptolemies sandbox scenario.
This was SVN commit r15218.
2014-05-26 01:28:56 +00:00
Mythos_Ruler 7bc0f611b3 Auras for Roman heroes Marcellus and Maximus.
This was SVN commit r15217.
2014-05-26 01:26:53 +00:00
Ykkrosh e79adae921 Attempt to work around LOS texture alignment bug.
For unknown reasons, sometimes glTexSubImage2D acts as if
GL_UNPACK_ALIGNMENT = 2 or 4, instead of 1. This causes the odd-sized
array uploaded for the LOS texture to be interpreted incorrectly, and
the LOS texture gets rendered very incorrectly.

Pad the array to a multiple of 4 in all cases, so that
GL_UNPACK_ALIGNMENT shouldn't affect it.

Hopefully fixes #2594.

This was SVN commit r15216.
2014-05-25 13:30:39 +00:00
mimo 3d306702df Petra: recover some cases where units are blocked because of pathfinder
This was SVN commit r15215.
2014-05-25 10:00:55 +00:00
JoshuaJB 072e4a614e Bump lobby version string.
This was SVN commit r15214.
2014-05-25 03:21:32 +00:00
JoshuaJB 5ce12c2263 Start phasing out the use of CParser in the GUI. Makes GUI parsing generally faster and stricter while adding better tests and debug information.
This was SVN commit r15213.
2014-05-25 03:16:52 +00:00
mimo 9c908a5f46 improve 6764b15ae2 by allowing a selected button to be selected again
This was SVN commit r15212.
2014-05-24 16:23:11 +00:00
mimo 6764b15ae2 ease switch to 100% trade of one resource using Shift-click
This was SVN commit r15211.
2014-05-24 15:37:19 +00:00
mimo 874ceb76a5 fix JS warning in Petra
This was SVN commit r15210.
2014-05-24 14:52:05 +00:00
sanderd17 8589003ac6 Let for loop return early. Small code style fix.
This was SVN commit r15209.
2014-05-24 10:18:15 +00:00
sanderd17 7f5264d3be Fix test for unhealable and healable classes. Make healers able to heal again
This was SVN commit r15208.
2014-05-24 09:50:10 +00:00
sanderd17 1e3ba2d438 Let formations use the UnitAI.AddOrder method, instead of directly deciding if ReplaceOrder or PushOrder should be used. This replaces the expectedRoute, and might lead to units behaving more as demanded. Refs #2568
This was SVN commit r15207.
2014-05-24 09:40:21 +00:00
JoshuaJB 2fbc55ec96 Update lobby server README.
This was SVN commit r15206.
2014-05-23 15:52:29 +00:00
JoshuaJB 9ee17342b1 Change developer overlay to only be openable through Alt+D shortcut. Fixes #2569
This was SVN commit r15205.
2014-05-23 00:18:16 +00:00
mimo 84b53933ff fix the AIs broken after b55b6a9cf1
This was SVN commit r15204.
2014-05-22 20:40:14 +00:00
leper 27104a4f33 Remove MaxDistance from Roman merchant ship. See 1207b146bb.
This was SVN commit r15203.
2014-05-22 16:39:00 +00:00
leper 52e807a207 Healers should not heal animals.
If we want war dogs to be healable we should change the class to
Domestic.

This was SVN commit r15202.
2014-05-22 16:38:57 +00:00
sanderd17 ea334e3716 Fix class counting
This was SVN commit r15201.
2014-05-22 16:20:36 +00:00
mimo 41de9f6e84 Petra fixes for maps without cc
This was SVN commit r15200.
2014-05-22 15:09:42 +00:00
sanderd17 3fc2574ecf Disable syntagma and testudo for champion cavalry
This was SVN commit r15199.
2014-05-22 14:50:53 +00:00
sanderd17 d20e244a37 fix tests
This was SVN commit r15198.
2014-05-22 14:38:49 +00:00
sanderd17 16c5bc96dc Add ptol and sele hero auras. Fixes #2444. Patch by Silk.
This was SVN commit r15197.
2014-05-22 14:37:11 +00:00
sanderd17 b55b6a9cf1 Add visible class names to all common buildings
This was SVN commit r15196.
2014-05-22 14:31:48 +00:00
sanderd17 ac1a9bf8d1 Clean up class parsing + add visible classes to be displayed in the GUI without adding them separatedly to our tooltips
This was SVN commit r15195.
2014-05-22 10:20:02 +00:00
historic_bruno eaa382a60c This was SVN commit r15194. 2014-05-22 01:38:46 +00:00
historic_bruno ee50168096 Removes errant text from GUI XML files, fixes some untranslated text per [wiki:Internationalization]. Refs #2507
This was SVN commit r15193.
2014-05-22 01:36:45 +00:00
scythetwirler eae7978868 Makes a word consistent with American English
This was SVN commit r15192.
2014-05-21 20:24:37 +00:00
sanderd17 3e985225fc Remove remaining MaxDistance. See 1207b146bb
This was SVN commit r15191.
2014-05-21 14:20:00 +00:00
sanderd17 1207b146bb Let trading range depend on obstruction. Fixes #2556
This was SVN commit r15190.
2014-05-21 14:03:57 +00:00
sanderd17 0a3eb92d62 Add slower game options. Might be usefull for slow players or development. Fixes #2499. Patch by DanCar.
This was SVN commit r15189.
2014-05-21 13:46:42 +00:00
sanderd17 01777a7ade fix tests
This was SVN commit r15188.
2014-05-21 12:28:39 +00:00
mimo 2303ad97cf petra: test on cc existence before trying to build
This was SVN commit r15187.
2014-05-21 09:37:41 +00:00
scythetwirler e0fb1223d6 Put the colon inside the translate tag.
This was SVN commit r15186.
2014-05-21 03:02:54 +00:00
mimo 153b1162fb changes for the AI to deal with maps with celts and change comment on naval maps
This was SVN commit r15185.
2014-05-20 21:30:48 +00:00
Mythos_Ruler 5dbf7ffa1e Portraits for these two Ptol boats.
This was SVN commit r15184.
2014-05-20 21:09:25 +00:00
mimo 4707f11b07 Petra AI: fix a bug in naval transport and adapt strategy to initial available resources
This was SVN commit r15183.
2014-05-20 19:48:54 +00:00
sanderd17 99a7bc67ac Fix 672f5a8b11 when sloppyness is 0
This was SVN commit r15182.
2014-05-20 18:45:36 +00:00
sanderd17 317c6057ed Remove members from a formation when they garrison. Fixes #2545
This was SVN commit r15181.
2014-05-20 17:47:47 +00:00
sanderd17 672f5a8b11 Add sloppyness and separate icon path to formation templates (makes it possible to have multiple formation templates - like different settings for different civs - with only one icon file)
This was SVN commit r15180.
2014-05-20 17:18:40 +00:00
leper 4c9d99ff68 Add plural forms for Gaelic. Fixes #2575.
This was SVN commit r15179.
2014-05-20 17:11:47 +00:00
fabio 41bc9fa65e Remove a newline in a tooltip.
There is no need for it.
Some translations also add the newline that, due to different words
length, appears in an unwanted place.

This was SVN commit r15178.
2014-05-20 10:41:09 +00:00
historic_bruno d8dbd499f8 Probably fixes uninitialized variable warning in GLSL model shader on some drivers
This was SVN commit r15177.
2014-05-20 03:41:46 +00:00
mimo d0e18900ae avoid new harmless spidermonkey warnings
This was SVN commit r15176.
2014-05-19 22:09:44 +00:00
leper 2081c62ab4 Support newer version of miniupnpc api. Refs #2552.
This was SVN commit r15174.
2014-05-19 21:01:06 +00:00
leper 940868398c Use Boost.Signals2 for Atlas. Patch by fabio. Fixes #2469.
This was SVN commit r15173.
2014-05-19 21:01:02 +00:00
mimo 15472f7797 fix Petra not gathering already dead animals and remove forgotten debug printout
This was SVN commit r15172.
2014-05-19 19:45:08 +00:00
JoshuaJB dfc7567561 Fix multiple observers on multiplayer games to work more reliably. Fixes #2529
This was SVN commit r15171.
2014-05-19 16:02:42 +00:00
fabio f4edb8dce5 Simplify and improve x86/amd64 CPU build flag
On amd64 removes the "-msse" flag, which is already
enabled by default.

On x86 changes the flags from "-march=i686 -msse" to
"-march=pentium3 -mtune=generic". This should also enable
other CPU features like MMX, while keeping the same
minimun supported CPU (Intel Pentium3 or AMD Athlon 4)
previously required by "-msse".

Fixes #2329.

This was SVN commit r15170.
2014-05-19 12:18:55 +00:00
sanderd17 4a3df1c8c5 Add extra check so units can't attack entities out of range. Fixes #2570
This was SVN commit r15168.
2014-05-19 09:05:18 +00:00
sanderd17 196eebe803 Fix partial internationalisation of the limit changers
This was SVN commit r15167.
2014-05-19 08:22:20 +00:00
sanderd17 5ae4619b81 Internationalize the AllowedToCreate method from EntityLimits. Fixes #2546.
This was SVN commit r15165.
2014-05-19 07:35:05 +00:00
historic_bruno 81da366268 Deletes some obsolete and broken old art files, refs #2524
This was SVN commit r15164.
2014-05-19 01:47:22 +00:00
historic_bruno ae29becb37 Removes pointless minimap state change during attack notification, it broke synchronized simulation state and caused some OOS errors. Fixes #2525. Refs #1719, #2526.
This was SVN commit r15163.
2014-05-19 01:35:14 +00:00
scythetwirler e6d762882a Add the tooltip option to default.cfg. Refs #2549.
This was SVN commit r15162.
2014-05-19 01:00:30 +00:00
scythetwirler 61b6eba4c1 Adds a config option for more detailed tooltips. Fixes #2549.
This was SVN commit r15161.
2014-05-19 00:01:47 +00:00
mimo 8e6b624ea5 fix civ in template
This was SVN commit r15160.
2014-05-18 17:00:54 +00:00
sanderd17 bd7ebe268e Make skirmish entities better moddable. Fixes #2523. Patch by Idanwin.
This was SVN commit r15159.
2014-05-18 15:53:57 +00:00
sanderd17 7ff5fbda2b Allow system components to be registered on the scripting side (so mods can make their own system components).
This was SVN commit r15157.
2014-05-18 13:44:08 +00:00
leper 2b05a8d233 Reenable JS warnings that were disabled in db0376fdc2.
This was SVN commit r15156.
2014-05-18 13:25:08 +00:00
leper 1432e082bf Update room and bot name.
This was SVN commit r15155.
2014-05-18 13:25:00 +00:00
mimo 814d3dc0e8 fix previous commit
This was SVN commit r15154.
2014-05-18 12:39:58 +00:00
mimo 3273720776 major update of Petra AI with first version of naval map support
This was SVN commit r15153.
2014-05-18 11:34:36 +00:00
mimo 3596f1c341 modify AI common-api to allow fishing and minor fixes
This was SVN commit r15152.
2014-05-18 10:50:44 +00:00
sanderd17 b7f6c00c2b Mark all components as global variables and allow to re-register existing components to update their schema and/or message receiving methods.
This allows for components to be extended in other files, so mods don't
have to overwrite entire components.
Fixes #2517. Thanks to Rada for helping on this
(also fix some tests broken in the previous commit)

This was SVN commit r15150.
2014-05-18 08:20:02 +00:00
sanderd17 86196212e2 Improve navigation for ship formations by setting the formation controller to the right passability class
This was SVN commit r15149.
2014-05-18 07:59:43 +00:00
Yves 96c806841d Fixes the packaging script for some changes related to l10n and SpiderMonkey
This was SVN commit r15148.
2014-05-12 01:36:32 +00:00
Ykkrosh 3ecbb7667b Restrict set of translations included in releases
This was SVN commit r15147.
2014-05-11 17:43:36 +00:00
sanderd17 0a880413fe Fix the out-of-world error we saw in the team game yesterday
This was SVN commit r15145.
2014-05-11 09:36:12 +00:00
JoshuaJB d70abd548a Move yellow modern buttons to their own style to correct naming issues (eg. ModernButtonRed was yellow). New name is ModernButtonYellow. Also switched the default button color back to red due to complaints by team members on IRC.
This was SVN commit r15144.
2014-05-11 03:25:34 +00:00
Mythos_Ruler 056d740e7f Fixes #2542
This was SVN commit r15143.
2014-05-10 23:40:53 +00:00
mimo fb2cda5aba prevent weird behaviour when the ship in which we want to garrison is selected with the units to garrison
This was SVN commit r15142.
2014-05-10 22:21:24 +00:00
Mythos_Ruler b2ec4e0e2a Portrait for Roman bireme.
Modern button from red to yellow.

This was SVN commit r15141.
2014-05-10 21:33:46 +00:00
Mythos_Ruler f287a7da12 Elephants can transport aboard Medium and Heavy warships.
This was SVN commit r15140.
2014-05-10 16:15:26 +00:00
sanderd17 da8843127c Fix displaying wrong text when no tooltip was defined, as reported by Kanetaka. Also cleans up the code to make it shorter.
This was SVN commit r15139.
2014-05-10 13:37:38 +00:00
sanderd17 f15160412a Enlarge the ideographic ranges in the word boundaries, fixes Japanese rendering a bit
This was SVN commit r15138.
2014-05-09 12:13:42 +00:00
Mythos_Ruler e79ad6b30b Switch Military Colonies to use the mercenary camp actor.
Update a few tech names (shouldn't affect translations).

This was SVN commit r15137.
2014-05-09 00:18:23 +00:00
mimo a5708873db set the right civ for mace dock
This was SVN commit r15136.
2014-05-08 23:15:01 +00:00
sanderd17 2c1917176a Use untranslated playerState.civ, if the civName 'Gaia' happened to be translated, this resulted in an undefined texture, which was the case in Chinese, and reported by Gameboy.
This was SVN commit r15135.
2014-05-08 14:07:48 +00:00
sanderd17 8cec641156 Replace strictness test by a different one, as the old test wasn't considered non-strict anymore.
This was SVN commit r15134.
2014-05-08 13:26:21 +00:00
sanderd17 955e6e788a Fix counting foundations as concuestCritical.
This was SVN commit r15133.
2014-05-08 11:27:09 +00:00
mimo 8e39a2297d fix delete selection broken (again) in bb65358dac. Code is changed to prevent this to happen again
This was SVN commit r15131.
2014-05-08 08:21:20 +00:00
scythetwirler a620cf8e17 Fixes an issue with unassigned players being functionally ready but not having the green marker
This was SVN commit r15130.
2014-05-08 04:47:57 +00:00
JoshuaJB bb65358dac After discussion with scythetwirler with input from Philip and Mythos, popup dialogs (like for delete, resign, and exit) should have no on the right as we want the user to click no in most of those cases. It's the 'recommended' action. In the case of save/cancel or continue/back, save and continue should always be on the right as that's the 'recommended' action. With some review, this placement seems consistant across operating systems.
This was SVN commit r15129.
2014-05-08 03:43:03 +00:00
historic_bruno c37a8cafc3 Fixes a few building warnings and convention issues from 19ca1e3ebf
This was SVN commit r15128.
2014-05-07 23:33:21 +00:00
sanderd17 db0376fdc2 Temporarily disable the Spidermonkey warnings for release
This was SVN commit r15127.
2014-05-07 19:42:12 +00:00
Gallaecio 83b6175358 Added a script to check translations for URLs that are not in the original strings.
This was SVN commit r15126.
2014-05-07 19:02:17 +00:00
sanderd17 cbeb40a14b Fix foundations changing entity limits. Fixes #2536
This was SVN commit r15123.
2014-05-07 08:24:31 +00:00
sanderd17 19ca1e3ebf Fix locale verification to also allow ICU locales without data, but still don't allow bogus locales. Patch by Yves. Fixes #2533.
This was SVN commit r15122.
2014-05-07 08:14:57 +00:00
mimo c5b184744c stop failed attack in aegis, see #2486
This was SVN commit r15121.
2014-05-07 07:03:21 +00:00
JoshuaJB 27382a7d78 Swap OK and Cancel positions on the AI config GUI page. (Also cleanup the XML a bit)
This was SVN commit r15120.
2014-05-06 19:02:34 +00:00
sanderd17 9fadc2709c Clean up the gate transformation tooltips as it caused problems for mods.
This was SVN commit r15119.
2014-05-06 18:52:05 +00:00
Mythos_Ruler 34a9b8c260 New song by Omri to the Celtic civs.
This was SVN commit r15118.
2014-05-06 12:28:25 +00:00
OmriLahav 93cfdce090 This was SVN commit r15116. 2014-05-06 08:19:45 +00:00
mimo f181a89c34 fixes wrong test
This was SVN commit r15115.
2014-05-05 19:22:54 +00:00
sanderd17 3a008ba532 Mask lobby password so it doesn't appear in any logs
This was SVN commit r15113.
2014-05-05 15:41:17 +00:00
historic_bruno bb43a71460 Updates checkrefs.pl to support skirmish maps
This was SVN commit r15112.
2014-05-05 01:09:53 +00:00
mimo 48bb533895 temporarily disable trader formation, see #2528
This was SVN commit r15111.
2014-05-04 21:38:31 +00:00
sanderd17 06685a3f9b Fix small issue
This was SVN commit r15110.
2014-05-04 20:22:31 +00:00
historic_bruno 44b40a85bb Fixes some broken actor references
This was SVN commit r15109.
2014-05-04 08:08:48 +00:00
historic_bruno ba5e6d9168 Removes duplicate FleeDistance property from template_unit_fauna_decorative (found by checkrefs.pl)
This was SVN commit r15108.
2014-05-04 05:52:51 +00:00
historic_bruno d2ecbecf32 Fixes tex_codec typo that broke BMP writing and big screenshots, fixes #2515
This was SVN commit r15107.
2014-05-04 05:49:31 +00:00
scythetwirler 9b136a45fc Fixes a couple dialog buttons
This was SVN commit r15106.
2014-05-04 02:44:14 +00:00
sanderd17 2eb2845c29 Extra check on the existance of a replacement, be more forgiving in the skirmish replacer.
This was SVN commit r15104.
2014-05-03 17:53:37 +00:00
sanderd17 dd13e01ac6 Extra check on existance of template, to be more forgiving if some template in the productionqueue doesn't exist.
This was SVN commit r15103.
2014-05-03 17:29:22 +00:00
Enrique e70eccf0ca Added Stan's contributor ptol_corral details in Lordgood's model
Added Stan's Cleopatra texture

This was SVN commit r15102.
2014-05-03 13:05:34 +00:00
sanderd17 575cdd7979 A spearman isn't ranged
This was SVN commit r15101.
2014-05-03 13:04:08 +00:00
sanderd17 b09925b27e switch the game setup confirmation buttons and move the welcome screen buttons
This was SVN commit r15100.
2014-05-03 09:21:05 +00:00
sanderd17 542bc1b273 Further fix switched buttons
This was SVN commit r15099.
2014-05-03 09:07:31 +00:00
Yves c1d5f6882c Also switch the button name to disable the correct one.
4e0a588456 only switched the label and the action.

This was SVN commit r15098.
2014-05-03 08:59:31 +00:00
sanderd17 12ec51783d Fix in-game manual display
This was SVN commit r15097.
2014-05-03 08:53:06 +00:00
sanderd17 4e0a588456 Switch more buttons, see 911be4e860
This was SVN commit r15096.
2014-05-03 08:45:19 +00:00
scythetwirler f066549523 Makes the other players default to unassigned instead of Default AI in a sandbox map.
This was SVN commit r15095.
2014-05-03 04:00:14 +00:00
Yves 122dae799b Don't allow returning an invalid locale from the advanced language menu.
This was SVN commit r15094.
2014-05-02 21:14:28 +00:00
sanderd17 99486ed7ab Add camera to the second player, somehow avoids strange errors.
This was SVN commit r15093.
2014-05-02 20:08:48 +00:00
mimo b8e9bae75e fixes Petra trying to keep going with a canceled attack
This was SVN commit r15092.
2014-05-02 11:03:24 +00:00
sanderd17 15f56cd984 Fix armour and attack display of heroes
This was SVN commit r15091.
2014-05-02 10:32:21 +00:00
sanderd17 ace3269768 Fix problem with sprintf errors being thrown when the AI places structures on the wrong places, make the code more uniform. Fixes #2485
This was SVN commit r15090.
2014-05-02 10:09:53 +00:00
sanderd17 a36a0bbd87 Improve my previous fix by throwing error objects instead of strings
This was SVN commit r15089.
2014-05-02 07:34:05 +00:00
sanderd17 aaf92409c9 Fix sprintf error reporting by printing the stack trace, and not trying to translate the calls
This was SVN commit r15088.
2014-05-02 07:27:44 +00:00
mimo 5658bb391b fix delete selection no more working after #15074
This was SVN commit r15087.
2014-05-01 21:06:43 +00:00
Yves 210374d86d Fixes Aegis not training additional units when no starting units are around.
Patch by Teiresias.

Fixes #2460

This was SVN commit r15086.
2014-05-01 13:13:38 +00:00
sanderd17 b9af0ac0e4 Enlarge various elements of the lobby login page to fit other languages.
This was SVN commit r15085.
2014-05-01 12:59:50 +00:00
sanderd17 a64456e6d8 Fix small space issue in the lobby (still some work to do there)
This was SVN commit r15084.
2014-05-01 11:38:53 +00:00
Gallaecio 47fc05d696 String freeze? Who said that?
Fix typo: avalible → available.

This was SVN commit r15082.
2014-05-01 01:22:59 +00:00
Gallaecio d51f2a0c35 Version bump and regeneration of translation templates accordingly.
This was SVN commit r15081.
2014-05-01 00:44:47 +00:00
leper c7b0261860 Fix the numbering in the Terms of Use for the lobby. Reverts 813db55b08.
This was SVN commit r15079.
2014-04-30 23:24:24 +00:00
leper 62f5476dec Add support for adding translation context to XML elements. Patch by Gallaecio.
Add translation context to some lobby headers.

This was SVN commit r15078.
2014-04-30 22:33:08 +00:00
sanderd17 057fa79bdb Revert db6c3f86f2. Changing something like that right before release is dangerous.
This was SVN commit r15077.
2014-04-30 17:53:51 +00:00
JoshuaJB 11865a8865 Revert a hack that snuck into an earlier commit of mine.
This was SVN commit r15076.
2014-04-30 17:22:38 +00:00
JoshuaJB db6c3f86f2 Missing file
This was SVN commit r15075.
2014-04-30 06:29:42 +00:00
JoshuaJB 911be4e860 The convention is confirm button on right, decline button on left (updates some in-game dialogs). Also enables GLSL.
This was SVN commit r15074.
2014-04-30 06:28:57 +00:00
JoshuaJB 90581f366c This was SVN commit r15073. 2014-04-30 05:36:50 +00:00
JoshuaJB e7b4c8b92a Make game automatically resume after closing the options menu. Refs #2507
This was SVN commit r15072.
2014-04-30 05:31:44 +00:00
JoshuaJB a88f1222c0 Update AI descriptions, closes #2500. Also correct some capitalization and developer overlay transparency for #2507.
This was SVN commit r15071.
2014-04-30 05:04:12 +00:00
JoshuaJB 748ebdfdb0 Various GUI fixes and cleanup.
This was SVN commit r15070.
2014-04-30 04:38:53 +00:00
JoshuaJB dfacf5358c New lobby connect/registration page. Not perfect but fixes most of the outstanding issues. Refs #2312
This was SVN commit r15069.
2014-04-30 00:46:57 +00:00
scythetwirler 15e9ffa21b Converts the save dialog to the modern UI. Refs #2507.
This was SVN commit r15068.
2014-04-29 21:45:00 +00:00
leper 29cab5f5ed Also change reveal map to revealed map.
Fix typo in tutorial map. Remove message refering to finite fields.

This was SVN commit r15066.
2014-04-29 14:51:21 +00:00
leper b246017f9f Explore_d_ map.
This was SVN commit r15065.
2014-04-29 13:10:56 +00:00
sanderd17 b3ab49bb30 Really remove the minimum damage of 1, what 37c8e77d8e was supposed to do
This was SVN commit r15064.
2014-04-29 07:15:10 +00:00
JoshuaJB 1e6614918b Initial modern buttons. Lobby/prelobby now only rely on the modern common files.
This was SVN commit r15063.
2014-04-29 00:07:27 +00:00
leper c77826e9aa Translate some message boxes when opening websites.
Fix a typo. Refs #2501.

This was SVN commit r15062.
2014-04-28 22:30:40 +00:00
leper 683170ea19 Enable/disable GenTangents when enabling/disabling PreferGLSL. Fixes #2505.
This was SVN commit r15061.
2014-04-28 22:30:27 +00:00
sanderd17 876d0e4e66 Forgot to fix some strings
This was SVN commit r15060.
2014-04-28 20:19:32 +00:00
sanderd17 e6e5b9f11f Add a link in the main menu to for translators. Patch by Stan, fixes #2501
This was SVN commit r15059.
2014-04-28 20:17:39 +00:00
leper 64d3d0b4b2 Remove falsely attributed quote.
This was SVN commit r15058.
2014-04-28 17:59:02 +00:00
sanderd17 4695f3425b Add the possibility to show the welcome screen on every update, next to the possibility to disable it completely. Patch by Itms, fixes #2116
This was SVN commit r15057.
2014-04-28 17:18:46 +00:00
Gallaecio f26a2917d3 Translate map name in the summary page
This was SVN commit r15056.
2014-04-28 15:54:47 +00:00
sanderd17 b8245da606 Improve disabled technology tooltip. Fixes #2497
This was SVN commit r15055.
2014-04-28 15:17:26 +00:00
sanderd17 a49b359748 Fix formations attacking by adding a combat.approaching state. Fixes #2496
This was SVN commit r15054.
2014-04-28 13:05:47 +00:00
Gallaecio b5dfacbf18 Translated map name in the loading screen, regenerated translation templates and updated translations from Transifex
This was SVN commit r15053.
2014-04-28 12:31:28 +00:00
Gallaecio fb80e29d41 Changes to English tooltips for consistency
Reported by an Italian translator, Fabio, at Transifex:
https://www.transifex.com/projects/p/0ad/translate/#it/public/13718374
https://www.transifex.com/projects/p/0ad/translate/#it/public/24494405

The periods were added in the main menu (only 2 tooltips without them)
and removed from the options menu (only 1 tooltip with it). In the
future, we might want to be consistent with tooltips through all the
GUI.

This was SVN commit r15052.
2014-04-28 10:11:11 +00:00
JoshuaJB 75713cc101 Don't display 'UNR' in the gamesetup on unranked players. This makes unranked lobby playernames consistant with those of rankless players who join via IP.
This was SVN commit r15051.
2014-04-28 05:39:18 +00:00
JoshuaJB 3014df2280 Disable wireframe mode in ranked games. Fixes #2401.
This was SVN commit r15050.
2014-04-28 05:02:20 +00:00
Mythos_Ruler da7526dbd4 Tweaked button.
This was SVN commit r15049.
2014-04-27 23:48:15 +00:00
scythetwirler e6ec0b2fc9 Add the limit back to provisionality in the rating system.
This was SVN commit r15048.
2014-04-27 23:42:56 +00:00
scythetwirler fde558b4b2 Implements a (hopefully) better rating system with an inflation test.
This was SVN commit r15047.
2014-04-27 23:13:29 +00:00
Gallaecio a8b50a66da Fixes to the lobby internationalization by sanderd17 and me
All strings are now translated at the last point, right before they are
added to the GUI.
Some other fixes are included.

This was SVN commit r15046.
2014-04-27 20:24:48 +00:00
JoshuaJB b3acb5657f Fix moderater prefixes in the lobby.
This was SVN commit r15045.
2014-04-27 19:26:12 +00:00
JoshuaJB 251372a062 Missing var statement.
This was SVN commit r15044.
2014-04-27 19:10:28 +00:00
JoshuaJB cfb72e990b Make gamesetup chat formatting more similar to the lobby and note that all players must be ready before starting a multiplayer game.
This was SVN commit r15043.
2014-04-27 19:06:21 +00:00
Yves 8f53ddd6b9 Unifies some translatable strings on the gamesetup screen.
This was SVN commit r15042.
2014-04-27 19:03:15 +00:00
Yves 2f8487b84b Adds translation support for the "More options" window on the gamesetup screen.
This was SVN commit r15041.
2014-04-27 18:41:56 +00:00
scythetwirler 983abd1952 Updates splashscreen style and adds a background to the scrollbar to match the dropdown
This was SVN commit r15040.
2014-04-27 18:30:40 +00:00
scythetwirler a163ac1c11 Reverts a rogue copy-paste in the last commit.
This was SVN commit r15039.
2014-04-27 18:23:15 +00:00
scythetwirler b8d3ef71f7 Fixes the updated dropdowns for multiplayer clients broken in 65f4c8b0e8
This was SVN commit r15038.
2014-04-27 18:18:05 +00:00
Gallaecio 461a17c95d Reverted d91756b251 after breaking the fix for the lobby that sanders17 had implemented
This was SVN commit r15037.
2014-04-27 17:38:19 +00:00
scythetwirler 65f4c8b0e8 Moves Select number of players to a more fitting and translation-friendly location. Also makes the map selection texts more translation-friendly in terms of space.
This was SVN commit r15036.
2014-04-27 17:24:37 +00:00
scythetwirler f9ccf05aa8 Change the style of dropdowns as per Mythos_Ruler. Also moves the rating list to the right side of the leaderboard (where it is on most rating lists).
This was SVN commit r15035.
2014-04-27 16:28:59 +00:00
Gallaecio 60334f05c8 Fix error introduced in 95b0a8d9bf while fixing a warning
This was SVN commit r15034.
2014-04-27 15:56:10 +00:00
scythetwirler 63bcf2fef6 Don't display I'm ready in single player setup. Refs #2447.
This was SVN commit r15033.
2014-04-27 15:32:22 +00:00
scythetwirler ce0f439817 Adjusts the lobby gamelist and dropdowns to support more translations (space-wise).
This was SVN commit r15032.
2014-04-27 14:52:32 +00:00
Gallaecio 95b0a8d9bf Fixed warnings in ‘gui’ due to the new SpiderMonkey
Refs #2372

This was SVN commit r15030.
2014-04-27 13:51:43 +00:00
Gallaecio 60e1ff59f5 Fix warning about msg.guid not being defined
This was SVN commit r15029.
2014-04-27 13:38:17 +00:00
Gallaecio 341bcb1cf9 Fix unfinished change in accidental commit d4109916a3
This was SVN commit r15028.
2014-04-27 13:37:26 +00:00
Gallaecio d4109916a3 Moved the translation of AI messages to a later point
This avoids attempts to translate messages prefixed with keywords,
such as “/team Message prefixed with a keyword”, and translates them
only after the keyword has been removed. Some keywords may hide the
message, removing the need for a translation altogether.

This was SVN commit r15027.
2014-04-27 13:33:15 +00:00
Gallaecio d91756b251 Moved the translation of map data to the loadMap() function
This avoids the translation of strings that had been previously
translated later in the code.

This was SVN commit r15026.
2014-04-27 13:28:47 +00:00
Mythos_Ruler e344225b72 Tweaked this description.
This was SVN commit r15025.
2014-04-27 13:11:50 +00:00
Mythos_Ruler ad5fb85de3 A bunch of tech tweaks.
Tweaked Belgian Bog environment.

This was SVN commit r15024.
2014-04-27 13:10:38 +00:00
Gallaecio 813db55b08 Fixed the numbering in the terms of user of the lobby
Reported by ‘tema’ (Italian translator) at Transifex:
https://www.transifex.com/projects/p/0ad/translate/#it/public/24566468

This was SVN commit r15022.
2014-04-27 10:02:23 +00:00
Gallaecio 243411f0c5 Internationalization of the lobby terms of service and terms of use
This was SVN commit r15021.
2014-04-27 09:13:28 +00:00
sanderd17 0db4cc690e Check for hero attack before querying it. Fixes #2490
This was SVN commit r15020.
2014-04-27 08:03:15 +00:00
JoshuaJB 81883806ec First version of the lobby Terms of Service and Terms of Use.
This was SVN commit r15019.
2014-04-27 05:59:48 +00:00
JoshuaJB 2ad7187f92 Move XMPP polling to the mainloop. Should reduce lobby disconnects. Fixes #2491
This was SVN commit r15018.
2014-04-27 05:37:34 +00:00
scythetwirler fe490df93a Revert an unnecessary part of the last commit (bc9b7f9af3).
This was SVN commit r15017.
2014-04-27 03:26:45 +00:00
scythetwirler bc9b7f9af3 Fixes the tutorial AI and updates the tutorial with the blacksmith.
This was SVN commit r15016.
2014-04-27 03:22:02 +00:00
Gallaecio 98905af6eb Added a context to some very generic strings and regenerated the public mod POT file
This was SVN commit r15015.
2014-04-27 00:23:19 +00:00
scythetwirler 0d3c608b05 Increases title bar width for internationalization support and unsquishes map preview in the lobby
This was SVN commit r15014.
2014-04-27 00:07:27 +00:00
Mythos_Ruler f9dec493fc Changed Ptolemaic and Seleucid Military Colonies to use the merc camp actor for now until proper Military Colony meshes are modeled.
Shrank the size of the gear icon.

Added a "seeds" particle. Doesn't seem to be working though.

This was SVN commit r15013.
2014-04-26 22:49:33 +00:00
scythetwirler aaf5ad1a63 Cosmetic cleanup - Delete full stop and make scrollbar a circle
This was SVN commit r15012.
2014-04-26 22:45:48 +00:00
JoshuaJB 9a809c3131 Revert overlay resizing (forgot about translations) and minor fixes to my last changes.
This was SVN commit r15010.
2014-04-26 19:52:56 +00:00
sanderd17 2ae1e16628 Fix translation of some game setup elements in multiplayer games
This was SVN commit r15009.
2014-04-26 19:52:16 +00:00
JoshuaJB abf12fb503 Enhance the main menu options page and use it to replace the in-game settings page..
This was SVN commit r15007.
2014-04-26 19:31:23 +00:00
scythetwirler d1d7afe46c Implements ready status into gamesetup. Fixes #2447.
This was SVN commit r15006.
2014-04-26 18:34:34 +00:00
Gallaecio 4770e64449 Some i18n fixed on the JavaScript side
Do not try to translate empty strings in translateObjectKeys().
Do not try to translate empty formation tooltips.
Do not translate player names at a point where they are already
translated.

This was SVN commit r15005.
2014-04-26 18:27:53 +00:00
JoshuaJB f5b0fc1076 Swap button placement on options page to be more consistant with other parts of the GUI.
This was SVN commit r15004.
2014-04-26 18:03:29 +00:00
Gallaecio 2b192a4fb5 Do not call Translate() on empty lines
Reported by Yves at Github:
https://github.com/leper/0ad/issues/11

This was SVN commit r15003.
2014-04-26 16:05:41 +00:00
Gallaecio 8fea36cdd0 Made tinygettext’s debug output optional
You can now enable tinygettext’s output from the user.cfg file
(tinygettext.debug).
This enhancement also solved a warning due to the previous workaround,
which was
to uncomment the output line to avoid the debug messages.

This issue was reported by Yves at Github:
https://github.com/leper/0ad/issues/10

This was SVN commit r15002.
2014-04-26 15:32:18 +00:00
Gallaecio baf04bad53 Added support for message extraction from INI files
Refs #2487

This was SVN commit r15001.
2014-04-26 14:06:00 +00:00
Gallaecio 3dd76c84bc Added a translation comment to the ‘Locale:’ string of the language menu
In order to do this, I added support for extracting the ‘comment’
attribute of translatable XML elements.

This was SVN commit r15000.
2014-04-26 12:51:12 +00:00
Gallaecio c82544be9f Use an early return in L10n::GetDictionaryLocale()
Suggested by l777 on the IRC.

This was SVN commit r14999.
2014-04-26 12:29:01 +00:00
Gallaecio d4f701d5f5 Remove MarkToTranslate from the JavaScript interface
The ‘l10n.js’ global JavaScript file already defines this function as
markForTranslation(),
and defines a context-aware twin function as well. Those two functions
are the only ones
currently used in the mod code (as it should be), and there are no
remaining calls to the
engine for that.

This was SVN commit r14998.
2014-04-26 12:26:04 +00:00
Gallaecio d6e37321d5 Removed an obsolete TODO comment in the L10n class implementation
This was SVN commit r14997.
2014-04-26 12:11:08 +00:00
Gallaecio fc793609eb Added API documentation to ‘source/i18n/’
This was SVN commit r14996.
2014-04-26 12:10:15 +00:00
Yves 7acdde5c86 Changes tests to use global g_ScriptRuntime instead of creating a new JSRuntime for each test.
The tests crashed on my Debian systems but not on my Ubuntu system.
The crash happened in line 142 of SpiderMonkey's ThreadLocal.h.

I know that I had to use a workarounnd for contexts to avoid destroying
the context that was created first. I also had in mind that in newer
versions a JS_Init function got introduced which presumably solves this
kind of issues.
Based on this experience I assumed runtimes could have a similar problem
and this patch indeed fixes the issues.
Unfortunately the correct usage of JSRuntimes in that regard is not
documented.
There's only a rater misterious comment in JSAPI.h which hasn't been
cleared up so far and is most likely completely outdated
(https://bugzilla.mozilla.org/show_bug.cgi?id=992641).

This was SVN commit r14995.
2014-04-25 21:19:51 +00:00
Gallaecio 49fc88ff81 Fixed typos on the English strings of the tutorial AI
This was SVN commit r14994.
2014-04-25 19:47:41 +00:00
Enrique 4cbaba418b Improved syntagma animations
Added seeding animation for farms. Only applied in Macedonian women at
the moment.

This was SVN commit r14993.
2014-04-25 14:29:05 +00:00
Gallaecio e92bf0c89d Show translated player name in chat messages
This should only affect player names that users do not define, such as
“Player 2”.
I’ve checked that:
• This change translate the name of the AI player in chat messages of
tutorial scenarios.
• If I name myself “Player 1” and host a multiplayer game, “Player 1” is
not translated.

This was SVN commit r14992.
2014-04-25 04:28:06 +00:00
Gallaecio 7afe0afbca Internationalized the messages of the tutorial AI
This was SVN commit r14991.
2014-04-25 03:41:01 +00:00
Gallaecio abed1b1734 Made the developer overlay wide enough for the Long Strings locale
This was SVN commit r14990.
2014-04-25 03:11:22 +00:00
Gallaecio dc0deb5f52 Fixed bad fix in bc1ed335e2
Note: l777 had given me the right fix (%s), I fixed it wrong for no good
reason…

This was SVN commit r14989.
2014-04-25 02:56:08 +00:00
Gallaecio c1c10667df Improved the internationalization of the construction “Insufficient resources” message
This was SVN commit r14988.
2014-04-25 02:45:19 +00:00
Gallaecio 0c04b90a2d Fixed the extraction of messages with leading spaces from plain text files
This was SVN commit r14987.
2014-04-25 01:55:43 +00:00
Gallaecio 0c88edc2f2 Internationalized rank names
In order to do so, I had to extend the XML message extractor to support
using XML tags as context.
This is because one of the ranks is “Advanced”, which is a pretty common
string.

This was SVN commit r14986.
2014-04-25 01:47:42 +00:00
Gallaecio bc1ed335e2 Fix GCC warning on “source/gui/scripting/ScriptFunctions.cpp”
Reported by JoshuaJB at Github: https://github.com/leper/0ad/issues/27
Fix provided by l777 (who I believe to be leper but I don’t really know)
on IRC.

This was SVN commit r14985.
2014-04-25 00:38:30 +00:00
Yves fd3d335265 Sacrifices a goat to the gods of insanity.
Fixes random crashes on Windows due to differences of STL types on the
binary level between different static libraries.
The differences are caused by the definition of _HAS_ITERATOR_DEBUGGING
and _SECURE_SCL in lib/precompiled.h.
All our engine static libs use precompiled headers but we didn't use
them for tinygettext because they aren't needed (except for these two
defines).
I've decided to add precompiled headers to tinygettext too instead of
just copying these defines. That should cause less headaches in the
future.

This was SVN commit r14983.
2014-04-24 20:05:48 +00:00
sanderd17 0027dcef31 Remove the actual serif fonts from the repo (they're completely unused now, and keeping them makes the package bigger)
This was SVN commit r14981.
2014-04-24 13:36:29 +00:00
sanderd17 73470a3610 Remove all references to serif fonts in the GUI files (see cde72788a2)
Rebuild the sans fonts to include the missing glyph character (fixes
#2483)
Update the pot files

This was SVN commit r14980.
2014-04-24 13:33:15 +00:00
Gallaecio bfa6bbd0e0 Internationalized the wall cost string
Also, added a check for the getCostComponentDisplayName() function, as I
once got an empty string, although I was not able to reproduce it.

This was SVN commit r14979.
2014-04-24 06:16:43 +00:00
Gallaecio 1fa5f13133 Improved the internationalization of the Diplomacy dialog box
You can now translate resource names differently depending on whether
they are in the middle of a sentence or at the beginning.
The Close button in the Diplomacy dialog box is now internationalized.

This was SVN commit r14978.
2014-04-24 05:48:23 +00:00
Gallaecio d2cbda3755 Fixed an English string in the Celtic and Gaul civilization files
Reported by kanetaka, a Japanese translator, at Transifex:
https://www.transifex.com/projects/p/0ad/translate/#ja/public/17634039

This was SVN commit r14976.
2014-04-24 04:41:03 +00:00
historic_bruno 92f2a16a88 Suppresses MSVC warning C4005 'macro redefinition' from SpiderMonkey upgrade
This was SVN commit r14975.
2014-04-23 21:12:28 +00:00
sanderd17 0d33f6412d Fixes #2482
This was SVN commit r14974.
2014-04-23 08:22:55 +00:00
sanderd17 311acea712 Fit UI for longer translations
This was SVN commit r14973.
2014-04-23 07:47:46 +00:00
sanderd17 3b571406f8 Enlarge tooltip size to fit all locales
This was SVN commit r14972.
2014-04-22 17:51:56 +00:00
sanderd17 9b9a96382c Fix boolean type
This was SVN commit r14971.
2014-04-22 12:52:49 +00:00
sanderd17 21362de6ac Add workaround for testing long strings with the separate po. ICU wouldn't accept a non-existing language.
This was SVN commit r14969.
2014-04-22 11:38:15 +00:00
Gallaecio 9dd4e71f1d Internationalized some messages
• You can now translate “The production queue is full”.
• Internationalized the “Pause” and “Resume” buttons. Only the initial
label was internationalized, it would switch to English as soon as you
pause the game for the first time.
• Internationalized the “Screenshot written to” message in the engine.

This was SVN commit r14968.
2014-04-22 06:35:51 +00:00
JoshuaJB 5a8bc1158a Add some more GUI graphics settings while fixing some persistence issues. Refs #2310
This was SVN commit r14967.
2014-04-22 05:09:31 +00:00
Gallaecio 93c94e45b7 “All nearby bipedal melee units” → “All nearby soldiers” (suggested by Mythos_Ruler on the IRC)
This was SVN commit r14966.
2014-04-21 14:37:42 +00:00
Gallaecio 46d7d5eb23 Removed trailing spaces detected in translatable strings
This was SVN commit r14965.
2014-04-21 14:35:33 +00:00
Gallaecio 21cb76b9f9 centre → center
This was SVN commit r14964.
2014-04-21 14:32:52 +00:00
Gallaecio e82a9f1a4d Removed a line break to make more space for translations
This was SVN commit r14963.
2014-04-21 14:27:02 +00:00
Yves 510ad15e6c Adds missing libs, fixes some svn properties and a build-problem on Windows.
In 1b3261b8f4 empty text files were committed instead of the libs.
The text files had svn:eol-style properties set and the mime-type was
text.
This removes the eol-style properties, changes the mime type and addes
the content of the files.

This was SVN commit r14959.
2014-04-20 23:47:52 +00:00
Yves 5aab36670c Give some more space to the labels in the advanced localization menu.
This was SVN commit r14958.
2014-04-20 22:38:29 +00:00
Enrique 6b1cde8f52 Added Micket's wolf mesh with Strannik's animations. Thank you guys!
Added two texture variations.

This was SVN commit r14957.
2014-04-20 22:24:37 +00:00
Gallaecio bba60424b0 Moved tinygettext licensing information
Moved from libraries/LICENSE.txt to LICENSE.txt. Reported by l777 on
IRC.

This was SVN commit r14956.
2014-04-20 22:04:16 +00:00
Gallaecio 64d204228a Message extraction and localization
It includes the translation template files (POT) as well as translation
files
(PO) developer through the Transifex platform by our awesome
translators.

It also includes tools to generate the translation template files,
generate a
special translation file with the longest strigns of all translations,
and a
tool to download translations from Transifex into the right game folders
automatically.

Fixes #67

This was SVN commit r14955.
2014-04-20 21:48:23 +00:00
Gallaecio e05c8263c5 Internationalization of the public mod (JavaScript and GUI XML side)
It includes a marvelous language selection menu developed by Yves.

It also includes the introduction of a sprintf implementation for
JavaScript, as well as
translation helper functions that use JavaScript-side translation
caching.

This patch includes code by Yves, sanderd17, leper and Gallaecio.

Ref #67

This was SVN commit r14954.
2014-04-20 20:51:48 +00:00
Gallaecio d6db5a466d Internationalization of the C++ side
Provides the logic to detect the system language, load translations, and
use
loaded translations both in the C++ and the JavaScript side.

This patch includes code by Yves, sanderd17, leper, historic_bruno and
Gallaecio. It’s worth noting that Yves and historic_bruno were also the
main
contributors behind the changes in 1b3261b8f4 as well.

This was SVN commit r14953.
2014-04-20 20:03:57 +00:00
Yves 30d5b572a6 Remove tinygettext from the build-osx-libs.sh file.
That's not needed anymore in the latest i18n branch. We build
tinygettext as a static library with the game now.

This was SVN commit r14952.
2014-04-20 19:30:01 +00:00
Gallaecio 1b3261b8f4 Added third-party libraries for internationalization and localization: ICU and tinygettext
This was SVN commit r14951.
2014-04-20 19:17:32 +00:00
Gallaecio 52c0a9b908 Changes to English strings after reports in Transifex by translators
This was SVN commit r14950.
2014-04-20 19:00:37 +00:00
mimo 130a394e27 a few fixes and some tweaks to petra
This was SVN commit r14949.
2014-04-20 17:19:56 +00:00
Mythos_Ruler f9e980ba5f Trying to blend some old UI assets with the new look.
Darkened the croc texture a bit.

This was SVN commit r14948.
2014-04-20 16:58:47 +00:00
Mythos_Ruler f27640de9b Minor tweaks to some maps.
This was SVN commit r14947.
2014-04-20 14:38:24 +00:00
Mythos_Ruler dde91b8c66 The attack notification should be less frequent.
This was SVN commit r14946.
2014-04-20 14:35:02 +00:00
Mythos_Ruler 2336f97ead Spartans get Oxybeles (but no Lithobolos).
This was SVN commit r14945.
2014-04-20 12:50:59 +00:00
Mythos_Ruler ff77676c60 Fixed auras and tooltips for some heroes.
Added some techs for houses and removed some from the Civic Center.
Makes a lot more sense this way.

This was SVN commit r14944.
2014-04-20 11:36:23 +00:00
Enrique 0bbf43dc5f upgraded sarissa's models
This was SVN commit r14943.
2014-04-20 00:34:48 +00:00
Enrique cf04dc9601 Missing units to use the new pikemen attack animation
This was SVN commit r14942.
2014-04-20 00:09:40 +00:00
Mythos_Ruler 78f8afd912 Changed some formation spacing.
This was SVN commit r14941.
2014-04-20 00:01:50 +00:00
Enrique 4f4455ec3a Added new attack animation for pikemen
This was SVN commit r14940.
2014-04-19 23:56:05 +00:00
Enrique b387458e33 Syntagma formation animations added to all hellenic pikemen.
This was SVN commit r14939.
2014-04-19 23:35:25 +00:00
Mythos_Ruler 2e7e46b399 Moves some blacksmith techs to Village Phase for Celtic civs. Fixes #2473
This was SVN commit r14938.
2014-04-18 11:28:28 +00:00
Mythos_Ruler 831d3ae69f This was SVN commit r14937. 2014-04-16 16:32:15 +00:00
JoshuaJB fe4f17fd73 Only send game report if ranking is enabled.
This was SVN commit r14936.
2014-04-16 14:00:09 +00:00
JoshuaJB a9b34da617 Fix some merge conflicts 9e2d0b9506 missed.
This was SVN commit r14935.
2014-04-16 13:58:56 +00:00
JoshuaJB 9e2d0b9506 Fix #2404. Rating auto-configure TODO (eg 2v2 games do not automatically show as being unrated). See #2276.
This was SVN commit r14934.
2014-04-16 06:03:49 +00:00
leper 47a516df34 Fix some JS warnings. Refs #2372.
This was SVN commit r14933.
2014-04-15 01:12:48 +00:00
sanderd17 e1488fee56 Add an 'explore map' option to the game setup.
This was SVN commit r14931.
2014-04-14 19:52:49 +00:00
sanderd17 a9d0a3bcae Fix how per tech modification affects work + fix the technologies that implement it. Fixes #2366
This was SVN commit r14930.
2014-04-14 16:33:00 +00:00
sanderd17 bb71823aee Make the actor tech-modifiable. Fixes #2243
This was SVN commit r14928.
2014-04-14 15:00:49 +00:00
scythetwirler 1073382e3b Sorts the lobby player list, ignoring case
This was SVN commit r14927.
2014-04-13 18:29:32 +00:00
Pureon b08e364e81 New shipwreck models
This was SVN commit r14926.
2014-04-13 11:16:30 +00:00
Mythos_Ruler 106638a9b8 This was SVN commit r14925. 2014-04-13 09:42:55 +00:00
Mythos_Ruler 01decbcd90 Train time changes.
Unlock champions tech more expensive.

This was SVN commit r14924.
2014-04-13 09:05:02 +00:00
scythetwirler 40e2a1e065 Fixes some javascript warnings in the lobby.
This was SVN commit r14923.
2014-04-13 01:48:24 +00:00
scythetwirler 180aa5c60d Makes the moderator prefix visible in the chatbox.
This was SVN commit r14922.
2014-04-12 23:40:36 +00:00
Mythos_Ruler 5a0c1a799b Some more portraits. Updated the portrait for the Macedonian siege workshop.
Tweaked some sandbox maps.

This was SVN commit r14921.
2014-04-12 14:55:04 +00:00
Mythos_Ruler f02a8a4c59 Some population techs.
Tweaking some training techs.

This was SVN commit r14920.
2014-04-12 13:39:19 +00:00
Mythos_Ruler 5740e22cd5 Fix health for these cavalry spearmen.
This was SVN commit r14919.
2014-04-12 11:52:39 +00:00
Mythos_Ruler c2d1aece02 Fixed female citizen selections.
This was SVN commit r14918.
2014-04-12 10:36:37 +00:00
Mythos_Ruler 08c1c8ed2d Minor tweaks to some particles.
Updated quinquereme tip image and text.

Minor updates to some maps.

Seleucids now use some Ptolemies ship actors temporarily.

This was SVN commit r14917.
2014-04-12 07:13:37 +00:00
sanderd17 ad36c0eb7b Parse entity ids to numbers again
This was SVN commit r14916.
2014-04-11 12:35:50 +00:00
mimo 41b8d06e27 remove forgotten debug printouts
This was SVN commit r14915.
2014-04-10 21:00:40 +00:00
Enrique f41c51359f Mauryan trader actor missing
This was SVN commit r14914.
2014-04-10 20:56:12 +00:00
mimo bb8e14fae1 some minor tweaks to petra ai
This was SVN commit r14913.
2014-04-10 20:25:02 +00:00
sanderd17 7840fd3049 fix capitalisation
This was SVN commit r14912.
2014-04-10 14:00:44 +00:00
sanderd17 7f77bb7cb0 Small improvements to entitycollection + add a serialization method (serialization is never executed though)
This was SVN commit r14911.
2014-04-10 09:51:43 +00:00
sanderd17 ff2979ca68 Save formation rotation when loading a new formation
This was SVN commit r14910.
2014-04-09 18:01:12 +00:00
sanderd17 1f63325ede Rotate entities to the right angle when forming a formation
This was SVN commit r14909.
2014-04-09 11:15:00 +00:00
Enrique 4ddf1ac4dc Added rowing, gathering, 3Idles and death animations for ptolemaic fisherman.
This was SVN commit r14908.
2014-04-06 21:06:17 +00:00
sanderd17 d27dffa31d Now really fix the issue with promoting and formation animations
This was SVN commit r14906.
2014-04-06 18:43:06 +00:00
mimo 833c2bac7a save/restore camera position and orientation in saved games, fixes #2354
This was SVN commit r14905.
2014-04-06 16:27:57 +00:00
leper fbfd87e7f7 Replace hawk with duplicated head bone with fixed version by stanislas69. Fixes #2454.
This was SVN commit r14904.
2014-04-06 16:00:12 +00:00
leper fb1827bee7 Fix ungarrisoning bug caused by promoting garrisoned entities. Fixes #2471.
This now uses the Autogarrsion order as both already work with an
already garrisoned entity.

This was SVN commit r14903.
2014-04-06 03:04:30 +00:00
mimo fd4cd56224 fixed petra map management when not circular
This was SVN commit r14901.
2014-04-05 12:18:37 +00:00
sanderd17 c5e59d02e1 Fix formation animations with promoted units
This was SVN commit r14900.
2014-04-05 09:48:57 +00:00
Mythos_Ruler 1908723188 Testudo for a few more Roman units.
This was SVN commit r14899.
2014-04-05 08:47:29 +00:00
sanderd17 61da102371 Add testudo animations to the right actor files and use it in the formation template
This was SVN commit r14898.
2014-04-04 18:38:13 +00:00
Enrique 776a098a1c Tetsudo formation test animation. Front and middle stances.
This was SVN commit r14897.
2014-04-04 10:17:15 +00:00
mimo d04f035f9a numerous fixes and improvments to petra ai
This was SVN commit r14896.
2014-04-03 20:48:54 +00:00
mimo ac9aaaa369 supplement the ai common-api
This was SVN commit r14895.
2014-04-03 20:31:59 +00:00
Enrique 26fdf74de3 Mauryan trader basic commit with idle and move animations. Needs zebu animation and trader texture or use a mauryan one.
Model and texture by paperkat, move animation by Wijitmaker, blender
exportation by stan

This was SVN commit r14894.
2014-04-03 18:31:56 +00:00
leper 3e03c9d08a Return something valid in a mock function to fix a warning while running tests.
This was SVN commit r14893.
2014-04-02 23:10:07 +00:00
leper b8b3542d25 Fix tests.
This was SVN commit r14892.
2014-04-02 23:09:59 +00:00
Enrique b287cbf805 New ptolemaic sail for merchant ship based on Lion's eagle.
fixes #2236

This was SVN commit r14891.
2014-04-02 02:52:13 +00:00
Enrique 2f12068a8f Ptolemaic merchant ship commit.
Model by Stanislas69 with some fixes.

This was SVN commit r14890.
2014-04-01 20:35:49 +00:00
Mythos_Ruler 55bb33dec8 Particle tweaks.
Mediterranean Cove skirmish map.

This was SVN commit r14888.
2014-03-30 01:56:35 +00:00
Mythos_Ruler 84016df11c Map tweaks and map preview changes.
This was SVN commit r14887.
2014-03-30 01:38:20 +00:00
Mythos_Ruler e715c60942 Cleaning up the scenarios folder.
This was SVN commit r14886.
2014-03-30 00:10:07 +00:00
JoshuaJB a7b2f6ba47 Fix more then one observer by allowing a game to have multiple players with the -1 ID.
This was SVN commit r14885.
2014-03-29 15:09:42 +00:00
sanderd17 22867fa9a3 Further complete the definitition of the entity state
This was SVN commit r14884.
2014-03-29 13:56:03 +00:00
sanderd17 8615f38803 Always define the entire entity state, but initialize it to null
This was SVN commit r14883.
2014-03-29 13:37:48 +00:00
sanderd17 132020f88e Fix some of the undefined warnings reported by the new SpiderMonkey. Initialize the player diplomacy arrays earlier in PlayerManager.
This was SVN commit r14882.
2014-03-29 11:03:00 +00:00
mimo 120f71d944 a couple a bugfixes
This was SVN commit r14881.
2014-03-29 08:51:09 +00:00
Mythos_Ruler b815fa8dd9 Portraits for the Ptolemaic dieres, penteres, and octeres.
Actor and texture for Antiochus the Great.

Histories for the Ptolemaic warships.

This was SVN commit r14880.
2014-03-29 00:16:16 +00:00
Yves e9e05f4efc Second (main) commit for the SpiderMonkey upgrade.
This commit contains all the required changes to our source files and
build scripts (hopefully).
A next commit will remove the old stuff of SpiderMonkey 1.8.5.

Spcial thanks to:
 - H4writer who helped a lot mainly with the performance issues we
had/have, but also with other problems or questions.
 - Leper for the review.
 - Historic_bruno for implementing the build scripts on Mac OS X and
testing on the Mac.
 - The people from the #jsapi channel and from
mozilla.dev.tech.js-engine who answered a lot of questions and helped
solving problems.
 - All the other people who helped

Refs #1886
Fixes #2442
Fixes #2416

This was SVN commit r14877.
2014-03-28 20:26:32 +00:00
Enrique 6f6b841af3 Upgraded ptoemaic quinquereme textures and made the model narrower.
This was SVN commit r14875.
2014-03-28 16:03:32 +00:00
Yves 0d9a7dab6b Works around infinite recursion problem.
This problems occurs with the new SpiderMonkey in debug mode, but it's
not a SpiderMonkey issue.
Unfortunately I couldn't find a clean solution, so I just documented the
problem in an extensive comment block and applied a workaround.
A clean solution would probably require changing the approach for
counting allocations completely.

This was SVN commit r14874.
2014-03-28 11:33:37 +00:00
mimo 0419f5500e another set of petra improvments, main one is a first try to place markets for trade (was random before)
This was SVN commit r14873.
2014-03-27 22:10:03 +00:00
Enrique 0a32b2d687 Ptolemaic trireme commit.
Fixed some texture stretching in the bireme.

This was SVN commit r14872.
2014-03-27 18:13:07 +00:00
mimo bc428e1649 some fixes (i.e.building placement) and cleanings of petra
This was SVN commit r14871.
2014-03-26 21:07:47 +00:00
Enrique 52af5b29a1 Ptolemaic bireme commit.
Fixed error in sparten temple when destroyed found bi Sanderd17

This was SVN commit r14870.
2014-03-26 20:34:54 +00:00
sanderd17 7c0c294814 Move some resources to passable terrain
This was SVN commit r14869.
2014-03-26 18:28:00 +00:00
mimo d5ff29d181 fix a flaw in UnitAI trade management
This was SVN commit r14868.
2014-03-26 09:11:06 +00:00
mimo 3dfa858229 remove some leftover warnings in petra
This was SVN commit r14867.
2014-03-25 19:26:45 +00:00
mimo 5de3b30742 fix previous tag
This was SVN commit r14866.
2014-03-24 22:51:15 +00:00
mimo 97afd25171 commit first version of new ai bot (named Petra)
This was SVN commit r14865.
2014-03-24 22:33:50 +00:00
mimo b03e3644ac add a few usefull functions in ai/common-api
This was SVN commit r14864.
2014-03-24 22:15:40 +00:00
Yves 90b9926ca1 Fixes warning showing up with the new SpiderMonkey.
The changed return value isn't related but returning false makes more
sense there IMO.

Refs #2372

This was SVN commit r14863.
2014-03-22 23:31:40 +00:00
Yves 5372b27142 Silences some warnings that show up on the gamesetup screen with the new SpiderMonkey without changing any behaviour.
Refs #2372

This was SVN commit r14862.
2014-03-22 13:54:10 +00:00
Mythos_Ruler 3fb46640cc Fix civ for Ptol Military Colony.
This was SVN commit r14861.
2014-03-21 22:51:47 +00:00
Mythos_Ruler 907ef01322 Added starting units to Deccan Plateau.
Added some detail to Nile River.

Updated Syria a little bit.

Added Pureons new tech portraits to some techs.

Portrait for Ptol champ elephant.

Gave the Military Settlement system to the Ptolemies. We'll use their
merc camp for a developing merc camp system. Ptol heroes can found civic
centers just like the Sele heroes.

This was SVN commit r14860.
2014-03-21 00:47:23 +00:00
Yves 2eeb7c2ba1 Workaround to reduce the impact of AI performance problems when planning new bases.
When no free territory was left on the map, the AI tried to place a CC
every 10th AI turn.
That's about all 10 seconds and it freezed the game for about a second.
Now when you played against 4 players it freezed aobut 4 seconds every
10 seconds, which is very bad.
I wanted to solve this properly but realized that I'd have to change a
lot in the terrain analysis code that will probably be replaced anyway
when we have a new pathfinder with a proper interface.
Also removes an unused variable (creating a territory map and not using
it can't be good for performance either).

This was SVN commit r14859.
2014-03-20 14:26:15 +00:00
Pureon 6eaad6cbb6 new tech portraits
This was SVN commit r14858.
2014-03-20 00:58:54 +00:00
mimo 1c81a96a50 fix bug in AI
This was SVN commit r14857.
2014-03-18 21:34:23 +00:00
JoshuaJB 63248bdc33 Fix issue with GUI reveal map status display.
This was SVN commit r14856.
2014-03-18 01:13:02 +00:00
mimo 209799aa4c fix 94c02ec33c for AI
This was SVN commit r14855.
2014-03-17 21:23:40 +00:00
Yves 5c4282a21c Fixes a small memory leak in the profiler shutdown code.
This was SVN commit r14854.
2014-03-17 21:16:38 +00:00
sanderd17 cde72788a2 * Add support for fallback fonts in the font builder.
* Replace DejaVu with Biolinium for the existign sans-styles.
* Add additional sans-styles using Biolinum.
* Update the GUI style definitions to use the sans-styles instead of
serif styles.
(Wait with updating custom defined fonts in strings, as it will cause a
mess with the internationalisation that's about to be included)
* Add fonts from the quite complete FreeFont family as fallback fonts.
* Render all glyphs supported by the different fonts to support as many
scripts as possible.
* Fixes #2457.
(Now hope I included all needed files)

This was SVN commit r14853.
2014-03-17 10:13:49 +00:00
Mythos_Ruler c1b839c21b Military Colony's territory weight reduced.
Updated icon for Syria map. Updated nisian war horses portrait from
Pureon.

Reduced the volume of the attack notification a little.

This was SVN commit r14852.
2014-03-17 00:10:13 +00:00
Mythos_Ruler 84ef2c1335 A test for Latin names for animals. Won't complete this until after next alpha.
This was SVN commit r14851.
2014-03-17 00:08:24 +00:00
JoshuaJB 883f307b40 Implement a basic observer mode. Any player which joins a multiplayer game but is not assigned a player slot automatically becomes an observer. Refs #69
This was SVN commit r14849.
2014-03-16 23:29:27 +00:00
JoshuaJB 94c02ec33c Revert gather limits to be global instead of per-player. Refs #1387
This was SVN commit r14848.
2014-03-16 20:35:23 +00:00
Mythos_Ruler 19724f7f41 "Syria" skirmish map.
This was SVN commit r14846.
2014-03-15 23:10:06 +00:00
wraitii ffe0faeca4 Move the skybox up per Mythos' ruler recommendation. This should probably be a map setting.
This was SVN commit r14844.
2014-03-15 21:07:02 +00:00
scythetwirler caeaf62723 Adjust widths in the lobby to make the map size dropdown fit.
This was SVN commit r14843.
2014-03-15 20:58:59 +00:00
Mythos_Ruler 722ad7264d Some updated maps. Acropolis Bay especially.
This was SVN commit r14842.
2014-03-15 19:56:51 +00:00
historic_bruno 49b0e1ce42 Eliminates some duplication in build-osx-libs.sh and sets more useful variables
This was SVN commit r14841.
2014-03-14 05:18:40 +00:00
historic_bruno dfa4766dab Reverts [[SVN:14831]] - wasn't a valid fix.
Patches MiniUPnPc to explicitly export symbols for GCC/Clang, fixes
build when -fvisibility=hidden is used, refs #2304.
Fixes incorrect use of CPPFLAGS in build-osx-libs.sh, it should be
CXXFLAGS. CPPFLAGS get passed to the C/C++ preprocessor, CXXFLAGS get
passed to the C++ compiler.

This was SVN commit r14840.
2014-03-14 04:17:42 +00:00
Enrique b18a899287 Added Ptolemaic healer body and head textures. Fixes #2234
This was SVN commit r14839.
2014-03-13 19:46:15 +00:00
wraitii 6ab578a6eb Fix out of date comments in Tex and ITexCodec, Fixes #2458.
This was SVN commit r14838.
2014-03-13 19:00:22 +00:00
Spahbod e17dd1ac12 Applying the new improvements: Gulf of Bothnia.
This was SVN commit r14837.
2014-03-13 09:45:09 +00:00
JoshuaJB ef888367aa Cleanup tex_codec, fixes #2456, patch by IronNerd.
This was SVN commit r14836.
2014-03-13 04:16:20 +00:00
JoshuaJB a5639631ee Texture system refactoring and cleanup, fixes #2455, patch by IronNerd.
This was SVN commit r14835.
2014-03-13 02:37:05 +00:00
Enrique a068935789 Ptolemaic dock upgrade. Fixes #2217
This was SVN commit r14834.
2014-03-12 18:38:16 +00:00
mimo 180b44e565 let the AI know that a unit has no more orders
This was SVN commit r14832.
2014-03-11 22:42:41 +00:00
Enrique 6274c7ffe8 Added ptolemaic quinquereme. Fixes #2232
This was SVN commit r14830.
2014-03-10 13:37:18 +00:00
mimo 9f1bcc2475 fix AI error
This was SVN commit r14829.
2014-03-09 22:26:41 +00:00
scythetwirler 0e0cd65134 Some GUI alignment/sizing improvements.
This was SVN commit r14828.
2014-03-09 19:24:17 +00:00
Yves 0e7c92e1e6 Fixes behaviour change in Atlas' JSON serialization after the switch to JSON Spirit (#2434).
This caused problems setting the starting camera.

Refs #2434

This was SVN commit r14827.
2014-03-09 17:55:54 +00:00
JoshuaJB 8959e63a53 Add back unintentionally removed idle workers button tooltip.
This was SVN commit r14826.
2014-03-09 02:42:42 +00:00
Mythos_Ruler e6f7ef78dc Removes legacy "technologies" folder.
This was SVN commit r14824.
2014-03-09 00:10:41 +00:00
Mythos_Ruler 7698e75962 Pyrrhus template.
This was SVN commit r14823.
2014-03-09 00:08:25 +00:00
Mythos_Ruler 0603392f03 Acropolis Bay.
This was SVN commit r14822.
2014-03-09 00:08:00 +00:00
Mythos_Ruler 119849defc Pyrrhus hero.
Some map stuff and actor changes (remove the elephants from Pericles).

This was SVN commit r14821.
2014-03-09 00:07:28 +00:00
Mythos_Ruler d214d8f61c Some map changes.
This was SVN commit r14820.
2014-03-09 00:02:33 +00:00
JoshuaJB fb65288463 Fix hover effect not regenerating after mousedown events, minor GUI code cleanup, and fix #2414
This was SVN commit r14819.
2014-03-07 22:43:57 +00:00
Yves c8bdd993c0 Upgrades cxxtest.
Switches to the already committed new cxxtest sources and deletes the
old sources.
Applies the changes from 6374080b60 and 4a57fed5a7 to the updated
sources.
Replaces the cxxtestgen.exe for Windows. This file was created from
cxxtest's python script using pywin32.
Modifies update-workspace.sh to force a rebuild when cxxtest options
could have been changed during the premake step.
Adds an additional option (--jenkins-tests) to
premake4.lua/update-workspaces.sh to use cxxtest's XmlPrinter which
generates output than can be used by Jenkins.

Fixes #2450

This was SVN commit r14818.
2014-03-07 20:58:17 +00:00
feneur a9368a4463 Updated tooltip to reflect the new max gatherer limit
This was SVN commit r14816.
2014-03-07 12:09:39 +00:00
sanderd17 66942c74fa Be more forgiving for training spaces (which cause empty strings on splitting) and avoid using bigger fonts for non-capitalisable signs in headings
This was SVN commit r14815.
2014-03-07 11:11:45 +00:00
sanderd17 32cf46f01c Fix some 'undefined' problems reported by Lion.Kanzen + improve coding style.
This was SVN commit r14814.
2014-03-07 08:27:13 +00:00
JoshuaJB 29f94a759c Fix an issue with lobby registration and a minor wording tweak.
This was SVN commit r14813.
2014-03-07 01:52:06 +00:00
scythetwirler abbd6efef1 Updates outdated/incorrect hotkeys.
This was SVN commit r14812.
2014-03-06 23:57:02 +00:00
scythetwirler 8a98bca9b2 Fixes the last z order (hopefully) and a style inconsistency.
This was SVN commit r14811.
2014-03-06 22:45:13 +00:00
scythetwirler ec26f1de83 Reduces z order to fix ai dialog.
This was SVN commit r14810.
2014-03-06 22:34:15 +00:00
JoshuaJB 8f30e722ab Some inconsequential style adjustments.
This was SVN commit r14809.
2014-03-06 02:24:06 +00:00
scythetwirler ef76d24e66 Fixes z order and a capitalization error.
This was SVN commit r14808.
2014-03-06 02:00:12 +00:00
scythetwirler 5f5cfb10ee Fixes a typo and makes naming of the fading consistent with other sprites.
This was SVN commit r14807.
2014-03-05 21:24:48 +00:00
sanderd17 f3714a7075 Fix invalid count for entityMaps
Improve error reporting on failed deserializations
Fixes #2328

This was SVN commit r14806.
2014-03-05 14:58:17 +00:00
JoshuaJB 02024370d8 Fix a warning in Visual Studio 2010 related to some of my recent changes.
This was SVN commit r14805.
2014-03-05 01:06:13 +00:00
scythetwirler 5582409973 Converts most parts of the game to use Pureon's new UI
This was SVN commit r14804.
2014-03-04 02:23:01 +00:00
Yves 1a2f889bb9 7cba43c9db changed the behaviour in case of undefined values which was not intended even if there's a warning now.
This should revert to correct behaviour for undefined values again (even
though this value should never be undefined).

Refs 2372

This was SVN commit r14803.
2014-03-03 23:01:49 +00:00
Yves 7cba43c9db Fixes warnings printed by the new SpiderMonkey.
Sets SelectableInGameSetup to true in all civ json files that didn't
have it set.
Having this value set to undefined (not set) was interpreted as true,
which is quite arbitrary.
With the new SpiderMonkey a warning will be printed if the value is
undefined.
This avoids ambiguity but makes the setting mandatory.

Refs #2372

This was SVN commit r14802.
2014-03-03 21:58:15 +00:00
Yves df43e32a59 Second try fixing the eol-styles
This was SVN commit r14801.
2014-03-03 21:36:24 +00:00
Yves 234f2003a3 Fix inconsistent line endings and add svn:eol-style property
This was SVN commit r14800.
2014-03-03 21:13:36 +00:00
Enrique 2d0e996725 Added modified Stanislas69 Pyrrhus helmet with textures.
Added an extra variation for brass and iron textures variations of
ptolemaic_romanized and thracian horned helmets.
Added playercolor to the thracian horned helmet crest.

This was SVN commit r14799.
2014-03-02 10:59:36 +00:00
Yves e290abc40f Should fix the Atlas build issues with the autobuilder.
For some reason the autobuilder does not know uint32_t but my Windows
system with VC2010 and my Linux system both do.

Refs #2434

This was SVN commit r14797.
2014-03-01 14:41:32 +00:00
mimo c2c172271f fix AI error, not reseting all units after a successful attack
This was SVN commit r14796.
2014-03-01 14:36:35 +00:00
Mythos_Ruler 05225a66ac Horned helmet to Thracian cavalry.
This was SVN commit r14794.
2014-03-01 10:37:45 +00:00
mimo 57e995e618 fix AI error, the freeze of this collection prevented promoted and packed units to be updated during attack
This was SVN commit r14793.
2014-03-01 09:35:30 +00:00
wraitii 4e5eeba27b Fix the skybox.
This was SVN commit r14792.
2014-02-28 18:23:24 +00:00
Enrique 999490bbf5 Added playercolor to ptolemaic romanized crest helmet.
This was SVN commit r14791.
2014-02-28 11:46:23 +00:00
Enrique 162a4c42f3 Stan's helmets ptolemaic romanized with and without crest, thracian horned cavalry and perseus hero. Heavily modified.
playercolor in crests still pending. Added brass and iron variations,
more subtle variations to come.

This was SVN commit r14790.
2014-02-28 11:32:23 +00:00
wraitii 02860690eb fix unused parameter warning.
This was SVN commit r14789.
2014-02-26 19:16:44 +00:00
wraitii 3f78042f45 Fix tests and C++11 build.
This was SVN commit r14788.
2014-02-26 19:08:03 +00:00
Mythos_Ruler 3573a6e9a8 Updated some portraits.
Added a Mercenary Thracian Swordsman.

Tweaked some textures.

Added a "gray skin" variation to the Ptolemaic elephant.

Added Saharan Oases skirm map.

This was SVN commit r14787.
2014-02-26 14:29:42 +00:00
Enrique 6b94ae9f59 Added two ptolemaic howdah variations for the champion elephant.
This was SVN commit r14786.
2014-02-26 13:53:36 +00:00
mimo d8903c0c6f fix AI error
This was SVN commit r14785.
2014-02-25 22:43:03 +00:00
wraitii e2f4379e9a Fix an issue with corruption of water data when the actor editor opened in Atlas.
Potential marginal optimizations to the water data creation code.

This was SVN commit r14784.
2014-02-25 06:27:15 +00:00
Yves 17f8f09399 Removes the ScriptInterface and SpiderMonkey dependencies from Atlas.
Replaces the code for JSON parsing and writing with an implementation
using the JSON Spirit library.

Fixes #2434
Refs #1886

This was SVN commit r14783.
2014-02-24 20:22:02 +00:00
mimo 33918a5c41 Fix AI error (with 3eaa9ac4d3) preventing promoted units to stay idle
This was SVN commit r14779.
2014-02-24 14:03:13 +00:00
sanderd17 50d93b4332 Was messed up by b3201acd93
This was SVN commit r14778.
2014-02-24 12:10:38 +00:00
Enrique c5f15a13d0 Modified Stanislas69 Seleucid romanized helmet and thracian helmet with several texture variations and organized in actors with variations.
Applied the romanized brass helmet with crest to the Seleucid heavy
swordman infantry.

This was SVN commit r14777.
2014-02-23 16:51:10 +00:00
mimo 3eaa9ac4d3 fix AI error
This was SVN commit r14776.
2014-02-23 09:51:07 +00:00
Yves 43377fdc5e Fixes an assertion when DEBUG_SERIALIZER_ANNOTATE is set to 1 and you click on "Host Game" from the main menu.
The reason was that CSimulationMessage uses the CBufferBinarySerializer
which did not add debugging annotations and deserialized the created
data with the CStdDeserializer which expects these annotations.
I did not fix the tests which remain broken as before this patch when
annotation is enabled.

This was SVN commit r14775.
2014-02-22 14:30:29 +00:00
Mythos_Ruler e38fc5f861 Increased Fanatic armor.
This was SVN commit r14774.
2014-02-22 13:10:54 +00:00
Mythos_Ruler 554cd510f2 Basic and Advanced Egyptian Pikemen textures.
Spec and norm maps for Mediterranean forest floor terrain.

This was SVN commit r14773.
2014-02-22 12:16:20 +00:00
JoshuaJB a3e1c68b9a Fix #2373. Have player resign if not returning to a networked game. Also notify host of networked game that by leaving all other players will be disconnected. Based off patch by boeseRaupe
This was SVN commit r14772.
2014-02-21 20:02:23 +00:00
Mythos_Ruler 8c21ec4dfd Quilted helms for Egyptian pikemen, based on work by Enrique.
This was SVN commit r14771.
2014-02-21 14:38:09 +00:00
Enrique 42d31da1bb ptolemaic quilted helmet commit.
This was SVN commit r14770.
2014-02-21 14:13:46 +00:00
sanderd17 c44b48bd59 Fix Atlas lag due to Position component that listens to the territoriesChanged message
This was SVN commit r14768.
2014-02-21 13:42:46 +00:00
scythetwirler 0ea3b7b7dd Adds the moderator prefix to the playerlist in the lobby.
This was SVN commit r14767.
2014-02-20 23:26:36 +00:00
JoshuaJB a725266337 Slightly better options menu.
This was SVN commit r14766.
2014-02-20 22:45:43 +00:00
JoshuaJB e182b4ddd2 Fix a valgrind warning about uninitilized variables in the scrollbar code and some comment/style fixes.
This was SVN commit r14764.
2014-02-19 21:59:07 +00:00
Mythos_Ruler facf119241 Farm fields back to 5 workers.
This was SVN commit r14763.
2014-02-19 17:54:34 +00:00
scythetwirler 2429f1e93c Displays ratings on the gamesetup page and formats ratings less than 1000 correctly.
This was SVN commit r14762.
2014-02-19 00:40:35 +00:00
mimo a4ec034bb5 fixes some AI errors
This was SVN commit r14761.
2014-02-18 18:19:33 +00:00
sanderd17 039b06e012 Enable selection of dogs when selecting idle warriors. Patch by tau. Fixes #2436
This was SVN commit r14760.
2014-02-17 21:40:47 +00:00
Mythos_Ruler b5c8faa367 Aura tooltip for Ptolemaic heroes. Auras themselves are not complete.
This was SVN commit r14759.
2014-02-17 15:54:17 +00:00
Mythos_Ruler 41534b1eda Arrow shooting buildings only increase arrows when ranged infantry are garrisoned inside.
Removing some unused textures.

This was SVN commit r14758.
2014-02-17 15:11:47 +00:00
Enrique c3dd79aa22 Ptolemaic mercenary camp commit.
This was SVN commit r14757.
2014-02-17 13:13:25 +00:00
sanderd17 322d78b9a5 remove debug warning
This was SVN commit r14755.
2014-02-16 15:23:50 +00:00
sanderd17 19965ce37a Fix missing territory decay when moving out of territory without changing the actual territory. Add possibility to check movement over territory boders in the JS simulation part. Based on patch by niektb
This was SVN commit r14754.
2014-02-16 15:22:11 +00:00
scythetwirler f92a46330d Anti-disconnect addition to the gamesetup screen. Also fixes typo in the lobby bot README.
This was SVN commit r14753.
2014-02-16 06:22:16 +00:00
scythetwirler be881dc420 Reformat the database to accept the additional summary counters as well as adding a couple summary counters. Also deletes unnecessary welcome message and deletes whitespace. Refs #686.
This was SVN commit r14752.
2014-02-16 06:06:16 +00:00
Enrique ab9a6b6303 Stanislas69' iberian tower modification commit.
This was SVN commit r14751.
2014-02-14 21:46:37 +00:00
Enrique 05bfe7dca0 Ptolemaic market commit
This was SVN commit r14750.
2014-02-14 17:18:29 +00:00
mimo 35f3dd03d9 improve ship behaviour when picking units
This was SVN commit r14749.
2014-02-13 20:21:27 +00:00
Yves 581c7635e1 Makes our favourite example of escaping even more awesome.
Codeblocks 12.11 requires an additional $ sign. This will break 10.05
and I haven't tested it with 13.12 or on other systems than Ubuntu.

This was SVN commit r14748.
2014-02-13 15:21:14 +00:00
Mythos_Ruler a921c5c2fb Portrait for Egyptian Pikeman.
Fixed a thing with the Ptolemies sandbox map.

Tweaked the elite Egyptian pikeman shield.

This was SVN commit r14747.
2014-02-13 15:08:01 +00:00
Mythos_Ruler 14a7e60bd5 Elite Egyptian Pikeman.
This was SVN commit r14746.
2014-02-11 17:51:01 +00:00
mimo e49b1e1ceb fix AI error
This was SVN commit r14745.
2014-02-09 19:54:50 +00:00
mimo d8152f1eda exchange if order otherwise we can't make a trade route with a damaged market
This was SVN commit r14744.
2014-02-09 18:42:06 +00:00
Enrique 44eb336dfe Added 4 stall variations as eyecandy with different cloth textures.
Added material for barley/wheat props.
Modified spec and normal maps of ptolemaic struct (for matching last
edit adding carpets)

This was SVN commit r14743.
2014-02-09 16:51:33 +00:00
Yves 9780d7177d Adds some missing vars.
This was SVN commit r14742.
2014-02-09 16:04:30 +00:00
Mythos_Ruler dea18ed318 4-player Greek Acropolis skirmish map
This was SVN commit r14741.
2014-02-09 13:07:33 +00:00
mimo c5beeb7a02 rename Median Oasis maps, fixes #2425
This was SVN commit r14740.
2014-02-09 09:48:14 +00:00
JoshuaJB df1221e9f5 Correct inverted sprites on modern tickbox and add a default modern tooltip style.
This was SVN commit r14739.
2014-02-09 05:31:25 +00:00
wraitii 01611c1675 Fixes AI error when building a new base, and improves the AI's early game and tendency to grab terrain. Fixes incorrect release of some units by the defense manager.
This was SVN commit r14738.
2014-02-07 18:36:37 +00:00
mimo 05f13bb1d8 fix ai bug
This was SVN commit r14737.
2014-02-07 18:00:41 +00:00
mimo 563768363b clean useless formations
This was SVN commit r14736.
2014-02-07 17:01:01 +00:00
Spahbod a0b0b6d74e Applying the new improvements: Gear, Guadalquivir River.
This was SVN commit r14735.
2014-02-07 09:23:14 +00:00
mimo 7277385891 fix typo
This was SVN commit r14734.
2014-02-07 07:52:10 +00:00
Yves 31e98e5c03 Reverts f25edfd8f1. Structured clones don't support cyclic references in SpiderMonkey v1.8.5.
SpiderMonkey v24 supports it and I'll add this change to #1886 instead.

Refs #2416
Refs #2415
Refs #1886

This was SVN commit r14733.
2014-02-06 13:32:09 +00:00
JoshuaJB fa85527baf Send messages in queue before closing connection, patch by boeseRaupe. Fixes #2420
This was SVN commit r14732.
2014-02-05 02:44:25 +00:00
historic_bruno 035078c317 Disables checks in os_cpu_LargePageSize Windows implementation, since they failed on Vista SP2 with old Xeon CPU, fixes #2346
This was SVN commit r14731.
2014-02-04 22:30:29 +00:00
JoshuaJB 72d306873f Correctly handle the keypad enter in CInput.cpp and make the return key case catch SDLK_RETURN instead of '/r' for consistancy and readability.
This was SVN commit r14730.
2014-02-03 21:46:27 +00:00
Mythos_Ruler 91be7d9bd1 New history blurb for Skiritai by forum contributor Thorfinn.
This was SVN commit r14729.
2014-02-03 16:25:08 +00:00
Mythos_Ruler e408ac46b1 2 player skirmish Median Oasis.
This was SVN commit r14728.
2014-02-03 16:16:31 +00:00
LordGood e329a93978 Ghost commit for fields
This was SVN commit r14727.
2014-02-03 05:12:36 +00:00
sanderd17 9971e3cfab Add formation check
This was SVN commit r14726.
2014-02-02 09:15:34 +00:00
historic_bruno 4be80f9322 Improves error handling in sound manager. Fixes some crashes and errors that could occur when OpenAL failed to init properly, fixes #2183, #2345
This was SVN commit r14725.
2014-02-02 05:58:27 +00:00
Yves f25edfd8f1 Removes ValueCloner.
Fixes #2416
Refs #2415
Refs #1886

This was SVN commit r14724.
2014-02-01 20:37:33 +00:00
wraitii c9aeaa1612 Fix a "big typo" in the attack plans, thanks mimo.
This was SVN commit r14723.
2014-02-01 18:34:24 +00:00
wraitii ddf9d948cf Fix some more debug in the AI.
This was SVN commit r14722.
2014-02-01 18:05:39 +00:00
mimo 5b506ceee3 prevent AI to try to attack its allies, fix #2393
This was SVN commit r14721.
2014-02-01 17:59:29 +00:00
mimo e21f052803 prevent error when an animal changes ownership
This was SVN commit r14720.
2014-02-01 17:55:27 +00:00
Mythos_Ruler 94a240737c Added more territory auras.
Fixed the Theatron for Hellenic civs. It now uses the Hellenization
effect correctly!

This was SVN commit r14719.
2014-02-01 12:09:06 +00:00
Spahbod 1f1a2ead44 Adding the missing cheats from [14712]. Refs #2072
This was SVN commit r14718.
2014-02-01 09:11:38 +00:00
scythetwirler e4e32c8cd7 Fixes a typo from 1d3ac14d35.
This was SVN commit r14717.
2014-02-01 03:55:24 +00:00
wraitii e6cf2f23c5 Fix AI debug mode.
This was SVN commit r14716.
2014-02-01 03:29:55 +00:00
wraitii c3cdf40f33 Somewhat experimental rewrite and simplification of the worker's logic to choose dropsites. Might behave unexpectedly now and then.
Error fixes here and there.

This was SVN commit r14715.
2014-02-01 00:44:12 +00:00
Mythos_Ruler 12aa170c58 Trying different territory weights.
This was SVN commit r14713.
2014-01-31 18:47:08 +00:00
sanderd17 60619dbf3f Add technologies cheat. Fixes #2072. Patch by boeseRaupe
This was SVN commit r14712.
2014-01-31 15:30:16 +00:00
Spahbod 1fad924411 Checking if cmpPlayer is valid.
This was SVN commit r14711.
2014-01-31 14:47:23 +00:00
Spahbod 9fe465884d Implements resource trickle. Allows decimal player resources. Fixes #2413.
This was SVN commit r14710.
2014-01-31 12:01:49 +00:00
JoshuaJB 0157e640cc Make my last commit C++98 compatible.
This was SVN commit r14709.
2014-01-31 01:26:08 +00:00
Enrique c3d9769622 Fixed iberian corral cloth ao texture assigned
This was SVN commit r14708.
2014-01-30 19:36:38 +00:00
Spahbod 708f003df3 Applying the new improvements: English Channel, Fortress
More cleanup and tweaks.

This was SVN commit r14707.
2014-01-30 17:09:45 +00:00
JoshuaJB ff4ed09b6f Backend for special formatting of moderaters in the lobby userlist.
This was SVN commit r14706.
2014-01-30 15:46:19 +00:00
Yves bab3a08643 Fixes a crash introduced in fd187f466f by ensuring that the CScriptValRooted values are destroyed before calling JS_DestroyContext.
I've tested the performance on Combat Demo (Huge) again with the code
from #2394.
It's very close but probably a little bit lower (hard to tell because
it's so close).

Closes #2408
Refs #2394

This was SVN commit r14705.
2014-01-30 13:21:36 +00:00
JoshuaJB b9eea330d0 Strip some whitespace and fix a warning in session.js
This was SVN commit r14704.
2014-01-29 19:00:47 +00:00
sanderd17 1d3ac14d35 Better summary screen. Fixes #686. Patch by Bajter and Kabzerek
This was SVN commit r14703.
2014-01-29 18:30:56 +00:00
sanderd17 459f13e72b Clean up the colorfade code. Patch by boeseRaupe, fixes #2395
This was SVN commit r14702.
2014-01-29 14:49:36 +00:00
Spahbod 7395d9c75a Applying the new improvements: Canyon, Continent, Corinthian Isthmus
Some cleanup and small tweaks.

This was SVN commit r14701.
2014-01-29 14:21:48 +00:00
sanderd17 639b583d31 Fix scatter formation
This was SVN commit r14700.
2014-01-29 14:01:21 +00:00
leper d6f8742f9b Change hawk and boar skeletons so that the root identifiers are unique. Fixes #2332.
Also adjust the DAEs to fit the new identifiers.

This was SVN commit r14699.
2014-01-29 04:14:24 +00:00
sanderd17 f097078d46 Send the move command directly instead of going through the FSM. That way, the failure can be catched earlier on. Should fix #2410
This was SVN commit r14698.
2014-01-28 20:40:38 +00:00
mimo 8953179e1a allow the possibility to define route with waypoints when doing trade, fixes #1207, #1821 and #1822
This was SVN commit r14697.
2014-01-28 18:56:39 +00:00
mimo 23777ba736 fix cbc1c9f0ab
This was SVN commit r14696.
2014-01-27 19:25:38 +00:00
Mythos_Ruler 325f9ca9a9 Sorry Brits. Changed "plough" (British spelling) to "plow" (American/Canadian spelling) after seeing more than one person on Youtube mispronounce the word.
Can only build 1 Juggernaut.

All champion cavalry now cost Food and Metal.

This was SVN commit r14695.
2014-01-27 16:16:32 +00:00
sanderd17 c751500907 Refactor some formation code to let it make use of the prototypes
This was SVN commit r14693.
2014-01-27 12:34:59 +00:00
JoshuaJB 7bcdb9f46d Remove two un-needed string initilizations from my earlier changes.
This was SVN commit r14692.
2014-01-27 05:46:21 +00:00
leper 78ff9a8480 Fix compilation failures with wxWidgets 3.0. Fixes #2375.
This was SVN commit r14691.
2014-01-27 00:02:03 +00:00
historic_bruno 0406c89908 Implements GetMonitorSize for OS X, patch by Echelon9, fixes #2390
This was SVN commit r14690.
2014-01-26 23:03:45 +00:00
mimo cbc1c9f0ab fixes remaining town bell defects, closes #2353, patch by Itms
This was SVN commit r14689.
2014-01-26 20:37:39 +00:00
JoshuaJB c61badb04c Fix typo.
This was SVN commit r14688.
2014-01-26 19:29:21 +00:00
JoshuaJB 2a1240008c Make my previous changes < C++11 compatible.
This was SVN commit r14687.
2014-01-26 19:23:50 +00:00
JoshuaJB 5e70bd3628 Fix and cleanup my recent changes.
This was SVN commit r14686.
2014-01-26 19:01:21 +00:00
mimo cb3a8d868a fix bug when garrisoning under alert and garrisonHolder is full, patch by Itms, see #2353
This was SVN commit r14685.
2014-01-26 18:28:55 +00:00
mimo 3e1fc74add improve alert tooltip, see #2353
This was SVN commit r14684.
2014-01-26 18:17:13 +00:00
mimo 9ed11bc404 keep work orders when in alert, patch by Itms, addresses #2353
This was SVN commit r14683.
2014-01-26 18:01:29 +00:00
sanderd17 09a2729503 fix a fix
This was SVN commit r14682.
2014-01-26 09:40:54 +00:00
sanderd17 f1ab9b8e57 Check isInWorld before asking position
This was SVN commit r14681.
2014-01-26 09:24:32 +00:00
JoshuaJB 5ec0dc8ae8 Fix a bug with one of the lobby settings I added to the options window.
This was SVN commit r14680.
2014-01-26 05:51:48 +00:00
JoshuaJB 39fef5c299 Add the ability to display chat messages when joining the lobby and quickly mostly update the options window to the new UI style.
This was SVN commit r14679.
2014-01-26 05:39:55 +00:00
scythetwirler a8fbe4eedc Centralizes centering rating into one function.
This was SVN commit r14678.
2014-01-26 05:27:00 +00:00
JoshuaJB 041c6ab1b3 More lobby cleanup.
This was SVN commit r14677.
2014-01-26 04:25:35 +00:00
historic_bruno 58a44bfbcb Adds missing comment in build-osx-libs.sh
This was SVN commit r14676.
2014-01-26 03:40:54 +00:00
historic_bruno 5187c6e4a5 Explicitly disables SDL X video driver in build-osx-libs.sh, to fix SDL_VIDEO_DRIVER_X11 definition used in HWDetect.cpp
This was SVN commit r14675.
2014-01-26 03:12:05 +00:00
historic_bruno 937ee8f77c Fixes clang "hidden overloaded virtual function" warning, patch by Echelon9, fixes #2388
This was SVN commit r14674.
2014-01-26 01:20:34 +00:00
JoshuaJB 0db9a18d39 Fix issue where lobby spam was being sent to external clients.
This was SVN commit r14672.
2014-01-25 21:58:22 +00:00
JoshuaJB 851c05a038 Cleanup and spam blocker redesign in lobby.js.
This was SVN commit r14671.
2014-01-25 20:51:01 +00:00
JoshuaJB 41a7c78e62 Fix some stuff in XmppClient.cpp on leper's recommendation.
This was SVN commit r14670.
2014-01-25 20:49:48 +00:00
mimo 28a707f98f small cleaning
This was SVN commit r14669.
2014-01-25 19:58:59 +00:00
scythetwirler 69991cd110 Deletes extra whitespace from last commit.
This was SVN commit r14668.
2014-01-25 19:00:22 +00:00
scythetwirler e183e87333 Adds a message that is triggered whenever the bot's name is mentioned when a user doesn't recognize the bot isn't human (which happens quite a lot)
This was SVN commit r14667.
2014-01-25 18:57:28 +00:00
Enrique 2b407a03eb Added Stanislas69 iberian corral with several fixes.
Fixed iberian struct normal and specmap.

This was SVN commit r14666.
2014-01-25 16:50:21 +00:00
sanderd17 9eb26c2622 Fix infinite loop when attacking a formation without valid targets
This was SVN commit r14665.
2014-01-25 16:27:55 +00:00
Mythos_Ruler 0f5e5fddd6 This was SVN commit r14664. 2014-01-25 14:45:58 +00:00
JoshuaJB 12a691edc2 Make my previous changes support < C++11 and Windows.
This was SVN commit r14661.
2014-01-24 20:31:39 +00:00
Mythos_Ruler 3f00d0cc9c Fix some broken maps. Delete some others.
This was SVN commit r14660.
2014-01-24 20:23:11 +00:00
sanderd17 ecaded076f Improve the Vector prototype with static functions. Replace the usage of the Math vector functions with functions from the Vector class.
This was SVN commit r14659.
2014-01-24 19:51:00 +00:00
JoshuaJB 5d4f509810 Update existing minimap idle button, add minimap idle button highlight and disabled, and some style fixes in session.xml. Refs #823 and refs #2357
This was SVN commit r14658.
2014-01-24 18:40:01 +00:00
Mythos_Ruler 2f145b1578 Iron Spearheads tech now affects all spear units (not just infantry spearmen).
Javelin Thong tech now affects all javelin units (not just infantry
javelinists).

Some shield tweaking.

Some more portraits.

This was SVN commit r14657.
2014-01-24 18:28:26 +00:00
JoshuaJB b46a6de335 Allow using the XMPP room subject to display lobby information to user, make the lobby GUI code more readable, and cleanup the modern styles.
This was SVN commit r14656.
2014-01-24 18:20:15 +00:00
JoshuaJB dd274113bc Fix #2403
This was SVN commit r14655.
2014-01-24 18:15:42 +00:00
Enrique d5609e33a6 Fixed elephant african bush actor and mesh
This was SVN commit r14654.
2014-01-24 15:04:58 +00:00
Spahbod 609e789cea Fixing the bug with the ramp in Cantabrian Highlands.
Applying the new improvements: Archipelago, Atlas Mountains, Cantabrian
Highlands.

This was SVN commit r14653.
2014-01-24 12:28:30 +00:00
scythetwirler f94a1aeac0 Checks for game end after toggling diplomacy. Also adds a comment for clarification to the lobby bot. Refs #2402.
This was SVN commit r14652.
2014-01-24 00:38:08 +00:00
scythetwirler 53900c082b Added some criteria for rated games. Fixes #2402.
This was SVN commit r14651.
2014-01-24 00:22:50 +00:00
scythetwirler e5e634f768 Displays ratings in the userlist. Fixes #2371.
This was SVN commit r14650.
2014-01-23 23:13:13 +00:00
Enrique d82282e358 Added animations for african bush elephant.
This was SVN commit r14649.
2014-01-23 21:41:58 +00:00
Mythos_Ruler cf851a7789 A bunch of naming stuff.
This was SVN commit r14648.
2014-01-23 18:32:21 +00:00
Enrique 35517f2cd6 commited basic_glow.xml material for self-illumination objects.
This was SVN commit r14647.
2014-01-23 17:50:00 +00:00
sanderd17 fd187f466f Add vector prototype to vector-like return values from C++ to JS. Fixes #2394.
This was SVN commit r14645.
2014-01-23 11:32:08 +00:00
sanderd17 d677033c4c Serialise Cost component since the population bonus is tech-modifiable. Fixes #2399
This was SVN commit r14644.
2014-01-23 08:56:22 +00:00
JoshuaJB df0cdf8561 Fix typo in the Lake random map script.
This was SVN commit r14643.
2014-01-23 04:48:52 +00:00
Enrique 8d5c02091a Added greek, arabic and big tents as eyecandy, they will be used in the ptolemaic mercenary camp.
Added Stanislas69's new gaul farmstead with some fixes. (Thanks
Stanislas69!)
Added carpet texture fragments to the ptolemaic struct texture

This was SVN commit r14642.
2014-01-22 22:59:06 +00:00
sanderd17 ef79e8305b An addition to bd3f5a8085, also refs #1964
This was SVN commit r14641.
2014-01-22 20:56:14 +00:00
sanderd17 bd3f5a8085 Removing the AI check for producing un-allowed units. Should be fixed in the AI side with ad8fa37f17. Refs #1964.
This was SVN commit r14640.
2014-01-22 20:47:51 +00:00
wraitii ad8fa37f17 Improve some building placement. May improve dropsite usage slightly.
Should fix #1964

This was SVN commit r14639.
2014-01-22 20:26:45 +00:00
sanderd17 1fedf11e9e Use a filter to pick a new attack target in the same turn, while still avoiding an infinite loop
This was SVN commit r14638.
2014-01-22 18:38:15 +00:00
wraitii a58acb28f0 Style improvements (thanks Leper).
Fix AI building its buildings closer together by properly moving failed
foundations out of the world.

This was SVN commit r14637.
2014-01-22 17:54:20 +00:00
Mythos_Ruler 546a26467f Cavalry Spearmen for Sparta. Gives them a melee cavalry for proper anti-siege.
This was SVN commit r14636.
2014-01-22 16:34:00 +00:00
Mythos_Ruler 01ec56cc0c A bunch of updated portraits. Thinking of going this color-coded route: Blue for citizen-soldiers. Red for champions and heroes. Maybe green for mercenary soldiers.
Tweaked a couple footprints.

This was SVN commit r14635.
2014-01-22 15:42:28 +00:00
sanderd17 32844e9a16 Fix tests + improve behaviour of attacking when not in formation
This was SVN commit r14634.
2014-01-22 15:13:07 +00:00
sanderd17 04aba0e41a Let certain formations stay in formation while attacking
This was SVN commit r14633.
2014-01-22 13:20:55 +00:00
wraitii de02ab2e53 Fix various bugs. Try to make the AI build its buildings closer together (WIP, and it's brute-force).
This was SVN commit r14632.
2014-01-22 03:11:19 +00:00
mimo df3bdcf8ca add back some lines removed unintentionally by previous tag
This was SVN commit r14631.
2014-01-21 22:59:21 +00:00
mimo 41d3366f6a check version and mods before loading a file, fixes #2361 and #2385.
This was SVN commit r14630.
2014-01-21 22:49:42 +00:00
wraitii 7d18fecbcd Fix some errors reported by Gildas, Lion_Kanzen and Gameboy. Prepare for formation fighting in the attack plans by having a more generic "army" component.
This was SVN commit r14629.
2014-01-21 20:24:51 +00:00
sanderd17 e466565c35 Let formations attack other formations (still without keeping their formation position though)
This was SVN commit r14628.
2014-01-21 16:50:58 +00:00
sanderd17 2ca25a6d3e differentiate between formations that can attack, and formations that can only move. Use the differentiation in the range calculation.
This was SVN commit r14627.
2014-01-21 09:10:17 +00:00
leper 453bd6c8a0 Fix typo (Cepio -> Caepio), reported by qwertz.
This was SVN commit r14626.
2014-01-21 00:41:17 +00:00
Spahbod 3955447b5b Applying the new improvements: Alpine Lakes, Anatolian Plateau
This was SVN commit r14625.
2014-01-20 15:44:28 +00:00
sanderd17 7763a22c08 revert having giving the attack state to formation controllers as it caused too much trouble
This was SVN commit r14624.
2014-01-19 18:03:43 +00:00
Spahbod 72ad5467e8 Applying the new improvements: Aegean Sea, Lake, Rivers
This was SVN commit r14623.
2014-01-19 15:38:02 +00:00
Mythos_Ruler 8b2037e5ee Some naming stuff.
Reduced the size of a spec map.

This was SVN commit r14622.
2014-01-19 12:58:18 +00:00
Spahbod 6036b48c1d WIP: Completing the unified random map syntax.
This was SVN commit r14621.
2014-01-19 11:58:24 +00:00
Spahbod d06ab6514b WIP: Setting ground for a unified random map syntax. Might break some current random maps.
Faster generation.
Better mountains.
Larger forests.
Should make it easier to design/tweak random maps.

This was SVN commit r14620.
2014-01-19 06:51:41 +00:00
alpha123 8845910f9c Of course the time I don't test before committing is the time I make a syntax error. I think the RNG hates me.
This was SVN commit r14619.
2014-01-19 02:57:40 +00:00
alpha123 7a520adbf3 Improve the wording of attack tooltips.
This was SVN commit r14618.
2014-01-19 02:01:21 +00:00
historic_bruno 3c04cdb8e0 Updates LICENSE.txt for 29a8df5029, refs #2308.
Sets svn:ignore property on generated cpp from encryption tests.

This was SVN commit r14617.
2014-01-18 23:41:27 +00:00
wraitii f2f0307a25 fix typo.
This was SVN commit r14616.
2014-01-18 21:05:53 +00:00
sanderd17 c2d43b009c Fix asking for non-existing templates of killed units
This was SVN commit r14614.
2014-01-18 20:56:21 +00:00
JoshuaJB 3cde5632ff Fix StoneCrossBox sizing.
This was SVN commit r14613.
2014-01-18 20:29:21 +00:00
wraitii 9330975d54 Fix Athens not researching civ phase. Make the AI adapt automatically to changing the max gatherers on fields.
Fix auto-researched technologies not being properly researched on init.
Fix the tests (amazing!).
GarrisonHolder sends which entities were added or removed (mostly for AI
purposes but could benefit other things).
Streamline AIInterface events.

This was SVN commit r14612.
2014-01-18 20:26:52 +00:00
Mythos_Ruler 76451a297e This was SVN commit r14611. 2014-01-18 20:21:06 +00:00
alpha123 c4643d925d Fix two bugs in attack tooltips. Add an extra Math.round to ensure we don't get huge decimals, and use a building's default arrow count as a minimum in rate calculation.
This was SVN commit r14610.
2014-01-18 19:20:17 +00:00
alpha123 ea526eedd1 Adjust the attack tooltips. Make the formatting for attack rate more consistent and use meters instead of tiles for range.
This was SVN commit r14609.
2014-01-18 18:59:51 +00:00
alpha123 046c5ef74c Make chariots faster, and give them a more consistent (and slightly smaller) obstruction radius.
Citizen chariots are now 15.0 speed (1 faster than cavalry), champion
chariots 16.0, and hero chariots 18.0.

This was SVN commit r14608.
2014-01-18 18:08:02 +00:00
Mythos_Ruler ca6301c399 Reduced number of gatherers for farms from 5 to 3 for testing.
This was SVN commit r14607.
2014-01-18 16:47:04 +00:00
JoshuaJB c02dafec74 Move simulation Vector math to globalscripts/Math.js. Refs #2032.
This was SVN commit r14606.
2014-01-18 15:27:30 +00:00
Mythos_Ruler ae35ed255f For the Celts, moved Blacksmith to the Village Phase. This isn't much of a bonus yet until we get some unique tech trees for the Blacksmith.
This was SVN commit r14605.
2014-01-18 15:04:20 +00:00
Mythos_Ruler 061c5f8ced Fixing pop cost for advanced Persian chariot.
This was SVN commit r14604.
2014-01-18 15:03:08 +00:00
Mythos_Ruler 36edaa5635 Siege Workshop for the Macedonians. Needs a new model.
Persians get the Nisean War Horses tech.

This was SVN commit r14603.
2014-01-18 15:02:16 +00:00
JoshuaJB 29a8df5029 Change the licence of sha.h to match the licence of sha.cpp. Refs #2308
This was SVN commit r14602.
2014-01-18 13:12:29 +00:00
Mythos_Ruler 8c971c4a10 Trying to make elephant attack sounds not so crazy. Unsuccessful.
This was SVN commit r14601.
2014-01-18 12:35:55 +00:00
Mythos_Ruler c316079cc7 Updated names for female citizens.
Updated Seleucid rally banner (still not happy with it).

Fixed name of Nisean War Horses tech.

This was SVN commit r14600.
2014-01-18 12:33:19 +00:00
JoshuaJB 1040cf2034 Add back a new minimap overlay, re-add and implement the original idle button, little whitespace cleanup, and delete some old unused ui images.
This was SVN commit r14599.
2014-01-18 02:38:07 +00:00
JoshuaJB 82ab190c5d Do what my previous commit was supposed to do.
This was SVN commit r14598.
2014-01-18 00:37:00 +00:00
JoshuaJB 9ad01e52fb Add third_party/encryption in premake as required for the lobby.
This was SVN commit r14597.
2014-01-17 23:51:23 +00:00
JoshuaJB 94822b791f Remove automatically generated test .cpp files.
This was SVN commit r14596.
2014-01-17 20:17:56 +00:00
JoshuaJB 32258b2ba3 Move lobby encryption code to third_party/encryption and add tests. Fixes #2308
This was SVN commit r14595.
2014-01-17 20:14:41 +00:00
Yves d80967111d Fixes a problem with the renderpath screen not being displayed.
Refs #2241

This was SVN commit r14593.
2014-01-17 18:40:36 +00:00
Yves 377c780ddd Fixes the problem that functions in globalscripts aren't available from GUI scripts anymore since 4b1297b328.
Refs #2241

This was SVN commit r14592.
2014-01-17 18:21:27 +00:00
historic_bruno c094e72ede Fixes scoping for icons in GUI text, instead of using only the top page on the stack, which caused errors when dialog boxes popped up over text containing icons
This was SVN commit r14591.
2014-01-17 02:54:57 +00:00
scythetwirler c39b541714 Fixes some typoes in the bot README
This was SVN commit r14590.
2014-01-16 23:22:14 +00:00
Mythos_Ruler aba3d8d9d5 Shield tweaking for the Bronze Shield and Gold Shield pikemen.
Adjusted hero health.

Made champions use arrow selections, while citizen soldiers use circles.

A bunch of updated portraits.

Seleucids changes.

Map updates.

New techs.

Roman siege walls a little weaker.

This was SVN commit r14589.
2014-01-16 23:21:57 +00:00
wraitii c1e86161b5 AIs now properly receive aura and technology updates. Fixes #2377, Refs #1520 . Consequently reimplement repairing for AIs.
Fix a few style issues and a bug with the gatherer count.
Still need to fix the entity.js file to handle properly some things as
this uses raw templates values.
Cache the AIinterface in AIProxy.js, please report if this works
properly.

This was SVN commit r14588.
2014-01-16 20:32:44 +00:00
sanderd17 4b828ae6bf Fix gaul fortress death variation. Fixes #2374
This was SVN commit r14587.
2014-01-16 19:26:39 +00:00
sanderd17 4a133264f5 Fix unit tests
This was SVN commit r14586.
2014-01-15 13:36:33 +00:00
wraitii 786afd9fcc Implement the number of gaia gatherers (it probably won't happen but it's safer that way).
Change UnitAI to call "leave" handlers on a conversion, like on a
destruction, so a unit will safely go to idle state on
resignation/conversions. Might fix some very weird bugs that probably
haven't been reported yet.
Reported by AlThePhoenix.
Fixes #2383.

This was SVN commit r14585.
2014-01-15 00:04:25 +00:00
sanderd17 a6dbf6a268 instead of removing members from formations as in e98478b68c, let the members stay in formation, but disable formation rearrangement in those cases.
This fixes issues with queueing orders, and should also fix #2380

This was SVN commit r14584.
2014-01-14 21:32:51 +00:00
wraitii 13105132a4 http://gifrific.com/wp-content/uploads/2012/06/You-Didnt-See-Anything-Madagascar.gif
This was SVN commit r14583.
2014-01-14 20:20:53 +00:00
wraitii d23b7deb98 Various improvements to AI's early game. Simplify some code and improve on other. Add a few different strategies (Rush/normal/boom, quite basic for now, refs #2344).
Aegis should mostly respect tech limitations so I'll ref #1964.
I'm going to go with #2364 is fixed, the AI should be more efficient in
early-game, and late-game is a known problem.
Fixes #2274 and fixes #2379.
Refs #2372 as it should fix several of those warnings for AIs.
Fixes #2256 with a new bartering system, in parts taken from mimo's
patch.

This was SVN commit r14582.
2014-01-14 19:54:31 +00:00
sanderd17 e98478b68c Make sure units in INDIVIDUAL state don't belong to a formation. Should fix #2380
This was SVN commit r14581.
2014-01-14 08:58:11 +00:00
JoshuaJB 0f56dceef2 Give the minimap 20px more on eack side and remove the ugly overlay. Also cleanup some nearby code.
This was SVN commit r14580.
2014-01-14 03:25:12 +00:00
leper 2ca0a20f81 Fix a bug in TestAllMemberFunction and initialize a variable in cmpBattleDetection. Refs #2372.
This was SVN commit r14579.
2014-01-12 23:13:24 +00:00
wraitii a26ab7b1e7 Should fix AI warnings (refs #2372).
Slight configuration changes to improve the early-game slightly, WIP.

This was SVN commit r14578.
2014-01-12 19:12:55 +00:00
sanderd17 0521d936a1 reduce a GuiInterface call for displaying formation tooltip
This was SVN commit r14577.
2014-01-12 18:39:47 +00:00
Yves 34949b0943 Fixes some AI errors and missing VARs.
This was SVN commit r14576.
2014-01-12 17:34:18 +00:00
wraitii 6c3bd4db1e Fix previous AI commit.
This was SVN commit r14575.
2014-01-12 02:40:42 +00:00
wraitii 9d02495a96 Fix a few bugs.
Improve the AI gamestate to make better use of entity collections,
should be very slightly faster, and it's cleaner.
Remove enemy watchers that were no longer used.

This was SVN commit r14574.
2014-01-12 01:07:07 +00:00
Yves 8195e767ef Fixes an occasional crash when hotloading GUI files.
Refs #2241

This was SVN commit r14573.
2014-01-11 20:53:01 +00:00
wraitii bc9b76c86b Fix an error in defense.js (thanks mimo), and an issue in the HQ that made the AI start super slowly on some maps.
This was SVN commit r14572.
2014-01-11 18:51:37 +00:00
wraitii 4ef80d26aa Proper fix for the gatherer count. Fix an AI bug. Thanks to Gameboy and Gildas for reporting.
This was SVN commit r14571.
2014-01-11 18:14:13 +00:00
sanderd17 0e0b4e3057 make population bonus technology modifiable
This was SVN commit r14570.
2014-01-11 14:55:22 +00:00
sanderd17 96448bfa4e * add a (currently useless) attack state to formations
* add a formation attack component that will be used in the future to
coordinate formation attacks
* clean up some related methods, and move some to more appropriate
places

This was SVN commit r14569.
2014-01-11 12:19:43 +00:00
JoshuaJB 20692a26b0 Fix some undefined errors with unknown presences in the lobby and recougnize the 'gone' presence as away.
This was SVN commit r14568.
2014-01-11 03:53:41 +00:00
mimo eee6ed65dc still another fix to the gatherer count
This was SVN commit r14567.
2014-01-10 22:50:13 +00:00
wraitii 82fa27bad4 http://i.imgur.com/iAwfubL.gif
This was SVN commit r14566.
2014-01-10 20:33:47 +00:00
wraitii df9fb05689 Fix the gatherer count per player further and some style niceness.
This was SVN commit r14565.
2014-01-10 20:27:34 +00:00
leper 7606230158 Vars and style fixes.
This was SVN commit r14564.
2014-01-10 20:04:37 +00:00
sanderd17 9f243a3372 Disabling the OFFSET_LINE doesn't change any functionality as far as seen, while it fixes #2368.
This was SVN commit r14563.
2014-01-10 19:56:36 +00:00
Yves 11430cf927 Remove scripting directory from premake4.lua
(I forgot that in cbc0650a79)

This was SVN commit r14562.
2014-01-10 19:52:57 +00:00
Yves cbc0650a79 Removes some unused files
This was SVN commit r14561.
2014-01-10 19:38:34 +00:00
wraitii bd22432fe8 Rename common-api-v3 to common-api.
Fix warnings with the new AI.
Fix an error with the per-player gatherer counts.

This was SVN commit r14559.
2014-01-10 17:46:48 +00:00
sanderd17 87250a79c9 delete groups with a right click. Fixes #2341. Patch by boeseRaupe
This was SVN commit r14558.
2014-01-10 16:51:13 +00:00
sanderd17 f9a2c30a17 fix tests
This was SVN commit r14557.
2014-01-10 16:36:04 +00:00
Yves ee39f21b52 Fixes a problem when messageboxes were called without callback function.
Fixes #2367
Refs #2241

This was SVN commit r14556.
2014-01-10 16:25:09 +00:00
sanderd17 3d23f81696 Show the number of attacks per second to show users some attack speed, without showing the actual timers, or calcualtion of the number of arrows. Fixes #2352
This was SVN commit r14555.
2014-01-10 09:17:40 +00:00
wraitii 72c2853563 Update the tutorial AI (somewhat untested and hacky).
This was SVN commit r14554.
2014-01-10 02:08:59 +00:00
wraitii a6032ddd3f Removes older AIs and APIs.
For the sake of it, we should have a minimal AI sometimes.

This was SVN commit r14553.
2014-01-10 01:48:09 +00:00
wraitii ede4f32bf2 Change the defense system used by Aegis to use more modular armies. This should be faster and easier to extend, though right now it might not be as efficient as before.
Fix a few bugs, including a few bad ones in the economy.
Change the way messages are handled, should be marginally faster in the
later game.
Makes gatherers count limit be per-player (refs #1387 and #643).

This was SVN commit r14552.
2014-01-10 01:46:27 +00:00
sanderd17 22a85b0eb4 add dummy setspeed method to UnitMotionFlying
This was SVN commit r14551.
2014-01-09 12:53:28 +00:00
mimo ec36222b20 add more flexibility to eject units when garrisonHolder is destroyed, fixes #2242
This was SVN commit r14550.
2014-01-08 18:27:58 +00:00
wraitii 2d806f81f0 If at first you don't succeed…
Refs #2359

This was SVN commit r14549.
2014-01-08 18:18:52 +00:00
sanderd17 641c65b1dd Give some explanation to my change in 0c336649e6
This was SVN commit r14548.
2014-01-08 17:57:12 +00:00
sanderd17 0c336649e6 fix repairing buildings
This was SVN commit r14547.
2014-01-08 15:39:32 +00:00
LordGood 774d56af7e Carthaginian farmstead remake
This was SVN commit r14546.
2014-01-08 15:19:35 +00:00
sanderd17 9229cea9cc allow repairing of moving objects
This was SVN commit r14545.
2014-01-08 13:39:33 +00:00
sanderd17 f9b950aa96 improve rearrange of idle formation when units are tasked away from the formation + fix formation-settable idle animations
This was SVN commit r14544.
2014-01-08 10:55:44 +00:00
sanderd17 e8c4031bea Don't disband idle formations anymore, but give the formations a decent idle state. Formationmembers still need to leave the formation to anything other than walking, but this is a small step towards attacking formations.
This was SVN commit r14543.
2014-01-08 09:47:27 +00:00
sanderd17 4585f7322c Make the tooltips and the required members part of the formation template + fix allowing the wedge formation only for cavalry
This was SVN commit r14542.
2014-01-08 08:02:15 +00:00
JoshuaJB bec7cfd520 Another attempt to fix the lobby disconnects.
This was SVN commit r14541.
2014-01-08 04:22:34 +00:00
historic_bruno 7e87211d91 Attempts to fix crash reported on OS X Mavericks by not calling SDL_SetGamma in that case (this patch was included in the A15 bundles), refs #2272
This was SVN commit r14540.
2014-01-08 01:29:04 +00:00
wraitii 0482038af2 Another go at #2359
This was SVN commit r14539.
2014-01-08 00:06:26 +00:00
historic_bruno ad6ed949ee Fixes unreferenced formal parameter warning in MSVC
This was SVN commit r14538.
2014-01-07 23:10:06 +00:00
sanderd17 aadd297cce Implement the ability to switch animations based on the formation position
This was SVN commit r14537.
2014-01-07 20:21:55 +00:00
sanderd17 ff2a7d6bad fix spelling mistakes
This was SVN commit r14536.
2014-01-07 19:43:32 +00:00
sanderd17 83c5d40cfb fix compiling problem caused by 8226d75715
This was SVN commit r14535.
2014-01-07 14:37:02 +00:00
sanderd17 b1e0f1b62a Clean up the mess of different ways to note the formations (capitalised, with spaces, with underscores, concatenated ...) by always referring to the template name.
This was SVN commit r14534.
2014-01-07 13:33:08 +00:00
sanderd17 94907897a7 Fix tests + fix classes Ashoka. Fixes #2362
This was SVN commit r14533.
2014-01-07 09:23:59 +00:00
JoshuaJB 8226d75715 Make PickEntitiesAtPoint faster yielding 1-3% overall performance improvement. Fixes #2358. Also removes some trailing whitespace.
This was SVN commit r14532.
2014-01-07 04:05:10 +00:00
mimo 729a795a44 of course, 7a3b1fe47e can be simplified
This was SVN commit r14531.
2014-01-06 23:23:18 +00:00
mimo 7a3b1fe47e Improve speed of territory computation, fixes #2360
This was SVN commit r14530.
2014-01-06 22:49:57 +00:00
wraitii d0e57cb0ff Change a few things to avoid warnings with gcc. Should fix #2359
This was SVN commit r14529.
2014-01-06 22:14:27 +00:00
leper baf6925b66 Tactical varfare.
This was SVN commit r14528.
2014-01-06 20:55:22 +00:00
sanderd17 8cc1ddf6de Small code style fix
This was SVN commit r14527.
2014-01-06 20:13:55 +00:00
mimo b4fa090435 fix losRangeQuery broken in e096df0070
This was SVN commit r14526.
2014-01-06 19:35:51 +00:00
sanderd17 3406f2f3e8 Fix code style of files committed too soon in f19a8d6b41
Adds blinking overlay to ther hero icon when he's attacked
Adds a health bar to the hero icon
Fixes #1902
Patch by boeseRaupe

This was SVN commit r14525.
2014-01-06 13:48:17 +00:00
sanderd17 f19a8d6b41 Take the box formation out of the special case formations
This was SVN commit r14524.
2014-01-06 13:32:48 +00:00
LordGood 5cde6f7046 small rome tower edit
This was SVN commit r14523.
2014-01-06 12:50:50 +00:00
sanderd17 9989359c46 Small code cleanup + fixed default formation orientation
This was SVN commit r14522.
2014-01-06 10:16:28 +00:00
sanderd17 2f077fd9e1 Remove wedge formation from being a special case in the formation code
This was SVN commit r14521.
2014-01-06 09:10:46 +00:00
historic_bruno 9ccaa42a54 Fixes MSVC warning C4706: assignment within conditional expression
This was SVN commit r14519.
2014-01-06 02:16:09 +00:00
sanderd17 92ed27e3c5 Treat the flank formation as a regular formation, rather than a special implementation.
This was SVN commit r14518.
2014-01-05 18:50:31 +00:00
mimo f814510b2e revise the chase and flee
This was SVN commit r14517.
2014-01-05 18:29:38 +00:00
sanderd17 b8ee766cd3 Remove some hardcoded formation shapes. Some special formations still have a special treatment though. Also implement speed modifiers for formations, so we can have faster and slower formations.
This was SVN commit r14516.
2014-01-05 17:13:22 +00:00
wraitii aa0d485d72 Fix improper disabling of waves.
This was SVN commit r14515.
2014-01-05 16:41:50 +00:00
wraitii 15ec863aec Substantial speed-up of the foam generation code.
Remove waves for now as they were unsatisfactory.
Removes "shininess" as a water parameter as it was basically useless.
Add a button in Atlas to recompute water parameters so you can now see
fog in Atlas.

Fixes #1743, #1803 (invalid)
Refs #1875, #2114, #48.

This was SVN commit r14514.
2014-01-05 16:15:20 +00:00
mimo d56595c802 Put into alert units trained during an alert, fixes #2342, patch by Itms
This was SVN commit r14513.
2014-01-05 15:12:17 +00:00
Yves 7193e29961 Adds precompiled.h include because Visual Studio checks for that even though the file only contains comments.
Thanks to boeseRaupe for reporting.

Refs #2348

This was SVN commit r14512.
2014-01-05 13:58:38 +00:00
Yves b20955436b I completely missed the header files when disabling the JS debugger.
Refs #2348

This was SVN commit r14511.
2014-01-05 10:26:27 +00:00
sanderd17 d0497c83f1 Split the formation template in different templates. This can be used later to remove hard-coded formation statistics and forms to attributes in those templates
This was SVN commit r14510.
2014-01-05 10:09:42 +00:00
LordGood d4f35f1061 Revised roman tower
This was SVN commit r14509.
2014-01-05 02:11:00 +00:00
Yves 6ca6a5f779 The patch in 4b65f77438 seems to have fixed the crash, but the initData value doesn't match the JSContext's compartment, so it's theoretically wrong.
This should fix it correctly.

#Refs 2241

This was SVN commit r14508.
2014-01-04 21:49:36 +00:00
Yves 4b65f77438 Fixes an occasional crash introduced in #2241 (hopefully).
Refs #2241

This was SVN commit r14507.
2014-01-04 21:36:12 +00:00
Yves 7d516e7e7a Disables the JS debugger.
It's completely broken since 4b1297b328 and will have to be updated for
the new SpiderMonkey API.
I only uncomment it at the moment because I plan to fix/reimplement it
soon after the upgrade.

Closes #2348
Refs #2241
Refs #1886

This was SVN commit r14506.
2014-01-04 20:47:56 +00:00
Mythos_Ruler da1a2eaba6 This was SVN commit r14505. 2014-01-04 20:42:34 +00:00
Mythos_Ruler d8e839daec Reduced armor for Roman siege walls.
This was SVN commit r14504.
2014-01-04 16:53:01 +00:00
sanderd17 58dd223018 Now really fix the temple aura. See d4b2c1285c
This was SVN commit r14503.
2014-01-04 15:43:05 +00:00
sanderd17 9fb6620edd Use an actual flee order to move animals away from the foundation. Fixes #2347
This was SVN commit r14502.
2014-01-04 15:36:20 +00:00
sanderd17 1e33dd1d5e fix targetPosition != null check
This was SVN commit r14501.
2014-01-04 13:15:44 +00:00
Yves 3d5f661447 Fixes assertion failure when opening the ingame manual.
This problem happens because callback functions need to be passed to GUI
pages differently since 4b1297b328.

Refs #2241

This was SVN commit r14499.
2014-01-04 11:48:28 +00:00
Yves 4a11b30b39 Fixes assertion failure when clicking the settings button (aiconfig) on the match setup screen.
This problem happens because callback functions need to be passed to GUI
pages differently since 4b1297b328.

Refs #2241

This was SVN commit r14498.
2014-01-04 11:29:35 +00:00
sanderd17 d4b2c1285c add the ability to exclude props from the selection size + add aura visualisation rings again
This was SVN commit r14497.
2014-01-04 10:41:32 +00:00
Yves 4b1297b328 Removes g_ScriptingHost and implements global to compartment 1 to 1 relation.
Each GUI Page gets its own compartment and all ScriptInterfaces in the
same thread should now use the same JS Runtime.
This is required for the SpiderMonkey upgrade.
Check the ticket for details.

Closes #2241
Refs #1886
Refs #1966

This was SVN commit r14496.
2014-01-04 10:14:53 +00:00
LordGood 743644f5ce Roman tower remake
This was SVN commit r14495.
2014-01-04 04:14:29 +00:00
sanderd17 e096df0070 fix units attacking harmless gaia buildings
This was SVN commit r14494.
2014-01-03 20:24:02 +00:00
JoshuaJB fb8032043b Use pointers instead of copying sprites in the GUI. Fixes #1984. Patch by jP_wanN.
This was SVN commit r14493.
2014-01-03 20:19:43 +00:00
JoshuaJB 28f022993a Fix template typos and inconsistaint whitespace.
This was SVN commit r14492.
2014-01-03 19:55:29 +00:00
Mythos_Ruler e85c3de782 Removed the Cavalry Stables from the Seleucids. Their training buildings started to get unwieldy compared to other civs.
This was SVN commit r14491.
2014-01-03 19:30:25 +00:00
mimo 9a41c588fe prevent traders to cycle between two adjacent markets
This was SVN commit r14490.
2014-01-03 14:03:12 +00:00
sanderd17 1eb5d730fc allow garissoning a small number of support units in houses as protection against early raids. Patch and suggestion from dumbo
This was SVN commit r14489.
2014-01-03 13:11:12 +00:00
sanderd17 f634a8db3e fix units fleeing too far
This was SVN commit r14488.
2014-01-03 12:49:04 +00:00
mimo 6e4adcba52 add missing rallypoint to garrisonholder wonders
This was SVN commit r14487.
2014-01-03 11:24:23 +00:00
LordGood 1c3da82869 New Carthaginian wonder commit
This was SVN commit r14486.
2014-01-03 03:17:53 +00:00
Mythos_Ruler f7c1b73a01 Some more tweaks for the Seleucids.
Updated portraits.

This was SVN commit r14485.
2014-01-02 23:24:18 +00:00
mimo 66de76e026 fixes #2340, patch by itms
This was SVN commit r14484.
2014-01-02 23:11:18 +00:00
sanderd17 8269f0cfd4 Group units in clusters of separate formations when they're too far apart.
This was SVN commit r14483.
2014-01-02 20:04:50 +00:00
wraitii 8b98e2d513 Fix osx libraries build script for WXwidgets and libiconv.
This was SVN commit r14482.
2014-01-02 17:24:48 +00:00
leper e73738d794 Do not pause multiplayer games if one player opens a dialog. Patch by boeseRaupe. Fixes #2275.
This was SVN commit r14481.
2014-01-02 16:30:24 +00:00
leper dd86995f77 Fix some newlines.
This was SVN commit r14480.
2014-01-02 16:22:03 +00:00
leper b3d799d950 Replace inconsistent separators in quotes. Fixes #2247. Patch by boeseRaupe.
This was SVN commit r14479.
2014-01-02 14:46:47 +00:00
mimo 7d26f93666 fix animals taken as target in move-attack after 66770feed6, use the same filter as in AttackEntitiesByPreference
This was SVN commit r14478.
2014-01-02 14:17:46 +00:00
sanderd17 5b2cb0e72f small code fix
This was SVN commit r14477.
2014-01-02 08:40:51 +00:00
JoshuaJB b1422137e5 Cleanup GUI Checkbox C++ code by removing broken, non-obvious internal text rendering.
This was SVN commit r14476.
2014-01-02 03:28:15 +00:00
sanderd17 d8e8f613cd small code cleanup
This was SVN commit r14475.
2014-01-01 19:56:27 +00:00
sanderd17 59525414ee fix automatically attacking buildings caused by 66770feed6
This was SVN commit r14474.
2014-01-01 19:54:15 +00:00
sanderd17 66770feed6 include gaia range query of UnitAI in general range query. Fixes #2156. Patch by dumbo
This was SVN commit r14473.
2014-01-01 18:59:16 +00:00
sanderd17 05baeae5bd fix units not dropping resources when they are already at the resource dropsite (e.g. fields right next to a farmstead). Fixes #2336
This was SVN commit r14472.
2014-01-01 18:17:47 +00:00
sanderd17 9cf55a5ed0 fix productionQueue failing to produce units while the upgrade tech is running
This was SVN commit r14471.
2014-01-01 16:35:49 +00:00
sanderd17 2197b80747 fix oos problem mentioned by Yves on IRC
This was SVN commit r14470.
2014-01-01 16:15:26 +00:00
JoshuaJB 3d171b54c9 New ModernTickBox style for the GUI. Replace the use of StoneCrossBox in the lobby GUI with the new style.
This was SVN commit r14469.
2014-01-01 06:15:06 +00:00
JoshuaJB 67570be8fa Make GUI button-based objects to behave more expectedly when doubleclicked, also some style tweaks.
This was SVN commit r14468.
2014-01-01 06:05:41 +00:00
JoshuaJB 1e522f9b2c Fix bug with rating in lobby bot, remove superfluous GUI typedef, and change the lobby chat autocompletion to use tab.
This was SVN commit r14467.
2014-01-01 00:23:18 +00:00
wraitii 9d9361ae44 Why you should test your code before committing, exhibit A.
This was SVN commit r14466.
2013-12-31 21:45:11 +00:00
wraitii a7cafe75aa "Reveal all player" id back to -1, add some "ensure" to catch invalid player ids and be safer.
This was SVN commit r14465.
2013-12-31 21:30:48 +00:00
wraitii fe2a97b0c9 Change some useless std::map into std::vector for LOS. Player "0" now reveals the LOS for all.
This was SVN commit r14463.
2013-12-31 16:38:11 +00:00
mimo d7f18c10de Add visual indicator when unsetting rally-points, closes #2117
This was SVN commit r14462.
2013-12-31 13:21:06 +00:00
Yves 75b8952d04 Delete help.txt.
I wanted to update it first for some function names I changed.
Then I noticed that nearly all the functions described there don't exist
anymore or have changed. There are much better descriptions at the
places where the functions are declared/implemented.
We should either do it right (and force everyone to update that file for
every change) or don't to it at all. At this stage of development it
doesn't make sense and when we start documenting all the functions at a
central place, there are better locations than this file.

This was SVN commit r14461.
2013-12-31 12:21:56 +00:00
JoshuaJB c0472f0de5 Fix trivial comment typo caught by wraitii.
This was SVN commit r14460.
2013-12-31 11:06:00 +00:00
sanderd17 f8ca47913d fix division by zero for zero-time technologies. Fixes #2334
This was SVN commit r14459.
2013-12-31 09:02:58 +00:00
JoshuaJB c7ff0bb486 Tweak some lobby login UI bits, rework scrollbar mousewheel handling, add ability to scroll through closed dropdowns with scrollwheel, general C++ GUI cleanup, and fix broken random map script 'Unknown Nomad'.
This was SVN commit r14458.
2013-12-31 04:54:16 +00:00
JoshuaJB b3a74e8f72 Add message to help new users register for the lobby.
This was SVN commit r14457.
2013-12-31 01:14:09 +00:00
leper 2008ebc9d6 Use ACLs in the ipstamp module to support multiple lobby bots.
This was SVN commit r14456.
2013-12-31 00:25:33 +00:00
JoshuaJB b2a535d838 Change the lobby registration to the new UI style and try to make it more ergonomic.
This was SVN commit r14455.
2013-12-31 00:01:27 +00:00
JoshuaJB e21464d960 Try to fix some errors in the bot by checking a player id's validity before using it as an index.
This was SVN commit r14454.
2013-12-30 20:48:15 +00:00
leper 1c9965999b Use another muc room for svn/a16.
This was SVN commit r14453.
2013-12-30 19:44:42 +00:00
wraitii dddc9bab7f Fix tests.
This was SVN commit r14452.
2013-12-30 18:55:37 +00:00
sanderd17 4776d85301 use UnitMotionFlying for the hawks
This was SVN commit r14451.
2013-12-30 18:03:01 +00:00
sanderd17 298115f4c5 Fix units chasing each other. Fixes #1537
This was SVN commit r14449.
2013-12-30 16:07:19 +00:00
wraitii ddee36e0a8 Hide map size for skirmish and scenarios. Refs #2301.
Also fix my previous commit because obviously I had committed the wrong
default value.

This was SVN commit r14448.
2013-12-30 15:59:00 +00:00
wraitii 08b44fe647 Fix water rendering (transparent objects now appear correctly when underwater/in reflections)
Add a new config option (renderactors) that, if set to false, will
prevent actors from rendering in-game (grass…)

This was SVN commit r14447.
2013-12-30 15:52:42 +00:00
Yves 4a15ac406b Move debug function and debug flag to API3 and use them from Aegis.
Remove copyPrototype from Aegis because that function is currently not
used and is already in API3.

Refs #2322

This was SVN commit r14446.
2013-12-30 14:28:30 +00:00
wraitii 5febe42aa9 Fix [14444]
This was SVN commit r14445.
2013-12-30 12:50:06 +00:00
wraitii bc136137fc Make hawks selectable in Atlas and alleviate their tendency to congregate in the upper right corner of maps.
This was SVN commit r14444.
2013-12-30 12:43:57 +00:00
wraitii bd2cd235fd Commit Micket's hawk model/rigging, textures using photos by unarmed, add an entity that moves around the map, change maps to use the entity and not the idle actor. Fixes #1228, Fixes #1975.
This was SVN commit r14443.
2013-12-30 11:10:54 +00:00
Yves 533f908f15 Some missing changes in #2322.
Refs #2322

This was SVN commit r14442.
2013-12-30 10:25:50 +00:00
Yves 3362c591f5 Moves AI players to one global using the module pattern.
This avoids wrapping overhead that would otherwise be required because
multiple globals per compartment aren't supported anymore in newer
versions of SpiderMonkey.

Check the ticket for a detailed explanation.

Closes #2322
Refs #2241
Refs #1886

This was SVN commit r14441.
2013-12-30 10:04:59 +00:00
Mythos_Ruler 9a8d5312d4 Removed Civic Center from the Seleucid female. They don't build civic centers (heroes can though). Citizen-Infantry build Military Colonies instead to expand.
This was SVN commit r14440.
2013-12-30 05:47:26 +00:00
Mythos_Ruler 3c630c2e63 Fixed Seleucid thureophoros accidentally calling on the Ptolemaic one.
Made the 4th level of armor techs apply to champions instead of all
infantry.

This was SVN commit r14439.
2013-12-30 05:38:24 +00:00
Mythos_Ruler 91bbc925e2 Completing the playability phase of the Seleucids. Now starts the long road of creating art and balancing and implementing bonuses (hero auras, unique techs, etc.).
This was SVN commit r14438.
2013-12-30 04:25:33 +00:00
leper 5e23445339 Make ConfigDB properly thread-safe.
Replace CreateValue with SetValueString so we don't pass pointers to
internal
 ConfigDB structures around. Refs #1810.
Remove some splash screen related functions since we can achieve the
same
 with the ConfigDB functions exposed to scripts.

This was SVN commit r14437.
2013-12-29 23:56:18 +00:00
JoshuaJB 92fba32c5e Some more C++ GUI cleanup.
This was SVN commit r14436.
2013-12-29 20:46:02 +00:00
JoshuaJB e729f46789 Make button-type GUI elements more responsive and cleanup in IGUIButtonBehavior.cpp
This was SVN commit r14435.
2013-12-29 19:31:48 +00:00
JoshuaJB d756e8d70e Add proper licences to lobby bot files. Also remove extranious config file.
This was SVN commit r14434.
2013-12-29 18:46:00 +00:00
sanderd17 45cfdf47f1 fix carthagian buildings being constructed with garrison flag up. Fixes #2318
This was SVN commit r14433.
2013-12-29 18:16:31 +00:00
leper 3746690f82 Define GLX_MESA_query_renderer functions unconditionally. Fixes #2325.
This was SVN commit r14432.
2013-12-29 17:13:55 +00:00
Mythos_Ruler 517e83b331 New map: Savanna River. Very defensive. Only 1 crossing, unless you cut through the trees around the river.
Tweaked Gambia River for pathing.

Tweaked the obstruction of Farm Fields so that they don't overlap so
much.

Increased build time of Wonders.

This was SVN commit r14431.
2013-12-29 16:36:25 +00:00
sanderd17 2146fa27c8 forgot to rename reference
This was SVN commit r14429.
2013-12-29 12:40:34 +00:00
wraitii 4158283fd4 Take unit obstruction size into account when checking if in range for garrisoning. Reduce CC loading range in consequence. Fixes #2190 .
This was SVN commit r14428.
2013-12-29 10:17:09 +00:00
sanderd17 10e8fb9105 remove debug message
This was SVN commit r14427.
2013-12-29 10:09:58 +00:00
sanderd17 cd125a94e2 fix tests + code style cleanup
This was SVN commit r14426.
2013-12-29 10:01:39 +00:00
wraitii 433293c7b2 Spread is now linearly tied to distance to target. Fixes #2093 .
This was SVN commit r14425.
2013-12-29 08:09:44 +00:00
Enrique 04d0f424df added wonder placeholders for generic hellenes and celts
This was SVN commit r14424.
2013-12-28 17:13:24 +00:00
wraitii ce7235a6aa Various art fixes.
Polynesia map is back to hdr mode.
Improve shark animations, improve crocodile walking animation.
Fix mauryan bamboo bow prop (for some reason it had two models).

This was SVN commit r14423.
2013-12-28 16:34:10 +00:00
wraitii 0029103153 Ptolemy fishing boat (along with props). fixes #2237
This was SVN commit r14422.
2013-12-28 15:59:08 +00:00
Enrique 15b42f0be5 Added wonder placeholders for civs without wonder.
This was SVN commit r14421.
2013-12-28 15:21:11 +00:00
Mythos_Ruler 139a1fd5ca Updated a bunch of civ jsons.
Fixed a few other things.

This was SVN commit r14420.
2013-12-28 15:07:19 +00:00
sanderd17 bf58f04511 add wonder victory condition. Refs #1649
This was SVN commit r14418.
2013-12-28 13:40:39 +00:00
mimo 749c4d5270 change the way to manage trade, closes #2311
This was SVN commit r14417.
2013-12-28 10:44:59 +00:00
Mythos_Ruler 6accb6faf6 Fixed bell icons.
Seleucid Military Reforms.

Fixed inheritance for Ptol healers.

This was SVN commit r14416.
2013-12-28 05:32:16 +00:00
JoshuaJB f254478d1b Revert accidentily committed changes.
This was SVN commit r14415.
2013-12-28 03:34:40 +00:00
JoshuaJB 177a7cd99d Make uninitilized players not show in the lobby leaderboard.
This was SVN commit r14414.
2013-12-28 03:32:31 +00:00
Mythos_Ruler 121345bd6a Name stuff.
This was SVN commit r14413.
2013-12-28 02:35:19 +00:00
Mythos_Ruler b3201acd93 Trimmed the descriptions for most of the random maps, per Josh's request.
This was SVN commit r14412.
2013-12-28 02:17:08 +00:00
Mythos_Ruler 5f1714dd83 Seleucids now have what used to be the Ptolemies' Military Settlement system (now called a Military Colony; needs a new model).
Fixed a few other templates.

This was SVN commit r14411.
2013-12-28 00:34:37 +00:00
Mythos_Ruler 02d38ceecd Fixed elephant stables class element.
This was SVN commit r14410.
2013-12-27 15:21:15 +00:00
sanderd17 bfa7f60251 add outpost skirmish entity, and apply it to the Gambia River skirmish map
This was SVN commit r14409.
2013-12-27 14:48:24 +00:00
sanderd17 659736301a define the limit changing elements together with the limits, so they can be queried by the GUI and the AI. Fixes #2187
This was SVN commit r14408.
2013-12-27 10:58:48 +00:00
wraitii 040e15ed51 Change shark model, skeleton, and change its animations. Add a shark entity that will roam the map and can be attacked, but will not attack and yields no food. Change Polynesia demo map to have a shark.
This was SVN commit r14407.
2013-12-27 10:32:53 +00:00
sanderd17 81f901d473 make the elphant stables count as town phase structure. Mentionned by Zeta1127 on the forums
This was SVN commit r14406.
2013-12-27 09:38:44 +00:00
sanderd17 f33d3193ca fix tests (fixes #2326)
+ small code cleanup
+ move guiInterface call to GetEntityState
refs #2154

This was SVN commit r14405.
2013-12-27 08:49:47 +00:00
Spahbod e4a124e768 WIP: Making the forests in random maps bigger as per people's request.
This was SVN commit r14404.
2013-12-27 08:07:05 +00:00
JoshuaJB dca3393195 Fix 'Carrier Pidgons' technology by checking that rawClasses is not NULL before operating on it.
This was SVN commit r14403.
2013-12-27 04:01:03 +00:00
Mythos_Ruler f42bf782bb Bactria map updated.
This was SVN commit r14402.
2013-12-27 00:47:26 +00:00
Mythos_Ruler c9b48c6e53 Updated a couple African maps with the new crocodiles.
This was SVN commit r14401.
2013-12-26 22:55:48 +00:00
Mythos_Ruler 60bcebf5b6 Fixed crocodile actor.
This was SVN commit r14400.
2013-12-26 22:45:04 +00:00
wraitii e942768b4d Add textured, normal-mapped, animated Nile crocodile to the game. Need to do a female version, possibly a saltwater croc version for mauryan maps?
Add crocodile entity, which is about similar to the lion.
Add a (temporary?) crocodile portrait.
It uses the lion sounds which are probably the closest we have right
now.

This was SVN commit r14399.
2013-12-26 22:33:06 +00:00
JoshuaJB 7688e9c93e Properly round rating calculation in the lobby bot to an integer.
This was SVN commit r14398.
2013-12-26 20:16:43 +00:00
JoshuaJB 4ac5aacc87 Strip some trailing spaces in the lobby bot.
This was SVN commit r14397.
2013-12-26 19:52:07 +00:00
JoshuaJB ad0d81cb8a Various lobby changes and some optimizations in the lobby bot by scythetwirler.
This was SVN commit r14396.
2013-12-26 19:45:20 +00:00
mimo 0780becb8a fix attack-move not working for packed units
This was SVN commit r14395.
2013-12-26 16:09:32 +00:00
Mythos_Ruler e9a269c01c Remove attack from Military Settlement for now.
This was SVN commit r14394.
2013-12-26 16:04:04 +00:00
sanderd17 953e44d9f8 try using footprint instead of obstruction for separation space between formation members + Fix some footprint sizes of siege units
This was SVN commit r14393.
2013-12-26 12:24:52 +00:00
sanderd17 41b3dfc89c Implement town bell
* the icons are temporary, and can be replaced later
* The sounds are created by LAVS, but may also need some polishing, so
the current ones are placeholders too
* The patch code is created by Itms
fixes #2154

This was SVN commit r14392.
2013-12-26 10:43:51 +00:00
sanderd17 9dcc3ee89e fix always picking the same processor core on some systems. Based on code hits by Philip
This was SVN commit r14391.
2013-12-26 10:05:44 +00:00
leper 1de1e2d5ba Fix typo.
This was SVN commit r14390.
2013-12-26 01:05:35 +00:00
JoshuaJB bdeae5d474 Don't send superfluous chat / commands in the lobby, also fix issues with the lobby system messages. Merge from my github branch.
This was SVN commit r14389.
2013-12-25 19:28:53 +00:00
Mythos_Ruler 4658cfa775 Mythos_Ruler's Christmas update for SVN users!
Includes:

- Unit rank upgrades, based on a patch by Sanderd. Not all civs get all
rank upgrades. For instance, Spartans get the Infantry rank upgrades,
but not the cavalry rank upgrades. Conversely, the Persians get the
cavalry rank upgrades, but not the infantry rank upgrades. Carthaginians
get rank upgrades for their mercenaries, but not their native units.
etc.

- Updated and tweaked many of the skirmish maps. Too many tweaks to
mention. But I did add Iberian circuit walls to many of them! New
"Bactria" Skirmish Map. Will continue to tweak this one to make it more
unique. It's based on modern-day Afghanistan, which the ancients called
"Bactria." A 2nd Ptolemies sandbox demo map.

- Moved the Ptolemaic Lighthouse to Town Phase to have more impact for
the Ptolemy player on maps with water.

- New Thureos shield patterns by Enrique for a NEW unit: Mercenary
Thureos Spearman.

- TECHNOLOGIES: Some techs renamed and tweaked. Plus, a new "Iron Armor"
tech for Heroes. A new "Roman Logistics" tech for the Roman Army Camp
and Siege Walls. A new "Battlefield Medics" tech for the temple that
unlocks (slow) health regeneration for units. The portrait for this tech
is placeholder and needs replaced ASAP.

- Cavalry now have oval selection rings. Eventually I will implement a
selection ring system where the citizen-soldiers and support units have
round rings, while champions have arrows, and heroes have stars. This
helps visually differentiate the roles of these 3 classes of units. Not
yet implemented.

- Vision radius for infantry slightly reduced.

- Fixed sounds for Persian Wonder.

- Fixed footprint sizes for a few buildings and Ptolemaic walls.

- Ptolemies now have the "Military Settlement" system in place. But this
system might go to the Seleucids instead later for historical reasons.

- Cost of fields reduced. Gathering rates for grain reduced.

- Fixed some selection group names for some templates. (Double clicking
didn't select them all as it should have).

- Fixed/Changed/Added some unit and building names, specifically for the
Ptolemies, but for some others as well.

- Some new temp portraits for Ptolemaic units. Ongoing task.

Lastly, I hope these changes don't break anything. They are heavily
tested on my end, but I can't promise I caught all bugs.

This was SVN commit r14388.
2013-12-25 15:49:49 +00:00
leper f7e68a4d4c Bot optimizations by scythetwirler.
This was SVN commit r14387.
2013-12-25 15:13:58 +00:00
sanderd17 40d407e8c6 use ptol fortress in random maps with the wall builder
This was SVN commit r14385.
2013-12-18 18:32:25 +00:00
leper 42bc5165ab Add compile time flag to disable use of miniupnpc.
This was SVN commit r14384.
2013-12-18 16:08:56 +00:00
sanderd17 7f5c2c4b83 enlarge the units demo map, so all units can be checked out again
This was SVN commit r14383.
2013-12-18 15:46:09 +00:00
Mythos_Ruler eb7215ecaf This was SVN commit r14381. 2013-12-18 14:14:37 +00:00
Mythos_Ruler 3d9fe04ab5 Added Egyptian names for Ptolemaic buildings.
Deleted a bunch of maps. Added Lorraine Plain skirmish map.

This was SVN commit r14380.
2013-12-18 13:54:30 +00:00
sanderd17 1b17ac50cc remove the aura visualisation from the actors, as it causes selection problems
This was SVN commit r14379.
2013-12-18 10:43:32 +00:00
sanderd17 63f2f85b01 make sure the non-garrisoned variant of the persian models is always picked while constructing
This was SVN commit r14378.
2013-12-18 10:28:32 +00:00
LordGood 6bc5e3f3a5 Ptolemies corral draft commit
This was SVN commit r14377.
2013-12-18 05:29:54 +00:00
alpha123 0b80cbe3ec Hide the password field by default on the lobby login box if there is a remembered password. Since we only store hashed passwords, this avoids potential confusing from seeing a password much longer than the user’s in the field.
This was SVN commit r14376.
2013-12-18 00:56:59 +00:00
alpha123 3c248e7501 Change the "Away" color in the lobby to be much easier to read on the dark background.
This was SVN commit r14375.
2013-12-17 23:58:53 +00:00
alpha123 c8fb750e43 Balance fix for CCs. Decrease build time from 600 to 500 and increase foundation armor from 3h/10p/3c to 5h/15p/3c.
This was SVN commit r14374.
2013-12-17 21:20:31 +00:00
leper c6d454ff2d Make ConfigDB threadsafe.
This was SVN commit r14373.
2013-12-17 19:58:39 +00:00
leper e83f24e3a6 Move UPnP port forwarding to a thread.
Fix some typos.
Do not return the result, as we would need to allocate it, but we never
use it.

This was SVN commit r14372.
2013-12-17 17:03:49 +00:00
JoshuaJB 4df4c0dec0 Try to actually do the threading my previous commit said it did.
This was SVN commit r14371.
2013-12-17 14:57:26 +00:00
JoshuaJB 0ba25e9968 Cache UPnP root URL to try to avoid searching each time. Also make searching asyncronous with the GUI to avoid hanging.
This was SVN commit r14370.
2013-12-17 14:21:49 +00:00
LordGood 60bbb50625 Ptolemaic dock draft commit
This was SVN commit r14369.
2013-12-17 03:17:35 +00:00
LordGood fa03aadaa5 Updated fixed unit icons
This was SVN commit r14368.
2013-12-16 04:09:35 +00:00
LordGood 8c5f583845 Ptolemaic blacksmith draft commit
This was SVN commit r14367.
2013-12-16 02:05:43 +00:00
leper 678d338670 Change bot name.
This was SVN commit r14366.
2013-12-15 21:02:58 +00:00
historic_bruno 2cdef4023c Fixes OS X libs build script
This was SVN commit r14365.
2013-12-15 20:56:58 +00:00
leper d2e671392b Fix bug in ipstamp module.
Sync with server. Refs #2307.

This was SVN commit r14363.
2013-12-15 18:33:01 +00:00
mimo 79252043ae fix the fish gatherer from b91ec9b449
This was SVN commit r14362.
2013-12-15 17:32:20 +00:00
Mythos_Ruler b91ec9b449 Added new Ptolemies track to the Ptolemies civ json.
Removed fishing from land units. However, they still try to go fish
after building a dock. Looks like it needs a deeper fix.

Portrait for Ptol camel archer.

This was SVN commit r14361.
2013-12-15 15:33:35 +00:00
OmriLahav 542861ba36 This was SVN commit r14359. 2013-12-15 14:14:22 +00:00
sanderd17 bcba922893 fix switching between column and other formations
This was SVN commit r14358.
2013-12-15 09:51:13 +00:00
historic_bruno e7d57136ef Updates license files for gloox, MiniUPnPc, and pkcs5_pbkdf2. Refs #2308
This was SVN commit r14357.
2013-12-15 02:49:11 +00:00
historic_bruno 2c3c8737e0 OS X libs build script improvements:
* fixes failed build when using --force-rebuild
* cleans up old build output before starting new builds
* improves separation of libogg and vorbis
* updates wxWidgets to 3.0.0

This was SVN commit r14356.
2013-12-15 02:14:45 +00:00
historic_bruno 99f44ff7a0 Reorganizes extern libs in alphabetical order
This was SVN commit r14355.
2013-12-15 01:34:16 +00:00
historic_bruno 99f90dd6de Adds MiniUPnPc to build-osx-libs.sh
This was SVN commit r14354.
2013-12-15 01:26:55 +00:00
LordGood c2c2177be4 forgot the death particles
This was SVN commit r14353.
2013-12-15 01:10:39 +00:00
historic_bruno 62a10ab938 Fixes Windows build.
Fixes UPnP error handling to be more correct and conventional, refs
#2305

This was SVN commit r14352.
2013-12-15 01:02:26 +00:00
LordGood b1a73d3c0e Ptolemaic market draft commit
This was SVN commit r14351.
2013-12-14 22:14:24 +00:00
JoshuaJB f890856c6d Seperate differently licenced portions of sha.cpp/h into pkcs5_pdkdf2.cpp/h and remove some extra std includes in sha.cpp. Refs #2308
This was SVN commit r14350.
2013-12-14 16:58:21 +00:00
JoshuaJB bf97148ddc Add proper licence header and remove tyedefs in sha.cpp/h. Refs #2308
This was SVN commit r14349.
2013-12-14 16:22:48 +00:00
JoshuaJB 5876ec38d1 Make sure we properly free some UPnP-related variables.
This was SVN commit r14348.
2013-12-14 03:21:21 +00:00
JoshuaJB 551eb3919d Change UPnP lease duration to 0 (permanent) and update comments.
This was SVN commit r14347.
2013-12-14 03:03:22 +00:00
Mythos_Ruler 63622a85d7 Fixed missing elephants in some maps, thanks mimo for catching it.
This was SVN commit r14345.
2013-12-13 19:10:04 +00:00
Mythos_Ruler 44587963e6 Reduced armor for palisade fort.
Tweaked ptolemies sandbox, Alpine Valleys (removed player command of
some deer), and added a Greek Acropolis "Night" map for fun.

This was SVN commit r14344.
2013-12-13 16:26:26 +00:00
Mythos_Ruler 685d37ddfa New Roman emblem.
This was SVN commit r14342.
2013-12-13 14:18:46 +00:00
leper fd47e6caee Name.
This was SVN commit r14341.
2013-12-13 13:30:59 +00:00
leper 619c59fd3f Read the default MUC room from the config file and set it to arena15. Fixes #2306.
Change the jid of xpartamupp to WFGbot to make it work on the new
server. Refs #2307.

This was SVN commit r14339.
2013-12-13 12:14:17 +00:00
Mythos_Ruler 5b9dfaef8f Tweaked Gallic Fields.
Made the palisade spikes not lose health when outside territory.

Changed ptol military settlement actor from Athenian barracks to
Macedonian barracks.

Lowered the height of the farm field status bar slightly.

This was SVN commit r14338.
2013-12-13 11:34:19 +00:00
JoshuaJB 8dab478691 Bundle miniUPnPc with 0AD.
This was SVN commit r14333.
2013-12-13 02:59:35 +00:00
JoshuaJB 667537ee49 UPnP-based automatic port-forwarding using miniupnpc. Breaks windows build at the moment. Refs #2305
This was SVN commit r14332.
2013-12-13 02:23:02 +00:00
Enrique b508fe848a Fixed celtic embassy textures in its actor
This was SVN commit r14331.
2013-12-12 10:09:14 +00:00
wraitii 1efd47c1ad Fix errors when loading a saved game with Aegis by making sure the AI re-inits properly. Still no real saved game support.
This was SVN commit r14329.
2013-12-11 17:10:14 +00:00
Enrique 1c890d64ee Fixed persian gate messed up in previous commit
This was SVN commit r14328.
2013-12-11 15:59:11 +00:00
sanderd17 c6cf074e7a Fix unitAI warning when member left the formation
This was SVN commit r14327.
2013-12-11 15:17:43 +00:00
Enrique 2a824acae6 Made ptolemaic walls thinner. Added door to the gate (no animations yet) fixed some stretched UVs
This was SVN commit r14326.
2013-12-11 01:53:10 +00:00
historic_bruno 8db3ada87f Improves debugging output to help troubleshoot some WSDL bugs, refs #2146, #1733
This was SVN commit r14325.
2013-12-10 18:54:18 +00:00
Mythos_Ruler c661bb01c3 Temp fix for Nubian archer.
This was SVN commit r14324.
2013-12-10 01:27:09 +00:00
alpha123 f3e53bfb7c Reduce splash radius of catapults from the rather ridiculous 20m to 10m.
This was SVN commit r14322.
2013-12-09 19:22:45 +00:00
mimo 683349333b tune the guard behaviour
This was SVN commit r14321.
2013-12-09 18:15:24 +00:00
wraitii a44e88fa42 Check for "Destroy" messages beforehand in the base manager to avoid a rare error.
This was SVN commit r14320.
2013-12-09 16:35:06 +00:00
Enrique ed93cebd28 garrison flag fixing in ptolemaic civic centre, edfu wonder and macedonian temple.
Centered athenian temple, selection and obstruction adjusted.

This was SVN commit r14319.
2013-12-09 14:46:35 +00:00
wraitii c3ef9b3685 Forgot I had renamed a file…
This was SVN commit r14318.
2013-12-09 14:23:56 +00:00
wraitii f9bee5d3ec Slight de-obfuscation of the AI code.
This was SVN commit r14317.
2013-12-09 14:20:11 +00:00
Enrique 9339e658a5 Two new head models for ptolemaic support females. Fixes #2235
This was SVN commit r14316.
2013-12-09 12:38:46 +00:00
Enrique 8351e794fa Added different textures for each ptolemaic camel rank
This was SVN commit r14315.
2013-12-09 02:01:21 +00:00
Enrique a04dfcf836 Camel rider tweaking
This was SVN commit r14314.
2013-12-09 00:33:33 +00:00
Enrique 3c70f25ca4 Final edfu temple normal and spec.
Ptolemaic camel rider fix

This was SVN commit r14313.
2013-12-09 00:21:45 +00:00
sanderd17 208200db28 fix querying unitAI of non-existing members
This was SVN commit r14312.
2013-12-08 19:57:34 +00:00
Yves 966f7c7145 Removes some duplicated code.
This was SVN commit r14311.
2013-12-08 19:23:09 +00:00
wraitii 36334a6fa7 Fix the AI incorrectly trying to place Civil Centres too close to each other.
This was SVN commit r14310.
2013-12-08 16:24:09 +00:00
mimo ad157ad325 fix test broken by #14306
This was SVN commit r14309.
2013-12-08 13:01:59 +00:00
Mythos_Ruler 71d378b7a5 A bunch of stuff.
This was SVN commit r14308.
2013-12-08 13:01:14 +00:00
Enrique 332e23ee9c Edfu temple commit. Needs normal and spec map tweaking (coming soon). Fixes #2220
This was SVN commit r14307.
2013-12-08 11:21:19 +00:00
mimo e173493621 separate gui entityState in two parts to improve gui timing, adresses #2179
This was SVN commit r14306.
2013-12-08 10:02:19 +00:00
wraitii 1f7019f8e6 Might fix an issue on Acropolis where Aegis tried to build a CC too close to his main one.
This was SVN commit r14305.
2013-12-08 09:07:33 +00:00
historic_bruno 3182d6c8ee Reverts 4c9cd2921d fundraiser splash screen now that the fundraiser has ended
This was SVN commit r14304.
2013-12-08 01:35:06 +00:00
Yves f0fe2acdcb Disables JIT compiling of a loop to work around OOS errors in multiplayer games with AI players.
Fixes #2000

This was SVN commit r14303.
2013-12-07 11:49:11 +00:00
sanderd17 ca3f697f9d add iberian monument aura
This was SVN commit r14301.
2013-12-06 18:14:22 +00:00
sanderd17 783907264f cache the offset positions for formations, and only recalculate if the rotation towards a new target is big enough
This was SVN commit r14300.
2013-12-06 10:21:07 +00:00
historic_bruno b1c081e36d Set svn:eol-style=native, fix some inconsistent line endings
This was SVN commit r14299.
2013-12-06 00:42:50 +00:00
sanderd17 8d56504778 fix switching between line and column formation
This was SVN commit r14298.
2013-12-05 20:26:51 +00:00
sanderd17 d3f7da1e27 Let formation attack from the moment the first unit is in range
This was SVN commit r14297.
2013-12-05 19:26:55 +00:00
mimo 9678cf547a cache quantities depending only on the selection, adresses #2179
This was SVN commit r14296.
2013-12-05 18:50:29 +00:00
wraitii 2f3ce82dc3 Fix Aegis no longer building dropsites after the skirmish fix.
This was SVN commit r14295.
2013-12-05 17:34:24 +00:00
Mythos_Ruler 56c805ae93 Texture stuff.
This was SVN commit r14294.
2013-12-05 13:23:22 +00:00
sanderd17 7b82fba8d0 remove distance sorting for formation place assignment, as it made the center of the formation run + remove debug warning in AI code
This was SVN commit r14292.
2013-12-05 12:31:04 +00:00
sanderd17 03d9db0bb7 fix comment
This was SVN commit r14291.
2013-12-05 10:44:39 +00:00
sanderd17 7a1dbca390 make the movement of formations and ships more natural
This was SVN commit r14290.
2013-12-05 10:38:39 +00:00
sanderd17 cf88da5829 improve formations a bit more
* Take obstruction size into account, so bigger units have more space in
formations
* Minimize the maximum walk distance to get in formation by letting the
units far away from the centre pick their positions first

This was SVN commit r14289.
2013-12-05 10:23:49 +00:00
sanderd17 4062e2011f fix tests
This was SVN commit r14288.
2013-12-05 08:53:40 +00:00
wraitii 0ef6397545 Optimize the "Move()" function by removing unnecessary message broadcast. Fixes #2094
This was SVN commit r14287.
2013-12-04 17:38:46 +00:00
wraitii 5f8b6be833 Some additions to the particle system:
This was SVN commit r14286.
2013-12-04 17:21:59 +00:00
wraitii 189ef85538 Fix AI errors on skirmish maps.
This was SVN commit r14285.
2013-12-04 16:52:44 +00:00
sanderd17 60c986c135 * Add method to rangemanager to query around a position instead of an entity
* Use that method in the splash damage calculation
Fixes #2285

This was SVN commit r14283.
2013-12-04 15:30:01 +00:00
sanderd17 367614343b add two files that were deleted by accident in 3afd8e9d9e
This was SVN commit r14282.
2013-12-04 13:15:43 +00:00
sanderd17 3afd8e9d9e better formation place assignments (units run around less)
This was SVN commit r14281.
2013-12-04 13:14:31 +00:00
Mythos_Ruler 3c6045308a Fixing some cursor issues.
This was SVN commit r14280.
2013-12-04 01:56:40 +00:00
Enrique a549d5a08b Fixed aura rays actor
This was SVN commit r14279.
2013-12-04 00:38:09 +00:00
Enrique cd32fafd63 Fixed shader in aura material
This was SVN commit r14278.
2013-12-04 00:35:05 +00:00
Enrique e268c059e5 Healing aura effect placeholder, applied only in athenian temple
This was SVN commit r14277.
2013-12-04 00:25:03 +00:00
Mythos_Ruler bddcd57dea - Fixed a prop typo in the Athenian temple.xml
- Added the first Egyptian music track to the Ptolemies.

- Adjusted the Sacred Band tip text. New pic coming soon.

- Still trying to figure out what to do with "Wasteland" map.

This was SVN commit r14276.
2013-12-04 00:18:52 +00:00
leper a96a333b47 Small cleanup.
This was SVN commit r14274.
2013-12-03 01:01:12 +00:00
quantumstate 68880ca5d5 Make atlas player assignment apply to all of the currently selected units
This was SVN commit r14273.
2013-12-02 22:46:33 +00:00
OmriLahav f09d56fb28 This was SVN commit r14271. 2013-12-02 20:46:25 +00:00
sanderd17 7c3c78f6c9 make sure target has health before taking damage
This was SVN commit r14270.
2013-12-01 20:55:54 +00:00
Mythos_Ruler 3fea8d7c1e Some tips tweaks and new tips.
This was SVN commit r14269.
2013-12-01 18:22:28 +00:00
Mythos_Ruler 168f92e1e9 "Equine Transports" tech for the Persians.
Updated tip images.

This was SVN commit r14268.
2013-12-01 02:49:26 +00:00
Mythos_Ruler d2fccef696 New 4-player skirmish map for Scythetwirler: Watering Holes.
This was SVN commit r14267.
2013-11-30 22:49:54 +00:00
Mythos_Ruler cb7a4fe39c Minor things.
This was SVN commit r14266.
2013-11-30 21:53:56 +00:00
mimo c134108154 remove duplicated code
This was SVN commit r14264.
2013-11-30 18:23:32 +00:00
mimo e88d05e0e4 allow units to guard/escort buildings or units, fixes #2034
This was SVN commit r14263.
2013-11-30 17:30:08 +00:00
sanderd17 1d914c4613 testing visualisation of auras (the elephants need to be replaced with some iconic meshes)
This was SVN commit r14262.
2013-11-30 12:36:48 +00:00
Mythos_Ruler 495716b3ed Reduced the size of a bunch of massive specular maps.
Tweaked some maps.

A new map called "Wasteland". Don't know what to do with it yet.

Dust storm and other particles changes and tweaks.

Tweaks to some maps.

Spec and Norm maps for the Great Pyramid.

New Mace shield prop textures for buildings.

This was SVN commit r14261.
2013-11-30 07:57:29 +00:00
Mythos_Ruler d8362700f0 4 new Successor/Hellenistic shield designs by Enrique. Each has a bronze, silver, bronze player color, and silver player color variation.
Added final Seleucid unit, the Thracian Mercenary Swordsman.

Added spec and normal mapping to the Spartiate shields.

New Seleucid emblem.

This was SVN commit r14260.
2013-11-30 02:58:43 +00:00
Enrique 61c9df2847 Increased ptolemaic barracks size
This was SVN commit r14259.
2013-11-30 01:34:15 +00:00
Mythos_Ruler 44c134e03f Cavalry Archer templates for Seleucids.
This was SVN commit r14258.
2013-11-29 22:24:11 +00:00
Mythos_Ruler 15d87b9ad1 Garrison and Waypoint flags for Seleucids.
Cavalry Archer actors for Seleucids.

This was SVN commit r14257.
2013-11-29 22:23:32 +00:00
JoshuaJB 2e2b1b04ff Fix #2285 by using the original design with additional checks.
This was SVN commit r14256.
2013-11-29 20:34:56 +00:00
Mythos_Ruler 5ce3880d53 Some more Seleucid units.
Tweaked maps.

This was SVN commit r14255.
2013-11-29 19:04:07 +00:00
JoshuaJB 860875c835 Triage #2285. Not the most efficiant, but it works.
This was SVN commit r14254.
2013-11-29 17:46:24 +00:00
sanderd17 25b92ec652 implement spart auras + female boost for males
This was SVN commit r14253.
2013-11-29 13:06:58 +00:00
sanderd17 d18444344c implement pers auras
This was SVN commit r14252.
2013-11-29 12:56:44 +00:00
sanderd17 7bab5421c6 implement mace auras
This was SVN commit r14251.
2013-11-29 12:47:39 +00:00
sanderd17 bb5515a9ee implement hele auras + fix vircengetorix (part 2)
This was SVN commit r14250.
2013-11-29 12:36:18 +00:00
sanderd17 53f376cdc2 implement hele auras + fix vircengetorix
This was SVN commit r14249.
2013-11-29 12:35:58 +00:00
Enrique b0f00d4836 Improved Ptolemaic flag emblem with retouched LionKranzen's eagle
This was SVN commit r14248.
2013-11-29 12:16:15 +00:00
sanderd17 d672c6cf7d make loot tech aware + implement celt and gaul hero auras
This was SVN commit r14247.
2013-11-29 12:13:37 +00:00
sanderd17 ca9944b09c brit + cart hero auras + small code fixes
This was SVN commit r14246.
2013-11-29 10:57:44 +00:00
sanderd17 d403545620 implement all athen auras + add missing files from previous commit
This was SVN commit r14245.
2013-11-29 09:02:41 +00:00
sanderd17 1784e6b9b1 fix some aura typos + implement iphicrates aura
This was SVN commit r14244.
2013-11-29 08:37:15 +00:00
Mythos_Ruler 6c81f23cc8 This was SVN commit r14243. 2013-11-29 04:10:57 +00:00
Mythos_Ruler 7ea031964c A /bunch/ more Seleucid entities and actors. They still need tons of props, textures, and models. Also, not all unit templates are there yet.
Updated the Seleucid civ json.

Tweaked some tooltips to show their unit classes better.

Balancing: Slingers are now 1.5x vs. ranged infantry and 1.25x vs. melee
infantry.

This was SVN commit r14242.
2013-11-29 04:04:10 +00:00
Enrique f54fe9a7d2 Fixed persian and carthaginian camel trader prop position.
Scaled down several AO textures bigger than 1024
Ptolemaic barracks commited

This was SVN commit r14241.
2013-11-29 02:25:47 +00:00
mimo 351468dbe5 fix initialisation of developper overlay for saved games
This was SVN commit r14240.
2013-11-28 18:08:41 +00:00
Mythos_Ruler 65f5fffd9e Partial commit of Seleucid entities and actors.
Testing cost balance for cav skirms.

Reduce Town Phase cost to 800/800.

A bunch of other minor things.

This was SVN commit r14239.
2013-11-28 15:52:18 +00:00
sanderd17 a6ec62c85d fix ptol cav archer upgrade. Fixes #2282
This was SVN commit r14238.
2013-11-28 12:54:28 +00:00
Mythos_Ruler 64c9f84f10 Tweaked Alpine Valleys.
This was SVN commit r14237.
2013-11-28 01:30:18 +00:00
historic_bruno acf1c420c1 Moves management of GL viewports to CRenderer, letting it store the current viewport; calling code can retrieve and restore it later (instead of using deprecated glPush/PopAttrib, previously removed for GLES compatibility by 7dec618898)
This was SVN commit r14235.
2013-11-28 00:57:39 +00:00
mimo 8b0f1c3f1f cleaning
This was SVN commit r14234.
2013-11-27 16:30:14 +00:00
JoshuaJB 43c2219b22 Fix my fix.
This was SVN commit r14233.
2013-11-26 21:38:48 +00:00
JoshuaJB 10b9ace654 Add missing line.
This was SVN commit r14232.
2013-11-26 20:01:09 +00:00
JoshuaJB 4b7ab63172 Fix #1496 with a revised version of my patch. Also moves damage-related functions from Attack.js to a seperate file in the global namespace.
This was SVN commit r14231.
2013-11-26 18:33:42 +00:00
sanderd17 7345d27c84 Summon planes back from the emptyness
This was SVN commit r14230.
2013-11-26 15:12:16 +00:00
JoshuaJB 433b32bdcd Various XpartaMuPP cleanup.
This was SVN commit r14229.
2013-11-25 04:05:41 +00:00
leper c3ebb50711 Fix ratings and print rating changes in the lobby.
Fix game listings.
Fix non-hosts unregistering games.
Patch by scythetwirler.

This was SVN commit r14228.
2013-11-25 02:55:47 +00:00
LordGood d6a9489ccb Ptolemaic walls commit
This was SVN commit r14227.
2013-11-25 00:34:31 +00:00
Mythos_Ruler 2db4f3fe40 A few new portraits from Pureon.
This was SVN commit r14226.
2013-11-24 23:53:29 +00:00
Mythos_Ruler ff0eb70f4a Portrait tweaks for NAF Ele and Tiger.
Added tigers to these maps.

This was SVN commit r14225.
2013-11-24 23:19:41 +00:00
Enrique b08b478403 tweaked tiger animations ratio
This was SVN commit r14224.
2013-11-24 23:07:11 +00:00
Enrique dc8cea3fa4 New tiger mesh, texture and animations
This was SVN commit r14223.
2013-11-24 21:38:36 +00:00
Mythos_Ruler 9fc30533d4 This was SVN commit r14222. 2013-11-24 15:29:23 +00:00
Mythos_Ruler 7109c34297 Observer Hack attempt.
Tweaks to Alpine Valleys and Greek Acropolis.

This was SVN commit r14221.
2013-11-24 15:27:03 +00:00
mimo 6a58044cc6 add missing protection to previous fix, fixes #1052
This was SVN commit r14220.
2013-11-24 10:37:23 +00:00
Mythos_Ruler b7c3efac50 Ptol camel archer a little faster.
Brand new Alpine Valleys skirm map. My take on it anyway. 1v1.

This was SVN commit r14219.
2013-11-23 21:34:03 +00:00
mimo d930244f02 update RallyPoint targets when renamed, fixes #1052
This was SVN commit r14218.
2013-11-23 19:32:59 +00:00
Mythos_Ruler 26c2ded9c5 New specific name for "Hellenization" = Exellinismós
More accurate names for Spartiate and Spartan Woman.

Tweaked some maps.

This was SVN commit r14217.
2013-11-23 15:50:15 +00:00
mimo 3d75d4e69c do not show carrying resources animation in attack-move
This was SVN commit r14216.
2013-11-22 17:43:26 +00:00
leper 5da63764e0 Fix compilation with wxWidgets 3.0.
This was SVN commit r14215.
2013-11-20 19:29:10 +00:00
mimo 09d5507ecb clean some useless code
This was SVN commit r14214.
2013-11-19 21:27:23 +00:00
mimo e8d8673734 let non-fighting units flee when attacked even if the attacker is not visible
This was SVN commit r14213.
2013-11-19 21:20:25 +00:00
Enrique 95d5a25be1 Fixed carry_meat animations for mauryan elephant archers and ptolemaic camel rider
This was SVN commit r14212.
2013-11-18 03:43:36 +00:00
historic_bruno 5ce8de1f0a Removes unused var from JS debugger, from patch by Markus. Fixes #1852
This was SVN commit r14211.
2013-11-17 23:41:19 +00:00
historic_bruno d672d9625d Changes update-workspaces.bat to not generate a vc2013 workspace by default, since the game won't successfully build yet, refs #2271
This was SVN commit r14210.
2013-11-17 23:11:56 +00:00
Enrique c1609697d7 camel armature rider fix.
This was SVN commit r14209.
2013-11-17 22:48:03 +00:00
Mythos_Ruler e397993dae Deleting a bunch of scenarios.
Made peacock easier to hunt.

Fixed elite Ptolemaic slinger promotion.

Reduced the health of basic ranged citizen soldiers slightly.

Updated Deccan Plateau with moar forestry.

Fixed Athenian Marine specific name.

This was SVN commit r14207.
2013-11-17 20:16:57 +00:00
leper e881099d43 Use functions to change variables. Remove broken branding of cheating player.
This was SVN commit r14206.
2013-11-17 18:24:09 +00:00
leper 3a24eab0f0 Cache technology modifiers based on original value. Patch from sanderd17 based on work by Spahbod. Fixes #2045.
This was SVN commit r14205.
2013-11-17 18:24:04 +00:00
mimo 0d876adc13 add some var
This was SVN commit r14204.
2013-11-17 12:28:26 +00:00
Yves 294aa142d8 Fixes compiling with the flag "--without-lobby".
Refs #2267

This was SVN commit r14203.
2013-11-17 11:52:11 +00:00
Mythos_Ruler 7595ea4534 2 player Badlands skirmish.
This was SVN commit r14202.
2013-11-17 01:40:39 +00:00
Mythos_Ruler d5e7c1c44a Fixed Ptolemies and Macedonians death variations in these actors. They were previously throwing an error.
Champion spearmen -> 80 metal instead of 80 wood.

This was SVN commit r14201.
2013-11-16 23:30:34 +00:00
Yves 6fba293088 In #2241 I'm going to change the GUI to have one ScriptInterface for each GUI page because that will be required for the Spidermonkey upgrade (#1886).
The Multiplayer lobby needs some changes to avoid compartment
mismatches. Instead of initializing it with a ScriptInterface and
storing script values at different locations, it takes a ScriptInterface
argument in the functions that really need to read or write some script
values and avoids storing values as script values with an associated
compartment where possible.
The scripting interface of the lobby is also adjusted to use
JSInterface_Lobby.h/cpp files as other components instead of adding all
functions to ScriptFunctions.cpp. This makes it a bit more clearly
arranged IMO.

Fixes #2267
Refs #2241
Refs #1886

This was SVN commit r14199.
2013-11-16 18:38:40 +00:00
Mythos_Ruler 451e801f6a Minor things.
This was SVN commit r14198.
2013-11-16 18:36:35 +00:00
Mythos_Ruler 1f677c17b1 Fixed deccan plateau.
This was SVN commit r14197.
2013-11-16 17:37:13 +00:00
Mythos_Ruler 30c2abd529 Hannibal now rides an Asian elephant.
This was SVN commit r14196.
2013-11-16 17:26:30 +00:00
Mythos_Ruler 6794bc5258 Made tropic forest floor darker.
Tweaked Deccan Plateau skirmish map.

Tweaked Sahel skim map.

This was SVN commit r14195.
2013-11-16 17:24:28 +00:00
Spahbod bde9d19b7a Adding wbg to more maps.
This was SVN commit r14194.
2013-11-16 16:11:43 +00:00
Spahbod d7ef47959d Sahel random map.
This was SVN commit r14193.
2013-11-16 15:17:18 +00:00
Enrique 7ab15cb721 Building animation for mauryan support elephant
This was SVN commit r14192.
2013-11-16 15:05:55 +00:00
Enrique b8e9f74070 Added animations to gaia asian elephant male.
Maur support elephant is now asian, it has new texture.
Added normal texture for the skin of all asian elephants. (only armors
before)

This was SVN commit r14191.
2013-11-16 13:03:58 +00:00
LordGood 19bd71af5d fixed unecessary prop point
This was SVN commit r14190.
2013-11-15 23:52:28 +00:00
LordGood 51b1de2dee Carthaginian Fortress commit!
This was SVN commit r14189.
2013-11-15 23:44:02 +00:00
Yves 3ab983f8a1 Some "varfare" again plus a call to initMusic because that will be needed for the Spidermonkey upgrade.
This was SVN commit r14188.
2013-11-15 18:35:19 +00:00
Mythos_Ruler 54fcb3b4ca Updated (and completed) Sahel skirmish map.
This was SVN commit r14187.
2013-11-15 16:41:05 +00:00
Mythos_Ruler 1cd4e6ffdd Round footprint for lighthouse.
Some spec and normal maps for some shields.

Updated some skirmish maps.

This was SVN commit r14186.
2013-11-15 15:26:57 +00:00
Spahbod 9dbd8dbb26 Fixing the broken water on gulf of bothnia.
This was SVN commit r14185.
2013-11-15 14:42:18 +00:00
Enrique 5dc7d8dc9f missing lighthouse files
This was SVN commit r14184.
2013-11-15 13:52:57 +00:00
Spahbod ca0575e422 Increasing thIncreasing the generation speed of the maps: Phoenician Levant
This was SVN commit r14183.
2013-11-15 08:57:32 +00:00
Enrique 98638a2d2f Ptolemaic lighthouse and LordGood's new carthaginian defense tower.
Fixed ptolemaic fortress garrison flag

This was SVN commit r14182.
2013-11-15 02:52:04 +00:00
leper 47b26e56d3 Remove unused VideoRecorder from Atlas.
This was SVN commit r14181.
2013-11-14 23:05:07 +00:00
alpha123 d459e97d33 Remove unnecessary Territory element from the fortress and defense tower templates.
This was SVN commit r14180.
2013-11-14 21:58:49 +00:00
alpha123 9266d30e17 Build on cf4f7d18a7 based on discussion on IRC. Allow fortresses, towers, and wall towers to attack siege again, but debonus them 0.5x against it. Bonus catapults 1.25x vs fortresses, but reduce their attack vs buildings slightly in order to make them effective against all buildings but slightly better against fortresses' huge HP. They still have far less DPS than rams, even against fortresses, but are more flexible and are ranged. Enforce a minimum distance of 60 between fortresses, meaning that fewer can fire on siege weapons at once, and turtling is slightly less effective in general. Minor stat changes dealing with range of towers, fortresses, and catapults. Increase catapult splash radius and decrease splash damage, to make catapults more effective as semi-static defense against large numbers of infantry.
This was SVN commit r14179.
2013-11-14 21:49:02 +00:00
alpha123 a3a7f1cd22 Adjust siege ram.
- Decrease attack from 50c with 2x vs buildings (3x vs gates) to 80c
with 1.5x vs gates.
- Increase charge attack from 40c with 2x vs buildings (3x vs gates) to
100c with 1.5x vs gates.

This was SVN commit r14178.
2013-11-14 21:15:51 +00:00
Ykkrosh 8ecfbd0899 Remove unused includes of tr1/unordered_map etc.
They cause build errors with libc++, and we always use
boost::unordered_map instead.

This was SVN commit r14177.
2013-11-14 20:47:59 +00:00
alpha123 cfba68f8d2 Increase Advanced Siege tech from +3 crush to +5 crush.
This was SVN commit r14176.
2013-11-14 20:36:05 +00:00
alpha123 cf4f7d18a7 Buff catapults slightly.
- Add 'Siege' to the RestrictedClasses of towers, wall towers, and
fortresses. A fortress by itself should not be able to shoot down a
catapult, it should require some defense. This also nerfs building a ton
of towers and fortresses, which was previously very difficult to
penetrate and led to long, boring wars of attrition.
- Increase armor from 2h/10p/5c to 2h/30p/10c (matches siege rams).
- Increase attack from 30h/0p/30c to 0h/20p/35c. Would like to add techs
to increase damage further.
- Reduce splash damage to 0h/15p/30c from 40h/0p/40c.
- Increase maximum range from 68 to 75. May increase this more or add
techs.
Motivation is that siege catapults are relatively weak late-game, as
they have great difficulting penetrating fortified positions, leading to
both sides turtling. Additionally, this makes them roughly as strong as
siege rams, having less damage output than rams but having the ability
to attack from a distance. This balances out the civs without rams and
gives the ones with both rams and catapults an additional choice to
make.

This was SVN commit r14174.
2013-11-14 20:30:00 +00:00
Spahbod a04cc9f01b Increasing the generation speed of the maps: Northern Lights, Rhine Marshlands
This was SVN commit r14173.
2013-11-14 18:58:55 +00:00
Yves 8dedf7bc3d Fixes a graphics issue on Linux (probably a driver bug) by scaling the images from 1x1024 px to 4x1024 px.
Fixes #2265

This was SVN commit r14172.
2013-11-14 17:19:49 +00:00
Enrique b4174664c6 hellenic walltower door fixed
This was SVN commit r14171.
2013-11-14 16:26:46 +00:00
Spahbod 0170db4a53 Adding advanced graphical features into random maps. Fixes #2262.
This was SVN commit r14170.
2013-11-14 14:33:55 +00:00
Spahbod 11c471273c Committing the fix for undefined civs in atlas, and the problem with ptolemics in Fortress map by FeXoR. Fixes #2258.
This was SVN commit r14169.
2013-11-14 12:27:56 +00:00
mimo 321e61617b Improve MoveToTarget when the target is moving, fixes #2253
This was SVN commit r14168.
2013-11-14 07:25:56 +00:00
leper 4915116ccc Fix glooxwrapper build on gcc 4.2 and warning on clang.
This was SVN commit r14167.
2013-11-14 00:32:28 +00:00
leper 4c395f4bf2 Remove Trigger and Cinematic sections from Atlas.
This was SVN commit r14166.
2013-11-14 00:10:04 +00:00
Ykkrosh bd900362ea Rebuild premake4.exe with VC++ 2008 again, so that it works on WinXP/2003
This was SVN commit r14164.
2013-11-13 21:16:06 +00:00
leper e58fa107cc Fix skeleton caching.
This was SVN commit r14163.
2013-11-13 20:05:57 +00:00
Spahbod 49721cff33 Increasing the generation speed of the maps: Unknown Land
This was SVN commit r14162.
2013-11-13 14:30:27 +00:00
Spahbod 62551be685 New Random Map: Mainland. A simple map without any body of water. Also the space between the forests is increased. Optimizing the map for relatively lag-free games.
This was SVN commit r14161.
2013-11-13 13:36:47 +00:00
Spahbod 0d323c020b Increasing the generation speed of the maps: Archipelago, Gulf of Bothnia, Lorraine Plain
This was SVN commit r14160.
2013-11-13 13:17:22 +00:00
Spahbod 5dac329c78 Increasing the generation speed of the maps: Aegean Sea
This was SVN commit r14159.
2013-11-13 10:20:22 +00:00
Spahbod 65bd13ac1e Increasing the generation speed of the maps: Syria
This was SVN commit r14158.
2013-11-13 08:07:05 +00:00
Enrique 4acbf86ffb Trying to fix crazy elephant armature
This was SVN commit r14157.
2013-11-12 21:30:25 +00:00
Enrique 2f0d6ee1e8 Upgraded asian elephant animations.
This was SVN commit r14156.
2013-11-12 19:13:45 +00:00
sanderd17 17fdb515f4 fix error when selecting multiple elephants
This was SVN commit r14155.
2013-11-12 19:03:12 +00:00
historic_bruno 7cb4c0dcfc Partial fix of minimap rendering for GLES.
Replaces glBegin/End with glDrawArrays, GL_QUADS with GL_TRIANGLES, and
modifies shaders as needed.

This was SVN commit r14153.
2013-11-12 01:31:52 +00:00
historic_bruno 7dec618898 Some attempts to fix GLES build in smooth LOS and post proc manager.
Replaces glBegin/End with glDrawArrays, GL_QUADS with GL_TRIANGLES, and
replaces glPush/PopAttrib by resetting the viewport manually.
Adjusts GLSL shaders for these changes.

This was SVN commit r14152.
2013-11-12 01:30:17 +00:00
historic_bruno f1613a3c90 Fixes fancy waves build on GLES (replaces GL_QUADS with GL_TRIANGLES)
This was SVN commit r14151.
2013-11-12 01:25:32 +00:00
historic_bruno 81eabfc934 Fixes basic water rendering on GLES (replaces GL_QUADS with GL_TRIANGLES).
Sets SDL2 to use correct profile for GLES.
Cleans up some old SDL 1.3 version checks.

This was SVN commit r14150.
2013-11-12 01:24:04 +00:00
historic_bruno 5771bee032 First pass at fixing GLES build - more to come
This was SVN commit r14149.
2013-11-12 01:17:16 +00:00
historic_bruno 0682c23fe3 Replaces BGRA textures with RGBA textures supported by GLES
This was SVN commit r14148.
2013-11-12 01:11:08 +00:00
Enrique 54abce1a3c hellenic walltower rotated 180 to match the droppoint with the wall RMS
This was SVN commit r14147.
2013-11-12 00:05:26 +00:00
mimo df1d5d2260 fix tag 2102648f7c which had unwanted changes
This was SVN commit r14146.
2013-11-11 16:29:44 +00:00
Mythos_Ruler 0e74e3a521 Removed Ostorius.
This was SVN commit r14145.
2013-11-11 16:09:00 +00:00
mimo 2102648f7c Allows autogarrison of newly trained units, fixes #1044
This was SVN commit r14144.
2013-11-11 15:37:16 +00:00
mimo fad8f7fce0 adds some needed protection
This was SVN commit r14143.
2013-11-11 15:03:22 +00:00
historic_bruno 3d8865f10b Adds gloox to OS X libs build script, with patch to fix build (fixed upstream in 5de9ed7444).
Fixes lobby build on OS X.
Fixes zlib not building as static lib.

This was SVN commit r14142.
2013-11-11 04:41:44 +00:00
historic_bruno 29ef5f3ce9 Adds patch for SDL 1.2 build on OS X 10.9 (Mavericks), CGDirectPaletteRef was deprecated and has now been removed. See https://bugzilla.libsdl.org/show_bug.cgi?id=2085
This was SVN commit r14141.
2013-11-11 01:19:55 +00:00
historic_bruno 45a7f577d3 A bunch of OS X SDK-related fixes.
Adds runtime support for 10.5 APIs: display modes, bundle paths, system
paths, pasteboards. Previously this was compile-time support only, which
prevented building on later SDKs while targeting earlier APIs.
Adds hardcoded version for pre-10.6 builds, to avoid messing with
deprecated Gestalt or having to add a 10.5 non-dispatch singleton (Grand
Central Dispatch didn't exist in 10.5)

This was SVN commit r14140.
2013-11-11 00:11:25 +00:00
historic_bruno 011cbb5725 Fixes OS X STL incompatibilities when building against later SDKs and targeting 10.5 (fixes stringstream build errors in these conditions)
This was SVN commit r14139.
2013-11-11 00:09:16 +00:00
historic_bruno 5c2c7248b1 Adds zlib, curl, iconv and libxml2 to OS X libs build script, to avoid using the non-backward-compatible versions provided by Apple.
Adds patch for zlib configure to pick up CFLAGS/LDFLAGS, to better
support SDK builds.
Cleans up OS X libs build script, hides some extraneous output.

This was SVN commit r14138.
2013-11-11 00:04:07 +00:00
leper 4406be3a69 Fix crash when trying to join the lobby again if the host disconnected in the game setup screen.
This was SVN commit r14137.
2013-11-10 22:42:48 +00:00
alpha123 f070bf9d1e Prohibit the user from picking the 'system' lobby name, as that's reserved for special messages.
This was SVN commit r14136.
2013-11-10 21:52:38 +00:00
alpha123 e01445818a Nerf/rebalance siege towers.
- Armor changed from 2h/20p/10c to 5h/20p/2c
- Attack changed from 25p to 10p/5c
- Bonus added: 2x vs structures
- Ranged reduced from 65 to 55
- Elevation bonus of 10 added
- PreferredClasses is now 'Structure'
- Ungarrisoned arrow count decreased to 0 from 2
- Build time increased to 60 from 50
- BuffHeal is now 0 (decreased from 1)
- Health reduced from 800 to 500
- Walking speed reduced to 5 from 6

The idea is for siege towers to be useful for siege, but also for
cleaning out large numbers of units. Previously they were very good at
the latter and useless for the former. They should still be very
powerful units, but not uncounterable and massing siege towers
(previously unbeatable if enough were acquired) should no longer be
feasible.

This was SVN commit r14135.
2013-11-10 20:21:50 +00:00
Mythos_Ruler 2811d4c367 Fixed this map.
This was SVN commit r14134.
2013-11-10 19:22:24 +00:00
Mythos_Ruler 912e485a64 Elephant changes and tweaks.
This was SVN commit r14133.
2013-11-10 19:08:38 +00:00
Enrique 85e9a2b0ce Added 3 idle animations and attack, death and walk animations for all asian elephants.
Maurya hero howdah added with normal and specular maps

This was SVN commit r14132.
2013-11-10 17:39:04 +00:00
Spahbod a2477f9d40 Increasing the generation speed of the maps: Alpine Lakes
This was SVN commit r14131.
2013-11-10 17:29:40 +00:00
Ykkrosh a96ed190a5 Add GLX_MESA_query_renderer support to hwdetect
This was SVN commit r14130.
2013-11-10 16:24:03 +00:00
Ykkrosh d178f32698 Fix Unicode in JS print() on Linux
This was SVN commit r14129.
2013-11-10 16:13:40 +00:00
JoshuaJB c27c663697 Print a traceback after an exception in the bot.
This was SVN commit r14128.
2013-11-10 04:28:18 +00:00
JoshuaJB 59da5fad2a Fix some spidermonkey lobby complaints when run in strict mode.
This was SVN commit r14127.
2013-11-10 04:09:03 +00:00
historic_bruno 174f636fd2 Fixes tests
This was SVN commit r14126.
2013-11-10 03:24:29 +00:00
leper 37cedb8133 Make filters work and add a skirmish map filter.
This was SVN commit r14125.
2013-11-10 00:45:19 +00:00
leper 4fb6896fd8 Fix warning when the hosted game is a random rms.
This was SVN commit r14124.
2013-11-09 23:57:31 +00:00
Ykkrosh d7ec8c47a6 Fix Unicode support in lobby.
Fix EncryptPassword being called with the wrong argument order, and
encrypting username instead of password. (This will break all existing
lobby accounts.)

Fix EncryptPassword not using all of salt_base.

This was SVN commit r14123.
2013-11-09 23:26:17 +00:00
Ykkrosh 35d48d2fe8 ...and increase HDATA_USER_SIZE so OglTex actually fits
This was SVN commit r14122.
2013-11-09 18:49:35 +00:00
Ykkrosh 1ad9d5424a Fix error at startup on 64-bit builds.
OglTex had a size_t added, which pushed it over HDATA_USER_SIZE.
Use u32 instead to minimise the difference between platforms.

This was SVN commit r14121.
2013-11-09 18:39:45 +00:00
Spahbod dcb3c0ad7a Increasing the generation speed of the maps: Continent
This was SVN commit r14120.
2013-11-09 16:00:01 +00:00
Mythos_Ruler d3fade285b Basic Nubian archer textures.
Map preview for Corsica and Sardinia.

This was SVN commit r14119.
2013-11-09 14:42:32 +00:00
sanderd17 2d2853dd6f Fix problems with EndGameManager in Atlas by waiting for the first turn
This was SVN commit r14118.
2013-11-09 10:09:28 +00:00
historic_bruno 9cc172b164 Fixes --without-lobby for MSVC and clang, refs #2249.
Cleans up some whitespace.
Removes obsolete PCH files.

This was SVN commit r14117.
2013-11-09 02:57:10 +00:00
Ykkrosh 3c47b12cbe Display texture memory usage in profiler's renderer stats
This was SVN commit r14116.
2013-11-09 01:03:23 +00:00
mimo 3a278df3f7 Move ship to shoreline when tasking units to garrison inside, fixes #1391
This was SVN commit r14115.
2013-11-08 23:22:59 +00:00
leper 5dfc3746e3 Remove old and unused archive stats.
This was SVN commit r14114.
2013-11-08 17:27:21 +00:00
leper 81cf02cc13 Fix building with --without-lobby. Fixes #2249.
This was SVN commit r14113.
2013-11-08 15:28:44 +00:00
leper 0f8d3e23db ;
This was SVN commit r14112.
2013-11-08 15:28:38 +00:00
RedFox 1a32a10f52 Updated premake to support VS2013. Also changed platform toolsets to vc110_xp and vc120_xp for VS2012 and VS2013 respectively. This way the builds will also work on WinXP.
This was SVN commit r14111.
2013-11-08 14:08:16 +00:00
sanderd17 da6abe630a Fix error message on starting game due to missing global variable.
This was SVN commit r14110.
2013-11-08 09:52:48 +00:00
Spahbod 7547dae0e2 Fixing the revert by the previous commit.
This was SVN commit r14109.
2013-11-08 08:04:35 +00:00
Spahbod f88b5be079 Increasing the generation speed of the maps: Islands, Lake.
This was SVN commit r14108.
2013-11-08 08:02:32 +00:00
JoshuaJB bb28e0eb70 Fix some system message/spam filter bugs in the lobby.
This was SVN commit r14107.
2013-11-08 00:57:58 +00:00
Ykkrosh 1138419017 Remove broken build script
This was SVN commit r14106.
2013-11-07 22:20:38 +00:00
JoshuaJB 62b92af925 Fix lobby registration errors.
This was SVN commit r14105.
2013-11-07 22:07:26 +00:00
Ykkrosh f53bd8974c Add autobuilder support for glooxwrapper
This was SVN commit r14103.
2013-11-07 21:45:59 +00:00
Yves 93cffe9deb Remove the old and no longer used archive builder that rebuilt the archive while the game is running.
This approach isn't used anymore. Now we start the archive building with
parameters to pyrogeneis.

Refs #2241 (the code used g_ScriptingHost which is going to be removed)

This was SVN commit r14102.
2013-11-07 21:06:18 +00:00
JoshuaJB 87e9c5694e Change the LOGWARNING when a config setting doesn't exist to a LOGMESSAGE.
This was SVN commit r14101.
2013-11-07 21:02:22 +00:00
JoshuaJB 8d5d66e57b Fix error that slipped into the lobby commit.
This was SVN commit r14099.
2013-11-07 20:10:59 +00:00
JoshuaJB bffe917914 Multiplayer lobby based on the XmPP protocol. Special thanks to Philip, alpha123, scythetwirler, and anyone else who has helped build, debug or test the lobby.
This was SVN commit r14098.
2013-11-07 20:07:24 +00:00
JoshuaJB d7121f4f55 glooxwrapper by Philip to support building gloox on Windows.
This was SVN commit r14097.
2013-11-07 19:38:09 +00:00
JoshuaJB 10e23c173d Add gloox library files.
This was SVN commit r14096.
2013-11-07 19:04:30 +00:00
Spahbod fe0510c079 Again increasing the generation speed of Islands random map by using the new chain placer. As a side effect, the map is more beautiful.
This was SVN commit r14095.
2013-11-07 19:02:09 +00:00
JoshuaJB b416de9b7c Remove the unused crypto++ library files.
This was SVN commit r14094.
2013-11-07 18:50:52 +00:00
JoshuaJB 3298dce158 Remove the unused crypto++ library.
This was SVN commit r14093.
2013-11-07 18:49:43 +00:00
sanderd17 3743e58f9a allow enabling the game clock as a persistent setting
This was SVN commit r14092.
2013-11-07 18:06:52 +00:00
Spahbod 6d62b3bf40 Added a new "placer" function for the rmgen library.
This new placer generates terrain features that are less "predictable".
It also increases the map generation time considerably.

Currently it is only implemented on Persian Highlands random map.

This was SVN commit r14091.
2013-11-07 14:50:16 +00:00
Spahbod b7751a277c Cleanup
This was SVN commit r14090.
2013-11-07 12:38:41 +00:00
Spahbod 5ec4962184 Decreasing the generation time of Islands random map to about 2/3 of the original.
This was SVN commit r14089.
2013-11-07 12:00:04 +00:00
mimo 9b98585275 Remember the last market for back-to-order trading, fixes #2248
This was SVN commit r14088.
2013-11-06 21:07:19 +00:00
sanderd17 9ffe235b2f Clean up EndGameManager. Fixes #2130
This was SVN commit r14087.
2013-11-05 19:40:50 +00:00
sanderd17 68fa9f4631 Fix building contstruction, but still don't allow positive regenrate for unhealable entities
This was SVN commit r14086.
2013-11-05 17:45:39 +00:00
Mythos_Ruler 24bc451852 Corsica and Sardinia skirmish map. Needs Iberian circuit wall.
This was SVN commit r14085.
2013-11-05 16:12:58 +00:00
sanderd17 8540740b35 disallow healing of unhealable entities via all ways
This was SVN commit r14084.
2013-11-05 07:07:10 +00:00
mimo 6fae05b5f6 fix
This was SVN commit r14083.
2013-11-03 17:41:59 +00:00
mimo 0362453035 test some components before use, adresses #2206
This was SVN commit r14082.
2013-11-03 17:18:43 +00:00
Mythos_Ruler 53a270347a Map preview for Zagros Mtns.
Changed preview for Greek acrpolis.

Fixed quote attribution. Thanks anfialro.

This was SVN commit r14081.
2013-11-03 16:39:28 +00:00
Mythos_Ruler f1100f10c1 Standardized Cav Spearmen animations.
This was SVN commit r14080.
2013-11-03 14:17:33 +00:00
sanderd17 c62cc3ee44 rename technology modifier 'multiplier' to 'multiply' for consistency with auras, and it looks better next to the existing 'add'
This was SVN commit r14079.
2013-11-03 14:09:32 +00:00
Mythos_Ruler e4f2ddb738 Renamed a bunch of maps.
This was SVN commit r14078.
2013-11-03 14:06:49 +00:00
Mythos_Ruler 5dc553bf91 More shield changes.
Tweaked number of 5-pop houses on Sicilia skirmish map.

New "Sahel" Skirmish map.

This was SVN commit r14077.
2013-11-03 14:01:45 +00:00
Mythos_Ruler 34e09220a4 Normal and spec maps for a bunch of shields.
This was SVN commit r14076.
2013-11-03 13:36:16 +00:00
sanderd17 e0161bd355 small code style fix
This was SVN commit r14075.
2013-11-03 13:15:44 +00:00
sanderd17 6dca6910c3 Recursively count garrisoned units to avoid overcapacity
This was SVN commit r14074.
2013-11-03 13:13:30 +00:00
Ykkrosh 72e11a2dea Fix VS2013 build errors, warnings
This was SVN commit r14073.
2013-11-03 12:46:07 +00:00
Mythos_Ruler 37f5aa5351 Standardized animations for cavalry swordsmen. Will do the same for cavalry spearmen. This is to help the player differentiate the unit types better.
This was SVN commit r14072.
2013-11-03 10:31:57 +00:00
Mythos_Ruler 768c821f13 Acropolis 7 scenario renamed to "Acropolis Night."
Cycladic Archipelago 06 and Deccan Plateau 01 scenarios deleted.

Gambia River skirmish map (still needs 2 out of 3 Iberian wall
circuits).

This was SVN commit r14071.
2013-11-03 10:14:43 +00:00
Mythos_Ruler 096fc43f9e Three new skirmish maps. 2 need Iberians walls though.
Deleted a couple of scenarios.

This was SVN commit r14070.
2013-11-03 09:51:16 +00:00
Mythos_Ruler f4bd08427c Trader speed tech!
This was SVN commit r14069.
2013-11-03 05:40:43 +00:00
Ykkrosh 29e4b1a17c Update Android support
This was SVN commit r14068.
2013-11-02 23:05:38 +00:00
Ykkrosh 8aa6485d78 Fix shader errors with OpenGL ES
This was SVN commit r14067.
2013-11-02 22:58:38 +00:00
Mythos_Ruler ba5b572ccc Iberian walls for Caspian Sea skirmish map.
Rubble for these houses.

This was SVN commit r14066.
2013-11-02 16:54:15 +00:00
Mythos_Ruler c1c45bd7c8 Caspian Sea skirmish map.
Clouds.

This was SVN commit r14065.
2013-11-02 15:28:33 +00:00
Ykkrosh 1fa2fc9739 CClientArea parsing test
This was SVN commit r14064.
2013-11-02 14:39:08 +00:00
mimo ce7c97b79f Improve back to work behaviour (queues taken into account), fix #2206, patch from Itms
This was SVN commit r14063.
2013-11-01 22:00:06 +00:00
mimo 358e8f5992 Remove ResourceGatherer for animals
This was SVN commit r14062.
2013-10-31 19:37:42 +00:00
Mythos_Ruler 552a4527ca Iberian walls for Deccan Plateau skirmish map.
Specific Name for Mauryan maiden guards (Visha Kanya).

Clarified the Iberian json a bit.

Some tooltip tweaking.

This was SVN commit r14060.
2013-10-31 17:21:10 +00:00
sanderd17 543ec3a8c7 Fix launching skirmish maps without selecting a civ
This was SVN commit r14059.
2013-10-30 17:01:11 +00:00
sanderd17 60fb5ed1c3 - Fix garisson and formation aura types
- Implement tech mods for UnitMotion speeds, Fixes #1958, based on patch
by wraitii
- Implement athen_hero_themistocles ship speed aura as a test

This was SVN commit r14058.
2013-10-30 16:12:53 +00:00
Ykkrosh 2d1be3d47e Improve correctness of hotkeys at low framerates.
SDL queues up all the input events received in a frame. When the hotkey
system saw a key up/down event, it immediately updated its
HotkeyIsPressed state and then pushed a hotkey event onto the end of the
queue.

If the initial queue was e.g. [key-down shift, key-press Z, key-up
shift], the hotkey event triggered by Z would be processed after the
key-up shift had updated the HotkeyIsPressed state, so the handler of
the Z hotkey would not think the shift hotkey was pressed.

If the initial queue was e.g. [key-press Z, mouse-click], the hotkey
triggered by Z would be processed after the mouse-click event, so it
could apply to the wrong building selection.

Fix by pushing the hotkey events onto a special queue that gets
processed before any subsequent SDL input events.

Also update the HotkeyIsPressed status when the HOTKEYDOWN/HOTKEYUP
events are processed, not when they are generated, to guarantee they are
consistent with the DOWN/UP events.

Fixes #1869.

This was SVN commit r14057.
2013-10-30 01:38:32 +00:00
Gallaecio 11c7c44a0b Fixed typos reported in Transifex by qwertz and Loki.
This was SVN commit r14056.
2013-10-29 23:22:09 +00:00
Gallaecio b67c411b33 Fix typos in template files. Refs #2185.
This was SVN commit r14055.
2013-10-28 20:26:35 +00:00
Gallaecio 15f09f7005 Fix typos in civilization files. Refs #2185.
This was SVN commit r14054.
2013-10-28 20:21:27 +00:00
Gallaecio 538c250d67 Fix typos in descriptions of random maps. Refs #2185.
This was SVN commit r14053.
2013-10-28 20:19:09 +00:00
Gallaecio dd7445262c Typo: enemey → enemy.
This was SVN commit r14052.
2013-10-28 20:01:51 +00:00
leper fcde137b30 Viriato.
This was SVN commit r14051.
2013-10-28 14:35:25 +00:00
JoshuaJB e2f475b86a Make the *nix ARM support a little sturdier, Fixes #2121
This was SVN commit r14050.
2013-10-27 21:06:15 +00:00
leper 3173722099 Copy this.entites in GarrisonHolder before passing and modifying it. Patch by mimo. Fixes #2238.
This was SVN commit r14049.
2013-10-27 16:37:51 +00:00
Mythos_Ruler 31e79e6709 Reorders the game setup drop list for maps.
This was SVN commit r14048.
2013-10-26 15:20:13 +00:00
Mythos_Ruler 30af350e31 New Neareastern Badlands skirmish map and it's awesome with Whizbang Graphics (WBG) enabled.
Tweaked some stuff on a few maps.

Fixed Iberian Walls for Nile River skirmish.

Changed names for Ptolemaic warships.

A couple of technology portraits for Advanced and Elite upgrades (these
techs are not implemented, but planned).

This was SVN commit r14047.
2013-10-26 15:10:15 +00:00
OmriLahav 597da2ff9d Alpha 14 remake
This was SVN commit r14045.
2013-10-26 11:10:21 +00:00
Mythos_Ruler a45b074b07 Renamed the Arabian Oasis maps to Libyan Oasis, because the Egyptian eye candy assets insinuate the Libyan Desert instead of the Arabian Desert.
Changed Nile River maps to "naval" maps because the AI gets stuck trying
to cross the river.

Renamed the "ptol" statue ruins to "egyptian" statue ruins. Makes them
more generically "Egyptian".

Ensured siege engines can only be built in City Phase.

This was SVN commit r14044.
2013-10-26 10:31:52 +00:00
Mythos_Ruler 64dc783a18 Simplified the Spartan population penalty.
Changed costs on a few units.

New tooltips and hero auras for Carthaginian heroes Hannibal, Hamilcar,
and Maharbal. (see: wiki civ profile)

Fixed specificname for some Carthaginian units.

Added a field entity for "skirmish" maps.

This was SVN commit r14043.
2013-10-26 09:40:21 +00:00
Mythos_Ruler fe6d508a82 Punjab skirmish map.
Some map tweaks.

This was SVN commit r14042.
2013-10-26 03:07:03 +00:00
Mythos_Ruler 1ee4c52779 All 4 players on Nile River skirmish map now have Iberian walls.
This was SVN commit r14041.
2013-10-25 09:00:46 +00:00
Mythos_Ruler 10ddc2aed6 Fixed starting unit for Ptolemies.
Nile River skirmish map (still needs Iberian walls for 2 of the
players).

New map preview for Arabian Oasis.

Moved Civic Center back to Town Phase, but made it take twice as long to
build.

Fixed elephant template.

Fixed up Persian Highlands skirmish map based on some notes from
Alpha123.

This was SVN commit r14040.
2013-10-25 08:02:55 +00:00
OmriLahav 14166af0ac This was SVN commit r14038. 2013-10-24 09:46:26 +00:00
leper 4e86b00a05 Remove inconsistencies in the manual. Refs #2185.
Fix player name.
Make log messages when saving games use quotes around paths.

This was SVN commit r14037.
2013-10-23 22:18:40 +00:00
Yves 20ed5b118c Unify script conversions and remove JSInterface_Vector3D.
Because it was historically grown, we have some duplicated code for
converting script types to native types.
This patch removes the file JSConversions.cpp and moves some code to
ScriptConversions.cpp.
The places using JSConversions.cpp are changed to use the
ScriptInterface's conversion functions in ScriptConversions.cpp.
I also removed JSInterface_Vector3D because it had additional
requirements to the conversion code that no other code has and because
it's currently not used. I think it doesn't make sense to maintain code
just because it could possibly be used again later.

Closes #2213
Refs #1886

This was SVN commit r14036.
2013-10-20 17:13:53 +00:00
Ykkrosh a4cd90ddfc Avoid non-ASCII characters in source code, since tools don't decode them consistently.
Fixes #2198.

This was SVN commit r14035.
2013-10-20 09:27:44 +00:00
leper d6f6d2b145 Remove useless error messages.
This was SVN commit r14034.
2013-10-20 01:47:16 +00:00
Mythos_Ruler 2117f77812 Fixed some resource placement.
This was SVN commit r14033.
2013-10-20 01:18:59 +00:00
Mythos_Ruler 50a2bddf77 Fixed some goats.
This was SVN commit r14032.
2013-10-20 01:10:02 +00:00
Mythos_Ruler 34d927f25c These two skirmish maps are now complete with walls for Iberians.
This was SVN commit r14031.
2013-10-19 23:52:28 +00:00
Mythos_Ruler 15f565f316 Corinthian Isthmus and Persian Highlands skirmish maps (wip).
This was SVN commit r14030.
2013-10-19 20:54:41 +00:00
leper 742c489353 Fix typos, remove BOMs and add newlines before EOF. Refs #2185. Patch by Gallaecio.
This was SVN commit r14029.
2013-10-19 20:13:48 +00:00
leper 71a41ba401 Line endings. Refs #2185.
This was SVN commit r14028.
2013-10-19 20:07:20 +00:00
Mythos_Ruler 45d4e92782 Fixed building requirements for Town Phase.
Changed Brit Wonder to the new Stonehenge model. :)

Trying out some new hunting changes from sanderd. Might just be
temporary. Refs #2092

This was SVN commit r14027.
2013-10-19 18:20:25 +00:00
Yves b9892bc73a Remove ScriptableObject/CJSObject
Since all remaining uses of ScriptableObject/CJSObject have been
removed, the related files can now also be removed.
Closes #2212
Refs #2126
Refs #2137
Refs #1886

This was SVN commit r14026.
2013-10-19 10:14:08 +00:00
Ykkrosh 024dd82209 Fix non-PCH build
This was SVN commit r14024.
2013-10-19 01:11:20 +00:00
Ykkrosh ac335f37c8 Fix some Clang warnings about unused private members
This was SVN commit r14023.
2013-10-19 00:53:58 +00:00
leper c0b628bcac Fix some typos. Patches by Swyter (Spanish translator). Fixes #2210, #2211.
This was SVN commit r14022.
2013-10-18 20:33:08 +00:00
Ykkrosh 701508922f Use CStrIntern for font names to reduce lookup cost
This was SVN commit r14020.
2013-10-18 16:15:42 +00:00
Ykkrosh 91169c82c7 Optimise rendering of scrollable text boxes by clipping
Add optional clipping rectangle to CTextRenderer. Strings that are
printed
outside the vertical extent of the clipping rectangle will be
immediately
skipped. This greatly reduces the cost of large scrollable text boxes.

This was SVN commit r14019.
2013-10-18 16:05:02 +00:00
Ykkrosh 751558d894 Optimise text rendering by batching
When CTextRenderer is given multiple strings with no differences other
than position, render them in a single glDrawElements call to reduce
driver overhead.

Also avoid some unnecessary copies of std::wstrings.

This helps performance a bit with large GUI text boxes.

This was SVN commit r14018.
2013-10-18 16:02:48 +00:00
Ykkrosh b6c7c0d799 Optimise glyph lookup in text renderer
std::map lookup was a major cost when rendering large amounts of text.
Replace it with a more efficient 2-level array.

This was SVN commit r14017.
2013-10-18 15:56:12 +00:00
Ykkrosh 5778484a77 Refactor text renderer
Replace unifont with CFont and CFontManager, since the h_mgr interface
was
needlessly inconvenient.

Load the font textures through CTextureManager, to support dynamic
reloading (e.g. when resetting GL state - see #741).

Add CFontMetrics as a convenient wrapper for code that just wants to
measure text.

Fixes #1117.

This was SVN commit r14016.
2013-10-18 15:53:07 +00:00
Ykkrosh 8799bd98b0 Support 8bpp textures
When textures.xml specifies format="alpha", the input is expected to be
an
8-bit greyscale PNG, and the output will be an 8-bit uncompressed
alpha-only DDS.

Add format override to CTextureProperties, to select between e.g.
GL_ALPHA
and GL_LUMINANCE for 8-bit textures.

This is needed so fonts can use the new texture system.

This was SVN commit r14015.
2013-10-18 15:36:31 +00:00
leper 6a2fac7a58 Add hotkeys for JSDebugger commands. Patch by sathyam. Fixes #2208.
This was SVN commit r14014.
2013-10-18 14:41:08 +00:00
Enrique 9802adf92f celt_stonehenge with normal and spec maps. Fixes #2053
This was SVN commit r14013.
2013-10-18 14:29:10 +00:00
sanderd17 f3968c0d4c fix some flaws in the preferred classes. Patch by Jammus, Fixes #1985
This was SVN commit r14011.
2013-10-16 19:08:01 +00:00
sanderd17 e6d9094c98 Remove InitSavedGame, but keep the rallypoint problem it solved. Fixes #1762, Patch by mimo.
This was SVN commit r14010.
2013-10-16 17:58:12 +00:00
OmriLahav 6c3c6cfd3a This was SVN commit r14009. 2013-10-16 14:08:47 +00:00
Ykkrosh a2f836c393 Prevent bogus -Wmaybe-uninitialized warnings in GCC
This was SVN commit r14008.
2013-10-16 12:22:50 +00:00
Mythos_Ruler eb33d0fd61 New unit for Romans: "Italian Allied Cavalry" which can help counter archers.
Persians and Mauryans still have uber archers, but must first pay for
them by researching "Archery Tradition" at the Barracks for 200F 300W.
This technology adds +10 meters to the range of all bow-using units,
plus makes archer units train faster (but have less health).

This was SVN commit r14007.
2013-10-16 01:04:55 +00:00
Mythos_Ruler 8456d50015 Found a couple more. (removing stonewall attack restriction).
This was SVN commit r14006.
2013-10-15 22:43:59 +00:00
Mythos_Ruler 8053cbd474 Remove the attack restriction for units against stone walls. May add it back for ranged units like archers and javelinists, after some discussion. I also feel it would be kind of weird to "charge" a stone wall (except for battering rams and elephants). So, we'll have to talk about it some more. But for now, let's test this out.
This was SVN commit r14005.
2013-10-15 22:43:06 +00:00
Enrique 40db79df33 greek docks do not show warships in the foundation until construction is finished.
Different actor variations of the building can be displayed while
construction naming their variation to "scaffold"

This was SVN commit r14004.
2013-10-15 21:24:20 +00:00
sanderd17 2bbbcff811 fix tests, breaking caused by renaming files.
This was SVN commit r14003.
2013-10-15 16:10:06 +00:00
sanderd17 5f5eedc513 Rename technology related files, methods and messages so their names represent the shared data flow between technologies and auras (and maybe future components). Implement the C++ part of auras through these generalised files. Fixes #2154
This was SVN commit r14001.
2013-10-15 10:05:08 +00:00
sanderd17 a4ce8dac34 fix technologies broken by 379a7b208f
This was SVN commit r14000.
2013-10-14 20:36:57 +00:00
sanderd17 379a7b208f Implement the js side of auras. Refs #2048. Patch with the help of Alpha123. Only the temple aura is added as example, all other aura components are removed from the templates to be created from scratch again.
This was SVN commit r13998.
2013-10-14 15:51:21 +00:00
Mythos_Ruler 57d47f23c9 This was SVN commit r13997. 2013-10-13 18:11:54 +00:00
Enrique 417e2455a0 Added ptolemaic ptolemaic storehouse and Lordgood's new cart temple and ptolemaic defense tower with little fixes.
This was SVN commit r13996.
2013-10-13 15:26:43 +00:00
Ykkrosh ce5c43fe03 Fix typo
This was SVN commit r13995.
2013-10-13 11:41:30 +00:00
historic_bruno 3a28caed03 Rebuilt premake4.exe with VC++ 2008 to avoid VC++ 2012 issues targeting XP
This was SVN commit r13994.
2013-10-12 23:47:09 +00:00
Enrique 41de5440e0 Added and applied normal and spec maps for ptolemaic struct, paintings and statues, added ptolemaic temple and farmstead. Fixed ptolemaic CC footprint + little fixes
This was SVN commit r13993.
2013-10-12 21:33:21 +00:00
Mythos_Ruler 7335c32c7e Some updated sounds from LAVS.
This was SVN commit r13992.
2013-10-12 01:27:10 +00:00
leper 9b8667a9aa Really add special starting unit.
This was SVN commit r13991.
2013-10-11 23:37:04 +00:00
leper 4f03550adf Create a special starting unit entity for skimish maps.
This was SVN commit r13990.
2013-10-11 23:36:02 +00:00
leper 396bd844dd Remove duplication between getActionInfo and determineAction. Allow setting rally points if not all selected buildings can do so. Patch by mimo. Fixes #2189.
This was SVN commit r13989.
2013-10-11 22:43:22 +00:00
leper 801cac87dd Properly queue rally points when setting them via the minimap. Patch by mimo. Fixes #2203.
This was SVN commit r13988.
2013-10-11 21:50:45 +00:00
sanderd17 c5669e2c4e Add a back to work button. Patch by Itms. Fixes #799
This was SVN commit r13987.
2013-10-11 19:11:07 +00:00
Ykkrosh e2d28c8894 Add AppData file, for use by some Linux package installers.
Fixes #2202.

This was SVN commit r13986.
2013-10-11 18:55:46 +00:00
OmriLahav 7791c4c61d This was SVN commit r13985. 2013-10-11 11:01:55 +00:00
OmriLahav f22e47a743 This was SVN commit r13984. 2013-10-11 11:01:06 +00:00
historic_bruno 644135b9f3 Fixes variable name conflict in session UI, patch by Itms, fixes #2199
This was SVN commit r13982.
2013-10-11 00:22:27 +00:00
historic_bruno f5eeed9cf7 Clears selections when loading saved game, patch by RefinedCode (fixes buggy selection behavior when using quicksave/quickload), fixes #2178
This was SVN commit r13981.
2013-10-10 23:58:29 +00:00
historic_bruno a00e57df72 Fixes hypothetical mem leak in network code (and an error in Cppcheck), patch by Riemer, fixes #2122
This was SVN commit r13980.
2013-10-10 23:46:42 +00:00
alpha123 f6c9db33d6 Focus on the building a hero is garrisoned in when the hero button is double-clicked. Patch by mimo. Fixes #2131
This was SVN commit r13978.
2013-10-10 21:23:19 +00:00
Mythos_Ruler c7e3c1499f Fixed typo.
This was SVN commit r13977.
2013-10-09 20:07:36 +00:00
Mythos_Ruler cd5a2aa527 Ptolemy IV.
Ptolemaic heroes added to Ptolemaic Fortress.

Seleucid Romanized Infantry Champion.

This was SVN commit r13976.
2013-10-09 13:42:34 +00:00
sanderd17 5c3ff86219 add different skirmish structures + skirmish demo map containing all skirmish templates so far
This was SVN commit r13975.
2013-10-08 18:02:35 +00:00
sanderd17 f3d83e0616 add skirmish defense tower and houses
This was SVN commit r13974.
2013-10-08 09:13:55 +00:00
historic_bruno f3d088dd5c Fixes JS debugger, fixes VS 2013 build error, re-fixes #2127, #2175
This was SVN commit r13973.
2013-10-07 22:55:30 +00:00
RedFox 8464777759 Fixed premake4 build incorrectly ignoring vs2010 action.
fixes #2191

This was SVN commit r13972.
2013-10-07 22:45:08 +00:00
RedFox a97cd73cf8 Adds EnableSSE2 for Visual Studio builds on windows.
Adds optional "--with-c++11" flag for GCC/ICC builds. For possible
future C++11 migration.
refs #2191

This was SVN commit r13971.
2013-10-07 22:39:13 +00:00
RedFox 055ea57468 ref #2191
Adds VS2012 support for premake4. Also adds
update-workspace-with-atlas.bat for VS2012 builds that need to compile
AtlasUI.dll, too.

This was SVN commit r13970.
2013-10-07 22:10:16 +00:00
Mythos_Ruler 79af6fb17f Newly updated Ptolemaic champion cavalry.
This was SVN commit r13969.
2013-10-07 20:47:06 +00:00
historic_bruno b9268fbdcd Fixes error logging in the JS debugger, based on patch by RefinedCode. Fixes #2175
This was SVN commit r13967.
2013-10-07 02:10:41 +00:00
historic_bruno d3e0fb4f84 Fixes crannóc spelling, thanks to GunChleoc
This was SVN commit r13966.
2013-10-07 00:46:58 +00:00
historic_bruno 1408a0be83 This was SVN commit r13965. 2013-10-06 23:29:03 +00:00
historic_bruno 74216a5825 Reverts field limits from f4abcd2ef9 until we can fix AI and UI problems, refs #2187
This was SVN commit r13964.
2013-10-06 23:25:55 +00:00
historic_bruno 6d67957db2 Prevents buildings from getting attack-move orders and implements attack-move rally points, patch by mimo. Fixes #2171
This was SVN commit r13963.
2013-10-06 22:50:30 +00:00
historic_bruno 35fa527814 Adds attacking player's name to attack notification messages.
Cleans up some duplicate username/color code in messages.js

This was SVN commit r13962.
2013-10-06 22:07:55 +00:00
Mythos_Ruler 7d92b3459b Turns on Attack notification text.
This was SVN commit r13961.
2013-10-06 21:17:56 +00:00
Mythos_Ruler 573215dad8 Fixed the player names on this map.
This was SVN commit r13960.
2013-10-06 20:51:30 +00:00
Mythos_Ruler 4cfee05c31 New skirmish templates for Brit war dog and Maur Worker Elephant. Added to current Skirmish maps.
This was SVN commit r13959.
2013-10-06 20:23:21 +00:00
Mythos_Ruler efc84a9cce Adjusting time costs for these Ptol buildings.
This was SVN commit r13958.
2013-10-06 19:13:20 +00:00
Mythos_Ruler 5fc888fdcf Some more player names for Carthage.
Player names for Seleucids.

Fixed names for Celtic docks and merchant ships.

Fixed cavalry health for a few units.

Name stuff for ships, specifically Carthage. Fixes #2106.

Started work on some Ptolemaic units, specifically the Cav Spearman.

Added LordGood's Sacred Band Cavalry portrait.

This was SVN commit r13957.
2013-10-06 18:28:10 +00:00
Mythos_Ruler b9b923be11 Fixes #2149
This was SVN commit r13956.
2013-10-06 14:58:26 +00:00
Mythos_Ruler 14b51afc39 Fixes #2152
This was SVN commit r13955.
2013-10-06 06:57:50 +00:00
Mythos_Ruler f4e4247f06 Fixed Gallic Outpost name. Fixes #2167.
Fix Ptol civ center footprint.

This was SVN commit r13954.
2013-10-06 06:53:32 +00:00
historic_bruno 50782c1c1c Fixes non-PCH build
This was SVN commit r13953.
2013-10-06 05:15:54 +00:00
historic_bruno 754e794f9b Implements attack notifications based on patch by madmax and zoot, fixes #1719
This was SVN commit r13951.
2013-10-06 04:49:38 +00:00
historic_bruno 2418ae190d Fixes some erroneous documentation in EntityLimits.
Removes previously implemented LimitsPerCivCentre from AI states.
Removes hardcoded categories from TrainingRestrictions

This was SVN commit r13950.
2013-10-06 03:13:46 +00:00
Mythos_Ruler c21953b434 Added some Iberian walls to a couple of skirmish maps.
Rethought the naming scheme of the skirmish maps.

This was SVN commit r13949.
2013-10-05 21:58:42 +00:00
Spahbod a1ceda4012 Polishing the Random Maps: The last batch...
This was SVN commit r13948.
2013-10-05 18:29:44 +00:00
leper fecfda29f6 Remove civ code hardcoding from SkirmishReplacer component. Refs #1198.
This was SVN commit r13947.
2013-10-05 17:54:41 +00:00
leper 3624c591bd Fix compilation failure without PCH.
This was SVN commit r13946.
2013-10-05 16:22:51 +00:00
leper 85253ca3c8 Let corpses cast shadows again. Refs #1771.
This was SVN commit r13945.
2013-10-05 16:22:46 +00:00
alpha123 ff6b80305c Rearrange hotkeys a bit. Queue the 8th unit is now Comma, and select idle warrior is forward slash (replacing camera-follows-mouse, which is available by holding middle mouse anyway). Fix #2181.
This was SVN commit r13944.
2013-10-04 23:31:24 +00:00
alpha123 433b29d6dc Fix description of Belgian Bog skirmish map.
This was SVN commit r13943.
2013-10-04 23:14:52 +00:00
Mythos_Ruler 76d9893123 New skirmish maps.
Fixed some things.

This was SVN commit r13942.
2013-10-04 18:11:13 +00:00
Mythos_Ruler 2283aedc3c The first Skirmish maps.
Temporary selection and complete sounds for Theater, Elephant Stables,
Cavalry Stables, Blacksmith, and Wonder. Sounds by LAVS. He is working
on improving them.

This was SVN commit r13941.
2013-10-04 13:17:21 +00:00
alpha123 939898c47d Nerf Iberian champion cavalry a bit.
This was SVN commit r13940.
2013-10-04 04:01:58 +00:00
historic_bruno 7901ed51d4 Implements skirmish maps, based on patch by sanderd17, fixes #1198. Skirmish maps are like scenarios, except the player can choose their civ during match setup. To create a skirmish map: place some skirmish entities for each player in Atlas (see templates/skirmish/* for examples), uncheck the player's civ in Atlas' player panel if desired, and save in the maps/skirmishes directory. The map will appear in match setup under the "Skirmish" match type.
Implements custom, VFS-based map load/save dialogs for Atlas (replaces
broken native file dialogs), fixes #631, #889.
Fixes map loading/saving to handle arbitrary subdirectories for better
organization.
Adds default settings to Atlas player panel, fixes #1872. Each setting
now has a checkbox to choose whether it should be saved with the map
(avoids writing lots of useless default data for each map).
Adds map preview setting to Atlas, refs #1745.
Cleans up and simplifies some duplicate code.
Fixes optional serialization performance test.

This was SVN commit r13938.
2013-10-04 02:29:16 +00:00
historic_bruno 5c35690309 Fixes broken statue ruins template and replaces old statue treasures with ruins
This was SVN commit r13937.
2013-10-04 01:15:16 +00:00
historic_bruno 6a97bbd4c3 Fixes dropdowns opening with empty list, caused assertion failure about vector subscript range in MSVC debug build
This was SVN commit r13936.
2013-10-04 00:31:36 +00:00
Enrique b0e2f6b368 Added obelisks to ptol_cc
This was SVN commit r13935.
2013-10-03 18:41:07 +00:00
Ykkrosh e700937fd3 Fix non-SSE x86 builds
This was SVN commit r13934.
2013-10-03 18:22:10 +00:00
Enrique 398a32a6ff Added ptolemiac civic centre with ao and custom decal dirt_7x5
This was SVN commit r13933.
2013-10-03 17:18:57 +00:00
Enrique 739ed00b5e Added ptolemaic fortress with ao. Updated ptolemaic struct texture
This was SVN commit r13932.
2013-10-02 21:29:44 +00:00
Mythos_Ruler e382967e34 Updated a bunch of things.
New waypoint and garrison flags for Ptolemies. New texture for Ptolemies
woman. Fixed footprint for statues ruin. etc.

This was SVN commit r13931.
2013-10-02 18:51:49 +00:00
Mythos_Ruler bb78b4c931 Replacing these statue "treasures" with "ruins." Instead of getting the resources immediately, ruins allow the player to "mine" the resources at a fast rate.
This was SVN commit r13930.
2013-10-02 16:54:13 +00:00
Enrique e0d50b6137 added seleucid thureos texture by request
This was SVN commit r13929.
2013-10-02 14:53:59 +00:00
Enrique 60200f8dbb fixed ptolemaic statues base.
This was SVN commit r13928.
2013-10-02 13:41:53 +00:00
Enrique 2e24c9f2b7 ptolemaic houses and statues with ao. Added ptolemaic struct texture and 4 ptolemaic round shields variations
This was SVN commit r13927.
2013-10-02 12:18:10 +00:00
Enrique 26af70ec7b Fixed ptolemaic thureos mesh shape
This was SVN commit r13926.
2013-10-01 15:15:39 +00:00
Ykkrosh 9f5635085e Fix #1833: animals spin around needlessly while roaming.
Patch from mimo.

This was SVN commit r13924.
2013-09-30 23:52:22 +00:00
Ykkrosh e449364408 Recompute system shader defines immediately when the relevant inputs change, instead of delaying until ReloadShaders.
This fixes an error with autostart and smoothlos=true, where the system
defines were being accessed before the first rendered frame.

This was SVN commit r13923.
2013-09-30 22:39:06 +00:00
historic_bruno 8cf5f61885 Avoids ugly layering of GUI pages when entering match setup
This was SVN commit r13922.
2013-09-30 20:51:19 +00:00
Enrique cbe103bdfe ptolemaic galatian shields for basic, advanced and elite with specular maps.
This was SVN commit r13921.
2013-09-30 19:03:09 +00:00
Enrique 1f032b7c59 Added Lordgood's new britons barracks and defense tower with minimal tweaking
This was SVN commit r13917.
2013-09-30 08:14:10 +00:00
historic_bruno e24ce51029 Adds DynamicArena allocator that grows by fixed chunk size, fixes #2142.
Changes fixed size arenas to new dynamic arenas with reasonable chunk
sizes (may require tuning), refs #1842

This was SVN commit r13916.
2013-09-30 01:22:44 +00:00
historic_bruno fbee618ac8 Fixes memory leak in sound manager
This was SVN commit r13915.
2013-09-30 01:09:16 +00:00
Yves 238b7f84d8 Changes the ConfigDB to expose global functions to scripts instead of properties and custom objects.
Fixes #2172
Refs #1886

This was SVN commit r13914.
2013-09-29 18:56:50 +00:00
Mythos_Ruler 2ea0620abb Reduce the health drain of the Nubian Archer.
Fixed the Lighthouse to not have the Library special tech.

Ptol Military Settlement has better sounds and a different portrait.

Increased defense tower limit since they now have a min distance limit.

Tweaked Ptolemies demo map.

This was SVN commit r13913.
2013-09-29 16:29:38 +00:00
leper 022393a0c6 Spelling fixes from the translation work by Gallaecio and Loki72. Fixes #2150, #2170.
This was SVN commit r13912.
2013-09-29 16:14:40 +00:00
Ykkrosh c2583e42da Reduce memory allocations in the renderer
Use an arena allocator in ShaderModelRenderer::Render, to reduce
the allocation cost in STL containers.

Avoid unnecessary copying of std::vectors.

This was SVN commit r13911.
2013-09-29 14:48:11 +00:00
Ykkrosh 6b0a0e83eb Fix profiler malloc count in debug mode on Windows
wdbg_heap_NumberOfAllocations doesn't work without the wdbg_heap
leak detector, which is disabled since it's slow and broken.
Use a simple hook via _CrtSetAllocHook instead to count allocations.

This was SVN commit r13910.
2013-09-29 14:43:14 +00:00
Mythos_Ruler f4abcd2ef9 Gauls get: Tavern and Naked Fanatic.
Britons get: Rotary Mill.

So, now all Celts get Rotary Mill, but also a unique unit-producing
building.

Britons now have a better demo "sandbox" map.

Ptolemies now play like they are intended. Just need tons of new
artwork. ;) Try them out on the demo map: Sandbox - The Ptolemaic
Egyptians.

Some highlights: Their Nubian Archers train very fast, but have a finite
life. The Lighthouse can be built on the shoreline (but looks like a
library). Their Military Settlement works as intended (can be built in
neutral territory, but min distance of 80 meters).

Testing out: Farm field limits (+8 per Farmstead, +2 per civ center).

This was SVN commit r13909.
2013-09-29 14:37:26 +00:00
Ykkrosh eceae8be5c Fix crash when setting rally point
This was SVN commit r13908.
2013-09-29 14:02:47 +00:00
wraitii d663dae2d8 New version of Aegis. Huge rewrite for WIP naval support (still very, very buggy at this point.) Features a few bugfixes and might be more efficient than the former version.
NEEDS TESTING.

This was SVN commit r13907.
2013-09-29 13:32:52 +00:00
Ykkrosh 994ebd9836 Add a list of statically-constructed CStrIntern strings
Switch all the constant strings in graphics code to use the new
variables.
This avoids the cost of instantiating CStrInterns at runtime every
frame.

This was SVN commit r13906.
2013-09-29 13:19:52 +00:00
Mythos_Ruler 08f431fa0d Ptolemaic entity templates for Enrique.
This was SVN commit r13905.
2013-09-29 03:08:59 +00:00
Ykkrosh 4e9570cd0f Fix unnecessary CShaderConditionalDefines copy, and inline some functions
This was SVN commit r13904.
2013-09-29 02:05:02 +00:00
Ykkrosh f075571502 Fix slightly expensive GetSystemShaderDefines()
Only recompute when any relevant parameters have changed, then return
the cached value.

This was SVN commit r13903.
2013-09-29 01:00:11 +00:00
Ykkrosh 555deea136 Fix conditional defines to not construct new CShaderDefines frequently
CShaderDefines is designed to be efficient to copy and compare, but not
to construct. Conditional defines were constructing new CShaderDefines
for many models every frame.

Precompute all the possible conditional combinations of CShaderDefines
when a material is first loaded, so they can be looked up at no cost
when rendering.

This was SVN commit r13902.
2013-09-29 00:30:58 +00:00
Ykkrosh 22f0f2b232 Set _NO_DEBUG_HEAP=1 in VS2010 projects
The debug heap has a high performance cost, even in release mode,
when running inside a debugger, which is surprising to people trying
to measure performance. It doesn't seem very useful at finding bugs
either.

Add a NoDebugHeap flag to Premake, to set that environment variable
when running in the VS2010 debugger.

This was SVN commit r13901.
2013-09-28 14:35:28 +00:00
Mythos_Ruler 2d1b7914a6 This was SVN commit r13900. 2013-09-28 11:58:05 +00:00
Mythos_Ruler b8a5acfd9e Preview image for The Gauls demo map.
This was SVN commit r13899.
2013-09-26 18:44:45 +00:00
RedFox 28ce5f3458 It might be better to issue a LOGWARNING when Spatial queries are too large. Opening the crash window seems a bit too much for something that can be recovered from.
This was SVN commit r13898.
2013-09-24 21:50:46 +00:00
sanderd17 e370af8d4e Fix rally point rendering on saved games. Fixes #1762. Patch by mimo
This was SVN commit r13897.
2013-09-24 20:27:18 +00:00
Mythos_Ruler 6880fd214f Fixed name of this map.
This was SVN commit r13896.
2013-09-24 18:41:19 +00:00
Enrique 895f927ff0 Celts corral props missing fix
This was SVN commit r13895.
2013-09-24 16:26:26 +00:00
Mythos_Ruler 59c8e9e6dc Big gameplay experiment: Moved Civic Centers from Town Phase to City Phase to see what it does to multiplayer match ups.
New "sandbox" demo map for the Gauls.

Renamed "Night's Watch" to "Sentries."

This was SVN commit r13894.
2013-09-24 15:55:35 +00:00
historic_bruno cd51540725 This was SVN commit r13892. 2013-09-22 18:13:19 +00:00
historic_bruno 2a613f8236 Removes mostly useless video memory detection, fixes another crash with Nvidia Optimus on Windows, fixes #2145, #2138
This was SVN commit r13891.
2013-09-22 18:07:33 +00:00
Mythos_Ruler e488ed09f5 This was SVN commit r13890. 2013-09-22 11:30:24 +00:00
Mythos_Ruler ae4ccfe050 3D farm fields for all factions.
Fixed tooltips for a bunch of units.

Increases pierce armor for elephants.

This was SVN commit r13889.
2013-09-22 08:07:29 +00:00
RedFox 5287af8967 Increased SpatialQueryArray max results from 1024 to 2048. This is a temporary fix until the Search and Prune solution is implemented.
This was SVN commit r13888.
2013-09-22 04:37:46 +00:00
sanderd17 5afb18dda4 fix units ejecting on destroying structure
This was SVN commit r13887.
2013-09-21 19:41:13 +00:00
sanderd17 4f6ddfe894 fix theatron build limit
This was SVN commit r13886.
2013-09-21 19:05:59 +00:00
Enrique 636f09053b celt tavern update
This was SVN commit r13885.
2013-09-21 15:24:56 +00:00
Yves 9781b67cf4 Changes the Console to expose global functions to scripts instead of properties.
Fixes #2140
Refs #1886

This was SVN commit r13884.
2013-09-21 14:48:19 +00:00
Mythos_Ruler bb506fb578 Spec maps and new player color texture for Greek females.
This was SVN commit r13883.
2013-09-21 12:41:05 +00:00
Mythos_Ruler 21639ce5ea Normal map and Specular map for warship sails.
Fixed Cav Sword tooltip.

Updated the product logo a little bit.

This was SVN commit r13881.
2013-09-21 11:50:04 +00:00
Mythos_Ruler 0233bb4877 Temporary Ptolemies emblem.
This was SVN commit r13880.
2013-09-21 09:23:21 +00:00
Mythos_Ruler ccc873d9d5 Tech complete sound slightly louder.
This was SVN commit r13879.
2013-09-21 09:22:31 +00:00
Mythos_Ruler ec66e59150 Fixed some civ json stuff. Fixed Ptolemaic json.
This was SVN commit r13878.
2013-09-21 09:21:48 +00:00
Yves 12e2428495 Changes the Renderer to expose global functions to scripts instead of using CJSObject.
Fixes #2137
Refs #1886

This was SVN commit r13877.
2013-09-21 08:24:45 +00:00
Mythos_Ruler c0b84fb41f Added build limits for Theater, Council Chamber, and Library.
Added Ptolemies civ json file. I am getting a javascript error in-game
though. Need help trouble shooting it.

This was SVN commit r13876.
2013-09-21 07:33:22 +00:00
Mythos_Ruler 9d2f59e80a Tweaking the Athenian field.
Tweaking 0 A.D. logo.

Fixed tooltip for Slinger.

Fixed name for Carthaginian wonder.

This was SVN commit r13874.
2013-09-21 03:58:54 +00:00
Ykkrosh d252e245ef Optimise fixed multiplies on MSVC x86
On MSVC, casting i32 to i64 then multiplying gets compiled into a call
to __allmul, which is slow. Use the __emul intrinsic instead.

GCC 4.6+ appears optimise this case automatically and doesn't need any
special handling.

This reduces the cost of ComputeShortPath by about 50% (testing AI vs AI
on Oasis 01).

This was SVN commit r13873.
2013-09-20 20:17:54 +00:00
Enrique 5a8cfb738b Commited experimental field for athenians (propped farm field)
This was SVN commit r13872.
2013-09-19 15:29:01 +00:00
Enrique 4b7c1a915d Celtic corral upgraded. Added more playercolor to gaullic civic centre.
This was SVN commit r13871.
2013-09-19 13:58:48 +00:00
historic_bruno bfe0b79b91 Better fix of Grid memory leak, refs #1842
This was SVN commit r13869.
2013-09-18 01:21:36 +00:00
alpha123 e10c4ebaae Amend 553875ea83: Forgot to include new hotkey in the config.
This was SVN commit r13868.
2013-09-17 00:31:18 +00:00
alpha123 553875ea83 Allow the use of Enter in addition to the OK button in the Join Game dialog.
This was SVN commit r13867.
2013-09-17 00:30:11 +00:00
historic_bruno 9f2a850a95 Fixes buggy operators and memory leak in Grid class, refs #1842
This was SVN commit r13866.
2013-09-17 00:28:22 +00:00
RedFox 5d9b2b95b0 Ticket #2127 - Performance and style improvements in scriptinterface.
No real behavior changes, only code maintenance.

Fixed signed/unsigned mismatch in EntityMap.h

This was SVN commit r13865.
2013-09-16 19:10:06 +00:00
historic_bruno 97912dd545 This was SVN commit r13864. 2013-09-16 16:56:26 +00:00
Enrique 16b615db79 Celt walls upgraded
This was SVN commit r13863.
2013-09-16 12:25:03 +00:00
sanderd17 a770ad9467 small code style fixes
This was SVN commit r13862.
2013-09-16 09:14:16 +00:00
RedFox 1b6a5fa802 This was SVN commit r13861. 2013-09-15 21:37:05 +00:00
RedFox 2a5ec404d1 Further reverted RangeManager sorting to stable_sort, since possibly with different STL implementations, the order of entities might change and cause OOS.
Overflowing elements in SpatialQueryArray are now reported with
debug_warn, but can be ignored and the program will continue working,
but further entities will be truncated.

This was SVN commit r13860.
2013-09-15 21:11:20 +00:00
Enrique bb799bdd53 upgraded gaul defense towers and celtic storehouse
This was SVN commit r13859.
2013-09-15 21:11:14 +00:00
Enrique 5fe43a0f21 removed non-used duplicated meshes
This was SVN commit r13858.
2013-09-15 19:56:13 +00:00
sanderd17 9eedd22b9a fix garrisoned units count for some special cases. Refs #2096. Patch by mimo
This was SVN commit r13857.
2013-09-15 16:47:40 +00:00
Enrique 65bddb7fa5 Celtic docks, kennel, farmstead and temple upgrades
This was SVN commit r13856.
2013-09-15 16:09:23 +00:00
Enrique bdeb358c44 Upgraded britons market and added new gaul market
This was SVN commit r13855.
2013-09-15 14:09:25 +00:00
RedFox 9694eec8b8 As per ticket #1707. Some minor improvements to spatial subdivision. Makes way for future changes in RangeManager.
Right now merely improves memory usage.

This was SVN commit r13854.
2013-09-15 14:03:53 +00:00
sanderd17 6644f224cd remove warn messages. Now really fixes #2102
This was SVN commit r13853.
2013-09-15 09:33:45 +00:00
sanderd17 b16b52492d change build distance restrictions to work with classes. Fixes #2012.
This was SVN commit r13852.
2013-09-15 09:29:16 +00:00
Mythos_Ruler 3016765766 All new techs for the blacksmith.
This was SVN commit r13851.
2013-09-15 08:55:28 +00:00
sanderd17 f213761912 let entities change entity limits. Fixes #2076
This was SVN commit r13850.
2013-09-15 08:19:50 +00:00
Mythos_Ruler de68973191 Changed the phase up sound.
Added a new "tech complete" sound for ALL techs.

Added some new armor techs for infantry and spearmen.

This was SVN commit r13849.
2013-09-15 07:53:01 +00:00
Mythos_Ruler 466900b898 Minor template stuff.
This was SVN commit r13848.
2013-09-15 05:55:16 +00:00
Mythos_Ruler db39fd059c Some tooltip tweaks.
Further attempts to balance archers. (ongoing)

This was SVN commit r13847.
2013-09-15 04:57:58 +00:00
Mythos_Ruler 08849ae6f6 Balance changes after playtesting with Alpha123.
This was SVN commit r13846.
2013-09-15 00:28:07 +00:00
Mythos_Ruler 4f138eaa12 Made the time icon slightly smaller.
Archers have less attack and cost slightly more.

Defense Towers now have a minimum build distance and are weaker.

This was SVN commit r13845.
2013-09-14 23:19:36 +00:00
historic_bruno 729e744c2f Removes yucky hard-coded categories from BuildRestrictions
This was SVN commit r13844.
2013-09-14 22:31:41 +00:00
Ykkrosh dd60c3a3e2 Restore textures.xml to make grid_subdiv terrain less ugly
This was SVN commit r13843.
2013-09-14 18:36:40 +00:00
Enrique a9cb79b108 celtic fortresses actor and barracks actor errors fixing reported by Sanderd
This was SVN commit r13842.
2013-09-14 13:59:43 +00:00
Ykkrosh 126e550d68 Delete bogus file
This was SVN commit r13841.
2013-09-14 12:19:22 +00:00
historic_bruno ea75cda095 Special case getEntityNamesFormatted to avoid messing with getEntityNames
This was SVN commit r13838.
2013-09-14 00:32:50 +00:00
alpha123 e7fa9a58de Remove the Costs: prefix from tooltips entirely.
This was SVN commit r13837.
2013-09-14 00:07:08 +00:00
alpha123 e646cf19bf Fix bug due to some technologies not having separate generic/specific names.
This was SVN commit r13836.
2013-09-14 00:00:47 +00:00
alpha123 c28151c1c1 Put tooltips on a diet.
This was SVN commit r13835.
2013-09-13 23:49:46 +00:00
Enrique 04b4e6af4b gaul fortress fix
This was SVN commit r13834.
2013-09-13 21:44:49 +00:00
Enrique 014acac9ed Upgraded britons and gaullic fortresses.
This was SVN commit r13833.
2013-09-13 21:41:24 +00:00
Enrique 532c9dce3e brit_civic_centre, celt_barracks and brit_crannog upgrade
added non-transparency with AO material and non-transparency-parallax-ao
material

This was SVN commit r13832.
2013-09-13 18:46:33 +00:00
Enrique 5023ff449e Gaul_civic_centre updated.
This was SVN commit r13831.
2013-09-13 14:18:27 +00:00
Enrique 8b9a0e3919 Added gaul houses, fixed brit houses and added a new variation. New effects applied.
Added Ludo's new stonehenge model.

This was SVN commit r13830.
2013-09-13 13:50:19 +00:00
Mythos_Ruler 77ca745637 Updated the logo.
Updated some Roman words.

This was SVN commit r13829.
2013-09-13 12:07:39 +00:00
historic_bruno 82fb0ce6be Improve game setup GUI performance by switching from main menu instead of pushing the page on top of the stsck
This was SVN commit r13828.
2013-09-12 15:12:08 +00:00
Mythos_Ruler 176cc55547 Fixing some Roman names. Thanks Robbob (on the forum).
Added Organic "preferredClass" to Fortresses, Wall Towers, and Defense
Towers, so that they prefer to shoot at enemy units rather than enemy
structures.

This was SVN commit r13827.
2013-09-12 13:53:00 +00:00
Yves 5304bc9d6a Changes GameView to expose global functions to scripts instead of using CJSObject.
Fixes #2126
Refs #1886

This was SVN commit r13826.
2013-09-12 12:40:05 +00:00
Ykkrosh 05422ad545 Avoid slightly-expensive QueryInterface() calls
Add CEntityHandle which wraps an entity_id_t and also has a pointer to a
per-entity array of IComponents. QueryInterface/CmpPtr on a handle just
involve a couple of pointer dereferences instead of a map lookup.

This requires sizeof(void*) per registered interface type per entity,
which is currently ~0.5KB per entity, which shouldn't be a problem.

This was SVN commit r13825.
2013-09-11 20:41:53 +00:00
sanderd17 87753bf3fd forgot to commit extra change for 508cc0d4c7
This was SVN commit r13824.
2013-09-11 18:59:51 +00:00
sanderd17 508cc0d4c7 Add preferred classes to BuildingAI. Patch by jammus. Fixes #1985
This was SVN commit r13823.
2013-09-11 17:50:49 +00:00
Mythos_Ruler 43df87e56f This was SVN commit r13822. 2013-09-10 22:05:12 +00:00
stwf b1bd61938e add file notification to Mac ticket 514, also change name of class FileInfo to CFileInfo to ease Mac development
This was SVN commit r13821.
2013-09-10 14:17:04 +00:00
sanderd17 d037d97d55 disable querying of local entities with a component. Avoids OOS problems. Patch thanks to historicbruno. Fixes #2119
This was SVN commit r13820.
2013-09-10 12:27:59 +00:00
sanderd17 d51217f718 Fix gazelle in deep water starting position on Oasis 9. Fixes #2123
This was SVN commit r13819.
2013-09-10 09:36:27 +00:00
leper 04ed87bf28 Display error messages instead of breaking into the debugger when we don't have rights to save a map in Atlas. Fixes #1941.
This was SVN commit r13818.
2013-09-09 23:31:22 +00:00
Ykkrosh b2862f14da Avoid continual libxml2 memory leak in simulation-test mode
This was SVN commit r13817.
2013-09-09 20:22:42 +00:00
Mythos_Ruler 3c29c2dccf Tweaked farm decal color.
This was SVN commit r13816.
2013-09-09 18:46:45 +00:00
sanderd17 c3f7a929e0 better garrison flag handling. Refs #2096.
This was SVN commit r13815.
2013-09-09 18:27:20 +00:00
sanderd17 e7ccc28cbc Enable sound notifications with technology upgrades. Based on patch by mpmoreti. Fixes #2021
This was SVN commit r13814.
2013-09-09 12:50:05 +00:00
sanderd17 a406863e0e fix bridge edge obstruction size and rotation of hele bridge edge
This was SVN commit r13813.
2013-09-09 12:11:34 +00:00
sanderd17 f051426a76 fix garrisonHolder flags when units are ejected
This was SVN commit r13812.
2013-09-08 19:51:16 +00:00
sanderd17 08514f68be small clean up of GarrisonHolder code
This was SVN commit r13811.
2013-09-08 18:46:29 +00:00
sanderd17 d1a376fd06 fix ejection of garrisoned units on resign. Fix ejection or killing on ownership and deplomacy changes. Patch by mimo. Fixes #2096
This was SVN commit r13810.
2013-09-08 16:02:41 +00:00
sanderd17 bc40534777 fix spread technology modifications. Fixes #2110
This was SVN commit r13809.
2013-09-08 15:20:54 +00:00
historic_bruno 7a0e91ab23 Fixes undefined behavior in Atlas error display, fixes #2115
This was SVN commit r13808.
2013-09-08 03:35:05 +00:00
leper ca1665dde1 Fix some typos in the civ json files. Patch by Gallaecio.
This was SVN commit r13807.
2013-09-07 17:40:50 +00:00
sanderd17 f588181004 use better technology script in guiInterface
This was SVN commit r13805.
2013-09-07 15:23:03 +00:00
sanderd17 24a4ceb89a fix carthagian technology. Fixes #2107
This was SVN commit r13804.
2013-09-07 09:26:56 +00:00
leper 819a1e7823 Save initial herd position and update the last known position of the hunted animal when hunting. Patch by mimo. Fixes #2047.
This was SVN commit r13803.
2013-09-06 19:47:48 +00:00
Ykkrosh 16c9724c24 Fix release build scripts
Exclude dev.cfg from the Windows installer.
Use the correct filename for the Windows installer.
Update some paths to match the new EC2 build process.

This was SVN commit r13802.
2013-09-06 19:43:45 +00:00
Mythos_Ruler 63f28f1a43 Increased build limit of Embassies to 2. This means you can build 2 of the same entity or 2 different out of the 3 available.
This was SVN commit r13801.
2013-09-06 19:26:49 +00:00
Mythos_Ruler d6ec0f6dbd Updated installer image.
This was SVN commit r13800.
2013-09-06 19:16:33 +00:00
stwf e19b470a42 fix music glitchyness when game loses focus trac #2090
This was SVN commit r13799.
2013-09-06 02:46:13 +00:00
Mythos_Ruler a7132dc66a Updated Macedonians sandbox demo map.
Fixed Carthaginians special tech "Colonization."

Fixed Carthage json file.

This was SVN commit r13797.
2013-09-02 16:26:19 +00:00
historic_bruno 4c9cd2921d Replaces splash screen with fundraiser message
This was SVN commit r13796.
2013-09-01 23:56:50 +00:00
leper 53a5781c66 Increase simulation script runtime size again. Refs #1436, #1966 and #2035.
This was SVN commit r13794.
2013-09-01 23:29:21 +00:00
Mythos_Ruler 6070cd01fa Reduced "grazing" time for whales.
This was SVN commit r13793.
2013-09-01 22:06:23 +00:00
Mythos_Ruler c3dcde7e34 Alpha version number.
This was SVN commit r13792.
2013-09-01 20:47:02 +00:00
Mythos_Ruler 3774b2051d This was SVN commit r13790. 2013-09-01 04:22:28 +00:00
Enrique 4ac19dff05 fixed maur_struct
This was SVN commit r13789.
2013-08-31 22:08:48 +00:00
Mythos_Ruler 4dd1397e15 Mauryans and Britons now start with a cav skirm in addition to their special starting unit (Worker Elephant and War Dog respectively).
Fixed a unit availability thing for Macedonians.

This was SVN commit r13788.
2013-08-31 19:27:37 +00:00
Mythos_Ruler cc08c81faf Tweaks to barracks and blacksmith tips.
This was SVN commit r13787.
2013-08-31 19:23:16 +00:00
Mythos_Ruler 0bd22649f0 Tweaked Army Camp tip text.
Adjusted max gatherers for pyramid ruins.

New 'Blacksmith' loading tip.

This was SVN commit r13786.
2013-08-31 12:26:17 +00:00
Mythos_Ruler 66ab19086a Updated Stoa tip image.
Updated Persian Architecture tip text.

Adjusted upward the number of max gatherers for small mines and the
unfinished Greek temple ruin.

Tweaked Cycladic Archipelago 6 (fixed fish and treasure positions).

Tweaked Gold Oasis 1 (made it possible to build a civic center in the
middle of the "Gold Patches."

Adjusted the Spartan House history entry, based on text by contributor
Thorfinn the Shallow Minded.

This was SVN commit r13785.
2013-08-30 22:35:15 +00:00
stwf df190cbbd1 fix issues with menu mode and playlist, harden code and clear out ambient noises at game end, fixes #2066
This was SVN commit r13784.
2013-08-29 13:20:55 +00:00
Mythos_Ruler 3047470858 Reduced volume for fishing boat movement sound and construction hammering sounds.
This was SVN commit r13783.
2013-08-29 12:46:48 +00:00
wraitii de85408e3b Fix fishing boats not being able to gather from whales. Reported on the forums by Gildas.
This was SVN commit r13782.
2013-08-29 11:26:02 +00:00
Enrique 24ff1371b8 Upgraded greek temples an assigned one variation per civ.
This was SVN commit r13780.
2013-08-27 23:48:22 +00:00
historic_bruno 15586778bb Disables frame-pointer omission in VC++ 2008 projects, fixes stack dump in release build, fixes #2078
This was SVN commit r13779.
2013-08-27 02:42:56 +00:00
Enrique 56d535b7c5 Effects added to hellenic stoas. Only temples to go yay!
This was SVN commit r13778.
2013-08-27 00:04:05 +00:00
Enrique c6d361a76f added effects and upgraded greek docks for each greek civ
This was SVN commit r13777.
2013-08-26 23:19:35 +00:00
sanderd17 89e69af987 let maurian elephant corpse sink fast, temporary fix until there is a real corpse
This was SVN commit r13776.
2013-08-26 17:42:09 +00:00
sanderd17 e79c2aa953 make all Iberian buildings available in the sandbox map (add walls, blacksmith and fire ship)
This was SVN commit r13775.
2013-08-26 11:38:41 +00:00
Enrique 0b670f88af Updated spart syssiton, mace lybrary and helenic market with effects and little fixes
This was SVN commit r13774.
2013-08-26 08:29:18 +00:00
alpha123 89430de468 Okay, do what f5ab6255d0 was supposed to do.
This was SVN commit r13773.
2013-08-26 04:17:26 +00:00
alpha123 b10a01645f Revert f5ab6255d0. I accidentally somehow committed my whole working tree on this computer....
This was SVN commit r13772.
2013-08-26 04:15:36 +00:00
alpha123 f5ab6255d0 General scrollbar improvements. Patch by Josh. Fixes #2080.
- Don't show the scrollbar when the contents aren't overflowing the
visible area.
- Fix bugs in minimum bar sizing.
- Add capability to set a maximum bar size.
- Correct outdated/incorrect comments.

This was SVN commit r13771.
2013-08-26 03:06:08 +00:00
leper 2dc0c40ff0 Fix some errors.
This was SVN commit r13770.
2013-08-26 01:26:35 +00:00
Mythos_Ruler e75765faae Fixed some Greek corral prop problems.
Fixed Storehouses tip.

Fixed the names for ALL Iberian units and buildings.

Added a build restriction for the Iberian Monument.

This was SVN commit r13769.
2013-08-25 22:20:09 +00:00
leper ff6b3e5725 Properly fix #2079.
This was SVN commit r13768.
2013-08-25 22:05:41 +00:00
sanderd17 7a96a3161b fix whale altitude (no floating whales). See aa95f3420d.
This was SVN commit r13767.
2013-08-25 18:59:36 +00:00
Mythos_Ruler 035d33dc33 'Crop Rotation' tech for the Gallic Rotary Mill.
This was SVN commit r13766.
2013-08-25 17:57:20 +00:00
Mythos_Ruler 7c0dfc0d82 Fixed a couple tips.
This was SVN commit r13765.
2013-08-25 17:36:55 +00:00
Mythos_Ruler acf899bb47 Fixed some Corral errors.
Fixed some Persian building stuff.

This was SVN commit r13764.
2013-08-25 17:36:34 +00:00
Mythos_Ruler 292ce925c6 Cast Shadow flag enabled on this actor.
This was SVN commit r13763.
2013-08-25 11:04:14 +00:00
Enrique 2c66383461 Added effects to athen_prytaneion
This was SVN commit r13762.
2013-08-25 10:24:34 +00:00
wraitii 52f947fd77 Check that we still have build orders for our attack plan. Temporarily fixes #2082 for A14.
This was SVN commit r13761.
2013-08-25 08:20:40 +00:00
Enrique 589e8d2ae8 Updated and added effects to greek gymnasion, storehouse, corral and epic temple (athenian wonder parthenon)
This was SVN commit r13760.
2013-08-25 01:02:22 +00:00
Mythos_Ruler ce9432bf3d Proper selection ring for whales.
Edited Mauryan civ info.

Added preview image for Cycladic Archipelago 6.

This was SVN commit r13759.
2013-08-24 22:30:28 +00:00
Mythos_Ruler d49476ac8d Increased armor for promoted Skirmish Cavalry. Previously this was neglected or missed.
This was SVN commit r13758.
2013-08-24 21:11:59 +00:00
sanderd17 247e45a6b5 fix quinquereme splash damage
This was SVN commit r13757.
2013-08-24 16:07:03 +00:00
sanderd17 11f663d761 fix history description to match with in-game numbers. Reported by scythetwirerler. Part 2
This was SVN commit r13756.
2013-08-24 15:33:59 +00:00
sanderd17 087e5f9c3e fix history description to match with in-game numbers. Reported by scythetwirerler
This was SVN commit r13755.
2013-08-24 15:30:52 +00:00
Ykkrosh 14a73204dd Disable distance-sorting for most transparent objects
Distance-sorting of the alpha-blend pass of objects like trees and grass
is quite expensive (partly the cost of sorting, partly the cost of being
unable to batch efficiently), and the effect on visual quality is
typically very hard to see (the alpha-test pass does most of the work
for
objects that aren't fully translucent). That's not a good tradeoff, so
turn it off.

Leave distance sorting enabled for e.g. waterfalls since it might make a
more noticeable difference for them.

This was SVN commit r13753.
2013-08-24 14:48:02 +00:00
wraitii f106d7714a Fix a swap between reflections and refractions in config.cfg . Disabling "Render Reflections" now reverts to the skybox for better results.
Allows to oversaturate in Atlas' HDR settings.

This was SVN commit r13752.
2013-08-24 14:44:38 +00:00
leper 9d933087b3 Fix #2079.
This was SVN commit r13751.
2013-08-24 14:24:37 +00:00
wraitii 957c51727b Improve on-water shadows. Fix an issue with foam looking static. Add anisotropic filtering (x4) to the water normal texture for testing.
This was SVN commit r13750.
2013-08-24 14:12:39 +00:00
Mythos_Ruler aa95f3420d Cleaned up and fixed the whale templates. Still need a custom selection ring.
Made Carthaginian Sacred Band Infantry and Cavalry cost metal instead of
wood.

Updated Cycladic Archipelago 6.

This was SVN commit r13749.
2013-08-24 13:31:25 +00:00
sanderd17 40af0917ca let gaul and brit healers upgrade to their local templates instead of the generic celtic templates. Fix double-click to select all healers after one of the healers upgraded.
This was SVN commit r13748.
2013-08-24 13:09:53 +00:00
wraitii 630301918c Fix the command line -autostart-aidiff to default to 2 (new medium)
This was SVN commit r13746.
2013-08-24 09:55:06 +00:00
Enrique ced59bcfa1 Updated hellenic defense tower with new effects.
This was SVN commit r13745.
2013-08-24 00:19:52 +00:00
alpha123 6963f8c067 Adjust cavaly swordsmen advanced and elite stats. Change attack from 21 -> 12 and 22 -> 14 (since the basic rank's attack is 10), and change armor from 4 -> 6 and 6 -> 7 (since the basic rank's armor is 5).
This was SVN commit r13744.
2013-08-23 18:46:18 +00:00
Enrique 1544bad62a Updated greek theatron for all greek civs. (AO + normal + spec)
This was SVN commit r13743.
2013-08-23 18:05:56 +00:00
Enrique efda9d5e33 Updated greek farmstead
This was SVN commit r13742.
2013-08-23 12:36:04 +00:00
janwas c1dcbe4176 update TLB table
refs #2074

This was SVN commit r13741.
2013-08-23 06:42:48 +00:00
Enrique e19bffa88f hele fortress gate textures
This was SVN commit r13740.
2013-08-22 14:57:14 +00:00
Enrique 5050dcf261 Upgraded and cleaned up hellenic fortress. Shield props now displays depending on faction. (AO + normal + spec)
This was SVN commit r13739.
2013-08-22 14:56:11 +00:00
Mythos_Ruler 18c0b17126 Fixes #2069.
This was SVN commit r13738.
2013-08-22 13:10:38 +00:00
historic_bruno 0a0bd83cf0 Adds L4 cache detection for some new Haswell CPUs, fixes #2074
This was SVN commit r13736.
2013-08-21 23:18:35 +00:00
Enrique 3174d16256 Updated greek civs barracks, added ao, spec and normals
This was SVN commit r13735.
2013-08-21 22:58:31 +00:00
Ykkrosh deb64d36fc Fix rendering artifacts with novbo=true gentangents=true
glDrawRangeElements needs to know the range of vertexs that are used
by the index array. With VBOs it doesn't really matter if the range
is wrong (all the vertexes are in GPU memory anyway), but with CPU
vertex arrays the driver has to memcpy the given range of data, so
incorrect bounds will result in garbage data being rendered.

With gentangents, the rendered mesh can have more vertexes than the
original CModelDef, but was rendered with the CModelDef's vertex count.

Use the correct vertex count instead.

Refs #2050.

This was SVN commit r13734.
2013-08-21 21:01:32 +00:00
sanderd17 9c4801e107 add splash damage to quinquereme
This was SVN commit r13733.
2013-08-21 19:52:50 +00:00
Enrique 73773e61d0 Spart CC small fix
This was SVN commit r13732.
2013-08-21 17:48:59 +00:00
Mythos_Ruler 827ec20b1f Made the Cart trade ship avail in Village phase as a kind of "sea trade" bonus for them.
This was SVN commit r13731.
2013-08-21 17:27:28 +00:00
Enrique d94e1d8ed3 Spartan CC modified. Doric columns adjusted
This was SVN commit r13730.
2013-08-21 17:03:47 +00:00
Mythos_Ruler 70dfd1f803 Cavalry Swordsmen stats rebalanced.
This was SVN commit r13729.
2013-08-21 15:55:13 +00:00
Mythos_Ruler 081707039a Updated Cycladic Archipelago 6. Both sides now playable.
This was SVN commit r13728.
2013-08-21 15:20:27 +00:00
sanderd17 035542e76c revert wrong changes to support and female_citizen template
This was SVN commit r13727.
2013-08-21 09:55:42 +00:00
sanderd17 605852fccf Fix function that decides which units can have which formations, and remove formations for animals and the maurian worker elephant
This was SVN commit r13726.
2013-08-21 09:53:59 +00:00
historic_bruno 52d6a8036d This was SVN commit r13725. 2013-08-21 05:37:28 +00:00
historic_bruno f947fa6afe Fixes stack overflow in stack dump logic, by special-casing boost::unordered types, fixes #1813.
Adds INIT_HAVE_DISPLAY_ERROR init flag to correctly override
ah_display_error in Atlas (InitVfs was overriding it again), but don't
use it because it's ugly and broken, refs #1729

This was SVN commit r13724.
2013-08-20 21:07:42 +00:00
Enrique 3843ae6bb0 Greek houses upgrade. (eyecandy, ao, normal, spec)
This was SVN commit r13723.
2013-08-20 16:41:10 +00:00
sanderd17 c5296b9246 Fix maurian elephants being unable to build stuff. Caused by enlarging the elephant obstruction radius.
This was SVN commit r13721.
2013-08-20 09:39:01 +00:00
wraitii ee877a46c7 Switch X and Z loops in the foam generation, possible speed improvement.
This was SVN commit r13720.
2013-08-20 08:55:33 +00:00
historic_bruno e3b9f17c19 Removes useless "old maps" filter from match setup, refs #2071
This was SVN commit r13719.
2013-08-20 02:28:49 +00:00
historic_bruno 68822e3418 Adds more information to construction command debugging
This was SVN commit r13717.
2013-08-19 23:18:18 +00:00
leper 54bbbb9797 Boost 1.54 deprecates Boost.Signal. Use Boost.Signal2 for >= 1.54.
This was SVN commit r13716.
2013-08-19 22:11:54 +00:00
historic_bruno 0b4fe2ef94 Tweaks game speed dropdown more, refs #2046
This was SVN commit r13715.
2013-08-19 20:00:26 +00:00
Ykkrosh 1739a381c1 Fix crash when editing terrain near map edges.
The values in CMessageTerrainChanged can be overestimates that exceed
the normal map boundaries, and should be clamped before looping over
them.

This was SVN commit r13714.
2013-08-19 19:19:34 +00:00
leper 0ca841b92b Suppress unused local typedef warnings when including SpiderMonkey headers.
This was SVN commit r13713.
2013-08-19 18:26:44 +00:00
Mythos_Ruler 4d9b81f40e This was SVN commit r13712. 2013-08-19 18:09:09 +00:00
Mythos_Ruler 30c194a804 Starting units re-adjusted.
This was SVN commit r13711.
2013-08-19 15:42:46 +00:00
wraitii 3783d0e14c Fix flying unit not crashing in water when they should. Patch by scythewirler. refs #2067
This was SVN commit r13710.
2013-08-19 14:44:15 +00:00
leper 0c16980408 Fix tests.
This was SVN commit r13709.
2013-08-19 10:55:35 +00:00
wraitii 03bf727d9a Fix deactivation of HQ waviness causing the specular effect to go crazy.
This was SVN commit r13708.
2013-08-19 10:19:21 +00:00
historic_bruno b770c41f0b Removes shadow casting and receiving on preview entities, patch started by ericb, fixes #1771
This was SVN commit r13706.
2013-08-18 22:17:57 +00:00
Pureon 63a0b4ae98 projectile point for mauryan elephant archer
This was SVN commit r13705.
2013-08-18 20:42:42 +00:00
Enrique 2637540ce2 Spart CC centre upgrade with doric capitels +AO and effects
This was SVN commit r13704.
2013-08-18 18:02:18 +00:00
Enrique ab6d15c414 Macedonian CC mesh and AO fix
This was SVN commit r13703.
2013-08-18 16:16:53 +00:00
Ykkrosh 0888cf6c23 Fix Linux build
This was SVN commit r13701.
2013-08-18 11:28:52 +00:00
RedFox bf7cd1fcbd Undo-d the commit due to general panic about GLSL.
This was SVN commit r13700.
2013-08-18 11:15:29 +00:00
wraitii 29b5021f97 Fix my previous commit because obviously I had forgotten something.
This was SVN commit r13699.
2013-08-18 09:42:02 +00:00
wraitii a4707bcc16 Change the water manager so incremental updates to the water information is possible. Streamline a few things (and removes a not-really-used calculation to speed things up further). Fixes #2063 , refs #1743.
This was SVN commit r13698.
2013-08-18 09:27:11 +00:00
sanderd17 557c1fc067 fix (dis)allowing of garrisoning by other components. Refs #2067
This was SVN commit r13697.
2013-08-18 08:23:36 +00:00
historic_bruno 92f4391f51 Adds tech template support to checkrefs.pl
This was SVN commit r13696.
2013-08-18 02:52:05 +00:00
historic_bruno 791d392797 Fixes and improves terrain scanning of checkrefs.pl.
Removes some useless old actors.

This was SVN commit r13695.
2013-08-18 01:57:37 +00:00
alpha123 a18262e7b1 Make planes about 20% cooler. Fixes #2067.
This was SVN commit r13694.
2013-08-17 22:55:16 +00:00
historic_bruno abce308281 Renames confusing grass1_spring.png terrain texture, used for fancy grass effect, refs #2069
This was SVN commit r13693.
2013-08-17 22:16:01 +00:00
sanderd17 f25bbda672 fix typo for garrisoned archer classes. Reported by scythetwirler.
This was SVN commit r13692.
2013-08-17 20:34:28 +00:00
Enrique 90b75c95ea Macedonians CC upgraded with corinthian capitel + AO and normals
This was SVN commit r13691.
2013-08-17 18:32:41 +00:00
Mythos_Ruler a6c28ae461 Altered footprint of some elephant units.
This was SVN commit r13690.
2013-08-17 16:16:37 +00:00
Enrique fdc1f3a043 increased mauryan blacksmith size
This was SVN commit r13689.
2013-08-17 14:47:44 +00:00
Mythos_Ruler 3a2eec841c Adjusted max gatherers for these trees.
This was SVN commit r13688.
2013-08-17 14:26:43 +00:00
Mythos_Ruler 998dc21676 Removed old Aegis folder.
This was SVN commit r13687.
2013-08-17 14:12:25 +00:00
Enrique 42d77129cc rome blacksmith fix
This was SVN commit r13686.
2013-08-17 14:07:48 +00:00
Enrique 9763b9076c Upgraded roman blacksmith
This was SVN commit r13685.
2013-08-17 14:04:08 +00:00
sanderd17 a9c71e39a4 make new elevation tool more drastic + add RMB action
This was SVN commit r13684.
2013-08-17 14:02:18 +00:00
wraitii bcf7115b5c Fix Aegis to work properly for A14, also rename the folder from "qbot-wc" to "aegis" (thus apparent huge number of changes). Adds a "sandbox" difficulty setting that will never attack, collect resources 50% slower, and is pop-capped at 70 for beginners.
This was SVN commit r13683.
2013-08-17 13:59:53 +00:00
Mythos_Ruler 38b52f9ff0 Fixed a broken texture link.
This was SVN commit r13682.
2013-08-17 12:51:11 +00:00
Enrique 723a3ec8b5 Fixed kart_embassy_italiote.dae
This was SVN commit r13681.
2013-08-17 12:41:37 +00:00
Mythos_Ruler 2d4c3d72c6 Removed the old dds file from these actors.
This was SVN commit r13680.
2013-08-17 12:18:50 +00:00
Mythos_Ruler cdd2c74d44 Superfluous textures deleted.
This was SVN commit r13679.
2013-08-17 11:38:49 +00:00
RedFox 960615aa53 PreferGLSL = true as long as GenTangents = true.
This is for GLSL migration in the long run.

This was SVN commit r13678.
2013-08-17 11:13:36 +00:00
Mythos_Ruler b818a54b06 Tweaked some maps.
Updated some "tips" images.

Tweaked civ center radius and town phase radius boost.

Added some clarification language to the Farm Field tooltip.

This was SVN commit r13677.
2013-08-17 10:15:38 +00:00
sanderd17 b5888f4e45 generalise kill vs eject garrisoned entities on death of garrisonHolder
This was SVN commit r13676.
2013-08-17 09:26:17 +00:00
historic_bruno d37d3be5d0 Fixes Attack component schema
This was SVN commit r13674.
2013-08-17 06:02:31 +00:00
sanderd17 b820f6e6ae Add a pike elevation tool to make sharp pointed mountains. Fixes #2059
This was SVN commit r13672.
2013-08-16 14:46:54 +00:00
sanderd17 fe0ec1c720 fix coding style for buildingAI. Refs #2010
This was SVN commit r13671.
2013-08-16 12:17:18 +00:00
sanderd17 fd2245c53c Improved building AI. Refs #2010
This was SVN commit r13670.
2013-08-16 11:17:36 +00:00
Enrique cc0ba8e246 Missing maur blacksmith struct_b
This was SVN commit r13669.
2013-08-16 04:50:44 +00:00
sanderd17 d66edf5958 fix a bug that ignored resetting XZ rotation to zero, reported by sythetwirler
This was SVN commit r13668.
2013-08-15 22:16:51 +00:00
sanderd17 81b29bf18d fix line wrapping when big number of gatherers on one resource
This was SVN commit r13667.
2013-08-15 20:00:55 +00:00
sanderd17 675b3c40be fix bouncing projectiles, patch by Markus. Fixes #769
This was SVN commit r13664.
2013-08-15 19:01:10 +00:00
historic_bruno 7ff167e7de Removes more unused variables, based on patch by Markus, refs #1852.
Adds TODOs to use POT textures in fancy water rendering.

This was SVN commit r13663.
2013-08-15 18:25:32 +00:00
Enrique 6d3901faf7 Added mauryan blacksmith with AO. Updated mauryan struct textures
This was SVN commit r13662.
2013-08-15 17:17:25 +00:00
sanderd17 6b316f6ce1 fix tests breaking caused by 4421787281. Refs #2062
This was SVN commit r13661.
2013-08-15 08:56:14 +00:00
sanderd17 4421787281 interpollate y offset for smooth climbing and landing of flying objects. refs #2062
This was SVN commit r13660.
2013-08-15 08:44:06 +00:00
historic_bruno 1712b0f42d Increases simulation script runtime to 32 MB to reduce OOM errors, refs #1436, #1966, #2035
This was SVN commit r13659.
2013-08-15 05:15:54 +00:00
alpha123 4e709f2c9c Implement landing and go-around for UnitMotionFlying. Patch by scythetwirler. Fixes #2062.
This was SVN commit r13658.
2013-08-15 03:10:04 +00:00
sanderd17 b6fe589ae3 fix health regeneration for negative values (reported by Mythos_Ruler)
This was SVN commit r13657.
2013-08-14 08:33:29 +00:00
alpha123 2307509088 Remove the old diminishing returns formula (I accidentally left it as a comment). Also, I forgot to credit scythetwirler (who came up with the new formula) in the previous commit.
This was SVN commit r13656.
2013-08-14 05:16:09 +00:00
alpha123 cc02eabdd0 Change the formula for diminishing returns to something less flawed. Also add a lot of comments explaining how it works.
This was SVN commit r13655.
2013-08-14 05:14:20 +00:00
sanderd17 598c05e056 clean UnitAI move to attack range code + fix possible bug
This was SVN commit r13654.
2013-08-13 15:11:17 +00:00
Mythos_Ruler ba244b509c Fixed the portrait for this tech.
Adjusted water a little bit for these scenarios.

This was SVN commit r13653.
2013-08-13 00:55:47 +00:00
historic_bruno c709105355 Clarifies control group HotKeys
This was SVN commit r13652.
2013-08-12 23:50:18 +00:00
Mythos_Ruler 6925d493fe This was SVN commit r13651. 2013-08-12 23:40:24 +00:00
alpha123 d74ed3f1ae Increase farming speed by 46% for females and 42% for males. Combined with diminishing returns it was waaay too slow prior to this commit.
This was SVN commit r13650.
2013-08-12 23:17:30 +00:00
alpha123 3d1e693148 Enable diminishing returns for farms.
(Yeah yeah, somehow I forgot this when I committed the actual
functionality.)

This was SVN commit r13649.
2013-08-12 23:11:39 +00:00
Mythos_Ruler c44efe6c8c Spartan tech "Agoge" altered. Moved to Syssiton from Civ Center.
Unit tooltips cleaned up a bit. Made to look neater in-game.

This was SVN commit r13648.
2013-08-12 21:53:53 +00:00
sanderd17 1aaca7e6e3 health regeneration
This was SVN commit r13647.
2013-08-12 17:45:18 +00:00
alpha123 96cef624e3 Fix compiling tests on ARM. Patch by Josh.
This was SVN commit r13646.
2013-08-12 03:12:57 +00:00
historic_bruno 1ffb74b336 Adjusts session game speed dropdown, fixes #2046
This was SVN commit r13645.
2013-08-11 20:49:41 +00:00
Pureon 066c542e36 Template tweaks to palace
This was SVN commit r13644.
2013-08-11 12:09:10 +00:00
Pureon a552a3cb8b Persian Palace structure
This was SVN commit r13643.
2013-08-11 12:02:36 +00:00
Enrique b8fb2e1697 Added helle_struct_b parallax/normal map and specular. Applied on greek blacksmith. Improved helle_struct specular map
This was SVN commit r13642.
2013-08-11 08:49:15 +00:00
Mythos_Ruler 46f091a154 Added the Athenian civ bonus "Silver Owls" which gives them +10% metal gathering rates when upgrading phases.
Made "Delian League" (faster building ships) a team bonus. Need some new
code to make it apply to allies too.

Made farming slower.

This was SVN commit r13641.
2013-08-09 22:37:05 +00:00
Spahbod 3f0354943f Polishing thePolishing the Random Maps: Archipelago, English Channel, Islands, Lake, Lorraine Plain, Migration, Neareastern Badlands, Northern Lights, Oasis, Persian Highlands.
This was SVN commit r13640.
2013-08-09 12:30:59 +00:00
Mythos_Ruler c8b8dd24e6 This was SVN commit r13639. 2013-08-09 00:03:51 +00:00
Mythos_Ruler b0ceef39b9 Hellenic building bonus deleted from templates and moved to a tech.
Some updated portraits.

This was SVN commit r13638.
2013-08-08 23:55:13 +00:00
alpha123 93abbae435 Fix build issues on ARM. Patch by Josh. Fixes #2049.
This was SVN commit r13634.
2013-08-07 05:00:46 +00:00
leper dc722d76f3 Fix tests. Refs #1960.
This was SVN commit r13632.
2013-08-06 22:32:46 +00:00
Spahbod bff070c6cb Polishing the Random Maps: Gulf of Bothnia, Hyrcanian Shores, Islands, Kerala, Lake, Latium.
This was SVN commit r13630.
2013-08-04 12:31:43 +00:00
historic_bruno 4a805fb05c Updates keys.txt with new keynames, refs #2043
This was SVN commit r13628.
2013-08-03 20:39:15 +00:00
historic_bruno 5a1ddd7cf9 Improves hotkey support for non-QWERTY keyboards, patch by lsdh, fixes #2043
This was SVN commit r13627.
2013-08-03 20:09:29 +00:00
alpha123 8c74df2acd Give an elevation advantage to ranged units. Patch by sanderd17. Fix #1960.
This was SVN commit r13626.
2013-08-03 19:20:20 +00:00
Spahbod 3b294d3ad4 Revised Persian names.
This was SVN commit r13625.
2013-08-03 16:14:17 +00:00
Enrique 4f7ba84fd6 Modified athens CC to have Ionic columns and AO map.
Added normal and spec maps for several greek struct and props textures.

This was SVN commit r13624.
2013-08-02 23:03:55 +00:00
Mythos_Ruler c8830ea769 Specific Name for Mauryan blacksmith.
This was SVN commit r13623.
2013-08-01 22:00:20 +00:00
Spahbod 17fd4fab94 Polishing the Random Maps: Fortress, Gear, Guadalquivir River
This was SVN commit r13622.
2013-08-01 17:58:51 +00:00
leper 70d072577b ;
This was SVN commit r13621.
2013-07-31 22:25:24 +00:00
leper f6e0c4c5a4 Split up cheats into multiple files. Patch by lsdh/ldsh. Fixes #2019.
Replace buggy hasAllies with the inlined check if we have a team at all.
Fix setting of starting resources (broken in 58fa0c7c58).

This was SVN commit r13620.
2013-07-31 22:22:12 +00:00
Spahbod c438a1eb82 Polishing the Random Maps: Alpine Valley, Archipelago, Cantabrian Highlands, Canyon, Continent, Corinthian Isthmus, English Channel
This was SVN commit r13619.
2013-07-31 10:05:48 +00:00
Spahbod f3823847b0 Polishing the Random Maps: Archipelago, Ardennes Forest, Atlas Mountains, Cantabrian Highlands
This was SVN commit r13618.
2013-07-30 11:09:40 +00:00
Spahbod 477855fbf5 Polishing the Random Maps: Alpine Valley, Anatolian Plateau, Archipelago
This was SVN commit r13617.
2013-07-30 07:56:09 +00:00
alpha123 344a149a66 Infinite farms with diminishing returns (but no farmland). Refs #1318.
This was SVN commit r13616.
2013-07-30 06:04:53 +00:00
alpha123 857ae2dd3e - Fix a bug from 20e7d2224a where the player ID would always be set to 1.
- Make the developer overlay a tad taller.

This was SVN commit r13614.
2013-07-29 20:01:09 +00:00
Spahbod 70e67af87f Polishing the Random Maps: Alpine Valley
This was SVN commit r13613.
2013-07-29 14:22:54 +00:00
Spahbod 4dfe1d6df9 Polishing the Random Maps: Alpine Valley
This was SVN commit r13612.
2013-07-29 13:50:20 +00:00
Spahbod 992a8ee0b8 Polishing the Random Maps: Aegean Sea and Alpine Valley
This was SVN commit r13611.
2013-07-29 12:52:31 +00:00
Mythos_Ruler 629492625f Some touching up.
This was SVN commit r13610.
2013-07-29 12:35:05 +00:00
alpha123 f3b0417aac Don't try to interpret Enter as a mouse click in message boxes (makes it really annoying to chat at the end of a game).
This was SVN commit r13608.
2013-07-29 05:04:28 +00:00
Spahbod e3c42a204e Fixing a bug
This was SVN commit r13607.
2013-07-29 04:30:03 +00:00
alpha123 20e7d2224a Implement a developer overlay command to change the current player ID (very useful for AI development).
This was SVN commit r13606.
2013-07-29 00:53:44 +00:00
Spahbod 53074c7715 Polishing the random maps: Aegean Sea, Alpine Lakes
This was SVN commit r13605.
2013-07-28 16:58:09 +00:00
Mythos_Ruler 63f766bb2a Nerfed Hellenization a bit.
Changed the portraits of the Cart merc techs.

This was SVN commit r13604.
2013-07-28 16:21:43 +00:00
Mythos_Ruler 0774730e2f -Made starting units start at Elite rank (just for fun and testing).
-Some new tech portraits for Divine Offerings and Agoge.
-Fertility Festival technology increased cost.
-New special technology for all Hellenic factions: Hellenization,
researched at the Theatron, increases territory influence for all
buildings +50%. This is a temporary technology until the real
Hellenization effect can be implemented.
-New special technology for the Mauryan and Iberian blacksmiths: Woot
Steel and Toledo Steel respectively.

This was SVN commit r13603.
2013-07-28 13:38:04 +00:00
Enrique 28db824982 iberian, hellene, roman and celtic blacksmiths with AO maps added.
This was SVN commit r13602.
2013-07-28 13:14:42 +00:00
Mythos_Ruler f0310cce58 Reduced Food cost of cavalry from 100 to 80.
Reduced Food cost of elephants from 200 to 150.
Reduced Metal cost of elephants from 200 to 150.
Reduced Stone cost of Mauryan elephant stables from 300 to 200.
Reduced Metal cost of Persian chariot archers from 100 to 0.

This was SVN commit r13601.
2013-07-28 10:20:07 +00:00
Mythos_Ruler a146a8ad3b Fixed some things.
This was SVN commit r13600.
2013-07-27 18:52:28 +00:00
quantumstate fd428cf45b Fix bug when randomly picking a unit to attack for AI's. Fix from bmwiedemann.
This was SVN commit r13599.
2013-07-27 15:08:45 +00:00
Spahbod 0263f17bcc Polishing the random maps: Aegean Sea
This was SVN commit r13598.
2013-07-27 12:13:46 +00:00
historic_bruno a684f7646b Fixes crash when hotloading main menu while splash screen shown (don't alter GUI page stack in init functions), refs #2042
This was SVN commit r13597.
2013-07-26 01:35:01 +00:00
Pureon db5c54c7c6 Persian dock update
This was SVN commit r13596.
2013-07-25 23:02:51 +00:00
Mythos_Ruler 70a3c6c8b4 Supremely blue water on Cycladic Archipelago 2. Enable high graphics and take a look at the depth rendering and specular effect.
This was SVN commit r13595.
2013-07-25 17:45:40 +00:00
Mythos_Ruler 5bfff54bcb Unit promotion animation and invulnerability reduced from 4 seconds to 2.8 seconds.
This was SVN commit r13594.
2013-07-25 13:57:54 +00:00
wraitii e5a9b0eab4 And of course I forgot a file.
This was SVN commit r13593.
2013-07-25 08:58:15 +00:00
wraitii 1f55280fa2 AI-related changes to the AI interface and Command.js, to facilitate debugging of upcoming new version of Aegis.
This was SVN commit r13592.
2013-07-25 08:57:07 +00:00
Mythos_Ruler 0d8b9b15e1 All animals now visible in Fog of War (FOW). Should help a lot with hunting.
Hack armor increased for most buildings.

This was SVN commit r13591.
2013-07-24 18:11:03 +00:00
Mythos_Ruler 697b88562c Game Speeds adjusted.
This was SVN commit r13590.
2013-07-24 13:08:45 +00:00
leper 6ed814354e Fix the fix of the fix. Refs #1914.
This was SVN commit r13589.
2013-07-23 18:48:25 +00:00
Mythos_Ruler 9681606d05 Non civ center units that are available at the village phase barracks are now not available until Town phase.
House-trained females take 30 seconds to train now.

This was SVN commit r13588.
2013-07-23 15:39:24 +00:00
wraitii efc1a678ed Change my fix from revision [13586] to use something faster. Still Refs #1914
This was SVN commit r13587.
2013-07-23 10:37:43 +00:00
wraitii dc3c39fd93 Fix a rare issue where units could get stuck in Individual.Gather.Gathering state forever because of worker limits. Refs #1914 (might even fix it).
This was SVN commit r13586.
2013-07-23 09:46:49 +00:00
wraitii d01d58f70f Fake randomization of the ship sinking animation to make it look better with ship formations. Refs #1921
This was SVN commit r13584.
2013-07-22 10:17:00 +00:00
leper 86a8dd7e6f Small cleanup.
This was SVN commit r13583.
2013-07-21 23:25:15 +00:00
Mythos_Ruler bff7c53a14 Some new hero portraits.
This was SVN commit r13582.
2013-07-21 05:53:53 +00:00
Mythos_Ruler 3aa9e2f6e0 Technology research time tweaks, and fixes.
This was SVN commit r13581.
2013-07-21 02:16:45 +00:00
historic_bruno e0ea53a8ee Adds saved game descriptions and in-game save dialog, based on patch by Crynux, fixes #2030
This was SVN commit r13579.
2013-07-21 00:23:57 +00:00
Mythos_Ruler 311403d5ef Barracks buildable in Village Phase.
Fish can now be seen through the fog of war (but not in shroud of
darkness, of course).

This was SVN commit r13578.
2013-07-20 12:01:56 +00:00
Mythos_Ruler 9f7a0348bd New portraiture by LordGood.
This was SVN commit r13577.
2013-07-20 07:35:54 +00:00
historic_bruno f5e60157bf Optimizes GetPercentMapExplored by caching explored vertices per player, patch by scroogie, fixes #2012
This was SVN commit r13576.
2013-07-20 00:50:40 +00:00
Pureon fc9b19ab47 Pers corral and storehouse updates
This was SVN commit r13575.
2013-07-18 22:59:14 +00:00
Pureon 439603e3fd Persion civic ao update
This was SVN commit r13574.
2013-07-17 23:45:24 +00:00
Pureon 1a20d47cfb Updates to the Persian civ centre model
This was SVN commit r13573.
2013-07-17 23:26:40 +00:00
historic_bruno 38cdc38bba Fixes a build error with SDL2, refs #2041
This was SVN commit r13572.
2013-07-17 06:33:11 +00:00
historic_bruno 39c0498811 Changes terrain anchoring to use faster CalcExactNormal instead of CalcNormalFixed, refs #1988, #2039
This was SVN commit r13571.
2013-07-17 05:42:16 +00:00
Pureon 1cca648b6d Persian blacksmith building
This was SVN commit r13570.
2013-07-16 21:57:49 +00:00
leper 2ea7fb18ea Backport c011875c5a to the older APIs and allow for empty buildable entites token list.
This was SVN commit r13569.
2013-07-16 21:22:05 +00:00
wraitii df2458aa39 Allow setting of prop min/max height in the actor Edit. By sanderd17.
This was SVN commit r13568.
2013-07-16 13:13:41 +00:00
historic_bruno da4d1916dc Implements shared trade gain with allies, patch by mimo, fixes #1691
This was SVN commit r13567.
2013-07-16 05:59:48 +00:00
historic_bruno f302faf8e4 Implements entity terrain anchoring as a visual effect, based on patch by sanderd17, fixes #1988.
Sets cavalry and quadrupedal animals to 'pitch' anchoring. Cleans up
mine templates.

This was SVN commit r13565.
2013-07-16 03:46:30 +00:00
Pureon 9a0ab14cf3 Carthaginian blacksmith building
This was SVN commit r13564.
2013-07-16 00:00:57 +00:00
wraitii c011875c5a Fixes an issue with Aegis and the iberians
This was SVN commit r13563.
2013-07-15 19:47:59 +00:00
wraitii de5b584cbf Fixes #2037
This was SVN commit r13562.
2013-07-15 05:54:46 +00:00
historic_bruno 047992e61a Fixes possible memory leaks by only allocating wave vertex buffers once and only when needed, and releasing them before re-allocating (in case CreateSuperfancyInfo is called multiple times).
Checks if wave vertex buffers were allocated before rendering, fixes
#2017

This was SVN commit r13561.
2013-07-15 03:26:48 +00:00
Pureon 6d284e4e56 Applying stwf's sound attribute to ballista + pers fortress decals added
This was SVN commit r13560.
2013-07-14 15:41:49 +00:00
Mythos_Ruler c9193b0302 Fix a few templates and techs.
This was SVN commit r13559.
2013-07-14 15:01:22 +00:00
Pureon 5eb670ef82 Med Cove and Persian sandbox map tweaks
This was SVN commit r13558.
2013-07-14 13:58:36 +00:00
wraitii 595c964d77 Make water specular more visible and fixes a few cases where it would actually hardly appear when it should.
Adds the ability to access an element in a dropdown box by typing the
first letters (Refs #1532).

This was SVN commit r13556.
2013-07-14 12:17:07 +00:00
wraitii 408c30e061 Probably fixes #2021. Optimization for foam generation while I'm at it (it's faster now, but there's a new temporary array of the size of the map)
This was SVN commit r13555.
2013-07-14 08:06:07 +00:00
Mythos_Ruler 071c976693 Sahel. wide open 2v2 scenario.
This was SVN commit r13554.
2013-07-13 01:50:46 +00:00
historic_bruno 63c19af5dc Fixes assignment operator warning on MSVC by making CObjectEntry NONCOPYABLE, refs #2033
This was SVN commit r13552.
2013-07-12 03:46:40 +00:00
historic_bruno 5fb89ac6bc Fixes prop bugs due to uninitialized variables on MSVC build, refs #2033
This was SVN commit r13551.
2013-07-12 03:32:14 +00:00
leper 91effd1ad1 ...
This was SVN commit r13550.
2013-07-11 23:58:54 +00:00
leper d5897854be Allow terrain aligned props. Patch by sanderd17. Fixes #2033.
This was SVN commit r13549.
2013-07-11 22:53:31 +00:00
leper 6cffdacb40 Small cleanup.
This was SVN commit r13547.
2013-07-10 00:08:05 +00:00
leper d1af7ea0ef Include mod path in the cache path.
This was SVN commit r13546.
2013-07-10 00:08:01 +00:00
Pureon fb0c1e6cc6 Update to the Carthaginian wonder/mausoleum
This was SVN commit r13545.
2013-07-09 23:51:23 +00:00
leper 27086be9c3 Split skeleton definitions into multiple files, adds hotloading support for skeleton files. Fixes #190.
This was SVN commit r13544.
2013-07-08 20:25:06 +00:00
alpha123 041855e547 Allow building walls along the shore. Patch by sanderd17. Fix #1610.
This was SVN commit r13542.
2013-07-07 22:44:47 +00:00
alpha123 d479f373aa Display current/max gatherers or builders when a resource or foundation is selected. Based on a patch by mimo. Fix #1871.
This was SVN commit r13541.
2013-07-07 22:13:58 +00:00
alpha123 ed3afce81e - Round attack numbers in the GUI. Patch by scythetwirler. Fix #1997.
- Adjust the siege attack tech to add an integer instead of multiply by
a percentage.
- Fix the siege armor tech so the tooltip and the added value match up.

This was SVN commit r13540.
2013-07-07 21:04:36 +00:00
leper 93e8ccda64 Fix crash in VC++11 debug builds. Fixes #2028. Patch by RedFox.
This was SVN commit r13539.
2013-07-07 20:02:20 +00:00
Pureon efc6263cc4 Tech icon tweaks
This was SVN commit r13538.
2013-07-07 15:55:35 +00:00
Pureon 41f1485997 Fixing some missing texture links caused by 80b0106502
This was SVN commit r13537.
2013-07-07 15:36:27 +00:00
historic_bruno 8aa016a884 Changes graphics card name detection on Windows to use OpenGL, as a workaround for certain WMI related crashes on Nvidia Optimus and netbook systems. Fixes #1952, #1575
This was SVN commit r13536.
2013-07-06 18:30:29 +00:00
Mythos_Ruler 30f8d6dae2 Tweaks to some templates and tech portraits.
This was SVN commit r13534.
2013-07-06 03:35:03 +00:00
Pureon 3824b3f89d Silver shield tech icon
This was SVN commit r13533.
2013-07-05 22:26:34 +00:00
leper 4ab38f81f7 Remove player owned sheep when committing the foundation.
This was SVN commit r13531.
2013-07-05 15:33:39 +00:00
Pureon 453389b53a Generic shield icons
This was SVN commit r13530.
2013-07-04 22:40:02 +00:00
stwf 485bd75abe apply patch from ticket 1944 added sound attribute to animations to optionally differentiate sound starting point
This was SVN commit r13529.
2013-07-02 11:44:46 +00:00
Mythos_Ruler 377cae15f8 Technology to unlock female training at the house.
Sacred Band infantry is now a spearman instead of pikeman.

This was SVN commit r13528.
2013-07-02 07:11:01 +00:00
Mythos_Ruler cd7b56faa4 Updated the name of "Porus" on Punjab 1.
Updated some Blacksmith templates with histories.

Made a new "pikeman" template to use with pike units. Made pikemen have
extra high armor, but pretty low attack. Basically they'd be used as the
ultimate meat-shield.

Cleaned up some stuff.

Made us of Pureon's new technology portraits.

This was SVN commit r13527.
2013-07-02 00:04:05 +00:00
leper 24b6fb7c3e Clean up cheat handling a bit. Use setter and getter for cheatTimeMultiplier.
This was SVN commit r13526.
2013-07-01 23:46:03 +00:00
Pureon 78d4a24fba Hero tech icon
This was SVN commit r13525.
2013-07-01 23:42:51 +00:00
Pureon 40660606aa Corinthian crest helmet tech icon
This was SVN commit r13524.
2013-07-01 21:46:24 +00:00
historic_bruno 9565c60a14 Adds UI sounds for buttons, dropdowns, lists, and checkboxes, fixes #948
This was SVN commit r13521.
2013-07-01 04:15:09 +00:00
leper ef66f73a84 Recalculate trader gain when garrisoned entities change. Patch by mimo. Fixes #2018.
This was SVN commit r13520.
2013-06-30 22:19:41 +00:00
Pureon c04f887676 Mauryan civ uses Omri's track. Cart sandbox map update
This was SVN commit r13519.
2013-06-30 11:06:35 +00:00
Pureon 2a2daf84e0 Small boats move around quieter than large ships
This was SVN commit r13518.
2013-06-30 10:40:59 +00:00
OmriLahav d213f2ba91 This was SVN commit r13516. 2013-06-30 09:24:43 +00:00
historic_bruno 0933925d49 Adds JS implementations of Math.pow, exp, and log, by sanderd17, refs #1193.
Fixes #1990 (OOS caused by Math.pow).
Adds tests and documentation for Math functions.

This was SVN commit r13515.
2013-06-30 05:16:20 +00:00
historic_bruno d79ba004da Fixes OS X build failing to find Boost libs, refs #1938
This was SVN commit r13514.
2013-06-30 00:48:34 +00:00
historic_bruno 8bccecdb8d Updates Premake Windows binary
This was SVN commit r13513.
2013-06-29 23:36:56 +00:00
leper bbcfa93dc4 Use os.findlib to find boost. Patch by Markus. Fixes #1938. Refs #1518.
This was SVN commit r13512.
2013-06-29 22:25:50 +00:00
leper c6348538ea Show combined costs in the gate conversion tooltip. Based on patch by Jgwman. Fixes #1591.
This was SVN commit r13511.
2013-06-29 20:55:53 +00:00
historic_bruno 123d08eb82 This was SVN commit r13510. 2013-06-29 04:12:17 +00:00
Mythos_Ruler 4c22d4631a Carthaginians can now only build 1 embassy at a time.
Each embassy comes with new technology pairs. Metal Costs vs. Training
Time.

Structure pierce armor adjusted upward.

This was SVN commit r13509.
2013-06-29 02:17:33 +00:00
alpha123 2b02f983a6 Replace decimal with nonNegativeDecimal. Refs #1633
This was SVN commit r13508.
2013-06-29 01:59:46 +00:00
alpha123 37c8e77d8e Use floats for health. Fix #1633
This was SVN commit r13507.
2013-06-29 00:43:08 +00:00
Mythos_Ruler 4b3f4c0a1d This was SVN commit r13506. 2013-06-27 12:00:23 +00:00
leper 623f5d9a9f Small garrison code clean-up
This was SVN commit r13505.
2013-06-26 19:24:56 +00:00
leper 6cbdc13e08 Clarify usage of CheckPlacement. Check if the losRangeQuery exists before disabling it.
This was SVN commit r13504.
2013-06-26 18:41:06 +00:00
leper 5e289f51c2 Make attack type a property of the order.
This was SVN commit r13503.
2013-06-26 14:15:03 +00:00
leper d5e081d55f Fix inconsitency between AttackEntityInZone and ShouldAbandonChase for units in defensive stance. Patch by mimo. Fixes #1866.
This was SVN commit r13502.
2013-06-26 13:24:03 +00:00
leper 2fcd52b657 Let states execute their leave handlers on OnDestroy. Fixes #1999. Patch by mimo.
This was SVN commit r13501.
2013-06-25 21:49:54 +00:00
historic_bruno 49b3b0ee9a Reverts interpolation changes from a7bc7ab50c, 71ae5a19d8, 1778e685ac, c6043779f6, 8777f68aa0, 21f13f9683. Refs #1846, #1858, #1865, #1906
This was SVN commit r13500.
2013-06-25 01:09:43 +00:00
historic_bruno 699d5c5d79 Fixes possible overflow in terrain position/normal calculation, based on patch by sanderd17. Fixes #1986
This was SVN commit r13499.
2013-06-25 00:57:42 +00:00
historic_bruno a981890ab9 Fixes PSA converter to detect broken animations/skeletons.xml slightly better, based on patch by Markus. Fixes #1478
This was SVN commit r13498.
2013-06-23 22:58:17 +00:00
historic_bruno ce8457e195 Fixes map name in pathfinder performance test
This was SVN commit r13497.
2013-06-23 00:50:24 +00:00
historic_bruno 4fc15a9b08 Renames mill to storehouse
This was SVN commit r13496.
2013-06-22 02:28:54 +00:00
Mythos_Ruler e5c35beefe Blacksmith smoke.
Persian and Carth blacksmith actors.

This was SVN commit r13495.
2013-06-21 00:16:52 +00:00
Mythos_Ruler 5f78bb7318 For most civs, made it so that Champions are unlocked by default in the Fortress at City Phase, but then also available for training at the Barracks, but after they are unlocked with a tech.
Removed the minrange for all ranged units until minimum range bugs are
fixed. To fix it will require a multi-pronged approach that will need
discussed and Trac tickets created.

This was SVN commit r13494.
2013-06-21 00:14:00 +00:00
historic_bruno 14990ea390 Fixes another possible NaN when invulnerable units are attacked, refs #1881
This was SVN commit r13493.
2013-06-18 20:20:37 +00:00
Mythos_Ruler fca1f4c3a7 Persians and Carthaginians receive blacksmiths.
This was SVN commit r13492.
2013-06-18 14:20:15 +00:00
historic_bruno 1a5d5eb808 Sets remaining unit trained and building completed sounds to HeardBy owner only, refs #1965
This was SVN commit r13490.
2013-06-18 05:06:22 +00:00
historic_bruno a7bc7ab50c Fixes units not rotating correctly during e.g. attacks, patch by sbte, fixes #1906
This was SVN commit r13489.
2013-06-18 03:42:06 +00:00
historic_bruno 95b51188fa Fixes possible undefined value returned by CmpHealth, leading to a NaN and serialization test failure. Refs #1881
This was SVN commit r13488.
2013-06-18 03:26:08 +00:00
stwf 00e21a9898 change 'restricted' flag to 'heardby' in SoundGroup xml files
This was SVN commit r13487.
2013-06-17 15:46:28 +00:00
stwf 36dec0e789 add restricted flag to SoundGroup xml for sounds thatonly the owning player should hear
This was SVN commit r13486.
2013-06-17 02:30:40 +00:00
historic_bruno 02b98f3acd Fixes build with x11 and SDL2
This was SVN commit r13485.
2013-06-17 01:43:57 +00:00
leper f918c9b074 Prevent formation controllers from showing up in range queries. Fixes #1796.
This was SVN commit r13484.
2013-06-16 23:10:01 +00:00
historic_bruno 5f90371a1c Cleans up some float constants and math from #1921
This was SVN commit r13482.
2013-06-15 00:42:07 +00:00
alpha123 9d27cccbcd Fix Visual Studio build issues.
This was SVN commit r13481.
2013-06-15 00:20:40 +00:00
historic_bruno e75877b52f Adds comment about xorg-x11's glXGetProcAddress not returning NULL for unsupported functions, closes #171
This was SVN commit r13480.
2013-06-14 23:49:20 +00:00
leper c01c8fb2fc Stop generating VS2005 project files. Refs #1951.
This was SVN commit r13479.
2013-06-14 23:46:12 +00:00
alpha123 98cac1a10f Improve ship sinking. Patch by wraitii. Fix #1921
This was SVN commit r13478.
2013-06-14 19:19:13 +00:00
leper 9ea830c855 Handle empty token list gracefully.
This was SVN commit r13477.
2013-06-14 16:13:59 +00:00
stwf bcf99e2a13 make sound code return faster, code cleaner
This was SVN commit r13476.
2013-06-14 16:05:57 +00:00
stwf da17e4329b cleanup SOundManaer component
This was SVN commit r13475.
2013-06-14 00:24:51 +00:00
stwf 26dbac8d57 fixes to SoundManager external interface, clean up ifdef situation, and SoundGroup playin
This was SVN commit r13474.
2013-06-13 12:12:44 +00:00
historic_bruno b3653cfe16 Updates bundled Valgrind headers to 3.8.1 and fixes test build, patch by Markus, fixes #1971
This was SVN commit r13473.
2013-06-12 03:38:37 +00:00
leper 2567fee329 Write mod data correctly. Fixes #1940.
This was SVN commit r13472.
2013-06-11 20:50:09 +00:00
Mythos_Ruler 15e75cdfbd Updated some building tooltips.
Removed wall techs from Iberians for balance.

This was SVN commit r13471.
2013-06-11 16:28:42 +00:00
historic_bruno facd447d0f Hopefully fixes GCC warning about narrowing conversion in C++11, fixes #1851
This was SVN commit r13470.
2013-06-11 02:40:49 +00:00
leper b3391ebe39 Fix build warnings. Patch by Markus. Refs #1851.
This was SVN commit r13469.
2013-06-11 00:05:57 +00:00
Mythos_Ruler 2ed10ec033 Changed names and histories for Roman civ center and market.
Fixed elephant heroes.

This was SVN commit r13468.
2013-06-10 15:33:18 +00:00
stwf ada7702bec add UI sound channel, clean up external interface and javascript calls
This was SVN commit r13467.
2013-06-10 13:58:43 +00:00
leper 29549561e1 Add flag to VisualActor for entities that should only be visible in Atlas. Patch by KareemErgawy. Fixes #1411.
This was SVN commit r13465.
2013-06-09 23:18:21 +00:00
alpha123 5246e9a576 Update description of ESC key in the manual. Refs #1928.
This was SVN commit r13464.
2013-06-09 20:38:57 +00:00
alpha123 6f3a0e1378 Implement location hotkeys. Fix #1882.
This was SVN commit r13463.
2013-06-09 20:21:19 +00:00
Mythos_Ruler 356adb1216 Nicer looking particles for Roman Temple. Fixes #1498.
More shield and helmet stuff.

This was SVN commit r13462.
2013-06-09 17:28:46 +00:00
Mythos_Ruler 80b0106502 Brand new Macedonian/Ptolemaic shield patterns by Enrique.
This was SVN commit r13461.
2013-06-09 15:57:29 +00:00
historic_bruno b40a738c87 Adds Omnipresent flag to more alarm sounds
This was SVN commit r13460.
2013-06-08 22:46:26 +00:00
Mythos_Ruler d151a6a304 Fixed war elephants. They can attack walls now.
This was SVN commit r13459.
2013-06-08 13:42:49 +00:00
Mythos_Ruler 8eae65be2b Fixed elephants. Can now attack walls.
This was SVN commit r13458.
2013-06-08 12:51:15 +00:00
Mythos_Ruler 633eab6080 Median Oasis 6 & 7.
Updated blowing sand texture.

This was SVN commit r13457.
2013-06-06 14:47:50 +00:00
stwf 71b25d5bd4 big SoundManager checkin,futureproof javascript interface, isolate external calls to remove OpenAL references
This was SVN commit r13455.
2013-06-06 11:13:57 +00:00
historic_bruno 1341b88468 Adds VBO support to minimap entity rendering to improve performance, patch by kuranes. Refs #1923
This was SVN commit r13454.
2013-06-06 00:10:58 +00:00
leper d20849d1c4 Add some checks for the sound manager. Fixes the segfault when using -quickstart.
This was SVN commit r13453.
2013-06-05 22:10:11 +00:00
leper 5b1f5dd2c1 Display expected trading gain (GainMultiplier = 1) for market foundations when setting rally points. Fixes #1963.
This was SVN commit r13452.
2013-06-05 21:35:31 +00:00
historic_bruno b2f6a1260e Sets Distanceless flag on most selection sound groups.
Adds new sound groups for gates.

This was SVN commit r13451.
2013-06-04 03:17:46 +00:00
historic_bruno 43d2c8be8c Converts a bunch of stereo sound effects to mono, to fix sounds ignoring entity position, fixes #1956, refs #1929.
Will require sound group XML updates in some cases.

This was SVN commit r13450.
2013-06-03 21:42:48 +00:00
Mythos_Ruler 4d5187bf40 Building completion and unit training sounds are now ubiquitous, meaning you'll hear them even if they are off-screen.
This was SVN commit r13449.
2013-06-03 02:50:10 +00:00
leper 8026685a06 Don't display the rally point tooltip for trading for enemy markets.
This was SVN commit r13448.
2013-06-02 20:17:44 +00:00
historic_bruno 2ef6ec3f73 Rounds trader gain to avoid fractions with garrisoned traders in a merchant ship, patch by Markus, fixes #1954
This was SVN commit r13447.
2013-06-01 21:28:31 +00:00
Pureon eebe7972df Lighting tweaks to Mauryan emblem
This was SVN commit r13446.
2013-06-01 12:09:34 +00:00
stwf 5af503405f last bunch of ogg files not converted from wav correctly
This was SVN commit r13445.
2013-06-01 02:56:31 +00:00
Mythos_Ruler b6e0661b8f New BRASIDAS Spartan hero.
"The Agoge" tech for Spartans.

Fixed Leonidas' selection ring.

This was SVN commit r13444.
2013-06-01 02:33:58 +00:00
stwf 67b42210aa mono ogg sounds rendered from original wav files recommitted
This was SVN commit r13443.
2013-06-01 02:30:05 +00:00
stwf 004eaf9e75 log warning when stereo sounds are played at position
This was SVN commit r13442.
2013-06-01 01:52:05 +00:00
Mythos_Ruler 4882aac409 New techs for Carthage: Mercenary Captains, reduce metal costs for merc units, based on ethnicity.
Melee cav more starting pierce armor.

This was SVN commit r13441.
2013-05-31 02:52:06 +00:00
stwf 690619ce5e many fauna sounds in stereo converted to mono so the OpenAL can locate them
This was SVN commit r13440.
2013-05-31 02:50:47 +00:00
stwf b21de66e40 address issue 1929 Ubiquitous Sound Effects, fixes a bug in determining which units are onscreen, also plays distant items softly if at all
This was SVN commit r13439.
2013-05-31 01:03:07 +00:00
Mythos_Ruler d3e40792ff Added a "wooden structures" civ bonus for the Celtic civs. Their buildings are 20% weaker, but they construct 20% faster than other cultures.
Fixed health for "Greek" walls.

Adjusted "preferredclasses" stuff on some templates.

This was SVN commit r13438.
2013-05-30 00:58:07 +00:00
Mythos_Ruler 085e9c620d Tweaked armor stats for battering ram and siege tower.
Fixed "rollover" tag to "history".

This was SVN commit r13437.
2013-05-29 23:39:13 +00:00
historic_bruno 7a8c8e439b Fixes warning in VC2012 build (C4706: assignment within conditional expression)
This was SVN commit r13434.
2013-05-28 01:23:43 +00:00
historic_bruno d2b0d25457 Fixes macro redefinition of FACILITY_VISUALCPP in VC2012 (it's defined in winerror.h).
Removes obsolete hack for old Boost and VC2005 (broke VC2005 build with
modern Boost).

This was SVN commit r13433.
2013-05-28 01:14:41 +00:00
Mythos_Ruler 4a8c7e72b5 Lowered crush armor for these buildings.
This was SVN commit r13431.
2013-05-27 18:21:57 +00:00
stwf 93d0084266 incorporate patch from ticket 1937, fix memory leak in SoundManager
This was SVN commit r13430.
2013-05-27 13:36:17 +00:00
historic_bruno 88c4e5bdd0 Extends binary serializer to support some standard JS classes: Number, String, Boolean. Fixes #406.
Extends binary serializer to support typed arrays.
Extends binary serializer to support custom JS prototype objects in AIs,
fixes #407.
Allows full serialization of AIs (not yet implemented). Refs #1089,
#1886
Increases binary serializer script backref arena from 8 MB to 16 MB,
refs #1842

This was SVN commit r13429.
2013-05-26 21:57:24 +00:00
Mythos_Ruler e58fe92892 Tweaked Walls stats and costs.
Carthaginians' 'Triple Walls' civ bonus moved from wall templates to
auto-researching (free) tech. It just cleans things up quite a bit.

Changed sound groups for "special buildings."

This was SVN commit r13428.
2013-05-25 23:10:16 +00:00
Mythos_Ruler 97b28e7343 Some sound file changes to hopefully add more aural variation.
Cavalry blacksmith techs moved from City to Town.

Trying to give the female citizen the order_build soundgroup, but it
doesn't seem to work. The game seems to use order_repair for both
repairing and building. These are two different actions so should
support two different sound groups.

This was SVN commit r13427.
2013-05-25 18:07:29 +00:00
wraitii 2c52099ddd Fix previous commit because of course there was test code in there. Make Aegis build more farms because of recent changes.
This was SVN commit r13426.
2013-05-25 16:24:05 +00:00
wraitii f372f9184c Fix Aegis breaking the profiler after some time (Fixes #1945. Fix typo (Fixes #1947). Patches by Markus.
Also one other fix for something attack related (probably, code is old
and I can't recall).

This was SVN commit r13425.
2013-05-25 15:56:11 +00:00
historic_bruno 17bb997e0e Fixes memory leak in CVertexBuffer::Release, patch by Markus, fixes #1933
This was SVN commit r13423.
2013-05-23 23:16:36 +00:00
leper bc8d461b81 Display rally point lines when setting rally points using the minimap. Patch by TrinityDeath. Fixes #1848.
This was SVN commit r13422.
2013-05-23 20:34:15 +00:00
historic_bruno a8a968d32c Catch exceptions by reference (by convention), based on patch from Markus, refs #1852
This was SVN commit r13421.
2013-05-22 22:27:53 +00:00
historic_bruno 72a8b88b7d Fixes some unconventional assignment operators, patch by Markus, refs #1852.
Fixes typo in test_ShaderManager

This was SVN commit r13420.
2013-05-22 22:04:58 +00:00
historic_bruno 94c57085e9 Makes some classes NONCOPYABLE, based on patch by Markus, refs #1852
This was SVN commit r13419.
2013-05-22 21:40:56 +00:00
historic_bruno d7dcd3b26c Use prefix increment operator for iterators (for consistency), refs #1852, #1064
This was SVN commit r13418.
2013-05-22 18:41:13 +00:00
stwf 3ce14e3f4b fix memory leak in SoundManager, patch taken from ticket #1934
This was SVN commit r13417.
2013-05-22 12:13:21 +00:00
leper 56a4d6417c Small cleanup.
This was SVN commit r13416.
2013-05-21 23:50:42 +00:00
leper e5523754b3 Check if a building is already at full health when trying to repair it. Fixes #1930.
This was SVN commit r13415.
2013-05-21 23:45:20 +00:00
leper 4356badfa9 Pause production if the producing entity is garrisoned. Fixes #1931.
This was SVN commit r13414.
2013-05-21 23:01:53 +00:00
leper 3f00d4d997 Change some size() > 0 to Based on patches by kuranes and Markus. Refs #1852, #1923.
This was SVN commit r13413.
2013-05-21 22:11:47 +00:00
leper 013fc9558a Fix typo. Fixes #1935.
This was SVN commit r13412.
2013-05-21 22:11:15 +00:00
wraitii 136f1891c1 Fixes a fix about a fix on the waterManager. Fixes #1891
This was SVN commit r13411.
2013-05-21 08:55:49 +00:00
Mythos_Ruler 346df43a43 Persian Apadana build limit.
This was SVN commit r13410.
2013-05-19 08:24:36 +00:00
Mythos_Ruler 67d072108b Bloody dead camel.
New wall technologies (research at Wall Tower, since for now techs can't
be researched at wall segments).

Adjusted default BatchTrainModifier from 0.7 to 0.8 in all buildings
since the new training techs were making unit batches train insanely
fast.

Added 'Naval Architects' batch training tech to the Dock (and Carth
Super Dock).

Attempting to add "Apadana" build limit, with no success. Need help
here. I thought BuildRestrictions.js and EntityLimits.js were the files
I needed to change, but it's not working (there should be a build limit
of 1 for the Persian Apadana).

Tweaked the levy techs.

Fixed Hero elephant unit RequiredTechnology.

This was SVN commit r13409.
2013-05-19 08:19:16 +00:00
leper 09108e6a97 Some more vars
This was SVN commit r13408.
2013-05-16 16:17:37 +00:00
Mythos_Ruler 1ea0bac280 New train time techs. For most factions, you choose either faster training infantry or faster training cavalry (either one unlocks Conscription, which boosts batch training considerably). For Persians, you get to research both at the barracks and stables, which unlocks conscription techs for both buildings. For Persians, I also moved the champion unlock tech to their Palace (Apadana), which now unlocks the "Immortals" technology (the tech that makes the Anusiya train twice as fast).
This was SVN commit r13407.
2013-05-15 08:11:20 +00:00
Mythos_Ruler ccb4ecc9f2 Renamed this tech.
This was SVN commit r13406.
2013-05-15 04:07:07 +00:00
Mythos_Ruler 9ceab639f3 Bloody dead sheep.
Unlocking tech for champions.

Champions trainable in barracks (after unlocking tech).

Farm Field yield increased from 2000 food to 5000 food. Max gatherers: 5
per field.

This was SVN commit r13405.
2013-05-14 09:48:37 +00:00
leper de5d4491ab var-fare
This was SVN commit r13404.
2013-05-12 22:28:02 +00:00
Mythos_Ruler f5f0bc701a Completely changed the "Stockbreeding" tech.
Fixed the 'Conscription' tech. It should work as advertised now.

Added some classes to the structures.

Reduced archer bonus vs. cav spears by 50%.

Moves Iphicratean Reforms from the Athenian Trireme to the Athenian
Dock.

This was SVN commit r13403.
2013-05-12 21:30:01 +00:00
Mythos_Ruler 2aa3ab8b03 conscription tech fix
This was SVN commit r13402.
2013-05-12 16:59:54 +00:00
leper 3bec6ced85 Fix hero button for heroes without attack
This was SVN commit r13401.
2013-05-12 16:02:53 +00:00
Mythos_Ruler daf572eb43 Temporary Blacksmith structures for prototyping and playtesting.
Lots of new techs. Healing techs. Vision for outpost. "Conscription"
tech boosts batch training speed. Implemented Macedonian "Hellenistic
Metropolis" special tech.

Testing placing Champions in the barracks (unlocked with a tech). Try
this out with the Macedonians.

Reduced archer attack damage. Reduced cost of healer.

Lots of other stuff.

This was SVN commit r13400.
2013-05-12 07:23:05 +00:00
Mythos_Ruler 209d8c4fd4 Made death screams slightly quieter. We actually need new male death/battle sounds.
This was SVN commit r13399.
2013-05-09 16:36:49 +00:00
Mythos_Ruler eae28bad5a Gold Oasis 3. Iberians vs. Mauryans.
This was SVN commit r13398.
2013-05-06 00:40:40 +00:00
Mythos_Ruler 57644fba50 Some art stuff: Scaffolds to other foundations, tweaking some Mauryan animations, new turban for maiden guards, etc.
This was SVN commit r13397.
2013-05-05 21:07:40 +00:00
Mythos_Ruler d49cc6fc8b Some armor changes. Also adds hero training restriction to hero elephant template. Fixes #1927.
This was SVN commit r13396.
2013-05-05 19:25:33 +00:00
leper 47e9431d29 Check if one of the technologies in a pair is already in progress. Fixes #1820.
This was SVN commit r13395.
2013-05-05 13:54:00 +00:00
leper cb7964a1db Make some gather techs work.
This was SVN commit r13394.
2013-05-05 13:13:38 +00:00
leper 56fa123718 Fix error when constructing with the first selected entity being a building.
This was SVN commit r13392.
2013-05-04 21:44:32 +00:00
leper fc5e2d27c7 Cancel building placement or reset selection on Esc. Patch by Josh. Fixes #1928.
This was SVN commit r13391.
2013-05-04 21:02:11 +00:00
leper 0d09f290d9 Allow setting rally points for foundations. Patch by Josh. Fixes #902.
This was SVN commit r13390.
2013-05-02 20:29:22 +00:00
stwf bf959e1c46 fix build when using --without-audio
This was SVN commit r13389.
2013-05-02 13:58:28 +00:00
leper 683f22cdb1 Display entity limits for buildings. Patch by Josh. Fixes #1924.
This was SVN commit r13388.
2013-05-01 19:25:55 +00:00
leper f42b77919d Future-proof the code for civ specific non-peace tracks.
This was SVN commit r13387.
2013-05-01 16:48:55 +00:00
wraitii 9a0749f3c9 Make sure to actually prevent Atlas from trying to render coastal waves. Fixes #1925
This was SVN commit r13386.
2013-05-01 06:47:49 +00:00
stwf ac3e9d8bc7 clear peace tracks before reloading music from civ files
This was SVN commit r13385.
2013-05-01 01:51:30 +00:00
Mythos_Ruler 67ff52a07f More armor adjustments.
This was SVN commit r13384.
2013-04-30 08:36:47 +00:00
leper 181db44ab5 Enforce technology restrictions when training units.
This was SVN commit r13383.
2013-04-29 21:51:14 +00:00
Mythos_Ruler 35daf00336 Snuck through without armor changes. Fixed now.
This was SVN commit r13382.
2013-04-29 18:33:03 +00:00
Mythos_Ruler e0a2e5790d Exponential Armor patch by Alpha123, with new updated armor values.
Needs a ton of testing.

This was SVN commit r13381.
2013-04-29 07:51:51 +00:00
Mythos_Ruler 4493f2986f Wonder support for civs currently with Wonders.
This was SVN commit r13380.
2013-04-29 02:46:13 +00:00
Mythos_Ruler 0686c6a553 Resetting 'default' maps.
This was SVN commit r13379.
2013-04-29 02:36:57 +00:00
leper 5a88f0fce0 Fix entity limits for buildings.
This was SVN commit r13378.
2013-04-29 00:36:21 +00:00
Mythos_Ruler f4e0007733 Cavalry are a bit faster.
Attempting to add Wonders, but no success (need help). Adding files here
to see if someone can fix what I've started.

This was SVN commit r13377.
2013-04-28 22:51:08 +00:00
historic_bruno d9540ad7f6 Fixes MSVC build error and warning
This was SVN commit r13375.
2013-04-27 22:43:22 +00:00
wraitii 4233acfa36 Slight clean up of the water code. Uses vertex data instead of a texture for foam. Should be faster to generate and render. Still no Atlas support.
This was SVN commit r13374.
2013-04-27 12:20:42 +00:00
stwf 092108b304 Must notify sound manager sources are now available
This was SVN commit r13372.
2013-04-26 23:13:11 +00:00
stwf c30f7a40e0 no need to check errors after destroying context, clean up some OpenAL interface calls
This was SVN commit r13371.
2013-04-25 10:48:34 +00:00
stwf 8324e0f665 add missing music list files
This was SVN commit r13369.
2013-04-24 19:27:16 +00:00
stwf 71486bd57d SoundManager supports playlists
This was SVN commit r13368.
2013-04-24 12:03:42 +00:00
leper 6115c3fc13 Remove some duplication from ProcessCommand.
This was SVN commit r13367.
2013-04-22 17:50:25 +00:00
Mythos_Ruler 62f24af68d Some new portraits by LordGood.
This was SVN commit r13366.
2013-04-21 18:47:11 +00:00
leper 3758b64916 Remove hardcoding of path from desktop file and launcher script. Patch by vincent. Fixes #1424.
This was SVN commit r13365.
2013-04-21 16:47:36 +00:00
leper 75f332ce20 Stop hotkey. Patch by alpha123. Fixes #1870.
This was SVN commit r13364.
2013-04-18 19:20:29 +00:00
leper cd6a76bcaa Gates now handle allies made using diplomacy.
This was SVN commit r13363.
2013-04-18 18:18:34 +00:00
leper 18a2b7d093 Fix roman merchant ship trading distance. Fixes #1874.
This was SVN commit r13362.
2013-04-18 18:18:31 +00:00
leper dc9889c190 Display number of garrisoned units when trying to garrison. Patch by mimo. Fixes #1915.
This was SVN commit r13361.
2013-04-18 18:18:29 +00:00
leper a362b41029 Fix grouping of garrisoned units. Patch by mimo. Fixes #1918.
This was SVN commit r13360.
2013-04-18 18:18:24 +00:00
stwf 503b481468 handle initialization errors cleanly, clean stuff up
This was SVN commit r13359.
2013-04-18 03:24:20 +00:00
leper b22320a85f Fix tests. Refs #1807.
This was SVN commit r13358.
2013-04-14 00:52:00 +00:00
leper d0a695f7fb Allow mutual allies to garrison in each others buildings. Patch by mimo. Fixes #1807.
This was SVN commit r13357.
2013-04-14 00:34:14 +00:00
stwf 2a3f1cb412 eliminate most warnings produced by Cppcheck
This was SVN commit r13356.
2013-04-12 03:10:54 +00:00
leper 7562c79e89 Change target for all orders on EntityRenamed. Patch by mimo. Fixes #1903.
This was SVN commit r13355.
2013-04-10 22:48:02 +00:00
leper 95a10e7f42 Reduce duplicate GuiInterfaceCalls some more. Patch by sbte. Fixes #1878.
This was SVN commit r13354.
2013-04-10 21:05:46 +00:00
stwf 0cad19ecec double check that the sound manager has been created before using
This was SVN commit r13353.
2013-04-10 12:03:17 +00:00
stwf b301d5c84d fades music in and out when switching to background, also honors g_PauseOnFocusLoss
This was SVN commit r13352.
2013-04-10 11:51:42 +00:00
Mythos_Ruler 19ce9657bc This was SVN commit r13351. 2013-04-10 09:11:08 +00:00
Mythos_Ruler 3074b930cc Tech.
This was SVN commit r13350.
2013-04-08 08:27:30 +00:00
Mythos_Ruler 789991c5d2 New food gathering tech for village phase.
Adjusted some food gather rates.

Adjusted some tech costs.

This was SVN commit r13349.
2013-04-08 07:59:57 +00:00
Mythos_Ruler 5429052b06 Lots of normal maps and spec maps. Ongoing project.
Added camel death scream (lol) to camel units.

Added sheep sounds to sheep.

Changed over the Mauryan elephant unit actors.

This was SVN commit r13348.
2013-04-07 22:28:36 +00:00
stwf c9a5d5cee5 pause music and ambient sounds when game pauses
This was SVN commit r13347.
2013-04-07 04:13:15 +00:00
leper 555f06acbe Fix errors when the hero is garrisoned. Patch by alpha123. Refs #1802.
This was SVN commit r13346.
2013-04-06 19:32:07 +00:00
historic_bruno c71ddae359 Adds forgotten OpenLogsFolder.vbs to Windows uninstaller
This was SVN commit r13345.
2013-04-05 21:40:49 +00:00
historic_bruno 2af37c3590 Adds player color to rubble entities, thanks to ericb for the patch, fixes #1887
This was SVN commit r13344.
2013-04-05 02:52:01 +00:00
historic_bruno 161d6c1ba7 Improves SDL 2.0 support
This was SVN commit r13343.
2013-04-05 02:39:30 +00:00
historic_bruno 7f9b486a48 This was SVN commit r13341. 2013-04-03 23:28:29 +00:00
historic_bruno 16de5c75ac Adds game speed option to match setup, adds in-game control for single player games, fixes #785.
Refactors some GUI utility functions.

This was SVN commit r13340.
2013-04-03 23:24:22 +00:00
leper 62dc594a71 Hero button. Based on patch by Malcom and edits to that by alpha123. Fixes 1802.
This was SVN commit r13339.
2013-04-03 17:27:55 +00:00
Mythos_Ruler f2da77ff72 "Oh myyyyy" -- George Takei. Lots of stuff:
- Town Phase cost increased to 1000 Food, 1000 Wood (from 500 of each).
This makes Village Phase longer and more interesting. Still need to
test.

- Lots of new normal maps and spec maps (for a bunch of desert terrains
and cretan date palms). This is an ongoing project.

- Fixed some spec maps for being too 'bright.'

- Changed the attack of melee spear units from a combo of pierce and
hack to just hack. Per discussion with Quantumstate. Needs testing.

- Changed the Median Oasis 1 scenario to include Mauryans and
Carthaginians.

This was SVN commit r13338.
2013-04-03 06:48:38 +00:00
historic_bruno a317cd9cba Fixes memory leak and removes unused code in WaterManager, fixes #1891, refs #1852
This was SVN commit r13337.
2013-04-03 03:30:10 +00:00
leper f82adf3ef3 Don't call GetSimulationState too often. Patch by sbte. Fixes #1878.
This was SVN commit r13336.
2013-04-02 21:06:20 +00:00
Mythos_Ruler 3c693245bd Portraits for the Mauryan healer and Chanakya.
This was SVN commit r13335.
2013-04-02 17:06:15 +00:00
Mythos_Ruler edea5d04e7 Portraits for Mauryan healer and Chanakya.
This was SVN commit r13334.
2013-04-02 17:05:51 +00:00
Ykkrosh 74df28f952 Fix --without-pch build
This was SVN commit r13333.
2013-04-02 15:44:42 +00:00
11172 changed files with 407788 additions and 381428 deletions
+4
View File
@@ -0,0 +1,4 @@
{
"phabricator.uri" : "https://code.wildfiregames.com/",
"repository.callsign" : "P"
}
+18
View File
@@ -0,0 +1,18 @@
{
"exclude": [
"(^binaries/system/)",
"(^source/third_party/)",
"(^libraries/)"
],
"linters": {
"text": {
"type": "text",
"severity": {
"1": "disabled",
"2": "disabled",
"3": "disabled",
"5": "disabled"
}
}
}
}
+20 -3
View File
@@ -37,7 +37,7 @@ in particular, let us know and we can try to clarify it.
BSD
/build/premake/*.lua
MIT
MIT - see license_mit.txt
/docs
Various (unspecified)
@@ -49,13 +49,30 @@ in particular, let us know and we can try to clarify it.
GPL version 2 (or later) - see license_gpl-2.0.txt
/source/lib
MIT
MIT - see license_mit.txt
/source/scriptinterface/third_party
MPL 2.0
/source/third_party/cppformat
BSD
/source/third_party/encryption
GPL version 2 (or later)
ISC (pkcs5_pbkdf2.cpp)
MIT (pkcs5_pbkdf2.h) - see license_mit.txt
/source/third-party/jsonspirit
MIT - see license_mit.txt
/source/third_party/mikktspace
zlib
/source/third_party/mongoose
MIT
MIT - see license_mit.txt
/source/third_party/tinygettext
zlib
/source/tools
Various - see LICENSE.txt within that directory
+341 -203
View File
@@ -5,6 +5,12 @@
; * create a text file called "local.cfg" instead, and copy *
; * the lines from this file that you want to change. *
; * *
; * If a setting is part of a section (for instance [hotkey]) *
; * you need to append the section name at the beginning of *
; * your custom line (for instance you need to write *
; * "hotkey.pause = Space" if you want to change the pausing *
; * hotkey to the spacebar). *
; * *
; * On Linux, create: *
; * $XDG_CONFIG_HOME/0ad/config/local.cfg *
; * (Note: $XDG_CONFIG_HOME defaults to ~/.config) *
@@ -20,12 +26,15 @@
; Enable/disable windowed mode by default. (Use Alt+Enter to toggle in the game.)
windowed = false
; Enable/disable the splashscreen
splashscreenenable = true
; Show detailed tooltips (Unit stats)
showdetailedtooltips = false
; Pause the game on window focus loss (Only applicable to single player mode)
pauseonfocusloss = true
; Persist settings after leaving the game setup screen
persistmatchsettings = true
; Default player name to use in multiplayer
; playername = "anonymous"
@@ -41,22 +50,30 @@ yres = 0
; Force a non-standard bit depth (if 0 then use the current desktop bit depth)
bpp = 0
; Preferred display (for multidisplay setups, only works with SDL 2.0)
display = 0
; Emulate right-click with Ctrl+Click on Mac mice
macmouse = false
; System settings:
waternormals = true
; if false, actors won't be rendered but anything entity will be.
renderactors = true
waterugly=false; Force usage of the fixed pipeline water. This is faster, but really, really ugly.
waterfancyeffects = false
waterrealdepth = true
waterfoam = false
watercoastalwaves = false
waterrefraction = true
waterreflection = true
watershadows = false
shadowsonwater = false
shadows = true
shadowpcf = true
vsync = false
particles = true
silhouettes = true
showsky = false
showsky = true
nos3tc = false
noautomipmap = true
@@ -79,23 +96,20 @@ force_s3tc_enable = true
renderpath = default
;;;;; EXPERIMENTAL ;;;;;
; Prefer GLSL shaders over ARB shaders (not recommended). REQUIRES gentangents=true.
; Prefer GLSL shaders over ARB shaders. Allows fancier graphical effects.
preferglsl = false
; Generate tangents for normal and parallax mapping. REQUIRES preferglsl=true.
gentangents = false
; Experimental probably-non-working GPU skinning support; requires preferglsl; use at own risk
gpuskinning = false
; Use smooth LOS interpolation; REQUIRES preferglsl=true.
; Use smooth LOS interpolation
smoothlos = false
; Use screen-space postprocessing filters (HDR, bloom, DOF, etc). Incompatible with fixed renderpath.
postproc = false
; Quality level of shader effects (set to 10 to display effects)
materialmgr.quality = 0.0
; Quality level of shader effects (set to 10 to display all effects)
materialmgr.quality = 2.0
; Maximum distance to display parallax effect. Set to 0 to disable parallax.
materialmgr.PARALLAX_DIST.max = 150
@@ -108,210 +122,334 @@ materialmgr.PARALLAX_VHQ_DIST.max = 0
; Replace alpha-blending with alpha-testing, for performance experiments
forcealphatest = false
; Opt-in online user reporting system
userreport.url = "http://feedback.wildfiregames.com/report/upload/v1/"
; Colour of the sky (in "r g b" format)
; Color of the sky (in "r g b" format)
skycolor = "0 0 0"
; GENERAL PREFERENCES:
sound.mastergain = 0.9
sound.musicgain = 0.2
sound.ambientgain = 0.6
sound.actiongain = 0.7
sound.bufferCount = 50
sound.bufferSize = 98304
; Camera control settings
view.scroll.speed = 120.0
view.scroll.speed.modifier = 1.05 ; Multiplier for changing scroll speed
view.rotate.x.speed = 1.2
view.rotate.x.min = 28.0
view.rotate.x.max = 60.0
view.rotate.x.default = 35.0
view.rotate.y.speed = 2.0
view.rotate.y.speed.wheel = 0.45
view.rotate.y.default = 0.0
view.rotate.speed.modifier = 1.05 ; Multiplier for changing rotation speed
view.drag.speed = 0.5
view.zoom.speed = 256.0
view.zoom.speed.wheel = 32.0
view.zoom.min = 50.0
view.zoom.max = 200.0
view.zoom.default = 120.0
view.zoom.speed.modifier = 1.05 ; Multiplier for changing zoom speed
view.pos.smoothness = 0.1
view.zoom.smoothness = 0.4
view.rotate.x.smoothness = 0.5
view.rotate.y.smoothness = 0.3
view.near = 2.0 ; Near plane distance
view.far = 4096.0 ; Far plane distance
view.fov = 45.0 ; Field of view (degrees), lower is narrow, higher is wide
view.height.smoothness = 0.5
view.height.min = 16
; HOTKEY MAPPINGS:
[adaptivefps]
session = 60 ; Throttle FPS in running games (prevents 100% CPU workload).
menu = 30 ; Throttle FPS in menus only.
[hotkey]
; Each one of the specified keys will trigger the action on the left
; for multiple-key combinations, separate keys with '+' and enclose the entire thing
; in doublequotes.
; for multiple-key combinations, separate keys with '+'.
; See keys.txt for the list of key names.
; > SYSTEM SETTINGS
hotkey.exit = "Alt+F4", "Ctrl+Break", "Super+Q" ; Exit to desktop
hotkey.leave = Escape ; End current game or Exit
hotkey.pause = Pause ; Pause/unpause game
hotkey.screenshot = F2 ; Take PNG screenshot
hotkey.bigscreenshot = "Shift+F2" ; Take large BMP screenshot
hotkey.togglefullscreen = "Alt+Return" ; Toggle fullscreen/windowed mode
hotkey.screenshot.watermark = "Alt+K" ; Toggle product/company watermark for official screenshots
hotkey.wireframe = "Alt+W" ; Toggle wireframe mode
hotkey.silhouettes = "Alt+S" ; Toggle unit silhouettes
hotkey.showsky = "Alt+Z" ; Toggle sky
; > CAMERA SETTINGS
hotkey.camera.reset = "H" ; Reset camera rotation to default.
hotkey.camera.follow = "F" ; Follow the first unit in the selection
hotkey.camera.zoom.in = Plus, Equals, NumPlus ; Zoom camera in (continuous control)
hotkey.camera.zoom.out = Minus, NumMinus ; Zoom camera out (continuous control)
hotkey.camera.zoom.wheel.in = WheelUp ; Zoom camera in (stepped control)
hotkey.camera.zoom.wheel.out = WheelDown ; Zoom camera out (stepped control)
hotkey.camera.rotate.up = "Ctrl+UpArrow", "Ctrl+W" ; Rotate camera to look upwards
hotkey.camera.rotate.down = "Ctrl+DownArrow", "Ctrl+S" ; Rotate camera to look downwards
hotkey.camera.rotate.cw = "Ctrl+LeftArrow", "Ctrl+A", Q ; Rotate camera clockwise around terrain
hotkey.camera.rotate.ccw = "Ctrl+RightArrow", "Ctrl+D", E ; Rotate camera anticlockwise around terrain
hotkey.camera.rotate.wheel.cw = "Shift+WheelUp", MouseX1 ; Rotate camera clockwise around terrain (stepped control)
hotkey.camera.rotate.wheel.ccw = "Shift+WheelDown", MouseX2 ; Rotate camera anticlockwise around terrain (stepped control)
hotkey.camera.pan = MouseMiddle, ForwardSlash ; Enable scrolling by moving mouse
hotkey.camera.left = A, LeftArrow ; Scroll or rotate left
hotkey.camera.right = D, RightArrow ; Scroll or rotate right
hotkey.camera.up = W, UpArrow ; Scroll or rotate up/forwards
hotkey.camera.down = S, DownArrow ; Scroll or rotate down/backwards
hotkey.camera.scroll.speed.increase = "Ctrl+Shift+S" ; Increase scroll speed
hotkey.camera.scroll.speed.decrease = "Ctrl+Alt+S" ; Decrease scroll speed
hotkey.camera.rotate.speed.increase = "Ctrl+Shift+R" ; Increase rotation speed
hotkey.camera.rotate.speed.decrease = "Ctrl+Alt+R" ; Decrease rotation speed
hotkey.camera.zoom.speed.increase = "Ctrl+Shift+Z" ; Increase zoom speed
hotkey.camera.zoom.speed.decrease = "Ctrl+Alt+Z" ; Decrease zoom speed
; > CONSOLE SETTINGS
hotkey.console.toggle = BackQuote, F9 ; Open/close console
exit = "Ctrl+Break", "Super+Q" ; Exit to desktop
cancel = Escape ; Close or cancel the current dialog box/popup
leave = Escape ; End current game or Exit
confirm = Return ; Confirm the current command
pause = Pause ; Pause/unpause game
screenshot = F2 ; Take PNG screenshot
bigscreenshot = "Shift+F2" ; Take large BMP screenshot
togglefullscreen = "Alt+Return" ; Toggle fullscreen/windowed mode
screenshot.watermark = "Alt+K" ; Toggle product/company watermark for official screenshots
wireframe = "Alt+W" ; Toggle wireframe mode
silhouettes = "Alt+S" ; Toggle unit silhouettes
showsky = "Alt+Z" ; Toggle sky
; > CLIPBOARD CONTROLS
hotkey.copy = "Ctrl+C" ; Copy to clipboard
hotkey.paste = "Ctrl+V" ; Paste from clipboard
hotkey.cut = "Ctrl+X" ; Cut selected text and copy to the clipboard
copy = "Ctrl+C" ; Copy to clipboard
paste = "Ctrl+V" ; Paste from clipboard
cut = "Ctrl+X" ; Cut selected text and copy to the clipboard
; > ENTITY SELECTION
hotkey.selection.add = Shift ; Add units to selection
hotkey.selection.milonly = Alt ; Add only military units to selection
hotkey.selection.remove = Ctrl ; Remove units from selection
hotkey.selection.idleworker = Period ; Select next idle worker
hotkey.selection.idlewarrior = Comma ; Select next idle warrior
hotkey.selection.offscreen = Alt ; Include offscreen units in selection
hotkey.selection.group.select.0 = 0
hotkey.selection.group.save.0 = "Ctrl+0"
hotkey.selection.group.add.0 = "Shift+0"
hotkey.selection.group.select.1 = 1
hotkey.selection.group.save.1 = "Ctrl+1"
hotkey.selection.group.add.1 = "Shift+1"
hotkey.selection.group.select.2 = 2
hotkey.selection.group.save.2 = "Ctrl+2"
hotkey.selection.group.add.2 = "Shift+2"
hotkey.selection.group.select.3 = 3
hotkey.selection.group.save.3 = "Ctrl+3"
hotkey.selection.group.add.3 = "Shift+3"
hotkey.selection.group.select.4 = 4
hotkey.selection.group.save.4 = "Ctrl+4"
hotkey.selection.group.add.4 = "Shift+4"
hotkey.selection.group.select.5 = 5
hotkey.selection.group.save.5 = "Ctrl+5"
hotkey.selection.group.add.5 = "Shift+5"
hotkey.selection.group.select.6 = 6
hotkey.selection.group.save.6 = "Ctrl+6"
hotkey.selection.group.add.6 = "Shift+6"
hotkey.selection.group.select.7 = 7
hotkey.selection.group.save.7 = "Ctrl+7"
hotkey.selection.group.add.7 = "Shift+7"
hotkey.selection.group.select.8 = 8
hotkey.selection.group.save.8 = "Ctrl+8"
hotkey.selection.group.add.8 = "Shift+8"
hotkey.selection.group.select.9 = 9
hotkey.selection.group.save.9 = "Ctrl+9"
hotkey.selection.group.add.9 = "Shift+9"
; > SESSION CONTROLS
hotkey.session.kill = Delete ; Destroy selected units
hotkey.session.attack = "Ctrl+Alt" ; Modifier to force attack instead of another action
hotkey.session.garrison = Ctrl ; Modifier to garrison when clicking on building
hotkey.session.attackmove = Ctrl ; Modifier to attackmove when clicking on a point
hotkey.session.queue = Shift ; Modifier to queue unit orders instead of replacing
hotkey.session.batchtrain = Shift ; Modifier to train units in batches
hotkey.session.massbarter = Shift ; Modifier to barter bunch of resources
hotkey.session.masstribute = Shift ; Modifier to tribute bunch of resources
hotkey.session.unloadtype = Shift ; Modifier to unload all units of type
hotkey.session.deselectgroup = Ctrl ; Modifier to deselect units when clicking group icon, instead of selecting
hotkey.session.rotate.cw = RightBracket ; Rotate building placement preview clockwise
hotkey.session.rotate.ccw = LeftBracket ; Rotate building placement preview anticlockwise
hotkey.timewarp.fastforward = Space ; If timewarp mode enabled, speed up the game
hotkey.timewarp.rewind = Backspace ; If timewarp mode enabled, go back to earlier point in the game
; > UNIT TRAINING
hotkey.session.queueunit.1 = "Z" ; add first unit type to queue
hotkey.session.queueunit.2 = "X" ; add second unit type to queue
hotkey.session.queueunit.3 = "C" ; add third unit type to queue
hotkey.session.queueunit.4 = "V" ; add fourth unit type to queue
hotkey.session.queueunit.5 = "B" ; add fivth unit type to queue
hotkey.session.queueunit.6 = "N" ; add sixth unit type to queue
hotkey.session.queueunit.7 = "M" ; add seventh unit type to queue
; > CONSOLE SETTINGS
console.toggle = BackQuote, F9 ; Open/close console
; > OVERLAY KEYS
hotkey.fps.toggle = "Alt+F" ; Toggle frame counter
hotkey.session.devcommands.toggle = "Alt+D" ; Toggle developer commands panel
hotkey.session.gui.toggle = "Alt+G" ; Toggle visibility of session GUI
hotkey.menu.toggle = "F10" ; Toggle in-game menu
hotkey.timeelapsedcounter.toggle = "F12" ; Toggle time elapsed counter
hotkey.session.showstatusbars = Tab ; Toggle display of status bars
fps.toggle = "Alt+F" ; Toggle frame counter
realtime.toggle = "Alt+T" ; Toggle current display of computer time
session.devcommands.toggle = "Alt+D" ; Toggle developer commands panel
timeelapsedcounter.toggle = "F12" ; Toggle time elapsed counter
session.showstatusbars = Tab ; Toggle display of status bars
session.highlightguarding = PgDn ; Toggle highlight of guarding units
session.highlightguarded = PgUp ; Toggle highlight of guarded units
session.toggleaurarange = "Alt+V" ; Toggle display of aura range overlays of selected units and structures
session.togglehealrange = "Alt+B" ; Toggle display of heal range overlays of selected units
; > HOTKEYS ONLY
hotkey.chat = Return ; Toggle chat window
hotkey.teamchat = "T" ; Toggle chat window in team chat mode
; > GUI TEXTBOX HOTKEYS
hotkey.text.delete.left = "Ctrl+Backspace" ; Delete word to the left of cursor
hotkey.text.delete.right = "Ctrl+Del" ; Delete word to the right of cursor
hotkey.text.move.left = "Ctrl+LeftArrow" ; Move cursor to start of word to the left of cursor
hotkey.text.move.right = "Ctrl+RightArrow" ; Move cursor to start of word to the right of cursor
; > PROFILER
hotkey.profile.toggle = "F11" ; Enable/disable real-time profiler
hotkey.profile.save = "Shift+F11" ; Save current profiler data to logs/profile.txt
hotkey.profile2.enable = "F11" ; Enable HTTP/GPU modes for new profiler
profiler2.http.autoenable = false ; Enable HTTP server output at startup (default off for security/performance)
profiler2.script.enable = false ; Enable Javascript profiling. Needs to be set before startup and can't be changed later. (default off for performance)
profiler2.gpu.autoenable = false ; Enable GPU timing at startup (default off for performance/compatibility)
profiler2.gpu.arb.enable = true ; Allow GL_ARB_timer_query timing mode when available
profiler2.gpu.ext.enable = true ; Allow GL_EXT_timer_query timing mode when available
profiler2.gpu.intel.enable = true ; Allow GL_INTEL_performance_queries timing mode when available
; > JS DEBUGGER
jsdebugger.enable = false ; Enable Javascript debugging (default off for security/performance)
chat = Return ; Toggle chat window
teamchat = "T" ; Toggle chat window in team chat mode
privatechat = "L" ; Toggle chat window and select the previous private chat partner
; > QUICKSAVE
hotkey.quicksave = "Shift+F5"
hotkey.quickload = "Shift+F8"
quicksave = "Shift+F5"
quickload = "Shift+F8"
; EXPERIMENTAL: joystick/gamepad settings
joystick.enable = false
joystick.deadzone = 8192
joystick.camera.pan.x = 0
joystick.camera.pan.y = 1
joystick.camera.rotate.x = 3
joystick.camera.rotate.y = 2
joystick.camera.zoom.in = 5
joystick.camera.zoom.out = 4
[hotkey.camera]
reset = "R" ; Reset camera rotation to default.
follow = "F" ; Follow the first unit in the selection
rallypointfocus = unused ; Focus the camera on the rally point of the selected building
zoom.in = Plus, Equals, NumPlus ; Zoom camera in (continuous control)
zoom.out = Minus, NumMinus ; Zoom camera out (continuous control)
zoom.wheel.in = WheelUp ; Zoom camera in (stepped control)
zoom.wheel.out = WheelDown ; Zoom camera out (stepped control)
rotate.up = "Ctrl+UpArrow", "Ctrl+W" ; Rotate camera to look upwards
rotate.down = "Ctrl+DownArrow", "Ctrl+S" ; Rotate camera to look downwards
rotate.cw = "Ctrl+LeftArrow", "Ctrl+A", Q ; Rotate camera clockwise around terrain
rotate.ccw = "Ctrl+RightArrow", "Ctrl+D", E ; Rotate camera anticlockwise around terrain
rotate.wheel.cw = "Shift+WheelUp", MouseX1 ; Rotate camera clockwise around terrain (stepped control)
rotate.wheel.ccw = "Shift+WheelDown", MouseX2 ; Rotate camera anticlockwise around terrain (stepped control)
pan = MouseMiddle ; Enable scrolling by moving mouse
left = A, LeftArrow ; Scroll or rotate left
right = D, RightArrow ; Scroll or rotate right
up = W, UpArrow ; Scroll or rotate up/forwards
down = S, DownArrow ; Scroll or rotate down/backwards
scroll.speed.increase = "Ctrl+Shift+S" ; Increase scroll speed
scroll.speed.decrease = "Ctrl+Alt+S" ; Decrease scroll speed
rotate.speed.increase = "Ctrl+Shift+R" ; Increase rotation speed
rotate.speed.decrease = "Ctrl+Alt+R" ; Decrease rotation speed
zoom.speed.increase = "Ctrl+Shift+Z" ; Increase zoom speed
zoom.speed.decrease = "Ctrl+Alt+Z" ; Decrease zoom speed
; GENERAL GUI SETTINGS
gui.cursorblinkrate = 0.5 ; Cursor blink rate in seconds (0.0 to disable blinking)
[hotkey.camera.jump]
1 = F5 ; Jump to position N
2 = F6
3 = F7
4 = F8
;5 =
;6 =
;7 =
;8 =
;9 =
;10 =
[hotkey.camera.jump.set]
1 = "Ctrl+F5" ; Set jump position N
2 = "Ctrl+F6"
3 = "Ctrl+F7"
4 = "Ctrl+F8"
;5 =
;6 =
;7 =
;8 =
;9 =
;10 =
[hotkey.profile]
toggle = "F11" ; Enable/disable real-time profiler
save = "Shift+F11" ; Save current profiler data to logs/profile.txt
[hotkey.profile2]
toggle = "Ctrl+F11" ; Enable/disable HTTP/GPU modes for new profiler
[hotkey.selection]
add = Shift ; Add units to selection
milonly = Alt ; Add only military units to selection
idleonly = "I" ; Select only idle units
remove = Ctrl ; Remove units from selection
cancel = Esc ; Un-select all units and cancel building placement
idleworker = Period ; Select next idle worker
idlewarrior = ForwardSlash ; Select next idle warrior
offscreen = Alt ; Include offscreen units in selection
[hotkey.selection.group.add]
0 = "Shift+0"
1 = "Shift+1"
2 = "Shift+2"
3 = "Shift+3"
4 = "Shift+4"
5 = "Shift+5"
6 = "Shift+6"
7 = "Shift+7"
8 = "Shift+8"
9 = "Shift+9"
[hotkey.selection.group.save]
0 = "Ctrl+0"
1 = "Ctrl+1"
2 = "Ctrl+2"
3 = "Ctrl+3"
4 = "Ctrl+4"
5 = "Ctrl+5"
6 = "Ctrl+6"
7 = "Ctrl+7"
8 = "Ctrl+8"
9 = "Ctrl+9"
[hotkey.selection.group.select]
0 = 0
1 = 1
2 = 2
3 = 3
4 = 4
5 = 5
6 = 6
7 = 7
8 = 8
9 = 9
[hotkey.session]
kill = Delete ; Destroy selected units
stop = "H" ; Stop the current action
backtowork = "Y" ; The unit will go back to work
unload = "U" ; Unload garrisoned units when a building/mechanical unit is selected
attack = Ctrl ; Modifier to attack instead of another action (eg capture)
attackmove = Ctrl ; Modifier to attackmove when clicking on a point
attackmoveUnit = "Ctrl+Q" ; Modifier to attackmove targeting only units when clicking on a point (should contain the attackmove keys)
garrison = Ctrl ; Modifier to garrison when clicking on building
autorallypoint = Ctrl ; Modifier to set the rally point on the building itself
guard = "G" ; Modifier to escort/guard when clicking on unit/building
patrol = "P" ; Modifier to patrol a unit
repair = "J" ; Modifier to repair when clicking on building/mechanical unit
queue = Shift ; Modifier to queue unit orders instead of replacing
batchtrain = Shift ; Modifier to train units in batches
massbarter = Shift ; Modifier to barter bunch of resources
masstribute = Shift ; Modifier to tribute bunch of resources
noconfirmation = Shift ; Do not ask confirmation when deleting a building/unit
fulltradeswap = Shift ; Modifier to put the desired trade resource to 100%
unloadtype = Shift ; Modifier to unload all units of type
deselectgroup = Ctrl ; Modifier to deselect units when clicking group icon, instead of selecting
rotate.cw = RightBracket ; Rotate building placement preview clockwise
rotate.ccw = LeftBracket ; Rotate building placement preview anticlockwise
[hotkey.session.gui]
toggle = "Alt+G" ; Toggle visibility of session GUI
menu.toggle = "F10" ; Toggle in-game menu
barter.toggle = "Ctrl+B" ; Toggle in-game barter/trade page
[hotkey.session.savedgames]
delete = Delete ; Delete the selected saved game asking confirmation
noconfirmation = Shift ; Do not ask confirmation when deleting a game
[hotkey.session.queueunit] ; > UNIT TRAINING
1 = "Z" ; add first unit type to queue
2 = "X" ; add second unit type to queue
3 = "C" ; add third unit type to queue
4 = "V" ; add fourth unit type to queue
5 = "B" ; add fivth unit type to queue
6 = "N" ; add sixth unit type to queue
7 = "M" ; add seventh unit type to queue
8 = Comma ; add eighth unit type to queue
[hotkey.session.timewarp]
fastforward = Space ; If timewarp mode enabled, speed up the game
rewind = Backspace ; If timewarp mode enabled, go back to earlier point in the game
[hotkey.text] ; > GUI TEXTBOX HOTKEYS
delete.left = "Ctrl+Backspace" ; Delete word to the left of cursor
delete.right = "Ctrl+Del" ; Delete word to the right of cursor
move.left = "Ctrl+LeftArrow" ; Move cursor to start of word to the left of cursor
move.right = "Ctrl+RightArrow" ; Move cursor to start of word to the right of cursor
[gui]
cursorblinkrate = 0.5 ; Cursor blink rate in seconds (0.0 to disable blinking)
scale = 1.0 ; GUI scaling factor, for improved compatibility with 4K displays
[gui.gamesetup]
enabletips = true ; Enable/Disable tips during gamesetup (for newcomers)
assignplayers = everyone ; Whether to assign joining clients to free playerslots. Possible values: everyone, buddies, disabled.
[gui.session]
camerajump.threshold = 40 ; How close do we have to be to the actual location in order to jump back to the previous one?
timeelapsedcounter = false ; Show the game duration in the top right corner
batchtrainingsize = 5 ; Number of units to be trained per batch (when pressing the hotkey)
aurarange = true ; Display aura range overlays of selected units and structures
healrange = true ; Display heal range overlays of selected units
[gui.session.minimap]
blinkduration = 1.7 ; The blink duration while pinging
pingduration = 50.0 ; The duration for which an entity will be pinged after an attack notification
[gui.session.notifications]
attack = true ; Show a chat notification if you are attacked by another player
tribute = true ; Show a chat notification if an ally tributes resources to another team member if teams are locked, and all tributes in observer mode
barter = true ; Show a chat notification to observers when a player bartered resources
phase = completed ; Show a chat notification if you or an ally have started, aborted or completed a new phase, and phases of all players in observer mode. Possible values: none, completed, all.
[gui.splashscreen]
enable = true ; Enable/disable the splashscreen
version = 0 ; Splashscreen version (date of last modification). By default, 0 to force splashscreen to appear at first launch
[joystick] ; EXPERIMENTAL: joystick/gamepad settings
enable = false
deadzone = 8192
[joystick.camera]
pan.x = 0
pan.y = 1
rotate.x = 3
rotate.y = 2
zoom.in = 5
zoom.out = 4
[chat]
timestamp = true ; Show at which time chat messages have been sent
[chat.session]
extended = true ; Whether to display the chat history
[lobby]
history = 0 ; Number of past messages to display on join
room = "arena22" ; Default MUC room to join
server = "lobby.wildfiregames.com" ; Address of lobby server
xpartamupp = "wfgbot22" ; Name of the server-side xmpp client that manage games
buddies = "," ; Comma separated list of playernames that the current user has marked as buddies
[lobby.columns]
gamerating = false ; Show the average rating of the participating players in a column of the gamelist
[lobby.stun]
enabled = true ; The STUN protocol allows hosting games without configuring the firewall and router.
; If STUN is disabled, the game relies on direct connection, UPnP and port forwarding.
server = "lobby.wildfiregames.com" ; Address of the STUN server.
port = 3478 ; Port of the STUN server.
delay = 200 ; Duration in milliseconds that is waited between STUN messages.
; Smaller numbers speed up joins but also become less stable.
[mod]
enabledmods = "mod public"
[network]
duplicateplayernames = false ; Rename joining player to "User (2)" if "User" is already connected, otherwise prohibit join.
lateobservers = everyone ; Allow observers to join the game after it started. Possible values: everyone, buddies, disabled.
observerlimit = 8 ; Prevent further observer joins in running games if this limit is reached
[overlay]
fps = "false" ; Show frames per second in top right corner
realtime = "false" ; Show current system time in top right corner
netwarnings = "true" ; Show warnings if the network connection is bad
[profiler2]
autoenable = false ; Enable HTTP server output at startup (default off for security/performance)
gpu.arb.enable = true ; Allow GL_ARB_timer_query timing mode when available
gpu.ext.enable = true ; Allow GL_EXT_timer_query timing mode when available
gpu.intel.enable = true ; Allow GL_INTEL_performance_queries timing mode when available
[sound]
mastergain = 0.9
musicgain = 0.2
ambientgain = 0.6
actiongain = 0.7
uigain = 0.7
[sound.notify]
nick = true ; Play a sound when someone mentions your name in the lobby or game
[tinygettext]
debug = false ; Print error messages each time a translation for an English string is not found.
[userreport] ; Opt-in online user reporting system
url = "http://feedback.wildfiregames.com/report/upload/v1/"
[view] ; Camera control settings
scroll.speed = 120.0
scroll.speed.modifier = 1.05 ; Multiplier for changing scroll speed
rotate.x.speed = 1.2
rotate.x.min = 28.0
rotate.x.max = 60.0
rotate.x.default = 35.0
rotate.y.speed = 2.0
rotate.y.speed.wheel = 0.45
rotate.y.default = 0.0
rotate.speed.modifier = 1.05 ; Multiplier for changing rotation speed
drag.speed = 0.5
zoom.speed = 256.0
zoom.speed.wheel = 32.0
zoom.min = 50.0
zoom.max = 200.0
zoom.default = 120.0
zoom.speed.modifier = 1.05 ; Multiplier for changing zoom speed
pos.smoothness = 0.1
zoom.smoothness = 0.4
rotate.x.smoothness = 0.5
rotate.y.smoothness = 0.3
near = 2.0 ; Near plane distance
far = 4096.0 ; Far plane distance
fov = 45.0 ; Field of view (degrees), lower is narrow, higher is wide
height.smoothness = 0.5
height.min = 16
+11
View File
@@ -0,0 +1,11 @@
;
; Developer configuration file
;
; NOTE: This is not read by the config system currently.
;
; This file is used by the engine to decide which mods are mounted, and in what
; order. The precense of this file suppresses loading of mods in the user mod
; path (see http://trac.wildfiregames.com/wiki/GameDataPaths) if the same mod is
; present in binaries/data/mods. It also implies -noUserMod.
; This is done to make saved maps end up in the right mod folder (and in the
; game-relative data path) to commit them later on.
+7 -1
View File
@@ -1,4 +1,7 @@
## List of key names that can be used in .cfg files for specifying hotkeys:
## This file documents keynames that can be used in .cfg files for specifying hotkeys
## Note: the keynames are not actually configured or implemented here
## Also note: if your keyboard supports keys that do not appear here (such as the French é letter),
## you should be able to use it directly.
Backspace, BkSp
Tab
@@ -146,3 +149,6 @@ Right Mouse Button, MouseRight
Middle Mouse Button, MouseMiddle
Mouse Wheel Up, WheelUp
Mouse Wheel Down, WheelDown
MouseButtonX, MouseNX # where X is a number 1-255, for extra mouse buttons
## (note that some mice start numbering their buttons at higher numbers
## so the first extra button on your mouse might be #8 here)
+8
View File
@@ -0,0 +1,8 @@
[main]
host = https://www.transifex.com
[0ad.engine]
file_filter = <lang>.engine.po
source_file = engine.pot
source_lang = en
+32
View File
@@ -0,0 +1,32 @@
[
{
"output": "engine.pot",
"inputRoot": "../../../source",
"project": "Pyrogenesis",
"copyrightHolder": "Wildfire Games",
"rules": [
{
"extractor": "cpp",
"filemasks": {
"includeMasks": ["**.cpp"],
"excludeMasks": ["third_party/**", "tools/**"]
},
"options": {
"format": "c-format",
"keywords": {
"Translate": [1],
"TranslatePlural": [1, 2],
"TranslateWithContext": [[1], 2],
"TranslatePluralWithContext": [[1], 2, 3],
"MarkForTranslation": [1],
"MarkForTranslationWithContext": [[1], 2]
},
"commentTags": [
"dennis-ignore:",
"Translation:"
]
}
}
]
}
]
@@ -9,7 +9,7 @@ uniform float shininess; // Blinn-Phong specular strength
uniform float specularStrength; // Scaling for specular reflection (specular color is (this,this,this))
uniform float waviness; // "Wildness" of the reflections and refractions; choose based on texture
uniform vec3 tint; // Tint for refraction (used to simulate particles in water)
uniform float murkiness; // Amount of tint to blend in with the refracted colour
uniform float murkiness; // Amount of tint to blend in with the refracted color
uniform float fullDepth; // Depth at which to use full murkiness (shallower water will be clearer)
uniform vec3 reflectionTint; // Tint for reflection (used for really muddy water)
uniform float reflectionTintStrength; // Strength of reflection tint (how much of it to mix in)
@@ -2,3 +2,44 @@ function GlobalSubtractionHelper(a, b)
{
return a-b;
}
function Vector2D(x, y)
{
if (arguments.length == 2)
{
this.x = x;
this.y = y;
}
else
this.x = this.y = 0;
}
Vector2D.prototype.add = function(v)
{
this.x += v.x;
this.y += v.y;
return this;
};
function Vector3D(x, y, z)
{
if (arguments.length == 3)
{
this.x = x;
this.y = y;
this.z = z;
}
else
this.x = this.y = this.z = 0;
}
Vector3D.prototype.add = function(v)
{
this.x += v.x;
this.y += v.y;
this.z += v.z;
return this;
};
// make the prototypes easily accessible to C++
const Vector2Dprototype = Vector2D.prototype;
const Vector3Dprototype = Vector3D.prototype;
@@ -0,0 +1,81 @@
<?xml version="1.0" encoding="UTF-8"?>
<element name="Pathfinder" xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
<a:documentation/>
<!--
NOTE: To modify this Relax NG grammar, edit the Relax NG Compact (.rnc) file
and use a converter tool like trang to generate the Relax NG XML (.rng) file
-->
<a:documentation/>
<interleave>
<element name="MaxSameTurnMoves">
<data type="nonNegativeInteger"/>
</element>
<element name="PassabilityClasses">
<oneOrMore>
<element>
<anyName/>
<interleave>
<optional>
<element name="MinWaterDepth">
<data type="decimal"/>
</element>
</optional>
<optional>
<!-- TODO: fixed type -->
<element name="MaxWaterDepth">
<data type="decimal"/>
</element>
</optional>
<optional>
<element name="MaxTerrainSlope">
<data type="decimal"/>
</element>
</optional>
<optional>
<element name="MinShoreDistance">
<data type="decimal"/>
</element>
</optional>
<optional>
<element name="MaxShoreDistance">
<data type="decimal"/>
</element>
</optional>
</interleave>
</element>
</oneOrMore>
</element>
<element name="MovementClasses">
<oneOrMore>
<element>
<anyName/>
<interleave>
<attribute name="Speed">
<data type="decimal"/>
</attribute>
<attribute name="Cost">
<data type="decimal"/>
</attribute>
<optional>
<element name="UnitClasses">
<zeroOrMore>
<element>
<anyName/>
<interleave>
<attribute name="Speed">
<data type="decimal"/>
</attribute>
<attribute name="Cost">
<data type="decimal"/>
</attribute>
</interleave>
</element>
</zeroOrMore>
</element>
</optional>
</interleave>
</element>
</oneOrMore>
</element>
</interleave>
</element>
@@ -1,6 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<Pathfinder>
<!-- Sets limit on the number of same turns moves we will process -->
<!-- Setting the value to 0 disable this functionality -->
<MaxSameTurnMoves>64</MaxSameTurnMoves>
<PassabilityClasses>
<!-- Unit pathfinding classes: -->
<unrestricted/>
<default>
<MaxWaterDepth>2</MaxWaterDepth>
<MaxTerrainSlope>1.0</MaxTerrainSlope>
@@ -8,8 +15,37 @@
<ship>
<MinWaterDepth>1</MinWaterDepth>
</ship>
<!-- Building construction classes:
* Land is used for most buildings, which must be away
from water and not on cliffs or mountains.
* Shore is used for docks, which must be near water and
land, yet shallow enough for builders to approach.
-->
<building-land>
<MaxWaterDepth>0</MaxWaterDepth>
<MinShoreDistance>1.0</MinShoreDistance>
<MaxTerrainSlope>1.0</MaxTerrainSlope>
</building-land>
<building-shore>
<MaxShoreDistance>2.0</MaxShoreDistance>
<MaxTerrainSlope>1.25</MaxTerrainSlope>
</building-shore>
</PassabilityClasses>
<!--
Warning: Movement costs are a subtle tradeoff between
pathfinding accuracy and computation cost. Be extremely
careful if you change them.
(Speeds are safer to change, but ought to be kept roughly
in sync with costs.)
-->
<MovementClasses>
<default Speed="1.0" Cost="1.08"/>
<city Speed="1.0" Cost="1.0">
<UnitClasses>
<infantry Speed="1.4" Cost="0.6"/>
</UnitClasses>
</city>
</MovementClasses>
</Pathfinder>
@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<element name="TerritoryManager" xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
<a:documentation/>
<!--
NOTE: To modify this Relax NG grammar, edit the Relax NG Compact (.rnc) file
and use a converter tool like trang to generate the Relax NG XML (.rng) file
-->
<a:documentation/>
<interleave>
<element name="ImpassableCost">
<data type="integer">
<param name="minInclusive">0</param>
<param name="maxInclusive">255</param>
</data>
</element>
<element name="BorderThickness">
<data type="decimal"/>
</element>
<element name="BorderSeparation">
<data type="decimal"/>
</element>
</interleave>
</element>
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<TerritoryManager>
<ImpassableCost>4</ImpassableCost>
<BorderThickness>0.5</BorderThickness>
<BorderSeparation>0.55</BorderSeparation>
<BorderThickness>0.75</BorderThickness>
<BorderSeparation>0.85</BorderSeparation>
</TerritoryManager>
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity>
<Test2A datatype="tokens">
a b c
</Test2A>
</Entity>
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="inherit_a">
<Test2A datatype="tokens">
d
</Test2A>
</Entity>
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity>
<Test2A a="b">
a b c
</Test2A>
</Entity>
@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="inherit_c">
<Test2A c="d"/>
</Entity>
@@ -3,5 +3,6 @@
<VisualActor>
<SilhouetteDisplay>false</SilhouetteDisplay>
<SilhouetteOccluder>false</SilhouetteOccluder>
<VisibleInAtlasOnly>false</VisibleInAtlasOnly>
</VisualActor>
</Entity>
@@ -0,0 +1,44 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity filtered="">
<AIProxy merge=""/>
<Armour merge=""/>
<BuildRestrictions merge=""/>
<!-- Don't provide population bonuses yet (but still do take up population cost) -->
<Cost merge="">
<PopulationBonus>0</PopulationBonus>
</Cost>
<Decay merge=""/>
<Health>
<Initial>1</Initial>
</Health>
<Fogging merge=""/>
<Footprint merge=""/>
<!-- Add the Foundation component, to deal with the construction process -->
<Foundation replace=""/>
<Health merge=""/>
<Identity merge=""/>
<!-- Foundations shouldn't initially block unit movement -->
<Obstruction merge="">
<DisableBlockMovement>true</DisableBlockMovement>
<DisableBlockPathfinding>true</DisableBlockPathfinding>
</Obstruction>
<OverlayRenderer merge=""/>
<Ownership merge=""/>
<Position merge=""/>
<RallyPoint merge=""/>
<RallyPointRenderer merge=""/>
<Selectable merge=""/>
<Sound merge=""/>
<StatusBars merge=""/>
<Visibility merge=""/>
<!-- Foundations should be visible themselves in fog-of-war if their base template is,
but shouldn't have any vision range -->
<Vision merge="">
<Range>0</Range>
<RevealShore merge="">false</RevealShore>
</Vision>
<!-- Switch the actor to foundation mode -->
<VisualActor>
<Foundation/>
</VisualActor>
</Entity>
@@ -4,6 +4,7 @@
<Actor>example</Actor>
<SilhouetteDisplay>false</SilhouetteDisplay>
<SilhouetteOccluder>false</SilhouetteOccluder>
<VisibleInAtlasOnly>false</VisibleInAtlasOnly>
</VisualActor>
<Selectable/>
<Position>
@@ -4,6 +4,7 @@
<Actor>example</Actor>
<SilhouetteDisplay>false</SilhouetteDisplay>
<SilhouetteOccluder>false</SilhouetteOccluder>
<VisibleInAtlasOnly>false</VisibleInAtlasOnly>
</VisualActor>
<Selectable/>
<Position>
+19
View File
@@ -0,0 +1,19 @@
The files in this directory are Copyright (C) 2014 Wildfire Games.
These files are licensed under the Creative Commons Attribution-Share Alike 3.0
(CC-by-sa) license, available at http://creativecommons.org/licenses/by-sa/3.0/
Briefly, this means:
* You may use, modify and distribute these files, for commercial and
non-commercial purposes.
* If you distribute one of these files, you must include attribution (e.g.
in the credits screen of a game or a video, or in a text file accompanying
the files). The attribution must include:
* A link to http://creativecommons.org/licenses/by-sa/3.0/
* The name "Wildfire Games" as the original author
* A link to http://www.wildfiregames.com/
* If you distribute one of these files, you must release it (and any
modifications you have made to it) under the CC-by-sa license.
@@ -0,0 +1,19 @@
namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0"
##
# NOTE: To modify this Relax NG grammar, edit the Relax NG Compact (.rnc) file
# and use a converter tool like trang to generate the Relax NG XML (.rng) file
##
element Textures {
element File {
attribute pattern { text }? &
attribute format { "dxt1" | "dxt3" | "dxt5" | "rgba" | "alpha" }? &
attribute mipmap { "true" | "false" }? &
attribute normal { "true" | "false" }? &
attribute alpha { "none" | "player" | "transparency" }? &
attribute filter { "box" | "triangle" | "kaiser" }? &
attribute kaiserwidth { xsd:float }? &
attribute kaiseralpha { xsd:float }? &
attribute kaiserstretch { xsd:float }?
}*
}
@@ -0,0 +1,78 @@
<?xml version="1.0" encoding="UTF-8"?>
<element name="Textures" xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
<a:documentation/>
<!--
NOTE: To modify this Relax NG grammar, edit the Relax NG Compact (.rnc) file
and use a converter tool like trang to generate the Relax NG XML (.rng) file
-->
<a:documentation/>
<zeroOrMore>
<element name="File">
<interleave>
<optional>
<attribute name="pattern"/>
</optional>
<optional>
<attribute name="format">
<choice>
<value>dxt1</value>
<value>dxt3</value>
<value>dxt5</value>
<value>rgba</value>
<value>alpha</value>
</choice>
</attribute>
</optional>
<optional>
<attribute name="mipmap">
<choice>
<value>true</value>
<value>false</value>
</choice>
</attribute>
</optional>
<optional>
<attribute name="normal">
<choice>
<value>true</value>
<value>false</value>
</choice>
</attribute>
</optional>
<optional>
<attribute name="alpha">
<choice>
<value>none</value>
<value>player</value>
<value>transparency</value>
</choice>
</attribute>
</optional>
<optional>
<attribute name="filter">
<choice>
<value>box</value>
<value>triangle</value>
<value>kaiser</value>
</choice>
</attribute>
</optional>
<optional>
<attribute name="kaiserwidth">
<data type="float"/>
</attribute>
</optional>
<optional>
<attribute name="kaiseralpha">
<data type="float"/>
</attribute>
</optional>
<optional>
<attribute name="kaiserstretch">
<data type="float"/>
</attribute>
</optional>
</interleave>
</element>
</zeroOrMore>
</element>
@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<Textures>
<File pattern="*" format="dxt5" mipmap="true" filter="box"/>
</Textures>
+19
View File
@@ -0,0 +1,19 @@
The files in this directory are Copyright (C) 2009 Wildfire Games.
These files are licensed under the Creative Commons Attribution-Share Alike 3.0
(CC-by-sa) license, available at http://creativecommons.org/licenses/by-sa/3.0/
Briefly, this means:
* You may use, modify and distribute these files, for commercial and
non-commercial purposes.
* If you distribute one of these files, you must include attribution (e.g.
in the credits screen of a game or a video, or in a text file accompanying
the files). The attribution must include:
* A link to http://creativecommons.org/licenses/by-sa/3.0/
* The name "Wildfire Games" as the original author
* A link to http://www.wildfiregames.com/
* If you distribute one of these files, you must release it (and any
modifications you have made to it) under the CC-by-sa license.
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8" standalone="no" ?>
<SoundGroup>
<Gain>1</Gain>
<Priority>100</Priority>
<ConeGain>1</ConeGain>
<Looping>0</Looping>
<RandOrder>1</RandOrder>
<RandGain>1</RandGain>
<RandPitch>1</RandPitch>
<Threshold>1</Threshold>
<Path>audio/interface/ui</Path>
<Sound>ui_button_click.ogg</Sound>
<Sound>ui_button_longclick.ogg</Sound>
</SoundGroup>
@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8" standalone="no" ?>
<SoundGroup>
<Gain>1</Gain>
<Priority>100</Priority>
<ConeGain>1</ConeGain>
<Looping>0</Looping>
<RandOrder>1</RandOrder>
<RandGain>1</RandGain>
<RandPitch>1</RandPitch>
<Threshold>1</Threshold>
<Path>audio/interface/ui</Path>
<Sound>ui_button_longclick.ogg</Sound>
</SoundGroup>
@@ -0,0 +1,36 @@
namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0"
##
# NOTE: To modify this Relax NG grammar, edit the Relax NG Compact (.rnc) file
# and use a converter tool like trang to generate the Relax NG XML (.rng) file
##
##
# Types #
##
flag = "0" | "1"
start = SoundGroup
SoundGroup = element SoundGroup {
element Gain { xsd:float }? &
element Looping { flag }? &
element Omnipresent { flag }? &
element HeardBy { "owner" }? &
element Distanceless { flag }? &
element Pitch { xsd:float }? &
element Priority { xsd:float }? &
element RandOrder { flag }? &
element RandGain { flag }? &
element GainUpper { xsd:float }? &
element GainLower { xsd:float }? &
element RandPitch { flag }? &
element PitchUpper { xsd:float }? &
element PitchLower { xsd:float }? &
element ConeGain { xsd:float }? &
element ConeInner { xsd:float }? &
element ConeOuter { xsd:float }? &
element Threshold { xsd:float }? &
element Decay { xsd:float }? &
element Sound { text }+ &
element Path { text }
}
@@ -0,0 +1,130 @@
<?xml version="1.0" encoding="UTF-8"?>
<grammar xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
<define name="flag">
<a:documentation/>
<!--
NOTE: To modify this Relax NG grammar, edit the Relax NG Compact (.rnc) file
and use a converter tool like trang to generate the Relax NG XML (.rng) file
-->
<a:documentation/>
<a:documentation/>
<!-- Types # -->
<a:documentation/>
<choice>
<value>0</value>
<value>1</value>
</choice>
</define>
<start>
<ref name="SoundGroup"/>
</start>
<define name="SoundGroup">
<element name="SoundGroup">
<interleave>
<optional>
<element name="Gain">
<data type="float"/>
</element>
</optional>
<optional>
<element name="Looping">
<ref name="flag"/>
</element>
</optional>
<optional>
<element name="Omnipresent">
<ref name="flag"/>
</element>
</optional>
<optional>
<element name="HeardBy">
<value>owner</value>
</element>
</optional>
<optional>
<element name="Distanceless">
<ref name="flag"/>
</element>
</optional>
<optional>
<element name="Pitch">
<data type="float"/>
</element>
</optional>
<optional>
<element name="Priority">
<data type="float"/>
</element>
</optional>
<optional>
<element name="RandOrder">
<ref name="flag"/>
</element>
</optional>
<optional>
<element name="RandGain">
<ref name="flag"/>
</element>
</optional>
<optional>
<element name="GainUpper">
<data type="float"/>
</element>
</optional>
<optional>
<element name="GainLower">
<data type="float"/>
</element>
</optional>
<optional>
<element name="RandPitch">
<ref name="flag"/>
</element>
</optional>
<optional>
<element name="PitchUpper">
<data type="float"/>
</element>
</optional>
<optional>
<element name="PitchLower">
<data type="float"/>
</element>
</optional>
<optional>
<element name="ConeGain">
<data type="float"/>
</element>
</optional>
<optional>
<element name="ConeInner">
<data type="float"/>
</element>
</optional>
<optional>
<element name="ConeOuter">
<data type="float"/>
</element>
</optional>
<optional>
<element name="Threshold">
<data type="float"/>
</element>
</optional>
<optional>
<element name="Decay">
<data type="float"/>
</element>
</optional>
<oneOrMore>
<element name="Sound">
<text/>
</element>
</oneOrMore>
<element name="Path">
<text/>
</element>
</interleave>
</element>
</define>
</grammar>
File diff suppressed because it is too large Load Diff
Binary file not shown.
File diff suppressed because it is too large Load Diff
Binary file not shown.
File diff suppressed because it is too large Load Diff
Binary file not shown.
File diff suppressed because it is too large Load Diff
Binary file not shown.
File diff suppressed because it is too large Load Diff
Binary file not shown.
File diff suppressed because it is too large Load Diff
Binary file not shown.
File diff suppressed because it is too large Load Diff
Binary file not shown.
File diff suppressed because it is too large Load Diff

Some files were not shown because too many files have changed in this diff Show More