1
0
forked from 0ad/0ad
Commit Graph

21022 Commits

Author SHA1 Message Date
7c534eae8a Allow training Axeman Cavalry at barracks.
Missed in dd5c7edea3 which introduced this template.

Patch by: borg-
Reviewed by: wraitii
Differential Revision: https://code.wildfiregames.com/D2954
This was SVN commit r24013.
2020-09-02 07:03:32 +00:00
dab3e58a56 Move cavalry movement tech to village phase and make it cheaper.
Having two technologies was too strong a bonus.

Patch by: borg-
Reviewed By: Nescio, wraitii
Differential Revision: https://code.wildfiregames.com/D2966
This was SVN commit r24012.
2020-09-02 06:59:33 +00:00
e916b8cc01 Improve splash damage falloff calculation to account for obstruction size.
Splash falloff was calculated using centre-to-point distance, where
nearest-edge to nearest-edge ought to have been used.
Use DistanceToPoint to correct for that.

Make sure the damage multiplier cannot go negative.
Remove GetUnitSize in favour of GetSize.

Reviewed By: bb
Differential Revision: https://code.wildfiregames.com/D2963
This was SVN commit r24010.
2020-08-31 15:01:04 +00:00
32886202a3 Fix AI using Maurya elephant archers as hunters following 164af0742a
The Maurya elephant archer is a fast moving citizen soldier, despite
being unable to gather.
This led to an issue post 164af0742a.

Reviewed By: bb
Fixes #5800

Differential Revision: https://code.wildfiregames.com/D2962
This was SVN commit r24009.
2020-08-31 09:05:34 +00:00
0292962756 Standardise attack bonus tooltips.
- Use multiplication symbol.
- Correct "vs." to "vs".

Patch by: @Nescio.
Differential Revision: D2610
Reviewed by: @Gallaecio.
Opposition by: @wraitii.
This was SVN commit r24007.
2020-08-29 09:45:19 +00:00
0530602405 Readd safeguard against killing an entity multiple times.
Also don't try to calculate more when we are damaged with zero (`0`)
amount.

Differential Revision: D2981
Reviewed by: @Angen.
This was SVN commit r24006.
2020-08-29 05:47:06 +00:00
bb
5e6a2322e7 Damage parent of mirage instead of trying to damage the mirage
Reviewed By: Freagarach
Differential Revision: D2979
This was SVN commit r24005.
2020-08-28 18:05:33 +00:00
221d5d4062 Fix applying StatusEffects after 0f91c5ac61.
Fixes the ordering of arguments in HandleAttackEffects by StatusEffects.
Fixes wrongly written effectType.

Differential Revision: D2977
Reviewed by: @bb.
This was SVN commit r24004.
2020-08-28 12:42:32 +00:00
6c27687c0c Sort nodes in templates and data.
The nodes in the templates ought to be sorted alphabetically as should
the modifications in technologies and auras. This makes that so.
(Also added the `Civ` to the Identity of template_formation, for it is
necessary although commented out.)

Differential Revision: D2976
Reviewed by: @Nescio.
This was SVN commit r24003.
2020-08-28 08:03:29 +00:00
0f91c5ac61 Rename Armour to Resistance and change the way it is processed.
- Renames Armour-node to Resistance.
- Support resistance against Capture.
- Puts resistance against effects in separate nodes.
- Some cleaning.

Differential Revision: D2229
Reviewed by: @bb (accepted), @wraitii.
Comments by: @Stan, @Nescio.
This was SVN commit r24001.
2020-08-27 10:24:59 +00:00
bb
37d31a5e3d Group buildings by function in the right selection panel
Patch By: Nescio
Differential Revision: D2807
This was SVN commit r24000.
2020-08-26 15:35:48 +00:00
4881a7ea0e Also move loading image after d6449bf3f0, noticed by @Nescio.
This was SVN commit r23999.
2020-08-26 15:34:23 +00:00
d6449bf3f0 Rename blacksmith -> forge.
A blacksmith is a person, a forge is the blacksmith's workshop.
This renames templates and corrects simulation and sound files.

Patch by: @Nescio.
Differential Revision: D2971
Approved by @genava55, @Gallaecio, @wraitii.

This was SVN commit r23998.
2020-08-26 15:00:00 +00:00
bb
2dd772c99f Add some missing credits
Based on patch by: Nescio
Differential Revision: D2882
This was SVN commit r23997.
2020-08-26 12:49:29 +00:00
5f1f768ed5 Fix gametime overlay and watermark in summary screen
Reviewed by: wraitii
Differential Revision: https://code.wildfiregames.com/D148
This was SVN commit r23996.
2020-08-26 10:34:25 +00:00
b9f82cb7ae Disable WorldPopulation option for scenarios.
Differential Revision: D2949
Reviewed by: @bb.
This was SVN commit r23995.
2020-08-25 14:40:32 +00:00
bb
3372b4618c Fix lineendings for json files
Noticed and proposed by: Nescio
Differential Revision: D2958
This was SVN commit r23994.
2020-08-25 14:17:12 +00:00
3c893ba402 Move "GetDamageBonus"-function from its own helper file to "Attacking.js"-helper.
Also cache calls to `cmpIdentity` to improve performance for multiple
bonuses.

Differential Revision: D2970
Reviewed by: @bb.
This was SVN commit r23993.
2020-08-24 15:17:50 +00:00
bb
0a26c55513 Fix more JsDocs numbers/bools/strings
This was SVN commit r23992.
2020-08-24 11:50:31 +00:00
bb
3ff65b451f Fix jsDocs object => Object
This was SVN commit r23991.
2020-08-24 11:01:25 +00:00
2627714c07 Allow to play different sounds based on what attacked you
Discussed with: @Lion.Kanzen
Sound by: @Samulis
Reviewed by: @Freagarach
Differential Revision: https://code.wildfiregames.com/D2859
This was SVN commit r23989.
2020-08-21 10:45:37 +00:00
7d180bcf14 New Kush and Maur portraits, arakamani by @Sundiata, background changes by @wowgetoffyourcellphone, and the harsiotef and chanakya by @m7600
This was SVN commit r23987.
2020-08-20 15:32:41 +00:00
1316dbf162 New Pers portraits by @m7600, xerxes background retexture by @Stan
Thread:
https://wildfiregames.com/forum/index.php?/topic/27520-task-improve-hero-portraits/

This was SVN commit r23986.
2020-08-20 15:30:07 +00:00
def60ee383 New Rome portraits by @m7600
Thread:
https://wildfiregames.com/forum/index.php?/topic/27520-task-improve-hero-portraits/

This was SVN commit r23985.
2020-08-20 15:29:31 +00:00
e72406ae29 New Sele portraits by @m7600
Thread:
https://wildfiregames.com/forum/index.php?/topic/27520-task-improve-hero-portraits/

This was SVN commit r23984.
2020-08-20 15:29:18 +00:00
1ca34da2b9 New Ptol portraits by @m7600
Thread:
https://wildfiregames.com/forum/index.php?/topic/27520-task-improve-hero-portraits/

This was SVN commit r23983.
2020-08-20 15:27:52 +00:00
484ce28d2f New Helo portraits by @m7600, tweaks on phillip's eye by @wowgetoffyourcellphone, background change on Alexander by @Stan
Thread:
https://wildfiregames.com/forum/index.php?/topic/27520-task-improve-hero-portraits/

This was SVN commit r23982.
2020-08-20 15:25:49 +00:00
f5cfa2b018 New Iber portraits by @m7600
Thread:
https://wildfiregames.com/forum/index.php?/topic/27520-task-improve-hero-portraits/

This was SVN commit r23981.
2020-08-20 15:24:14 +00:00
bdb9fa18c5 Cart Hero portraits by m7600 (hamilcar) and modified background by @wowgetoffyourcellphone and Stan
Thread:
https://wildfiregames.com/forum/index.php?/topic/27520-task-improve-hero-portraits/

This was SVN commit r23980.
2020-08-20 15:21:56 +00:00
d8709f84f3 New Celt portraits by @m7600 and @Stan
Thread:
https://wildfiregames.com/forum/index.php?/topic/27520-task-improve-hero-portraits/

This was SVN commit r23979.
2020-08-20 15:19:47 +00:00
aba6223c85 New Athenians portraits by @m7600
This was SVN commit r23978.
2020-08-20 15:17:42 +00:00
da8c747e3b Move gaia/fauna_hawk -> birds/buzzard.
The "hawk" is actually a buzzard, so renamed.
Moved outside of the "gaia" folder so mapmakers can easily identify
between birds that cannot be interacted with ("birds" folder) and those
that *can* be interacted with ("gaia" folder) even though they may have
the same template name.

Patch by: @Nescio.
Differential Revision: D2254
This was SVN commit r23977.
2020-08-20 08:45:37 +00:00
3c31a6d706 Update the thracian rhomphaia icon green to red, add an icon for the gastaphretes by @wowgetoffyourcellphone, delete an unused icon.
This was SVN commit r23976.
2020-08-19 13:27:13 +00:00
4e63ddbfd9 Add a NVTT version check at compile-time, fixes #5757, refs #5804.
This will prevent users who have an old NVTT installed on their system
from experiencing crashes. Other NVTT issues at runtime should be fixed
by clearing the cache.

Differential Revision: https://code.wildfiregames.com/D2765
This was SVN commit r23974.
2020-08-18 17:30:41 +00:00
996b37f07b Fix logic issue with the DXT1a texture format, refs #4549.
Before the NVTT upgrade, no DXT1a file would have been properly decoded:
they would all have been mistaken for a 8bpp greyscale due to a logic
issue in our code, which would have triggered a crash. I did not notice
the logic issue when performing the upgrade. As a result, decoding those
files now fails silently: their alpha bit will be ignored and they will
be handled as DXT1.

This patch fixes the logic and allows us to decode DXT1a properly, in
accordance with the format specifications. Currently, we do not use this
format.

Reviewed By: wraitii
Differential Revision: https://code.wildfiregames.com/D2522
This was SVN commit r23973.
2020-08-18 16:45:56 +00:00
de53e2ac44 Fixes and improvements to the CI pipelines.
- Custom fixes to coala: support python3.8 and recent versions of
cppcheck
- Adapt .coafile to current coala
- Adapt LicenseYearBear to current `svn` python package
- Move the linter configuration to the coala directory
- Remove the now unused lint-patch script
- Update Jenkins pipelines to report build stderr as a comment on Unix
(including warnings when the build succeeds), and to report lint issues
inline

Tested on Jenkins during the past week.

Differential Revision: https://code.wildfiregames.com/D2931
This was SVN commit r23971.
2020-08-18 12:47:09 +00:00
78d973c11e Check for lastPos existence in Combat-Approaching-MovementUpdate [fix 5568bd4c16]
Fixes 5568bd4c16

`lastPos` isn't guaranteed to exist, though formations are most likely
required to make the situation happen in common gameplay.

Reviewed By: Freagarach
Differential Revision: https://code.wildfiregames.com/D2960
This was SVN commit r23970.
2020-08-18 07:46:29 +00:00
dbca1ed99b Removes unused mapSize uniform and changes too short names of variables in wide scopes.
This was SVN commit r23968.
2020-08-17 21:20:18 +00:00
840ed69fa3 Implements correct distance to edges for the building snapping feature.
The feature was added in a8f241da5d.

Reviewed By: Itms
Tested By: Freagarach
Differential Revision: https://code.wildfiregames.com/D2945
This was SVN commit r23967.
2020-08-17 20:13:18 +00:00
Alexandermb
a909d303de Replace hele_tunic.png to hele_tunic.dds following c9a523796a
This was SVN commit r23965.
2020-08-16 15:24:22 +00:00
ba743afcc1 Move TargetKilled function from Attacking.js-helper to KilledBy in cmpHealth.
Also update some "HPchange" to "healthChange".

Differential Revision: D2941
Reviewed by: @Angen.
This was SVN commit r23964.
2020-08-16 06:10:28 +00:00
dd8c7b597b Remove some redundant lines from ship templates.
- Move nodes that are superseded in (practically) all children.
- Move footprints to specific children since most actors differ anyway.

Patch by: @Nescio.
Differential Revision: D2744
This was SVN commit r23963.
2020-08-15 06:06:15 +00:00
69e7a781c4 Use mercenaries in scenarios instead of mace_* duplicates.
Split off from D2863.

Patch by: @Nescio.
Differential Revision: D2873
This was SVN commit r23962.
2020-08-15 05:52:48 +00:00
Alexandermb
4e033dace9 Correct a typo cooper -> copper.
This was SVN commit r23960.
2020-08-13 02:21:37 +00:00
Alexandermb
c9a523796a Update the cretan pelte with a new mesh (Reused from the Xiongnu shield mesh with some adjustments)
Thread:
https://wildfiregames.com/forum/index.php?/topic/28632-delenda-est-screenshots/#comment-402708

Added a few textures required by the actor.

This was SVN commit r23959.
2020-08-12 19:49:05 +00:00
c527ca3d6c Remove some unnecessary lines from a few civic structure templates.
Patch by: @Nescio.
Differential Revision: D2850.
This was SVN commit r23957.
2020-08-10 06:06:43 +00:00
24e0e50a9d Javelinist -> Javelineer in templates.
Follow up to f489ab3a16.

Patch by: @Nescio.
Differential Revision: D2914
This was SVN commit r23956.
2020-08-10 05:59:56 +00:00
4f39e6675a Completely separates fixed and shader paths in sky rendering.
Removes usages of fixed pipeline functions in shader path.

Tested By: Stan
Differential Revision: https://code.wildfiregames.com/D2944
This was SVN commit r23954.
2020-08-09 15:21:06 +00:00
b664a1ae8e Moves GL calls of fixed pipeline under the same condition.
This was SVN commit r23953.
2020-08-09 13:01:58 +00:00
4c1847d3db Removes old matrices from sky rendering in shader path.
Tested By: Stan
Differential Revision: https://code.wildfiregames.com/D2943
This was SVN commit r23952.
2020-08-09 11:24:09 +00:00