1
0
forked from 0ad/0ad
Commit Graph

19037 Commits

Author SHA1 Message Date
7ecd1d2c34 Clean some forward declarations.
Remove unused (wrong copy&paste) includes from 86fcf0de8c in
JSInterface_ModIo.*, initially hinted at by leper.
Remove a forward declaration in JSInterface_Console.h that should have
become an include with 4b1297b328, because CxPrivate must be declared
before its reference too.
Remove a forward declaration in JSInterface_Mod.h from 64bfa089af that
should have been the include added in af03c72f76 which in turn omitted
to remove this forward declaration.
Remove a forward declaration in Renderer.h that became unused with
1ddd24bb8c.

Differential Revision: https://code.wildfiregames.com/D1470
Reviewed By: Itms
This was SVN commit r21788.
2018-04-27 16:06:42 +00:00
440012961a really fix packing problems reported in 5acfa9921e
Differential Revision: https://code.wildfiregames.com/D1458
This was SVN commit r21786.
2018-04-26 16:49:18 +00:00
583b6ec625 Stop some auras from being applied extra times, don't apply player auras to templates, and fix some linting errors
Differential Revision: https://code.wildfiregames.com/D1430
Comments by: fatherbushido, elexis
This was SVN commit r21785.
2018-04-26 00:35:24 +00:00
f7c2785400 Fix a couple of packing problems from 5acfa9921e
Packable units should pack in the attack order after the standground
check, and they should pack before chasing.
Reported by: bb
Comments by: mimo at D1458
This was SVN commit r21784.
2018-04-25 23:47:24 +00:00
ae06687b80 Revert sinkrate change from 35b0715c3a which was too drastic (15x).
Remove unneeded, slightly different sinkrate from the hellenic epic
temple.

Differential Revision: https://code.wildfiregames.com/D1467
Baed on patch by: Nescio
This was SVN commit r21783.
2018-04-25 12:54:32 +00:00
fa01a67d42 Fix gaia becoming defeated due to yet another missing IsInWorld check.
The check should have been in there for mods (garrisonable CCs) since
the first version, but it was needed the hard way by units becoming
targets in 76d648349d.

This was SVN commit r21782.
2018-04-25 12:26:34 +00:00
ec8d95abe1 Update auras of entities of other players that affected the defeated player after 2651caa885 removed this case handling unintentionally.
Also avoids some unneded player entity aura cleans.

Differential Revision: https://code.wildfiregames.com/D1453
Reported and comments by: fatherbushido
Reviewed By: temple
refs #5099

This was SVN commit r21779.
2018-04-24 17:28:24 +00:00
86fcf0de8c Move ModIo JS interface functions to a separate namespace, refs 833c9f108c.
Differential Revision: https://code.wildfiregames.com/D1466
Reviewed By: Itms
This was SVN commit r21778.
2018-04-24 13:12:08 +00:00
76d648349d Fix gaia units ignoring players without CCs.
As demonstrated by Dizaka, it allowed players to win a game by deleting
all buildings, sending one unit across the map and having the enemy get
defeated by the double gaia count.
It also means that players that still have buildings but no CCs/Wonders
are targetted by elephants.

This was SVN commit r21777.
2018-04-24 12:46:59 +00:00
067bbb38d6 Fix whitespace in JSInterface_Sound.*
This was SVN commit r21776.
2018-04-24 11:44:26 +00:00
5a34c9e570 Add missing distance from nomad units to soldiers garrisoned on walls by the trigger script, noticed by temple.
Delay city patrols in nomad mode.
More trees on roads.

This was SVN commit r21775.
2018-04-24 11:21:11 +00:00
0933f24891 petra: small tweak for civs without field
This was SVN commit r21773.
2018-04-23 20:30:22 +00:00
25099f2898 Remove aggressive gaia soldiers on nomad random maps.
Differential Revision: https://code.wildfiregames.com/D1465
Reviewed By: (-_-) aka smiley
This was SVN commit r21772.
2018-04-23 18:13:39 +00:00
bb
e3bc85388f Hide the settingsPanel for non-controllers
Patch By: ffffffff
Comments By: elexis
Differential Revision: https://code.wildfiregames.com/D1243
This was SVN commit r21771.
2018-04-23 15:29:35 +00:00
bb
15a16beed3 Tidy up gamesetup initGUIObjects
Suggested By: elexis
This was SVN commit r21770.
2018-04-23 15:09:21 +00:00
bb
2ff1d993be Split the sliding logic from the moving logic for the settingsPanel in gamesetup
Preparation for D1243

This was SVN commit r21769.
2018-04-23 14:51:09 +00:00
bb
3d4abb5f62 Use esc to close the tabs in gamesetup
string should come after release

Patch By: ffffffff
Differential Revision: https://code.wildfiregames.com/D1242
This was SVN commit r21768.
2018-04-23 14:08:26 +00:00
c4342d6291 Fix gaia attackers on the left riverside of Danubius trying to attack units on the right riverside if they happened to be closer, fixes #4622.
At most send an attack order for one target before patroling
(targetCount),
because adding further targets can end in the gaia unit being blocked
and slaughtered by the player without difficulty and
because the mechanism isn't as relevant for ships as it was envisioned
to be (since most ofen the 3 closest ships already are in the same
location).

Patch By: (-_-) aka smiley
Differential Revision: https://code.wildfiregames.com/D1449
This was SVN commit r21767.
2018-04-23 11:32:22 +00:00
2bc068aa41 Add some missing IsInWorld checks to Danubius for cases where all targets are garrisoned, promoted, upgraded, transformed, becoming packed or undergoing any special treatment by some mod, refs D1449.
This was SVN commit r21766.
2018-04-23 11:22:46 +00:00
096500d99a Toggle the visibility of the session GUI instantly, rather than waiting possibly indefinitely for the next simulation turn.
Differential Revision: https://code.wildfiregames.com/D1464
Reviewed By: bb
This was SVN commit r21765.
2018-04-23 09:33:03 +00:00
56d93afceb Adjust code comments to match a breaking change in the mod.io API.
See
317358c5d0.

This was SVN commit r21764.
2018-04-23 09:09:45 +00:00
4b09d6f167 Ask the lobby player to open the mod selection page if the mods don't match the ones from the lobby host, as decided in the staff meeting.
This was SVN commit r21761.
2018-04-22 23:46:06 +00:00
c23045dcc0 Two hurtful string changes in preparation of string freeze, refs #4936, decided in the staff meeting.
This was SVN commit r21760.
2018-04-22 23:37:39 +00:00
833c9f108c mod.io support.
mod.io is a new platform for sharing mods, that 0 A.D. can make use of
in order to download mods and install them.

Based on patch by leper, numerous changes from s0600204, vladislavbelov,
Imarok, elexis, temple and myself.
Differential Revision: https://code.wildfiregames.com/D1029
This was SVN commit r21759.
2018-04-22 18:14:45 +00:00
fe177fb5bf petra: make some use of mobile dropsites
This was SVN commit r21758.
2018-04-22 17:00:32 +00:00
d5978468d5 petra: support upgrade from one garrisonable structure to one non-garrisonable
This was SVN commit r21757.
2018-04-22 16:52:34 +00:00
79ca3218fa Deforest the Dodecanese.
The deficit in buildspace required the players to solely gather trees
for dozens of minutes to progress.

This was SVN commit r21756.
2018-04-22 14:21:07 +00:00
364eaa34c6 Move some utility functions from the public mod to the mod mod in preparation for upcoming commit.
Small fixes and improvement while I'm at it, by temple and elexis.

This was SVN commit r21754.
2018-04-22 12:03:51 +00:00
81e21ea53d petra: improve mod support by allowing civs to build corrals when they can't build fields, even if the field template exists
This was SVN commit r21753.
2018-04-21 22:16:07 +00:00
8f2eb1ea87 remove debug printout forgotten in 50f702aa9e
This was SVN commit r21752.
2018-04-21 12:07:48 +00:00
50f702aa9e petra: allow the ai to use ranges for mod who support them, and add Archery class to ranges to allow differentiating them from barracks
This was SVN commit r21751.
2018-04-21 11:55:34 +00:00
27f5d854bb Reload batch size when changed in options
Differential Revision: https://code.wildfiregames.com/D1459
This was SVN commit r21750.
2018-04-20 19:55:54 +00:00
18d8d2b29d petra cleanup
This was SVN commit r21749.
2018-04-20 15:36:14 +00:00
aed19f65ae petra: fix for civs which do not have support worker units (as xiongnu in TerraMagna)
This was SVN commit r21748.
2018-04-20 15:00:49 +00:00
8d35042dec further increase the training and building time of AI by 10% in easier levels (based on a stat of 1 beginner! more feedback needed)
This was SVN commit r21746.
2018-04-19 17:16:56 +00:00
43e242dab5 petra: improve sorting of resources according to the needs.
This was SVN commit r21745.
2018-04-19 15:30:01 +00:00
a37c2240c3 Attacks resulting from a gathering order on an animal should be considered forced or not consistently with the original gather order.
Reviewed By: temple
Fixes #4863

Differential Revision: https://code.wildfiregames.com/D1457
This was SVN commit r21744.
2018-04-19 14:20:53 +00:00
3033a56f39 Improve mine and passage placement on Jebel Barkal.
Place more mines on nomad in the fertile land.
Chose better fitting templates for the fertile land.
Alternate passage locations, so the gameplay purpose of the irrigation
canals is met (increasing the distance between opponents).
Increase the size of the city on larger maps.
Don't have bumps near gates.

This was SVN commit r21743.
2018-04-19 11:00:08 +00:00
341a714c21 Allow lobby players to watch the replay of the game just played without disconnecting them from the lobby,
because they can open the lobby as a dialog while replaying the game in
this release.

Differential Revision: https://code.wildfiregames.com/D1237
Patch By: fpre / ffffffff
This was SVN commit r21742.
2018-04-18 14:43:11 +00:00
f2cda85310 Fix compilation of ModInstaller without pch
Reviewed by: elexis
Differential Revision: https://code.wildfiregames.com/D1456
This was SVN commit r21739.
2018-04-17 22:02:10 +00:00
724b25bac6 Style adjustments to 936c16050b
This was SVN commit r21738.
2018-04-17 17:31:11 +00:00
da2f1e9c89 Add some random roads leading to/away from the city Napata.
This was SVN commit r21737.
2018-04-17 00:52:50 +00:00
d171156e99 Don't pick a civ that shouldn't be selectable in gamesetup when civ random was choosen
Discovered by Undying Nephalim.
Investigated by s0600204
Reviewed by: s0600204
Differential Revision: https://code.wildfiregames.com/D1455
This was SVN commit r21736.
2018-04-16 19:50:02 +00:00
077538d06c Impose a population limit for gaia units on Jebel Barkal to prevent lag of doom.
Have strongly garrisoned buildings in the city capturable to incentivize
players to break the walls.

Use "probabilistic rounding" for unit counts, so that on a 1v1 with a
normal mapsize on medium difficulty,
don't round to 0 elephants per stable in the first wave as it is too few
and
don't round to 1, because that were too many.

Place Sentry towers in easy difficulty instead of none.

This was SVN commit r21735.
2018-04-16 12:51:41 +00:00
a00b4b6e77 Remove a warning about missing markets when the player has issued a barter command just before losing the market, fixes #3645.
This was SVN commit r21733.
2018-04-16 01:04:53 +00:00
35b0715c3a Reduce decay time for units to avoid lag when too many units are dead.
Make their decaying faster too so they do not stay too long under the
ground for no reason.
Leave it some time still so players can still have an idea on how many
dead units are there.

This was SVN commit r21732.
2018-04-15 22:22:45 +00:00
d654ae18d2 New greek quiver by Alexandermb
Thread:
https://wildfiregames.com/forum/index.php?/topic/23925-task-weapons-and-armory/&page=3

This was SVN commit r21731.
2018-04-15 21:52:52 +00:00
a74352b100 Spawn proportionately less gaia attackers when players become defeated.
This also reduces the attackercount slightly, because gaia is now
excluded when counting players.
PlayerManager.GetActivePlayers helper function.

This was SVN commit r21730.
2018-04-15 16:47:51 +00:00
f5d8b509ff Place the other half of the bridge on Dodecanese.
Differential Revision: https://code.wildfiregames.com/D1448
Patch By: smiley / (-_-)
This was SVN commit r21729.
2018-04-15 15:51:24 +00:00
d87057b1c0 Fix playerbase animal template on Hellas not being defined for the highlands biome.
The error was hidden by the default chicken value.

Reported by: nani
This was SVN commit r21728.
2018-04-15 15:19:49 +00:00