Commit graph

16895 commits

Author SHA1 Message Date
Itms
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
elexis
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
Imarok
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
leper
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
leper
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
elexis
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
elexis
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
Imarok
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
mimo
9b819645f5 fix typo in 82faae8637
This was SVN commit r19179.
2017-01-28 10:22:03 +00:00
mimo
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
mimo
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
elexis
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
elexis
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
Enrique
f958c6a168 The rest of the structure icons upgrade by wowgetoffyourcellphone. Thanks!
This was SVN commit r19170.
2017-01-25 16:31:32 +00:00
fatherbushido
49d86dcd9f Fix a portrait icon reference. Accepted by Enrique.
This was SVN commit r19169.
2017-01-25 15:24:53 +00:00
Enrique
d10f84a157 Improved structure icons by wowgetoffyourcellphone. Thanks!
This was SVN commit r19168.
2017-01-24 22:47:52 +00:00
Enrique
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
fatherbushido
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
elexis
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
mimo
43c7551202 fix a typo in 8adc6b0a04, noticed by Sandarac
This was SVN commit r19164.
2017-01-23 22:33:21 +00:00
mimo
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
mimo
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
wraitii
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
Imarok
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
fatherbushido
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
leper
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
elexis
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
fatherbushido
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
Enrique
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
elexis
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
Imarok
c791b9ade3 Add the confirm hotkey to the prelobby window
This was SVN commit r19151.
2017-01-17 14:33:26 +00:00
Imarok
42204dce46 Cleanup of Batch training
This was SVN commit r19150.
2017-01-17 10:41:32 +00:00
wraitii
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
fatherbushido
5f859c5784 Don't send MT_Attacked message when an ally help capturing back.
Differential Revision: https://code.wildfiregames.com/D69
This was SVN commit r19148.
2017-01-16 14:17:38 +00:00
fatherbushido
03ecf8508f Remove a useless function in AttackDetection. Accepted by wraitii.
Differential Revision: https://code.wildfiregames.com/D68
This was SVN commit r19147.
2017-01-16 12:19:38 +00:00
wraitii
0a6a42321d Improve cache efficiency of CcmpPathfinder::UpdateGrid substantially. On very large maps, this can be a very substantial improvement (I have measured up to 30ms)
This was SVN commit r19146.
2017-01-16 10:41:35 +00:00
wraitii
ad76352cef Prevent the AI manager from copying the pathfindinder dirtiness grid every turn.
Review by Itms

Differential Revision: https://code.wildfiregames.com/D25
This was SVN commit r19145.
2017-01-16 08:38:31 +00:00
Imarok
df1b542c5a CLeanup the nickNotify in gamesetup
This was SVN commit r19143.
2017-01-15 22:40:59 +00:00
leper
3a85d0b3fa Remove unused parameter from template loading code
Templates should be the same for all players, techs can be used to
provide
different lists of templates if that is needed.

Reviewed By: Itms
Differential Revision: https://code.wildfiregames.com/D25
This was SVN commit r19142.
2017-01-15 18:41:53 +00:00
fatherbushido
ba76f60c53 Fix portraits icon leftovers in templates. Accepted by enrique.
Differential Revision: https://code.wildfiregames.com/D67
This was SVN commit r19141.
2017-01-15 11:56:32 +00:00
fatherbushido
6b9725892e Remove remaining colour occurence in art files as done in b1c4e29ac8. Patch by stanislas69. Refs #4458.
This was SVN commit r19140.
2017-01-14 16:14:00 +00:00
fatherbushido
103a59ec1e Fix a space tab inconsistency detected by python3.
This was SVN commit r19139.
2017-01-13 08:40:54 +00:00
fatherbushido
19e1be6e7b Remove a target moving spread factor for ranged attack. That one was a bit redundant as a moving target has yet a big advantage. Accepted by wraitii.
Differential Revision: https://code.wildfiregames.com/D61
This was SVN commit r19136.
2017-01-12 11:33:25 +00:00
fatherbushido
0706fe8410 Add history tag to Carthaginians units from design docs. Replace a generic one by the specific one. Remove a TBD tooltip.
This was SVN commit r19135.
2017-01-12 10:58:35 +00:00
Enrique
b84be743fa Adds garrisoned variant to carthage super dock. Patch by Stanislas69
Improves carthage market obstruction and rubble actor. Patch by
Stanislas69

This was SVN commit r19134.
2017-01-10 23:08:31 +00:00
fatherbushido
dc1835bb1d Add missing history entries to Macedonian units and set their slinger as mercenary in agreement of design doc.
This was SVN commit r19133.
2017-01-10 20:41:07 +00:00
Enrique
4f7b4e97d8 Improved slinger attack animation.
fixed build animation mallet placement.
fixed iberian helmet to fit new head meshes.
fixed mauryan turbans to fit new head meshes.
fixed persian camel trader prop placement
fixed female carry meat prop placement
fixed tool prop gather grain placement

This was SVN commit r19132.
2017-01-10 19:26:02 +00:00
Enrique
ef7fcd4674 Batch of patches from Stanislas69
Fixes #3813
Refs #2524 and #4440

-Fixes stoyas foundations
-Fixes walls foundations
-Fixes carth superdock foundation
-Fixes cape_chariot variant
-Fixes missing referenced files in #2524

This was SVN commit r19131.
2017-01-10 19:22:54 +00:00
Enrique
0a68ace52d Upgraded Carthaginian market from Stanislas69. Thanks!
This was SVN commit r19130.
2017-01-10 19:17:17 +00:00
Enrique
004c8679d4 Updated unit portraits from wowgetoffyourcellphone. Thanks!
This was SVN commit r19129.
2017-01-10 19:13:47 +00:00