griffkid4/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity
23,500 Commits 1 Branch 28 Tags 13 GiB
a05d9c43c4
Commit Graph

16039 Commits

Author SHA1 Message Date
vladislavbelov
a05d9c43c4 Removes unused and incorrect materials. 
This was SVN commit r27373.
 2023-01-06 16:15:01 +00:00
vladislavbelov
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
vladislavbelov
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
vladislavbelov
4984c31f03 Fixes incorrect actor material added in f4bd43d3e7. 
This was SVN commit r27370.
 2023-01-06 15:13:07 +00:00
vladislavbelov
e291269898 Fixes missed group and variant after 975fcddd41. 
This was SVN commit r27369.
 2023-01-06 15:07:21 +00:00
vladislavbelov
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
wowgetoffyourcellphone
f4bd43d3e7 Mapping | Improve the look of the tutorial map. 
This was SVN commit r27365.
 2023-01-06 00:54:29 +00:00
vladislavbelov
2549c44c1d Removes escaped quotes from spartan_sword.xml added in 2a9e7f9449. 
This was SVN commit r27364.
 2023-01-06 00:40:42 +00:00
vladislavbelov
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
vladislavbelov
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
vladislavbelov
e9e7995ec7 Adds normal texture to cavalry_spearman_c_r.xml. 
This was SVN commit r27359.
 2023-01-05 22:11:49 +00:00
vladislavbelov
f86c916799 Adds default normal texture for actors. 
This was SVN commit r27358.
 2023-01-05 22:00:21 +00:00
wowgetoffyourcellphone
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
vladislavbelov
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
vladislavbelov
1798b386f5 Adds missing materials with both norm and spec textures. 
This was SVN commit r27355.
 2023-01-05 18:34:41 +00:00
vladislavbelov
fe1b2554e2 Removes useless defines from rock materials. 
This was SVN commit r27354.
 2023-01-05 17:40:10 +00:00
wowgetoffyourcellphone
3453a299d2 Art | Missing actor 
This was SVN commit r27353.
 2023-01-05 17:34:36 +00:00
vladislavbelov
1dd122190b Adds missing svn eol-style native for materials. 
This was SVN commit r27352.
 2023-01-05 16:18:00 +00:00
Freagarach
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
wowgetoffyourcellphone
3f560391f2 A couple more revealer sizes. 
This was SVN commit r27348.
 2023-01-05 04:47:31 +00:00
wowgetoffyourcellphone
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
wowgetoffyourcellphone
9334041a0e Art | Terrains | Improve some terrains. 
This was SVN commit r27346.
 2023-01-05 01:03:34 +00:00
wowgetoffyourcellphone
80094ee0cf Art | Change the scaffolds used by these foundations. 
This was SVN commit r27345.
 2023-01-05 00:49:07 +00:00
wowgetoffyourcellphone
4ab9178737 Art | Tweak the UV map of the Spartan CC 
This was SVN commit r27344.
 2023-01-05 00:45:07 +00:00
wowgetoffyourcellphone
cecb0e20f1 Fix | Fix the parent ref in this skirmish entity. 
This was SVN commit r27343.
 2023-01-05 00:27:17 +00:00
wowgetoffyourcellphone
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
wowgetoffyourcellphone
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
wowgetoffyourcellphone
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
wowgetoffyourcellphone
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
wowgetoffyourcellphone
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
Freagarach
48ac0fecde Fix missed target -> position. 
Introduced in fc04e849ca.
Reported by: @wowgetoffyourcellphone.
This was SVN commit r27333.
 2023-01-02 06:58:39 +00:00
vladislavbelov
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
wowgetoffyourcellphone
0152c26b72 Some additional scaffolds for construction foundations. 
This was SVN commit r27327.
 2022-12-31 16:00:40 +00:00
wowgetoffyourcellphone
e7613d1c89 Some new Ruin objects. 
This was SVN commit r27325.
 2022-12-31 04:37:56 +00:00
Freagarach
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
Freagarach
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
vladislavbelov
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
vladislavbelov
858b134a15 Removes duplicated uniforms after 7c20a8c958. 
This was SVN commit r27317.
 2022-12-29 17:52:00 +00:00
Freagarach
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
Freagarach
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
wraitii
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
vladislavbelov
edca3d719e Removes unused materials following f08f6f1d2d. 
This was SVN commit r27311.
 2022-12-28 16:25:14 +00:00
Stan
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
wowgetoffyourcellphone
3814c153df Fix materials on these 3 field plots 
This was SVN commit r27306.
 2022-12-26 23:43:25 +00:00
wowgetoffyourcellphone
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
wowgetoffyourcellphone
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
wowgetoffyourcellphone
41998f494c Fix some decals after 0b3a1eafc4 
This was SVN commit r27303.
 2022-12-26 20:09:40 +00:00
wowgetoffyourcellphone
0b3a1eafc4 Fix some decals after 1754a3f06c 
This was SVN commit r27302.
 2022-12-26 20:01:49 +00:00
vladislavbelov
0159f25636 Removes unoptimized terrain materials following 1754a3f06c. 
This was SVN commit r27301.
 2022-12-26 11:57:46 +00:00