1
0
forked from 0ad/0ad
Commit Graph

22287 Commits

Author SHA1 Message Date
a541f3a317 Fix hotloading making models disappear.
The actors were always hotloaded because of a bad logic change in
76acc4e146.

Fixes #6228

Differential Revision: https://code.wildfiregames.com/D4175
This was SVN commit r25805.
2021-06-17 07:52:50 +00:00
8c7d77a610 Fix serialisation crash when patrolling.
6778fc4ea6 introduced waiting at the patrol points, but it was possible
that at such a point an enemy was noticed, thus quiting the "look
around" state, deleting `this.stopSurveying`, which was later `++`-ed.
That lead to an `NaN` property which got serialised. `NaN` serialisation
crashes as of 0e7fafebe1.

Differential revision: https://code.wildfiregames.com/D4177
Reported in:
https://wildfiregames.com/forum/topic/41264-alpha-25-pre-releaserelease-candidate-build-testing/page/4/?tab=comments#comment-435709
Reviewed by: @wraitii
This was SVN commit r25804.
2021-06-17 07:40:24 +00:00
17c54d5a69 Fix options occasionally thinking they've been modified when they haven't.
std::array leave the values in an undefined state which can very well be
'true'.

Tested By: Freagarach
Fixes #6205

Differential Revision: https://code.wildfiregames.com/D4170
This was SVN commit r25802.
2021-06-16 15:54:55 +00:00
d8f0bde05e Reset the campaigns previews
I had used a debug image which I left in and which looks broken.
Removing it defaults to the normal 'missing preview' 0 A.D. image which
looks more correct.

Differential Revision: https://code.wildfiregames.com/D4172
This was SVN commit r25801.
2021-06-16 15:53:19 +00:00
8e26bd0446 Fix bug with map-dependent random settings
Settings like Landscape, Daytime & team placement are map dependent. If
"random" map is chosen, we first must select the map before selecting
these.
This wasn't done correctly and so starting "random" map that picked e.g.
Unknown could fail.

Biomes were already correctly handled.

Reported by: langbart
Fixes #6227

Differential Revision: https://code.wildfiregames.com/D4173
This was SVN commit r25800.
2021-06-16 15:52:19 +00:00
eafa7fc005 Mirage unrepairable in cmpRepairable.
e0800bc092 introduced a `repairable` toggle, but did not mirage that
function, meaning one could not repair an allied miraged structure.

Reported by: Langbart
Patch by: Freagarach
Refs #6226

Differential Revision: https://code.wildfiregames.com/D4171
This was SVN commit r25799.
2021-06-15 08:46:14 +00:00
6f49e7bd6b New key for signing A25-compatible mods.
This was SVN commit r25798.
2021-06-14 19:42:00 +00:00
fde057dd1c Provide Magadha description.
Text by: @wowgetoffyourcellphone
Patch by: @Langbart
Differential revision: https://code.wildfiregames.com/D4169
Comment by: @marder
Fixes: #6222

This was SVN commit r25796.
2021-06-14 06:15:28 +00:00
6b493aa52c Fixes big screenshots, implements CCamera::GetViewQuad properly for custom projections.
Differential Revision: https://code.wildfiregames.com/D4165
This was SVN commit r25794.
2021-06-13 17:42:37 +00:00
08400276e1 Slight size increase for the parchment background of loading screen tips.
Prevents overflow in some translations, and aligns it better with the
tip image.

Patch by: Langbart
Fixes #4754

Differential Revision: https://code.wildfiregames.com/D4167
This was SVN commit r25793.
2021-06-13 15:12:14 +00:00
893ea3cd10 Alpha 25 Name: Yaunā
This is the old Persian variant of Ionian.

Differential Revision: https://code.wildfiregames.com/D4130
This was SVN commit r25792.
2021-06-13 15:08:27 +00:00
467f2140be Fixup 21bbeb4bbc
I momentarily forgot that `arc patch` only pretends it works with binary
files on SVN.

This was SVN commit r25791.
2021-06-13 15:07:03 +00:00
7ca15b42fd Add a tip about the default formation feature.
Differential Revision: https://code.wildfiregames.com/D4166
This was SVN commit r25790.
2021-06-13 15:02:54 +00:00
21bbeb4bbc Update some MR map previews.
Updates the map previews of all the Best for MP maps & Empire

This removes the fancy mainland biome switch because it was the only map
to do that and we lack the tools to automate it.

Differential Revision: https://code.wildfiregames.com/D4159
This was SVN commit r25789.
2021-06-13 14:56:16 +00:00
b4b7a1fc3a Fix issues with Introductory Tutorial
- Actually win at the end, thus advancing the campaign
- Count rams properly
- Show the ready button for the city-phase when cheating.

Reported by: langbart
Fixes #6188

Differential Revision: https://code.wildfiregames.com/D4161
This was SVN commit r25788.
2021-06-13 08:55:37 +00:00
9ef19ad795 Remove African Plains from "best for Mp" maps
Too similar to either Nearestern Badlands or Mainland.
It seems better to remove it from the filter for this release.

Differential Revision: https://code.wildfiregames.com/D4160
This was SVN commit r25787.
2021-06-13 08:46:12 +00:00
f189172db6 UnitMotion hack to fix units being stuck near corners.
I think there is a small mismatch between CheckMovement & the vertex
pathfinder when computing passability because one is ray-based and the
other just uses edges. However, it's out of my reach to fix it for now.
This can lead to units being stuck near building edges occasionally.
This introduces an un-intrusive recovery strategy (aka a hack) in
HandleObstructedMove that should get the units unstuck.

Should fix #6114 (to a sufficient extent anyways)

Differential Revision: https://code.wildfiregames.com/D4162
This was SVN commit r25786.
2021-06-13 08:43:32 +00:00
caebc4d3f9 Update the splash screen.
Link to the forums instead of solely the known issues. We have an FAQ
button already, and there are fewer known issues than in the past.

Remove the bit about formations, which isn't really relevant anymore,
and instead add a request for contributions.

Differential Revision: https://code.wildfiregames.com/D4156
This was SVN commit r25785.
2021-06-13 08:40:26 +00:00
a5399d34b8 Floor turn rates to 4
The pathfinders are not aware about turn time, and pathing becomes quite
poor with such low turn rates, leading to units that take much longer to
move than they used to.

Until the pathfinders are updated, we should refrain from using very low
turn rates on actual units.

Refs #6142

Differential Revision: https://code.wildfiregames.com/D4163
This was SVN commit r25784.
2021-06-13 08:11:48 +00:00
dd779872c4 Small tweak of map flare characteristics
Refs #3491

Differential Revision: https://code.wildfiregames.com/D4099
This was SVN commit r25783.
2021-06-12 22:35:30 +00:00
bfc20bc847 Add a background to campaign load page
Differential Revision: https://code.wildfiregames.com/D4157
This was SVN commit r25781.
2021-06-12 17:20:01 +00:00
7e423fe20e Only show the full template run name + template name if they're different.
The campaign screen currently shows both the name of the run (selected
by the user) and the name of the campaign. This is, by default, the
same, and thus looks weird.

Reported by: langbart, marder
Tested by: marder
Differential Revision: https://code.wildfiregames.com/D4158
This was SVN commit r25780.
2021-06-12 17:19:09 +00:00
956b3f96db Improvement to autoqueue usability
The graphical interface will show autoqueued units as 'ghost' units so
the player gets immediate feedback on what's happening.
The autoqueue disengages if it runs out of resources or entity limits:
this reflects that the autoqueue cannot resume on its own.

By changing the spot where the autoqueue pushes items, the autoqueue no
longer 'buffers' one unit in advance, but remains very slightly less
efficient than manual queuing. This also prevents cheats from leading to
a ton of units accidentally being created.

Accepted By: Freagarach
Refs #6213

Differential Revision: https://code.wildfiregames.com/D4144
This was SVN commit r25779.
2021-06-12 09:43:57 +00:00
42d6893eb8 Fix lobby dgame details panel with incompatible mods.
There was an issue in 07e44a75a1 that made the game details mostly red
with incompatible mods.
This fixes that: now only the 'Mods' title is red, and I added specific
text to highlight why it's colored that way.

Based on a patch by: Langbart
Differential Revision: https://code.wildfiregames.com/D4153
This was SVN commit r25778.
2021-06-12 08:57:34 +00:00
721cfa7ae6 Improve some options texts.
Differential revision: https://code.wildfiregames.com/D3741
Comments by: @Nescio, @wraitii
This was SVN commit r25777.
2021-06-12 05:56:23 +00:00
f537fdd87d Look for resources nigh the order when forced.
When tasked to gather, entities looked for resources close to their
current location when the target was invalid (e.g. full).
Now on forced orders the entities will look for resources close to that
order's location, when possible.

Differential revision: https://code.wildfiregames.com/D4146
Fixes: #6085
Reviewed by: @Imarok
Tested by: @Langbart
Comments by: @marder, @Stan, @wraitii
This was SVN commit r25776.
2021-06-12 05:47:06 +00:00
b3458d408a Add a setting for the minimap flare lifetime.
Tested by: marder, Langbart
Differential Revision: https://code.wildfiregames.com/D4135
This was SVN commit r25775.
2021-06-11 20:47:09 +00:00
abe7211e15 Remove duplicated loading tip images
In 9b50e4475f I committed some duplicated images.
Noticed by: wowgetoffyourcellphone
This was SVN commit r25774.
2021-06-11 19:07:34 +00:00
ded4859e6e Fix missing templates on wild_lake.js.
Broken in 8ee6774d12

Reported by: @Nobbi
This was SVN commit r25773.
2021-06-11 15:41:40 +00:00
e1a0cabf5a RM generation: improve metal mines generation
Introduces a new helper to place mines. use it on 'Best for MP' maps for
stone and metal.

The amount of metal will scale with the # of players, and will place
slightly more mines overall for fairer distribution.

This should make 1v1 and 4v4 more playable on these maps.

Differential Revision: https://code.wildfiregames.com/D4148
This was SVN commit r25772.
2021-06-11 15:14:40 +00:00
ffd62e08d8 Speed up Corinthian Isthmus / Lorraine Plain RM generation
Both maps were using extremely high smoothness setting, that did nothing
but lag extremely.

Differential Revision: https://code.wildfiregames.com/D4150
This was SVN commit r25770.
2021-06-11 06:38:16 +00:00
fa218b66bb Loading tips: Dynamically adjust the title height and fix the width
Tested by: Langbart
Differential Revision: https://code.wildfiregames.com/D4152
This was SVN commit r25768.
2021-06-10 19:59:23 +00:00
9b50e4475f Brush up the loading tips
New loading screen tips. Update for the pictures and the text.

Patch by: marder
Reviewed by: Freagarach
Some based on work of: wowgetoffyourcellphone
Fix #6191

Differential Revision: https://code.wildfiregames.com/D4107
This was SVN commit r25767.
2021-06-10 17:25:18 +00:00
79e772152b Fix game not closing when compiled with --without-nvtt.
Fixes: #6107

Differential Revision: https://code.wildfiregames.com/D4138
This was SVN commit r25766.
2021-06-10 15:42:38 +00:00
4de9c4c164 Fixes for some random maps.
- Hellas_biome isn't a RM but as a JSON script it does load, and then
silently fails on mapgen. Explicitly fail.
- Fix player.js when a valid position cannot exist.
- Fix unknown.js when landscape isn't set in the settings.

Reported by: vladislavbelov
Refs #6180

Differential Revision: https://code.wildfiregames.com/D4147
This was SVN commit r25765.
2021-06-10 13:16:10 +00:00
b84e268a1f Fix arctic biome with postrocessing and tweak for nubia and steppe
- Arctic biome was much too bright with postprocess (error in
717a9d0252)
- Change sun angle in Nubia to make the grass less yellow at default
camera angle
- Change sun angle in Steppe to make the game look less flat at default
camera angle.

Patch by: marder
Differential Revision: https://code.wildfiregames.com/D4145
This was SVN commit r25764.
2021-06-10 06:48:38 +00:00
0b6486dc7a Fix 0 A.D. quitting 'too fast' when it gains focus after alt+F4
There appears to be an SDL issue with linux and X11 that causes Keydown
events to be sent immediately when 0 A.D. gains focus. This can loead to
Alt-F4 quitting 0 A.D. immediately upon focus gain, such as when another
application was quit via Alt-F4.

The typical bug case was:
- Open 0 A.D.
- Open another app
- Alt-F4 other app
- 0 A.D. immediately receives alt-F4 as well and exits.

Since SLD handles this hotkey natively via SDL_QUIT, it seems easier to
default to "no hotkey", as that fixes the problem.

Reported by: Imarok
Fixes #6092

Differential Revision: https://code.wildfiregames.com/D4132
This was SVN commit r25762.
2021-06-09 18:39:06 +00:00
4ee03b544d Disable the flare button for observers.
Use the new button that Stan committed in b3ec0d48ba
Reviewed by: Freagarach
Differential Revision: https://code.wildfiregames.com/D4136
This was SVN commit r25761.
2021-06-09 16:34:53 +00:00
270378414e Uncompress cached DDS in mouse event mask.
Reported by: langbart
Differential Revision: https://code.wildfiregames.com/D4142
This was SVN commit r25759.
2021-06-09 13:50:57 +00:00
f620ed8750 Make grass greener in temperate biome
And slightly reduce the desaturation since it now looks better.

Patch by: marder
Differential Revision: https://code.wildfiregames.com/D4139
This was SVN commit r25758.
2021-06-09 08:55:44 +00:00
717a9d0252 Further RM biome tweaks
- Make Savanna and Nubia have a .25 Forest probability.
- Remove brightness changes from HDR, this made postproc look too
different, particularly on Savanna
- Lower postproc impact on constrast/saturation for the same reasons.
- Lighten up Aegean, Alpine, Savanna, Nubia, slightly darken Arctic
- Make Aegean water a bit bluer. Likewise lightwen Savanna water.
- Fix the sun elevation/rotation on Nubia, Sahara and Savanna
- Remove the HDR settings of Cantabrian Highlands
- Remove the water/HDR settings of Corinthian Isthmus RM

Comments by: marder
Differential Revision: https://code.wildfiregames.com/D4124
This was SVN commit r25757.
2021-06-09 08:17:12 +00:00
324b4bdf64 Small tweak to the Roman Army Camp balance
- Max garrison reduced to 20, like fortresses (caps the capture regen
rate)
- Can construct rams
- Cost an additional 100S/100M

The capture stats have been tweaked but there's no fundamental change.

See also D4080

Differential Revision: https://code.wildfiregames.com/D4109
This was SVN commit r25756.
2021-06-09 06:42:20 +00:00
a36e7d6986 Make elephant archers cost 2 population.
This is intended to make a deathball of elephant archer less OP, as the
units are difficult to mass but really strong once that is done.

See D3599 for larger changes.

This was SVN commit r25755.
2021-06-09 06:40:35 +00:00
05ace86b76 Fix caledonian meadows.
Broke in 6cc6d8c156

Refs #6180

Differential Revision: https://code.wildfiregames.com/D4131
This was SVN commit r25754.
2021-06-09 06:35:17 +00:00
b8758c8941 Prevent ProductionQueue.AddItem for going over the entity limits / Fix autoqueue being able to train infinite heroes.
Autoqueue can ignore entity limits like Heroes, because AddItem does not
check for them, only commands.js. This changes that, fixing the
autoqueue.

Reported by: Player of 0AD
Tested by: langbart
Refs #6213

Differential Revision: https://code.wildfiregames.com/D4133
This was SVN commit r25753.
2021-06-09 06:33:52 +00:00
184ed2fb55 Apply modifiers from civ/team bonus auras in Reference Suite
The Reference Suite (Structure Tree, Civ Info, Viewer) wasn't taking
into
account civilization- or team-bonus auras when calculating entity stats.

This wasn't really a problem (for Vanilla 0AD) prior to a18d97b047, as
civ-bonus auras don't exist in Vanilla 0AD, and our team-bonus auras
didn't
apply to the owning civ before that change. Now they do, the Suite needs
to
take them into consideration.


Differential Revision: https://code.wildfiregames.com/D4093
This was SVN commit r25751.
2021-06-08 23:35:44 +00:00
06672206d4 (Re)display phase idents in Structure Tree
They were all set to hidden-by-default as part of b7ff371d00, only there
wasn't anything to tell them to unhide when we actually want them. This
commit
fixes that.


Differential Revision: https://code.wildfiregames.com/D4114
This was SVN commit r25750.
2021-06-08 23:20:39 +00:00
990d61a74a Draws all characters for a very long text of the same style.
Tested By: Langbart
Differential Revision: https://code.wildfiregames.com/D4120
This was SVN commit r25749.
2021-06-08 18:17:10 +00:00
870e689e5f Unit pushing: fix pairs of unit being allowed to overlap.
Following 40cbde1925, the minimum pushing force is 0.2. This also
happens to be the maximum pushing force any pair of units can exert on
each other, so they can freely overlap instead of being pushed.

This tweaks settings slightly to fix that problem.

Reported by: marder
Differential Revision: https://code.wildfiregames.com/D4129
This was SVN commit r25748.
2021-06-08 16:38:06 +00:00
83703992c9 Fix speed glitch
Introduced in 40cbde1925
MoveToFormationOffset may be called after the formation controller is
reset, leading to issues. It seems best to trust only
SetMemberOfFormation.

This causes the speed glitch experienced by wow & Valihrant.

Differential Revision: https://code.wildfiregames.com/D4128
This was SVN commit r25747.
2021-06-08 16:03:31 +00:00