gptbot/0ad
1
0
Fork 0
forked from mirrors/0ad
Code Pull Requests Activity
23,451 Commits 1 Branch 39 Tags
a333c8f355fc13a1ff3b0898a03ea2f97f618dfb
Commit Graph

23451 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
vladislavbelov 55443563e6 Fixes calling SDL functions in CVideoMode after SDL_Quit. 
CVideoMode::Shutdown was introduced in 97019c3a5a without any SDL calls
in it. But the one was added in d62e3729d5.

Differential Revision: https://code.wildfiregames.com/D4836
This was SVN commit r27268.
 2022-12-04 14:54:24 +00:00
wowgetoffyourcellphone 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
wowgetoffyourcellphone bca17a2d73 Alpha 27 | Art | Improve some Greek tile textures. 
This was SVN commit r27266.
 2022-12-03 01:49:44 +00:00
wowgetoffyourcellphone e564c6afa5 Alpha 27 | Art | Fix texture refs 
This was SVN commit r27264.
 2022-11-29 22:44:55 +00:00
wowgetoffyourcellphone ae835534c7 Alpha 27 | Art | New shrine model. 
This was SVN commit r27263.
 2022-11-29 21:13:43 +00:00
wowgetoffyourcellphone 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
trompetin17 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
Stan 661312ea6f Fix minimap circle not showing. 
Noticed by: @vladislavbelov
This was SVN commit r27259.
 2022-11-27 20:20:40 +00:00
wowgetoffyourcellphone 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
vladislavbelov 29368cf776 Adds framebuffer attachment load and store operations. 
Comments By: phosit, Stan
Differential Revision: https://code.wildfiregames.com/D4830
This was SVN commit r27256.
 2022-11-26 21:55:17 +00:00
wowgetoffyourcellphone 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
wowgetoffyourcellphone 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
wowgetoffyourcellphone 15ca4413df Alpha 27 | Art | Slightly modify the Aphrodite statue textures 
This was SVN commit r27253.
 2022-11-26 00:40:25 +00:00
wowgetoffyourcellphone adb846320a Alpha 27 | Art | Turn the Kushite corral model 90 degrees 
This was SVN commit r27252.
 2022-11-26 00:39:35 +00:00
wowgetoffyourcellphone c840ce5b6f Alpha 27 | Art | Add a strong rock material 
This was SVN commit r27251.
 2022-11-26 00:38:07 +00:00
wowgetoffyourcellphone 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
wowgetoffyourcellphone 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
wowgetoffyourcellphone fe62b57620 Alpha 27 | Art | New face Egyptian texture 
This was SVN commit r27248.
 2022-11-26 00:19:02 +00:00
wowgetoffyourcellphone 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