1
0
forked from mirrors/0ad
Commit Graph

23380 Commits

Author SHA1 Message Date
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
Angen f1874ec196 Add color mixer
Add option to pick colour with sliders

Differential revision: D4597
Comments by: @Stan, @vladislavbelov, @Langbart, @elexis
This was SVN commit r27188.
2022-11-01 11:46:14 +00:00
vladislavbelov 480bc48194 Removes unused debug print of backend inside CVideoMode forgotten in 912202ff0c.
This was SVN commit r27185.
2022-10-30 00:43:45 +00:00
vladislavbelov 3a4c8342a0 Makes AcquireNextBackbuffer returns true in case of successful backbuffer acquirement.
This was SVN commit r27184.
2022-10-30 00:38:45 +00:00
vladislavbelov b54ace20ea Stores available locales in L10n by value instead of std::unique_ptr.
Patch By: phosit
Differential Revision: https://code.wildfiregames.com/D4764
This was SVN commit r27183.
2022-10-29 23:41:01 +00:00
vladislavbelov 2d0cde4e64 Disallows backend buffer uploading inside framebuffer pass.
Differential Revision: https://code.wildfiregames.com/D4815
This was SVN commit r27182.
2022-10-29 23:20:04 +00:00
wowgetoffyourcellphone a6a9355b2c [Alpha 27][Art][Actors][Flora] Improve the grass sprites to use a smoothed mesh model instead of models that aren't smoothed.
Also try to reduce a little of the trans overlap with some of the
textures.

This was SVN commit r27181.
2022-10-28 22:41:49 +00:00
wowgetoffyourcellphone e7d8ed33a6 [A27][Maps] Forgot to set a map preview for zagros_mountains_2p.xml
This was SVN commit r27179.
2022-10-27 03:34:43 +00:00
wowgetoffyourcellphone 13aae37a32 [Alpha 27] [Art] Add a missing material.
This was SVN commit r27178.
2022-10-27 03:25:52 +00:00
wowgetoffyourcellphone d3a20238de [Alpha 27] [Maps] [Terrains] Add a new Persia biome terrain set and a newly updated Zagros Mountains skirmish map to showcase it.
Only 4 new textures, as the biome extensively uses the flexibility of
the terrain system to pull assets from other biomes and form a coherent
new biome.

This was SVN commit r27177.
2022-10-27 03:20:22 +00:00
wowgetoffyourcellphone 0ede6c550e [A27] Fix 1 terrain, add 1 missing terrain, both for Aegean.
This was SVN commit r27176.
2022-10-26 19:20:05 +00:00
vladislavbelov 3dad53a7ee Fixes without PCH build in StunClient missing include for std::byte added in 895e4e6aa6.
Differential Revision: https://code.wildfiregames.com/D4814
This was SVN commit r27174.
2022-10-26 00:15:27 +00:00
vladislavbelov 968fd50fb0 Moves Backend enum from CVideoMode to backends.
Comments By: phosit, Stan
Differential Revision: https://code.wildfiregames.com/D4809
This was SVN commit r27173.
2022-10-25 22:45:54 +00:00
Stan b141204875 Allow to have more than 8 colors in the drop down.
Actual colors will be another commit.
Discussed with: @wowgetoffyourcellphone.

Differential Revision: https://code.wildfiregames.com/D4811
This was SVN commit r27172.
2022-10-24 12:43:30 +00:00
Stan f62e1457de Remove redundant references to deleted .dtd files
We only use relaxng and that confuses other linters like xmllint.

Patch by: @Langbart
Differential Revision: https://code.wildfiregames.com/D4748
This was SVN commit r27170.
2022-10-23 17:06:51 +00:00
Stan dd15a65fcd Civ backgrounds for minimap
Comments by: @marder, @Freagarach
Differential Revision: https://code.wildfiregames.com/D4271
This was SVN commit r27169.
2022-10-23 16:50:30 +00:00
wowgetoffyourcellphone 5d15f50fa7 [Alpha 27][Art][Technologies] Some new technology portraits.
This was SVN commit r27168.
2022-10-23 15:53:43 +00:00
vladislavbelov 8691674cc6 Moves skybox vertex array creation and uploading before its rendering.
This was SVN commit r27167.
2022-10-23 14:47:23 +00:00
wowgetoffyourcellphone a86ba870b7 [Alpha 27][Art] Choose better foundation actors for a few structures.
This was SVN commit r27166.
2022-10-23 13:03:08 +00:00
vladislavbelov 228fff14e4 Splits minimap entities rendering and moves buffer uploading before drawing.
This was SVN commit r27165.
2022-10-22 21:00:13 +00:00
vladislavbelov dfa8176007 Allow 0.0.0.0 IP in StunClient tests added in 2034136560.
Patch By: kalev
Differential Revision: https://code.wildfiregames.com/D4792
This was SVN commit r27164.
2022-10-22 19:22:38 +00:00
Stan 2402f05201 Fix incorrect paths in LICENSE.txt and improve wording slightly.
Rebased from a
Patch by: @elexis
Accepted by: @asterix
Comments by: @smiley
Differential Revision: https://code.wildfiregames.com/D1664
This was SVN commit r27163.
2022-10-22 18:29:39 +00:00
wowgetoffyourcellphone de9021a8fc [Alpha 27] [Art] [Textures] Some new technology portraits by @real_tabasco_sauce
This was SVN commit r27162.
2022-10-22 18:09:19 +00:00
Stan 88b426dc59 Fix the issues with entvalidate.py
It doesn't properly handle mixins / special templates
    On python 3.8+, XML elements are no longer sorted and this fails
validation against entity.rng
    mixins are not properly applied because the | split is incorrect (3
max items instead of 2)
    merge="" is not supported
    Parents aren't always passed when they should be.
    on windows it is incorrectly assumed that the encoding is 1252

Patch by: @baco
Tweaks by: @Stan
Based on a patch by: @wraitii
Differential Revision: https://code.wildfiregames.com/D4698
This was SVN commit r27161.
2022-10-22 16:24:45 +00:00
vladislavbelov 426edbc399 Reset m_EndsWithSpace to fix the uninitialized read of it introduced in f4128208de.
Patch By: phosit
Differential Revision: https://code.wildfiregames.com/D4806
This was SVN commit r27160.
2022-10-22 15:21:34 +00:00
Stan 8612fb0f4f Fix 16-bit texture introduced in f841c1fac0
This was SVN commit r27158.
2022-10-17 12:33:36 +00:00
vladislavbelov 47aae99fbe Skips renderer resources preloading for screenshots.
This was SVN commit r27156.
2022-10-13 21:46:08 +00:00
wowgetoffyourcellphone f841c1fac0 [Alpha 27][Maps] Add a new cliff terrain for the Aegean-Anatolian biome and color correct 2 of that biome's grass terrains.
This was SVN commit r27155.
2022-10-13 16:50:53 +00:00
wowgetoffyourcellphone e5bdd589cb [Alpha 27] [Art] [Maps] Add a new "Baltic-Nordic" biome for terrains.
This was SVN commit r27154.
2022-10-13 16:48:38 +00:00
wowgetoffyourcellphone edfd557374 [Alpha 27] [Maps] Use better/new placement obstructors on Cisalpine Winter's frozen lakes.
This was SVN commit r27153.
2022-10-13 15:39:21 +00:00
vladislavbelov 64bd81ae6b Adds usage flags to backend textures.
This was SVN commit r27152.
2022-10-12 23:19:27 +00:00