1
0
forked from mirrors/0ad
Commit Graph

20795 Commits

Author SHA1 Message Date
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
wraitii cb25b5e9b7 Tweak vision of walls and some special structures.
Those buildings get 1 vision (making them selectable), but no longer
provide vision on their own.
Wall Towers have their vision increased slightly to make it larger than
their attack range and to compensate for it.

Patch by: Nescio
Accepted By: borg-, genava55, wraitii
Differential Revision: https://code.wildfiregames.com/D2505
This was SVN commit r23934.
2020-08-05 09:36:23 +00:00
wraitii 395a10beb0 Fix compilation error on arch introduced by 5473393e30
CLogger.h uses std::deque but doesn't include the required header file.
This fails since 5473393e30 on Arch Linux

Reported by: navigo_ps91
Reviewed By: irishninja
Differential Revision: https://code.wildfiregames.com/D2928
This was SVN commit r23933.
2020-08-05 09:25:24 +00:00
wraitii 1dd01f2ca8 Tweak soldier footprints
Switch cavalry / elephant footprints to a 2:1 ratio.

Accepted By: wraitii, genava55
Differential Revision: https://code.wildfiregames.com/D2496
This was SVN commit r23932.
2020-08-04 14:24:34 +00:00
wraitii a0ee4f35a8 Remove territory influence from arch, monument, pillar
Patch by: Nescio
Accepted By: borg-, genava55, wraitii
Differential Revision: https://code.wildfiregames.com/D2504
This was SVN commit r23931.
2020-08-04 13:48:09 +00:00
wraitii ce9307c1a9 Streamline animal footprints.
Define them in specific templates as animals generally have specific
actors.
Use values in 0.5 steps and pick them appropriately for each actor.

Patch by: Nescio
Accepted By: wraitii, genava55
Differential Revision: https://code.wildfiregames.com/D2721
This was SVN commit r23930.
2020-08-04 13:42:49 +00:00
wraitii 84d92ecfaf Disable artillery towers and bolt towers in-game.
Introduced by 21106e011f and d4db7d2e0b respectively, these templates
were introduced without taking gameplay considerations into account, and
players disliked them.
De-activate them from regular play until a better solution can be found.

Test Plan: Check for completeness and correctness. Agree unbuildable is
an improvement over brokenness.

Patch by: Nescio
Accepted by: borg-, wraitii
Differential Revision: https://code.wildfiregames.com/D2495
This was SVN commit r23928.
2020-08-03 14:11:16 +00:00
Stan ea725cc289 Fix text input max_length attribute. fixes 5593f573f4
Reviewed by: @wraitii
Fixes #5266
Differential Revision: https://code.wildfiregames.com/D2377
This was SVN commit r23927.
2020-08-03 12:39:25 +00:00
wraitii 01118c1196 Fix issues relating to SDL and wxWidgets interaction in Atlas.
This fixes the transfer of key inputs from WxWidgets to SDL, making it
possible to type in the in-game GUI from Atlas.

Also fixes whitespace issues in some Atlas files.

The following improvements are OSX specific:
- fixes an SDL assertion related to unused subsystems in Atlas.
- Remove the 'osxguiapplication' override. This fixes the editor
starting up in the background and not accepting input when launched from
in-game.
- To prevent an issue with sdl/wxwidgets conflict when running from
inside the game, actually boot a new instance (see #2427)


Reported by: wik (Many thanks for your investigations)
Tested by: trompetin17, Stan
Fixes #2427
Fixes #2846

Differential Revision: https://code.wildfiregames.com/D2788
This was SVN commit r23926.
2020-08-03 12:23:16 +00:00
wraitii 375c319639 Improve ship pickup.
Improve unitAI: don't move if the requester can reach us and we are
close enough. This avoids an issue where ships moved more than necessary
when picking up many units.
Also improve requester UnitAI -> retry pickup if the target entity is
Idle.
Improve unitMotion: periodically recompute paths in "known bad path"
mode to adapt to moving targets.
Expose UnitMotion reachability to scripts and other code.

This adds a test map for some common and some tricky pickup cases, using
triggers.

Based on a patch by: causative
Reviewed By: Freagarach
Fixes #3472

Differential Revision: https://code.wildfiregames.com/D665
This was SVN commit r23925.
2020-08-03 12:02:24 +00:00
Freagarach 88dc6d8e1e Do not let every entity with UnitAI listen to "OnGlobalConstructionFinished".
All entities with UnitAI wastefully listened to global
ConstructionFinished messages. Now the message is only sent to assigned
builders.

Differential Revision: D2697
Reviewed by: @wraitii.
This was SVN commit r23924.
2020-08-03 10:13:54 +00:00
Freagarach 7bf1bf3f66 Alphabetize entity limits and statistics classes.
This makes it less likely to add double entries. Also corrects
indentation in the `<StatisticsTracker>`-node.

Patch by: @Nescio.
Differential revision: D2834
This was SVN commit r23923.
2020-08-03 09:25:22 +00:00
wraitii a6e41c545e Allow women citizen to lay the same foundations as citizen soldiers.
Women could already build/repair such buildings, they simply could not
be used to place foundations.
This reduces micro and removes a minor annoyance.

Accepted By: Nescio, borg-, badosu, itms
Differential Revision: https://code.wildfiregames.com/D2911
This was SVN commit r23921.
2020-08-02 12:43:14 +00:00
wraitii d0ff48bc7a Fix gathering infinite loop when the gatherer is out of the world.
Promoted units move out of the world but keep their current orders,
which can trigger invalid states.
As cleanup, handle this case in GATHER.FINDINGNEWTARGET

A more general fix seems possible by putting the UnitAI in a default
state.

Reported by: psypherium
Reviewed By: Angen
Fixes #5788

Differential Revision: https://code.wildfiregames.com/D2920
This was SVN commit r23920.
2020-08-02 11:40:46 +00:00
wraitii 21cdcf44bc Fix segfault when sending a very large net chat message.
This crash occured on the receiver machine, making it effectively a
remote crash attack.

Reported by: Riddler66
Based on a patch by: elexis
Fixes #5726

Differential Revision: https://code.wildfiregames.com/D2629
This was SVN commit r23918.
2020-08-01 15:25:13 +00:00