1
0
forked from 0ad/0ad
Commit Graph

16115 Commits

Author SHA1 Message Date
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