mirrors/0ad
1
0
Fork 2
mirror of https://gitea.wildfiregames.com/0ad/0ad.git synced 2026-07-23 03:12:55 +00:00
Code Issues Packages Projects Releases Wiki Activity
23,470 Commits 1 Branch 39 Tags
9cffe4e96ffb4b9053c91a10fc85df810c6f28ed
Commit Graph

23470 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Stan 8e0e40d489 Fix whitespaces, identation and remove (void). 
Patch by: @phosit
Differential Revision: https://code.wildfiregames.com/D4800
This was SVN commit r27337.
 2023-01-04 17:10:05 +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 e4ded1f971 Fixes vertex attribute format mismatch for silhouette debug rendering. 
This was SVN commit r27331.
 2023-01-01 21:46:31 +00:00
vladislavbelov ca242239f1 Adds StaticVector implementation. 
Patch By: phosit
Comments By: jprahman, Stan
Differential Revision: https://code.wildfiregames.com/D4838
This was SVN commit r27329.
 2022-12-31 19:10:17 +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 ded41eab31 Allow other root XML than entity. 
Implements a `GetOnlyChild()`, following discussion at
https://irclogs.wildfiregames.com/%230ad-dev/2022-05-06-QuakeNet-%230ad-dev.log.

Differential revision: https://code.wildfiregames.com/D4738
Comments by: @phosit, @Stan, @vladislavbelov, @wraitii
This was SVN commit r27323.
 2022-12-30 07:34:23 +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 c0e888e2af Removes SetViewport from CRenderer. 
Differential Revision: https://code.wildfiregames.com/D4849
This was SVN commit r27313.
 2022-12-29 06:53:06 +00:00
vladislavbelov edca3d719e Removes unused materials following f08f6f1d2d. 
This was SVN commit r27311.
 2022-12-28 16:25:14 +00:00
wraitii a333c8f355 Use Future::CancelOrWait in pathfinder Deinit 
If the pathfinding tasks are running, they might reference now-deleted
variables. CancelOrWait prevents this.
Remove `Future::Cancel()` altogether as that was its only use and the
functions seems dangerous.

Introduced with 0ebc08b13c

Patch by: phosit
Reviewed By: wraitii
Differential Revision: https://code.wildfiregames.com/D4831
This was SVN commit r27310.
 2022-12-28 11:34:04 +00:00
wraitii 92153b0afb Replace SharedStateResult with std::optional 
std::optional was not usable when our Future class was introduced, but
it is now, so we can replace SharedStateResult with it, reducing custom
code.

Note that Apple Clang has some incompatibilites with part of the
optional interface, but it isn't used here.

Patch by: phosit
Comments by: vladislavbelov
Accepted by: wraitii
Differential Revision: https://code.wildfiregames.com/D4803
This was SVN commit r27309.
 2022-12-28 10:54:41 +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
vladislavbelov 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
wowgetoffyourcellphone 22f7d3c543 Art | Replace the decal for the Theater foundation. 
This was SVN commit r27298.
 2022-12-24 03:52:04 +00:00
wowgetoffyourcellphone e6f5c2b47c Art | Reduce size of the bridge_wood spec map 
This was SVN commit r27297.
 2022-12-24 02:49:06 +00:00
wowgetoffyourcellphone 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
wowgetoffyourcellphone 2f938cf6f8 Art | Materials for the wood bridge decals 
This was SVN commit r27294.
 2022-12-22 16:39:27 +00:00
wowgetoffyourcellphone 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
wowgetoffyourcellphone 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
wowgetoffyourcellphone 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
wowgetoffyourcellphone 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
vladislavbelov 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
vladislavbelov 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
vladislavbelov 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
Freagarach 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
wowgetoffyourcellphone 7373dac017 Art | New look for the Athenian city walls. 
This was SVN commit r27279.
 2022-12-08 23:34:40 +00:00
trompetin17 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
vladislavbelov 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
vladislavbelov d8bf4f6e62 Makes GLES using high precision for both vertex and fragment shaders. 
This was SVN commit r27275.
 2022-12-06 18:30:34 +00:00
wowgetoffyourcellphone 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
vladislavbelov 2ef801f5d0 Remove some unnecessary string copy related to substr. 
Patch By: phosit
Differential Revision: https://code.wildfiregames.com/D4772
This was SVN commit r27271.
 2022-12-04 19:56:12 +00:00
vladislavbelov 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
vladislavbelov 3723cbf692 Fixes big screenshots after 29368cf776 and 3a4c8342a0. 
Differential Revision: https://code.wildfiregames.com/D4835
This was SVN commit r27269.
 2022-12-04 19:28:34 +00:00