Compare commits

839 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
3897 changed files with 56170 additions and 29515 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"
}
}
}
}
-3
View File
@@ -79,6 +79,3 @@ in particular, let us know and we can try to clarify it.
/source/tools/atlas
GPL version 2 (or later) - see license_gpl-2.0.txt
/binaries/data/mods/public/globalscripts/BicubicInterpolation.js
MIT 2013 Hugh Kennedy - see license_mit.txt
+43 -16
View File
@@ -29,12 +29,6 @@ windowed = false
; Show detailed tooltips (Unit stats)
showdetailedtooltips = false
; Enable/disable the splashscreen
splashscreendisable = false
; Splashscreen version (date of last modification). By default, 0 to force splashscreen to appear at first launch.
splashscreenversion = 0
; Pause the game on window focus loss (Only applicable to single player mode)
pauseonfocusloss = true
@@ -114,7 +108,7 @@ 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)
; 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.
@@ -131,6 +125,9 @@ forcealphatest = false
; Color of the sky (in "r g b" format)
skycolor = "0 0 0"
[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
@@ -163,16 +160,17 @@ console.toggle = BackQuote, F9 ; Open/close console
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
session.gui.toggle = "Alt+G" ; Toggle visibility of session GUI
menu.toggle = "F10" ; Toggle in-game menu
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
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
quicksave = "Shift+F5"
@@ -300,6 +298,11 @@ deselectgroup = Ctrl ; Modifier to deselect units when clicking group ic
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
@@ -328,19 +331,31 @@ move.right = "Ctrl+RightArrow" ; Move cursor to start of word to the right of
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.menu]
limitfps = true ; Limit FPS in the menus and loading screen
[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]
attacknotificationmessage = true ; Show attack notification messages
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
@@ -353,23 +368,35 @@ zoom.in = 5
zoom.out = 4
[chat]
timestamp = false ; Show time chat message was posted
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 = "arena21" ; Default MUC room to join
room = "arena22" ; Default MUC room to join
server = "lobby.wildfiregames.com" ; Address of lobby server
xpartamupp = "wfgbot21" ; Name of the server-side xmpp client that manage games
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.
lateobserverjoins = false ; Allow observers to join the game after it started
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]
+2 -98
View File
@@ -1,5 +1,7 @@
## 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
@@ -150,101 +152,3 @@ 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)
## Special keys for international and non-QWERTY keyboards:
World0, W0
World1, W1
World2, W2
World3, W3
World4, W4
World5, W5
World6, W6
World7, W7
World8, W8
World9, W9
World10, W10
World11, W11
World12, W12
World13, W13
World14, W14
World15, W15
World16, W16
World17, W17
World18, W18
World19, W19
World20, W20
World21, W21
World22, W22
World23, W23
World24, W24
World25, W25
World26, W26
World27, W27
World28, W28
World29, W29
World30, W30
World31, W31
World32, W32
World33, W33
World34, W34
World35, W35
World36, W36
World37, W37
World38, W38
World39, W39
World40, W40
World41, W41
World42, W42
World43, W43
World44, W44
World45, W45
World46, W46
World47, W47
World48, W48
World49, W49
World50, W50
World51, W51
World52, W52
World53, W53
World54, W54
World55, W55
World56, W56
World57, W57
World58, W58
World59, W59
World60, W60
World61, W61
World62, W62
World63, W63
World64, W64
World65, W65
World66, W66
World67, W67
World68, W68
World69, W69
World70, W70
World71, W71
World72, W72
World73, W73
World74, W74
World75, W75
World76, W76
World77, W77
World78, W78
World79, W79
World80, W80
World81, W81
World82, W82
World83, W83
World84, W84
World85, W85
World86, W86
World87, W87
World88, W88
World89, W89
World90, W90
World91, W91
World92, W92
World93, W93
World94, W94
World95, W95
+1
View File
@@ -22,6 +22,7 @@
"MarkForTranslationWithContext": [[1], 2]
},
"commentTags": [
"dennis-ignore:",
"Translation:"
]
}
@@ -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>
@@ -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>
@@ -11,4 +11,4 @@
<Path>audio/interface/ui</Path>
<Sound>ui_button_click.ogg</Sound>
<Sound>ui_button_longclick.ogg</Sound>
</SoundGroup>
</SoundGroup>
+58 -79
View File
@@ -1,88 +1,74 @@
var g_translations = {};
var g_pluralTranslations = {};
var g_translationsWithContext = {};
var g_pluralTranslationsWithContext = {};
/**
* These functions rely on the JS cache where possible and
* should be prefered over the Engine.Translate ones to optimize the performance.
*/
var g_Translations = {};
var g_PluralTranslations = {};
var g_TranslationsWithContext = {};
var g_PluralTranslationsWithContext = {};
// Checks if the specified variable is a string, and if it is, it checks that it
// is not empty.
function isNonEmptyString(variable)
function isTranslatableString(message)
{
if (typeof variable != "string")
return false;
else if (variable.trim())
return true;
else
return false;
return typeof message == "string" && !!message.trim();
}
// Translates the specified English message into the current language.
//
// This function relies on the g_translations cache when possible. You should use this function instead of
// Engine.Translate() whenever you can to minimize the number of C++ calls and string conversions involved.
/**
* Translates the specified English message into the current language.
*/
function translate(message)
{
var translation = g_translations[message];
if (!translation)
return g_translations[message] = Engine.Translate(message);
return translation;
if (!g_Translations[message])
g_Translations[message] = Engine.Translate(message);
return g_Translations[message];
}
// Translates the specified English message into the current language for the specified number.
//
// This function relies on the g_pluralTranslations cache when possible. You should use this function instead of
// Engine.TranslatePlural() whenever you can to minimize the number of C++ calls and string conversions involved.
/**
* Translates the specified English message into the current language for the specified number.
*/
function translatePlural(singularMessage, pluralMessage, number)
{
var translation = g_pluralTranslations[singularMessage];
if (!translation)
g_pluralTranslations[singularMessage] = {};
if (!g_PluralTranslations[singularMessage])
g_PluralTranslations[singularMessage] = {};
var pluralTranslation = g_pluralTranslations[singularMessage][number];
if (!pluralTranslation)
return g_pluralTranslations[singularMessage][number] = Engine.TranslatePlural(singularMessage, pluralMessage, number);
if (!g_PluralTranslations[singularMessage][number])
g_PluralTranslations[singularMessage][number] = Engine.TranslatePlural(singularMessage, pluralMessage, number);
return pluralTranslation;
return g_PluralTranslations[singularMessage][number];
}
// Translates the specified English message into the current language for the specified context.
//
// This function relies on the g_translationsWithContext cache when possible. You should use this function instead of
// Engine.TranslateWithContext() whenever you can to minimize the number of C++ calls and string conversions involved.
/**
* Translates the specified English message into the current language for the specified context.
*/
function translateWithContext(context, message)
{
var translationContext = g_translationsWithContext[context];
if (!translationContext)
g_translationsWithContext[context] = {}
if (!g_TranslationsWithContext[context])
g_TranslationsWithContext[context] = {}
var translationWithContext = g_translationsWithContext[context][message];
if (!translationWithContext)
return g_translationsWithContext[context][message] = Engine.TranslateWithContext(context, message);
if (!g_TranslationsWithContext[context][message])
g_TranslationsWithContext[context][message] = Engine.TranslateWithContext(context, message);
return translationWithContext;
return g_TranslationsWithContext[context][message];
}
// Translates the specified English message into the current language for the specified context and number.
//
// This function relies on the g_pluralTranslationsWithContext cache when possible. You should use this function instead of
// Engine.TranslatePluralWithContext() whenever you can to minimize the number of C++ calls and string conversions involved.
/**
* Translates the specified English message into the current language for the specified context and number.
*/
function translatePluralWithContext(context, singularMessage, pluralMessage, number)
{
var translationContext = g_pluralTranslationsWithContext[context];
if (!translationContext)
g_pluralTranslationsWithContext[context] = {};
if (!g_PluralTranslationsWithContext[context])
g_PluralTranslationsWithContext[context] = {};
var translationWithContext = g_pluralTranslationsWithContext[context][singularMessage];
if (!translationWithContext)
g_pluralTranslationsWithContext[context][singularMessage] = {};
if (!g_PluralTranslationsWithContext[context][singularMessage])
g_PluralTranslationsWithContext[context][singularMessage] = {};
var pluralTranslationWithContext = g_pluralTranslationsWithContext[context][singularMessage][number];
if (!pluralTranslationWithContext)
return g_pluralTranslationsWithContext[context][singularMessage][number] = Engine.TranslatePluralWithContext(context, singularMessage, pluralMessage, number);
if (!g_PluralTranslationsWithContext[context][singularMessage][number])
g_PluralTranslationsWithContext[context][singularMessage][number] =
Engine.TranslatePluralWithContext(context, singularMessage, pluralMessage, number);
return pluralTranslationWithContext;
return g_PluralTranslationsWithContext[context][singularMessage][number];
}
/**
@@ -99,28 +85,24 @@ function translatePluralWithContext(context, singularMessage, pluralMessage, num
*/
function translateMessageObject(object)
{
// the translation function
var trans = translate;
let trans = translate;
if (object.context)
trans = function(msg) { return translateWithContext(object.context, msg);};
trans = msg => translateWithContext(object.context, msg);
if (object.message)
object = trans(object.message);
else if (object.list)
{
var translatedList = object.list.map(trans);
object = translatedList.join(translateWithContext("enumeration", ", "));
}
object = object.list.map(trans).join(translateWithContext("enumeration", ", "));
return object;
}
/**
* Translates any string value in the specified JavaScript object
* Translates any string value in the specified JavaScript object
* that is associated with a key included in the specified keys array.
*
* it accepts an object in the form of
*
*
* {
* translatedString1: "my first message",
* unTranslatedString1: "some English string",
@@ -139,7 +121,7 @@ function translateMessageObject(object)
* }
*
* Together with a keys list to translate the strings and objects
* ["translatedString1", "translatedString2", "translatedObject1",
* ["translatedString1", "translatedString2", "translatedObject1",
* "translatedObject2"]
*
* The result will be (f.e. in Dutch)
@@ -151,30 +133,28 @@ function translateMessageObject(object)
* unTranslatedString2: "some English string"
* },
* translatedObject1: "mijn derde bericht",
* translatedObject2: "lijst, van, teksten",
* translatedObject2: "lijst, van, teksten",
* }
*
* So you see that the keys array can also contain lower-level keys,
* And that you can include objects in the keys array to translate
* And that you can include objects in the keys array to translate
* them with a context, or to join a list of translations.
*
* Also, the keys array may be an object where properties are keys to translate
* and values are translation contexts to use for each key.
*/
function translateObjectKeys(object, keys) {
// If keys is an array, simply translate.
function translateObjectKeys(object, keys)
{
if (keys instanceof Array)
{
for (var property in object)
for (let property in object)
{
if (keys.indexOf(property) > -1)
{
if (isNonEmptyString(object[property]))
if (isTranslatableString(object[property]))
object[property] = translate(object[property]);
else if (object[property] instanceof Object)
{
object[property] = translateMessageObject(object[property]);
}
}
else if (object[property] instanceof Object)
translateObjectKeys(object[property], keys);
@@ -185,11 +165,11 @@ function translateObjectKeys(object, keys) {
// An empty value means no context.
else
{
for (var property in object)
for (let property in object)
{
if (property in keys)
{
if (isNonEmptyString(object[property]))
if (isTranslatableString(object[property]))
if (keys[property])
object[property] = translateWithContext(keys[property], object[property]);
else
@@ -226,4 +206,3 @@ function markForPluralTranslation(singularMessage, pluralMessage, number)
"pluralCount": number
};
}
@@ -223,4 +223,4 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
})
}
}
})(typeof window === "undefined" ? this : window);
})(typeof window === "undefined" ? this : window);
@@ -15,6 +15,7 @@
sprite_back_vertical = "ModernScrollBack"
sprite_bar_vertical = "ModernScrollBar"
/>
<!--
==========================================
- TOOLTIPS -
@@ -30,6 +31,18 @@
sprite="BlackBorderOnGray"
textcolor="255 255 255"
/>
<tooltip name="sliderTooltip"
anchor="top"
buffer_zone="4"
delay="0"
font="sans-14"
maxwidth="300"
offset="16 32"
sprite="BlackBorderOnGray"
textcolor="255 255 255"
/>
<!--
==========================================
- COLORS -
@@ -199,6 +199,22 @@
size = "0 1 100% 100%-1"
/>
</sprite>
<sprite name="ModernDarkBoxGoldDisabled">
<effect grayscale=""/>
<!-- borders -->
<image texture = "global/modern/gold-separator.png"
real_texture_placement = "0 0 806 1"
size = "0 0 100% 1"
/>
<image texture = "global/modern/gold-separator.png"
real_texture_placement = "0 0 806 1"
size = "0 100%-1 100% 100%"
/>
<!-- background -->
<image backcolor = "12 12 12 100"
size = "0 1 100% 100%-1"
/>
</sprite>
<sprite name="ModernDarkBoxWhite">
<!-- borders -->
<image texture = "global/modern/white-separator.png"
@@ -729,6 +745,14 @@
size="0 6 16 22"
/>
</sprite>
<sprite name = "ModernDropDownArrowDisabled">
<effect grayscale=""/>
<image texture = "global/modern/dropdown-arrow.png"
real_texture_placement = "0 0 16 16"
texture_size="0 0 16 16"
size="0 6 16 22"
/>
</sprite>
<sprite name = "ModernNotSorted">
<image texture = "global/modern/arrow-up-down.png"
real_texture_placement = "0 0 16 16"
@@ -798,4 +822,16 @@
texture_size="0 0 24 24"
/>
</sprite>
<sprite name="ModernSliderButton">
<image texture="global/modern/tick-on.png"
real_texture_placement="0 0 27 27"
size="50%-10 50%-10 50%+11 50%+11"
/>
</sprite>
<sprite name="ModernSliderLine">
<image texture="global/modern/gold-separator.png"
real_texture_placement="0 0 806 1"
size="0 50%-1 100% 50%+1"
/>
</sprite>
</sprites>
@@ -59,8 +59,10 @@
text_valign="center"
sprite="ModernDarkBoxGold"
sprite_disabled="ModernDarkBoxGoldDisabled"
button_width="16"
sprite2="ModernDropDownArrow"
sprite2_disabled="ModernDropDownArrowDisabled"
sprite2_pressed="ModernDropDownArrowHighlight"
buffer_zone="8"
@@ -68,6 +70,7 @@
sprite_list="BlackBorderOnGray"
sprite_selectarea="ModernDarkBoxWhite"
textcolor_selected="white"
textcolor_disabled="140 140 140 255"
scrollbar="true"
scrollbar_style="ModernScrollBar"
@@ -79,18 +82,21 @@
<style name="ModernLabelText"
font="sans-bold-stroke-14"
textcolor="white"
textcolor_disabled="140 140 140 255"
text_align="center"
text_valign="center"
/>
<style name="ModernRightLabelText"
font="sans-bold-stroke-14"
textcolor="white"
textcolor_disabled="140 140 140 255"
text_align="right"
text_valign="center"
/>
<style name="ModernLeftLabelText"
font="sans-bold-stroke-14"
textcolor="white"
textcolor_disabled="140 140 140 255"
text_align="left"
text_valign="center"
/>
@@ -134,6 +140,12 @@
square_side="22"
sound_pressed="audio/interface/ui/ui_button_click.ogg"
/>
<style name="ModernSlider"
sprite="ModernSliderButton"
sprite_bar="ModernSliderLine"
button_width="20"
tooltip_style="sliderTooltip"
/>
<style name="ModernButtonRed"
sprite="ModernButtonRed"
sprite_disabled="ModernButtonRedDisabled"
@@ -141,6 +153,7 @@
sprite_pressed="ModernButtonRed"
font="sans-bold-stroke-14"
textcolor="white"
textcolor_disabled="210 210 210 160"
text_align="center"
text_valign="center"
sound_pressed="audio/interface/ui/ui_button_click.ogg"
+3 -1
View File
@@ -71,6 +71,7 @@ ex_settings =
attribute scrollbar { bool }?&
attribute scrollbar_style { text }?&
attribute scroll_bottom { bool }?&
attribute scroll_top { bool }?&
attribute selected_column { text }?&
attribute selected_column_order { text }?&
attribute sortable { bool }?&
@@ -151,7 +152,8 @@ column =
attribute id { text }&
attribute color { ccolor }?&
attribute heading { text }?&
attribute width { text }?
attribute width { text }?&
attribute hidden { bool }?
)
}
\include =
+22 -10
View File
@@ -289,6 +289,11 @@
<ref name="bool"/>
</attribute>
</optional>
<optional>
<attribute name="scroll_top">
<ref name="bool"/>
</attribute>
</optional>
<optional>
<attribute name="selected_column"/>
</optional>
@@ -296,7 +301,9 @@
<attribute name="selected_column_order"/>
</optional>
<optional>
<attribute name="sortable"/>
<attribute name="sortable">
<ref name="bool"/>
</attribute>
</optional>
<optional>
<attribute name="sound_closed"/>
@@ -325,6 +332,9 @@
<optional>
<attribute name="sprite2"/>
</optional>
<optional>
<attribute name="sprite_asc"/>
</optional>
<optional>
<attribute name="sprite_heading"/>
</optional>
@@ -334,6 +344,9 @@
<optional>
<attribute name="sprite_background"/>
</optional>
<optional>
<attribute name="sprite_desc"/>
</optional>
<optional>
<attribute name="sprite_disabled"/>
</optional>
@@ -343,6 +356,9 @@
<optional>
<attribute name="sprite2_disabled"/>
</optional>
<optional>
<attribute name="sprite_not_sorted"/>
</optional>
<optional>
<attribute name="sprite_over"/>
</optional>
@@ -358,15 +374,6 @@
<optional>
<attribute name="sprite_selectarea"/>
</optional>
<optional>
<attribute name="sprite_asc"/>
</optional>
<optional>
<attribute name="sprite_desc"/>
</optional>
<optional>
<attribute name="sprite_not_sorted"/>
</optional>
<optional>
<attribute name="square_side">
<data type="decimal"/>
@@ -501,6 +508,11 @@
<optional>
<attribute name="width"/>
</optional>
<optional>
<attribute name="hidden">
<ref name="bool"/>
</attribute>
</optional>
</interleave>
</element>
</define>
+21 -8
View File
@@ -192,7 +192,7 @@ function generateModsList(listObjectName, mods)
});
// Update the list
var obj = Engine.GetGUIObjectByName(listObjectName);
var obj = Engine.GetGUIObjectByName(listObjectName);
obj.list_name = names;
obj.list_modFolderName = folders;
obj.list_modLabel = labels;
@@ -269,19 +269,32 @@ function disableMod()
function resetFilters()
{
// Reset states of gui objects.
Engine.GetGUIObjectByName("modTypeFilter").selected = 0;
Engine.GetGUIObjectByName("negateFilter").checked = false;
Engine.GetGUIObjectByName("modGenericFilter").caption = "";
Engine.GetGUIObjectByName("negateFilter").checked = false;
// NOTE: Calling generateModsLists() is not needed as the selection changes and that calls applyFilters()
Engine.GetGUIObjectByName("modTypeFilter").selected = 0;
}
function applyFilters()
{
Engine.GetGUIObjectByName("modsAvailableList").selected = -1;
Engine.GetGUIObjectByName("modsEnabledList").selected = -1;
// Save selected rows
let modsAvailableList = Engine.GetGUIObjectByName("modsAvailableList");
let modsEnabledList = Engine.GetGUIObjectByName("modsEnabledList");
let selectedModAvailableFolder = modsAvailableList.list_modFolderName[modsAvailableList.selected];
let selectedModEnabledFolder = modsEnabledList.list_modFolderName[modsEnabledList.selected];
// Remove selected rows to prevent a link to a non existing item
modsAvailableList.selected = -1;
modsEnabledList.selected = -1;
generateModsLists();
// Restore previously selected rows
modsAvailableList.selected = modsAvailableList.list_modFolderName.indexOf(selectedModAvailableFolder);
modsEnabledList.selected = modsEnabledList.list_modFolderName.indexOf(selectedModEnabledFolder);
Engine.GetGUIObjectByName("globalModDescription").caption = "";
}
/**
@@ -360,7 +373,7 @@ function moveCurrItem(objectName, up)
function areDependenciesMet(mod)
{
var guiObject = Engine.GetGUIObjectByName("message");
for each (var dependency in g_mods[mod].dependencies)
for (var dependency of g_mods[mod].dependencies)
{
if (isDependencyMet(dependency))
continue;
@@ -397,7 +410,7 @@ function isDependencyMet(dependency_idAndVersion, modsEnabled = null)
var dependency_id = dependency_idAndVersion;
// modsEnabled_key currently is the mod folder name.
for each (var modsEnabled_key in modsEnabled)
for (var modsEnabled_key of modsEnabled)
{
var modJson = g_mods[modsEnabled_key];
if (modJson.name != dependency_id)
+5 -5
View File
@@ -1,4 +1,4 @@
/* Copyright (c) 2015 Wildfire Games
/* Copyright (C) 2015 Wildfire Games.
*
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of this software and associated documentation files (the
@@ -7,10 +7,10 @@
* distribute, sublicense, and/or sell copies of the Software, and to
* permit persons to whom the Software is furnished to do so, subject to
* the following conditions:
*
*
* The above copyright notice and this permission notice shall be included
* in all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
@@ -230,7 +230,7 @@ function RunDetection(settings)
}
// Disable most graphics features on software renderers
if (GL_RENDERER.match(/^(Software Rasterizer|Gallium \S* on (llvm|soft)pipe.*|Mesa X11|Apple Software Renderer|GDI Generic)$/))
if (GL_RENDERER.match(/^(Software Rasterizer|.*(llvm|soft)pipe.*|Mesa X11|Apple Software Renderer|GDI Generic)$/))
{
warnings.push("You are using '" + GL_RENDERER + "' graphics driver, expect very poor performance!");
warnings.push("If possible install a proper graphics driver for your hardware.");
@@ -364,7 +364,7 @@ global.RunHardwareDetection = function(settings)
if (output.disable_allwater !== undefined)
Engine.SetDisableAllWater(output.disable_allwater);
if (output.disable_fancywater !== undefined)
Engine.SetDisableFancyWater(output.disable_fancywater);
+2 -2
View File
@@ -22,14 +22,14 @@ hwdetectTestData.sort(function(a, b) {
return 0;
});
for each (var settings in hwdetectTestData)
for (var settings of hwdetectTestData)
{
var output = RunDetection(settings);
var os = (settings.os_linux ? "linux" : settings.os_macosx ? "macosx" : settings.os_win ? "win" : "???");
var disabled = [];
for each (var d in ["disable_audio", "disable_s3tc", "disable_shadows", "disable_shadowpcf", "disable_allwater", "disable_fancywater", "override_renderpath"])
for (var d of ["disable_audio", "disable_s3tc", "disable_shadows", "disable_shadowpcf", "disable_allwater", "disable_fancywater", "override_renderpath"])
if (output[d] !== undefined)
disabled.push(d+"="+output[d])
@@ -38,6 +38,7 @@ element actor {
element animations {
element animation {
attribute name { text } &
attribute id { text }? &
attribute frequency { xsd:nonNegativeInteger }? &
attribute file { text }? &
attribute speed { xsd:nonNegativeInteger } &
@@ -93,6 +93,9 @@
<element name="animation">
<interleave>
<attribute name="name"/>
<optional>
<attribute name="id"/>
</optional>
<optional>
<attribute name="frequency">
<data type="nonNegativeInteger"/>
@@ -5,18 +5,26 @@
<variant frequency="100" name="Base">
<mesh>skeletal/pig.dae</mesh>
<props>
<prop actor="particle/flame_catapult.xml" attachpoint="root"/>
<prop actor="particle/smoke.xml" attachpoint="root"/>
<prop actor="particle/flame_pig.xml" attachpoint="root"/>
<prop actor="particle/smoke_blacksmith.xml" attachpoint="root"/>
</props>
<textures><texture file="skeletal/animal_pig_a.dds" name="baseTex"/></textures>
</variant>
</group>
<group>
<variant frequency="100" name="Idle"/>
<variant name="healthy" frequency="1">
<textures><texture file="skeletal/animal_pig_b.png" name="baseTex"/></textures>
</variant>
<variant name="lightDamage">
<textures><texture file="skeletal/animal_pig_c.png" name="baseTex"/></textures>
</variant>
<variant name="mediumDamage">
<textures><texture file="skeletal/animal_pig_d.png" name="baseTex"/></textures>
</variant>
<variant name="heavyDamage">
<textures><texture file="skeletal/animal_pig_e.png" name="baseTex"/></textures>
</variant>
<variant name="death">
<props>
<prop actor="props/units/blood_01.xml" attachpoint="root"/>
</props>
<textures><texture file="skeletal/animal_pig_e.png" name="baseTex"/></textures>
</variant>
</group>
</actor>
@@ -17,7 +17,10 @@
</group>
<group>
<variant frequency="1" name="standard">
<textures><texture file="skeletal/animal_rhino.png" name="baseTex"/></textures>
<textures>
<texture file="skeletal/animal_rhino.png" name="baseTex"/>
<texture file="skeletal/animal_rhino_spec.png" name="specTex"/>
</textures>
</variant>
</group>
<group>
@@ -28,4 +31,5 @@
</props>
</variant>
</group>
<material>basic_specmap.xml</material>
</actor>
@@ -5,14 +5,14 @@
<group>
<variant frequency="100" name="Mesh">
<animations>
<animation file="other/whale_fin_idle_a.dae" name="Idle" speed="5"/>
<animation file="other/whale_fin_idle_a.dae" name="Idle" speed="6"/>
<animation file="other/whale_fin_idle_b.dae" name="Idle" speed="5"/>
<animation file="other/whale_fin_idle_b.dae" name="Idle" speed="5"/>
<animation file="other/whale_fin_idle_c.dae" name="Idle" speed="5"/>
<animation file="other/whale_fin_idle_c.dae" name="Idle" speed="7"/>
<animation file="other/whale_fin_idle_d.dae" name="Idle" speed="6"/>
<animation file="other/whale_fin_idle_d.dae" name="Idle" speed="5"/>
<animation file="other/whale_fin_idle_a.dae" name="Idle" speed="2"/>
<animation file="other/whale_fin_idle_a.dae" name="Idle" speed="3"/>
<animation file="other/whale_fin_idle_b.dae" name="Idle" speed="2"/>
<animation file="other/whale_fin_idle_b.dae" name="Idle" speed="3"/>
<animation file="other/whale_fin_idle_c.dae" name="Idle" speed="2"/>
<animation file="other/whale_fin_idle_c.dae" name="Idle" speed="3"/>
<animation file="other/whale_fin_idle_d.dae" name="Idle" speed="3"/>
<animation file="other/whale_fin_idle_d.dae" name="Idle" speed="2"/>
</animations>
<mesh>skeletal/whale_fin.dae</mesh>
</variant>
@@ -0,0 +1,49 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="2" name="Cretan-Date-Palm-02">
<mesh>gaia/tree_cretan_date_palm_02.dae</mesh>
</variant>
<variant frequency="3" name="Cretan-Date-Palm-04">
<mesh>gaia/tree_cretan_date_palm_04.dae</mesh>
</variant>
<variant frequency="3" name="Cretan-Date-Palm-05">
<mesh>gaia/tree_cretan_date_palm_05.dae</mesh>
</variant>
<variant frequency="0" name="Weird_Crooked_One">
<mesh>gaia/tree_cretan_date_palm_08.dae</mesh>
</variant>
</group>
<group>
<variant frequency="1" name="Palm Fronds-a">
<textures>
<texture file="gaia/tree_palm_senegal_a.dds" name="baseTex"/>
<texture file="gaia/tree_palm_senegal_spec.png" name="specTex"/>
<texture file="gaia/tree_palm_senegal_norm.png" name="normTex"/>
</textures>
</variant>
<variant frequency="1" name="Palm Fronds-b">
<textures>
<texture file="gaia/tree_palm_senegal_b.dds" name="baseTex"/>
<texture file="gaia/tree_palm_senegal_spec.png" name="specTex"/>
<texture file="gaia/tree_palm_senegal_norm.png" name="normTex"/>
</textures>
</variant>
<variant frequency="1" name="Palm Fronds-c">
<textures>
<texture file="gaia/tree_palm_senegal_c.dds" name="baseTex"/>
<texture file="gaia/tree_palm_senegal_spec.png" name="specTex"/>
<texture file="gaia/tree_palm_senegal_norm.png" name="normTex"/>
</textures>
</variant>
<variant frequency="1" name="Palm Fronds-d">
<textures>
<texture file="gaia/tree_palm_senegal_d.dds" name="baseTex"/>
<texture file="gaia/tree_palm_senegal_spec.png" name="specTex"/>
<texture file="gaia/tree_palm_senegal_norm.png" name="normTex"/>
</textures>
</variant>
</group>
<material>trans_wind_parallax_spec.xml</material>
</actor>
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<group>
<variant name="Base">
<particles file="flame_pig.xml"/>
</variant>
</group>
<material>basic_trans.xml</material>
</actor>
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<group>
<variant name="Base">
<particles file="sparks_blacksmith.xml"/>
</variant>
</group>
<material>basic_trans.xml</material>
</actor>
@@ -1,18 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<float/>
<group>
<variant frequency="100">
<mesh>props/special/marker_object_sound.dae</mesh>
</variant>
</group>
<group>
<variant name="base">
<textures>
<texture file="props/marker_object.png" name="baseTex"/>
</textures>
</variant>
</group>
<material>player_trans.xml</material>
</actor>
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="Base">
<mesh>props/Box.dae</mesh>
</variant>
</group>
<group>
<variant frequency="1" name="foundation">
<textures><texture file="structural/foundation.dds" name="baseTex"/></textures>
</variant>
</group>
</actor>
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="Base">
<mesh>props/Box_Pile.dae</mesh>
</variant>
</group>
<group>
<variant frequency="1" name="foundation">
<textures><texture file="structural/foundation.dds" name="baseTex"/></textures>
</variant>
</group>
</actor>
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="Base">
<mesh>props/Brick.dae</mesh>
</variant>
</group>
<group>
<variant frequency="1" name="foundation">
<textures><texture file="structural/foundation.dds" name="baseTex"/></textures>
</variant>
</group>
</actor>
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="Base">
<mesh>props/Brick_Pile1.dae</mesh>
</variant>
</group>
<group>
<variant frequency="1" name="foundation">
<textures><texture file="structural/foundation.dds" name="baseTex"/></textures>
</variant>
</group>
</actor>
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="Base">
<mesh>props/Brick_Pile2.dae</mesh>
</variant>
</group>
<group>
<variant frequency="1" name="foundation">
<textures><texture file="structural/foundation.dds" name="baseTex"/></textures>
</variant>
</group>
</actor>
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="Base">
<mesh>props/Brick_Pile3.dae</mesh>
</variant>
</group>
<group>
<variant frequency="1" name="foundation">
<textures><texture file="structural/foundation.dds" name="baseTex"/></textures>
</variant>
</group>
</actor>
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="Base">
<mesh>props/Brick_Pile4.dae</mesh>
</variant>
</group>
<group>
<variant frequency="1" name="foundation">
<textures><texture file="structural/foundation.dds" name="baseTex"/></textures>
</variant>
</group>
</actor>
@@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="Base">
<mesh>props/Brick_Pile_Big1.dae</mesh>
</variant>
</group>
<group>
<variant frequency="1" name="foundation">
<textures><texture file="structural/foundation.dds" name="baseTex"/></textures>
</variant>
</group>
</actor>
@@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="Base">
<mesh>props/Brick_Pile_Big2.dae</mesh>
</variant>
</group>
<group>
<variant frequency="1" name="foundation">
<textures><texture file="structural/foundation.dds" name="baseTex"/></textures>
</variant>
</group>
</actor>
@@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="Base">
<mesh>props/Brick_Pile_Big3.dae</mesh>
</variant>
</group>
<group>
<variant frequency="1" name="foundation">
<textures><texture file="structural/foundation.dds" name="baseTex"/></textures>
</variant>
</group>
</actor>
@@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="Base">
<mesh>props/Brick_Pile_Big4.dae</mesh>
</variant>
</group>
<group>
<variant frequency="1" name="foundation">
<textures><texture file="structural/foundation.dds" name="baseTex"/></textures>
</variant>
</group>
</actor>
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="Base">
<mesh>props/Delimitator.dae</mesh>
</variant>
</group>
<group>
<variant frequency="1" name="foundation">
<textures><texture file="structural/foundation.dds" name="baseTex"/></textures>
</variant>
</group>
</actor>
@@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="Base">
<mesh>props/plank_big.dae</mesh>
</variant>
</group>
<group>
<variant frequency="1" name="foundation">
<textures><texture file="structural/foundation.dds" name="baseTex"/></textures>
</variant>
</group>
</actor>
@@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="Base">
<mesh>props/plank_big_pile_a.dae</mesh>
</variant>
</group>
<group>
<variant frequency="1" name="foundation">
<textures><texture file="structural/foundation.dds" name="baseTex"/></textures>
</variant>
</group>
</actor>
@@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="Base">
<mesh>props/plank_big_pile_b.dae</mesh>
</variant>
</group>
<group>
<variant frequency="1" name="foundation">
<textures><texture file="structural/foundation.dds" name="baseTex"/></textures>
</variant>
</group>
</actor>
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="Base">
<mesh>props/Vase.dae</mesh>
</variant>
</group>
<group>
<variant frequency="1" name="foundation">
<textures><texture file="structural/foundation.dds" name="baseTex"/></textures>
</variant>
</group>
</actor>
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="Base">
<mesh>props/Object_pile.dae</mesh>
</variant>
</group>
<group>
<variant frequency="1" name="foundation">
<textures><texture file="structural/iber_struct.dds" name="baseTex"/></textures>
</variant>
</group>
</actor>
@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="foundation 4x2 A">
<mesh>props/wrld_wood_a.dae</mesh>
<textures><texture file="props/wrld_wood_1.dds" name="baseTex"/></textures>
</variant>
<variant frequency="1" name="foundation 4x2 B">
<mesh>props/wrld_wood_b.dae</mesh>
<textures><texture file="props/wrld_wood_1.dds" name="baseTex"/></textures>
</variant>
<variant frequency="1" name="foundation 4x2 A">
<mesh>props/wrld_wood_c.dae</mesh>
<textures><texture file="props/wrld_wood_1.dds" name="baseTex"/></textures>
</variant>
<variant frequency="1" name="foundation 4x2 B">
<mesh>props/wrld_wood_d.dae</mesh>
<textures><texture file="props/wrld_wood_1.dds" name="baseTex"/></textures>
</variant>
</group>
</actor>
@@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="Base">
<mesh>props/Wood_Up.dae</mesh>
</variant>
</group>
<group>
<variant frequency="1" name="foundation">
<textures><texture file="structural/foundation.dds" name="baseTex"/></textures>
</variant>
</group>
</actor>
@@ -5,8 +5,8 @@
<variant>
<mesh>structural/athen_cc_round_roof.dae</mesh>
<textures>
<texture file="structural/hele_roof_round.dds" name="baseTex"/>
<texture file="structural/hele_roof_round_spec.png" name="specTex"/>
<texture file="structural/hele_struct.dds" name="baseTex"/>
<texture file="structural/hele_struct_spec.png" name="specTex"/>
</textures>
</variant>
</group>
@@ -2,14 +2,23 @@
<actor version="1">
<castshadow/>
<group>
<variant>
<variant frequency="0" name="norm">
<mesh>props/brit_civic_centre_roof.dae</mesh>
<textures>
<texture file="structural/celt_roof_round.png" name="baseTex"/>
<texture file="structural/celt_roof_round_norm.png" name="normTex"/>
<texture file="structural/celt_roof_round_spec.png" name="specTex"/>
<texture file="structural/ao/brit_civic_centre.png" name="aoTex"/>
</textures>
<texture file="structural/celt_roof_round.png" name="baseTex"/>
<texture file="structural/celt_roof_round_norm.png" name="normTex"/>
<texture file="structural/celt_roof_round_spec.png" name="specTex"/>
<texture file="structural/ao/brit_civic_centre.png" name="aoTex"/>
</textures>
</variant>
<variant frequency="1" name="test">
<mesh>props/brit_civic_centre_roof.dae</mesh>
<textures>
<texture file="structural/brit_roof_round.png" name="baseTex"/>
<texture file="structural/celt_roof_round_norm.png" name="normTex"/>
<texture file="structural/celt_roof_round_spec.png" name="specTex"/>
<texture file="structural/ao/brit_civic_centre.png" name="aoTex"/>
</textures>
</variant>
</group>
<material>player_trans_ao_parallax_spec.xml</material>
@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<group>
<variant>
<mesh>structural/found_1x1.dae</mesh>
<props>
<prop actor="props/structures/carthaginians/damage_variant_preloader_2.xml" attachpoint="root"/>
<prop actor="props/structures/carthaginians/damage_variant_preloader_3.xml" attachpoint="root"/>
</props>
<textures>
<texture file="structural/kart_struct_damaged.png" name="baseTex"/>
<texture file="structural/kart_struct_damaged_norm.png" name="normTex"/>
</textures>
</variant>
</group>
<material>player_trans_parallax.xml</material>
</actor>
@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<group>
<variant>
<mesh>structural/found_1x1.dae</mesh>
<textures>
<texture file="structural/kart_struct_damaged_med.png" name="baseTex"/>
<texture file="structural/kart_struct_damaged_med_norm.png" name="normTex"/>
</textures>
</variant>
</group>
<material>player_trans_parallax.xml</material>
</actor>
@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<group>
<variant>
<mesh>structural/found_1x1.dae</mesh>
<textures>
<texture file="structural/kart_struct_damaged_heavy.png" name="baseTex"/>
<texture file="structural/kart_struct_damaged_heavy_norm.png" name="normTex"/>
</textures>
</variant>
</group>
<material>player_trans_parallax.xml</material>
</actor>
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="Trade Center Stall 01">
<mesh>props/kart_tc_stall_01.dae</mesh>
<textures>
<texture file="structural/kart_struct.dds" name="baseTex"/>
<texture file="structural/kart_struct_norm.png" name="normTex"/>
<texture file="structural/kart_struct_spec.png" name="specTex"/>
<texture file="structural/ao/kart_tc.png" name="aoTex"/>
</textures>
</variant>
</group>
<material>player_trans_ao_parallax_spec.xml</material>
</actor>
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="Trade Center Stall 02">
<mesh>props/kart_tc_stall_02.dae</mesh>
<textures>
<texture file="structural/kart_struct.dds" name="baseTex"/>
<texture file="structural/kart_struct_norm.png" name="normTex"/>
<texture file="structural/kart_struct_spec.png" name="specTex"/>
<texture file="structural/ao/kart_tc.png" name="aoTex"/>
</textures>
</variant>
</group>
<material>player_trans_ao_parallax_spec.xml</material>
</actor>
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="Trade Center Stall 03">
<mesh>props/kart_tc_stall_03.dae</mesh>
<textures>
<texture file="structural/kart_struct.dds" name="baseTex"/>
<texture file="structural/kart_struct_norm.png" name="normTex"/>
<texture file="structural/kart_struct_spec.png" name="specTex"/>
<texture file="structural/ao/kart_tc.png" name="aoTex"/>
</textures>
</variant>
</group>
<material>player_trans_ao_parallax_spec.xml</material>
</actor>
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="Trade Center Stall 04">
<mesh>props/kart_tc_stall_04.dae</mesh>
<textures>
<texture file="structural/kart_struct.dds" name="baseTex"/>
<texture file="structural/kart_struct_norm.png" name="normTex"/>
<texture file="structural/kart_struct_spec.png" name="specTex"/>
<texture file="structural/ao/kart_tc.png" name="aoTex"/>
</textures>
</variant>
</group>
<material>player_trans_ao_parallax_spec.xml</material>
</actor>
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="Trade Center Stall 05">
<mesh>props/kart_tc_stall_05.dae</mesh>
<textures>
<texture file="structural/kart_struct.dds" name="baseTex"/>
<texture file="structural/kart_struct_norm.png" name="normTex"/>
<texture file="structural/kart_struct_spec.png" name="specTex"/>
<texture file="structural/ao/kart_tc.png" name="aoTex"/>
</textures>
</variant>
</group>
<material>player_trans_ao_parallax_spec.xml</material>
</actor>
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="Trade Center Stall 06">
<mesh>props/kart_tc_stall_06.dae</mesh>
<textures>
<texture file="structural/kart_struct.dds" name="baseTex"/>
<texture file="structural/kart_struct_norm.png" name="normTex"/>
<texture file="structural/kart_struct_spec.png" name="specTex"/>
<texture file="structural/ao/kart_tc.png" name="aoTex"/>
</textures>
</variant>
</group>
<material>player_trans_ao_parallax_spec.xml</material>
</actor>
@@ -3,10 +3,10 @@
<castshadow/>
<group>
<variant frequency="1" name="market_props_a">
<mesh>props/kart_market_a.dae</mesh>
<mesh>props/kart_market_a_old.dae</mesh>
</variant>
<variant frequency="1" name="market_props_b">
<mesh>props/kart_market_b.dae</mesh>
<mesh>props/kart_market_b_old.dae</mesh>
</variant>
</group>
<group>
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<group>
<variant frequency="100">
<mesh>structural/kart_palace_decals.dae</mesh>
<textures>
<texture file="structural/kart_struct.dds" name="baseTex"/>
<texture file="structural/kart_struct_norm.png" name="normTex"/>
<texture file="structural/kart_struct_spec.png" name="specTex"/>
</textures>
</variant>
</group>
<material>basic_trans_parallax_spec.xml</material>
</actor>
@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="Scout_Tower">
<mesh>structural/kart_defense_tower_scaffolding.dae</mesh>
<props>
<prop actor="props/structures/decals/dirt_2x2.xml" attachpoint="root"/>
</props>
<textures>
<texture file="structural/kart_struct.dds" name="baseTex"/>
<texture file="structural/kart_struct_spec.png" name="specTex"/>
<texture file="structural/kart_struct_norm.png" name="normTex"/>
<texture file="structural/ao/kart_defense_tower_scaffolding_AO.png" name="aoTex"/>
</textures>
</variant>
</group>
<material>player_trans_ao_parallax_spec.xml</material>
</actor>
@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="Scout_Tower">
<mesh>structural/kart_farmstead_scaffolding.dae</mesh>
<props>
<prop actor="props/structures/decals/dirt_3x3.xml" attachpoint="root"/>
</props>
<textures>
<texture file="structural/kart_struct.dds" name="baseTex"/>
<texture file="structural/kart_struct_spec.png" name="specTex"/>
<texture file="structural/kart_struct_norm.png" name="normTex"/>
<texture file="structural/ao/kart_farmstead_scaffolding_AO.png" name="aoTex"/>
</textures>
</variant>
</group>
<material>player_trans_ao_parallax_spec.xml</material>
</actor>
@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="Scout_Tower">
<mesh>structural/kart_fortress_scaffolding.dae</mesh>
<props>
<prop actor="props/structures/decals/dirt_6x6.xml" attachpoint="root"/>
</props>
<textures>
<texture file="structural/kart_struct.dds" name="baseTex"/>
<texture file="structural/kart_struct_spec.png" name="specTex"/>
<texture file="structural/kart_struct_norm.png" name="normTex"/>
<texture file="structural/ao/kart_fortress_scaffolding_AO.png" name="aoTex"/>
</textures>
</variant>
</group>
<material>player_trans_ao_parallax_spec.xml</material>
</actor>
@@ -0,0 +1,38 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant>
<props>
<prop actor="props/structures/decals/dirt_3x3.xml" attachpoint="root"/>
</props>
<textures>
<texture file="structural/kart_struct.dds" name="baseTex"/>
<texture file="structural/kart_struct_spec.png" name="specTex"/>
<texture file="structural/kart_struct_norm.png" name="normTex"/>
<texture file="structural/ao/kart_defense_tower_scaffolding_AO.png" name="aoTex"/>
</textures>
</variant>
</group>
<group>
<variant frequency="10" name="House A">
<mesh>structural/kart_house_a_scaffolding.dae</mesh>
<textures>
<texture file="structural/ao/kart_house_a_scaffolding_AO.png" name="aoTex"/>
</textures>
</variant>
<variant frequency="10" name="House B">
<mesh>structural/kart_house_b_scaffolding.dae</mesh>
<textures>
<texture file="structural/ao/kart_house_b_scaffolding_AO.png" name="aoTex"/>
</textures>
</variant>
<variant frequency="10" name="House C">
<mesh>structural/kart_house_c_scaffolding.dae</mesh>
<textures>
<texture file="structural/ao/kart_house_c_scaffolding_AO.png" name="aoTex"/>
</textures>
</variant>
</group>
<material>player_trans_ao_parallax_spec.xml</material>
</actor>
@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="Scout_Tower">
<mesh>structural/kart_wall_long_b_scaffolding.dae</mesh>
<props>
<prop actor="props/structures/decals/dirt_2x2.xml" attachpoint="root"/>
</props>
<textures>
<texture file="structural/kart_struct.dds" name="baseTex"/>
<texture file="structural/kart_struct_spec.png" name="specTex"/>
<texture file="structural/kart_struct_norm.png" name="normTex"/>
<texture file="structural/ao/kart_wall_long_b_scaffolding_AO.png" name="aoTex"/>
</textures>
</variant>
</group>
<material>player_trans_ao_parallax_spec.xml</material>
</actor>
@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="Scout_Tower">
<mesh>structural/kart_wall_medium_b_scaffolding.dae</mesh>
<props>
<prop actor="props/structures/decals/dirt_2x2.xml" attachpoint="root"/>
</props>
<textures>
<texture file="structural/kart_struct.dds" name="baseTex"/>
<texture file="structural/kart_struct_spec.png" name="specTex"/>
<texture file="structural/kart_struct_norm.png" name="normTex"/>
<texture file="structural/ao/kart_wall_medium_b_scaffolding_AO.png" name="aoTex"/>
</textures>
</variant>
</group>
<material>player_trans_ao_parallax_spec.xml</material>
</actor>
@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="Scout_Tower">
<mesh>structural/kart_wall_short_b_scaffolding.dae</mesh>
<props>
<prop actor="props/structures/decals/dirt_2x2.xml" attachpoint="root"/>
</props>
<textures>
<texture file="structural/kart_struct.dds" name="baseTex"/>
<texture file="structural/kart_struct_spec.png" name="specTex"/>
<texture file="structural/kart_struct_norm.png" name="normTex"/>
<texture file="structural/ao/kart_wall_short_b_scaffolding_AO.png" name="aoTex"/>
</textures>
</variant>
</group>
<material>player_trans_ao_parallax_spec.xml</material>
</actor>
@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="Scout_Tower">
<mesh>structural/kart_wall_tower_b_scaffolding.dae</mesh>
<props>
<prop actor="props/structures/decals/dirt_6x6.xml" attachpoint="root"/>
</props>
<textures>
<texture file="structural/kart_struct.dds" name="baseTex"/>
<texture file="structural/kart_struct_spec.png" name="specTex"/>
<texture file="structural/kart_struct_norm.png" name="normTex"/>
<texture file="structural/ao/kart_fortress_scaffolding_AO.png" name="aoTex"/>
</textures>
</variant>
</group>
<material>player_trans_ao_parallax_spec.xml</material>
</actor>
@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="Scout_Tower">
<mesh>structural/kart_wooden_tower_scaffolding.dae</mesh>
<props>
<prop actor="props/structures/decals/dirt_2x2.xml" attachpoint="root"/>
</props>
<textures>
<texture file="structural/kart_struct.dds" name="baseTex"/>
<texture file="structural/kart_struct_spec.png" name="specTex"/>
<texture file="structural/kart_struct_norm.png" name="normTex"/>
<texture file="structural/ao/kart_wooden_tower_scaffold_AO.png" name="aoTex"/>
</textures>
</variant>
</group>
<material>player_trans_ao_parallax_spec.xml</material>
</actor>
@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<group>
<variant name="decal_damage_3x3">
<decal angle="0" depth="22" offsetx="0" offsetz="0" width="22"/>
<textures>
<texture file="gaia/damage_light_3x3.png" name="baseTex"/>
<texture file="gaia/damage_light_3x3_norm.png" name="normTex"/>
</textures>
</variant>
</group>
<material>terrain_norm.xml</material>
</actor>
@@ -0,0 +1,28 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="Gaul Storehouse Barrel A">
<textures>
<texture file="structural/celt_struct.dds" name="baseTex"/>
<texture file="structural/celt_struct_norm.png" name="normTex"/>
<texture file="structural/celt_struct_spec.png" name="specTex"/>
</textures>
</variant>
</group>
<group>
<variant name="a">
<mesh>props/gaul_storehouse_barrel_a_a.dae</mesh>
<textures>
<texture file="structural/ao/gaul_storehouse_a_ao.png" name="aoTex"/>
</textures>
</variant>
<variant name="b">
<mesh>props/gaul_storehouse_barrel_a_b.dae</mesh>
<textures>
<texture file="structural/ao/gaul_storehouse_b_ao.png" name="aoTex"/>
</textures>
</variant>
</group>
<material>player_trans_ao_parallax_spec.xml</material>
</actor>
@@ -0,0 +1,28 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="Gaul Storehouse Barrel B">
<textures>
<texture file="structural/celt_struct.dds" name="baseTex"/>
<texture file="structural/celt_struct_norm.png" name="normTex"/>
<texture file="structural/celt_struct_spec.png" name="specTex"/>
</textures>
</variant>
</group>
<group>
<variant name="a">
<mesh>props/gaul_storehouse_barrel_a_a.dae</mesh>
<textures>
<texture file="structural/ao/gaul_storehouse_a_ao.png" name="aoTex"/>
</textures>
</variant>
<variant name="b">
<mesh>props/gaul_storehouse_barrel_b_a.dae</mesh>
<textures>
<texture file="structural/ao/gaul_storehouse_b_ao.png" name="aoTex"/>
</textures>
</variant>
</group>
<material>player_trans_ao_parallax_spec.xml</material>
</actor>
@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="Gaul Storehouse Foliage">
<textures>
<texture file="props/structs_nature.png" name="baseTex"/>
</textures>
</variant>
</group>
<group>
<variant name="a">
<mesh>props/gaul_storehouse_foliage_a.dae</mesh>
</variant>
<variant name="b">
<mesh>props/gaul_storehouse_foliage_b.dae</mesh>
</variant>
</group>
<material>basic_trans.xml</material>
</actor>
@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="Gaul Storehouse Ore">
<textures>
<texture file="props/rome_sb_turf.png" name="baseTex"/>
</textures>
</variant>
</group>
<group>
<variant name="a">
<mesh>props/gaul_storehouse_ore_a.dae</mesh>
</variant>
<variant name="b">
<mesh>props/gaul_storehouse_ore_b.dae</mesh>
</variant>
</group>
<material>basic_trans.xml</material>
</actor>
@@ -1,16 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant>
<mesh>props/hele_fortress_props.dae</mesh>
<textures>
<texture file="props/hele_props_a.dds" name="baseTex"/>
<texture file="props/hele_props_a_norm.png" name="normTex"/>
<texture file="props/hele_props_a_spec.png" name="specTex"/>
<texture file="structural/ao/hele_fortress.png" name="aoTex"/>
</textures>
</variant>
</group>
<material>player_trans_ao_parallax_spec.xml</material>
</actor>
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant>
<mesh>props/hele_fortress_props.dae</mesh>
<textures>
<texture file="props/hele_props_a.dds" name="baseTex"/>
<texture file="props/hele_props_a_norm.png" name="normTex"/>
<texture file="props/hele_props_a_spec.png" name="specTex"/>
</textures>
</variant>
</group>
<material>player_trans_parallax_spec.xml</material>
</actor>
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="blacksmith struct">
<mesh>structural/maur_big_stupa_struct_dome.dae</mesh>
<textures>
<texture file="structural/maur_dome.png" name="baseTex"/>
<texture file="structural/maur_dome_spec.png" name="specTex"/>
<texture file="structural/maur_dome_norm.png" name="normTex"/>
<texture file="structural/ao/maur_big_stupa_ao.png" name="aoTex"/>
</textures>
</variant>
</group>
<material>player_trans_ao_parallax_spec.xml</material>
</actor>
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant name="pediment">
<mesh>structural/ptol_library_pediment.dae</mesh>
<textures>
<texture file="structural/hele_struct.dds" name="baseTex"/>
<texture file="structural/hele_struct_norm.png" name="normTex"/>
<texture file="structural/hele_struct_spec.png" name="specTex"/>
<texture file="structural/ao/ptol_library_AO.png" name="aoTex"/>
</textures>
</variant>
</group>
<material>player_trans_ao_parallax_spec.xml</material>
</actor>
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="Settlement">
<mesh>structural/ptol_library_roof.dae</mesh>
<textures>
<texture file="structural/Sele_struct_2.png" name="baseTex"/>
<texture file="structural/Sele_struct_2_norm.png" name="normTex"/>
<texture file="structural/Sele_struct_2_spec.png" name="specTex"/>
<texture file="structural/ao/ptol_library_AO.png" name="aoTex"/>
</textures>
</variant>
</group>
<material>player_trans_ao_parallax_spec.xml</material>
</actor>
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="ptolemaic Statue 1">
<mesh>structural/ptol_library_sphynx.dae</mesh>
<textures>
<texture file="structural/ptol_statues_sphynx.png" name="baseTex"/>
<texture file="structural/ao/ptol_library_AO.png" name="aoTex"/>
</textures>
</variant>
</group>
<material>player_trans_ao.xml</material>
</actor>
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant>
<mesh>props/rome_capitoline_pediment.dae</mesh>
<textures>
<texture file="props/rome_capitoline_pediment.png" name="baseTex"/>
<texture file="structural/ao/rome_capitoline.png" name="aoTex"/>
</textures>
</variant>
</group>
<material>player_trans_ao.xml</material>
</actor>
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant>
<mesh>props/rome_capitoline_statues.dae</mesh>
<textures>
<texture file="props/rome_cc_statues.png" name="baseTex"/>
<texture file="structural/ao/rome_capitoline.png" name="aoTex"/>
</textures>
</variant>
</group>
<material>player_trans_ao.xml</material>
</actor>
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant>
<mesh>props/rome_quadriga_statue.dae</mesh>
<textures>
<texture file="props/quadriga_statue.png" name="baseTex"/>
<texture file="props/quadriga_statue_norm.png" name="normTex"/>
<texture file="props/quadriga_statue_spec.png" name="specTex"/>
<texture file="structural/ao/rome_capitoline.png" name="aoTex"/>
</textures>
</variant>
</group>
<material>player_trans_ao_parallax_spec.xml</material>
</actor>
@@ -2,14 +2,14 @@
<actor version="1">
<castshadow/>
<group>
<variant name="pediment">
<variant name="apollo">
<mesh>props/sele_wonder_statue.dae</mesh>
<textures>
<texture file="structural/sele_apollo_gold.png" name="baseTex"/>
<texture file="null_white.dds" name="specTex"/>
<texture file="structural/sele_apollo_gold_spec.png" name="specTex"/>
<texture file="structural/ao/sele_wonder_statue_AO.png" name="aoTex"/>
</textures>
</variant>
</group>
<material>player_trans_ao.xml</material>
<material>basic_spec.xml</material>
</actor>
@@ -2,13 +2,14 @@
<actor version="1">
<castshadow/>
<group>
<variant name="pediment">
<variant name="apollo">
<mesh>props/sele_wonder_statue_head.dae</mesh>
<textures>
<texture file="structural/sele_apollo_gold_head.png" name="baseTex"/>
<texture file="structural/sele_apollo_gold_head_spec.png" name="specTex"/>
<texture file="structural/ao/sele_wonder_statue_head_AO.png" name="aoTex"/>
</textures>
</variant>
</group>
<material>player_trans_ao.xml</material>
<material>basic_spec.xml</material>
</actor>
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="berry basket">
<mesh>props/berry_basket.dae</mesh>
</variant>
</group>
<group>
<variant>
<textures>
<texture file="props/basket_rome_1.dds" name="baseTex"/>
</textures>
</variant>
</group>
</actor>
@@ -0,0 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="Cape">
<mesh>props/new/capes/cape_hd_long.dae</mesh>
<textures>
<texture file="props/cape_hd.dds" name="baseTex"/>
</textures>
</variant>
</group>
<group>
<variant frequency="1" name="Idle"/>
<variant file="biped/base_archer_chariot_ready.xml"/>
<variant file="biped/attack_ranged_archer.xml"/>
<variant file="biped/attack_capture.xml"/>
<variant file="biped/gather_praise.xml"/>
<variant file="biped/death_infantry.xml"/>
</group>
<material>player_trans.xml</material>
</actor>
@@ -0,0 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant file="biped/base_archer_chariot_ready.xml">
<mesh>props/new/capes/cape_hd_hoplite.dae</mesh>
<textures><texture file="props/cape_hd.dds" name="baseTex"/></textures>
</variant>
</group>
<group>
<variant frequency="1" name="Idle"/>
<variant file="biped/attack_ranged_archer_hip.xml"/>
<variant file="biped/attack_capture.xml"/>
<variant file="biped/gather_praise.xml"/>
<variant file="biped/death_infantry.xml"/>
</group>
<material>player_trans.xml</material>
</actor>
@@ -0,0 +1,42 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant file="biped/base_archer_ready.xml">
<textures><texture file="props/cape_hd.dds" name="baseTex"/></textures>
</variant>
</group>
<group>
<variant frequency="3" name="Cape-hd">
<mesh>props/new/capes/cape_hd_medium.dae</mesh>
</variant>
</group>
<group>
<variant frequency="1" name="Idle"/>
<variant file="biped/attack_ranged_archer_hip.xml"/>
<variant file="biped/attack_capture.xml"/>
<variant file="biped/attack_slaughter.xml"/>
<variant file="biped/gather_tree.xml"/>
<variant file="biped/gather_grain.xml"/>
<variant file="biped/gather_fruit.xml"/>
<variant file="biped/gather_meat.xml"/>
<variant file="biped/gather_rock.xml"/>
<variant file="biped/gather_ore.xml"/>
<variant file="biped/gather_ruins.xml"/>
<variant file="biped/gather_praise.xml"/>
<variant file="biped/build.xml"/>
<variant file="biped/build_farm.xml"/>
<variant file="biped/carry_food.xml"/>
<variant file="biped/carry_meat.xml"/>
<variant file="biped/carry_wood.xml"/>
<variant file="biped/carry_stone.xml"/>
<variant file="biped/carry_metal.xml"/>
<variant file="biped/carry_food_idle.xml"/>
<variant file="biped/carry_meat_idle.xml"/>
<variant file="biped/carry_wood_idle.xml"/>
<variant file="biped/carry_stone_idle.xml"/>
<variant file="biped/carry_metal_idle.xml"/>
<variant file="biped/death_infantry.xml"/>
</group>
<material>player_trans.xml</material>
</actor>
@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
<group>
<variant file="biped/base_jav_chariot_ready.xml">
<mesh>props/new/capes/f_cape_long.dae</mesh>
<textures><texture file="props/cape_celt_boudicca.dds" name="baseTex"/></textures>
</variant>
</group>
<group>
<variant frequency="1" name="Idle"/>
<variant file="biped/attack_ranged_javelinist.xml"/>
<variant file="biped/attack_capture.xml"/>
<variant file="biped/gather_praise.xml"/>
<variant name="carry_meat"/>
<variant file="biped/death_infantry.xml"/>
</group>
<material>player_trans.xml</material>
</actor>
@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
<group>
<variant file="biped/base_jav_chariot_ready.xml">
<mesh>props/new/capes/f_cape_long.dae</mesh>
<textures><texture file="props/cape_celt_boudicca.dds" name="baseTex"/></textures>
</variant>
</group>
<group>
<variant frequency="1" name="Idle"/>
<variant file="biped/attack_ranged_javelinist.xml"/>
<variant file="biped/attack_capture.xml"/>
<variant file="biped/gather_praise.xml"/>
<variant name="carry_meat"/>
<variant file="biped/death_infantry.xml"/>
</group>
<material>player_trans.xml</material>
</actor>
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant file="biped/base_healer.xml"/>
</group>
<group>
<variant frequency="1" name="Cape long">
<mesh>props/new/capes/m_cape_long.dae</mesh>
<textures><texture file="props/cape_hero.dds" name="baseTex"/></textures>
</variant>
</group>
<material>player_trans.xml</material>
</actor>
@@ -0,0 +1,42 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant file="biped/base_hoplite.xml">
<animations>
<animation file="biped/new/death_a.dae" name="Death" id="death1" speed="60"/>
<animation file="biped/new/death_b.dae" name="Death" id="death2" speed="60"/>
</animations>
<mesh>props/new/capes/cape_hd_hoplite.dae</mesh>
<textures>
<texture file="props/cape_hd.dds" name="baseTex"/>
</textures>
</variant>
</group>
<group>
<variant frequency="1" name="Idle"/>
<variant file="biped/attack_capture.xml"/>
<variant file="biped/attack_slaughter.xml"/>
<variant file="biped/gather_tree.xml"/>
<variant file="biped/gather_grain.xml"/>
<variant file="biped/gather_fruit.xml"/>
<variant file="biped/gather_meat.xml"/>
<variant file="biped/gather_rock.xml"/>
<variant file="biped/gather_ore.xml"/>
<variant file="biped/gather_ruins.xml"/>
<variant file="biped/gather_praise.xml"/>
<variant file="biped/build.xml"/>
<variant file="biped/build_farm.xml"/>
<variant file="biped/carry_food.xml"/>
<variant file="biped/carry_meat.xml"/>
<variant file="biped/carry_wood.xml"/>
<variant file="biped/carry_stone.xml"/>
<variant file="biped/carry_metal.xml"/>
<variant file="biped/carry_food_idle.xml"/>
<variant file="biped/carry_meat_idle.xml"/>
<variant file="biped/carry_wood_idle.xml"/>
<variant file="biped/carry_stone_idle.xml"/>
<variant file="biped/carry_metal_idle.xml"/>
</group>
<material>player_trans.xml</material>
</actor>
@@ -0,0 +1,42 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant file="biped/base_skirmisher.xml">
<textures><texture file="props/cape_hd.dds" name="baseTex"/></textures>
</variant>
</group>
<group>
<variant frequency="1" name="Cape-hd-medium">
<mesh>props/new/capes/cape_hd_medium.dae</mesh>
</variant>
</group>
<group>
<variant frequency="1" name="Idle"/>
<variant file="biped/attack_ranged_javelinist.xml"/>
<variant file="biped/attack_capture.xml"/>
<variant file="biped/attack_slaughter.xml"/>
<variant file="biped/gather_tree.xml"/>
<variant file="biped/gather_grain.xml"/>
<variant file="biped/gather_fruit.xml"/>
<variant file="biped/gather_meat.xml"/>
<variant file="biped/gather_rock.xml"/>
<variant file="biped/gather_ore.xml"/>
<variant file="biped/gather_ruins.xml"/>
<variant file="biped/gather_praise.xml"/>
<variant file="biped/build.xml"/>
<variant file="biped/build_farm.xml"/>
<variant file="biped/carry_food.xml"/>
<variant file="biped/carry_meat.xml"/>
<variant file="biped/carry_wood.xml"/>
<variant file="biped/carry_stone.xml"/>
<variant file="biped/carry_metal.xml"/>
<variant file="biped/carry_food_idle.xml"/>
<variant file="biped/carry_meat_idle.xml"/>
<variant file="biped/carry_wood_idle.xml"/>
<variant file="biped/carry_stone_idle.xml"/>
<variant file="biped/carry_metal_idle.xml"/>
<variant file="biped/death_infantry.xml"/>
</group>
<material>player_trans.xml</material>
</actor>
@@ -0,0 +1,42 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant file="biped/base_skirmisher.xml">
<textures><texture file="props/cape_hd_thracian.png" name="baseTex"/></textures>
</variant>
</group>
<group>
<variant frequency="1" name="Cape-hd">
<mesh>props/new/capes/cape_hd_medium.dae</mesh>
</variant>
</group>
<group>
<variant frequency="1" name="Idle"/>
<variant file="biped/attack_ranged_javelinist.xml"/>
<variant file="biped/attack_capture.xml"/>
<variant file="biped/attack_slaughter.xml"/>
<variant file="biped/gather_tree.xml"/>
<variant file="biped/gather_grain.xml"/>
<variant file="biped/gather_fruit.xml"/>
<variant file="biped/gather_meat.xml"/>
<variant file="biped/gather_rock.xml"/>
<variant file="biped/gather_ore.xml"/>
<variant file="biped/gather_ruins.xml"/>
<variant file="biped/gather_praise.xml"/>
<variant file="biped/build.xml"/>
<variant file="biped/build_farm.xml"/>
<variant file="biped/carry_food.xml"/>
<variant file="biped/carry_meat.xml"/>
<variant file="biped/carry_wood.xml"/>
<variant file="biped/carry_stone.xml"/>
<variant file="biped/carry_metal.xml"/>
<variant file="biped/carry_food_idle.xml"/>
<variant file="biped/carry_meat_idle.xml"/>
<variant file="biped/carry_wood_idle.xml"/>
<variant file="biped/carry_stone_idle.xml"/>
<variant file="biped/carry_metal_idle.xml"/>
<variant file="biped/death_infantry.xml"/>
</group>
<material>player_trans.xml</material>
</actor>
@@ -0,0 +1,50 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant file="biped/base_skirmisher.xml"/>
</group>
<group>
<variant frequency="1" name="Cape medium">
<mesh>props/new/capes/cape_hd_medium.dae</mesh>
</variant>
<variant frequency="1" name="Cape long ragged">
<mesh>props/new/capes/cape_hd_ragged.dae</mesh>
</variant>
</group>
<group>
<variant frequency="1" name="Pelt Brown">
<textures><texture file="props/cape_hd_pelt_brown.png" name="baseTex"/></textures>
</variant>
<variant frequency="1" name="Pelt Gray">
<textures><texture file="props/cape_hd_pelt_gray.png" name="baseTex"/></textures>
</variant>
</group>
<group>
<variant frequency="1" name="Idle"/>
<variant file="biped/attack_ranged_javelinist.xml"/>
<variant file="biped/attack_capture.xml"/>
<variant file="biped/attack_slaughter.xml"/>
<variant file="biped/gather_tree.xml"/>
<variant file="biped/gather_grain.xml"/>
<variant file="biped/gather_fruit.xml"/>
<variant file="biped/gather_meat.xml"/>
<variant file="biped/gather_rock.xml"/>
<variant file="biped/gather_ore.xml"/>
<variant file="biped/gather_ruins.xml"/>
<variant file="biped/gather_praise.xml"/>
<variant file="biped/build.xml"/>
<variant file="biped/build_farm.xml"/>
<variant file="biped/carry_food.xml"/>
<variant file="biped/carry_meat.xml"/>
<variant file="biped/carry_wood.xml"/>
<variant file="biped/carry_stone.xml"/>
<variant file="biped/carry_metal.xml"/>
<variant file="biped/carry_food_idle.xml"/>
<variant file="biped/carry_meat_idle.xml"/>
<variant file="biped/carry_wood_idle.xml"/>
<variant file="biped/carry_stone_idle.xml"/>
<variant file="biped/carry_metal_idle.xml"/>
<variant file="biped/death_infantry.xml"/>
</group>
</actor>

Some files were not shown because too many files have changed in this diff Show More