1
0
forked from mirrors/0ad
Commit Graph

15936 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
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 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
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
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
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
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 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
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 8612fb0f4f Fix 16-bit texture introduced in f841c1fac0
This was SVN commit r27158.
2022-10-17 12:33:36 +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 344ec2c166 Reduces uniforms sizes for the minimap shader.
This was SVN commit r27147.
2022-10-11 22:20:36 +00:00
vladislavbelov 1cd1715088 Removes unused UV2 from minimap shader and reorders parameters types.
This was SVN commit r27146.
2022-10-11 20:56:00 +00:00
marder 2ca0fd6ffb [Fix] Remove the remnants of the Han rice resource
It is unused at this point and causes their farming upgrades to be
non-functional

Accepted by: @Silier @wowgetoffyourcellphone
Differential revision: https://code.wildfiregames.com/D4791
This was SVN commit r27144.
2022-10-11 15:26:53 +00:00
Freagarach 856e876148 Only have capturing entities contribute to the capture regenrate.
Only entities which have capture attack themselves will contribute to
the regen-rate of a structure.
The `garrisonRegenRate` is now a multiplier how much each unit
contributes their strength.

Quite some gameplay change, but we can experiment with this.

Differential revision: https://code.wildfiregames.com/D4679
Comments by: @chrstgtr, @marder, @wraitii
This was SVN commit r27142.
2022-10-10 05:36:27 +00:00
Freagarach a315f90980 Implement emergency recognition for PetraAI.
First patch for an emergency mode. This implements a rudimentary
detection strategy.
The current effect is a shout-out for help.

Patch by: @JCWasmx86
Differential revision: https://code.wildfiregames.com/D4645
Refs. #2195

This was SVN commit r27141.
2022-10-10 05:09:23 +00:00
wowgetoffyourcellphone 4e52613ca2 [Alpha 27] [Maps] Improve Deccan Plateau skirmish map with new terrains, better lighting, etc.
This was SVN commit r27140.
2022-10-09 23:22:33 +00:00
vladislavbelov dffde00e5f Reduces uniforms sizes for the Canvas2D shader.
Differential Revision: https://code.wildfiregames.com/D4796
This was SVN commit r27136.
2022-10-09 10:44:51 +00:00
wraitii a0e006dbbe Fix victory conditions loading (fixes Hero Garrison in regicide crashloop).
VictoryConditions.js gamesetting sends multiple updates to 'active' and
'disabled', instead of just one single update at the end. This is
listened to by amongst others the regicide 'hero garrison' setting, thus
`HeroGarrison` is deactivated, and then tries to be reactivated from the
init attributes, and then disabled again later.

This implements a simple fix, VictoryConditions only sends a single
update in FromInitAttributes with the end-state.

Differential Revision: https://code.wildfiregames.com/D4793
This was SVN commit r27135.
2022-10-08 12:46:11 +00:00
vladislavbelov 61019c0e91 Removes unused minimap shader variants.
This was SVN commit r27130.
2022-10-07 22:52:23 +00:00
wowgetoffyourcellphone a6af1515b6 [Alpha 27][Art] Add player color to the Greek sentry tower.
This was SVN commit r27126.
2022-10-05 23:32:24 +00:00
wowgetoffyourcellphone 4fe5c8eb66 [Alpha 27][Portraits] Adjust portraits for Skirmish templates
refs 5b76cb5812

This was SVN commit r27125.
2022-10-05 23:03:10 +00:00
wowgetoffyourcellphone d93168fd11 [Alpha 27][Atlas] Obstructor parent template
This was SVN commit r27124.
2022-10-05 22:46:17 +00:00
wowgetoffyourcellphone fcc622c1ab [Alpha 27][Actors] Update the look of the Mediterranean stone quarry.
This was SVN commit r27123.
2022-10-05 02:25:11 +00:00
wowgetoffyourcellphone 94f284dfd9 [Alpha 27][GUI][Textures] Add civ-specific Minimap textures for future inclusion in the UI
This was SVN commit r27122.
2022-10-05 02:22:03 +00:00
wowgetoffyourcellphone 4fa5bd7ebd [Alpha 7][Art][Textures] Improve the look of the Kush bireme sail texture.
This was SVN commit r27121.
2022-10-05 02:15:20 +00:00
wowgetoffyourcellphone a9fef1932f [Alpha 27][Atlas] New Obstructor objects for Atlas.
Obstructors are useful for Skirmishes and Scenarios. They are only
visible in Atlas, not in-game.

This was SVN commit r27120.
2022-10-05 02:14:25 +00:00