1
0
forked from mirrors/0ad
Commit Graph

20527 Commits

Author SHA1 Message Date
Alexandermb b9bb46e006 Shields texture folder cleaning and shield actors being unused due to new ones.
Fixed hand position on infantry pikeman.

Adjusted Shield position in some howdah.

Replaced Shield cloak on an outdated (to be updated) shield

This was SVN commit r23646.
2020-05-09 17:25:56 +00:00
Alexandermb 70cf017fe6 Correction of 4 aspis with the Lambda or "A" letter with a modern representation instead of a historically accurate one.
Commented by @Nescio

This was SVN commit r23645.
2020-05-09 15:45:41 +00:00
Stan da0f87458b Fix the build script failing to get ICU.
Use the github mirror instead,
Update from 59.1 to 59.2

Accepted by: @Itms
Patch by: @Krinkle
Differential Revision: https://code.wildfiregames.com/D2717
This was SVN commit r23644.
2020-05-09 10:34:34 +00:00
FeXoR d995dcebfa Reduce areas players can't place buildings on due to high inclination/bumpiness on random map Wild Lake.
Reported by OptimusShepard at https://code.wildfiregames.com/D1624

Tested by: FeXoR
This was SVN commit r23642.
2020-05-08 18:14:44 +00:00
vladislavbelov 1e1ce27eba Adds offsets to the terrain resize function and adds comments how the resizing works.
Original Patch By: Clockwork-Muse
Tested By: Stan
Differential Revision: https://code.wildfiregames.com/D2724
This was SVN commit r23639.
2020-05-07 21:46:17 +00:00
Stan 5159fe3fa4 Add some new selection textures by Nescio
Refs: https://code.wildfiregames.com/D2503

This was SVN commit r23638.
2020-05-07 18:43:08 +00:00
Angen 093285bf35 Do not stack fleeing orders.
Differential Revision: https://code.wildfiregames.com/D2162
Patch by: Freagarach
Replace current fleeing order with new fleeing order instead adding new
one on top of current fleeing order, what was causing fleeing unit to
move further away as it should.

This was SVN commit r23637.
2020-05-07 17:29:35 +00:00
Stan 5fcade9ffd Improved selection shapes by @Nescio.
Refs: https://code.wildfiregames.com/D2503

This was SVN commit r23636.
2020-05-07 17:22:59 +00:00
Angen d52328f520 Fix typo in 118ebc810c
This was SVN commit r23635.
2020-05-07 17:03:44 +00:00
Angen 990e3163d8 Do not store empty Garrison tag in map xml files after 8bfb449375
Differential Revision: https://code.wildfiregames.com/D2690
Patch by: Freagarach
Reported on forum:
https://wildfiregames.com/forum/index.php?/topic/27867-tag-in-the-map-xml-file/

8bfb449375 introduced Garrison tag to the xml map files.
In case GarrisonHolder was present, but held no entities, empty tag was
written. This is adding check for emptyness so that behaviour is
prevented.

This was SVN commit r23634.
2020-05-07 16:57:45 +00:00
Angen 118ebc810c Fix Capture points not initialised properly.
Differential Revision: https://code.wildfiregames.com/D2706
Fixes: #5712

Correctly check for timer when regeneration rate is affected by
modifications but not capture points.
Move frequently affected values with modifications called by timer to
prototype.
Recompute all cached values affected by modifications when ownership is
transfered.
Recompute cached values before initialising capture points first time
fixing e16c4c4800.

This was SVN commit r23633.
2020-05-07 16:46:03 +00:00
Stan 027659b7f8 Fix a233b04c57 commit unintentional removal in unit_actions.js.
Noticed by: @Freagarach
This was SVN commit r23632.
2020-05-07 16:05:41 +00:00
Stan a233b04c57 New streamlined icons for the GUI. Add a back to work icon.
Fixes #2296
Fixes #4019
Thread:
https://wildfiregames.com/forum/index.php?/topic/27738-experimenting-with-icons/&tab=comments#comment-393054

This was SVN commit r23631.
2020-05-07 15:37:52 +00:00
Stan 423b3cbcaa Allow specific garrison points to receive only specific units, for instance catapults on ships, or having both visible garrison points for fortresses and garrisonning elephants.
Reviewed by: @Freagarach,
Comments by: @elexis, @Angen
Fixes #3488

This was SVN commit r23630.
2020-05-07 15:03:18 +00:00
Alexandermb 20c0f986b3 Adjust some animations of the elephant with a blender addon to make it look more smooth.
Fixed unsync on aspis cloak for swordsman due to idle animations being
24 FPS while the shield cloaks was 30 FPS

This was SVN commit r23628.
2020-05-05 19:06:54 +00:00
Alexandermb fd4e23ce29 Fix incorrect stretching on the aspis cloak while capturing and walking (hoplite)
This was SVN commit r23627.
2020-05-05 14:28:13 +00:00
Alexandermb 08c432d126 Fix missing stuff from the latest committ and delete unused variants.
@Stan Checkref

This was SVN commit r23626.
2020-05-05 13:44:22 +00:00
vladislavbelov a4341acaa6 Fixes macOS builds after 76909984b2 because of removed header.
This was SVN commit r23625.
2020-05-05 11:31:19 +00:00
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