1
0
forked from 0ad/0ad
Commit Graph

19368 Commits

Author SHA1 Message Date
fd719833ab Replace includes uniform_foo with uniform_foo_distribution as it's deprecated in newer versions of boost. It was added in the 1.47 version.
Reviewed by: @Angen, @vladislavbelov
Differential Revision: https://code.wildfiregames.com/D1823
This was SVN commit r22211.
2019-04-22 21:45:23 +00:00
bc3fd69bf0 Const-correct the hierarchical pathfinder.
Use at() over find() as it makes the code neater and the performance
impact is negligible.
This forces an algorithm change in FindReachableRegions as the key
accessed is not guaranteed to exist.

Differential Revision: https://code.wildfiregames.com/D1830
This was SVN commit r22210.
2019-04-22 16:07:25 +00:00
a0ec66fc4a Fix portrait icons of mechanical units broken by d3a73f0611. Reported by Polakrity.
This was SVN commit r22209.
2019-04-22 15:53:34 +00:00
ccfae46042 Accidentally committed an upstream version of the hierarchical pathfinder tests in 60cfd2d16c.
This fixes that.

This was SVN commit r22208.
2019-04-22 14:31:19 +00:00
60cfd2d16c Actually add the test file for ab5f63e087.
This was SVN commit r22207.
2019-04-22 12:44:28 +00:00
4c7f14b7f3 Add a few assertions to pathfinder tests, fix the disabled tests.
Differential Revision: https://code.wildfiregames.com/D1831
This was SVN commit r22206.
2019-04-22 12:13:54 +00:00
ab5f63e087 Add tests for the hierarchical pathfinder.
These variously test some simple MakeGoalReachable and
FindNearestNavcell calls, as well as checking edges and regions when
updating the map.

Differential Revision: https://code.wildfiregames.com/D1833
This was SVN commit r22205.
2019-04-22 12:07:30 +00:00
d3a73f0611 Rename generic ballista template to boltshooter and onager to stonethrower to avoid ambiguity. Remove template_unit_mechanical.xml and remove '_mechanical' from ship and siege template paths.
The template tree included 'template_unit_mechanical.xml', which had two
children, '*_ship.xml' and '*_siege.xml'.
This template did little and implied a relevant common ancestor to ship
and siege units. As organic units do not descend from a generic
'Organic', this was not necessary.

This commit removes this template and the '_mechanical' bit from
children templates to simplify.

Additionally, this renames:
 - template_unit_mechanical_siege_ballista.xml to
template_unit_siege_boltshooter.xml
 - template_unit_mechanical_siege_onager.xml to
template_unit_siege_stonethrower.xml
This helps avoid ambiguity, as our Roman ballista for example throws
stones (even if it is a torsion engine), and 'ballista' refers to a bolt
shooter in Age of Empires 1 (and in AoE 2 for the Elephant Ballista,
confusingly not named a scorpion like other bolt shooters in that game).

Patch By: Nescio
Reviewers: Wraitii

Subscribers: Itms, O14 Maps, wraitii, elexis, Vulcan, Stan

Differential Revision: https://code.wildfiregames.com/D1760
This was SVN commit r22204.
2019-04-21 17:04:15 +00:00
bb
0ed704e791 Communicate field diminishing returns to the player in the fields tooltip
refs: #4669
Patch By: happyconcepts
Comments By: Nescio
Differential Revision: https://code.wildfiregames.com/D1803
This was SVN commit r22203.
2019-04-21 16:26:39 +00:00
bb
a7c2f40ac5 Bring the palisade templates under their own parent (instead of the stone wall).
While at it:
- Remove the stone cost/loot from palisades
- Change the gate tooltip to not mention stone walls
- Standartize palisade armour (don't reuse the walls' armour)
- Demand village phase instead of town phase for all palisades
- Remove stone wall classes from palisades

Patch By: Nescio
Differential Revision: https://code.wildfiregames.com/D1796
This was SVN commit r22202.
2019-04-21 14:55:36 +00:00
f9b529f2fb Remove workaround in GetGUIObjectByName
f0d9806b3f added a problem: Engine.GetGuiObjectByName is unaware of the
caller GUI page.
So GUI pages in the background that still run the onTick and other event
code tried to look on the topmost GUI page, rather than their own GUI
page.
9674c3c0fe added a workaround that has to be copied to any place that
can call JS code.
If developers don't know about the reason for this workaround and add a
new place that can call JS code (#5369), they won't be able to implement
anything.

This removes this workaround by passing the pointer to the correct GUI
page as callback data.

Patch By: elexis
Reviewed By: wraitii
Refs #5369

Trac Tickets: #5369

Differential Revision: https://code.wildfiregames.com/D1701
This was SVN commit r22200.
2019-04-20 15:49:42 +00:00
6225377c4d Cleanup deprecated SM-specific syntax in ExtractFormations in Commands.js
This piece of code used Array comprehensions, since deprecated, and
removed in Firefox 58. See
https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Operators/Array_comprehensions

Patch By: smiley
Reviewed By: elexis
Differential Revision: https://code.wildfiregames.com/D1724
This was SVN commit r22199.
2019-04-20 15:34:40 +00:00
def47cb7ae Change Run Speed into a Run multiplier.
This changes running speed into a running multiplier (of walk speed).

The advantage is that it simplifies code since you can setup a default
run multiplier at the template level and it'll work for all subsequent
templates, and technologies cannot forget to change it. It makes
specialised unit templates easier to maintain, too.

Formations have a 100 run multiplier which effectively sets their
maximal walking speed at 100

Reviewed By: bb, O2 JS Simulation
Differential Revision: https://code.wildfiregames.com/D438
This was SVN commit r22197.
2019-04-19 10:04:50 +00:00
46fc204033 Correctly handle receiving 0 damage as not receiving any damage.
Do not flag a unit as injured when it receives 0 damage.
Do not flag dead units as injured.
Do not mark units as injured when they are full health and killed at one
shot.

Cleanup Reduce, introducing a separate function to handle deaths.

Patch By: Angen
Reviewed By: wraitii
Commented By: Stan
Differential Revision: https://code.wildfiregames.com/D1769
This was SVN commit r22196.
2019-04-19 09:13:31 +00:00
e678f4c151 cattails fix
This was SVN commit r22194.
2019-04-18 22:18:51 +00:00
3700e039af Remove useless files that contained placeholder objects (boxes)
This was SVN commit r22193.
2019-04-18 16:01:04 +00:00
b127cba874 Add missing parenthesis in the Petra diplomacyManager. Else the requested tribute amount would always be wrong.
Reviewed by: @bb
Differential Revision: https://code.wildfiregames.com/D1826
This was SVN commit r22192.
2019-04-16 16:39:17 +00:00
bb
2c8efc9751 align the footprint an obstruction size with the model size for the kush range
This was SVN commit r22191.
2019-04-15 21:46:44 +00:00
bb
536d5e3af4 unparent the range from the barracks, and reduce the duplication in the civs' range templates
while at it, make the classes consistent and remove the cav from the
range

Patch By: Nescio
Differential Revision: https://code.wildfiregames.com/D1791
This was SVN commit r22190.
2019-04-15 21:39:21 +00:00
bb
a2e522edcb Move tooltips on gamesetup dropdowns from xml to js, since by current gamestup design that is the way all tooltips are added.
While add it add some periods


Patch By: Polakrity
Differential Revision: https://code.wildfiregames.com/D594
This was SVN commit r22188.
2019-04-14 20:29:08 +00:00
bb
53bb9fa367 Handle orderone hotkey also for the minimap
refs D308, 62f07098ea
Patch By: luiko
Comments By: Angen, Stan
Differential Revision: https://code.wildfiregames.com/D1822
This was SVN commit r22187.
2019-04-14 19:29:02 +00:00
wackyserious
9621009360 New Texture: Iberian Units Retexture
Thread:
https://wildfiregames.com/forum/index.php?/topic/24988-task-iberian-units-update/

Reviewed by Genava55 and other community members

This was SVN commit r22186.
2019-04-14 04:28:18 +00:00
89a8c9ca87 Fix broken test introduced by b1659e7618
This was SVN commit r22185.
2019-04-13 12:49:33 +00:00
b1659e7618 Move more things in the projectile part of the Attack/Ranged component
Following D945, I reckon more things should be moved from Attack/Ranged
to Attack/Ranged/Projectile.

In the long run, I think most things should be moved to the Projectile,
which would let us have several projectiles per attack (for example),
make it easier to abstract away from the Melee/Ranged attack types, and
would also be more coherent. This is the first step, as it adds the
Projectile to all templates.

This also makes the launch point a parameter, though I only add "y" as
implementing the rotation is left as an exercise to the reader.

Reviewed By: bb
Differential Revision: https://code.wildfiregames.com/D1171
This was SVN commit r22184.
2019-04-13 09:27:14 +00:00
4a5fb3ba94 Fix issue in 672d587bc0, detected by the checkrefs.pl script.
Patch By: Nescio
Reviewed By: Itms
Differential Revision: https://code.wildfiregames.com/D1824
This was SVN commit r22183.
2019-04-13 09:20:29 +00:00
bb
672d587bc0 Add ConquestCritical to structures that want it, instead of removing it from those that don't want it.
While add it remove conquestCritical from benches/fences/tables/columns
etc.

Patch By: Nescio
Differential Revision: https://code.wildfiregames.com/D1626
This was SVN commit r22182.
2019-04-12 15:05:11 +00:00
bb
c66962a2aa Reduce duplication in template_structure_military*
Patch By: Nescio
Differential Revision: https://code.wildfiregames.com/D1793
This was SVN commit r22181.
2019-04-12 14:12:16 +00:00
02a429bc7f Fix 4edcf21b98. Refs #5428
Differential Revision: https://code.wildfiregames.com/D1821
This was SVN commit r22178.
2019-04-10 06:05:34 +00:00
wackyserious
f472199acb New Texture: Basic Celtic Infantry (Topless with pants) + Linothorax for Spartan Skiritai
Thread:
​https://wildfiregames.com/forum/index.php?/topic/23002-task-celtic-unit-textures/

Reviewed by Stanislas69 and other community members

This was SVN commit r22177.
2019-04-10 03:54:55 +00:00
wackyserious
1ea60ff35a New Texture: Greek Psiloi (Elite) and Athenian Epilektoi
Thread:
​https://wildfiregames.com/forum/index.php?/topic/22184-task-hellenic-unit-textures/

Reviewed by Stanislas69 and Wowgetoffyourcellphone

This was SVN commit r22176.
2019-04-10 02:35:15 +00:00
4edcf21b98 Remove useless class, test class and use boost instead of it in test_RangeManager.h. Use boost::random::uniform_real_distribution<double> instead of deprecated boost::uniform_real<> in that class as well.
Refs #5428
Reviewed by: @Angen, @vladislavbelov
Differential Revision: https://code.wildfiregames.com/D1584
This was SVN commit r22175.
2019-04-09 21:50:10 +00:00
c12b95d6f6 Corrections in game loading quotes.
Use English names for authors and titles, use American English rather
than British.

Patch By: Nescio
Reviewed By: Itms
Differential Revision: https://code.wildfiregames.com/D1818
This was SVN commit r22174.
2019-04-09 19:54:32 +00:00
96261e3023 fixed anchor points on quarry entities
This was SVN commit r22172.
2019-04-07 21:33:28 +00:00
9cfbce2879 Quarry stone
This was SVN commit r22171.
2019-04-07 21:00:50 +00:00
3a7335d723 Removes unused iterator in Xeromyces. Its usage was removed in a07add11c6.
Patch By: Angen
Differential Revision: https://code.wildfiregames.com/D1814
This was SVN commit r22170.
2019-04-07 18:23:04 +00:00
bb
0b1593e268 recieve -> receive
Reported by Stan in 13288df4f4

This was SVN commit r22169.
2019-04-07 16:06:10 +00:00
493f6061cb Dead palms and some more stone cliff variation
This was SVN commit r22168.
2019-04-07 12:31:18 +00:00
bb
94716b9987 Remove an unused variable
The variable was introduced in 492e49da38 without being used, neither
did it become used in a later commit. To me it seems that it is a
left-over from a copy paste, as the ".left" functions do use the
variable.
Notice 74c420f658 did cleanup around these lines, but did not remove
this variable

Patch By: Angen
Differential Revision: https://code.wildfiregames.com/D1813
This was SVN commit r22166.
2019-04-06 22:04:13 +00:00
bb
13288df4f4 Update the wonder victory timer in case the wonder renames.
Reviewed By: smiley
Comment By: elexis
Differential Revision: https://code.wildfiregames.com/D1732
This was SVN commit r22165.
2019-04-06 21:58:20 +00:00
359df88f1a [CSlider] On click move the slider-button to the mouse position
Reviewed By: vladislavbelov
Refs: #2593
Differential Revision: https://code.wildfiregames.com/D1622
This was SVN commit r22164.
2019-04-06 18:47:22 +00:00
bb
99e03b9311 Remove unneeded death sounds from structure templates, as they inherit from template_structure
Patch By: Nescio
Differential Revision: https://code.wildfiregames.com/D1795
This was SVN commit r22163.
2019-04-06 14:35:39 +00:00
2288943f91 Fixes
C4458 in AtlasObjectImpl.cpp line 292 and in AtlasUI/Object.cpp:547
C4456 in MapDialog.cpp:173 and in ScenarioEditor.cpp:742

Reviewed by: @Angen
Accepted by: @Itms
Comments by: @vladislavbelov
Differential Revision: https://code.wildfiregames.com/D1741
This was SVN commit r22161.
2019-04-05 12:37:37 +00:00
cac81d1e84 Fix berry bushes smoothing groups,
Reported by: @Angen, @vladislavbelov
This was SVN commit r22160.
2019-04-05 12:11:09 +00:00
734ea4fd6b Improve the error window on Windows by adding a link to https://trac.wildfiregames.com/wiki/GameDataPaths.
Patch By: Angen
Reviewed By: Itms, vladislavbelov
Differential Revision: https://code.wildfiregames.com/D1799
This was SVN commit r22157.
2019-04-04 20:30:52 +00:00
9d2adaf514 Add missing berry bush mesh from 114015f4e9
Noticed by: @vladislavbelov
This was SVN commit r22156.
2019-04-03 06:02:11 +00:00
7182de3b20 Removes unused variable. It was introduced in f0615df318, an interface to control
the variable was removed in 12e2428495. A usage was removed in
9376609ee8.
And since then the usage is useless because we use infinity sky model.

This was SVN commit r22154.
2019-04-02 18:49:12 +00:00
b3e80c3870 I'm a huge fan of Mediterranean fan palms, which are themselves not very huge, mind you
This was SVN commit r22153.
2019-04-01 15:15:02 +00:00
114015f4e9 New berry bushes by BigTiger
Reviewed by: @Stan
Comments by: @borg
Thread:
https://wildfiregames.com/forum/index.php?/topic/25431-task-trees/

This was SVN commit r22151.
2019-04-01 07:19:01 +00:00
390f573bef Giant reeds, rocks, fruiting date palms, few more date palm variations
This was SVN commit r22150.
2019-04-01 04:34:20 +00:00
0a1cccc9b9 Improve team bonus descriptions consistency
Patch By: Nescio
Differential Revision: https://code.wildfiregames.com/D1720
This was SVN commit r22149.
2019-03-31 22:14:01 +00:00