1
0
forked from mirrors/0ad
Commit Graph

14945 Commits

Author SHA1 Message Date
vladislavbelov 283f524fcf Implements DrawRect in Canvas2D, removes CConsole background drawing with low level GL calls.
This was SVN commit r25590.
2021-05-29 12:31:14 +00:00
Imarok 6f9a162dfa CList, COList, CDropdown, CText, CInput: Draw borders above the rest and improve scrollbar drawing order
Fixes: #6055
Differential Revision: https://code.wildfiregames.com/D4004
This was SVN commit r25587.
2021-05-28 16:32:04 +00:00
Stan d50ca8e8ec Slight tweak to the grass texture.
Patch by: @marder
This was SVN commit r25586.
2021-05-28 13:11:16 +00:00
Freagarach 3d7af82328 Improve support for classes in PetraAI.
Let PetraAI use MatchesClassList more.

Differential revision: https://code.wildfiregames.com/D2150
Reviewed by: Angen
Comments by: Stan
This was SVN commit r25584.
2021-05-28 06:54:48 +00:00
vladislavbelov f7ad2daf62 Removes gui_solid material shader usages from scene rendering.
This was SVN commit r25582.
2021-05-27 20:13:47 +00:00
wraitii 25b9faf1cb Split graphics options in two tabs
To allow incorporating more options, this splits the graphics settings
into two tabs, one containing general options (such as
silhouettes/windowed), and one with more advanced settings.

Accepted by: asterix
Differential Revision: https://code.wildfiregames.com/D3985
This was SVN commit r25581.
2021-05-27 10:12:13 +00:00
Stan f57c2f71d5 Fix map names
Noticed by @wraitii

This was SVN commit r25580.
2021-05-27 09:18:00 +00:00
Stan bcac3bb896 Fix two issues noticed by @marder.
Disable AO on quarried objects as its arguably broken.
Adds a second uv in case it's enabled again to prevent crashes in Atlas.
Use normal instead of parallax for the texture that do not have height
information.

This was SVN commit r25576.
2021-05-26 15:18:25 +00:00
wraitii 18372d665c Campaign menu: reuse default map preview if available.
Differential Revision: https://code.wildfiregames.com/D4019
This was SVN commit r25575.
2021-05-26 14:45:44 +00:00
wraitii 81457ef952 Fix potential undefined conversion.
Summary: Ran into this when testing things in the lobby - I'm not sure
it can happen if everything is working correctly, but I've had it
repeatedly when testing broken stuff. Feels safer.

Test Plan: ^

Differential Revision: https://code.wildfiregames.com/D4018
This was SVN commit r25574.
2021-05-26 13:29:11 +00:00
wraitii bce26e905f Mod selector: "start mods" saves the configuration.
Differential Revision: https://code.wildfiregames.com/D3992
This was SVN commit r25573.
2021-05-26 13:27:43 +00:00
Imarok 35601a7bb3 Fix some error in rmgen.
Reviewed by: kalimaps
Refs: #6180
Differential Revision: https://code.wildfiregames.com/D4017
This was SVN commit r25570.
2021-05-25 21:26:48 +00:00
Stan 3f371f40b1 Replace missing biomes by the closest we now have.
Reported by:  @Freagarach
This was SVN commit r25565.
2021-05-25 14:17:39 +00:00
Freagarach 23d7969ffd Fix city phase requirements in PetraAI HQ.
Defence towers were removed from the requirements in 29ab4b5af3, but
PetraAI was not made aware of this.

Differential revision: https://code.wildfiregames.com/D4015
Reviewed by: @Angen, @wraitii
Comment by: @Imarok
This was SVN commit r25564.
2021-05-25 13:46:03 +00:00
Stan 44f935562c Update mainland icons
This was SVN commit r25563.
2021-05-25 12:26:29 +00:00
Stan 95e576dbe3 Use new biomes for random maps,
Patch by: @wowgetoffyourcellphone
This was SVN commit r25562.
2021-05-25 12:25:39 +00:00
Stan de1a10ca53 New maps using the new biomes.
Patch by: @wowgetoffyourcellphone
- cisalpine_winter_2p
- crocodilopolis_4p
- gallic_highlands_2p
- hindu_kush_2p
- hydaspes_river_4p
- magadha_2p
- miletus_peninsula_2p
- nubian_frontier_2p
- saharan_oases_2p
- scythia_4p
- white_cliffs_of_dover_5p

This was SVN commit r25561.
2021-05-25 12:18:40 +00:00
Stan 88d3f50f7e Update some maps with new terrains
Patch by: @wowgetoffyourcellphone
- syria_2p
- sporades_islands_2p
- saharan_oases_4p
- butana_steppe_2p
- bactria_2p
- alpine_valleys_2p
- belgian_bog_2p

This was SVN commit r25560.
2021-05-25 12:15:41 +00:00
Stan 20bb3ea4a3 Add trading posts and shrines as map props
Add a placement obstructor (idea by @Grapjas) to prevent  construction
but not movement

This was SVN commit r25559.
2021-05-25 11:32:07 +00:00
Stan 92a4fdc8e4 Add more ruin objects
Add a new metal type of ruins
Update templates accordingly.

Patch by @wowgetoffyourcellphone

This was SVN commit r25558.
2021-05-25 11:00:13 +00:00
Stan c8f1501db4 Add templates for the new rock and stone mines
This was SVN commit r25557.
2021-05-25 10:57:22 +00:00
Stan b6ae8915de Add more prop actors for maps
- Update the stone and metal mine meshes and
textures/skins/gaia/decal_quarry_sahara_a.png
- Slight tweak to the steppe grass
- Add some ptol eyecandy

Templates will come in a following commit.

This was SVN commit r25556.
2021-05-25 10:53:20 +00:00
Stan ac33c8513b More grass types for biomes
Patch by @wowgetoffyourcellphone

This was SVN commit r25555.
2021-05-25 10:44:19 +00:00
Stan 63199dac2d Some tweaks to the grass fields.
This was SVN commit r25554.
2021-05-25 10:40:39 +00:00
Stan 47fc344567 Update the resource icons.
Patch by @wowgetoffyourcellphone.

This was SVN commit r25553.
2021-05-25 10:21:52 +00:00
Stan 463775faa4 Slight tweaks to particles.
This was SVN commit r25552.
2021-05-25 10:07:04 +00:00
Stan 6324f3369a Use correct projectiles for artillery.
Patch by @wowgetoffyourcellphone

This was SVN commit r25551.
2021-05-25 10:06:34 +00:00
Stan b3aa84adea New shark and whale icons. update the berry an tree and artic wolf icons.
This was SVN commit r25550.
2021-05-25 09:24:23 +00:00
Stan fb84adda3b New autoqueue icons.
This was SVN commit r25549.
2021-05-25 08:35:46 +00:00
wraitii 863ef0f88a Tweak sound distance attenuation & add configurability
Following D3108 / 876f6d5e50, sounds are attenuated by their actual
distance. However, as noted by players on A24, the dropoff is stark and,
when zoomed out, can easily result in not hearing things that are
happening in the middle of the screen.

The new default settings almost double the max-range, change the minimum
range to have greater dynamic range, and reduce the stereo depth
slightly to better match the default camera FOV.

These are stored per sound-grounp, possibly allowing future tweaks on a
per-soundgroup basis, and are configurable.

Tested by: Imarok
Discussed over mail with: Samulis, Porru

Differential Revision: https://code.wildfiregames.com/D3612
This was SVN commit r25547.
2021-05-25 06:19:25 +00:00
Imarok 1fd940b3d0 Adjust position of replay filters
Differential Revision: https://code.wildfiregames.com/D4010
This was SVN commit r25542.
2021-05-24 20:04:28 +00:00
vladislavbelov 3e5638e548 Removes hardcoded 1px width borders from GUI sprites.
Tested By: Imarok
Differential Revision: https://code.wildfiregames.com/D4008
This was SVN commit r25541.
2021-05-24 18:42:51 +00:00
wraitii 8054097daf Mouse event mask for the diplomacy colors button
Differential Revision: https://code.wildfiregames.com/D4011
This was SVN commit r25540.
2021-05-24 12:09:30 +00:00
wraitii 581e5b8752 Remove differences in territory decay rates.
Structures now decay in the same time span, including walls/palisades.
This buffs houses/storehouses against capture slightly.

Exceptions:
- Fortresses decay 4 times slower (but, as of now, they are also
territory roots).
- Wonders decay 4 times slower.

Differential Revision: https://code.wildfiregames.com/D3993
This was SVN commit r25539.
2021-05-24 10:45:38 +00:00
Angen c1f8e74717 Add Filter placeholder text to modio filter field
Differential revision: D4000
Reviewed by: @Imarok
This was SVN commit r25532.
2021-05-23 08:55:38 +00:00
vladislavbelov 0728c58a4d Removes unnecessary z-level from GUI sprite rendering.
Tested By: Imarok
Differential Revision: https://code.wildfiregames.com/D4003
This was SVN commit r25524.
2021-05-22 18:06:18 +00:00
wraitii 80a8c3827b Fix CanAttack for mirages following 88549e77e1
CanAttack queries the miraged Resistance which did not exist, thus
failing.
This mirages Resistance explicitly (fixing parts of #5883)

Fixes 88549e77e1, reverts the mirage.xml change in 738b200dda

Refs #5883

Reported by: Asger_Spear
Differential Revision: https://code.wildfiregames.com/D4001
This was SVN commit r25517.
2021-05-22 10:56:40 +00:00
Freagarach 0dfebc8d2b Let PetraAI check for different templates when finding the best dropsite.
Loops buildable templates to find the best.

Differential revision: https://code.wildfiregames.com/D3876
Comments by: @Angen, @Stan, @wraitii
This was SVN commit r25514.
2021-05-22 07:53:47 +00:00
Freagarach 494d12fb9c Let PetraAI check for droppable resources when finding the best dropsite location.
Instead of hardcoding resources.

Differential revision: https://code.wildfiregames.com/D3874
Comments by: @Angen, @Stan
This was SVN commit r25513.
2021-05-22 07:51:08 +00:00
Freagarach 012ac9f36b Add rated game information to the objectives dialog.
So an joined observer can see that information.

Patch by: @Langbart
Differential revision: https://code.wildfiregames.com/D3964
Comment by: @wraitii
Idea accepted by: @asterix
This was SVN commit r25512.
2021-05-22 07:39:17 +00:00
Freagarach 340aa419f4 Deduplicate add/remove entity to/from AIs resource map.
Also moves the function to the shared_script, since that is the
prototype it uses and the function doesn't use anything of the
terrain_analysis (as per @Angen's request).

Differential revision: https://code.wildfiregames.com/D3906
Comments by: @Angen, @wraitii
This was SVN commit r25511.
2021-05-22 07:35:16 +00:00
wraitii 8f8e29c092 Fix incompatible mods start: show both incompatible and enabled mods;
As noted by Angen in a26535d023, refs 3bcf360107
When starting with incompatible mods, the non-incompatible mods were no
longer shown. This fixes that.
I think the code looks cleaner from this new control flow that
explicitly only mounts "mod".

Tested by: Angen
Differential Revision: https://code.wildfiregames.com/D3996
This was SVN commit r25510.
2021-05-22 07:33:49 +00:00
Freagarach 3548feb16a Fix entities receiving double hunt order only attacking.
Caused by: 293cd95ccb.
Noticed by @Asger and @Kate.
Special case hunting.

Differential revision: https://code.wildfiregames.com/D3986
Comment by: @wraitii
This was SVN commit r25509.
2021-05-22 05:27:51 +00:00
Imarok b2e1181982 Partly revert 5f1f768ed5.
The underlying cause was fixed by 8eb4871c9b.
Reviewed by: wraitii
Differential Revision: https://code.wildfiregames.com/D3836
This was SVN commit r25505.
2021-05-21 21:37:07 +00:00
Stan fe4890e0b2 Improved particles by @wowgetoffyourcellphone
This was SVN commit r25496.
2021-05-21 10:49:11 +00:00
Stan 9756fb3dad Darker AO for the stone quary
This was SVN commit r25495.
2021-05-21 10:42:20 +00:00
Stan 274fadaf30 More consistent animal portraits by @wowgetoffyourcellphone
This was SVN commit r25494.
2021-05-21 10:41:41 +00:00
Stan bdfacbfdd3 Add a round 9x9 decal
This was SVN commit r25493.
2021-05-21 10:40:20 +00:00
Stan 15140751a7 Improved farm decals by @wowgetoffyourcellphone
This was SVN commit r25492.
2021-05-21 10:33:13 +00:00
Stan 19f7db1681 Remove the floating property from shipwrecks.
Patch by: @wowgetoffyourcellphone
EOL native.

This was SVN commit r25491.
2021-05-21 09:49:32 +00:00