1
0
forked from mirrors/0ad
Commit Graph

13171 Commits

Author SHA1 Message Date
wraitii dd67d0769e Resolve issues with 0c20afdfda - unitAI order cleanup and unitMotion MoveTo change
0c20afdfda had two issues:
- some of the unitAI code did not return true when switching states in
the "enter" phase
- missed a return false in unitMotion.cpp

This fixes the issue noticed by @bb.

Differential Revision: https://code.wildfiregames.com/D1947
This was SVN commit r22339.
2019-06-05 17:27:12 +00:00
s0600204 800bf0da24 Improve UTF-8 character handling in Atlas
(Also prevents the compile-time warnings reported in the abandoned
D1432)

Accepted by: Itms
Patch linting by: Stan, Vladislav, wraitii
Also tested by: Imarok
Fixes: #4936
Differential Revision: https://code.wildfiregames.com/D1395
This was SVN commit r22335.
2019-06-03 20:19:53 +00:00
wackyserious 9618c1fc2f Roman helmets texture recolor
-Adjusted the hue and saturation of the textures to achieve visual
uniformity.

Reviewed by: Stan
This was SVN commit r22331.
2019-06-01 10:44:01 +00:00
elexis 2b5aaad399 Revert 899714f667 to faciliate committing it again with credit in the commit message.
Agreed with: wraitii and liked by vladislavbelov in
https://wildfiregames.com/forum/index.php?/topic/26104-leper-attribution-request-899714f667/
Refs D1504

This was SVN commit r22330.
2019-05-31 21:56:13 +00:00
bb 7d25ab3a45 Merge persian and mauryan Archery Tradition technologies
Add the tech to ranges, and make them also pop upin captured barracks

Patch By: Nescio
Differential Revision: https://code.wildfiregames.com/D1941
This was SVN commit r22329.
2019-05-31 21:35:30 +00:00
bb 658a5a8dd1 Rename Stables class to Stable since we use the singular forms.
Fixes 964934cf4e

Patch By: Angen
Reviewed By: Nescio
Differential Revision: https://code.wildfiregames.com/D1890
This was SVN commit r22328.
2019-05-31 20:47:57 +00:00
Stan 5ecacc60f0 Fix the smoothing group issue reported by @vladislavbelov on the chat today, that is made more visible by https://code.wildfiregames.com/D1925.
- Rename civil_centre to civic_center
- Rename the shield prop object to a more explicit name.
- The template and the rubble template should be renamed in another
commit to make sure that do not affect the AI.

This was SVN commit r22327.
2019-05-31 13:21:58 +00:00
bb bd26f04e5a Set ship status bars in parent
Patch By: Nescio
Reviewed By: wraitii
Comments By: Imarok, Stan
Differential Revision: https://code.wildfiregames.com/D1842
This was SVN commit r22326.
2019-05-31 12:00:49 +00:00
bb e7f720d7bc Reduce defensive_wall* duplication
Including:
Remove LongWall from gates
Change the ("unused") gate cost component in more reasonable number and
adapt the repairTimeRatio with it to keep the health/second the same

Patch By: Nescio
Differential Revision: https://code.wildfiregames.com/D1794
This was SVN commit r22325.
2019-05-31 11:17:10 +00:00
bb 4495467e65 Seperate stable from barracks
Including:

    moves template_structure_military_barracks_stables.xml to
template_structure_military_stable.xml
    updates all its children accordingly
    merges values from pers_stable.xml into the new generic template
    changes generic name Stable (singular, without s)
    standardizes rubble sizes to 5x5 (pers had 4x4)
    corrects specific name for Greek factions
    adds foundation actor to kush_stable.xml

Patch By: Nescio
Comments By: Angen
Differential Revision: https://code.wildfiregames.com/D1790
This was SVN commit r22322.
2019-05-30 21:00:18 +00:00
bb 93139ab417 Rename pers_stables to pers_stable as rest of {civ}_stable to simplify check done by Petra
Patch By: Angen
Reviewed By: Stan
Differential Revision: https://code.wildfiregames.com/D1860
This was SVN commit r22320.
2019-05-30 16:55:45 +00:00
wackyserious 97fad1fe1d Re-upload the uncompressed PNG files for the previous commits.
There was a setback when I used tinypng to compress the images as it
eliminated necessary image component.

Reviewed by: Stan
This was SVN commit r22318.
2019-05-29 09:44:10 +00:00
wackyserious dcdff5e9ca New Texture: Macedonian Units
Thread:
https://wildfiregames.com/forum/index.php?/topic/22184-task-greek-unit-texture-update/

Reviewed by: Art Department and forum community.
This was SVN commit r22317.
2019-05-29 09:30:16 +00:00
Stan 8cb7c4ec34 New horse and cattle fauna template corrections
Patch by: @Nescio
Reviewed by: @Stan
Differential Revision: https://code.wildfiregames.com/D1874
This was SVN commit r22315.
2019-05-28 20:46:56 +00:00
wraitii 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
wraitii 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
wraitii 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
Stan 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
Stan 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
wraitii 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
wraitii 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
wraitii 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
wraitii 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
Imarok 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
Stan 24b42ef15c Use Alexandermb's shield for the gaul theatron.
This was SVN commit r22292.
2019-05-20 12:51:55 +00:00
Stan 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
Stan 3cc010d44e New deer icon by @wowgetoffyourcellphone
Reviewed by: @Stan
This was SVN commit r22289.
2019-05-19 09:18:07 +00:00
Stan 904b537483 Fix blood sometimes appearing below the infantry hero Ashoka.
This was SVN commit r22288.
2019-05-19 08:02:29 +00:00
Stan 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
Imarok 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
wraitii 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
wraitii 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
wraitii 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
Stan 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
Stan 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
Stan 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
Stan 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
Stan 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
Stan 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
Stan 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
Stan 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
Stan 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
Stan ca37b0fb0e Use the new animation for the maur trader.
This was SVN commit r22258.
2019-05-09 17:43:17 +00:00