1
0
forked from 0ad/0ad
Commit Graph

14678 Commits

Author SHA1 Message Date
8c0adac8a4 Use the new arrow and variants to reduce duplication for ptol
This was SVN commit r24911.
2021-02-13 23:52:25 +00:00
e8cfcdb6e4 Use the new arrow and variants to reduce duplication for rome
This was SVN commit r24910.
2021-02-13 23:52:04 +00:00
3da97821e7 Use the new arrow variants to reduce duplication for spart
This was SVN commit r24909.
2021-02-13 23:51:34 +00:00
808af6148f Unify sele damage level by using variants. Use the new arrow variant to reduce duplication
This was SVN commit r24908.
2021-02-13 23:50:50 +00:00
7697615fb4 Unify cart damage level by using variants. Use the new arrow variant to reduce duplication
This was SVN commit r24907.
2021-02-13 23:50:16 +00:00
1141c060f4 Add a variant for projectiles for bolt artillery and normal arrows.
This was SVN commit r24906.
2021-02-13 23:49:21 +00:00
7c2be449de Fix attack notifications with buildings
Differential Revision: https://code.wildfiregames.com/D3566
This was SVN commit r24904.
2021-02-13 21:31:16 +00:00
0b432e7c9c Replace background color of trees by an average color to remove artifacts on filtering, flickering on some cards (when a background color leaks to the main color).
Script by: @Vladislavbelov
This was SVN commit r24902.
2021-02-13 17:48:29 +00:00
2c67a569c0 Replace background color of bushes by an average color to remove artifacts on filtering, flickering on some cards (when a background color leaks to the main color).
Script by: @Vladislavbelov
This was SVN commit r24901.
2021-02-13 17:47:55 +00:00
fc39ff52fc Fix player+AI setup in MP gamesetup
Data race introduced in 612515a163.

Reported by: Langbart
Fixes #6020

Differential Revision: https://code.wildfiregames.com/D3564
This was SVN commit r24900.
2021-02-13 17:34:24 +00:00
6085d14ca9 Increase the cose of cavalry/infantry levy techs.
Patch by: borg-
Differential Revision: https://code.wildfiregames.com/D3458
This was SVN commit r24898.
2021-02-13 16:48:17 +00:00
Angen
16fc7bb2de [Petra/AI] Handle permadeaths for heroes hotfix
caused by a79a47effe and de3ed2cd19 petra will be blocked by not being
able to train hero again as she does not do rotations.
add check for matchlimits reached for permadeaths
more propper solution to handle training with numbers greater than 1
will be needed in the future.

Differential revision: D3559
Accepted by: @Freagarach
This was SVN commit r24897.
2021-02-13 11:38:58 +00:00
fba69b2672 Fix this.capacities not always existing when processing value modification messages.
692e236499 assumed that `this.capacities` would always exist, but that
proved incorrect, in particular if a value modification message is sent
before ownership change is processed.

Fix that by initializing them on init.

Reported by: Langbart
Fixes #6019

Differential Revision: https://code.wildfiregames.com/D3562
This was SVN commit r24896.
2021-02-13 10:52:17 +00:00
674cdae166 Fix issues with formation + packing.
- e7e218a3bc contained a small mistake: this.order wasn't cleared when
clearing the orderqueue, which led to a broken codepath in
PushOrderFront.
- Since 71a61d5f50, formation orders their members to reform in IDLE.
This will automatically pack any unpacked siege.

Reported by: langbart
Tested by: langbart
Fixes #6018

Differential Revision: https://code.wildfiregames.com/D3561
This was SVN commit r24895.
2021-02-13 10:08:10 +00:00
f175bc4f8d Fixes big screenshots with water (reflection or refraction camera), adds big screenshot customization.
Commented By: Stan, wraitii
Differential Revision: https://code.wildfiregames.com/D3557
This was SVN commit r24891.
2021-02-12 21:20:07 +00:00
44dc2ca6f2 Reduce the normal strength. the default is way too big.
This was SVN commit r24890.
2021-02-12 14:14:35 +00:00
bc30f422c0 Disable Parallax for new trees. Parallax isn't really visible anyway, and the work should be covered by the normal map. It's also very performance costly.
Add a fallback material for the basic_trans_wind_parallax_spec.xml so it
default to a less costly one on lowest settings.

Rename basic_trans_wind_parallax_spec.xml to
basic_trans_wind_norm_spec.xml to reflect there is no parallax disabled.

Discussed with @vladislavbelov.

This was SVN commit r24889.
2021-02-12 14:06:37 +00:00
6e0d90b67b Fix clear command in lobby.
Missed in f78d3ddf71.

Noticed by @Langbart
Differential revision: D3556
Reviewed by: @Angen
Fixes: #6008

This was SVN commit r24888.
2021-02-12 10:32:07 +00:00
4d083660aa Fix kushite buildings death variants, Noticed by @Edwarf.
Add smoke to the gaul cc

This was SVN commit r24884.
2021-02-11 18:57:14 +00:00
0f3d4a30a0 Fix some ptolemies death variants, Noticed by @Edwarf
This was SVN commit r24883.
2021-02-11 18:56:30 +00:00
95b0407388 Fix macedonian buildings death variants, Noticed by @Edwarf
This was SVN commit r24882.
2021-02-11 18:55:55 +00:00
2d288a3b11 Fix mercenary camps death variants Noticed by @Edwarf
This was SVN commit r24881.
2021-02-11 18:51:14 +00:00
b5c7611860 Fix incorrect mercenary icon. Noticed by @Edwarf
This was SVN commit r24880.
2021-02-11 18:49:14 +00:00
037f2b71c4 Fix Spartan destruction variants not having smoke use the variant.
This was SVN commit r24879.
2021-02-11 14:56:42 +00:00
34da01301c Introduce destructions variants and use them to clean structures death variants.
- Remove unused decals as the rubble takes over
- Add destruction smoke to most buildings
- Fix very small destruction smoke for gates
- Fix fortress props "popping up" when ranges and arsenals are
destroyed.

This was SVN commit r24878.
2021-02-11 13:18:29 +00:00
c61ea0334b Fix some icons on borg-'s request
This was SVN commit r24877.
2021-02-11 11:23:20 +00:00
183377c302 New sling sounds
Patch by: @Samulis
This was SVN commit r24874.
2021-02-11 00:21:33 +00:00
02f8d1739f Reduced metallic impact for all melee sounds, blended existing sword sounds into sword attacks.
Patch by: @Samulis
This was SVN commit r24873.
2021-02-11 00:20:45 +00:00
98d60dab18 Improve training sounds for merchants and priests
Patch by: @Samulis
This was SVN commit r24872.
2021-02-11 00:17:58 +00:00
0ee2399458 Increase the difference between the chopping and building sounds
Patch by: @Samulis
Reported by: @Badosu
This was SVN commit r24871.
2021-02-11 00:16:13 +00:00
e7e218a3bc Fix no-formation orders after several formation orders.
When giving several queued formation-walk orders, then a queued
non-formation order (such as gathering), the gather order would be
silently dropped. This did not happen if only one formation-walk order
was given, which is why this issue was not noticed in 59d0885d68

To fix it, explicitly only drop pre-"leave formation" orders in the
queue for formation members.

Reported By: faction02
Differential Revision: https://code.wildfiregames.com/D3550
This was SVN commit r24869.
2021-02-10 19:23:39 +00:00
11fde58751 Fix positioning of the research progress icons below the counters overlay
Bug found by: ffffffff
Differential Revision: https://code.wildfiregames.com/D3525
This was SVN commit r24868.
2021-02-10 16:59:50 +00:00
8ea4f3186c Allow capture when falling back to "WalkAndFight" in COMBAT.APPROACHING
COMBAT.APPROACHING will fallback to WalkAndFight if the order is forced
and the movement fails (happens e.g. on target death).
That behaviour was added in 5568bd4c16 (and tweaked in d9c6879450), to
make the unit move to the general position asked by the player as a
fallback.
However, it did not allow capture, which meant units would occasionally
start attacking structures, instead of capturing (the default).
This makes that fallback allow capture in all cases, which is generally
more expected than the reverse.

Fixes #6003

Differential Revision: https://code.wildfiregames.com/D3548
This was SVN commit r24866.
2021-02-10 13:49:13 +00:00
e94e1f1fcf Better fix for formation waltzing, revert 5d96346ac5.
5d96346ac5 proved unsufficient to fix formation 'waltzing'. This is a
better fix, which makes sure units actually try to reach their
designated offset in the first place.
Further, it removes code that recalculated offsets un-necessarily, which
led to an issue with "sloppy" formations such as open and closed orders.

Fixes #5997

Differential Revision: https://code.wildfiregames.com/D3543
This was SVN commit r24865.
2021-02-10 09:59:39 +00:00
06639a0383 Ignore MoveToChasingPoint orders when not chasing.
Reported By: Freagarach
Reviewed By: Angen
Fixes #6002

Differential Revision: https://code.wildfiregames.com/D3547
This was SVN commit r24863.
2021-02-10 08:14:38 +00:00
Angen
f1e812bc32 Reuse the same formation controller when formationtemplate does not change
When reforming manually, the case of formation template beeing the same
was ignored what resulted in creating new formation controllers.

Differential revision: D3542
This was SVN commit r24859.
2021-02-08 18:39:26 +00:00
f222dd2d3e Make pages relying on hotkeys more resilient
Reviewed by: @wraitii
Differential Revision: https://code.wildfiregames.com/D3541
This was SVN commit r24856.
2021-02-08 13:56:40 +00:00
a4c698ac48 Fix units restarting orders when tasked to attack/gather/repair/heal same unit.
FSM states would be left/re-entered, resetting the timer, which did not
happen pre a16e7c0a56 and is undesirable in general.
This explicitly checks for a few cases where timers are relevant.

Essentially a Patch by: Freagarach
Differential Revision: https://code.wildfiregames.com/D3531
This was SVN commit r24855.
2021-02-08 10:20:34 +00:00
831e4a183f Fix a crash in the mod selector when using the mod downloadder.
When closing the mod downloader, the list of enabled mod is reset, which
can lead to an out-of-index assertion failing in the engine if an
enabled mod was selected before.

Reported by: Vas
Fixes #6001

Differential Revision: https://code.wildfiregames.com/D3537
This was SVN commit r24854.
2021-02-08 10:13:06 +00:00
612515a163 Debounce gamesetup network messages & slider changes to avoid lag.
Gamesetup Net synchronisation messages are sent on any change, which
includes slider changes. They can be quite slow for clients to process,
so it makes sense to introduce some 'debounce' here. I picked 400ms
somewhat arbitrarily.

Sliders also call UpdateGameAttributes, which can also lag, so run it
only once per 50ms at most.

Reported by: nani
Differential Revision: https://code.wildfiregames.com/D3536
This was SVN commit r24852.
2021-02-07 18:00:57 +00:00
65195211a8 [gameplay] Reduce iberian fireship attack
86ddf09640 had buffed them by giving them Fire damage, which ships have
no resistance against. This made the too strong.

Patch By: Feldfeld
Reviewed By: wraitii
Differential Revision: https://code.wildfiregames.com/D3538
This was SVN commit r24851.
2021-02-07 15:59:54 +00:00
Angen
ab2fb3e6b0 [gameplay-a24] Tweak elephant stable building time
As pointed out by Edwarf in the forum post, the elephant stable is
rather expensive compared to the arsenal (both are city-phase
structures).
This patch keeps the elephant stable's resource costs unchanged (it is
visually larger than the other three military structures), but lowers
the building time from 240 s to 180 s.

Differential revision: D3515
Reviewed by: @borg-
Patch by: @Nescio
This was SVN commit r24850.
2021-02-07 12:56:59 +00:00
Angen
819db85ab6 [gameplay-a24] Make unlock_spies technology cheaper
As pointed out by Edwarf in this forum post, the espionage technology is
rather expensive. This patch removes the wood and stone costs and
reduces the research time.

Differential revision: D3516
Reviewed by: @borg-
Patch by: @Nescio
This was SVN commit r24849.
2021-02-07 12:53:23 +00:00
Angen
8135928ff4 Fix wrong selecting of the match when updating list introduced in 1a8de6d2b8
hostUsername is member of stanza
stanza does not have gameName but name

Reviewed by: @wraitii
Differential revision: D3524
This was SVN commit r24848.
2021-02-07 12:50:42 +00:00
d88db989a0 Reduce interline space for lobby/gamesetup chats.
Post f78d3ddf71, chat uses a list, which has natively a larger interline
space.
This introduces a new style to revert to A23-like interline, making chat
denser and better looking.

Patch By: nani
Reviewed By: wraitii
Differential Revision: https://code.wildfiregames.com/D3533
This was SVN commit r24846.
2021-02-07 11:18:21 +00:00
d17079a640 Fix Phoenician Trireme
Reviewed by: Freagarach
Fixes: #5998
Differential Revision: https://code.wildfiregames.com/D3526
This was SVN commit r24843.
2021-02-06 20:30:07 +00:00
b3cbee6ba9 Performance improvements to VertexBuffer.
Patch By: dm
Tested By: OptimusShepard, Stan, wraitii
Differential Revision: https://code.wildfiregames.com/D2528
This was SVN commit r24834.
2021-02-04 23:26:37 +00:00
6dba34e915 Fix team population in summary graphs.
Introduced in 57d0e7bd96, missed in 9145e03bf5.

Differential revision: D3519
This was SVN commit r24832.
2021-02-04 17:40:47 +00:00
3ea0e0c903 Use power-of-two sized image in Catafalque page
Should fix concern raised on a30c4a69f7 raised by @vladislavbelov


Differential Revision: https://code.wildfiregames.com/D3332
This was SVN commit r24829.
2021-02-04 00:38:05 +00:00
333f7b4fb4 Fixes building snapping for non-square foundations. Fixes #5976
Tested By: Freagarach, Langbart, Stan
Differential Revision: https://code.wildfiregames.com/D3510
This was SVN commit r24827.
2021-02-03 17:03:44 +00:00