1
0
forked from 0ad/0ad
Commit Graph

16354 Commits

Author SHA1 Message Date
9a0f6a317b Fix idle units idling nigh capturable entity.
Introduced when changing the default behaviour to capturing
(82e2619ece).
Also fixes confusing the AI with catafalques (etc.), noticed by
@Langbart at D4933.

Differential revision: https://code.wildfiregames.com/D4934
Tested by: @Langbart, @phosit
This was SVN commit r27532.
2023-02-10 07:14:39 +00:00
fe015fdc1e Don't error out on complex requirements without tooltip.
Since it is not nice to make the game unusable (citation needed) we'll
emit a warning, which is less not nice.
Reported by: @Langbart
Differential revision: https://code.wildfiregames.com/D4930
Reviewed by: @Langbart
Fixes #6724

This was SVN commit r27531.
2023-02-07 07:33:22 +00:00
9a134b88f7 Properly use tokens for all Tech requirements.
Better than faking the fix with a flaw in the inheritance.
Refs. d771e775d9 and 83b786dcf5.

Differential revision: https://code.wildfiregames.com/D4924
Comments by: @Stan
Refs. #6724

This was SVN commit r27530.
2023-02-06 11:50:42 +00:00
642a20e9a8 Fix leading space in centurion aura.
This was SVN commit r27528.
2023-02-03 09:20:53 +00:00
d765c06198 Double wall turret placements for stone walls.
Walls should be more helpful as a defensive feature, currently they only
serve to limit movement.
Wall garrisoning is the primary defensive benefit of walls, but only
allowing eight to garrison in a long wall section means these eight
units are quickly dealt with, especially since they are stationary.
Doubling the wall garrison (by adding another row, not by cramming them
side-to-side) not only looks cooler, but also allows a more sizable army
to occupy walls.
Refs.
https://wildfiregames.com/forum/topic/105534-ai-and-the-walls-dilemma/.

Patch by: @real_tabasco_sauce
Differential revision: https://code.wildfiregames.com/D4914
Comments by: @Stan, @wowgetoffyourcellphone
This was SVN commit r27527.
2023-02-03 09:14:33 +00:00
d771e775d9 Fix multiple requirements (and no tooltip) of the Ptol champion pikeman.
Reported by: @Langbart
Fixes #6724

This was SVN commit r27524.
2023-02-02 08:19:18 +00:00
4c4e978627 Fix more issues with animated meshes reported by https://code.wildfiregames.com/P293
Reported by: @trompetin17
Refs #6714

This was SVN commit r27520.
2023-02-01 13:39:25 +00:00
ce875e675e Fix two broken models causing black glitches.
- They had vertexes groups without weights.
- Both of them were unused one incorrectly so.
- Also fix the material while at it.
Refs #6714

This was SVN commit r27515.
2023-01-31 16:28:04 +00:00
f0bde861f6 Fix typo in foundation code.
Introduced in 2bda444435.
Refs. #6709

Differential revision: https://code.wildfiregames.com/D4909
Comments by: @Stan
This was SVN commit r27508.
2023-01-30 11:08:44 +00:00
34765a4664 Use different default hotkey for capturing.
Conflicted with garrisoning, which is used more often.
Reported by @minohaka at D4697, after 82e2619ece.

Differential revision: https://code.wildfiregames.com/D4908
Accepted by: @real_tabasco_sauce
This was SVN commit r27506.
2023-01-30 08:17:05 +00:00
83b786dcf5 Tokens for required technologies.
Use tokens for required technologies, allowing `-tech` and easier
replacements.
Fixes requiring `replace=""` when replacing techs.
Also a minor fix in the TemplateParser.js for upgrade requirements.
Refs. 9bb9ff8b16.

Differential revision: https://code.wildfiregames.com/D4912
Comments by: @Stan
This was SVN commit r27505.
2023-01-30 08:05:34 +00:00
2969487cdd Improving corral tooltips/info.
Reduces unnecessary text.
The corral defines the interval and the animal auras define the amount.

Patch by: @Grapjas
Differential revision: https://code.wildfiregames.com/D4896
Comments by: @Langbart, @Stan
Fixes #6687

This was SVN commit r27487.
2023-01-25 08:56:55 +00:00
1078277c59 Fix required technology tooltip colour.
Done by creating a function for 'objections' and using that for any
unmet requirements.

Patch by: @abian
Differential revision: https://code.wildfiregames.com/D4899
Comments by: @Langbart
Fixes #6694

This was SVN commit r27484.
2023-01-24 08:03:24 +00:00
471b05da04 Fix actors changing on transform.
Reported by `Aristippus of Cyrene` at
https://wildfiregames.com/forum/topic/101769-chinese-mangonels/.

Investigated by: @Langbart
Refs. c6a9e7188e
Fixes #6707

This was SVN commit r27483.
2023-01-24 07:54:53 +00:00
983182feeb Fix PetraAI requesting tribute from defeated player.
The requests weren't deleted, both from received and sent diplomacy
requests.

Reported by @Obelix at
https://wildfiregames.com/forum/topic/96576-petraai-bot-doesnt-recognize-defeat-of-competitor-its-trading-with.
Investigated by: @Langbart
Differential revision: https://code.wildfiregames.com/D4904
Comment by: @phosis
Fixes #6654

This was SVN commit r27481.
2023-01-23 07:54:09 +00:00
cae24f17a0 Fix comparing requirements for GAIA.
There was no check for `cmpTechnologyManager` in the comparing code.

Reported by: @Langbart
Fixes #6705

This was SVN commit r27480.
2023-01-23 07:48:14 +00:00
9c6dd6b1ca Fix gastaphrete like crossbowmen having their crossbow stand straight.
Reported by: @Langbart
Fixes #6683

This was SVN commit r27476.
2023-01-21 17:20:52 +00:00
f5fe608b5c Fix han chariots keeping their flags when dying.
Reported by: @Langbart
Refs #6683

This was SVN commit r27474.
2023-01-21 16:18:40 +00:00
ea017969a2 Art | More ship sail stuff
- Notably, new textures for the large Han warship sails.

This was SVN commit r27471.
2023-01-20 01:07:35 +00:00
2b6b129b2e Art | Fix contrast on this ao map
This was SVN commit r27468.
2023-01-19 16:37:02 +00:00
67cd066f16 Translate resources in PetraAI's tribute demands.
Reported by Gurken Khan at
https://wildfiregames.com/forum/topic/96576-petraai-bot-doesnt-recognize-defeat-of-competitor-its-trading-with.

Based on a patch by: @Langbart
Differential revision: https://code.wildfiregames.com/D4897
Accepted by: @Langbart
Fixes #6648

This was SVN commit r27467.
2023-01-19 07:44:58 +00:00
80ee95d4f4 Art | These null textures weren't completely black or white. Fix this minor oversight.
This was SVN commit r27464.
2023-01-18 19:27:36 +00:00
de72510c60 Fix Atlas warning on reinit.
AIDiff is undefined when calling InitGame. But this cheat stuff should
not be in the helper.
(Now people don't need to change the helper if they want a non-cheating
AI. @Silier)

This patch is favoured over @trompetin17's by Wilfy:
https://irclogs.wildfiregames.com/%230ad-dev/2023-01-16-QuakeNet-%230ad-dev.log
@ 21:14.

Reported by: @Langbart
Differential revision: https://code.wildfiregames.com/D4881
Fixes #6302

This was SVN commit r27463.
2023-01-18 07:56:03 +00:00
490aceb4ff Fix centurion having no civilization and speaking greek.
This was SVN commit r27462.
2023-01-17 23:55:12 +00:00
681171359b Allow to garrison the minister in the corral.
To allow it to benefit from its aura.

Reported by: @Langbart
Refs. #6690

This was SVN commit r27455.
2023-01-16 14:19:51 +00:00
f97a986077 Fix Mace storehouse tech time in template viewer.
Reported at
https://wildfiregames.com/forum/topic/102542-game-guide-of-macedonians-error-reporting
Patch by: @Langbart
Fixes #6691
Refs. #6587

This was SVN commit r27454.
2023-01-16 14:09:53 +00:00
4b24750ae0 Art | Add garrison flags to all Corrals, since they can now garrison animals
Fixes #6689

Refs #4581

This was SVN commit r27448.
2023-01-15 19:24:35 +00:00
e4d19fb784 Art | Update some more ship sail textures
This was SVN commit r27444.
2023-01-14 17:41:58 +00:00
901e6fba28 Simulation | Tooltip trickle food rate for garrisoned animals
Fixes #6687

This was SVN commit r27443.
2023-01-14 17:14:20 +00:00
a740ffa12d Art | Even better millet texture
This was SVN commit r27437.
2023-01-13 17:39:45 +00:00
a7e15b0a0a Art | Additional updates for ship sails
This was SVN commit r27433.
2023-01-13 02:34:01 +00:00
988ec48db0 Art | New "millet field" for the Han
Texture by @Stan

This was SVN commit r27432.
2023-01-13 02:33:11 +00:00
a695098950 Fix /clear command in gamesetup
Patch by: @Norse_Harold
Reviewed by: @trompetin17
Differential Revision: D4885
Fixes: #6685

This was SVN commit r27431.
2023-01-12 23:25:42 +00:00
726b07e209 Fix a visual glitch which happens when you enter in lobby GUI without any game. The button "join game" have a cross line from panel description.
This was SVN commit r27430.
2023-01-12 19:39:56 +00:00
841b2dd5dc Complete a2efada174 and d206f362ef, the bonus for cavalry was removed from the tooltip, but the technology was still available in the stable because it was incorrectly assumed to be in the academy.
Differential Revision: https://code.wildfiregames.com/D4873
This was SVN commit r27428.
2023-01-12 18:00:18 +00:00
eae5840b0e Fix structure tree/civinfo with empty civ history.
Since the history string is optional, don't fail without it.

Based on a patch by: @Silier
Fixes #6651

This was SVN commit r27427.
2023-01-12 10:34:53 +00:00
344e85e97f Fix discrepancy between max hitpoints and actual hitpoints due to floats in JS.
Patch by: @Langbart
Fixes #6657

This was SVN commit r27425.
2023-01-12 09:16:26 +00:00
a2efada174 Fix d206f362ef.
Noticed by: @phosit
This was SVN commit r27424.
2023-01-12 06:54:59 +00:00
b573993000 Reverts mistaken changes in default.cfg from 7c84c23114.
This was SVN commit r27419.
2023-01-11 16:29:41 +00:00
842de4e603 Fix some style issues.
EOL style -> native. Set MIME-type.
Some textual stuff.

This was SVN commit r27416.
2023-01-11 08:55:44 +00:00
c97f744c19 Fix typo in CCC victory condition.
Reported by: @LordWellington.
Also on Transifex by: pilino1234 at Transifex.
This was SVN commit r27415.
2023-01-11 07:22:02 +00:00
7c84c23114 Adds Vulkan backend.
Comments By: phosit, Stan
Differential Revision: https://code.wildfiregames.com/D4876
This was SVN commit r27412.
2023-01-10 20:22:20 +00:00
de697397ba Gameplay | Fix | fix Fire ships trainable from captured docks as the Han
Patch by: @real_tabasco_sauce
Differential Revision: https://code.wildfiregames.com/D4875
This was SVN commit r27411.
2023-01-10 19:35:23 +00:00
90e6d1bd4d Gameplay | Community Mod | CC territory/cost adjustment, roman camp in town phase, spearcav increased acceleration, improved alexander the great, sele civ bonus
Patches by: @real_tabasco_sauce
Differential Revision: https://code.wildfiregames.com/D4877
Comments by: @Stan, @chrstgtr , @wowgetoffyourcellphone
Forum discussion:
https://wildfiregames.com/forum/topic/83784-introducing-the-official-community-mod-for-alpha-26/

This was SVN commit r27410.
2023-01-10 19:26:36 +00:00
03c3d2d438 Fix Centurion name.
Reported by @Carltonus

This was SVN commit r27408.
2023-01-10 16:58:05 +00:00
d953138cf6 [Gameplay A27] Reduce pop cost of ministers
Patch by: @real_tabasco_sauce
Accepted by: @chrstgr, @wowgetoffyourcellphone
Differential Revision: https://code.wildfiregames.com/D4874
This was SVN commit r27407.
2023-01-10 16:51:11 +00:00
d206f362ef [Gameplay A27] - Han fixes:
- Remove crossbow_training.json from the Han academy
- Adjust the cost of poison arrows and poison blades so that the ranged
upgrade should be the one to cost metal, since ranged units currently
dominate most battles.
- Reduce the obstruction area of rice paddies so that they are easier to
place.

Patch by: @real_tabasco_sauce
Accepted by: @chrstgtr, @wowgetoffyourcellphone
Differential Revision: https://code.wildfiregames.com/D4873
This was SVN commit r27406.
2023-01-10 16:48:28 +00:00
e7bb845dd0 Art | Remove parallax from these prop actors
This was SVN commit r27404.
2023-01-10 00:14:16 +00:00
ccc85aef55 Templates | Remove an unnecessary line of code.
This was SVN commit r27403.
2023-01-10 00:12:51 +00:00
8f405255a7 Art | Update the foundation actors for the Greek temples
This was SVN commit r27402.
2023-01-10 00:12:02 +00:00
a331e7088b Art | Tweak Rotary Mill portrait to make it emphasize grain. The grain icon on this update matches the aura icon for the structure.
This was SVN commit r27401.
2023-01-10 00:08:06 +00:00
4952c3717f Gameplay | Add Roman Centurions: Upgradable at a cost of 100 food 50 metal from rank 3 swordsmen and spearmen
Patch by: @real_tabasco_sauce and @vv221
Differential Revision: https://code.wildfiregames.com/D4872
Accepted by: @wowgetoffyourcellphone based on forum discussions
This was SVN commit r27400.
2023-01-09 21:56:09 +00:00
82e2619ece Switch default behavior from capture to attack.
Discussed countless times on the forum.
We try this out this release.

Patch by: @marder
Differential revision: https://code.wildfiregames.com/D4697
Idea accepted by: @asterix, @wowgetoffyourcellphone, @chrstgtr
Comments by: ^ + @Stan
This was SVN commit r27399.
2023-01-09 14:29:06 +00:00
9044735e87 Optional column "sort_order" attribute support olist GUI
Patch by: @Grapjas
Differential revision: D4859
Reviewed by: @trompetin17
This was SVN commit r27398.
2023-01-09 14:26:03 +00:00
7e63ecff2b Rebalance some civ and team bonus.
Two nerfs to ptol bonus: easier capture, and +50% build time (see
https://wildfiregames.com/forum/topic/83784-introducing-the-official-community-mod-for-alpha-26/page/7/).
An update to four team bonuses that were rather lacking in A26 and
previously.
- Athens is now CC techs -50% research time and -30% cost.
- Seleucids 20% cost discount for CCs also applies to build time.
- Persia team bonus is cheaper, faster building barracks and stables.
- Carthage is infantry mercenaries -50% train time.

Original patch by: @real_tabasco_sauce at
https://gitlab.com/0ad/0ad-community-mod-a26/-/merge_requests/12 and
https://gitlab.com/0ad/0ad-community-mod-a26/-/merge_requests/13.
Ported by: @vv221
Differential revision: https://code.wildfiregames.com/D4863
Comments by: @chrstgtr, majima
This was SVN commit r27397.
2023-01-09 11:11:54 +00:00
6c46c3cef2 Credit @real_tabasco_sauce for 0ac1eaab08 and e636285908.
This was SVN commit r27396.
2023-01-09 09:45:27 +00:00
e636285908 Axe cav minor buff.
Gives them 8.7 Hack DPS since they are too weak currently.

Original patch by: @real_tabasco_sauce at
https://gitlab.com/0ad/0ad-community-mod-a26/-/merge_requests/11.
Ported by: @vv221
Differential revision: https://code.wildfiregames.com/D4862
Comments by: @chrstgtr, majima
This was SVN commit r27395.
2023-01-09 09:35:07 +00:00
0ac1eaab08 Pericles and Themistocles improvements.
Original patch by: @real_tabasco_sauce at
https://gitlab.com/0ad/0ad-community-mod-a26/-/merge_requests/8/.
Ported by: @vv221
Differential revision: https://code.wildfiregames.com/D4856
This was SVN commit r27394.
2023-01-09 09:30:32 +00:00
9a051026c8 Rebalance healers by making them cheaper.
They are rarely used now, this may help.

Original patch by: majima at
https://gitlab.com/0ad/0ad-community-mod-a26/-/merge_requests/5.
Ported by: @vv221
Differential revision: https://code.wildfiregames.com/D4855
Comments by: @chrstgtr, @real_tabasco_sauce, @wraitii
This was SVN commit r27393.
2023-01-09 09:20:04 +00:00
931103c1b7 Move tier 2 blacksmith technologies to Town Phase.
To make phase 2 more viable.

Original patch by: majima at
https://gitlab.com/0ad/0ad-community-mod-a26/-/merge_requests/4.
Ported by: @vv221
Differential revision: https://code.wildfiregames.com/D4854
Comments by: @chrstgtr, @real_tabasco_sauce, @wraitii
This was SVN commit r27392.
2023-01-09 09:16:35 +00:00
0170caae5b Add area damage to elephants.
Makes elephants more effective against units and less of a siege weapon.
Animals should not be used as mechanical siege weapons.

Based on a patch by: @Kate
Differential revision: https://code.wildfiregames.com/D4137
Comments by: @marder, @wraitii
This was SVN commit r27391.
2023-01-09 09:12:20 +00:00
c8e24927b2 Add support to change column heading text in olist GUI component
Patch by: @Grapjas
Reviewed by: @phosit @trompetin17
Differential Revision: https://code.wildfiregames.com/D4857
This was SVN commit r27384.
2023-01-07 15:02:12 +00:00
2ad469cd6e Art | Further improvements to ships
This was SVN commit r27382.
2023-01-07 01:38:13 +00:00
ead5d68a66 This was SVN commit r27381. 2023-01-07 01:33:50 +00:00
1e2f23750b Remove materials from particle actors to prevent useless warnings.
This was SVN commit r27374.
2023-01-06 18:51:47 +00:00
a05d9c43c4 Removes unused and incorrect materials.
This was SVN commit r27373.
2023-01-06 16:15:01 +00:00
6184ab7dd6 Changes alternative material for player_trans_ao_norm_spec.xml to to player_trans_norm_spec.xml.
This was SVN commit r27372.
2023-01-06 16:09:04 +00:00
20d9a52bb6 Adds missing norm and spec textures for cav_blanket and han actors without baseTex inside XML.
This was SVN commit r27371.
2023-01-06 16:07:26 +00:00
4984c31f03 Fixes incorrect actor material added in f4bd43d3e7.
This was SVN commit r27370.
2023-01-06 15:13:07 +00:00
e291269898 Fixes missed group and variant after 975fcddd41.
This was SVN commit r27369.
2023-01-06 15:07:21 +00:00
975fcddd41 Replaces old materials in actors by materials with norm and spec textures.
Differential Revision: https://code.wildfiregames.com/D4860
This was SVN commit r27368.
2023-01-06 13:59:22 +00:00
f4bd43d3e7 Mapping | Improve the look of the tutorial map.
This was SVN commit r27365.
2023-01-06 00:54:29 +00:00
2549c44c1d Removes escaped quotes from spartan_sword.xml added in 2a9e7f9449.
This was SVN commit r27364.
2023-01-06 00:40:42 +00:00
90a3e2b2e7 Changes female citizen actors to use a material with norm and spec textures.
This was SVN commit r27361.
2023-01-05 22:39:57 +00:00
66b626a9ab Changes Acacia actors to use a material with norm and spec textures.
This was SVN commit r27360.
2023-01-05 22:21:46 +00:00
e9e7995ec7 Adds normal texture to cavalry_spearman_c_r.xml.
This was SVN commit r27359.
2023-01-05 22:11:49 +00:00
f86c916799 Adds default normal texture for actors.
This was SVN commit r27358.
2023-01-05 22:00:21 +00:00
1ee9533093 Fix | Art | Add a proper material for this stone mine actor
This was SVN commit r27357.
2023-01-05 21:32:40 +00:00
45fe6affb6 Makes materials use alternative materials with both norm and spec textures or without both.
This was SVN commit r27356.
2023-01-05 19:00:02 +00:00
1798b386f5 Adds missing materials with both norm and spec textures.
This was SVN commit r27355.
2023-01-05 18:34:41 +00:00
fe1b2554e2 Removes useless defines from rock materials.
This was SVN commit r27354.
2023-01-05 17:40:10 +00:00
3453a299d2 Art | Missing actor
This was SVN commit r27353.
2023-01-05 17:34:36 +00:00
1dd122190b Adds missing svn eol-style native for materials.
This was SVN commit r27352.
2023-01-05 16:18:00 +00:00
ce9fb7a0b2 Fix structure tree with complex requirements.
Complex requirements were not properly handled by the parsing code.
This makes it a bit more explicit while also handling multiple techs as
requirements.

Reported by: @wowgetoffyourcellphone
Differential revision: https://code.wildfiregames.com/D4833
This was SVN commit r27350.
2023-01-05 08:07:57 +00:00
3f560391f2 A couple more revealer sizes.
This was SVN commit r27348.
2023-01-05 04:47:31 +00:00
a1be542d5e Maps | Vision Revealer objects for maps.
These give vision to parts of the map to specified players.

Placed some on the skirmish map Miletus Peninsula as an example.

This was SVN commit r27347.
2023-01-05 03:47:13 +00:00
9334041a0e Art | Terrains | Improve some terrains.
This was SVN commit r27346.
2023-01-05 01:03:34 +00:00
80094ee0cf Art | Change the scaffolds used by these foundations.
This was SVN commit r27345.
2023-01-05 00:49:07 +00:00
4ab9178737 Art | Tweak the UV map of the Spartan CC
This was SVN commit r27344.
2023-01-05 00:45:07 +00:00
cecb0e20f1 Fix | Fix the parent ref in this skirmish entity.
This was SVN commit r27343.
2023-01-05 00:27:17 +00:00
89a48f4a34 Mapping | Atlas | Add a new "Farmstead" object for Skirmish maps, which simulates the much chewed-over Farmland concept. Capture one to gain the "Farmland" aura that boosts nearby farming.
Add some to a few skirmish maps for testing.

This was SVN commit r27342.
2023-01-05 00:06:20 +00:00
7c1c8fb2ff Templates | Rename warship parent templates to more agnostic naming scheme. Adjust ship child templates to suit.
This was SVN commit r27341.
2023-01-04 23:50:12 +00:00
9c05ff2271 Art | Ships | Add a custom actor and sails for the Seleucid quinquereme, which was previously using the Ptolemy actor.
Also fix some other minor ship stuff.

This was SVN commit r27340.
2023-01-04 23:45:55 +00:00
9cffe4e96f Art | Ships | Improve the look of ship sails and add some new sail textures. Fix some other ship things.
This was SVN commit r27339.
2023-01-04 22:32:18 +00:00
384f4d4215 Art | Cilician Pirate Ship for use as a map creep on water maps
This was SVN commit r27338.
2023-01-04 21:24:32 +00:00
48ac0fecde Fix missed target -> position.
Introduced in fc04e849ca.
Reported by: @wowgetoffyourcellphone.
This was SVN commit r27333.
2023-01-02 06:58:39 +00:00
4ed41d4a9a Switches from pipeline state descriptions to pipeline states.
Tested By: phosit, Stan
Differential Revision: https://code.wildfiregames.com/D4850
This was SVN commit r27328.
2022-12-31 18:29:44 +00:00
0152c26b72 Some additional scaffolds for construction foundations.
This was SVN commit r27327.
2022-12-31 16:00:40 +00:00
e7613d1c89 Some new Ruin objects.
This was SVN commit r27325.
2022-12-31 04:37:56 +00:00
5044850f93 Teach PetraAI the new garrisonRegenRate.
Improves behaviour after 856e876148 by counting in the capture strength
of garrisoned entities.

Differential revision: https://code.wildfiregames.com/D4799
Comment by: @Silier
This was SVN commit r27322.
2022-12-30 07:28:02 +00:00
89c78ee1f3 Fix double resource subtraction on training stop.
Reported by @KarloManco at
https://wildfiregames.com/forum/topic/102402-resourcesused-counter-bug/.
Introduced in 0c4f59d0a7.

Fixes #6670

This was SVN commit r27321.
2022-12-30 07:16:58 +00:00
3b4ffea4a6 Adds missing conditions for input UV attributes for terrain_blend and terrain_decal shaders.
This was SVN commit r27318.
2022-12-29 18:31:20 +00:00
858b134a15 Removes duplicated uniforms after 7c20a8c958.
This was SVN commit r27317.
2022-12-29 17:52:00 +00:00
a6052df6fc Fix disappearing berries due to not miraging.
Reported in
https://wildfiregames.com/forum/topic/102351-berries-disappear-in-fog-of-war/,
introduced in da0f33f137.
Marks entities as seen by the player, such that a mirage is properly
created when some attribute changes.

Differential revision: https://code.wildfiregames.com/D4848
Basically a patch by: @wraitii
This was SVN commit r27316.
2022-12-29 12:05:44 +00:00
fc04e849ca Use position for positions in unit_commands.js.
Replacing `target` by `position` where applicable.
It gave errors when following a player who flared.

Reported by: @Langbart
Differential revision: https://code.wildfiregames.com/D4824
Comment by: @Silier
Fixes #6303

This was SVN commit r27315.
2022-12-29 11:55:13 +00:00
a38744fba4 Wrap game settings initialisation from persistent data in a try-catch block.
Summary:
The persistent settings have historically often led to bugs (see A26,
but that's far from the only example).
The trouble is that this usually leads to the game setup being
completely unusable, often requiring clearing the MatchSettings.json
file (or de-activating it in the settings if one knows that is there).
Furthermore, mods can make the persistentSettings take 'bad' values, and
in general this behaviour is prone to unexpected breakage and difficult
to defend against.

This wraps it in a try-catch block to ensure the game remains usable. It
still relays the error with a more useful error message.

Differential Revision: https://code.wildfiregames.com/D4794
This was SVN commit r27314.
2022-12-29 10:44:22 +00:00
edca3d719e Removes unused materials following f08f6f1d2d.
This was SVN commit r27311.
2022-12-28 16:25:14 +00:00
f08f6f1d2d Remove usages of basic_spec basic_blend playercolor_spec and objectcolor_spec for performance reasons (Reducing the number of shader switches)
As a result some objects are a bit less shiny.

Discussed with: @vladislavbelov

Script at P290

This was SVN commit r27308.
2022-12-27 18:21:34 +00:00
Angen
402e90b5ab Fix 281bb0b2ec
Replace function removed in 281bb0b2ec reported by @Stan

Differential revision: D4846
Reviewed by: @Stan
This was SVN commit r27307.
2022-12-27 11:13:27 +00:00
3814c153df Fix materials on these 3 field plots
This was SVN commit r27306.
2022-12-26 23:43:25 +00:00
5d8418a1db Fix spacing in these decals (Notepad++ automatically inserts tabs for spaces)
This was SVN commit r27305.
2022-12-26 20:51:59 +00:00
ca898bdc51 Fix Alternative Materials line in the terrain materials, since "terrain_norm" has been deleted.
This was SVN commit r27304.
2022-12-26 20:51:18 +00:00
41998f494c Fix some decals after 0b3a1eafc4
This was SVN commit r27303.
2022-12-26 20:09:40 +00:00
0b3a1eafc4 Fix some decals after 1754a3f06c
This was SVN commit r27302.
2022-12-26 20:01:49 +00:00
0159f25636 Removes unoptimized terrain materials following 1754a3f06c.
This was SVN commit r27301.
2022-12-26 11:57:46 +00:00
1754a3f06c Optimizes terrain materials to reduce the total number of used combinations. Refs #6636
Differential Revision: https://code.wildfiregames.com/D4845
This was SVN commit r27299.
2022-12-26 06:59:06 +00:00
22f7d3c543 Art | Replace the decal for the Theater foundation.
This was SVN commit r27298.
2022-12-24 03:52:04 +00:00
e6f5c2b47c Art | Reduce size of the bridge_wood spec map
This was SVN commit r27297.
2022-12-24 02:49:06 +00:00
173e3938fa Art | Improve the look of the Parthenon, Athenian Temple, and some Spartan structures.
This was SVN commit r27296.
2022-12-23 18:14:03 +00:00
2f938cf6f8 Art | Materials for the wood bridge decals
This was SVN commit r27294.
2022-12-22 16:39:27 +00:00
cab2e29f1a Art | Improve the look of the Roman wonder (Temple of Jupiter Capitolinus)
This was SVN commit r27292.
2022-12-22 01:23:13 +00:00
74434f8708 Art | Tweak some textures
Brighten up the Aegean stone texture a bit
Improve the Spartan female spec texture

This was SVN commit r27291.
2022-12-21 22:23:58 +00:00
d59fc2a7bf Art | Add a new 24x24 platform model for structures; use on Roman Fortress actor
This was SVN commit r27290.
2022-12-21 22:22:59 +00:00
38d27392ae Art | Rename materials for clarification purposes
Adjust the actors and terrains to match name change

Plus some other minor actor fixes

This was SVN commit r27289.
2022-12-21 22:19:38 +00:00
46a904e007 Removes USE_SPECULAR from terrain_common shader unused by materials added in b7888aea52.
This was SVN commit r27288.
2022-12-20 17:10:21 +00:00
561184e5fd Removes IGNORE_LOS from water shaders as they can't ignore LOS.
Reported By: Stan
This was SVN commit r27283.
2022-12-10 19:41:27 +00:00
7c20a8c958 Reduces shader inputs duplication and wraps them in a macro. Refs #6636
Tested By: Stan
Differential Revision: https://code.wildfiregames.com/D4837
This was SVN commit r27282.
2022-12-10 10:14:35 +00:00
a451da151d Match HQ Water Effects text in manual with options.
Reported by @lecalam on Transifex.

This was SVN commit r27280.
2022-12-09 07:13:06 +00:00
7373dac017 Art | New look for the Athenian city walls.
This was SVN commit r27279.
2022-12-08 23:34:40 +00:00
c189d1858c Additional default colors after D4811
Comment by: Stan
Fixes: #3506
Differential Revision: ​https://code.wildfiregames.com/D4813
This was SVN commit r27277.
2022-12-06 21:19:25 +00:00
46e9816aaf Fixes missing svn:eol-style native for debug_fragment.h and solid.vs.
This was SVN commit r27276.
2022-12-06 18:51:00 +00:00
3494e1f296 Update the Nisean War Horse tech icon, make the old one a new cavalry speed icon instead. Adjust the techs to suit.
Idea by @real_tabasco_sauce

This was SVN commit r27274.
2022-12-06 01:16:09 +00:00
b2f529c655 Fix NVTT build on MCST Elbrus 2000 (e2k) following 1bb336829d.
Based on the patch in NVTT:
https://github.com/castano/nvidia-texture-tools/pull/304.

Patch By: Fatton, r-a-sattarov
Differential Revision: https://code.wildfiregames.com/D4801
This was SVN commit r27270.
2022-12-04 19:41:09 +00:00
65ab37d49f Alpha 27 | Art | Remove geometric tiles from Mace and Spart civic centers and give them tile decals instead. Also tweak the Sele civic center with some statues.
This was SVN commit r27267.
2022-12-03 01:55:01 +00:00
bca17a2d73 Alpha 27 | Art | Improve some Greek tile textures.
This was SVN commit r27266.
2022-12-03 01:49:44 +00:00
e564c6afa5 Alpha 27 | Art | Fix texture refs
This was SVN commit r27264.
2022-11-29 22:44:55 +00:00
ae835534c7 Alpha 27 | Art | New shrine model.
This was SVN commit r27263.
2022-11-29 21:13:43 +00:00
3c518e842c Alpha 27 | Art | Add a second Greek shrine building. Rename the first one.
This was SVN commit r27262.
2022-11-29 21:12:57 +00:00
12d96b6277 Display a tooltip for the health and capture points and fix the civ tooltip style.
Comments By: asterix, Stan
Fixes #6367
Differential Revision: ​https://code.wildfiregames.com/DD4323
This was SVN commit r27260.
2022-11-28 03:17:37 +00:00
661312ea6f Fix minimap circle not showing.
Noticed by: @vladislavbelov
This was SVN commit r27259.
2022-11-27 20:20:40 +00:00
4cbfa1a435 Alpha 27 | Art | commit missing new face texture.
Reported by @Stan'

This was SVN commit r27257.
2022-11-27 00:48:48 +00:00
e9979c62b3 Alpha 27 | Art | Add a block wall texture to the Spart_Struct files for use in future building platform geometry.
This was SVN commit r27255.
2022-11-26 00:45:02 +00:00
0280dff151 Alpha 27 | Art | Reduce the resolution of some spec maps (smaller file size)
This was SVN commit r27254.
2022-11-26 00:42:03 +00:00
15ca4413df Alpha 27 | Art | Slightly modify the Aphrodite statue textures
This was SVN commit r27253.
2022-11-26 00:40:25 +00:00
adb846320a Alpha 27 | Art | Turn the Kushite corral model 90 degrees
This was SVN commit r27252.
2022-11-26 00:39:35 +00:00
c840ce5b6f Alpha 27 | Art | Add a strong rock material
This was SVN commit r27251.
2022-11-26 00:38:07 +00:00
e8c1b91b36 Alpha 27 | Art | Remove the weird tile geometry from the Athenian CC and add a tile decal instead.
This was SVN commit r27250.
2022-11-26 00:36:15 +00:00
b0efd7ec43 Alpha 27 | Art | New Greek Shrine and Painted Stoa. Tweak some minor art things.
This was SVN commit r27249.
2022-11-26 00:30:37 +00:00
fe62b57620 Alpha 27 | Art | New face Egyptian texture
This was SVN commit r27248.
2022-11-26 00:19:02 +00:00
415304db8a Fix Ptol Champion Juggernaut template. It had accidentally included some unready code.
Fixes #6660

Refs 61ee26bce1

This was SVN commit r27246.
2022-11-24 14:49:30 +00:00
9bb9ff8b16 Add Requirements helper.
Allows more flexibility in e.g. the Identity requirements and unifies
the checking of requirements.
One can use the script at https://code.wildfiregames.com/P265 to fix
templates.

Differential revision: https://code.wildfiregames.com/D4514
Comments by: @elexis, @Stan
Fixes #6421

This was SVN commit r27245.
2022-11-24 11:20:11 +00:00
42fe39d35c Garrison Domestic Animals into the Corral to get a <ResourceTrickle> of Food.
By aura.

Differential revision: D4380
Original patch by: @wowgetoffyourcellphone
Comments by: @chrstgtr, @borg-, @LetswaveaBook, @marder, @Micfild,
@Silier
Refs. #1907

This was SVN commit r27244.
2022-11-24 09:53:34 +00:00
26c2f2ac42 Fix elephant mixins.
Use `mul_round`, refs. 2078abdcc4. (Resources in cost and loot need to
be integers.)

Reported by: @Langbart
Differential revision: D4832
Suggestion by: @Stan
Fixes #6659

This was SVN commit r27243.
2022-11-24 09:36:10 +00:00
966727b52e Make the player state an enum.
So we don't need to hassle with strings all over the place.

Differential revision: D4504
Comments by: @Silier
This was SVN commit r27242.
2022-11-22 07:54:11 +00:00
da2d002c78 Don't (mis)use technologies to differentiate elephants.
Use mixins.

Differential revision: D4590
This was SVN commit r27241.
2022-11-22 07:09:25 +00:00
50d8afcaba Add TerritoryInfluence to Athenian Gymnasium.
Missed in 1582e80ccf.

Patch by: @Langbart
Fixes #6656

This was SVN commit r27240.
2022-11-22 07:00:32 +00:00
93db8b803c Alpha 27 | Art | Improve the look of the Spartan "Persian Stoa" by adding some shield prop points to the model.
This was SVN commit r27239.
2022-11-22 02:35:39 +00:00
9e5976b970 Alpha 27 | Structure model fixes: Center Seleucid CC, turn Kushite market 180 degrees.
This was SVN commit r27235.
2022-11-20 16:06:21 +00:00
fca59054de Alpha 27 | Fix generic name of Shrines
This was SVN commit r27234.
2022-11-19 13:00:42 +00:00
dac3ce3584 Add JS bindings for in game camera attributes.
Patch By: edoput
Differential Revision: https://code.wildfiregames.com/D4667
This was SVN commit r27230.
2022-11-18 19:24:45 +00:00
0d1f331b3d Alpha 27 | Art | Improve the look of the Aphrodite statues with ao maps and better textures. Add a pedestal to the large statue.
This was SVN commit r27228.
2022-11-15 19:21:34 +00:00
a4ce5982ea Make infantry_spearman_b.xml consistent with other han spearmen.
Reported by: @Silier
This was SVN commit r27227.
2022-11-14 11:53:37 +00:00
649a62fb1d Renames shaders solid_player to model_solid_player and solid_tex to model_solid_tex.
This was SVN commit r27223.
2022-11-13 21:55:40 +00:00
192585008a Removes skycolor from GL framebuffer.
Differential Revision: https://code.wildfiregames.com/D4822
This was SVN commit r27220.
2022-11-11 23:03:01 +00:00
76e0076ef6 Alpha 27 | Art | Add Badlands and Savanna metal mines
This was SVN commit r27218.
2022-11-10 20:56:43 +00:00
3c35ef9fa5 Alpha 27 | Maps | Vastly improve the Gambia River skirmish map with the new assets.
This was SVN commit r27217.
2022-11-10 04:57:49 +00:00
dfa3fb6603 Alpha 27 | A new demo skirmish map for the African Savanna biome.
This was SVN commit r27216.
2022-11-10 04:47:37 +00:00
90d01a831f [Alpha 27] [Art] Several Gaia/Rock/Ore/Grass texture and actor improvements.
- Reduced the size of many spec maps (grayscale, lower resolution)

This was SVN commit r27215.
2022-11-10 04:42:10 +00:00
2faf515e00 [terrains] Fix a typo in a terrain file.
This was SVN commit r27214.
2022-11-10 04:09:08 +00:00
63c0d31b04 [maps] Improve Caspian Sea skirmish map terrains
This was SVN commit r27213.
2022-11-10 04:07:25 +00:00
37908af490 [Alpha 27][Terrains] "Temperate_Autumn" and "African Savanna" terrain sets.
- Adjust "Rhinelands (Fall)" biome file to the new Temperate_Autumn
terrains.
- Rename temperate_europe to temperate_summer.
- "Savanna" biome adjustments to the new African Savanna terrains
forthcoming.
- Some Skirmish map adjustments and improvements.

This was SVN commit r27212.
2022-11-10 03:44:04 +00:00
f4c730a887 Reduces the uniform size of an instancing transform of overlay solid shader.
This was SVN commit r27209.
2022-11-06 20:04:26 +00:00
3978149386 Reduces the uniform size of a texture transform of debug overlay shader.
This was SVN commit r27208.
2022-11-06 19:40:47 +00:00
Angen
eacbb1d248 Spaces around '+' in 467541cfad
This was SVN commit r27205.
2022-11-05 12:28:54 +00:00
240c1247ad Wraps gl_FragColor in a macro to avoid duplication for different versions.
gl_FragColor and gl_FragData are deprecated since GLSL 1.30.

This was SVN commit r27204.
2022-11-05 11:49:38 +00:00
850272ee5b Replaces deprecated in GLSL 1.30 gl_TexCoord by varying in water shaders.
This was SVN commit r27203.
2022-11-05 10:29:38 +00:00
Angen
467541cfad Do not break gui when fallback language is not available in termsdialog.js
L10 falls back to language code, that means if "pt_x" is not available
it falls back to "pt", but we do not provide "pt", same for "en" or
after uninstalling and removing language pack and leaving language
selected.
Adding warning.

Related post:
https://wildfiregames.com/forum/topic/96800-terms-display-error

This was SVN commit r27201.
2022-11-05 08:19:32 +00:00
33dd5d9fbc Wraps vertex attributes in a macro to avoid duplication for different versions.
This was SVN commit r27199.
2022-11-04 23:41:41 +00:00
e2f433db8c Wraps gl_Position in a macro to avoid duplication for different versions.
This was SVN commit r27198.
2022-11-04 22:56:56 +00:00
Angen
cde8b7fae8 Missed file
This was SVN commit r27195.
2022-11-03 17:29:46 +00:00
Angen
b7c0878cef Save configuration once when possible
Differential revision: D4818
Reduce how many times configuration is written into the file pointed out
by @nani and @Freagarach in D4616
Also fix bug in 281bb0b2ec

This was SVN commit r27194.
2022-11-03 16:44:47 +00:00
Angen
281bb0b2ec Remove user.cfg from javascript
remove path from javascript
path is defined by the configuration scope

combine some calls
remove not needed calls

Differential revision: D4616
Accepted by: @Freagarach, @nani
Comments by: @phosit
This was SVN commit r27192.
2022-11-02 07:21:25 +00:00
wackyserious
2b94c6ca27 Han Officer Helmet (New)
This was SVN commit r27191.
2022-11-02 01:54:00 +00:00
8c4df2f729 native
This was SVN commit r27190.
2022-11-01 19:00:09 +00:00
64888e710a [Alpha 27] [Art] Improve the look of a bunch of eyecandy rocks.
This was SVN commit r27189.
2022-11-01 18:48:20 +00:00
Angen
f1874ec196 Add color mixer
Add option to pick colour with sliders

Differential revision: D4597
Comments by: @Stan, @vladislavbelov, @Langbart, @elexis
This was SVN commit r27188.
2022-11-01 11:46:14 +00:00
a6a9355b2c [Alpha 27][Art][Actors][Flora] Improve the grass sprites to use a smoothed mesh model instead of models that aren't smoothed.
Also try to reduce a little of the trans overlap with some of the
textures.

This was SVN commit r27181.
2022-10-28 22:41:49 +00:00
e7d8ed33a6 [A27][Maps] Forgot to set a map preview for zagros_mountains_2p.xml
This was SVN commit r27179.
2022-10-27 03:34:43 +00:00
13aae37a32 [Alpha 27] [Art] Add a missing material.
This was SVN commit r27178.
2022-10-27 03:25:52 +00:00
d3a20238de [Alpha 27] [Maps] [Terrains] Add a new Persia biome terrain set and a newly updated Zagros Mountains skirmish map to showcase it.
Only 4 new textures, as the biome extensively uses the flexibility of
the terrain system to pull assets from other biomes and form a coherent
new biome.

This was SVN commit r27177.
2022-10-27 03:20:22 +00:00
0ede6c550e [A27] Fix 1 terrain, add 1 missing terrain, both for Aegean.
This was SVN commit r27176.
2022-10-26 19:20:05 +00:00
b141204875 Allow to have more than 8 colors in the drop down.
Actual colors will be another commit.
Discussed with: @wowgetoffyourcellphone.

Differential Revision: https://code.wildfiregames.com/D4811
This was SVN commit r27172.
2022-10-24 12:43:30 +00:00
f62e1457de Remove redundant references to deleted .dtd files
We only use relaxng and that confuses other linters like xmllint.

Patch by: @Langbart
Differential Revision: https://code.wildfiregames.com/D4748
This was SVN commit r27170.
2022-10-23 17:06:51 +00:00
dd15a65fcd Civ backgrounds for minimap
Comments by: @marder, @Freagarach
Differential Revision: https://code.wildfiregames.com/D4271
This was SVN commit r27169.
2022-10-23 16:50:30 +00:00
5d15f50fa7 [Alpha 27][Art][Technologies] Some new technology portraits.
This was SVN commit r27168.
2022-10-23 15:53:43 +00:00
a86ba870b7 [Alpha 27][Art] Choose better foundation actors for a few structures.
This was SVN commit r27166.
2022-10-23 13:03:08 +00:00
dfa8176007 Allow 0.0.0.0 IP in StunClient tests added in 2034136560.
Patch By: kalev
Differential Revision: https://code.wildfiregames.com/D4792
This was SVN commit r27164.
2022-10-22 19:22:38 +00:00
de9021a8fc [Alpha 27] [Art] [Textures] Some new technology portraits by @real_tabasco_sauce
This was SVN commit r27162.
2022-10-22 18:09:19 +00:00
8612fb0f4f Fix 16-bit texture introduced in f841c1fac0
This was SVN commit r27158.
2022-10-17 12:33:36 +00:00
f841c1fac0 [Alpha 27][Maps] Add a new cliff terrain for the Aegean-Anatolian biome and color correct 2 of that biome's grass terrains.
This was SVN commit r27155.
2022-10-13 16:50:53 +00:00
e5bdd589cb [Alpha 27] [Art] [Maps] Add a new "Baltic-Nordic" biome for terrains.
This was SVN commit r27154.
2022-10-13 16:48:38 +00:00
edfd557374 [Alpha 27] [Maps] Use better/new placement obstructors on Cisalpine Winter's frozen lakes.
This was SVN commit r27153.
2022-10-13 15:39:21 +00:00
344ec2c166 Reduces uniforms sizes for the minimap shader.
This was SVN commit r27147.
2022-10-11 22:20:36 +00:00
1cd1715088 Removes unused UV2 from minimap shader and reorders parameters types.
This was SVN commit r27146.
2022-10-11 20:56:00 +00:00
2ca0fd6ffb [Fix] Remove the remnants of the Han rice resource
It is unused at this point and causes their farming upgrades to be
non-functional

Accepted by: @Silier @wowgetoffyourcellphone
Differential revision: https://code.wildfiregames.com/D4791
This was SVN commit r27144.
2022-10-11 15:26:53 +00:00
856e876148 Only have capturing entities contribute to the capture regenrate.
Only entities which have capture attack themselves will contribute to
the regen-rate of a structure.
The `garrisonRegenRate` is now a multiplier how much each unit
contributes their strength.

Quite some gameplay change, but we can experiment with this.

Differential revision: https://code.wildfiregames.com/D4679
Comments by: @chrstgtr, @marder, @wraitii
This was SVN commit r27142.
2022-10-10 05:36:27 +00:00
a315f90980 Implement emergency recognition for PetraAI.
First patch for an emergency mode. This implements a rudimentary
detection strategy.
The current effect is a shout-out for help.

Patch by: @JCWasmx86
Differential revision: https://code.wildfiregames.com/D4645
Refs. #2195

This was SVN commit r27141.
2022-10-10 05:09:23 +00:00
4e52613ca2 [Alpha 27] [Maps] Improve Deccan Plateau skirmish map with new terrains, better lighting, etc.
This was SVN commit r27140.
2022-10-09 23:22:33 +00:00
dffde00e5f Reduces uniforms sizes for the Canvas2D shader.
Differential Revision: https://code.wildfiregames.com/D4796
This was SVN commit r27136.
2022-10-09 10:44:51 +00:00
a0e006dbbe Fix victory conditions loading (fixes Hero Garrison in regicide crashloop).
VictoryConditions.js gamesetting sends multiple updates to 'active' and
'disabled', instead of just one single update at the end. This is
listened to by amongst others the regicide 'hero garrison' setting, thus
`HeroGarrison` is deactivated, and then tries to be reactivated from the
init attributes, and then disabled again later.

This implements a simple fix, VictoryConditions only sends a single
update in FromInitAttributes with the end-state.

Differential Revision: https://code.wildfiregames.com/D4793
This was SVN commit r27135.
2022-10-08 12:46:11 +00:00
61019c0e91 Removes unused minimap shader variants.
This was SVN commit r27130.
2022-10-07 22:52:23 +00:00
a6af1515b6 [Alpha 27][Art] Add player color to the Greek sentry tower.
This was SVN commit r27126.
2022-10-05 23:32:24 +00:00
4fe5c8eb66 [Alpha 27][Portraits] Adjust portraits for Skirmish templates
refs 5b76cb5812

This was SVN commit r27125.
2022-10-05 23:03:10 +00:00
d93168fd11 [Alpha 27][Atlas] Obstructor parent template
This was SVN commit r27124.
2022-10-05 22:46:17 +00:00
fcc622c1ab [Alpha 27][Actors] Update the look of the Mediterranean stone quarry.
This was SVN commit r27123.
2022-10-05 02:25:11 +00:00
94f284dfd9 [Alpha 27][GUI][Textures] Add civ-specific Minimap textures for future inclusion in the UI
This was SVN commit r27122.
2022-10-05 02:22:03 +00:00
4fa5bd7ebd [Alpha 7][Art][Textures] Improve the look of the Kush bireme sail texture.
This was SVN commit r27121.
2022-10-05 02:15:20 +00:00
a9fef1932f [Alpha 27][Atlas] New Obstructor objects for Atlas.
Obstructors are useful for Skirmishes and Scenarios. They are only
visible in Atlas, not in-game.

This was SVN commit r27120.
2022-10-05 02:14:25 +00:00
221c478edc [Alpha 27][Art] Begin to add subterranean platforms for structures. This adds one to the Athenian Wonder.
This was SVN commit r27119.
2022-10-05 02:03:42 +00:00
86af95b80b [Alpha 27][Art][Actors][Celts] Reduce the amount of nakedness in Gallic and Brythonic units
This was SVN commit r27118.
2022-10-05 01:57:32 +00:00
2144a6c22b [Alpha 27][Audio] Reduce the volume and normalize the stone selection sound
This was SVN commit r27117.
2022-10-05 01:55:07 +00:00
54e1a66891 [Alpha 27] Add an icon the Arakamani's aura
This was SVN commit r27116.
2022-10-05 01:53:22 +00:00
61ee26bce1 [Alpha 27][Art][Portraits][Templates] Moving portrait textures to their own specific folders
This commit is for the templates

This was SVN commit r27115.
2022-10-05 01:49:40 +00:00
5b76cb5812 [Alpha 27][Art][Textures][Portraits] Move unit portraits to civ-specific folders.
This commit if for art; the next commit is for the templates refs.

This was SVN commit r27114.
2022-10-05 01:45:38 +00:00
95d64869f7 [Alpha 27][Art][Actors] Remove unnecessary decals from some trees; change decals on some structures
This was SVN commit r27113.
2022-10-05 01:40:47 +00:00
3b2126b95f [Alpha 27] [Art] Improved Hellenic structure texture, namely the frieze and pediment
This was SVN commit r27112.
2022-10-05 01:38:14 +00:00
f68528777f Bump version to alpha 27.
Last alpha 26 commit was [[SVN:27104]]

Accepted by: @asterix, @vladislavbelov
Discussed with: @Freagarach, @wraitii, @implodedok, @Itms

Refs: #6625

Differential Revision: https://code.wildfiregames.com/D4789
This was SVN commit r27105.
2022-10-04 17:05:11 +00:00
85854db8d6 Fixes water rendering on map borders.
Tested By:
Differential Revision: https://code.wildfiregames.com/D4716
This was SVN commit r27102.
2022-09-12 21:53:36 +00:00
4c4562699c [Alpha 26] Fix so that swordsman heroes can use the Testudo (if their civ allows it)
This was SVN commit r27095.
2022-09-11 15:58:28 +00:00
a91ff9c7f5 Replaces -1 as stencil mask value in effect XML by a positive mask.
Differential Revision: https://code.wildfiregames.com/D4785
This was SVN commit r27092.
2022-09-10 20:23:28 +00:00
32ccabeba6 Fix ministers being trainable by all civs.
Reported by: @Nobbi
This was SVN commit r27088.
2022-09-04 10:47:21 +00:00
40bb300efd Amend ToU to disallow account sharing.
Reviewers: Stan, Dunedan

Accepted By: Stan
Differential Revision: https://code.wildfiregames.com/D4783
This was SVN commit r27087.
2022-09-03 17:08:21 +00:00
6acc4b4a5b Don't mix locally installed python libs when building
Patch by: @baco
Differential Revision: https://code.wildfiregames.com/D4776
This was SVN commit r27084.
2022-09-01 20:49:16 +00:00
8eae4979c3 [Alpha 26] Fixes additional unit actors, for Roman Testudo and Anti-Cav idle animations, as well as an oversight with Athenian hero Pericles.
Fixes #6614

This was SVN commit r27080.
2022-09-01 19:27:00 +00:00
c938113609 [A26] Fix Hoplite and Pikeman actors for Phalanx and Syntagma idle animations. Add syntagma variants for Han halbs, for edge cases.
Differential revision: https://code.wildfiregames.com/D4780
This was SVN commit r27079.
2022-09-01 16:32:18 +00:00
e799ee7088 Switch names between ministry and civil_centre.xml reported by @AIEND.
https://wildfiregames.com/forum/topic/83323-balancing-the-han/page/6/#comment-517225

This was SVN commit r27075.
2022-08-27 11:57:08 +00:00
d1586e0edf Fix perioikoi hoplites not assuming the idle phalanx stance as the champions and heroes do.
This was SVN commit r27071.
2022-08-24 12:29:29 +00:00
6eb58a1248 Fix incorrect civilization being set in the spartan sandbox. Introduced in afde89eb33
This was SVN commit r27070.
2022-08-24 12:21:34 +00:00
acb939e7bc Don't wait for observers by default and let them lag as much as needed.
Discussed with: @alre, @wraitii, @real_tabasco_sauce, @chrstgtr, @Sevda
Thread:
https://wildfiregames.com/forum/topic/18003-suggestions-for-0-ad/page/157/#comment-516302

This was SVN commit r27069.
2022-08-24 12:08:46 +00:00
03e3f0f1f1 [Maps] Enable Napata citizen cavalry on Jebel barkal again
Oversight in daaa87b48c , noticed by @Freagarach

This was SVN commit r27066.
2022-08-21 08:03:24 +00:00
fbded636a2 [Gameplay] - Small nerf to CS crossbows
patch by: @real_tabasco_sauce
accepted by: @wowgetoffyourcellphone
Differential Revision: https://code.wildfiregames.com/D4754
This was SVN commit r27061.
2022-08-18 18:24:51 +00:00
14b8fb3b3b Add small flower borders to the han civic center to make its footprint more obvious.
Thread:
https://wildfiregames.com/forum/topic/86856-very-strange-field-sticking-near-han-city-center-by-ctrl/

This was SVN commit r27060.
2022-08-17 09:39:54 +00:00
8c497bea0d Fix an edge case when you would delete the last savegame and thus, the metadata would be undefined.
Introduced in a8c6d7a82b
Thread:
https://wildfiregames.com/forum/topic/89261-a-new-series-of-bugs/#comment-514015

This was SVN commit r27053.
2022-08-14 15:10:38 +00:00
daaa87b48c [Maps] Fix Jebel barkal after 01fd2564e5
since only infantry can garrision in stables now.

Reported by: Gurken Kahn
https://wildfiregames.com/forum/topic/82754-alpha-26-pre-releaserelease-candidate-build-testing/page/16/#comment-514594

Troubleshooting by @lyv

This was SVN commit r27052.
2022-08-14 15:05:48 +00:00
fc374d3718 Fix Athenian Gymnasion counting as a City Phase building, when it's actually a Town Phase building. Maybe we should add that class automatically at some point.
Reported by: Player of 0AD
Thread:
https://wildfiregames.com/forum/topic/82754-alpha-26-pre-releaserelease-candidate-build-testing/?do=findComment&comment=514655

This was SVN commit r27051.
2022-08-14 10:37:43 +00:00
5cdb9f6244 Recenter Han emblem logo slightly and fix the name.
Noticed by: @vladislavbelov
This was SVN commit r27050.
2022-08-14 10:29:45 +00:00
291182683d Adds explicit z value for main menu buttons to workaround low resolutions to be able to exit.
Reviewed By: marder, Stan
Differential Revision: https://code.wildfiregames.com/D4757
This was SVN commit r27049.
2022-08-13 11:22:33 +00:00
c9f7bf35ac Add in 92a96785a4 removed Han swordsman templates back in under a different name
So people can use them in atlas
Request by @wowgetoffyourcellphone

This was SVN commit r27048.
2022-08-13 09:19:27 +00:00
92a96785a4 [Gameplay] Enable other civ's to train champions in Han barracks and stables
Reported by Player of 0AD:
https://wildfiregames.com/forum/topic/82754-alpha-26-pre-releaserelease-candidate-build-testing/page/16/#comment-514122

Note that this also deletes the Han swordsman templates, as they are
unused right now.

This was SVN commit r27046.
2022-08-11 20:31:05 +00:00
4f3adf7fa6 Fix mipmap issue with the camel rein. Use a very light texture as most details are not really visible.
Fixes #6556
Reported by: @Langbart
This was SVN commit r27045.
2022-08-11 17:46:35 +00:00
3eea53ae66 [Gameplay] Make fences capturable
Request by Gurken Khan
https://wildfiregames.com/forum/topic/82754-alpha-26-pre-releaserelease-candidate-build-testing/page/16/#comment-513790

And I agree, it is annoying thay you can't just delete them once their
on your territory.

This was SVN commit r27043.
2022-08-10 22:16:38 +00:00
a80ce526b7 [Fix] Patch globalscripts technology template helper after 8d80a2186e and the ProductionQueue split
Patch by @s0600204.

This lets all technologies show up correctly in-game and in the
structure tree again.

accepted by: @marder @Freagarach
Fixes: #6587

Differential Revision: https://code.wildfiregames.com/D4755
This was SVN commit r27042.
2022-08-10 21:49:15 +00:00
d1c9e96f87 [Gameplay] Disable training han crossbow cavalry in other civ's barracks
Request by Player of 0AD:
https://wildfiregames.com/forum/topic/82754-alpha-26-pre-releaserelease-candidate-build-testing/page/15/#comment-513182

This was SVN commit r27040.
2022-08-08 21:32:56 +00:00
f8ff908d73 [maps] Adjust playerPlacementRiver to group teams on the same side in most cases
Brute forcing the right arrangement, which is unnecessary but accepted
since it has only a negligible performance impact overall.

accepted by: @lyv @andy5995
Fixes: #6390

Differential revision: https://code.wildfiregames.com/D4747
This was SVN commit r27039.
2022-08-08 20:52:05 +00:00
5afbdc6a09 [Gameplay] Disable training persian champions in other civ's barracks
Request by Player of 0AD:
https://wildfiregames.com/forum/topic/82754-alpha-26-pre-releaserelease-candidate-build-testing/page/15/#comment-513143

This was SVN commit r27038.
2022-08-08 20:41:17 +00:00
10f2ad4463 [Gameplay] Disable loot for trainable animals
Request by Player of 0AD:
https://wildfiregames.com/forum/topic/82754-alpha-26-pre-releaserelease-candidate-build-testing/page/15/#comment-513143

This was SVN commit r27037.
2022-08-08 18:16:58 +00:00
f843cf726d Cavalry vision range 92 m -> 80 m.
Patch by: @real_tabasco_sauce
Differential revision: https://code.wildfiregames.com/D4744
Comments by: @asterix, @borg-, @breakfastburrito_007, @chrstgtr,
@marder, @wowgetoffyourcellphone

This was SVN commit r27036.
2022-08-08 07:23:00 +00:00
96d33e02e4 Revert 774e8060d9.
Issue found:
https://wildfiregames.com/forum/topic/82754-alpha-26-pre-releaserelease-candidate-build-testing/?do=findComment&comment=513199.
The issue introduced is significantly worse than the stuff it fixed.

This was SVN commit r27034.
2022-08-08 07:14:18 +00:00
0a54a4e2a5 [Alpha 26] [Fix] Restore the Kushite fisherman actor
Reported by @CovenantKillerJ here:
https://wildfiregames.com/forum/topic/82754-alpha-26-pre-releaserelease-candidate-build-testing/?do=findComment&comment=512741

This was SVN commit r27029.
2022-08-04 15:36:13 +00:00
5cd08feba6 Fix issues with the sandbox_han.xml map in 08156e73fc.
Noticed by: @Langbart
This was SVN commit r27028.
2022-08-03 15:55:52 +00:00
5e824698e9 Fix false positive missing file in checkrefs.py in 22168569c6 (Game ignores double extensions)
Noticed by @Langbart

This was SVN commit r27027.
2022-08-03 15:43:07 +00:00
1e46b6f7e7 Fix material not using spectex in b8131a0f09
Noticed by @Langbart

This was SVN commit r27026.
2022-08-03 15:41:43 +00:00
d6d137bf5d [Fix] Adjust position of ice house and ministry in the building panel
accepted by: @asterix @Langbart
Fixes: #6502

Differential Revision: https://code.wildfiregames.com/D4746
This was SVN commit r27025.
2022-08-01 18:56:10 +00:00
a50d582c5f [Fix] Add missing loot to the Han minister
reported on the forums by Gurken Khan:
https://wildfiregames.com/forum/topic/82754-alpha-26-pre-releaserelease-candidate-build-testing/page/14/#comment-511954

This was SVN commit r27023.
2022-07-31 21:05:16 +00:00
6a48b023ad [Alpha 26] [Fix] [Persians] Remove the "City" class from the Persian Ice House.
Reported by @Gurken Khan:
https://wildfiregames.com/forum/topic/82754-alpha-26-pre-releaserelease-candidate-build-testing/?do=findComment&comment=511945

This was SVN commit r27022.
2022-07-31 20:55:39 +00:00
d76daebb03 [Gameplay] Rebalancing of the Gaul fanatic
patch by : @borg-
accepted by: @chrstgtr @real_tabasco_sauce
Differential revision: https://code.wildfiregames.com/D4722
This was SVN commit r27021.
2022-07-31 11:12:46 +00:00
b9e119e85e Add more world population options.
Requested by: @Edwarf
Accepted by: @Freagarach
Differential Revision: https://code.wildfiregames.com/D4742
This was SVN commit r27020.
2022-07-29 19:50:23 +00:00
b3d8b77173 [A26][Fix][Han] Add turret points to the Han wall gate.
Reported here by @0ad is the best rts game:
https://wildfiregames.com/forum/topic/87305-a26-hans-gate-cannot-be-garrisoned/

This was SVN commit r27018.
2022-07-26 14:16:29 +00:00
fbc9e19544 New icon for the han champion_infantry_crossbowman
Fixes #6591
Refs 08156e73fc

This was SVN commit r27013.
2022-07-18 12:06:43 +00:00
b8131a0f09 Use the new crossbow for han champion units.
This was SVN commit r27012.
2022-07-18 12:05:22 +00:00
22168569c6 New crossbow model for the han champion units.
Refs 08156e73fc

This was SVN commit r27011.
2022-07-18 12:04:43 +00:00
08156e73fc [Gameplay] Han unit roster restructure and other balancing adjustments
After feedback on the first RC's :
https://wildfiregames.com/forum/topic/83323-balancing-the-han/
This version of the roster seems to have a minimal concensus.
This removes some units from the very big roster of the Han,
restructures it and changes the cavalry crossbow champion for an
infantry one due to histrorical issues.
It furthermore reverts the changes to the champion infantry crossbow
template introduced in 9411d8c98e as that nerf wasn't necesarry.
This means that the Han and the Macedonians now have a champion crossbow
unit with the same stats.

Also:

Fixes #6560 by only keeping the "academy" templates, so that the Han can
now only train champions from the academy. Therefore, this reverts parts
of c4bdbe4dd9 and all of 2c9a6704e0.

Discussion with : @borg- @real_tabasco_sauce @wowgetoffyourcellphone
AIEND @Stan and other people on the forums and the Diff.

Differential revision: https://code.wildfiregames.com/D4713
This was SVN commit r27009.
2022-07-17 09:20:52 +00:00
fd08ab051f Fix other civs being able to upgrade Han CC to Court.
This ensures the `{civ}` and `{native}` tags are (properly) supported
for upgrades and uses it for the Han CC.

Reported on the forums
(https://wildfiregames.com/forum/topic/82754-alpha-26-pre-releaserelease-candidate-build-testing/page/10/#comment-508908)
by @Gurken Khan.
Differential revision: https://code.wildfiregames.com/D4733
Comments by: @Stan, @wowgetoffyourcellphone
This was SVN commit r27008.
2022-07-15 17:16:00 +00:00
2ccf42a244 Add an order sound for the Maurya elephant.
Reported by: @GurkenKhan
Thread:
https://wildfiregames.com/forum/topic/82754-alpha-26-pre-releaserelease-candidate-build-testing/?do=findComment&comment=508534

This was SVN commit r27006.
2022-07-12 08:19:14 +00:00
ba9cd30c9b Add missing garrison flag for the maurya houses.
Reported by: @GurkenKhan
Thread:
https://wildfiregames.com/forum/topic/82754-alpha-26-pre-releaserelease-candidate-build-testing/?do=findComment&comment=508540
Refs #4581, #6160

This was SVN commit r27005.
2022-07-12 08:09:25 +00:00
3f243b7b50 Fix d1538f7fbd.
Where I forgot to remove the other members when disbanding a formation.

Reported by: @wowgetoffyourcellphone
This was SVN commit r27000.
2022-07-04 05:06:59 +00:00
35e5f268da Fix properties on Persian Champion Infantry Archer XML file.
This was SVN commit r26999.
2022-07-04 05:02:44 +00:00
a7c709c58c [A26][Persians][Fixes] Fixes the Immortal Archer and Ice House for Persians.
This was SVN commit r26998.
2022-07-03 21:04:23 +00:00
22466770f1 [Alpha 26][Fix][Macedonians] Change Macedonian Team Bonus from Barter Bonus to Siege Bonus
This changes the old bartering bonus, which has been proved to be
mathematically problematic, for a siege-focused bonus, which is also
historically relevant.
Differential revision: https://code.wildfiregames.com/D4729
Forum discussion (lengthy):
https://wildfiregames.com/forum/topic/71578-feedbacks-from-a26-svn-tests/page/6/#comment-485498
Accepted by: @chrstgtr, @real_tabasco_sauce, @borg-
This was SVN commit r26997.
2022-07-03 13:51:56 +00:00
b6caf5eb63 Differentiate Persians.
- Allows the immortals to be "upgraded" between sword and bow yielding.
- Reduces batch training time per progressing phase.
- Don't kill the immortals partly when reducing their training time.
- More units from the CC.
- Enable the Ice House.

Patch by: @borg-
Differential revision: https://code.wildfiregames.com/D4724
Accepted by: @chrstgtr, @real_tabasco_sauce
Comments by: @marder, @Stan
This was SVN commit r26996.
2022-07-03 05:44:37 +00:00
6e3ddadc7e Fix flickering tooltip for user report button
Patch by: @Langbart
Fixes #6581

This was SVN commit r26994.
2022-06-30 13:34:34 +00:00
d1538f7fbd Fix formation merging issues.
The motion parameters were calculated even without members, which caused
us to try set a undefined passclass.
Also were members added to previously merged twin-formations. Once
merged (i.e. disbanded), they are moved out of world now.

Some cleanups/deduplication whilst at it.

Reported by: @andy5995 at the forums
(https://wildfiregames.com/forum/topic/71578-feedbacks-from-a26-svn-tests/page/8/#comment-505078)
Differential revision: https://code.wildfiregames.com/D4727
Comments by: @Langbart, @marder
Tested by: @Langbart
Fixes #6580

This was SVN commit r26993.
2022-06-30 06:04:05 +00:00
5ab132c16c Remove unused han_hero_wei_qing_3.json aura.
Reported by: @Langbart
Fixes #6544
Fixes 77c11753c3

This was SVN commit r26992.
2022-06-28 13:47:39 +00:00
18bdacbb57 [maps] Adjust position of starting units on oceanside_2p.xml
For the Han they were inside the CC.

This was SVN commit r26989.
2022-06-24 18:01:15 +00:00
fd7f091b8c [Gameplay] Han - adjust crossbow stats & training techs
Similar dps as a slinger now, but with higher repat time. Normal citizen
soilder cost.
Nerf the crossbow training technology a bit.
Make the archer & crossbow technology availabe in the stable as well, as
it they also affect cavalry units.

accepted by : @real_tabasco_sauce
positive comment from: @borg-

Differential revision: https://code.wildfiregames.com/D4721
This was SVN commit r26988.
2022-06-24 17:31:02 +00:00
a6c1d5bbb9 revert last commit / 39dd5329cc
Misscommunication if this was the right move or not.

Leave the size as it was until someone has time to fix all buttons at
once.

This was SVN commit r26987.
2022-06-24 16:41:53 +00:00
39dd5329cc [GUI] increase msgbox button size to fix text overlap
Report:
https://wildfiregames.com/forum/topic/82754-alpha-26-pre-releaserelease-candidate-build-testing/page/6/#comment-504135

3ab25cbd95 added a new button which has more text and can span have
multiple lines in some languages.
Fix: increase the size.
possible todo for the future: unify button sizes or make them adaptive
depending on the text size.

comments by @Langbart @Stan

accepted by @wraitii

Differential revision: https://code.wildfiregames.com/D4707
This was SVN commit r26986.
2022-06-24 11:19:17 +00:00
ec723428d1 Logic fix for very high shadows on very large screens.
ON large screens like 5120x1440 calculated shadow map was 32768. That
was 16x more than high setting, 32x more than medium setting and 64x
more than low setting.

After this change shadow map sizes using very high setting by resolution
will be following:
1920x1080 - 4096
2560x1440 - 4096
3840x1440 - 4096
5120x1440 - 8192
3840x2160 - 4096
7680x4320 - 8192
Patch by: @karmux
Reviewed by: @vladislavbelov, @Stan
Differential Revision: https://code.wildfiregames.com/D4723
This was SVN commit r26983.
2022-06-23 17:04:13 +00:00
3cdd5d2bd6 [Gameplay] Han - Reduce strength of art of war technology
Seemed a bit strong, especially with the hero.

accepted by : @borg-

Differential revision: https://code.wildfiregames.com/D4714
This was SVN commit r26982.
2022-06-22 17:29:59 +00:00
589dfa7a50 This was SVN commit r26981. 2022-06-22 17:18:11 +00:00
77c11753c3 [Gameplay] Han - Hero adjustments
accepted by : @borg-
positive comments by: @real_tabasco_sauce
Differential revision: https://code.wildfiregames.com/D4709
This was SVN commit r26980.
2022-06-22 17:06:11 +00:00
b4155900d3 [Gameplay] Han - adjust farming techs to the standard 20%
accepted by : @real_tabasco_sauce

Differential revision: https://code.wildfiregames.com/D4720
This was SVN commit r26979.
2022-06-22 17:03:31 +00:00
00e29977dc Add missing frequency for the idle variant.
Noticed by: @Langbart
Fixes #6579

This was SVN commit r26978.
2022-06-21 05:38:54 +00:00
3d47232ec8 [graphics] Adjust default config to give a better first impression
comments by @vladislavbelov
accepted by : @Stan

Differential revision: https://code.wildfiregames.com/D4706
This was SVN commit r26976.
2022-06-20 19:50:45 +00:00
f22fdcd004 [Gameplay] Han - remove Laozi gate
It is not historically correct and more importantly, I also doesn't add
that much gamplay value. Also clean up the template a bit and remove the
aura while at it.

accepted by : @Stan & people on the forum:
https://wildfiregames.com/forum/topic/83323-balancing-the-han-release-candidate-1/

Differential revision: https://code.wildfiregames.com/D4708
This was SVN commit r26975.
2022-06-20 19:16:51 +00:00
2685783886 [Gameplay] Adjust cost of mer cav (again)
Add a little bit of food cost. Not enough to hugely change stuff, but
just an addition to make it a little bit harder to mass them.

Conceptual agreement from @chrstgtr @real_tabasco_sauce

Differential revision: https://code.wildfiregames.com/D4710
This was SVN commit r26974.
2022-06-20 19:07:27 +00:00
db1a31b701 [Gameplay] Move ptol heroes to the fortress
accepted by : @chrstgtr @borg- @real_tabasco_sauce

Differential revision: https://code.wildfiregames.com/D4711
This was SVN commit r26973.
2022-06-20 19:04:08 +00:00
83bab71e8d [maps] Lighting adjustments to gulf_of_bothnia.js spring biome
Just some tweaks to make it look nicer.

This was SVN commit r26972.
2022-06-20 18:50:59 +00:00
e888587116 Fix some capes not having approaching animations.
EOL native + MIME type.
Remove duplicated tools objects spawning when gathering resources.

This was SVN commit r26971.
2022-06-20 13:48:24 +00:00
3294f0ea48 [GUI] Correction of the deco size at the bottom right of the ModernDialog sprite
The bottom deco on the right is 2 pixels wider than the one on the left.

Patch by @Langbart

Differential revision: https://code.wildfiregames.com/D4717
This was SVN commit r26968.
2022-06-20 06:33:27 +00:00