1
0
forked from 0ad/0ad
Commit Graph

15132 Commits

Author SHA1 Message Date
b7ff371d00 Prevent OOM crash in Reference Tree on error
The structTree, in case of errors, could have enough items to draw to
trigger an OOM failure in the Arena allocator.

This fixes that by hiding elements by default and some c++ memory
optimisation (mostly, this should make all platforms take the same
memory footprint for VisibleObject).

Discussed with vladislavbelov and s0600204

Differential Revision: https://code.wildfiregames.com/D4114
This was SVN commit r25746.
2021-06-08 14:57:59 +00:00
858148d332 Add garrison flags for all wonders.
Fixes: #6160
Refs: #4581

This was SVN commit r25745.
2021-06-08 12:04:08 +00:00
f3be9bd465 Fix forge garison flag and add some missing death particles.
Refs: #4581
Refs: #6160

This was SVN commit r25744.
2021-06-08 11:42:31 +00:00
1aa944b0bb Slightly improved parchment.png texture.
Patch by: @marder
Refs:  D4107

This was SVN commit r25743.
2021-06-08 11:05:44 +00:00
055c2d009b Change the mine selection sound and make it louder.
Patch by: @Langbart
Fixes #6184

Differential Revision: https://code.wildfiregames.com/D4102
This was SVN commit r25742.
2021-06-08 10:42:15 +00:00
d03112d2f6 Fix gamesetup issues with map filters.
Redo 09a33b6626.
When the host set te 'best for mp' mapfilter and a non-default maps,
ordering issues bugged things out.
This handles things slightly better.

Fixes #6208

Differential Revision: https://code.wildfiregames.com/D4121
This was SVN commit r25741.
2021-06-08 08:51:36 +00:00
224a96373b Revert parts of 09a33b6626
There is an issue when no matchsettings.json is present.

This keeps the network synchronisation fix, that worked.

This was SVN commit r25739.
2021-06-07 19:55:05 +00:00
f5f493681d Fix atlas crash with RM capture the relic.
As no default values got set, some game settings became NaN, which
triggered exceptions.
This sets sane default.

This also includes better debugging logic in case of exception, so it's
easier to know what happens.

Fixes #6200

Reported by: langbart
Differential Revision: https://code.wildfiregames.com/D4113
This was SVN commit r25736.
2021-06-07 18:48:16 +00:00
d95eda9eb3 Add description for new hotkeys
Adds a proper description for flare & last attackfocus hotkeys.
Fixes eb2e489898 and 8e63a0322c

Reviewed By: Imarok
Differential Revision: https://code.wildfiregames.com/D4116
This was SVN commit r25734.
2021-06-07 18:45:03 +00:00
275ee9d75b Disable TreasureCollector component in siege engines.
This is unexpected and does not seem particularly useful/sensical.

Patch by: pszemsza
Fixes #5214

Differential Revision: https://code.wildfiregames.com/D3929
This was SVN commit r25733.
2021-06-07 12:54:08 +00:00
7e9bb4d4e8 Only save MP match settings if the player is the controller
Broken in 72f0fdb41b.

Differential Revision: https://code.wildfiregames.com/D4112
This was SVN commit r25732.
2021-06-07 11:45:14 +00:00
09a33b6626 Fix MP gamesetup issues with mapfilter
- Settings weren't sent to the server when mapfilters change.
- Because of ordering issues, the 'multiplayer' mapfilter would be
activated at the wrong time and things would go haywire.
- Likewise, selecting a non-default map with a non-default filter
wouldn't work well.

Fixes #6208

Differential Revision: https://code.wildfiregames.com/D4111
This was SVN commit r25731.
2021-06-07 11:40:43 +00:00
70f2ac6788 Fix error on resign with formation
Formation controllers that were about to be destroyed could bug out.
It's plausible this bug would also happen with regular units, but
couldn't reproduce.

Differential Revision: https://code.wildfiregames.com/D4110
This was SVN commit r25730.
2021-06-07 11:38:16 +00:00
a8480b1dc9 Fix incorrect animation for african elephants
Patch by: @wowgetoffyourcellphone
This was SVN commit r25729.
2021-06-07 09:48:34 +00:00
b3ec0d48ba Add a disabled flare icon for observers.
This was SVN commit r25728.
2021-06-07 08:51:23 +00:00
cdb73b29f2 Lower Forge technology costs, introduce a 3rd level.
Follows 9a3da390b9 / b5bbed4690.
Forge technologies are cheaper in A24, but still too expensive to use
directly, making the forge not immediately useful.
This changes the technologies from 2 levels to 3, and further decreases
costs.
Instead of 600/400 then 900/600, costs are 200/100, 350/250 then
500/400. This makes the Town Phase techs immediately accessible, and
lengthens impact of City Phase with stronger late techs.

Iberians and Mauryas had a special "wootz steel" tech that gave
swordsmen +20% damage, this is folded into the 3rd level. I have not
changed the effect because the tech was cheap, but we shall see.

Patch by: Nescio
Comments by: borg-, Valihrant
Differential Revision: https://code.wildfiregames.com/D3679
This was SVN commit r25726.
2021-06-07 07:33:59 +00:00
d0989ee3ac Expand Experience trickle to stables and elephant stables
Increases consistency, unlikely to be overpowered. Temple and Fortress
were considered but found risky of being too strong.

Patch by: langbart
Differential Revision: https://code.wildfiregames.com/D3994
This was SVN commit r25725.
2021-06-07 06:55:59 +00:00
8e853a7a0d Lower infantry crossbowmen walk speed.
Their lowered prepare time (since c78ead79e6) makes them too good at
hit-and-run, they should be slower since a crossbow is encumbering.

Accepted By: ValihrAnt
Differential Revision: https://code.wildfiregames.com/D4096
This was SVN commit r25724.
2021-06-07 06:50:26 +00:00
add76379d4 Correctly reset teams when changing scenario.
When switching scenarios, teams should always be reset.
Do nothing in skirmish mode.

Reported by: Stan
Differential Revision: https://code.wildfiregames.com/D4104
This was SVN commit r25723.
2021-06-07 06:46:11 +00:00
88e6671388 Lower Champion Elephant armor against Pierce.
Elephants go from 2150 real HP to 2100 against Hack and 1700 against
Pierce.
The intention is to make them more vulnerable to range (and somewhat
spearmen as well).

Suggested by: Valihrant
Differential Revision: https://code.wildfiregames.com/D4058
This was SVN commit r25721.
2021-06-07 06:40:38 +00:00
d9511564ce Fixup tooltips after 73dcf36976
Some civ-specific variants had specific tooltips.

Differential Revision: https://code.wildfiregames.com/D4095
This was SVN commit r25720.
2021-06-07 06:36:42 +00:00
cc4087f3fe Don't open the template viewer when in special input state
Fix #6041

Differential Revision: https://code.wildfiregames.com/D4105
This was SVN commit r25716.
2021-06-06 19:00:04 +00:00
eb2e489898 Add a hotkey to focus on the last attack alarm
Fix #5608

Differential Revision: https://code.wildfiregames.com/D4101
This was SVN commit r25715.
2021-06-06 18:29:48 +00:00
e0b492a83a Removes old gui_* materials, replaced by a single canvas2d material.
This was SVN commit r25714.
2021-06-06 18:25:04 +00:00
30e135693e Implements configurable cascade shadows.
Tested By: Langbart, Stan, wraitii
Differential Revision: https://code.wildfiregames.com/D3972
This was SVN commit r25711.
2021-06-06 16:44:54 +00:00
40cbde1925 Further Pushing tweaks: more customisable, longer ranges.
This overall decreases the deathball effect from units walking to each
other a bit.
- Fix formations - this cleans up a UnitMotion hack for formations,
making it possible to increase pushing ranges without breaking closely
knit formations like testudo.
- Make MINIMAL_PUSHING and the MOVE_EXTENSION configurable, and add a
STATIC_EXTENSION as well.
- Increase the pushing range significantly, making units sparser.

Differential Revision: https://code.wildfiregames.com/D4098
This was SVN commit r25708.
2021-06-06 15:25:52 +00:00
063408c252 New pikemen small shields.
Patch by: @wowgetoffyourcellphone,
This was SVN commit r25707.
2021-06-06 14:28:28 +00:00
cea23ac864 Improve the UVMap of some old rocks. They were looking very weird with some of the new textures.
This was SVN commit r25706.
2021-06-06 14:27:02 +00:00
683759c4c6 Fix some texture bug on tree_oak_new_c the uv was referencing some transparent parts of the texture. The texture was also a bit too transparent on the bark.
Reported by: @vladislavbelov
This was SVN commit r25705.
2021-06-06 11:23:32 +00:00
374b869480 Tweaks to the alpine RM biome
- Rename to subalpine to fit the theme better & tweak tooltip
- improve the shore textures
- remove the snow dir texture which contrasted too heavily.

Differential Revision: https://code.wildfiregames.com/D4027
This was SVN commit r25701.
2021-06-06 08:24:39 +00:00
3f2265a09e Update for the Steppe RM biome
- Change the grass actor, which was too lighting dependent and heavy on
performance
- Change the main terrain texture which was quite noisy
- Change shore textures to be more seamless.

Based on a patch by: marder
Differential Revision: https://code.wildfiregames.com/D4025
This was SVN commit r25700.
2021-06-06 08:21:35 +00:00
8af0689b5f Fix gamesetup player assignment issue when joining
Switch some logic from C++ to JS in PREGAME for player assignments. Refs
#3049

Fixes #6204

Reported by: Imarok
Tested By: Imarok
Differential Revision: https://code.wildfiregames.com/D4092
This was SVN commit r25699.
2021-06-06 08:02:28 +00:00
73dcf36976 Remove territory root from fortresses.
Reverts D1762 / 014c2922f2.
Because any territory connected to a root does not decay, this made it
possible to anchor CC territories by adding a fortress somewhere, thus
making it much, much harder to push against an enemy territory.
This led to a much more turtley gameplay and overall made the game
worse.

For now, I do not reintroduce the larger territory range (which was
reduced in 014c2922f2).

Differential Revision: https://code.wildfiregames.com/D3989
This was SVN commit r25697.
2021-06-06 07:35:40 +00:00
fdb4040838 Adds HiDPI mode for testing. HiDPI on Windows isn't supported in SDL yet. So we use a custom code.
Differential Revision: https://code.wildfiregames.com/D4076
This was SVN commit r25692.
2021-06-05 19:01:37 +00:00
8e63a0322c Map flares
Add flaring on the map and resize the minimap buttons.
Target marker and button by Stan.
Reviewed/Commented by wraitii, elexis, vladislavbelov
Refs: #3491
Refs: #57

Differential Revision: https://code.wildfiregames.com/D1751
This was SVN commit r25691.
2021-06-05 17:37:18 +00:00
3bb5f364c2 (Reference Suite) Support aura-based civilization bonuses
As a side effect of 6b7a80b260, this is now trivial to do.

We don't (currently) have any aura-based civ bonuses in Vanilla 0A.D.,
but hopefully modders will find it useful.

This was SVN commit r25690.
2021-06-05 16:39:59 +00:00
6b7a80b260 (Reference Suite) Fetch teambonus auras from player_{civ}.xml files
(The `civ` key (in the team bonus aura templates) was added in
190d6e7cf5 for the
purpose of identifying which aura belongs to which civ. It's no longer
used.)

Proposed by: @Nescio
Comments by: @Freagarach
Refs: 190d6e7cf5
Differential Revision: https://code.wildfiregames.com/D3864
This was SVN commit r25689.
2021-06-05 16:24:25 +00:00
ad8c7cb2e0 Fixup artic biome: add lillies replacement
Since lillies wouldn't make too much sense, add rocks.

Differential Revision: https://code.wildfiregames.com/D4087
This was SVN commit r25688.
2021-06-05 10:47:20 +00:00
7de9487a87 "New maps" demo campaign
This shows off the new maps, and shows off campaigns in a straighforward
manner.

Differential Revision: https://code.wildfiregames.com/D4020
This was SVN commit r25684.
2021-06-04 18:04:17 +00:00
498c2f402d Allow setting a custom page for the 'back' page in the gamesetup.
Forgotten in c012888e2a. This is useful for campaigns that would want to
use the full gamesetup, and in general makes the gamesetup slightly more
flexible.

Differential Revision: https://code.wildfiregames.com/D4082
This was SVN commit r25683.
2021-06-04 17:22:15 +00:00
f2c9c392bb Rework metal/stone techs to cost Food and Stone.
Food/Wood techs now cost Wood and metal (with food techs being slightly
less expensive as they provide less bonus). Metal/Stone techs now cost
Food and Stone instead of Wood and Metal, reducing the load on those
resources, and making Stone slightly more critical.

Initial work by: Nescio
Accepted By: chrstgtr, Valihrant
Differential Revision: https://code.wildfiregames.com/D3704
This was SVN commit r25682.
2021-06-04 17:20:15 +00:00
a359275841 Map touchup: Corinthian isthmus
- Support biomes
- Hills, forests, food & metal mines won't spawn on the isthmus anymore,
to avoid obstructions and make things a little fairer
- Stone mines spawn only on the isthmus and players start only with
small stones
- Tidier forests
- The central passageway is sometimes slightly offset left/right
- The central passageway is surrounded by a walkable shallow, which
prevents effectively walling the actual passageway.
- Widen the river slightly.

Overall the intention is to make the map less of a turtle-fest, though
it remains chokepointy by nature.

Differential Revision: https://code.wildfiregames.com/D4062
This was SVN commit r25681.
2021-06-04 17:08:10 +00:00
eae2538802 Map touchup: gulf of bothnia
- Denser forests
- frozen lake biome gets some watery holes in there, just to make it
slightly more mazey.
- Tweak the lighting of the specific biomes to avoid overexposing the
ground textures.

Differential Revision: https://code.wildfiregames.com/D4073
This was SVN commit r25680.
2021-06-04 16:50:44 +00:00
76191d43c8 Map touchup: River/Lake/Mainland/Continent
- Slightly denser forests with the new helper
- good default biome for African Plains in Atlas.

Differential Revision: https://code.wildfiregames.com/D4072
This was SVN commit r25679.
2021-06-04 16:36:02 +00:00
bc17e1ade3 Map touchup: neareastern badlands
- Support African biomes
- Tidier forests

This was SVN commit r25678.
2021-06-04 16:34:09 +00:00
990eea63b9 Map touchup: Cantabrian Highlands
- Support biomes
- Tidier forests

This was SVN commit r25677.
2021-06-04 16:32:37 +00:00
146b680d63 Fix borders of game description in gamesetup
Spotted by Langbart
Reviewed by Langbart
Refs 6f9a162dfa

Differential Revision: https://code.wildfiregames.com/D4074
This was SVN commit r25676.
2021-06-04 16:30:36 +00:00
c1d3584da3 Map touchup: hyrcanian shores
- Properly split mainland & highland forests
- slightly tidier forests
- support biomes

Differential Revision: https://code.wildfiregames.com/D4063
This was SVN commit r25675.
2021-06-04 16:21:59 +00:00
e865db3bfb Map touchup: Ardennes forest
- reuse settings from the temperate biome
- More wood / slightly denser
- replace the aleppo pine with the Fir, looks better
- Rework the terrain textures

Differential Revision: https://code.wildfiregames.com/D4061
This was SVN commit r25674.
2021-06-04 16:16:53 +00:00
5e0b65853b Map touchup: African plains
- Support the 3 african biomes.
- Bigger forests (same # of trees overall)
- More hills/watering holes, more animals there.

Differential Revision: https://code.wildfiregames.com/D4060
This was SVN commit r25673.
2021-06-04 16:00:37 +00:00