1
0
forked from mirrors/0ad
Commit Graph

20809 Commits

Author SHA1 Message Date
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
Imarok 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
Freagarach 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
Freagarach 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
Stan 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
Stan 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
Stan 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
Stan 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
Stan 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
Stan 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
Stan 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
Stan 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
Stan 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
Stan 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
Stan aba6223c85 New Athenians portraits by @m7600
This was SVN commit r23978.
2020-08-20 15:17:42 +00:00
Freagarach 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
Stan 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
Itms 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
Itms 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
Itms 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
wraitii 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
vladislavbelov 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
vladislavbelov 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
Freagarach 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
Freagarach 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
Freagarach 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
Freagarach 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
Freagarach 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
vladislavbelov 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
vladislavbelov b664a1ae8e Moves GL calls of fixed pipeline under the same condition.
This was SVN commit r23953.
2020-08-09 13:01:58 +00:00
vladislavbelov 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
Angen 36c1566640 Forgot female support in d503363e83
This was SVN commit r23951.
2020-08-08 11:52:55 +00:00
Angen b3f40e54f8 Correct cart.json changes that slipped on commit rebase in d503363e83
This was SVN commit r23950.
2020-08-08 11:37:58 +00:00
Angen d503363e83 Rename italiote to italic
Differential Revision: D2796
Patch by: Nescio
Reviewed by: Angen, Stan
0 A.D. currently uses the term "Italiote" [sic]. It's best to use
precise language:

Italic refers to a branch of Indo-European and the peoples that speak it
(cf. Celtic).
Italian refers to the modern language, descendant from Latin, the people
that speak it, and their country (cf. Romanian).
Italiot (from Ἰταλιώτης) refers to Greeks living in Italy (cf. Cypriot).
From the context it's clear what 0 A.D. actually means (Samnites etc.)
is Italic.

This patch therefore:

Corrects the art file names.
Also renames the other embassy icons for consistency (cf. D2551).
Corrects the embassy template file name.
Adjusts the affected templates, AI, and map file.
Deletes the unused Celt, Iberian, Italian classes.
Updates the embassy template tooltips (cf. D2578) and cart.json civ file
entries.
Orders the <Identity> node in the templates as specified in Identity.js.

This was SVN commit r23949.
2020-08-08 11:23:34 +00:00
vladislavbelov 26ae55cad0 Adds contrast-adaptiv-sharpening filter, also helps to partly remove FXAA texture blurring.
Patch By: OptimusShepard
Tested By: Stan
Differential Revision: https://code.wildfiregames.com/D2642
This was SVN commit r23947.
2020-08-07 22:16:55 +00:00
Freagarach 8d90636306 Correct buildings in PetraAI's config.js.
Add missing entries and remove deprecated rotary mill.
Also some cosmetic changes.

Patch by: @Nescio.
Differential Revision: D2887
This was SVN commit r23946.
2020-08-07 17:36:11 +00:00
vladislavbelov e49cc91257 Adds ARB shaders for GUI materials to replace fixed ones.
Tested By: Stan
Differential Revision: https://code.wildfiregames.com/D2921
This was SVN commit r23945.
2020-08-07 08:32:01 +00:00
Freagarach 3b668e0a71 Fix the barter string which were in reversed order.
Also rename variables to reduce ambiguity.

Patch By: @Nescio
Differential Revision: https://code.wildfiregames.com/D2893
This was SVN commit r23944.
2020-08-07 07:34:02 +00:00
wraitii f27e5ce139 Fix ODR violation for ShaderModelRendererInternals.
ShaderModelRendererInternals is defined twice, once by ModelRenderer.cpp
and once by HWLightingModelRenderer.cpp.
Having two different definitions in the global namespace is a violation
of the C++ One-Definition-Rule.

Patch by: StefanBruens
Reviewed By: wraitii, Vladislav
Differential Revision: https://code.wildfiregames.com/D2932
This was SVN commit r23941.
2020-08-06 11:33:26 +00:00
wraitii 45d136d57e Fix GetPosition2D call when the entity may be out of the world in unitMotion
As reported by Freagarach following a7da40ac2f.

32e8ed51aa introduced a "MoveObstructed" message, that could be sent
when the entity ran into obstructions, to stop early.
In HandleObstructedMove, my intention, as written in the comment, was
that the caller would do its thing (call StopMoving(), move out of the
world etc.) and thus ComputeGoal would return early.

However, I mistakenly left the `cmpPosition->GetPosition2D()` in between
that and ComputeGoal, which would then fail.

This fixes that by moving it after the `ComputeGoal` call.

Also add a sanity StopMoving() call to a7da40ac2f's move-out-of-world
call.

Reported by: Freagarach
Differential Revision: https://code.wildfiregames.com/D2935
This was SVN commit r23940.
2020-08-06 08:40:14 +00:00
wraitii cdefefa617 Switch Medium and Normal map sizes.
The default size used to be Medium, when "Normal" makes more sense for
that.
Further, "medium" is now halfway between tiny and giant sizes, which
also makes more sense.

Patch by: Nescio
Reviewed By: wraitii
Differential Revision: https://code.wildfiregames.com/D2927
This was SVN commit r23939.
2020-08-06 07:57:27 +00:00
wraitii 02efd269c9 Only scan the relevant part of the map in DiskPlacer
This makes it faster, particularly for small radiuses.

Patch by: badosu
Comments by: elexis
Reviewed By: wraitii
Differential Revision: https://code.wildfiregames.com/D2710
This was SVN commit r23938.
2020-08-06 07:03:26 +00:00
Freagarach 3fbc3f2cd5 Standardise armour technology tooltips.
Makes the tooltips of technologies that modify armour consise.

Patch by: @Nescio.
Differential Revision: D2579
Reviewed by: @Gallaecio.
This was SVN commit r23937.
2020-08-06 06:05:28 +00:00
Freagarach bbeeaae768 Rename workshop to arsenal.
A workshop is a more generic place of doing work whilst an arsenal is a
place where artillery is handled, which is the purpose of the structure
in 0 A.D..

Patch by: @Nescio.
Differential Revision: D2756
This was SVN commit r23935.
2020-08-05 18:47:17 +00:00