1
0
forked from 0ad/0ad
Commit Graph

20587 Commits

Author SHA1 Message Date
bb
74a02d232e Allow a garrisonholder to not have health.
Patch by: Freagarach
Adaptation by: wraitii
Differential Revision: D2375
This was SVN commit r23720.
2020-05-31 19:40:54 +00:00
bb
29098b456b Remove all spaces, caps, parentheses and hyphens from map file names.
PersistMatchSettings are broken by this commit.

Comments By: leper, itms, Stan, vladislav, elexis
Patch By: Nescio
Differential Revision: D1042
This was SVN commit r23719.
2020-05-31 19:10:15 +00:00
6a29c46b5f Fix Gaul trader offset. Refs https://code.wildfiregames.com/D2640
This was SVN commit r23718.
2020-05-31 16:21:42 +00:00
bb
82c2de90fd Replace the Flight_demo map from 2c58b07223 with Flight_demo_2 from a64f1356cb. Adding a runway on a cliff to the latter, so all functionalities are kept.
While at it remove the cap from the name, according to the art naming
conventions.

Noticed and proposed by Nescio in D1042
Comments by: elexis, stan, vladislav
This was SVN commit r23717.
2020-05-31 15:55:21 +00:00
bb
743443977b Rename brit_champion_cavalry* to brit_champion_chariot*
Patch By: Nescio
Comments By: Stan
Differential Revision: https://code.wildfiregames.com/D2529
This was SVN commit r23716.
2020-05-31 14:16:23 +00:00
Angen
10fb4822df [gameplay-a24] Allow training all barracks champions at captured barracks.
Before this change, civilisation could train champions in captured
barracks only if captured barracks allowed to train that unit, what was
not always the case so some champions were allowed to be trained in
captured barracks and some was not.

Differential Revision: https://code.wildfiregames.com/D2547
Patch by: Nescio
Reviewed by: ValihrAnt
This was SVN commit r23715.
2020-05-31 10:12:02 +00:00
531dcf40c3 Revert 0363202a20, 2abd9cead2 and b4144dc2c3
Player-testing has revealed QA issues, so reverting these for now.

Differential Revision: https://code.wildfiregames.com/D2773
This was SVN commit r23714.
2020-05-31 10:06:39 +00:00
0cde295654 Make wall segment cost proportional.
Patch by: @Nescio.
Reviewed by: @ValihrAnt
Differential Revision: https://code.wildfiregames.com/D2611
This was SVN commit r23713.
2020-05-31 07:29:26 +00:00
b4144dc2c3 Hotfix for 2abd9cead2 - remove the OnEntityRenamed handling.
0363202a20 actually fixed the particular issue of upgrading a long-wall
to a gate by correctly handling it in UnitAI, so this code, which didn't
work, is no longer needed anyways.

Noticed by running units_demo which seems to have skirmish replacer
placeholders.

This was SVN commit r23711.
2020-05-30 14:26:33 +00:00
2abd9cead2 Enable garrisoning on gates / fix movement of units with visible garrison points
This addresses two related issues:
- Units visibly garrisoned on gates keep the gate open.
- Units visibly garrisoned on entities keep their pathfinding blocker
flags.

Remove the block-movement flag from visibly garrisoned entities.
Keep a list of entities that cannot move and thus should not count
towards gate-opening logic.

Packing logic is kept separate: it is more related to entities having
'alternate forms' with different capabilities than being currently
incapable of moving.

Based on work by temple

Comments by: Freagarach
Tested by: Nescio
Fixes #2679
Fixes #5151

Differential Revision: https://code.wildfiregames.com/D1418
This was SVN commit r23710.
2020-05-30 09:18:33 +00:00
ed2ae1d283 Do not compute capture points for the invalid player on player defeat
Reviewed By: Freagarach
Refs #5745

Differential Revision: https://code.wildfiregames.com/D2748
This was SVN commit r23709.
2020-05-30 06:25:10 +00:00
0363202a20 Trigger an exit-reentry when the target entity of an order is renamed
This lets sunit AI FSM states correctly handle target entity renaming by
processing a message when that happens. The default behaviour is to
leave-reenter the state, which re-runs sanity checks and optionally
picks a better behaviour.

UnitMotion is still not made aware of entity renaming, as the
leave-enter makes it irrelevant in practice. It still may be a good idea
to implement that someday.

Fixes the concern raised at de1bb8a766.
Fixes #5584

Comments by: bb, Freagarach
Reported by: minohaka, bb, Freagarach
Differential Revision: https://code.wildfiregames.com/D2735
This was SVN commit r23708.
2020-05-29 17:00:50 +00:00
131590927f Remove the old, broken colosseum and the version that was made for Delenda Est introduced in 83680b0dee which was completely unused and did not provide actors. They belong to 0 A.D: Empire Besieged.
This was SVN commit r23707.
2020-05-29 14:11:26 +00:00
ebd9786268 Add missing cpp files in last commit refs D2503
This was SVN commit r23704.
2020-05-28 18:18:00 +00:00
cdade0af30 Reorganize selection textures by size instead of by shapes. Optimize templates to reduce duplication
Patch by: @Nescio
Differential Revision: https://code.wildfiregames.com/D2503
This was SVN commit r23703.
2020-05-28 18:05:05 +00:00
bb
5cfce692e7 Implement keyDown event
Change HotkeyPress event to be non-repeating (HotkeyDown to replace the
repeating case)
Fix shiftlag
Make toggle hotkeys only respond to the first SDL event.

Many iterations of review by: elexis
Test done by: Imarok
Comments By: vladislav, Stan
Reviewed By: wraitii
Fixes: #5055
Differential Revision: https://code.wildfiregames.com/D1398
This was SVN commit r23701.
2020-05-26 21:47:03 +00:00
892f97743b Fix some cases of units getting stuck.
This fixes an off-by-one error that led to entities sometimes getting
stuck against obstructions.
It also increases the max-range of the short pathfinder to help entities
find their way around corridors and house blocks.

Fixes 2ff8614ce2 (off-by-one error) and reverts the range changes from
32e8ed51aa

Reported By: Freagarach
Fixes #5586 . Refs #5624

Differential Revision: https://code.wildfiregames.com/D2754
This was SVN commit r23699.
2020-05-25 20:13:35 +00:00
d68b3bb098 Do not send Attacked message on entities that have no attack effects receiver
Since 16b452cf91, it is possible for units to be sent "Attacked"
messages even though they cannot be attacked
(e.g. a non-capturable being the target of a Capture attack effect).
These messages are spurious and should not be sent.

Reported By: Angen
Differential Revision: https://code.wildfiregames.com/D2758
This was SVN commit r23698.
2020-05-25 19:14:46 +00:00
28f591ad1e Add slaughter animations to most units.
Discussed briefly with @fatherbushido
Thread:
https://wildfiregames.com/forum/index.php?/topic/27974-slaughter-attack-in-actors-templates/&tab=comments#comment-394851

Differential Revision: https://code.wildfiregames.com/D2708
This was SVN commit r23697.
2020-05-25 10:07:20 +00:00
Angen
9f6d44feb8 Remove some variables from serialisation and update this.animations name to reflect what it actually holds [Formations.js]
Needs ReviewPublic

Differential Revision: https://code.wildfiregames.com/D2707
Comments by: elexis, Stan, wraitii, bb
Remove variables were not needed to be serialised or stored inside
component
Create `variablesToSerialize` to hold list of variables, that need to be
Serialized.
Rename `this.template.Animations` to `this.template.AnimationVariants`
(and anything related) as it does not hold animation names but names of
animation variants what is misleading.
Do not create timer when deserializing as that would cause oos and timer
already exists.
this.Init has to be called from Deserialize because it is not called by
default

This was SVN commit r23694.
2020-05-23 13:03:34 +00:00
Angen
21e3eedd2f Fix computation of clusters and var->let
Compare matrix values against `undefined` instead of relying on `||`
because `||` does not work as intended when distance is `0`.

Differential Revision: https://code.wildfiregames.com/D2761
Fixes: #5761

This was SVN commit r23693.
2020-05-23 12:53:11 +00:00
Angen
c8e6c05334 Fix gcc warning reported by Imarok after 204e17206b
Introduced in 204e17206b.
Gcc gives warning about missing parenthesis so this patch is adding
them, not changing result of expression.
Fix proposed by Imarok in P206 after report on irc
http://irclogs.wildfiregames.com/2020-05/2020-05-22-QuakeNet-%230ad-dev.log.

Differential Revision: https://code.wildfiregames.com/D2762
Reviewed by: elexis
This was SVN commit r23692.
2020-05-23 12:21:49 +00:00
Angen
204e17206b Update plural_forms.cpp by tinygettext to reflect needs of translators
Some languages like sk in [[SVN:21907]] have changed crucial line with
information about how many plurals language uses and how to calculate
correct one. However in plural_forms this line could not be matched with
implemented functions so as result object with default settings have
been returned what resulted in using only singular for translatePlural
calls.

Affected languages (12):
sk, lt, uk, cs, pl, ro, mk, he, ga, cy, be, br

I am leaving old variants as they can be useful for another languages.

Differential Revision: https://code.wildfiregames.com/D2751
Comments by: wraitii
This was SVN commit r23690.
2020-05-22 20:06:40 +00:00
9034335d22 Correct WallPiece schema help comments
(Fairly sure I've got them right this time.)

Refs: #2944, D900, da35f63279

This was SVN commit r23687.
2020-05-21 19:11:00 +00:00
6e6c401ee8 Check the library version instead of the mtime of the already-built guard file in build-osx-libs.sh
Use a suffix for bundled libraries in order to rebuild them when we
patch them, refs #2551.

Patch By: Krinkle
Differential Revision: https://code.wildfiregames.com/D2649
This was SVN commit r23686.
2020-05-21 15:28:38 +00:00
57636140b5 Fix typo (certifiacte -> certificate) imported from gloox in 0e2adda813, reported by pilino1234 on transifex, relayed via Angen on Phabricator.
This was SVN commit r23685.
2020-05-21 10:15:26 +00:00
da35f63279 Add help comments to WallPiece component schema
Also resolves whitespace issue in WallSet component breaking structree
and rmgen
wallbuilder when wall curve pieces are listed separated with newlines (&
tabs)
instead of single spaces.

Requested by: Nescio
Refs: #2944, D900

This was SVN commit r23684.
2020-05-21 04:34:13 +00:00
bb
b8be438472 Invert a case in 585f9e76a5
This was SVN commit r23683.
2020-05-20 19:47:40 +00:00
bb
585f9e76a5 Create unitAI function to match a target's speed.
Patch By: Freagarach
Differential Revision: D2731
This was SVN commit r23682.
2020-05-20 19:39:36 +00:00
c1ddc0c4b9 Internationalise Damage Types and Status Effects using (optional) JSON files.
.json files in simulation/data/template/helpers/damage_types and
status_effects will be used to internationalise damage types and status
effects, as well as share common text.
Fixes the order of damage types being inconsistent.

Add the possibility for i10n xml extractor to set a custom context.

Fixes #4801
Related to D2296.

Featuring work from: Freagarach

Differential Revision: https://code.wildfiregames.com/D2337
This was SVN commit r23681.
2020-05-20 17:26:37 +00:00
441f17cbeb Fix EntitiesNearPoint range query
Use a fixed range delta around the missile hit-location for neighboring
entities to damage.
Use a common query for GAIA and non-GAIA entities.
Do not presume attackable entities have Health.
Fix an issue where gaia entities were returned twice.

This fixes concerns reported by elexis at 38b2e37a61 and by Freagarach
at 16b452cf91.

Differential Revision: https://code.wildfiregames.com/D2738
This was SVN commit r23680.
2020-05-20 17:03:33 +00:00
Angen
d113a94d4d Add missing .(dot) in tooltip in maur_defense_tower.xml
Reported by GunChleoc on transifex.
Introduced in 14bd613288

This was SVN commit r23679.
2020-05-20 16:50:40 +00:00
bb
3f3a699b9e Allow timers to update their interval.
Patch By: Freagarach
Differential Revision: https://code.wildfiregames.com/D2666
This was SVN commit r23678.
2020-05-19 15:42:57 +00:00
c9d9b7be83 macOS build fixes and Jenkins pipelines.
This includes:
- some build fixes
- Jenkins pipelines, in use since January
- a revamped DMG build script, including dmgbuild configuration by Tobbi
and a tweak by norsnor (D2650)

Differential Revision: https://code.wildfiregames.com/D2523
This was SVN commit r23676.
2020-05-17 14:12:53 +00:00
782a77f106 Allow using system premake5 (with the flag --with-system-premake5) when running update-workspaces.sh, refs #1518.
Differential Revision: https://code.wildfiregames.com/D2519
This was SVN commit r23675.
2020-05-17 11:41:58 +00:00
4eac7b6958 Rename the Seleucid citizen pikeman to ϕαλαγγίτης phalangitēs / phalangite
Corrects the name of the Seleucid champion pikeman: “silver shields” is
the name of their corps, they fought as phalangites, thus there is no
need to specify that.

Patch by: @Nescio
Comments by: @wowgetoffyourcellphone
Differential Revision: https://code.wildfiregames.com/D2736
This was SVN commit r23674.
2020-05-16 21:14:52 +00:00
5f38609350 Cleanup Timer.js
Reviewed by: @bb
Comments by: @elexis, @Freagarach, @Polakrity
Differential Revision: https://code.wildfiregames.com/D1776
This was SVN commit r23673.
2020-05-16 17:41:07 +00:00
wackyserious
2f5c4999fe Add missing file reported in: https://wildfiregames.com/forum/index.php?/topic/28160-error-after-revision-23670/
This was SVN commit r23672.
2020-05-16 06:23:50 +00:00
40f77d0f0f Rename civinfo page from "History" to "Civilization Overview"
Patch by: Nescio
Accepted by: s0600204
Differential Revision: https://code.wildfiregames.com/D2722
This was SVN commit r23671.
2020-05-15 21:27:35 +00:00
wackyserious
77f901266b Texture Update: Arab Javelineer and Nabatean Camel Archer
Thread:
https://wildfiregames.com/forum/index.php?/topic/25200-committed-arab-javelineer-and-nabatean-archer-unit-texture/

Reviewed by: Sundiata, Alexandermb and Nescio
This was SVN commit r23670.
2020-05-15 10:19:18 +00:00
wackyserious
d6dcb558ca Texture Update: Seleucid Thorakites (by wowgetoffyourcellphone)
Thread:
https://wildfiregames.com/forum/index.php?/topic/28150-committed-seleucid-thorakites-unit-texture/

Reviewed by: Stan, Lion.kanzen and wackyserious
This was SVN commit r23669.
2020-05-15 09:25:42 +00:00
wackyserious
f864aa5a15 Texture Update: New (and updated) Persian Unit Textures
-Sardian auxillary
-Sogdian archer (basic)
-Hyrcanian cavalry

Thread:
https://wildfiregames.com/forum/index.php?/topic/23634-committed-persian-unit-texture-upgrade/&do=findComment&comment=390782

Feedback by: Nescio
This was SVN commit r23668.
2020-05-15 08:51:22 +00:00
Alexandermb
1491837208 New macedonian aspis.
New roster and cleaner gorgon shield for spartan champion.

Reflective metal for basic athen shields.

This was SVN commit r23666.
2020-05-14 20:13:51 +00:00
bb
b109a127e5 Add XPtrickle test after d392472d44, cleanup promotion test.
Patch By: Freagarach
Differentital Revision: https://code.wildfiregames.com/D2670

This was SVN commit r23665.
2020-05-14 15:07:33 +00:00
Alexandermb
9953e2ca85 Upload hele_crest_hair_06.xml actor wich wasn't uploaded on latest committ and replace hele_crest_thracian_hair_p3.xml actor on hair slot.
This was SVN commit r23664.
2020-05-13 14:01:32 +00:00
Alexandermb
f6a77a9d7d Fix Seleucid thracian helmets crest to new one and delete unused crest's.
This was SVN commit r23663.
2020-05-12 20:40:09 +00:00
Alexandermb
baf5af5a23 Seleucid shields cleaning and new thespian variants.
This was SVN commit r23662.
2020-05-12 19:32:58 +00:00
f2d30ed94d Rename test_resources.js to test_Resources.js for consistency.
Reviewed by: @bb
Differential Revision: https://code.wildfiregames.com/D2730
This was SVN commit r23661.
2020-05-12 17:22:44 +00:00
c08016d950 Optimize GetIdentityClasses in Templates.js
Add unit tests.

Reviewed by: @bb
Differential Revision: https://code.wildfiregames.com/D2404
This was SVN commit r23660.
2020-05-12 15:24:59 +00:00
Alexandermb
b61b21afb7 Spartan Dokana shield.
Resize of a helmet/cart_helmet_01_bronze.png

Fix aspis_athen_m.xml variant name

This was SVN commit r23659.
2020-05-11 19:13:46 +00:00