mirrors/0ad
1
0
Fork 2
mirror of https://gitea.wildfiregames.com/0ad/0ad.git synced 2026-07-18 09:11:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
23,410 Commits 1 Branch 39 Tags
e9979c62b33da8a84db5b7766f2bdfe064cdec36
Commit Graph

23410 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Freagarach 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
Freagarach 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
Freagarach 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
Freagarach 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
Freagarach 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
Freagarach 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
wowgetoffyourcellphone 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
wowgetoffyourcellphone 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
wowgetoffyourcellphone fca59054de Alpha 27 | Fix generic name of Shrines 
This was SVN commit r27234.
 2022-11-19 13:00:42 +00:00
vladislavbelov 8e51dfa91a Moves post processing out of scene rendering to avoid framebuffer pass duplicate. 
Comments By: phosit, Stan
Differential Revision: https://code.wildfiregames.com/D4827
This was SVN commit r27232.
 2022-11-18 19:59:18 +00:00
vladislavbelov 87843b5c4e Remove unused members of TaskManager::Impl missed in 1b35d36daa. 
Patch By: phosit
Differential Revision: https://code.wildfiregames.com/D4826
This was SVN commit r27231.
 2022-11-18 19:32:20 +00:00
vladislavbelov 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
wowgetoffyourcellphone 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
Stan 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
vladislavbelov 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
vladislavbelov 92f2152900 Removes unused UV1 stream in OverlayRenderer and moves vertex data setup out of a loop. 
This was SVN commit r27222.
 2022-11-13 19:19:08 +00:00
vladislavbelov 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
wowgetoffyourcellphone 76e0076ef6 Alpha 27 | Art | Add Badlands and Savanna metal mines 
This was SVN commit r27218.
 2022-11-10 20:56:43 +00:00
wowgetoffyourcellphone 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
wowgetoffyourcellphone 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
wowgetoffyourcellphone 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
wowgetoffyourcellphone 2faf515e00 [terrains] Fix a typo in a terrain file. 
This was SVN commit r27214.
 2022-11-10 04:09:08 +00:00
wowgetoffyourcellphone 63c0d31b04 [maps] Improve Caspian Sea skirmish map terrains 
This was SVN commit r27213.
 2022-11-10 04:07:25 +00:00
wowgetoffyourcellphone 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
vladislavbelov 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
vladislavbelov 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
vladislavbelov 097725e1e0 Moves particles data uploading out of framebuffer pass. 
Comments By: phosit
Differential Revision: https://code.wildfiregames.com/D4820
This was SVN commit r27207.
 2022-11-06 11:31:05 +00:00
Angen eacbb1d248 Spaces around '+' in 467541cfad 
This was SVN commit r27205.
 2022-11-05 12:28:54 +00:00
vladislavbelov 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
vladislavbelov 850272ee5b Replaces deprecated in GLSL 1.30 gl_TexCoord by varying in water shaders. 
This was SVN commit r27203.
 2022-11-05 10:29:38 +00:00
Angen 017fe7e263 Restrict access for Read/WriteFile functions 
For security reasons planing to restrict access for ReadFile,
ReadFileLines, WriteJSONFile, ReadJSONFile, ListDirectoryFiles,
FileExists to the following folders/files:

"gui, simulation, maps, campaigns, saves/campaigns,
config/matchsettings.json, config/matchsettings.mp.json"
adding "moddata" if some mods need to access and ship custom files that
don't fit into other locations mentioned above

Differential revision: D4617
Reviewed by: @phosit
Comments by: @Stan @vladislavbelov
Fixes: #5850

This was SVN commit r27202.
 2022-11-05 08:33:27 +00:00
Angen 467541cfad Do not break gui when fallback language is not available in termsdialog.js 
L10 falls back to language code, that means if "pt_x" is not available
it falls back to "pt", but we do not provide "pt", same for "en" or
after uninstalling and removing language pack and leaving language
selected.
Adding warning.

Related post:
https://wildfiregames.com/forum/topic/96800-terms-display-error

This was SVN commit r27201.
 2022-11-05 08:19:32 +00:00
vladislavbelov 33dd5d9fbc Wraps vertex attributes in a macro to avoid duplication for different versions. 
This was SVN commit r27199.
 2022-11-04 23:41:41 +00:00
vladislavbelov e2f433db8c Wraps gl_Position in a macro to avoid duplication for different versions. 
This was SVN commit r27198.
 2022-11-04 22:56:56 +00:00
vladislavbelov eea6c21d40 Remove L10n::DictionaryDeleter added in d6ddc4f3ac. 
Patch By: phosit
Differential Revision: https://code.wildfiregames.com/D4817
This was SVN commit r27197.
 2022-11-04 20:52:28 +00:00
Angen cde8b7fae8 Missed file 
This was SVN commit r27195.
 2022-11-03 17:29:46 +00:00
Angen b7c0878cef Save configuration once when possible 
Differential revision: D4818
Reduce how many times configuration is written into the file pointed out
by @nani and @Freagarach in D4616
Also fix bug in 281bb0b2ec

This was SVN commit r27194.
 2022-11-03 16:44:47 +00:00
Angen 281bb0b2ec Remove user.cfg from javascript 
remove path from javascript
path is defined by the configuration scope

combine some calls
remove not needed calls

Differential revision: D4616
Accepted by: @Freagarach, @nani
Comments by: @phosit
This was SVN commit r27192.
 2022-11-02 07:21:25 +00:00
wackyserious 2b94c6ca27 Han Officer Helmet (New) 
This was SVN commit r27191.
 2022-11-02 01:54:00 +00:00
wowgetoffyourcellphone 8c4df2f729 native 
This was SVN commit r27190.
 2022-11-01 19:00:09 +00:00
wowgetoffyourcellphone 64888e710a [Alpha 27] [Art] Improve the look of a bunch of eyecandy rocks. 
This was SVN commit r27189.
 2022-11-01 18:48:20 +00:00