Commit Graph

21533 Commits

Author SHA1 Message Date
Stan 3da97821e7 Use the new arrow variants to reduce duplication for spart
This was SVN commit r24909.
2021-02-13 23:51:34 +00:00
Stan 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
Stan 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
Stan 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
vladislavbelov 565710d4c9 Fixes UB in shared_ptr usage of an array. Refs #5288
Reported By: PVS-Studio
This was SVN commit r24905.
2021-02-13 23:25:41 +00:00
Imarok 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
vladislavbelov fc7da5edd1 Fixes leaking of a file handle in case of an error. Refs #5288
Reported By: PVS-Studio
This was SVN commit r24903.
2021-02-13 17:57:37 +00:00
Stan 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
Stan 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
wraitii 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
vladislavbelov b2310ad70a Makes DynamicArena more cache-friendly and removes useless member.
Tested By: Langbart
Differential Revision: https://code.wildfiregames.com/D3560
This was SVN commit r24899.
2021-02-13 17:33:05 +00:00
wraitii 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
wraitii 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
wraitii 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
wraitii 18bc3e47ea Prevent destroyed obstructions from reactivating.
Obstructions can reactivate after being destroyed, which leaves them
dangling forever. This is similar to 54f7a09a54.
This fixes this issue by setting a temporary "is destroyed" variable to
true.@

Reported by: seeh
Tested by: langbart
Reviewed By: Freagarach
Fixes #6016

Differential Revision: https://code.wildfiregames.com/D3558
This was SVN commit r24894.
2021-02-13 08:45:23 +00:00
Itms c59d569767 Port remaining python2 helper scripts to python3, fixes #5694.
Differential Revision: https://code.wildfiregames.com/D2501
This was SVN commit r24892.
2021-02-12 21:25:33 +00:00
vladislavbelov 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
Stan 44dc2ca6f2 Reduce the normal strength. the default is way too big.
This was SVN commit r24890.
2021-02-12 14:14:35 +00:00
Stan 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
Freagarach 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
vladislavbelov 63e0f13f1b Reduces the number of GL state changes in GUI.
This was SVN commit r24885.
2021-02-11 19:15:35 +00:00
Stan 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
Stan 0f3d4a30a0 Fix some ptolemies death variants, Noticed by @Edwarf
This was SVN commit r24883.
2021-02-11 18:56:30 +00:00
Stan 95b0407388 Fix macedonian buildings death variants, Noticed by @Edwarf
This was SVN commit r24882.
2021-02-11 18:55:55 +00:00
Stan 2d288a3b11 Fix mercenary camps death variants Noticed by @Edwarf
This was SVN commit r24881.
2021-02-11 18:51:14 +00:00
Stan b5c7611860 Fix incorrect mercenary icon. Noticed by @Edwarf
This was SVN commit r24880.
2021-02-11 18:49:14 +00:00
Stan 037f2b71c4 Fix Spartan destruction variants not having smoke use the variant.
This was SVN commit r24879.
2021-02-11 14:56:42 +00:00
Stan 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
Stan c61ea0334b Fix some icons on borg-'s request
This was SVN commit r24877.
2021-02-11 11:23:20 +00:00
Stan 183377c302 New sling sounds
Patch by: @Samulis
This was SVN commit r24874.
2021-02-11 00:21:33 +00:00
Stan 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
Stan 98d60dab18 Improve training sounds for merchants and priests
Patch by: @Samulis
This was SVN commit r24872.
2021-02-11 00:17:58 +00:00
Stan 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
vladislavbelov 65aa3d9292 Switches decals to VBChunk to reduce the number of state changes.
Also allows to use compressed vertex formats in future.

Tested By: Stan
Differential Revision: https://code.wildfiregames.com/D3553
This was SVN commit r24870.
2021-02-10 23:48:43 +00:00
wraitii 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
Imarok 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
vladislavbelov 5e1b84ed64 Batches decals and reduces the number of state changes.
Reviewed By: wraitii
Tested By: Langbart
Differential Revision: https://code.wildfiregames.com/D3545
This was SVN commit r24867.
2021-02-10 16:42:56 +00:00
wraitii 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
wraitii 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
wraitii 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
vladislavbelov 990f09e67e Changes CVertexBufferManager container from std::list to std::vector.
This was SVN commit r24861.
2021-02-08 22:37:44 +00:00
vladislavbelov 6d4fd01a59 Separates allocated vertex buffers into groups for data locality.
Tested By: Langbart, OptimusShepard, Stan
Differential Revision: https://code.wildfiregames.com/D3522
This was SVN commit r24860.
2021-02-08 22:34:10 +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
wraitii d078df0b85 Get the public IP from the lobby if not using STUN.
Follow-up to 1a8de6d2b8. This makes it again possible to host without
STUN via the lobby.
The lobby bot will answer the host "Register" command with the external
IP. This is only sent to the host, avoiding IP leakage.

There is a small window in which a client might try to join and the
public IP isn't up, and the request goes through, but that seems rather
unlikely to be a problem in practice.

Refs #5913

Differential Revision: https://code.wildfiregames.com/D3490
This was SVN commit r24858.
2021-02-08 15:47:34 +00:00
wraitii c009eae0a5 Lobbybots: update readme to reflect mod_ipstamp being optional
Following #5913, mod_ipstamp is no longer required to enable STUN
hosting (it can only be useful to enable non-STUN hosting).
This updates the readme to reflect that, and fixes some markdown issues.

Differential Revision: https://code.wildfiregames.com/D3473
This was SVN commit r24857.
2021-02-08 14:22:01 +00:00
Stan 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
wraitii 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
wraitii 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
wraitii 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