1
0
forked from 0ad/0ad
Commit Graph

22203 Commits

Author SHA1 Message Date
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
7fdbe037dd Uses canvas2d material for line drawing instead of gui_solid.
This was SVN commit r25704.
2021-06-06 10:13:57 +00:00
337c4100ce Cleanups ddbf1ea770 which fixes 4ffc005a7f. Sprites can not be inserted twice.
This was SVN commit r25702.
2021-06-06 09:31:36 +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
ddbf1ea770 Hotfix 4ffc005a7f
A GUI sprite can have e.g. "color:" and "stretched:", but 'sprite' was
moved from after the first call.
Refs #6206

Differential Revision: https://code.wildfiregames.com/D4094
This was SVN commit r25698.
2021-06-06 07:44:20 +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
4ffc005a7f Removes raw pointers management from sprites owned by CGUI.
This was SVN commit r25695.
2021-06-06 00:32:49 +00:00
8e150199a8 Removes raw pointers management from CGUISprite.
This was SVN commit r25694.
2021-06-06 00:22:43 +00:00
a2257237b3 Removes raw pointers management from GUIScrollBarOwner.
This was SVN commit r25693.
2021-06-06 00:12:31 +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
f3efe47ff6 Default-init atomics in TaskManager::Impl
std::atomic<bool> does not value-initialise the boolean.
This caused windows tests to use way too much CPU and fail.

Differential Revision: https://code.wildfiregames.com/D4089
This was SVN commit r25687.
2021-06-05 09:48:41 +00:00
3745940de8 Fix OOS in unit motion
Fixes 592453c62f
wasObstructed and wentStraight are not reset when Move() isn't called,
but PostMove may still be called (if the unit was pushed). This will
OOS.

Differential Revision: https://code.wildfiregames.com/D4088
This was SVN commit r25686.
2021-06-05 09:33:57 +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
2599289872 Update the Savanna RM biome
Patch by: marder
Differential Revision: https://code.wildfiregames.com/D4067
This was SVN commit r25672.
2021-06-04 15:39:43 +00:00
d1e51593cd Fix water texture in aegean biome
The new texture is less visually intrusive thus a better general fit.

Patch by: marder
Differential Revision: https://code.wildfiregames.com/D4026
This was SVN commit r25671.
2021-06-04 15:24:48 +00:00
93e450c433 Increase the size of the Lobby Create match dialog
Based on a patch by: langbart
Fixes #6202

Differential Revision: https://code.wildfiregames.com/D4081
This was SVN commit r25670.
2021-06-04 13:10:34 +00:00
54dae5257d Make Stable technologies more affordable
Patch by: ValihrAnt
Reviewed By: wraitii
Differential Revision: https://code.wildfiregames.com/D3919
This was SVN commit r25669.
2021-06-04 13:00:25 +00:00
db7d63f208 Add a 'createDefaultForests' wrapper around createForests
This new helper gives fewer but larger forests by default.

Follows 70a4406bef

Differential Revision: https://code.wildfiregames.com/D4071
This was SVN commit r25668.
2021-06-04 12:57:05 +00:00
69901d9ffb Tweaks to TaskManager code
Reported by: Vladislav
Differential Revision: https://code.wildfiregames.com/D4077
This was SVN commit r25667.
2021-06-04 12:55:15 +00:00
f9ed769355 Add a mahout for the Maurya support elephant. Re-enabling building should be done in a separate [gameplay] differential.
Fixes: #6091
Thread:
https://wildfiregames.com/forum/topic/37023-task-add-mahout-to-mauryan-worker-elephant/

This was SVN commit r25666.
2021-06-04 10:34:53 +00:00
b2f887da2c Improved Seleucid pikemen and Archers.
Patch by: @wowgetoffyourcellphone
This was SVN commit r25665.
2021-06-04 08:59:11 +00:00
741d53e3e7 Do not go to the nearest dropsite when full and asked to hunt/slaughter and attack instead. This is fine as long as units don't decay.
Comments by: @wraitii, @Freagarach
Reported by: @FeldFeld
Fixes: #5954
Refs: 6d187f2145
Differential Revision: https://code.wildfiregames.com/D3444
This was SVN commit r25664.
2021-06-04 08:44:15 +00:00
dd61eb4751 Update "autumn" biome
Patch by: marder
Differential Revision: https://code.wildfiregames.com/D4065
This was SVN commit r25663.
2021-06-04 08:33:13 +00:00
82c44e826d Lobbybots: Send IQ result containing the IP address to a client starting a new hosted match and remove the IP from gamelist stanza.
Refs: D3490, D3184

This was SVN commit r25660.
2021-06-04 00:33:43 +00:00
b360b7bd2b Disallow hardware without VBO support to simplify vertex buffer usages.
Tested By: Stan
Differential Revision: https://code.wildfiregames.com/D4054
This was SVN commit r25659.
2021-06-03 22:06:59 +00:00
45d7bee29b Revert the UI change.
It looks bad on the summary graph, and might need further adjustments in
general.

Discussed with: @Langbart, @Imarok, @wraitii
cc @wowgetoffyourcellphone

This was SVN commit r25658.
2021-06-03 17:02:02 +00:00
0ebc08b13c Thread the pathfinder computations using the task manager.
The pathfinder computations are run asynchronously (and potentially on
the main thread) in-between simulation turns, thus reducing
pathfinder-related lag considerably in common cases.

To make this most efficient, the number of paths computed during a turn
via MaxSameTurnMoves is reduced from 64 to 20.

This has a hard dependency on the obstruction manager (via the vertex
pathfinder) not being modified in-between simulation turn (or to put it
more generally on the simulation state not changing outside of turn
computation), otherwise results will be non-deterministic and go OOS.
This is currently entirely safe (as in, it indeed does not happen that
the simulation state changes in-between turn), but future work towards
improving simulation sandboxing would be good.

Thanks to Kuba386 for maintaining & improving the patch in 2020
Thanks to everyone who tested the various iterations of this patch.

Fixes #4324

Differential Revision: https://code.wildfiregames.com/D14
This was SVN commit r25657.
2021-06-03 16:21:28 +00:00
1b35d36daa Implement a global task manager using a pool of worker threads
Tasks are simple callables (e.g. lambdas), and can be pushed with 2
priority levels. Pushing a task returns a future.
Futures can be waited on, can return results, and can be cancelled
deterministically. Futures can also not be waited on.

This gives 'hardware concurrency - 1' threads to maximize CPU usage in a
work-stealing workflow.

Reviewed by: vladislavbelov
Refs #5874

Differential Revision: https://code.wildfiregames.com/D3848
This was SVN commit r25656.
2021-06-03 14:48:38 +00:00
c78ead79e6 Standardize prepare time for ranged units.
Prepare time is the time between an attack order and the arrows actually
flying.

Archers go from 500ms to 800ms standard, making them slower to fire than
other ranged units, and making them slightly harder to micro against
e.g. raids.
Javelineers go from 750ms to 400ms, for the opposite effect.
Crossbowmen, as a 'special' feature, get 200ms, meaning they fire their
first volley really fast despite their long repeat rate.

This also standardizes all javelineer units to have 1250ms repeat time.

Differential Revision: https://code.wildfiregames.com/D4050
This was SVN commit r25655.
2021-06-03 13:49:07 +00:00
5d542ab63b Fix new biomes: small mines are again small
The terrain update introduced large actors for both small and large
stone and metal actors. This replaces the small ones by the appropriate
small actors.

Patch by: marder
Differential Revision: https://code.wildfiregames.com/D4057
This was SVN commit r25654.
2021-06-03 13:44:14 +00:00