Commit Graph

16379 Commits

Author SHA1 Message Date
cce7d02036 Bugfix & optimisations to ApplyModifiers
This functions is amongst the most called in JS, so it's important to
make it speedy.

- Bugfix: if 'originalValue' is falsy, the result was never cached. This
in particular affected the minRange of archers, which is 0. It's a large
optimisation on combatDemoHuge, but the effect elsewhere is less likely
to be noticeable.
- Don't go through the helper to get the player Entity ID, in this case
it's slower.
- Concat is slower than Flat() in this case according to my profiling.
- Some micro-optimisation by strict equality.

Differential Revision: https://code.wildfiregames.com/D5012
This was SVN commit r27696.
2023-06-14 07:27:06 +00:00
5893c4bc85 Allow to set the biome with the autostart command.
Basically a patch by: @wraitii
Differential revision: https://code.wildfiregames.com/D4976
Comments by: @bb, @sera
Accepted by: @Langbart
Fixes #6521

This was SVN commit r27692.
2023-06-14 06:35:27 +00:00
f64b3f773e Art | Misc actor and texture improvements
This was SVN commit r27690.
2023-06-14 01:23:30 +00:00
14dd3c0aad Make Farmstead aura icon appear over affected Fields as well as gatherers
This was SVN commit r27689.
2023-06-14 01:19:27 +00:00
70c83b9c3d Art | Add a new variant texture for Spartan women
This was SVN commit r27688.
2023-06-14 01:18:03 +00:00
466968ca3e Art | Buildings | New Gallic structure textures with roof shingles instead of thatch.
This was SVN commit r27687.
2023-06-14 01:16:47 +00:00
227bc8db02 Maps | Update a bunch of skirmish maps and add a new one (Arabian Oases 2p)
This was SVN commit r27686.
2023-06-14 01:13:44 +00:00
075d8589f3 Art | Player color for Greek defense tower
This was SVN commit r27685.
2023-06-14 01:07:15 +00:00
9aa118d6be Art | Move Mauryan heads to the correct folder.
This was SVN commit r27684.
2023-06-14 01:01:56 +00:00
22cbd39bbd Civs | Remove AI names which duplicate in-game heroes.
This was SVN commit r27683.
2023-06-14 00:57:58 +00:00
aa7dfc196e Art | New model for the Mauryan Palace
This was SVN commit r27682.
2023-06-14 00:56:01 +00:00
59a805dac8 Art | Fix the ostrich feather actors for Nubian units
This was SVN commit r27681.
2023-06-14 00:36:05 +00:00
50453f1e1f Art | Use a better portrait for Whales
This was SVN commit r27680.
2023-06-14 00:34:18 +00:00
df2a0cf3ab Art | New and improved terrains
New Farmland terrains for various biomes

Remove alpha channel from numerous terrain normal maps

This was SVN commit r27679.
2023-06-14 00:32:34 +00:00
46b374b855 Art | Greatly improve the look of some ship sail actors
This was SVN commit r27678.
2023-06-14 00:18:27 +00:00
50e78c1af5 Art | Some new assets
Mediterranean Bush (dry)
Stone and Rock fences by @Wow
New props for Briton and Gallic formation standards
New Kushite Shields by @Stan
Saharan capturable farmstead
Celtic Shrine (with improved textures)
Royal Palm tree

This was SVN commit r27677.
2023-06-14 00:15:28 +00:00
95546c8a1d Art | unit portraits | Update a bunch of unit portraits
This was SVN commit r27676.
2023-06-13 23:20:27 +00:00
553149957d Art | Technology portraits | Update some older tech portraits and add a few new ones.
This was SVN commit r27675.
2023-06-13 23:13:41 +00:00
3991c5c857 Speed up timer update by using Map.forEach
According to JIT profiling on SM 115, using ForEach is faster than
iterating.
This is a micro optimisation, maybe 2% faster for OnUpdate, which means
we might see an overall improvement < 0.4%.

The reason this is faster here is that Iterating needs to construct an
array to store the result, whereas ForEach just uses the values
directly. This means this probably doesn't apply to iterating if we
don't need both the key/value pair.

Differential Revision: https://code.wildfiregames.com/D5010
This was SVN commit r27674.
2023-06-13 15:57:18 +00:00
7350b9042e Don't poll territory in Position component
CmpPosition::TurnStart checks whether the territory changed underneath
each entityevery turn. The only user of this is TerritoryDecay
(structures, for the most part). It is rather inefficient to have this
done for all entities.
The simplest solution is to listen to position-changed messages in
TerritoryDecay instead. This should hardly ever happen in vanilla 0
A.D., except in Atlas, so it's basically free.

This sort of reverts 19965ce37a (original implementation) and
c44b48bd59.

Accepted By: Freagarach (concept only)
Differential Revision: https://code.wildfiregames.com/D5009
This was SVN commit r27673.
2023-06-13 15:48:03 +00:00
2a17a2866e Update the rules for new lobby usernames
Right now usernames for the lobby can consist solely of numbers and
special characters. This can result in nonsensical usernames and is
prone to be abused. While we can't entirely prevent nonsensical
usernames, we can at least do a bit better.

Therefore, this adjusts the rules for the validation of new lobby
usernames in pyrogenesis. Previously these rules were:

- length: between 1 and 20 characters
- valid characters: lower- and uppercase letters, numbers, ".", "_", "-"

The new rules are:

- length: between 3 and 20 characters
- valid characters: lower- and uppercase letters, numbers, ".", "_", "-"
- must contain at least one letter

These validation changes are relevant for new user registrations only
and don't affect existing users. As this also just adjusts the
client-side validation, users will also still be able to register
usernames according to the old rules, e.g. when using an older version
of 0 A.D., until the same change gets rolled out at a later point in
time server-side as well.

This was SVN commit r27670.
2023-06-08 15:21:04 +00:00
b131e641f5 Fix visual glitch in slaughtering: This adds a PrepareTime to the Slaughter attack. Has negligible affect on gameplay, but fixes a minor, but ugly visual glitch where the animal dies too quickly, without even being stabbed first.
Differential Revision: https://code.wildfiregames.com/D5017
Accepted by: @chrstgtr
Supportive comments by: @real_tabasco_sauce, @Freagarach, @Feldfeld
This was SVN commit r27669.
2023-06-07 15:58:26 +00:00
f2ca8f7787 Balance the splash damage of Elephants.
- Move the Crush damage from Splash to direct hit.
- Reduce overall damage slightly

Accepted By: Feldfeld
Differential Revision: https://code.wildfiregames.com/D5008
This was SVN commit r27668.
2023-06-06 07:10:03 +00:00
0d5cc1b994 Fix game crash when communicating with the lobby on macOS 13
Summary:
On macOS Ventura (at least version 13.2.1 and above), the game crashes
instantly when clicking on buttons communicating with the lobby.

This issue is solved by upgrading nettle to 3.9 and GNUTLS to 3.8.

Patch by: froissant
Accepted By: wraitii
Trac Tickets: #6807

Differential Revision: https://code.wildfiregames.com/D5018
This was SVN commit r27667.
2023-06-06 07:07:50 +00:00
9707931878 Fixes Vulkan hazards reported by validation layers.
Tested By: Stan
Differential Revision: https://code.wildfiregames.com/D5024
This was SVN commit r27665.
2023-06-05 16:32:18 +00:00
71e3d1303d Disables UV1 vertex attribute without USE_AO for model_common shader.
This was SVN commit r27656.
2023-05-30 17:07:58 +00:00
cd8eb70859 Disables framebuffer invalidating by default for GL as some drivers perform it incorrectly.
Fixes #6805

Tested By: Itms
Differential Revision: https://code.wildfiregames.com/D5003
This was SVN commit r27654.
2023-05-29 20:53:10 +00:00
58eebfcc64 Art Fix | Roman minimap symbol is now the she-wolf of Rome suckling Romulus and Remus, instead of the problematic fasces symbol of Roman power.
This was SVN commit r27652.
2023-05-24 22:11:13 +00:00
ecdd98d879 Remove unused and now broken mesh.
The archive builder reported not being able to convert it as it uses the
previous armature.

This was SVN commit r27651.
2023-05-24 09:38:54 +00:00
04f55f7cf5 Check the validity of a couple pointers in low-level tests, refs #5288.
Reported By: PVS-Studio
Patch By: animus
Reviewed By: phosit
Differential Revision: https://code.wildfiregames.com/D4994
This was SVN commit r27647.
2023-05-18 16:52:29 +00:00
f0b01f0896 Mark ModifiersManager as a system component.
Patch by: @Langbart
Refs: #6801 #6792

This was SVN commit r27642.
2023-05-11 20:51:18 +00:00
52b308750f Fix a bug with the AI after 91509290d6
This was SVN commit r27641.
2023-05-11 09:24:19 +00:00
c278da73d9 Fix issues with the component documentation.
Reported by: @Langbart
Fixes: #6792

Differential Revision: https://code.wildfiregames.com/D4985
This was SVN commit r27638.
2023-05-10 15:55:51 +00:00
173e016172 Allow starting by command with sandbox AI.
|| takes 0 as false; ?? doesn't.

Patch by: @Freagarach
Accepted by: @sera, @Langbart
Fixes: #6771

Differential Revision: https://code.wildfiregames.com/D4975
This was SVN commit r27637.
2023-05-10 15:34:38 +00:00
91509290d6 Workaround TriggerHelper.js not being able to spawn units correctly because of promotion.
Avoid duplication by moving the function to Transform.js.
Add tests to Transform.js
Add tests to TurretHolder.js
Optimize slightly Trainer.js by removing some useless
Engine.QueryInterface calls.
Refs #6784 (symptoms in TriggerHelper.js are fixed underlying cause not)

`SkirmishReplacer` is called before the Modifier Manager so it does not
suffer the same fate.
Entities using `ChangeEntityTemplate` function are still affected.
Maps calling Engine.AddEntity directly are still affected.

Ideally this should be handled by hotloading components instead of
creating new entities each time. See =>
https://code.wildfiregames.com/D4991
Tested using:
908dd631d9

Differential Revision: https://code.wildfiregames.com/D4984
This was SVN commit r27636.
2023-05-10 15:13:52 +00:00
1c7e157e28 [Maps] Fix incorrect fruit bush in Gulf of Bothnia - Frozen Lake biome
"fruitBush": "gaia/fauna_deer" was an oversight/ hack and is just bad
practice.

patch by: @real_tabasco_sauce
comments by: @phosit
Differential revision: https://code.wildfiregames.com/D4990
This was SVN commit r27635.
2023-05-09 17:45:44 +00:00
7cd980f2e1 Move some engine required files to the mod mod.
Most of the shaders are explicitely interned by the engine except for
the one called "Model" which is not required (you can have maps with
just terrain for visualization)
The rng files are called by the engine to validate structure.
The game has two overrides for high quality and normal water to be
"ocean" and "default" respectively
The minimap flare folder is hardcoded see #6795
The default material now calls the dummy shader instead of the model one
when in modmod
Move the default skybox, it will be required by _default.xml
The terrain materials are moved as well, for completeness, although they
are currently not referenced.

This commit does not include atlas needed files as it cannot run without
the public mod anyway for now. It will be done in a separate commit when
we have the ingame editor that will require _default.xml for instance.

This commit is also needed to generate the spir-v shaders in the correct
mods, in order to be able to launch the game with mod mod only.

Refs: #6636 #5366
Fixes: #6294

Differential Revision: https://code.wildfiregames.com/D4906
This was SVN commit r27629.
2023-05-06 17:14:41 +00:00
15874868e2 Alpha 27 | Fix | Add garrisoned prop points for standard Greek houses.
Reported by Gurken Khan:
https://wildfiregames.com/forum/topic/96804-alpha26-feedback-and-suggested-changes/?do=findComment&comment=550459

This was SVN commit r27626.
2023-05-01 20:46:22 +00:00
04230f7e03 Adds SPIR-V to effect XML files.
Differential Revision: https://code.wildfiregames.com/D4986
This was SVN commit r27624.
2023-04-29 20:36:37 +00:00
69f01932c7 Update Transifex configurations for the new API using the tx migrate command specified on https://github.com/transifex/cli/releases
This was SVN commit r27619.
2023-04-27 13:06:30 +00:00
c3d61fecf2 Fix missing texture/duplicate sprite reported by checkrefs.py
This was SVN commit r27618.
2023-04-26 15:15:51 +00:00
abb280d75a Alpha 27 Name: Agni
This is a Sanskrit word meaning fire and connoting the Vedic fire deity
of Hinduism.

Poll: https://wildfiregames.com/forum/topic/106110-alpha-27-naming-poll/

This was SVN commit r27617.
2023-04-26 12:03:17 +00:00
dffaf9d103 Alpha 27 | Fix vision revealers by removing redundant components from the templates and truly make them invisible in-game.
Fixes #6791

This was SVN commit r27611.
2023-04-17 15:06:00 +00:00
a28fddcf72 Adds an option to disable mouse grab in fullscreen.
Refs #6649
Refs #545

Differential Revision: https://code.wildfiregames.com/D4974
This was SVN commit r27603.
2023-04-12 06:59:37 +00:00
ef71533d70 Use a lower default MTU for ENet hosts, and make it configurable.
This fixes packet loss issues on some VPN solutions.

Patch By: sera
Differential Revision: https://code.wildfiregames.com/D4967
This was SVN commit r27599.
2023-04-10 08:21:07 +00:00
ac3d187dcd Fixes model water and waterfall shaders outputting color on shadow pass.
This was SVN commit r27594.
2023-03-28 06:51:00 +00:00
bd20a95d4f Alpha 27 | Art| Fix: "Garrisoned" prop point for Athenian "Parthenon" Wonder model
Reported by: @Stan' from @zyli's log here:
https://wildfiregames.com/forum/topic/106298-petra-error/?fbclid=IwAR1R-MFsqFxFwDdqgBONIevkXRf1V1bPdosTYxyJigxOQo1VPkPQDHDdlzc#comment-548226

This was SVN commit r27593.
2023-03-27 18:14:36 +00:00
952aed8e7f Alpha 27 | Art | Fix: Add garrison flag for Athenian Gymnasion.
Reported here:
https://wildfiregames.com/forum/topic/96804-alpha26-feedback-and-suggested-changes/page/3/#comment-547882

This was SVN commit r27591.
2023-03-24 18:59:22 +00:00
e96ec4d1bd Alpha 27 | Art | Fix: palm_tropical UV maps
Fixes #6756

This was SVN commit r27589.
2023-03-21 18:52:39 +00:00
405b92e653 Disable actual turn rate for ships - make their turning purely visual
They can't dance either way and this improves their pathfinding behavior
as well as their visual movement.

Comments from @Stan @Freagarach @wraitii @real_tabasco_sauce

Differential Revision: https://code.wildfiregames.com/D4971
This was SVN commit r27587.
2023-03-19 19:40:10 +00:00
87202eccad Adjust footprint of packed roman ballista
It look very stretched

This was SVN commit r27586.
2023-03-18 10:25:30 +00:00
d493560fc8 [Gameplay] - Balance changes to catapult/ heavy warship stats and fix them firing infinitly at targets outside their vision range
Fixes: #6708

Reported by @borg- @andy5995, ticket creation & suggested solutions by
@Langbart
Previous version of the batch accepted by @real_tabasco_sauce, positive
comments from @chrstgtr

Differential Revision: https://code.wildfiregames.com/D4962
This was SVN commit r27585.
2023-03-18 07:58:44 +00:00
33c95dec01 [Gameplay] - Adjust batch modifier from upgraded Han CC
Reported on the Forums:
https://wildfiregames.com/forum/topic/106426-incredibly-fast-training-times/

Solution: Use half the current value (for now)

Refs: #6755 because of the description

accepted by: no one, but there seemed to be a general agreement that a
reduction would be ok.

Differential Revision: https://code.wildfiregames.com/D4961
This was SVN commit r27584.
2023-03-18 07:24:13 +00:00
e56355baaf Fix mistake in previous commit.
Reported by: @wowgetoffyourcellphone
This was SVN commit r27582.
2023-03-17 06:50:55 +00:00
1263c53b58 Fix han sales having broken scale causing visual glitches.
Also use the correct normal and spec textures for the sail.

This was SVN commit r27581.
2023-03-16 17:01:23 +00:00
4fbe948be7 Fixes grass with normal and specular textures.
Tested By: Langbart, marder, wowgetoffyourcellphone
Differential Revision: https://code.wildfiregames.com/D4968
This was SVN commit r27575.
2023-03-12 12:00:21 +00:00
574c93f094 Fix a bug introduced in cc4d68c68d.
The `alive` variant could sometimes be set preventing the garrison flag
from showing.
Reported by: Gurken Khan
Thread: https://wildfiregames.com/forum/topic/106480-flagless-uxelon/

This was SVN commit r27571.
2023-03-08 16:27:02 +00:00
39e3272116 Fix string issue noted by @rollieoo at Transifex.
This was SVN commit r27570.
2023-03-06 15:03:54 +00:00
5706426dad Give Chandragupta Maurya Hero two auras.
Patch by: @real_tabasco_sauce
Differential revision: https://code.wildfiregames.com/D4952
Reviewed by: @chrstgtr
Comments by: @Langbart, @wowgetoffyourcellphone
This was SVN commit r27568.
2023-03-06 07:37:20 +00:00
9692a3ec9c Revert af64e565d7.
Introduced #6750, reported by @Langbart, and quite hard to do right.
Fixes #6750

This was SVN commit r27567.
2023-03-06 07:24:47 +00:00
4bb9d2a997 Don't subtract lifestock from used/gathered resources.
Also some cleaning in the statistics tracker.
(`total` is used by the lobby bots and hence not removed.)

References 215a102c27 and #3948.
Differential revision: Don't subtract lifestock from used/gathered
resources.
Tested by: @Langbart
Fixes #6744

This was SVN commit r27562.
2023-02-24 09:26:56 +00:00
8d4bf38d1d Attack-move when rally point target is out of world.
Instead of merely walking (totally unwanted in the middle of a fight,
hence I call this a bugfix).

Differential revision: https://code.wildfiregames.com/D4955
This was SVN commit r27561.
2023-02-24 09:10:50 +00:00
8f8e8710a0 Fix units idling after unable to garrison while there are rally points.
When unable to garrison and that is the first rally point, the rest of
the rally point queue is not handled.
The check was introduced in df1d5d2260 because UnitAI didn't guard
garrisoning properly.

Patch by: @Langbart
Differential revision: https://code.wildfiregames.com/D4954
Fixes #6746

This was SVN commit r27560.
2023-02-24 09:08:38 +00:00
af64e565d7 Autocontinue constructing farms when the first queued for construction is full.
Seen at around minute 20 at
https://wildfiregames.com/forum/topic/15271-0-ad-on-youtube/page/114/#comment-544694.
If not tasked by the user, entities will not autogather. But now they at
least construct the farms.

Differential revision: https://code.wildfiregames.com/D4945
Comments by: @phosit, @Stan
This was SVN commit r27559.
2023-02-24 09:04:10 +00:00
11c9e33d0f [PetraAI] - Wait when all members of an attack-plan are garrisoned.
Reported by: @Langbart
Differential revision: https://code.wildfiregames.com/D4936
Refs. #6385 by fixing a part of it (the attack plan).

This was SVN commit r27551.
2023-02-17 13:49:01 +00:00
d28145a61a Fix missing animation variant reset after committing resources in UnitAI.
Causing units to not show the gathering animation when close to a
dropsite.
We might want to move this stuff to their respective components.

Differential revision: https://code.wildfiregames.com/D4937
Comments by: @Stan
Fixes #6566

This was SVN commit r27550.
2023-02-17 13:43:06 +00:00
189fc18251 Fix batch not stopped when using the spawn cheat.
Reported and tested by @Langbart.
Differential revision: https://code.wildfiregames.com/D4939
Fixes #6739

This was SVN commit r27549.
2023-02-17 13:31:51 +00:00
f7193ed595 Fix two missing overlay icons for hero auras.
Patch by: @real_tabasco_sauce
Differential revision: https://code.wildfiregames.com/D4941
Reviewed by: @wowgetoffyourcellphone
This was SVN commit r27548.
2023-02-17 13:25:47 +00:00
8a46c3341b Allow Chanakya technology bonus to be used concurrently with healing.
As it was too tedious to use and hence unused.
Also nerf it a bit since it may be too strong otherwise.

Patch by: @real_tabasco_sauce
Differential revision: https://code.wildfiregames.com/D4943
Reviewed by: @chrstgtr, @wowgetoffyourcellphone
This was SVN commit r27547.
2023-02-17 13:18:26 +00:00
783efd4aaa Ditch superfluous call to getEntityById as reported by @Langbart at 6ea5d33406.
This was SVN commit r27545.
2023-02-17 07:04:57 +00:00
6ea5d33406 Fix AI tasking catafalques to the center of the CC.
There is some unit-motion/unitAI bug that makes them not reach the
center and hence idleness.

Refs. #6735 by fixing the specific PetraAI <> catafalque case.
Reported and solution by: @Langbart
This was SVN commit r27544.
2023-02-15 14:30:08 +00:00
ee88cd353c Fix trees, rocks, fish, and crocodiles having incorrect owners.
Refs #6688
Refs D4123

This was SVN commit r27543.
2023-02-14 21:48:35 +00:00
eafacb6e25 Remove some textures that had both DDS and PNG variants.
Use @wackyserious new textures for those.
Fixes #6738
Reported by: @sera
This was SVN commit r27540.
2023-02-13 11:57:12 +00:00
e6d87c7fe4 Fix Han catafalque.
Which had a wrong description and/or wrong modifiers and a strange
affected class.
Reported by @LienRag at
https://wildfiregames.com/forum/topic/38729-addition-of-han-chinese-to-0ad/?do=findComment&comment=543258.

Differential revision: https://code.wildfiregames.com/D4931
Comments by: @chrstgtr, @Langbart, @Stan, @wowgetoffyourcellphone
This was SVN commit r27534.
2023-02-10 07:28:27 +00:00
471e1a8297 Fix rally point cursor and capturing from spawn.
Introduced in 82e2619ece (the default attack mode switch).

Differential revision: https://code.wildfiregames.com/D4933
Tested by: @Langbart, @phosit, @wowgetoffyourcellphone
Fixes: #6727
(Refs. #6733)

This was SVN commit r27533.
2023-02-10 07:19:34 +00:00
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