1
0
forked from mirrors/0ad
Commit Graph

19426 Commits

Author SHA1 Message Date
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 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
wraitii 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
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
Stan 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
Stan 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
wraitii 2584cbf69a Fix warning introduced in the mirage cleanup, 905763004a
Iterating using a for..in over an array returns the indices as string,
not number, which C++ did not accept.

Differential Revision: https://code.wildfiregames.com/D1864
This was SVN commit r22254.
2019-05-08 19:24:20 +00:00
wraitii 809f297707 Move the Vertex Pathfinder to its own helper class
The vertex pathfinder was implemented directly in CCmpPathfinder,
instead of being a separate helper like the hierarchical pathfinder or
the long pathfinder.

This moves it to its own helper VertexPathfinder, which gets us ready
for D14 and pathfinder threading. Some struct definitions need to be
moved around.

Differential Revision: https://code.wildfiregames.com/D1855
This was SVN commit r22253.
2019-05-08 11:53:02 +00:00
Alexandermb 6970a168d9 Add dirt decals to rome factions temple:
Basic temple and Vesta Temple.

This was SVN commit r22252.
2019-05-07 17:28:36 +00:00
Stan 6efa2b46ce Fix uv shield orientation for pikemen.
Thread:
https://wildfiregames.com/forum/index.php?/topic/17326-your-screenshots/page/17/#comments

This was SVN commit r22250.
2019-05-04 21:01:13 +00:00
wraitii b0f41952b8 Fix UnitMotion calculation of time left to avoid units going back and forth between walking and running animations.
Because of the limited precision of our fixed-point numbers, the
timeLeft calculation could sometimes return results above the actual
time left, resulting in units moving a few fixed::epsilons farther than
they should be, which makes them switch to the running animation. This
was rather unstable however, so there was a constant 'flickering'
between walking and running.
If we divide last instead of first in the operation, the errors get
gobbled up by the division and we no longer have this issue.

Reported by: wowgetoffyourcellphone
Differential Revision: https://code.wildfiregames.com/D1856
This was SVN commit r22249.
2019-05-04 15:53:46 +00:00
wraitii 75d0c56070 Don't crash when calling the profiler from a 'non-main' thread
Motive behind the change: calls to Profile() currently crash unless they
are triggered from the main thread, but it's somewhat difficult to know
that from the code. It makes more sense to silently ignore those
particularly so we can easily have the same code be threaded or not.

This also removes a few profiling calls that don't make much sense.

Differential Revision: https://code.wildfiregames.com/D1853
This was SVN commit r22248.
2019-05-04 15:03:10 +00:00
wraitii 905763004a Slight cleanup of fogging OnDestroy and some comments
Following b56f7f39d4 I dwelled in the fogging code. Some confusion could
have been avoided by some comments.
Also early-exit the loop to avoid doing un-necessary js->c++
transitions.

Reviewed By: Itms
Differential Revision: https://code.wildfiregames.com/D1737
This was SVN commit r22247.
2019-05-04 13:49:08 +00:00
wackyserious e4a5a8f848 New Texture: Persian Units
Thread:
https://wildfiregames.com/forum/index.php?/topic/23634-task-persian-unit-texture-upgrade/#comments

Reviewed by: LordGood, Wowgetoffyourcellphone and several community
members.

This was SVN commit r22246.
2019-05-04 02:15:27 +00:00
Stan 0e3a3257c2 Add special scaffoldings for the wall towers as well. Based on a model by @LordGood.
This was SVN commit r22245.
2019-05-03 22:28:42 +00:00
Stan b852eeba9c Add missing file in 7165acf9cc. It didn't appear as changed in previous commit
This was SVN commit r22244.
2019-05-03 22:26:07 +00:00
Stan 7165acf9cc Add an AO map to the propylaea building. Enable special maps for all versions of the building. Add EOL Native to the actors.
This was SVN commit r22243.
2019-05-03 22:23:57 +00:00
Stan 55b3086c03 Add a map to be able to test which foundation fits best an actor.
This was SVN commit r22241.
2019-05-01 21:10:28 +00:00
Stan 64eb803ee4 Update templates to use the new foundation sizes.
This was SVN commit r22240.
2019-05-01 21:09:54 +00:00
Stan d52005f990 Unify foundation sizes
1x1 is now a 1x1 grid unit for the game 2x2m unit in blender , that you
can see using THE Wireframe mode or the special texture in atlas.
Resize and adapt existing foundations accordingly
Unify construction dust, it only appears when building (scaffold
variant)
Add 64 foundations from 2x1 to 9x9 and corresponding dirt decals
Add three new scaffolds based on Lordgood's for walls
Rename props to use lowercase names as per art conventions and update
the maps accordingly.
Use 0x instead of a b c and d as per the art convention.
Add missing materials tags, and only use special textures when necessary

Template update will be done in the following commit.

This was SVN commit r22239.
2019-05-01 21:08:53 +00:00
Stan ae7725b698 Add more animations to the atlas drop down list.
This was SVN commit r22238.
2019-05-01 20:57:33 +00:00
Alexandermb f696236cb5 This was SVN commit r22237. 2019-04-29 15:52:03 +00:00
Alexandermb e084b5239b New iberian helmets
Threa:
https://wildfiregames.com/forum/index.php?/topic/24988-task-iberian-units-update/page/4/&tab=comments#comment-372800

Including updated versions of:

* iber_helmet_05
* iber_helmet_06
* iber_helmet_07
* iber_helmet_08
* iber_helmet_09

Updated actors:

*iberians/cavalry_javelinist_a_r.xml
*iberians/cavalry_javelinist_e_r.xml
*iberians/cavalry_javelinist_c_r.xml
*iberians/infantry_spearman_a.xml
*iberians/infantry_swordsman_a.xml
*iberians/infantry_swordsman_c.xml
*iberians/infantry_swordsman_e.xml
*carthaginians/infantry_spearman_e.xml

This was SVN commit r22235.
2019-04-28 15:51:21 +00:00
Imarok 839f281c98 Don't add the period outside a translated string
Previoues version reviewed by: bb
Comments by: elexis
Differential Revision: https://code.wildfiregames.com/D1366
This was SVN commit r22234.
2019-04-28 15:26:41 +00:00
Stan ef098db7c8 Seed unit sounds so that their pitch and their gain are always the same for the same unit.
Fixes #3578
Reviewed by: @vladislavbelov
Differential Revision: https://code.wildfiregames.com/D1584
This was SVN commit r22231.
2019-04-25 22:37:15 +00:00
Imarok 34a6f17aa7 Fix forgotten tab in 06fae58904 line 1337.
Noticed by Polakrity.

This was SVN commit r22230.
2019-04-25 21:06:14 +00:00
Stan 6f31daed81 Fix missing spaces and non compliant code with regards to the coding conventions.
Add a missing semi-colon

For future reference on documenting records using JSDoc see the
differential.

Reviewed by: @elexis
Differential Revision: https://code.wildfiregames.com/D1848
This was SVN commit r22229.
2019-04-25 20:05:53 +00:00
vladislavbelov 9f5494cb87 Fixes a misprint that was introduced in cb83d494e0.
This was SVN commit r22228.
2019-04-25 18:59:41 +00:00
Imarok 06fae58904 Reload wheel-adjusted batchsize immediately
Commented by: elexis
Differential Revision: https://code.wildfiregames.com/D1742
This was SVN commit r22227.
2019-04-25 17:19:47 +00:00
Imarok bc93f51a1c Add an experience status bar
Earlier version reviewed by: bb
Comments by: elexis
Differential Revision: https://code.wildfiregames.com/D1460
This was SVN commit r22226.
2019-04-25 15:58:54 +00:00
wraitii 98f4ed6cb8 Fix D1491 which introduced an ENSURE that should not have been there.
Reported by wowgetoffyourcellphone.

This was SVN commit r22225.
2019-04-25 07:08:19 +00:00
wackyserious fbfefa6063 New Texture: Celtic Druid
Discussion:
https://wildfiregames.com/forum/index.php?/topic/23002-task-celtic-unit-textures/page/9/
Thread:
https://wildfiregames.com/forum/index.php?/topic/25402-task-celtic-druid-re-texture/

Reviewed by: Stanislas69, Genava55 and Sundiata
This was SVN commit r22223.
2019-04-25 04:55:11 +00:00
wackyserious b0bab436de Retexture: Illyrian helmet (Bronze and Gold variants)
- Reduced probability for gold and other variant.

Reviewed by Stanislas69

This was SVN commit r22222.
2019-04-25 03:38:44 +00:00