Commit graph

20509 commits

Author SHA1 Message Date
vladislavbelov
76909984b2 Removes obsolete clipboard, replaces by platform-agnostic SDL2`s APIs. Refs D2476.
Patch By: linkmauve
Tested By: bb, elexis, Stan
This was SVN commit r23624.
2020-05-05 11:18:00 +00:00
Alexandermb
f558dbbd6f Aspis update V2
Cleaned some textures using new blender 2.81 Feature Denoiser, while
also replacing material from High poly to low poly baking to Direct
Rendering.

Added some new variants and improved patterns with the help of @Lion and
@Stan.

Both @Stan and i handled the baking of the shields.

Including some animations corrections.

Renamed shields from Basic, Elite, Advanced rank to _## following a
better naming schema on the textures.

*New:

Added aprons (Aspis shield hellenic faction cloaks).

17 new variants, after this committ cleaning of the old aprons will be
done deleting old unuseable dds files and meshes.

Baked using direct render and the new alpha material.

Animated mesh for use with both Hoplite and Swordsman (Relax/Ready
variants)

Let me know if there's any issue.

Will continue adding/cleaning the rest of the aspis in the meantime.

This was SVN commit r23623.
2020-05-05 03:02:16 +00:00
Stan
7c218ab079 New gaul wonder, pattern by @GunChleoc & Lion.Kanzen, statue by @Basshunter, template adjustements by @Nescio, historical resources by @Genava55
This was SVN commit r23621.
2020-05-03 19:35:50 +00:00
Angen
b7db808b1f Disable attack as formation for anti_cavalry.xml following ac3c02b4d4 fixing 06e01ef944
Range check for members attacking as formation is broken. For more
details see
D2709 04aba0e41a and #4951.

This was SVN commit r23620.
2020-05-03 12:05:52 +00:00
Imarok
9306d84905 Show correct action cursor over minimap
Refs: #1847
Differential Revision: https://code.wildfiregames.com/D2718
This was SVN commit r23619.
2020-05-03 10:32:33 +00:00
vladislavbelov
2e6aecb210 Fixes FXAA for maps with default effects, FXAA was introduced in 113b1c49b9.
Tested By: OptimusShepard, Stan
Differential Revision: https://code.wildfiregames.com/D2712
This was SVN commit r23617.
2020-05-02 22:34:29 +00:00
Imarok
3d306f4760 Minimap → MiniMap and consistent return
Previous version reviewed by: Nescio
Differential Revision: https://code.wildfiregames.com/D2719
This was SVN commit r23616.
2020-05-02 21:04:19 +00:00
bb
3e315c0ef0 Tweak 2 heights missed in 934025b2fb
This was SVN commit r23615.
2020-05-02 17:02:46 +00:00
bb
8158fe7b23 Show 2 decimals for gather rates in gui.
Patch By: Nescio
Differential Revision: https://code.wildfiregames.com/D2594
Extremely far away ref: #4099

This was SVN commit r23614.
2020-05-01 16:39:48 +00:00
Angen
23111ab427 Actually do not use sorting order for forced columnar formation
f19a8d6b41 moved sorting classes to template and according to lines 561
and 574 in that commit, it was intended to not use sorting in case of
forced columnar formation.

Fixing oversight at lines 660 and 662 in that commit by removing this.
word so cavalry will be put to the front always.

Noticed in D2707 after @elexis mentioned behaviour change on unused
variable.

Differential Revision: https://code.wildfiregames.com/D2711
This was SVN commit r23613.
2020-05-01 09:44:14 +00:00
bb
115215c627 Remove useless food.meat from some animal templates, since the parent already has it.
Patch By: Nescio
Differential Revision: D2714
This was SVN commit r23610.
2020-04-29 21:42:38 +00:00
bb
934025b2fb Resize walls.
Align footprints/obstruction/visual garrison spots/statusbar height with
the visual actors in use.
Gate doors got a little wider (since their visual actors allows that),
so this might help pathing a little.

Patch By: Nescio
Differential Revision: https://code.wildfiregames.com/D2502
This was SVN commit r23609.
2020-04-29 21:21:49 +00:00
vladislavbelov
2489e57d58 Uses EPS to compare Camera quads after 50f70b7be3.
We don't need exact precision in that kind of calculations. Since we use
not fixed floating point numbers and use them only for visual stuff.

Tested By: Stan
Differential Revision: https://code.wildfiregames.com/D2713
This was SVN commit r23608.
2020-04-29 18:41:53 +00:00
bb
7357656df2 Anchor correct templates.
Reduce the number of Position/Anchor entries by setting "pitch" in
template_unit instead
pitch Elephants, traders and some cows
pitch-roll catafalques

The solution is not ideal for catafalques, traders and chariots, since
they consist of different parts that want different values. Probably
needs subunits to fix.

Patch By: Nescio
Differential Revision: D2705
This was SVN commit r23607.
2020-04-28 18:35:40 +00:00
vladislavbelov
e0b183a54a Fixes FXAA on some platforms with broken GL drivers.
Replaces texture2DLod (deprecated in 1.30, but available in 1.20) by
textureLod and updates the shader version to 1.30. texture2DLod was
added in 113b1c49b9 as the part of FXAA.

Tested By: Imarok, OptimusShepard
Differential Revision: https://code.wildfiregames.com/D2699
This was SVN commit r23606.
2020-04-27 00:05:27 +00:00
Alexandermb
bc4373b738 Scale up hippopotamus
This was SVN commit r23605.
2020-04-26 13:56:23 +00:00
Stan
789117ef17 Fix the hippopotamus template in 1ca8c78014. For some reason I forgot to apply it on mine.
Patch by: @Nescio
This was SVN commit r23604.
2020-04-26 06:45:21 +00:00
Stan
1ca8c78014 Hippopotamus model by @Micket, animations by @Alexandermb, textures by @Stan based on CC-BY-SA textures, see credits and thread for links.
Fixes: #1969

Comments by: @Nescio, @wowgetoffyourcellphone.
This was SVN commit r23603.
2020-04-25 21:34:24 +00:00
Angen
98d3b6cca0 Cache keys of g_UnitActions sorted instead of computing it every tick.
Sort keys from g_UnitActions once and store in global variable saving
around 40 microseconds in every tick and mouse event required to
determine action of unit.

Differential Revision: https://code.wildfiregames.com/D2637
Patch by: Freagarach
Reviewed by: Angen
Comments by: elexis
This was SVN commit r23602.
2020-04-25 18:07:53 +00:00
bb
98098c821c Make units really remain if they have the remain death type. Let hunt have corpse deathtype, which creates the resource.
Patch By: Freagarach
Differential Revision: https://code.wildfiregames.com/D2656
This was SVN commit r23601.
2020-04-25 16:41:05 +00:00
elexis
ebf0591a8f Skip and warn about globalscripts and random map tests following 077c4f2576 and 0a6db43c83 when testing without public mod present or if the respective folders don't exist.
Differential Revision: https://code.wildfiregames.com/D2645
Reported By: ricotz
Reviewed By: Angen
Comments By: Stan, Freagarach
This was SVN commit r23598.
2020-04-23 12:06:56 +00:00
Alexandermb
9686ec1a33 Elephant new attacking melee animations And Infant elephant animations.
Adjusted mesh of the elephants to match the new howdwah and cushion
variants
Moved howdah and renamed properly to keep the props in a single folder.
Added new turret pikeman animations while attacking melee.
Added Infant elephant animations.
Replaced Hannibal turret mesh with a new howdah with same shields.

This was SVN commit r23597.
2020-04-22 22:29:13 +00:00
Angen
4eda561d34 [PetraAI] - Only try to subtract resource gift from "waitingfortribute" if gift contains required resource.
Check for existance of requested type in event message, since 6814a983e1
stoped sending resource codes with 0 tribute and that was not even
guaranteed to get before through another options how to trigger tribute
event.

Differential Revision: https://code.wildfiregames.com/D2703
Patch by: Freagarach
Reviewed by: Angen
Comments by: elexis
This was SVN commit r23596.
2020-04-22 18:19:38 +00:00
Angen
173d05588a Fix more cape attack animations
Use Archer-Fem for female variants because there were two Archer-Relax
variants with different animation sets introduced in d3cc5523ae.
Fix cape attack animation for classic archer variant following
676bc42647, introduced by not updating in 61b8a32ad5.

Differential Revision: https://code.wildfiregames.com/D2701
Reviewed by: Stan
This was SVN commit r23595.
2020-04-22 18:02:17 +00:00
Stan
ccc34ecfb1 Improve the gaul tile normal map.
This was SVN commit r23593.
2020-04-21 21:51:37 +00:00
Stan
0ad79096bd Add a C++ interface for CCmpAttack.
This allows Atlas not to rely on eval() to get access to the attack
component.
Add a quick test for the added method.
This fixes the animation speed matching that of the actor instead of the
template.
Remove some dead code after af2abb8cbf
Fixes: #5129
Reviewed by: @Angen
Comments by: @elexis
Differential Revision: https://code.wildfiregames.com/D2464
This was SVN commit r23592.
2020-04-21 21:44:05 +00:00
Stan
2c1f1ebe31 Fix a typo in variants that caused broken animation in the actor viewer with the champion iberian cavalry (The unit would not fallback to idle)
Introduced by 61b8a32ad5

Thread:
https://wildfiregames.com/forum/index.php?/topic/27969-iberian-champion-cavalry-actor-viewer-atlas/&tab=comments#comment-394522

This was SVN commit r23591.
2020-04-21 12:42:13 +00:00
Imarok
ff7ab2fa8f Revert 0916ffbbb1
Summary: Having a mouse event and a hotkey for the same hardware key
turned out to be bad. If the mouse is above a gui element that handles
the middle mouse event and the middle mouse is released, this event will
be consumed by the gui handler of this gui element. Therefore the hotkey
handler does not know that the key was released. If we change that
behaviour typing in input fields would trigger hotkeys. So this seems
unsolvable without adding special handling for the middle mouse case,
which would be ugly.


Fixes: #5695

Differential Revision: https://code.wildfiregames.com/D2700
This was SVN commit r23589.
2020-04-19 12:29:40 +00:00
Angen
3ad1e47e7e Fix typo in startingStrategy.js
This was SVN commit r23588.
2020-04-19 12:07:26 +00:00
Angen
c47496cf18 Cleanup ResearchTechnology function
Remove unused variable since e16c4c4800 and call for ranged manager.
Transform comment to javadoc.
var -> let

Differential Revision: https://code.wildfiregames.com/D2631
Patch by: Freagarach
Reviewed by: Angen
This was SVN commit r23587.
2020-04-15 21:26:25 +00:00
Stan
676bc42647 Fix issues with capes reported by @wowgetoffyourcellphone and @hidan
This was SVN commit r23586.
2020-04-15 11:57:04 +00:00
Angen
3d5b766687 Syntax cleanup of GuiInterface and test.
Remove redundant comments.
var -> let
quote object properties
fix intendation
fix some spacing
use javadoc for function description
remove one line brackets

Differential Revision: https://code.wildfiregames.com/D2069
Patch by: Freagarach
Reviewed by: Angen
Comments by: elexis, Nescio, Stan
This was SVN commit r23584.
2020-04-13 07:47:55 +00:00
Angen
ff74a26865 Fix handling events with undefined message in _petrabot Serialization [Petra]
Check for undefined messages when Serializing events.

Differential Revision: https://code.wildfiregames.com/D2695
Reported by: DangerousI (
https://wildfiregames.com/forum/index.php?/topic/24727-javascript-error-petrabot-typeerror/)
Reviewed by: Freagarach
Tested by: gameboy
Fixes: #5282

This was SVN commit r23583.
2020-04-12 13:26:11 +00:00
Angen
46a9160d12 Use formation controller as target when formation reaches another formation
When a formation that is given the order to attack another formation is
already in range the formation controller of the target is passed as the
target for its members.

Use same behaviour when formation walks into another formation`s range.

Differential Revision: https://code.wildfiregames.com/D2692
Patch by: Freagarach
Reviewed by: Angen
This was SVN commit r23582.
2020-04-12 10:37:41 +00:00
Angen
448592b3c5 Colorize username in chat when user changes ready status or leaves match
Remove regression after 34138a7764.
Make ready status message bold as any other system messages are bold.

Differential Revision: https://code.wildfiregames.com/D2663
Reviewed by: elexis
Comments by: nani, Freagarach
This was SVN commit r23581.
2020-04-12 10:19:20 +00:00
Angen
9a1052a93c [gameplay-a24] Structure selection groups
This patch sets selection groups for all shared structures in the
generic parent templates of structures.

Clicking behaviour:
single click: select the clicked structure
double click: select all structures of the same selection group within
view that are owned by this player (e.g. all owned barracks across
civilisations)
triple click: select all structures of exactly the same file within view
that are owned by this player (e. g. all owned barracks of the same
civilisation)

Differential Revision: https://code.wildfiregames.com/D2675
Patch by: Nescio
Reviewed by: ValihrAnt
This was SVN commit r23580.
2020-04-12 10:09:03 +00:00
Angen
ded0598950 [gameplay-a24] give worker elephants an aura
Remove builder component from worker elephant as it was not able to
place any foundation.
Add aura, that speeds up builder rate for all workers by 25% inside 15
range.

Differential Revision: https://code.wildfiregames.com/D2511
Patch by: Nescio
Reviewed by: Feldfeld
Comments by: elexis, Stan
This was SVN commit r23579.
2020-04-12 09:58:48 +00:00
Stan
e76742bb77 Improved icons by @wowgetoffyourcellphone.
Remove trailing zeroes.
Rename fauna_bear to fauna_bear_brown for consistency.
Delete a unused icon.

This was SVN commit r23578.
2020-04-11 23:34:37 +00:00
Stan
3d29f9ab66 Add missing foundation for the mausoleum.xml introduced in 2bf78288f4:
This was SVN commit r23577.
2020-04-11 23:03:10 +00:00
Stan
f21bf3565e Fix incorrect animation for viridomarus
Discussed with: @Alexandermb

This was SVN commit r23576.
2020-04-11 16:32:48 +00:00
Stan
2bf78288f4 Add the mausoleum at Halicarnassus to the game as an eyecandy building.
Thread:
https://wildfiregames.com/forum/index.php?/topic/20820-macedonian-wonder/page/2/
Feedback by: @wowgetoffyourcellphone, @Nescio
This was SVN commit r23575.
2020-04-11 13:34:15 +00:00
Alexandermb
693a2dcd90 Adjust the UV mapping of the "elephant_african_forest.dae" Mesh
Due to recent Elephant update for having the blend file of the whole
elephants and have the proper workspace for animating riders it was
updated in a recent commit. However the african forest elephant mesh
wasn't properly adapting to the new UV mapping since it wasn't properly
alligned.

Thread:
https://wildfiregames.com/forum/index.php?/topic/27906-elephant-uv-mapping/&tab=comments#comment-393918

This was SVN commit r23574.
2020-04-10 15:39:49 +00:00
Stan
ee033b6268 Rename the Carthaginian “mausoleum” to “cenotaph”.
Patch by: @Nescio
Differential Revision: https://code.wildfiregames.com/D2694
This was SVN commit r23572.
2020-04-08 13:45:58 +00:00
Angen
8354d511dc Add formation CheckTarget-/MoveToTargetRange-functions.
Use `CheckFormationTargetAttackRange` instead `CheckTargetAttackRange`
for formations to not use that ugly workaround with passing `target,
target`.

Use `MoveFormationToTargetAttackRange` to achieve better looking
behaviour when moving formation to target range.

Differential Revision: https://code.wildfiregames.com/D2015
Patch by: Freagarach
Reviewed by: Angen
This was SVN commit r23571.
2020-04-07 17:35:25 +00:00
Angen
3bcc5ab0ab Selection groups for support units
Merge selection group for women.
Merge selection group for healers.
Add selection group for merchant ship and fishing ship.
Add selection group for trader and slave as well.

Differential Revision: https://code.wildfiregames.com/D2677
Patch by: Nescio
Reviewed by: Freagarach
This was SVN commit r23570.
2020-04-07 17:28:10 +00:00
vladislavbelov
accf7ade37 Add thread names on Linux (implements debug_SetThreadName), also add the thread name of the UPnP thread.
Patch By: linkmauve
Differential Revision: https://code.wildfiregames.com/D2479
This was SVN commit r23568.
2020-04-06 20:20:27 +00:00
Angen
36ea0b14cd React to target death properly when chasing
Differential Revision: https://code.wildfiregames.com/D2517
Reviewed by: Freagarach
Comments by: elexis, Stan
Fixes: #5610 #5656

Introduce likelyFailure check in the movementupdate for chasing state
missing since 32e8ed51aa.
Use new order and substate for Chasing to get into the wanted range and
avoid that way issue with running - walking tracking or animation
variants.

Fixing issue when attacker would not react to the death of the target
while chasing it in stances where results for abandoning chasing are
always false and also do not rely on timer ending chasing for the rest
of stances.

This was SVN commit r23566.
2020-04-03 18:08:45 +00:00
Angen
c968154934 Explicitly return "undefined" when requesting Splash data in Attack.js
Compared to other occurrences in code base, it makes sense to return
undefined rather then just empty return.

Differential Revision: https://code.wildfiregames.com/D2665
Patch by: Freagarach
This was SVN commit r23563.
2020-04-01 18:17:48 +00:00
Itms
32a105d6f8 Update cppformat from v0.11.0 to v1.1.0, fixes #5646, refs #3190.
Use the opportunity to rename the lib from cppformat to fmt, refs #4148.

Patch By: adrian
Rebased By: s0600204
Differential Revision: https://code.wildfiregames.com/D2613
This was SVN commit r23562.
2020-04-01 07:29:33 +00:00
Stan
5a4a935e3b Fix missing <group> tag in 36f9648ba7
Noticed by: @Angen
This was SVN commit r23560.
2020-03-27 20:32:00 +00:00