Commit graph

17170 commits

Author SHA1 Message Date
mimo
61b243fdc6 fixes to the economic tutorial (D194) following 15e2b42525
Reviewed By: Itms
Differential Revision: https://code.wildfiregames.com/D520
This was SVN commit r19628.
2017-05-21 16:41:39 +00:00
fatherbushido
aa4c542926 Fix an oversight noticed by leper in 1558272fd2.
This was SVN commit r19627.
2017-05-21 14:57:41 +00:00
Itms
f0a008c821 Refactor NONCOPYABLE to remove unneeded semicolons. Remove visibility keywords that were hidden in the macro. Patch by echotangoecho.
Reviewed By: Itms
Differential Revision: https://code.wildfiregames.com/D481
This was SVN commit r19626.
2017-05-21 13:11:07 +00:00
wraitii
cde8d503df Fix the building construction rate for multiple units.
Because of a floor operation, tasking another unit to a building could
actually slow the construction down.

Patch by temple.

Differential Revision: https://code.wildfiregames.com/D521
This was SVN commit r19625.
2017-05-21 08:11:34 +00:00
wraitii
3d7784d2af Try to recognise unknown hotkey mappings using SDL2.
This improves our international keyboard until we completely rework the
hotkey system which seems to be quite legacy at this point.

Reviewed by Itms.
Differential Revision: https://code.wildfiregames.com/D303
This was SVN commit r19624.
2017-05-21 08:05:52 +00:00
fatherbushido
5deaa5df53 Fix an oversight in dc17836fe5.
This was SVN commit r19623.
2017-05-21 06:00:13 +00:00
fatherbushido
1558272fd2 Fix some formal issues noticed by elexis in dc17836fe5.
This was SVN commit r19622.
2017-05-21 05:48:05 +00:00
elexis
2d8d082289 Fox templates and portraits for the existing models.
Differential Revision: https://code.wildfiregames.com/D524
Fixes #4580
Patch By: Phormio
This was SVN commit r19621.
2017-05-21 00:49:03 +00:00
elexis
85cfd7effb Remove all spaces from music tracks.
Differential Revision: https://code.wildfiregames.com/D508
Patch By: Phormio
Reviewed By: Vladislav
This was SVN commit r19620.
2017-05-20 22:58:22 +00:00
elexis
7c716918ff Replace the "full games" filter with an "open games" filter and exclude running games from the results (since the use-case is to help players finding a game they can join as a player).
Revert cbc49f43e6 because the reasons for hiding non-open games don't
apply or don't apply anymore:
* The filter doesn't actually prevent unwanted clients to join the
server.
* The host can kick or ban unwanted clients now.
* Many users are interested in joining games as observer (either for the
sake of observing or to meet up with buddies).
 So for many players the first action after entering the lobby was to
uncheck this checkbox.

Differential Revision: https://code.wildfiregames.com/D218
Reviewed By: mapkoc
This was SVN commit r19619.
2017-05-20 22:44:08 +00:00
elexis
d6c028923e Increase size of the civ selection dropdowns so that the scrollbar disappears.
Increase vertical size of the player selection dropdown in the observer
menu.

Differential Revision: https://code.wildfiregames.com/D527
Proposed and reviewed by: temple
This was SVN commit r19618.
2017-05-20 22:19:04 +00:00
fatherbushido
f264552359 Add Macedonian team bonus. Refs #4082. Reviewed by mimo.
Differential Revision: ​https://code.wildfiregames.com/D480
This was SVN commit r19616.
2017-05-20 18:31:19 +00:00
fatherbushido
dc17836fe5 Add barter multiplier for barter prices. They can be altered by technologies or auras. Reviewed by mimo.
Differential Revision: https://code.wildfiregames.com/D478
This was SVN commit r19615.
2017-05-20 18:01:49 +00:00
mimo
d8490b8c2e Petra: gameTypeManager cleanup
Summary:
In regicide, data.garrisonEmergency was not reset when retreating a hero
to a base when the hero couldn't find a place to garrison.
Transfer the stance info to the AI

Reviewed By: mimo
Differential Revision: https://code.wildfiregames.com/D515
This was SVN commit r19614.
2017-05-19 20:28:21 +00:00
leper
aa025b514b Fix out of bounds access in Hotkey.cpp. Patch by echotangoecho.
Differential Revision: https://code.wildfiregames.com/D211
This was SVN commit r19613.
2017-05-19 18:01:22 +00:00
leper
7c88529b45 Call std::terminate() instead of throwing in a destructor.
We don't catch this specific exception, so no behavioural change, but we
do no longer violate the implicit noexcept for destructors in C++11.
(Fixes a GCC6 and VS2015 warning.)

Reviewed By: Itms
Differential Revision: https://code.wildfiregames.com/D416
This was SVN commit r19612.
2017-05-19 17:48:43 +00:00
elexis
3bebd1a21f Replace shark actors with actual sharks on the skirmish map Thessalian Plains (4).
Differential Revision: https://code.wildfiregames.com/D511
Patch By: Phormio
This was SVN commit r19611.
2017-05-19 08:23:37 +00:00
elexis
8cfd494b88 Add selection-dependent gamesetup tooltips for the chosen map, map filter, map size, civilization and population capacity.
The tooltips of the larger mapsizes and higher population capacities
(depending on the number of players) warn the controller of potential
performance issues.

Differential Revision: https://code.wildfiregames.com/D505
Reviewed By: Hannibal_Barca
This was SVN commit r19609.
2017-05-18 20:49:29 +00:00
mimo
1e5757a0ac Petra: cleanup of the 7dd3cf7543 cleanup (to avoid mixing attackManager and gametypeManager stuff)
This was SVN commit r19607.
2017-05-18 17:29:27 +00:00
elexis
4c693589d3 Rating column in the gamelist allowing players to sort by and filter games with players of approximately equal (to have a challenging opponent) or better skill (to learn or become entertained from when observing).
Differential Revision: https://code.wildfiregames.com/D125
Based on patch by: fpre
This was SVN commit r19606.
2017-05-18 11:50:33 +00:00
s0600204
9da0db50ee Revert change to datatype of resource costs in Cost.js made in 52f311da2b
Refs: #3934
Change agreed by: fatherbushido, wraitii
This was SVN commit r19604.
2017-05-18 01:30:01 +00:00
elexis
7a91d330d3 Add GetMicroseconds function to allow microsecond precise timing in the JS GUI.
Differential Revision: https://code.wildfiregames.com/D190
Reviewed By: Vladislav, echotangoecho
This was SVN commit r19603.
2017-05-17 22:10:09 +00:00
elexis
5302e3e1f7 Prevent players and AIs being assigned to the same slot simultaneously in SP and MP if persist-match-settings were enabled
following the wrong move of this clearance from updatePlayerList to
handlePlayerAssignmentMessage.

Differential Revision: https://code.wildfiregames.com/D434
Reviewed By: Imarok
This was SVN commit r19602.
2017-05-17 22:01:23 +00:00
elexis
4bacd6f38e Buff elephant archer after f15abb066c made it slow, 38c7d7224a removed the capturing ability, 30c7a2ef18 removed the resource gathering ability and c279283d82 made it fat.
Double the damage output, HP and cost.
Add armor and metal cost for consistency with the War Elephant.

Differential Revision: https://code.wildfiregames.com/D436
Reviewed By: fatherbushido
Tested By: borg-
Values agreed with: Grugnas, nigel87

This was SVN commit r19601.
2017-05-17 21:55:35 +00:00
s0600204
df89091c48 Show entity upgrades in the Structure Tree
Reviewed By: bb
Trac Tickets: #4079
Differential Revision: https://code.wildfiregames.com/D92
This was SVN commit r19600.
2017-05-17 18:41:23 +00:00
mimo
15e2b42525 New economic tutorial based on triggers, accessible from the "learn to play" button
Reviewed By: elexis
Differential Revision: https://code.wildfiregames.com/D194
This was SVN commit r19599.
2017-05-17 17:33:36 +00:00
mimo
7dd3cf7543 petra captureRelics cleanup following 921c89d3a6
This was SVN commit r19598.
2017-05-17 17:21:05 +00:00
elexis
24de93e39a Sort lobby games by status, then by name when clicking on the name column.
Differential Revision: https://code.wildfiregames.com/D300
Patch By: fpre
This was SVN commit r19597.
2017-05-16 23:44:19 +00:00
mimo
921c89d3a6 Petra: Capture gaia relics
Summary:
Petra will capture gaia relics on occasion. Because the AI has access to
all of the map and all entities in the game, these gaia capture events
have to be spaced out quite a bit to make things fair.

Reviewed By: mimo
Differential Revision: https://code.wildfiregames.com/D333
This was SVN commit r19596.
2017-05-16 17:33:31 +00:00
elexis
8156d297ea Display the minimum, maximum and current value of sliders in the options page and round to at most 2 decimal places.
Differential Revision: https://code.wildfiregames.com/D459
Reviewed By: Vladislav
This was SVN commit r19595.
2017-05-16 16:38:41 +00:00
elexis
29dfcda35f Change the options page dropdown implementation to use a textual identifier instead of the numerical dropdown array index in the config file and code.
Differential Revision: https://code.wildfiregames.com/D402
Patch By: Polakrity
This was SVN commit r19594.
2017-05-16 15:52:01 +00:00
fatherbushido
7cfef7cf9f Tooltip mistake in a589b067a9. Noticed by elexis.
This was SVN commit r19593.
2017-05-16 12:15:08 +00:00
fatherbushido
a589b067a9 Team bonuses for Britons, Gauls and Romans. Reviewed by elexis. Refs #4082.
Differential Revision: https://code.wildfiregames.com/D502
This was SVN commit r19591.
2017-05-16 05:16:41 +00:00
elexis
576754566d Revert the decision from 903460994d to let cavalry units prefer siege engines over human units, because they most often don't reach the siege engines before being massacred by the attackers.
Differential Revision: https://code.wildfiregames.com/D394
Fixes #4543
Refs #4194
Patch By: causative
Reviewed By: Grugnas
Reported By: borg-, ffm
This was SVN commit r19590.
2017-05-16 02:51:02 +00:00
elexis
90beda96f8 Fix atlas clicking following 8f36ca47a1 / D326 by adding the missing clicks property to the wxWidgets SDL event construction.
Differential Revision: https://code.wildfiregames.com/D452
Fixes #4557
Patch By: causative
This was SVN commit r19589.
2017-05-16 00:09:16 +00:00
elexis
2599d0374e Get the index of the hovered element in GUI lists and use it to display item-specific tooltips in the gamesetup for the victory condition, maptype and starting resources.
Differential Revision: https://code.wildfiregames.com/D316
Fixes #3699
Patch By: Vladislav
This was SVN commit r19588.
2017-05-15 21:49:10 +00:00
Imarok
aa302dcb2d Fix whitespace in 202e567492
This was SVN commit r19587.
2017-05-15 19:30:00 +00:00
elexis
d8c0492ddb Fix the readystate following D322 / b4e5858f6d.
Differential Revision: https://code.wildfiregames.com/D487
Reviewed By: Imarok
This was SVN commit r19586.
2017-05-15 19:14:51 +00:00
s0600204
f325452f2d Add missing check of phase techs' tech requirements in Structure Tree.
Reviewed By: elexis
Differential Revision: https://code.wildfiregames.com/D500
This was SVN commit r19585.
2017-05-15 18:56:10 +00:00
Imarok
202e567492 Fix economy and military score
Reviewed by: causative
Differential Revision: https://code.wildfiregames.com/D494
This was SVN commit r19584.
2017-05-15 18:43:38 +00:00
elexis
1eae8d0a95 Fix doubleclicking if the unit died between the clicks following 8f36ca47a1, refs #4414, https://code.wildfiregames.com/D326
Differential Revision: https://code.wildfiregames.com/D469
Patch By: causative
This was SVN commit r19583.
2017-05-15 11:51:01 +00:00
elexis
a73d59720e Add hint to the manual that the batch train size can be changed in the options.
Differential Revision: https://code.wildfiregames.com/D501
Reviewed By: echotangoecho
This was SVN commit r19580.
2017-05-14 22:57:55 +00:00
Itms
62195c28f2 Fix out of range access in CInput, patch by vladislavbelov. Fixes #4570.
Some invalid cursor positions were not checked, resulting in a crash in
Debug mode. This was revealed by e1e4ef0370, refs #4401.

Reviewed By: echotangoecho, Itms
Differential Revision: https://code.wildfiregames.com/D484
This was SVN commit r19579.
2017-05-14 19:02:03 +00:00
fatherbushido
000e39629f Make initialization of phase techs for AI more robust. Refs ae3b66a778. Fix #4573. Reviewed by mimo.
Differential Revision: https://code.wildfiregames.com/D491
This was SVN commit r19578.
2017-05-14 18:01:27 +00:00
mimo
62259e34e4 Petra: Fix missing check for getEntityById, patch by Sandarac
Reviewed By: mimo
Differential Revision: https://code.wildfiregames.com/D496
This was SVN commit r19577.
2017-05-14 09:44:16 +00:00
elexis
d5c9725dc3 Revert the wrong "insufficient permissions to remove an account" error message from 9281aaf25e to the previous "Registration forbidden" which is shown when lobby registrations are disabled or restricted to some IP range.
Differential Revision: https://code.wildfiregames.com/D319
Refs #3047
Reviewed By: scythetwirler, leper
This was SVN commit r19575.
2017-05-14 03:18:21 +00:00
elexis
08b23d0164 Sooner network timeout warnings.
Reviewed By: echotangoecho
This was SVN commit r19574.
2017-05-13 22:52:11 +00:00
elexis
aa5f3e7d32 Fix the most annoying instance of the persist-matchsettings-bugs that prevented players to build the Ptolemian lighthouse in case of previously having selected a map where that template is disabled.
Most recently reported by nigel87.

Differential Revision: https://code.wildfiregames.com/D489
Reviewed By: Grugnas
Refs #3883

This was SVN commit r19573.
2017-05-13 17:15:16 +00:00
mimo
1f1b179202 petra: take restricted classes into account
This patch implements some changes needed to take restricted classes
into account for example for D450, but it does not claim to be complete.
This will have to be fully tested when these restrictions are really
used.
Tested by fatherbushido using D450

Differential Revision: https://code.wildfiregames.com/D473
This was SVN commit r19572.
2017-05-13 15:14:23 +00:00
mimo
fe2e0fa02f follow-up and complement of D446 to adapt garrisoning to the structure attackers
Summary:
- take the healthLevel of the units into account
- take Sandarac comments on D446 into account

Differential Revision: https://code.wildfiregames.com/D468
This was SVN commit r19571.
2017-05-13 15:04:04 +00:00