1
0
forked from mirrors/0ad
Commit Graph

20266 Commits

Author SHA1 Message Date
Stan 14318bf206 Rename a png file pretending to be a DDS file. Add EOL Native property to the XML file.
Noticed by: @Itms
This was SVN commit r23308.
2019-12-29 18:24:41 +00:00
Alexandermb 1e6a888c11 Add missing attack_capture variants on some heros as conversed with @faterbushido
This was SVN commit r23307.
2019-12-29 16:37:36 +00:00
Alexandermb 2bf3bef76e Fix trader variants as well as replace saddle prop point with rider.
Thread:
https://wildfiregames.com/forum/index.php?/topic/27415-error-message-appears!/&tab=comments#comment-390385

This was SVN commit r23306.
2019-12-29 16:34:13 +00:00
Itms cc7071c691 Upgrade NVTT to version 2.1.1, fixes #4549.
Windows binaries built with toolset v140_xp.
Tested under Windows, Linux and macOS.
Includes a patch for building on musl Linux, contributed by voroskoi,
containing code by leper.
Use the opportunity to set native line endings in the NVTT bundle.

The NVTT DLL was the last one built with VS 2010, refs #5379, #5527.

Differential Revision: https://code.wildfiregames.com/D2475
This was SVN commit r23305.
2019-12-29 11:21:33 +00:00
Itms fcac07213f Update libsodium to 1.0.18, built on Windows with toolset v140_xp.
Also fixes the download address in the macOS libraries script.

Tested on Windows and macOS.

This was SVN commit r23302.
2019-12-28 18:12:43 +00:00
Alexandermb 8b560d2380 Some walking with tool's animations.
Thread:
https://wildfiregames.com/forum/index.php?/topic/26012-committed-animations/page/32/&tab=comments#comment-390317

This was SVN commit r23301.
2019-12-28 14:58:30 +00:00
Angen 792e51b3dd [UnitAI] Fix return value on "enter" according to FSM logic
When entity is in "enter" phase of state and it was called SetNextState,
code have to return true in order to abort current state to work
properly ( else return false ).

Differential Revision: https://code.wildfiregames.com/D1943
This was SVN commit r23300.
2019-12-28 13:43:18 +00:00
Alexandermb d7bf234ad7 Fix some wrong folders with latest two committs.
This was SVN commit r23299.
2019-12-28 13:16:07 +00:00
Angen 67514fb9ce Automatically cancel packing or unpacking based on given order
Cancel packing when next command requires unpacked state and cancel
unpacking when next command requires packed state.

Fixing unit refusing to move because keeps unpacking to attack targets
in range.

Partially Fixes: #4015, #5328
Differential Revision: https://code.wildfiregames.com/D1520
Patch by: @causative
Comments by: elexis, Freagarach, Stan
This was SVN commit r23298.
2019-12-28 11:40:24 +00:00
Angen 3051c90955 Inform player that second market is too close to setup trade route
Display tooltip with disabled action and icon to player with
information, that markets are too close to setup trade route.

Differential Revision: https://code.wildfiregames.com/D2285
Reviewed by: @Freagarach
Comments by: elexis, Stan, Imarok, nani
This was SVN commit r23297.
2019-12-28 11:15:05 +00:00
Alexandermb acf524790c Camel update.
Overal enhancement of the camel mesh and animations.

New animations for the camel riders allowing for more camel cavalry unit
types (Swordsman, Spearman, Javelinist, Archer, Lancer. Shield and No
Shield Variants).

New death animation.

New idle animations.

Better motion for the running, walking, trotting animation.

New melee attacking animations for the camel.

Improvement of the rein for a more performance friendly actor.

This was SVN commit r23296.
2019-12-28 03:49:18 +00:00
Alexandermb 4c96e5e23b Replace mace oxybeles visual actor with the new one.
Replace "athenians" folder to "hellenes" in
siege_heavy_artillery_packed.xml

This was SVN commit r23295.
2019-12-28 02:52:48 +00:00
Alexandermb 3b422ede91 Upload missing variants from 8cf5a9eac4
Reported by @Stan

This was SVN commit r23294.
2019-12-28 02:51:04 +00:00
Angen a8f7668bc6 Add missing phalanx animation for carthaginian spearmen
Differentail Revision: https://code.wildfiregames.com/D2514
Reviewed by: @Stan
This was SVN commit r23293.
2019-12-27 20:24:02 +00:00
Stan 503f0f280b Add missing group tag in b8690f7c54
This was SVN commit r23292.
2019-12-27 16:24:04 +00:00
Stan 886b750fe9 Remove 462 polygons (4126 > 3664) on the Persian fishing ship by not using basic_trans.xml.
This was SVN commit r23291.
2019-12-27 16:14:46 +00:00
Stan b8690f7c54 Cleanup field actors. Remove basic_trans to default instead, and don't load more textures than needed.
This was SVN commit r23290.
2019-12-27 16:04:48 +00:00
Angen c9c8a47018 [AI] Small cleanup in defenseManager
Make comments to start with capital letter and ends with dot.
Remove not needed continue call.
Merge if condition

Differential Revision: https://code.wildfiregames.com/D2001
Reviewed by: @Stan
This was SVN commit r23289.
2019-12-27 14:03:32 +00:00
Angen 072f48651b Add disabled cursor icon for trade route
Needed for D2285
Created by @Stan

This was SVN commit r23288.
2019-12-27 10:37:27 +00:00
Alexandermb 8cf5a9eac4 Siege Artillery rework.
Thread:
https://wildfiregames.com/forum/index.php?/topic/27286-task-siege-artillery-rework/#comments

Visual improvement of siege artillery stone/bolt throwers such as:

Lithobolos.
Oxybeles.
Scorpio.
Polybolos.
Ballista.

New models, New animations, New actors.

This was SVN commit r23285.
2019-12-27 01:02:49 +00:00
LordGood d3ce9b05b2 Night version of Obedska bog, with stan's new fireflies
This was SVN commit r23284.
2019-12-26 21:47:00 +00:00
Angen b1a78ce285 Treat min range in the same manner as max range when computing goal
Problem description:
When unit gets command to move to the range exactly X units from some
point/entity, what means minRange == maxRange, that triggers computing
goal when distance < minRange with result distance(goal, target) >
maxRange, because minRange computation uses clearance even when is
treating target as circle.

Solution:
Do not use clearance when treating target as circle, so computation when
distance < minimum range is done in same way as computation when
distance > maximum range and so computed goal has correct position.

Reported on forum:
https://wildfiregames.com/forum/index.php?/topic/27384-strange-landing-on-the-island-and-unable-to-attack/
Differential Revision: https://code.wildfiregames.com/D2512
Tested by: gameboy
This was SVN commit r23283.
2019-12-26 21:03:15 +00:00
LordGood de5d5f39c4 New Skirmish map Obedska Bog.
This was SVN commit r23282.
2019-12-26 12:30:13 +00:00
Stan d8785cd477 Reorders the exceptions in the following files for consistency [EDIT]:
art.json
    history.json
    programming.json

and also renames:

    Hannibal_Baraq → Hannibal_Barca
    Lordgood → LordGood
    stanislas69 → Stan
Patch by: @Nescio
Comments by: @Freagarach, @Itms
Differential Revision: https://code.wildfiregames.com/D2427
This was SVN commit r23281.
2019-12-24 16:29:59 +00:00
wackyserious 4fb6346063 Texture Update: Athenian and Roman unit textures
Threads:
https://wildfiregames.com/forum/index.php?/topic/22184-task-greek-unit-texture-general-thread/
https://wildfiregames.com/forum/index.php?/topic/27371-task-iphicrates-unit-texture/
https://wildfiregames.com/forum/index.php?/topic/25533-committed-roman-infantry-new-texture/

Reviewed by: Art Department, Sundiata and Community members
Note: templates/units/rome_infantry_swordsman_slave.xml is included in
this commit.

This was SVN commit r23280.
2019-12-24 09:26:55 +00:00
elexis 7cf83f19fd Clean Skirmish maps of default and invalid gamesetting values.
* The gamesetup class rewrite in D2483 will enable Skirmish and Random
maps to fix AIs and Civs by specifying them.
  Hence remove them from all maps that don't intend to fix them (i.e.
all except Egypt 3v3).
* Remove default values (and the few irrelevant non-default values) so
that the player-chosen settings may be persisted between Skirmish map
selection changes, refs #3120, D2483.
* Remove invalid settings: mapType, AISeed and random map settings
Script, Size, Seed, Nomad, BaseHeight, BaseTerrain, refs b8216a9164,
75c24843b2.
* Remove StartingCamera values since they are useless, refs #4839,
D1098.
* Add the "new" keyword to Atlas Valleys and Vesuvius from c4f530be28,
so they appear in the "new" filter.
* Unhide Barcania (3)

This was SVN commit r23279.
2019-12-24 04:38:01 +00:00
LordGood c4f530be28 Atlas Valleys and Vesuvius skirmish maps
This was SVN commit r23278.
2019-12-23 12:08:56 +00:00
vladislavbelov dd1678287d Marks unused arguments in macOS implementation of try_gui_display_error
This was SVN commit r23275.
2019-12-21 14:31:47 +00:00
vladislavbelov b276c9b76f Enable hardware S3TC on GLES too by using GL_EXT_texture_compression_s3tc
Patch By: linkmauve
Differential Revision: https://code.wildfiregames.com/D2489
This was SVN commit r23274.
2019-12-21 12:12:38 +00:00
vladislavbelov e269466f51 Splits CameraController and adds ICameraController interface
Comments By: Stan
Differential Revision: https://code.wildfiregames.com/D2478
This was SVN commit r23272.
2019-12-21 00:44:18 +00:00
vladislavbelov 091f3167e0 Use raise() instead of kill() for debug_break()
Patch By: linkmauve
Differential Revision: https://code.wildfiregames.com/D2480
This was SVN commit r23271.
2019-12-21 00:30:34 +00:00
vladislavbelov d6d6cb0696 Refactors ownership of SOverlayTexturedLine in CCmpRangeOverlayRenderer
Differential Revision: https://code.wildfiregames.com/D2463
This was SVN commit r23270.
2019-12-20 22:33:50 +00:00
Angen eb3b7f089e Fix mod list filter
Fixing problem with filters reported in 64bfa089af.

Use filtered version of mods for manipulation in javascript instead non
filtered one.
Fixing following problems when filter is applied:
not enabling selected mod
displaying wrong tooltip
getting out of bounds error when using keyboard arrows to select
next/previous mod

This is also disabling possibility to sort enabled mods manually when
filters are applied. See comment in moveCurrItem for more details.

Differential Revision: https://code.wildfiregames.com/D1944
This was SVN commit r23269.
2019-12-20 20:19:21 +00:00
Angen 21070a4592 Fix second tasked garrison holder to pickup not reacting properly
Move some pickup logic to Approaching state from parent Garrison state
to react to state changes among childrens of Garrison state properly.

Reported by: causative
Patch by: causative, Freagarach
Fixes: #5557
Differential Revision: https://code.wildfiregames.com/D2174
This was SVN commit r23268.
2019-12-20 20:05:19 +00:00
Angen d931ea183e Fix promoted entities not retaining order queue after cc1ea7cca0.
cc1ea7cca0 changed order in which cheer order is given and old orders
copied. That lead to replacing all orders with cheering order.

Patch by: Freagarach
Differential Revision: https://code.wildfiregames.com/D2358
This was SVN commit r23267.
2019-12-20 19:53:59 +00:00
vladislavbelov 0406509823 Merges two camera JS interface functions into the single one.
Differential Revision: https://code.wildfiregames.com/D2467
This was SVN commit r23264.
2019-12-19 23:41:20 +00:00
vladislavbelov e1cf1e16b9 Unbind the correct texture slot in SkyManager
Wrong binding pair was introduced in 779a33ee30.

Patch By: linkmauve
Differential Revision: https://code.wildfiregames.com/D2487
This was SVN commit r23263.
2019-12-19 21:41:01 +00:00
Imarok 4171d62d1b Workaround for L3 cache detection of Ryzen 3000
This code is planned to get refactored or removed anyway, so just do a
cheap workaround.

Reviewed by: Imarok
Fixes: #4360
Differential Revision: https://code.wildfiregames.com/D2353
This was SVN commit r23262.
2019-12-19 16:52:47 +00:00
Imarok 72fc4105e2 Linting: Remove "no-lone-blocks" rule for ESLint
Lone blocks can help reading the code.

Patch by: Krinkle
Refs #5524
Differential Revision: https://code.wildfiregames.com/D2452
This was SVN commit r23261.
2019-12-19 16:38:30 +00:00
Imarok dd891f6193 Fix User Reporter worker thread always using a full CPU-Thread
Summary:
This bug was introduced in 62dd922bc0.
Fixed by not using the predicate of the `wait` command.
It was wrong and even if it was right it wouldn't be really usefull.

Reviewed by: Angen
Fixes: #5620

Differential Revision: https://code.wildfiregames.com/D2373
This was SVN commit r23259.
2019-12-18 17:19:56 +00:00
Stan 244bffa61b Remove some unused old helper images as they shouldn't be packaged.
This was SVN commit r23258.
2019-12-17 18:09:25 +00:00
Stan 4e6eead260 Remove a unused png file which is now out of date following the new helmets update by @Alexandermb
This was SVN commit r23257.
2019-12-17 16:07:25 +00:00
Stan 02759a90f9 Fix khopesh_norm.png being huge.
This was SVN commit r23256.
2019-12-17 16:00:12 +00:00
Stan 9b99eb46a0 Remove an unused billboard.
This was SVN commit r23255.
2019-12-17 15:56:51 +00:00
Stan 49f0a8c95b Remove transparency from metal mines with no alpha in textures. It saves one drawcall per object and around 300 polys per mesh. Add missing materials. Add native EOL fixes indent.
This was SVN commit r23254.
2019-12-17 13:54:19 +00:00
Stan 400c90c67d Remove transparency in fauna actors that do not need it. Add a no_trans_spec.xml material. + Native eol and some ident fix.
Noticed by: @vladislavbelov
This was SVN commit r23253.
2019-12-17 12:02:23 +00:00
wackyserious 8959ba2110 Texture Update: Carthaginian Units (Second part)
Thread:
​https://wildfiregames.com/forum/index.php?/topic/22630-committed-carthaginian-unit-textures/page/5/#comments

Reviewed by: Lordgood, Stan, Alexandermb, Sudiata, Genava55 and others
This was SVN commit r23252.
2019-12-17 08:48:42 +00:00
Itms 3af575abd0 Update the Jenkins scripts to match the current state, which uses Jenkins pipelines, Docker for reproductible build environments, and ZFS for space efficiency and robust incremental patching. refs #4419, refs #4312.
Reviewed By: Angen
Differential Revision: https://code.wildfiregames.com/D1910
This was SVN commit r23250.
2019-12-16 21:52:42 +00:00
Itms f5c142fde8 Put the Windows patch testing Jenkins pipeline, written by Angen, under source control.
Patch By: Angen
Differential Revision: https://code.wildfiregames.com/D1946
This was SVN commit r23249.
2019-12-16 21:35:16 +00:00
Angen 9d0b4db973 Fix formation members not getting rotation correctly when IDLE
Set formation member rotation to the same angle as formation has when
member stays idle.

Differential Revision: https://code.wildfiregames.com/D2469
This was SVN commit r23248.
2019-12-16 20:38:10 +00:00