1
0
forked from mirrors/0ad
Commit Graph

17390 Commits

Author SHA1 Message Date
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