1
0
forked from mirrors/0ad
Commit Graph

20248 Commits

Author SHA1 Message Date
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
vladislavbelov b5bac2a2a2 Fixes overlay renderer on fixed render path, it was introduced in 14bfbbf9d4.
This was SVN commit r23247.
2019-12-16 18:45:03 +00:00
wackyserious 8640282220 Texture Update: Carthaginian Units
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 r23246.
2019-12-16 13:41:54 +00:00
Stan 0a584de3ce Correct the AI names in the maur.json civ file:
Aśoka was listed twice; kept the common English name Ashoka the
Great and removed Ashokavardhan
    Acharya was not a Maurya, therefore removed
    Bindusara was Chandragupta's son and Aśoka's father, therefore
listed second
    Corrected s into sh (ś) where necessary

Patch by: @Nescio
Differential Revision: https://code.wildfiregames.com/D2157
This was SVN commit r23245.
2019-12-16 11:42:24 +00:00
Stan 0540f5ebc6 Correct Greek specific names of structures.
Patch by: @Nescio
Translation by: @Nescio and "The European Castalia Society"
(@Anaxandridas ho Skandiates' team)

Thread:
https://wildfiregames.com/forum/index.php?/topic/25268-specific-name-review-structures/

Differential Revision: https://code.wildfiregames.com/D2228
This was SVN commit r23244.
2019-12-16 11:30:05 +00:00
Stan 14118a0835 Indicate vowel length in amphitheatre specific name.
Patch by: @Nescio
Differential Revision: https://code.wildfiregames.com/D2473
This was SVN commit r23243.
2019-12-16 11:16:52 +00:00
vladislavbelov b2665437fc Allow calling timer_DisplayClientTotals multiple times.
According to the `timer_DisplayClientTotals` comment 953d2621dd broke
correctness of `clients` after the function call.

Patch By: echotangoecho
Reviewed By: wraitii
Differential Revision: https://code.wildfiregames.com/D812
This was SVN commit r23240.
2019-12-14 22:49:44 +00:00
Stan 6ada1d015d Allow modders to play an animation when objects with production queues are researching techs.
Reviewed by: @Angen
Comments by: @Krinkle, @bb
Thread:
https://wildfiregames.com/forum/index.php?/topic/27329-visual-feedback-for-researching/&tab=comments#comment-389598

Differential Revision: https://code.wildfiregames.com/D2459
This was SVN commit r23239.
2019-12-14 20:49:04 +00:00
Angen 5d777d4d64 Move hardcoded gain per garrisoned trader on ship to template
It removes hardcoded value from Trader.js to templates.
This change allows to have merchant ships among civilisations or one
civilisation itself which would give different bonus when garrisoned
traders.
Supports modifications to that value with technologies and auras.

Differential Revision: https://code.wildfiregames.com/D2106
This was SVN commit r23238.
2019-12-14 20:30:56 +00:00
Angen d0403bd3a8 Apply modifications to template values based on entity owner instead watching player
When observer selects some building he can see possible units to be
trained. Data about that templates are returned with id of observer what
means no technologies or bonuses for selected player have been applied
to the template. So observer does not see correct information in
tooltip.

Differential Revision: https://code.wildfiregames.com/D2054
Fixes: #5109
Tested by: Nescio
This was SVN commit r23237.
2019-12-14 20:10:32 +00:00
Angen 425fb6d93a Fix units not reentering FORMATIONMEMBER.IDLE when they are promoted or stopped
When unit is idle in formation and promoted, it enters INDIVIDUAL.IDLE
incorrectly.
When unit is moving as part of formation and formation is ordered to
stop, unit enters INDIVIDUAL.IDLE but should keep FORMATIONMEMBER.IDLE.

Differential Revision: https://code.wildfiregames.com/D2468
This was SVN commit r23236.
2019-12-14 15:47:26 +00:00
Angen df524c31d1 Do not allow minimum size drop to 0 because of population scale [Petra attack plan]
Petra reached maxed population and started spamming attack requests.
Reported at forum
https://wildfiregames.com/forum/index.php?/topic/27319-ai-chat-spamming/.

Cause of problem was that with given population scaling and current
rounding minimal requested size of units dropped to 0.
What leaded to allow to start without units because minimum count have
been reached.

This change requires at least one unit if minimum size is not 0 before
adjustment by pop scaling , what we need to not block attacks with
heroes or healers for example.

Now in case Petra is not able to produce units, aborts plan correctly.

Differential Revision: https://code.wildfiregames.com/D2462
This was SVN commit r23235.
2019-12-14 15:44:22 +00:00
vladislavbelov 2fa18b1503 Replaces direct Camera member usage by appropriate method call (m_Orientation > GetOrientation()).
This was SVN commit r23234.
2019-12-14 12:56:47 +00:00
Angen a7b7486dea Set correct animation variant for formation member when starts to move
Formation variants for members are not set correctly once they move
because their ranks changes but variants do not get updated.

This was SVN commit r23233.
2019-12-14 10:10:26 +00:00
Alexandermb 67a17a7a9d Fix healer "healing_m.dae" animation being unsync first and last frame.
Reported by @elexis in ca901415c7

This was SVN commit r23232.
2019-12-13 14:36:18 +00:00
vladislavbelov df329d1b81 Optimise out of frustum rendering of texture overlays.
Reviewed By: wraitii
Commented By: Stan
Differential Revision: https://code.wildfiregames.com/D1847
This was SVN commit r23229.
2019-12-10 23:13:37 +00:00
vladislavbelov 6110d108c1 Removes hard-coded clip planes from water shader.
Differential Revision: https://code.wildfiregames.com/D2443
This was SVN commit r23228.
2019-12-10 21:39:09 +00:00
Stan 9391756294 Add a more explicit message when requested animation rig does not match rigged model.
Reviewed By: @Angen
Discussed With: @Alexandermb

Differential Revision: https://code.wildfiregames.com/D2447
This was SVN commit r23225.
2019-12-08 19:50:36 +00:00
Stan 2b9e125ee5 Fix missing arrow on top of the action-remove-guard.png icon.
This was SVN commit r23224.
2019-12-08 19:04:35 +00:00