1
0
forked from 0ad/0ad
Commit Graph

17062 Commits

Author SHA1 Message Date
a82fe62747 Fix an ambiguity in the ai info text.
Reviewed By: elexis
Differential Revision: https://code.wildfiregames.com/D136
This was SVN commit r19208.
2017-02-08 18:10:50 +00:00
f185817a1c This was SVN commit r19207. 2017-02-08 03:55:26 +00:00
d1e6205b70 Spy tech icon
This was SVN commit r19206.
2017-02-07 21:44:18 +00:00
0e2d2610c9 Display a nice error message when trying to register too many lobby accounts
(This is a workaround that will be removed when gloox has fixed the
issue.)

Reviewed by: elexis
Refs #3771
Differential Revision: https://code.wildfiregames.com/D87
This was SVN commit r19205.
2017-02-07 15:05:26 +00:00
2fabe80b20 Increase catapult and bolt shooter health by factor 2.5 and 2 (as rams have 4 times that health and still vanish quickly enough when encountering sword units).
Make catapults more affordable by reducing their stone cost from 350 to
250 per unit.

Differential Revision: https://code.wildfiregames.com/D102
Reviewed By: scythetwirler, fatherbushido
This was SVN commit r19204.
2017-02-07 13:18:04 +00:00
7487d27467 Fix infinite loop detection when placing players randomly on the newer random map scripts (and prevent them surely, not only almost surely).
Reviewed By: FeXoR
Differential Revision: https://code.wildfiregames.com/D118
This was SVN commit r19203.
2017-02-06 23:21:39 +00:00
20d34d4a97 Properly sort selected entities by owner
Fixes #4425. Refs #1807, #4167. Fixes a8b9416725

Reviewed by: mimo
Differential Revision: https://code.wildfiregames.com/D123
This was SVN commit r19202.
2017-02-06 22:17:21 +00:00
5130bb69d3 Use std::time_t in the replay menu (as 64bit integer conversion are implemented now) and remove the unused filemoddate fallback.
Differential Revision: https://code.wildfiregames.com/D112
Reviewed By: echotangoecho
This was SVN commit r19200.
2017-02-05 02:18:33 +00:00
39bb057ec5 Show the defeat/active state of players in the diplomacy window
Patch by javiergodas, rebased and negative review by elexis. Fixes
#4237.

This was SVN commit r19199.
2017-02-03 15:08:32 +00:00
863b8da240 Fix GarrisonHolder wich doesn't start to heal garrisoned units when the related technology is researched.
Summary:
When the heal technology is researched in a barrack, a wounded unit
garrisoned in it is not healed.
Indeed the component doesn't listen to value modification.
The patch fixes that.

Test Plan: Reproduce what is above and see that the patch fix it.

Reviewers: O2 JS Simulation, wraitii

Reviewed By: wraitii
Subscribers: wraitii, mimo, Vulcan

Differential Revision: https://code.wildfiregames.com/D63
This was SVN commit r19197.
2017-02-02 09:15:05 +00:00
17b8e60cc7 Fix ProjectileSpeed entry in Attack schema
Summary:
The documentation is imo misleading.
Projectile speed 0 is not supported anywhere in the code and doesn't
lead to a melee attack.

Test Plan: -

Reviewers: O2 JS Simulation, leper

Reviewed By: O2 JS Simulation, leper
Subscribers: leper, Vulcan

Differential Revision: https://code.wildfiregames.com/D115
This was SVN commit r19196.
2017-02-02 08:32:57 +00:00
223da5216b Don't increase entity limit counter when we upgrade to an entity with the same restriction category.
Summary:
In some mods (for hero) or in the current game (for sentry tower), when
we have reach the entity limit related to a restriction category, we
can't upgrade any entity wich have that restriction category to one with
the same restriction category (for example, upgrading an hero to an hero
as the 1 max limit is yet reached).
That diff should allow that in the gui and the sim.
Code could be concatenated. So comments are welcome.

Test Plan:
For in game testing, you can for example in the Player template reduce
the DefenseTower limit to 2. Then build 2 sentry towers.
Without the patch you can't upgrade any of them. With you can upgrade
them to defense tower.

Reviewers: wraitii, O8 JS GUI, O2 JS Simulation

Reviewed By: wraitii, O8 JS GUI, O2 JS Simulation
Subscribers: leper, mimo, wraitii, Vulcan, O8 JS GUI

Differential Revision: https://code.wildfiregames.com/D81
This was SVN commit r19195.
2017-02-01 16:35:08 +00:00
b052831529 Improve AI chat messages
Differential Revision: https://code.wildfiregames.com/D59
This was SVN commit r19194.
2017-01-31 18:03:36 +00:00
67b00a7232 Add a linear splash damage for boltshooters. Reviewed by elexis.
Differential Revision: https://code.wildfiregames.com/D107
This was SVN commit r19193.
2017-01-31 14:46:57 +00:00
79da98aa75 Remove all out-of-scope usages in binaries/data/mods/public/gui/common/functions_utility.js
Reviewed by elexis

This was SVN commit r19192.
2017-01-30 16:30:59 +00:00
83a2e810da Remove all occurrences of for each in JS scripts.
This will allow us to use some linters that would otherwise crash on
this non-standard SpiderMonkey feature. Refs #4419.

Special thanks to elexis for thoroughly checking and testing all the
changes!
Reviewed By: leper, elexis
Differential Revision: https://code.wildfiregames.com/D40
This was SVN commit r19191.
2017-01-30 12:47:08 +00:00
c0ca70efd2 Fix 64-bit integer script conversions by removing the discrepancy between Windows and Linux.
Patch by echotangoecho, fixes #3848.
Reviewed By: Itms
Differential Revision: https://code.wildfiregames.com/D84
This was SVN commit r19189.
2017-01-30 10:21:08 +00:00
73bda917bb Cleanup of NASM. It has been unused for ages (153357f640) and we still have legacy code lines in our premake scripts. We also carry an unused binary for Windows.
By removing this we don't need to add NASM support to premake5, refs
#3729.

Reviewed By: leper
Differential Revision: https://code.wildfiregames.com/D97
This was SVN commit r19188.
2017-01-30 09:19:59 +00:00
d183d1913d Nerf slingers, since infantry should not be able to destroy buildings easily, in particular in village phase.
Differential Revision: https://code.wildfiregames.com/D103
Reviewed By: fatherbushido
This was SVN commit r19186.
2017-01-29 19:01:01 +00:00
d2b9236388 Colorize the playername with rating in the lobby user profile
Reviewed by: elexis
Differential Revision: https://code.wildfiregames.com/D48
This was SVN commit r19185.
2017-01-29 17:31:18 +00:00
584ccd690e Remove lib/pointer_typedefs.h. Patch by echotangoecho.
Reviewed By: Itms, leper
Differential Revision: https://code.wildfiregames.com/D83
This was SVN commit r19184.
2017-01-29 00:06:28 +00:00
6ae2db53db Employ some variadic macros to make some of the C++ -> JS function calling code nicer.
Template-ize CallFunctionVoid.
Changes CallFunction parameter order to make template parameter
deduction with
variadic parameters work nicely.

Reviewed By: Itms, wraitii, Yves
Differential Revision: https://code.wildfiregames.com/D77
This was SVN commit r19183.
2017-01-28 23:37:15 +00:00
fd5bd8e301 Fix 9964bee5bb.
Differential Revision: https://code.wildfiregames.com/D100
Reviewed By: Imarok
This was SVN commit r19182.
2017-01-28 20:47:26 +00:00
9a6c5eac60 Colorize playernames in the wonder victory time notification.
Differential Revision: https://code.wildfiregames.com
Reviewed By: Imarok
This was SVN commit r19181.
2017-01-28 20:30:30 +00:00
a74fcdcb35 Durations over 1 hour aren't displayed correctly
Reviewed by: elexis
Differential Revision: https://code.wildfiregames.com/D44
refs #4418, #3350

This was SVN commit r19180.
2017-01-28 10:59:53 +00:00
9b819645f5 fix typo in 82faae8637
This was SVN commit r19179.
2017-01-28 10:22:03 +00:00
c2d0327af9 Implement shared vision at the entity level
Summary:
To fix tickets like #3335, having a shared vision at the entity level is
needed. This patch implements that in CCmpRangeManager, interfaced with
a new JS component VisionSharing to manage the shared entities visions.
As an example of use case (in addition to garrisoning in allied
structure without the sharedLos tech), we can think of bribing enemy
units: there is a part about it in the patch, but this one is very wip
and not intended to be committed but rather for test purposes of the
feature.
So when garrisoning a unit in another player's building, the vision of
the garrisonHolder is shared (part intended for review). In addition,
for tests of the feature, when clicking on the new bribe icon in the
diplomacy window, a random unit of the chosen player is bribed and share
its vision during 15 s.

Test Plan: Garrison a unit in an allied structure without the sharedLos
tech, or test the wip bribe feature from the diplomacy window.

Reviewers: Itms

Reviewed By: Itms
Subscribers: Stan, leper, O11 Templates, wraitii, elexis, fatherbushido,
Itms, Vulcan, O1 C++ Simulation

Differential Revision: https://code.wildfiregames.com/D60
This was SVN commit r19175.
2017-01-26 21:10:46 +00:00
ff743bc928 Reshuffling of AI management of territory maps
Reviewed By: Sandarac
Differential Revision: https://code.wildfiregames.com/D96
This was SVN commit r19174.
2017-01-26 18:17:31 +00:00
7b04c74043 Fix inconsistent disabled resign and pause button
Summary:
The pause button displays an additional GUI element on top of the button
containing the text.
This apparently unneeded element uses a style forcing the button text to
be white, even if the element is disabled.

Test Plan:
Start a multiplayergame with all players in the same team, winning it
instantly.
The resign and pause button become disabled, but have different text
colors.
Apply the patch and notice the issue is gone and that the XML is more
consistent.
Try pausing to see that the pause button caption still updates.
Convince yourself that there are no other occurances of
`pauseButtonText`.


Reviewers: fatherbushido

Reviewed By: fatherbushido
Subscribers: Vulcan

Differential Revision: https://code.wildfiregames.com/D91
This was SVN commit r19173.
2017-01-26 00:22:38 +00:00
9964bee5bb Change the NetServer Broadcast function to send the given message to clients that are in one of the states specified by the caller.
Thus remove the peculiarity to broadcast to clients that are in the
gamesetup, loading screen or ingame, but not rejoining ones.

Fix "unknown player" errors in the GUI by broadcasting player
assignments to rejoining players too. Fixes #4036.

Differential Revision: D17
Reviewed By: Imarok
This was SVN commit r19171.
2017-01-25 19:04:17 +00:00
f958c6a168 The rest of the structure icons upgrade by wowgetoffyourcellphone. Thanks!
This was SVN commit r19170.
2017-01-25 16:31:32 +00:00
49d86dcd9f Fix a portrait icon reference. Accepted by Enrique.
This was SVN commit r19169.
2017-01-25 15:24:53 +00:00
d10f84a157 Improved structure icons by wowgetoffyourcellphone. Thanks!
This was SVN commit r19168.
2017-01-24 22:47:52 +00:00
528f38f4dd Fixed ptolemaic skirmisher portrait as mercenary
Fixed mauritarian archer portrait as citizen soldier
Fixed judean slingers portrait as citizen soldier
Thanks wowgetoffyourcellphone for the portraits!

This was SVN commit r19167.
2017-01-24 22:03:49 +00:00
90e876f328 Some changes for Ptolemies. Allow training their new champion pikeman in the fortress. Train their heros in civic center instead of fortress. Replace the Nubian archer with the more historically accurate Cretan one. Train mercenary skirmisher at the civic center and the archer at the barrack. Accepted by scythetwirler and elexis.
Differential Revision: https://code.wildfiregames.com/D56
This was SVN commit r19166.
2017-01-24 15:51:00 +00:00
4f01db4831 Split TurnManager classes into individual files per class. Patch by echotangoecho, fixes #4095.
Remove the "Net" prefix from the non-networked classes.
Use variadic macros and mark the client turnmanager as NONCOPYABLE.

Differential Revision: D16
Reviewed By: leper
This was SVN commit r19165.
2017-01-24 02:04:50 +00:00
43c7551202 fix a typo in 8adc6b0a04, noticed by Sandarac
This was SVN commit r19164.
2017-01-23 22:33:21 +00:00
8adc6b0a04 petra: cleanup and improve regicide support, patch by Sandarac, refs #4142
This was SVN commit r19163.
2017-01-23 20:36:12 +00:00
5725542fc4 petra: respond to neutral requests from enemies, patch by Sandarac, refs #4431
This was SVN commit r19161.
2017-01-21 10:59:18 +00:00
8fec942e8a Fix Atlas under macOS Sierra.
We were polling SDL messages from two different threads (by mistake),
and Sierra now refuses to do that.
Tested by Stan, Itms, Fatherbushido, and discussed with Philip for the
code change itself.
Fixes #4408.
Differential Revision: https://code.wildfiregames.com/D42
This was SVN commit r19160.
2017-01-21 09:54:08 +00:00
8813888fe0 Color the garrison panel buttons more nicely
Reviewed by: elexis
Differential Revision: https://code.wildfiregames.com/D52
This was SVN commit r19159.
2017-01-20 11:16:20 +00:00
0901167349 Remove an unused duplicated unit. Accepted by Itms.
Differential Revision: ​https://code.wildfiregames.com/D58
This was SVN commit r19158.
2017-01-20 10:16:12 +00:00
be1a205f91 Add support for const methods in components and make those that can be const const.
Reviewed By: Itms
Differential Revision: https://code.wildfiregames.com/D75
This was SVN commit r19156.
2017-01-20 02:25:19 +00:00
678e082230 Remove the "quit" simulation command and restrict the "set-shading-color" simulation command to AIs,
since they are only useful for AI debugging and counterproductive in
multiplayer mode, refs #3551.

Instead, enable AI developers to exit the game from a new AI API
command,
allowing to batch simulate matches. Refs #2755.

Differential Revision: D65
Reviewed By: leper
Consulted: mimo

This was SVN commit r19155.
2017-01-19 14:45:32 +00:00
13529b04a3 Fix 03ecf8508f. Bug noticed by mimo. Some objects are not instance of Vector3D after deserialization.
This was SVN commit r19154.
2017-01-18 13:25:38 +00:00
5c2495db52 Small improvement in Carthaginian normal map.
Fixed carthaginian market actors.
Fixed gate structure template. Patch by Stanislas69
fixes #2524

This was SVN commit r19153.
2017-01-18 00:51:07 +00:00
3448a98d1f Remove three unused AI helper functions, likely remains of the AEGIS bot removed in 3f1db1ef01.
Reviewed By: mimo
Differential Revision: D74
This was SVN commit r19152.
2017-01-17 20:45:16 +00:00
c791b9ade3 Add the confirm hotkey to the prelobby window
This was SVN commit r19151.
2017-01-17 14:33:26 +00:00
42204dce46 Cleanup of Batch training
This was SVN commit r19150.
2017-01-17 10:41:32 +00:00
b3b47c1718 Avoid recreating the dirtiness grid every turn by swapping. Significantly reduces the number of allocations, and slight speedup (particularly on larger maps). Reviewed by Leper.
Differential Revision: https://code.wildfiregames.com/D70
This was SVN commit r19149.
2017-01-17 07:24:41 +00:00