1
0
forked from 0ad/0ad
Commit Graph

16041 Commits

Author SHA1 Message Date
0b3a1eafc4 Fix some decals after 1754a3f06c
This was SVN commit r27302.
2022-12-26 20:01:49 +00:00
0159f25636 Removes unoptimized terrain materials following 1754a3f06c.
This was SVN commit r27301.
2022-12-26 11:57:46 +00:00
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
22f7d3c543 Art | Replace the decal for the Theater foundation.
This was SVN commit r27298.
2022-12-24 03:52:04 +00:00
e6f5c2b47c Art | Reduce size of the bridge_wood spec map
This was SVN commit r27297.
2022-12-24 02:49:06 +00:00
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
2f938cf6f8 Art | Materials for the wood bridge decals
This was SVN commit r27294.
2022-12-22 16:39:27 +00:00
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
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
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
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
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
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
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
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
7373dac017 Art | New look for the Athenian city walls.
This was SVN commit r27279.
2022-12-08 23:34:40 +00:00
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
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
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
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
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
bca17a2d73 Alpha 27 | Art | Improve some Greek tile textures.
This was SVN commit r27266.
2022-12-03 01:49:44 +00:00
e564c6afa5 Alpha 27 | Art | Fix texture refs
This was SVN commit r27264.
2022-11-29 22:44:55 +00:00
ae835534c7 Alpha 27 | Art | New shrine model.
This was SVN commit r27263.
2022-11-29 21:13:43 +00:00
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
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
661312ea6f Fix minimap circle not showing.
Noticed by: @vladislavbelov
This was SVN commit r27259.
2022-11-27 20:20:40 +00:00
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
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
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
15ca4413df Alpha 27 | Art | Slightly modify the Aphrodite statue textures
This was SVN commit r27253.
2022-11-26 00:40:25 +00:00
adb846320a Alpha 27 | Art | Turn the Kushite corral model 90 degrees
This was SVN commit r27252.
2022-11-26 00:39:35 +00:00
c840ce5b6f Alpha 27 | Art | Add a strong rock material
This was SVN commit r27251.
2022-11-26 00:38:07 +00:00
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
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
fe62b57620 Alpha 27 | Art | New face Egyptian texture
This was SVN commit r27248.
2022-11-26 00:19:02 +00:00
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
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
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
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
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
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
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
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
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
fca59054de Alpha 27 | Fix generic name of Shrines
This was SVN commit r27234.
2022-11-19 13:00:42 +00:00
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
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
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
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
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
76e0076ef6 Alpha 27 | Art | Add Badlands and Savanna metal mines
This was SVN commit r27218.
2022-11-10 20:56:43 +00:00
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
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
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
2faf515e00 [terrains] Fix a typo in a terrain file.
This was SVN commit r27214.
2022-11-10 04:09:08 +00:00
63c0d31b04 [maps] Improve Caspian Sea skirmish map terrains
This was SVN commit r27213.
2022-11-10 04:07:25 +00:00
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
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
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
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
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
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
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
8c4df2f729 native
This was SVN commit r27190.
2022-11-01 19:00:09 +00:00
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
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
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
13aae37a32 [Alpha 27] [Art] Add a missing material.
This was SVN commit r27178.
2022-10-27 03:25:52 +00:00
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
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
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
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
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
5d15f50fa7 [Alpha 27][Art][Technologies] Some new technology portraits.
This was SVN commit r27168.
2022-10-23 15:53:43 +00:00
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
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
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
8612fb0f4f Fix 16-bit texture introduced in f841c1fac0
This was SVN commit r27158.
2022-10-17 12:33:36 +00:00
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
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
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
344ec2c166 Reduces uniforms sizes for the minimap shader.
This was SVN commit r27147.
2022-10-11 22:20:36 +00:00
1cd1715088 Removes unused UV2 from minimap shader and reorders parameters types.
This was SVN commit r27146.
2022-10-11 20:56:00 +00:00
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
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
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
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
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
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
61019c0e91 Removes unused minimap shader variants.
This was SVN commit r27130.
2022-10-07 22:52:23 +00:00
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
4fe5c8eb66 [Alpha 27][Portraits] Adjust portraits for Skirmish templates
refs 5b76cb5812

This was SVN commit r27125.
2022-10-05 23:03:10 +00:00