1
0
forked from 0ad/0ad
Commit Graph

19553 Commits

Author SHA1 Message Date
0c20afdfda Unit Motion: MoveTo family of function no longer returns false if the move is un-necessary, instead unitAI checks explicitly.
This also moves the actual "moving" code to states instead of orders,
making states more self-contained and removing the change of errors when
cleaning up a state.

Differential Revision: https://code.wildfiregames.com/D1865
This was SVN commit r22313.
2019-05-28 11:38:18 +00:00
e2233a4a90 Don't clear pathnames in vfs::GetPathnames so it can be called several times.
Differential Revision: https://code.wildfiregames.com/D1914
This was SVN commit r22312.
2019-05-28 10:18:04 +00:00
899714f667 Small commands.js cleanup
Differential Revision: https://code.wildfiregames.com/D1504
This was SVN commit r22311.
2019-05-28 10:00:19 +00:00
0f645b45a9 Fix red squares on some maps when using HQ water effects
This fixes an oversight in rp22297.

Reported By: gameboy
Differential Revision: https://code.wildfiregames.com/D1919
This was SVN commit r22310.
2019-05-28 09:57:14 +00:00
42591587a8 New less broken walls for the gauls, move the gaul walls to the gaul repository, the gaul gate will be moved when it's replaced/improved.
Thread:
https://wildfiregames.com/forum/index.php?/topic/17326-your-screenshots/page/19/
https://wildfiregames.com/forum/index.php?/topic/19465-suggestions-for-the-gauls/page/4/

This was SVN commit r22309.
2019-05-27 22:01:25 +00:00
804d36fca3 Add a build flag to prefer locally-built libraries (linux/bsd systems)
To use:
```
./update-workspaces.sh --prefer-local-libs
```
Then run `make` as usual.

Accepted by: Itms
Differential Revision: https://code.wildfiregames.com/D1747
This was SVN commit r22308.
2019-05-27 15:45:57 +00:00
792027f18d Unify stables names.
Fix some decals,
Remove AO suffix,
Rename struct_b to roof
Use stable_elephant as per the art convention
<general>_<civ>_<type>_<extra>_<variation>

This was SVN commit r22306.
2019-05-26 20:11:58 +00:00
12f893b1e3 Remove 'Async' from short/long path requests names
Having Async in the name was not really informative and made it awkward
to reuse for non-async code.

Reviewed By: Kuba386
Differential Revision: https://code.wildfiregames.com/D1854
This was SVN commit r22305.
2019-05-26 13:47:41 +00:00
f504c643a0 Allow entities to be affected by Status Effects from ranged attacks.
This implements a status effects receiver component (in a similar
fashion to the damage receiver component). The plan is to further extend
this component notably to handle graphical indication of status effects,
and a variety of other effects.

Currently implemented: ranged attacks can inflict status effects that
reduce HP over time.
This can be resisted by armour.

No units currently utilise this in-game but with proper graphics support
that could be changed.

Patch By: Mate-86
Reviewed By: wraitii
References #1912

Differential Revision: https://code.wildfiregames.com/D1252
This was SVN commit r22304.
2019-05-26 12:44:46 +00:00
65fcd66556 Update precompiled headers to improve build times.
Expect a 10-25% build time improvement.

Original Patch By: Angen
Reviewed By: Angen
References #5038

Differential Revision: https://code.wildfiregames.com/D1333
This was SVN commit r22303.
2019-05-26 07:21:12 +00:00
9ea68317ad Use pkg-config where possible instead of hard-coding or library-specific programs
Accepted by: Itms, wraitii
Previously tested by: andy5995
Fixes: #5157
Refs: D1582
Differential Revision: https://code.wildfiregames.com/D1611
This was SVN commit r22302.
2019-05-25 18:00:40 +00:00
220449ea9a JPS - make the JPC cache usable again (98f4ed6cb8 fix)
Reviewed By: Itms
Differential Revision: https://code.wildfiregames.com/D1875
This was SVN commit r22301.
2019-05-25 16:01:44 +00:00
537a141867 Early-exit when destroying invalid entities (INVALID_ENTITY, already destroyed…)
Destroying INVALID_ENTITY is valid and should do nothing.

The current code will send MT_Destroy messages when doing this, which is
un-necessary work and feels kind of broken to me.
Early-exit instead.

Reviewed By: Itms
Differential Revision: https://code.wildfiregames.com/D1736
This was SVN commit r22300.
2019-05-25 15:59:43 +00:00
94e0856485 ShouldConsiderOurselvesAtDestination renamed to CloseEnoughFromDestinationToStop and stateful effects moved at the caller.
It improves readability of the code when a function that seems like it
does a simple check actually only does a simple check and the caller is
the one changing state.

Differential Revision: https://code.wildfiregames.com/D1884
This was SVN commit r22299.
2019-05-25 13:23:44 +00:00
ea208f19a3 Health.js cleanup: add tests, add an "IsInjured" function, use this.hitpoints everywhere
Continuation of D1769.

Differential Revision: https://code.wildfiregames.com/D1828
This was SVN commit r22298.
2019-05-25 13:11:46 +00:00
01a8138780 Water GLSL shader improvements around reflections and whitespace fixes.
This improves refractions around entities close to the surface, such as
fishes, by handling depth better and by clipping the water plane a
little lower.

This uses the skybox for reflections when refractions are enabled but
reflections are disabled, making it possible to play with reflections
disabled without having super-ugly water (arguably a performance
improvement).

Differential Revision: https://code.wildfiregames.com/D359
This was SVN commit r22297.
2019-05-25 11:08:57 +00:00
b637fdbae9 Add unit motion integration test map
This uses trigger to create some scientific test cases for unit motion
(the whole unitAI->Motion->Pathfinders stack)

Differential Revision: https://code.wildfiregames.com/D1892
This was SVN commit r22296.
2019-05-25 10:26:03 +00:00
d15e7df5de Target build version explicitly for Xcode
Xcode otherwise defaults to the latest Mac OS version.

Reviewed By: Wraitii
Differential Revision: https://code.wildfiregames.com/D1482
This was SVN commit r22295.
2019-05-25 08:28:35 +00:00
31010f493d Replace , with . in an AI's chat sentence
Patch by: Nescio
Differential Revision: https://code.wildfiregames.com/D1912
This was SVN commit r22293.
2019-05-21 17:32:14 +00:00
24b42ef15c Use Alexandermb's shield for the gaul theatron.
This was SVN commit r22292.
2019-05-20 12:51:55 +00:00
3aace01be7 New Briton Blacksmith.
Make all the props in the blacksmith buildings separate
Add three tools, one hammer, two tongs
Use the new briton shields on the blacksmith
Use the new helmets on the blacksmith
Add new crates, and gives it a bit more geometry.
Update the anvil eyecandy prop

This was SVN commit r22290.
2019-05-19 17:50:29 +00:00
3cc010d44e New deer icon by @wowgetoffyourcellphone
Reviewed by: @Stan
This was SVN commit r22289.
2019-05-19 09:18:07 +00:00
904b537483 Fix blood sometimes appearing below the infantry hero Ashoka.
This was SVN commit r22288.
2019-05-19 08:02:29 +00:00
3477b561a5 New icons for the boar, the camel, the horse, the walrus and the wildebeest by @wowgetoffyourcellphone
Reviewed by: @Stan
This was SVN commit r22287.
2019-05-18 09:29:02 +00:00
dc34d9c5d0 Fix possibly using uninitialized global in 80635665f7 and rename GetDirectoryName
Reviewed by: weberkai
Fixes: #4789
Differential Revision: https://code.wildfiregames.com/D1852
This was SVN commit r22284.
2019-05-14 10:13:02 +00:00
621bb1367a [CChart] Add a percentage format and round displayed integers
Reviewed by: bb
Approved by: Vladislav
Differential Revision: https://code.wildfiregames.com/D1878
This was SVN commit r22282.
2019-05-13 21:23:26 +00:00
f0f06deaf3 Fix ResetMoveSpeed rename missed in 859d96fba5, introduced by ac47803221.
This was SVN commit r22281.
2019-05-13 19:40:58 +00:00
bb
964934cf4e Make the ai aware ranges no longer have the barracks class
fixes 536d5e3af4

Patch By: Angen
Comments By: Nescio, Stan
Differential Revision: https://code.wildfiregames.com/D1857
This was SVN commit r22280.
2019-05-13 18:53:21 +00:00
795e414663 Hierarchical pathfinder: Speed up edge update
Speed up edge update by being clever, only updating dirty tiles instead
of everything (effectively doing to "TODO be clever" here).

This is a substantial speed improvement when an update is necessary.

Differential Revision: https://code.wildfiregames.com/D1834
This was SVN commit r22279.
2019-05-13 17:02:16 +00:00
32b2c01c7c Decouple long and hierarchical pathfinders to an extent.
Following 809f297707, this decouples the hierarchical pathfinder and the
long pathfinder. The long pathfinder was the class owning the
hierarchical pathfinder, which didn't particularly make sense and
resulted in some interface awkwardness.

At the moment, the long pathfinder still needs to hierarchical
pathfinder to compute paths (to make sure they are reachable).

Differential Revision: https://code.wildfiregames.com/D1867
This was SVN commit r22278.
2019-05-13 16:58:00 +00:00
859d96fba5 UnitMotion - improve variable names and reuse a duplicated function (cleanup def47cb7ae)
This:
 - cleans up a code duplication and clarifies the intent.
 - reorders things around for clarity
 - improves variable names.

Commented By: elexis
Differential Revision: https://code.wildfiregames.com/D1840
This was SVN commit r22277.
2019-05-13 16:47:51 +00:00
ac47803221 Fix move speed not correctly reset when chasing a unit
def47cb7ae had an issue where the move speed was not correctly reset
after chasing a unit.

Reported By: Angen
Reviewed By: Angen
Differential Revision: https://code.wildfiregames.com/D1861
This was SVN commit r22275.
2019-05-11 12:23:22 +00:00
6935fb665d Replace all shields by the new shields in the gaul barracks.xml
Replace the old spears by new spear models,
Use the eyecandy barrel instead of the one, hence removing useless
underground geometry
Use the eyecandy anvil instead.
Add smoke to the chimney,
Fix the roof UVMapping
Rename to gaul.

This was SVN commit r22274.
2019-05-10 15:01:12 +00:00
35101bbd23 Add a new open barrel variant with celt swords.
Fix barrel size.

This was SVN commit r22273.
2019-05-10 14:59:22 +00:00
81fcd891be Update the eyecandy dummy actor using the one in the celt barracks.
Enable normal and spec maps

This was SVN commit r22272.
2019-05-10 14:57:22 +00:00
c0dd79ac3d Add different names to the gaul shield color variants so they don't synchronize when using them as props.
This was SVN commit r22271.
2019-05-10 14:55:00 +00:00
64bf626d5b Fix last checkrefs.pl warning because the cavalry variant was using an incorrect animation.
This was SVN commit r22270.
2019-05-10 14:54:03 +00:00
Alexandermb
55e77096ec Removed duplicated gather meat unnecesary for cavalry riders.
Added gather meat position for carthaginian cavalry spearman italic,
they were standing above the horse when gathering meat

This was SVN commit r22269.
2019-05-10 14:26:50 +00:00
Alexandermb
e8451c235a Remove unused carthaginians/farmstead_horse.xml used in carthaginians/farmstead.xml
Remove round shield for Bouddica and add a British Exclusive shield
Remove unused files by 2115bf2e5d

This was SVN commit r22268.
2019-05-10 14:05:58 +00:00
20da0b727f moves territory_pull.xml from other/ to special/ and updates the only file in which it is currently used (maps/scenarios/Campaign Test Map.xml), because it is something special and thus doesn't belong in other/ (which contains various gaia structures).
Patch by: @Nescio
Reviewed by: @elexis, @Stan
Differential Revision: https://code.wildfiregames.com/D1798
This was SVN commit r22266.
2019-05-10 06:50:36 +00:00
Alexandermb
444330ade0 More remove of unused files by: 2115bf2e5d
This was SVN commit r22265.
2019-05-09 21:50:30 +00:00
Alexandermb
3a8a661005 Continuation of the cleaning of the art unused or duplicated files from 2115bf2e5d
Remove unused files

This was SVN commit r22264.
2019-05-09 20:19:05 +00:00
d5e90c2be3 *Faction exclusive shield shapes for Britons and Gauls
*Differentiation of Celtic factions (Gauls and Britons)

Thread:
https://wildfiregames.com/forum/index.php?/topic/25422-task-celtic-shields/&page=4
Reviewed by @Stan, @Genava55 and others community members
Patch by: @Alexandermb
This was SVN commit r22263.
2019-05-09 19:40:52 +00:00
Alexandermb
8b7ba6e631 Remove now unused files by 2115bf2e5d
Cleaning of the art assets of the old horse.

This was SVN commit r22262.
2019-05-09 19:21:05 +00:00
Alexandermb
9d9e75f0b3 Fix issue with seleucid cavalry armor.
Reported by: @Hidan
Thread:
https://wildfiregames.com/forum/index.php?/topic/25397-task-horse-update-20-retexture/page/3/&tab=comments#comment-374738

This was SVN commit r22261.
2019-05-09 19:13:54 +00:00
2115bf2e5d *New Horse models
*New Horse textures
*New Horse fauna (Breed, Marwari, Lusitano, Celtic)
*Cleaner distribution of animations for riders and horse files
*Better usage of variants to reduce amount of lines in Horse Actors
*Chariot for Kushites Done by @Sundiata
*Single armature for chariots

The missing riders will be added in the next commit.



Patch by: @Alexandermb
Reviewed by: @Lordgood, @Stan
This was SVN commit r22260.
2019-05-09 18:16:43 +00:00
9e44b9867b Fix the kush background stuttering.
Patch by: @Polakrity
Reviewed by: @Stan
Differential Revision: https://code.wildfiregames.com/D1758
This was SVN commit r22259.
2019-05-09 17:46:48 +00:00
ca37b0fb0e Use the new animation for the maur trader.
This was SVN commit r22258.
2019-05-09 17:43:17 +00:00
bdb306813a Some cattle Fauna
New Cattle Textures
New Sanga Variants
New Maur trader chariot

Thread:
https://wildfiregames.com/forum/index.php?/topic/18469-committed-zebu-rigging/
Reviewed by: @Stan, @Lordgood, and others community members
Patch by: @Alexandermb
This was SVN commit r22257.
2019-05-09 17:38:51 +00:00
126da09a47 removes <Actor> from the generic template_* files
removes <SpecificName> from the generic template_* files
removes <GenericName> from the gaia/ruins/* files
removes <GenericName> from the gaia/treasure/* files
removes <Icon> from the gaia/treasure/* files if it's identical to the
parent template
adds the appropriate actors to their specific children in the cases they
were not yet included there
adds the appropriate specific names to their specific children in the
cases they were not yet included there
use title case for the gaul theatron
<Actor> is still present in the following generic templates:
template_formation.xml
template_unit_catafalque.xml

Reviewed by: @Stan
Patch by: @Nescio
Differential Revision: https://code.wildfiregames.com/D1759
This was SVN commit r22256.
2019-05-09 17:24:20 +00:00