mirrors/0ad
1
0
Fork 2
mirror of https://gitea.wildfiregames.com/0ad/0ad.git synced 2026-07-20 19:23:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
17,350 Commits 1 Branch 39 Tags
dca572fbcd3cdcf3c151bebb07b766e035dbf3ce
Commit Graph

17350 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
mimo e8c6b09c4f Reset the alert of ProductionQueues when ownerShip changes, fixes #4571 
This was SVN commit r19570.
 2017-05-13 14:52:23 +00:00
fatherbushido ae3b66a778 Make phase technology researchable in all captured civic center. Reviewed by elexis. Fix #4572. 
This was SVN commit r19569.
 2017-05-13 13:58:27 +00:00
elexis 57e767ac08 Gamesetup cleanup: Merge two adjacent identical loops in sanitizePlayerData. 
Reviewed By: Imarok
This was SVN commit r19567.
 2017-05-12 18:08:14 +00:00
fatherbushido ac83155197 Remove reference to range in aura description. Patch by Grugnas. 
Differential Revision: https://code.wildfiregames.com/D464
This was SVN commit r19566.
 2017-05-12 17:09:07 +00:00
fatherbushido 5f4d5cdf76 Remove a leftover argument in GetSimulationState call. Refs 00ea7763f7. Reviewed by elexis and echotangoecho. 
Differential Revision: https://code.wildfiregames.com/D479
This was SVN commit r19565.
 2017-05-12 16:20:56 +00:00
Imarok 31a41ab735 Fix warning when quitting the game during loading. Patch by bb. 
Also contains some `StatistcTracker` cleanup.

Differential Revision: https://code.wildfiregames.com/D475
This was SVN commit r19564.
 2017-05-12 14:21:28 +00:00
Imarok 77246af17a Avoid NetClient FSM error when pausing while loading the game. 
Patch by echotangoecho. Closes ec1696ded3. Fixes #4261.

Differential Revision: https://code.wildfiregames.com/D472
This was SVN commit r19563.
 2017-05-12 13:22:29 +00:00
elexis 00c4adfae8 Add missing Hexify call to the OOS dialog in D105 that became required with the hash comparison in JS. Reported by causative. 
Differential Revision: https://code.wildfiregames.com/D476
Reviewed By: leper
This was SVN commit r19562.
 2017-05-12 08:50:20 +00:00
leper 51f7502bb1 Don't move temporaries, so possibly allowing for copy elision. 
Pointed out by clang's -Wpessimizing-move.

Reviewed By: wraitii
Differential Revision: https://code.wildfiregames.com/D421
This was SVN commit r19559.
 2017-05-11 23:24:54 +00:00
elexis 6e549bfed2 Prohibit cheats if cheats are disabled, 
i.e. developer cheats to control enemy units, revealing the map and
promoting units too.

Open the developer overlay only if cheats are enabled (which is always
the case in singleplayer mode and only the case in multiplayer mode if
explicitly enabled).
(This doesn't make it harder for developers to "debug", since they
previously had to remember to disable the rated game setting too. Also
every bug had to be reproduced with the replay either way)

Reverts 3cbbf31173 which reverted 6e0e607b20 (since as of c288278229,
the autostart gamesetup enables cheats too).

Differential Revision: https://code.wildfiregames.com/D455
Fixes #3551
Reviewed By: echotangoecho
Agreed with Itms and Imarok in the last staff meeting.

This was SVN commit r19558.
 2017-05-11 22:49:54 +00:00
elexis c288278229 Enable cheats in autostarted games because the JS gamesetup enables them in singleplayer and because the autostarted multiplayer mode relies on the change-perspective feature to control players. 
Differential Revision: https://code.wildfiregames.com/D453
Refs #2676
Reviewed By: echotangoecho
This was SVN commit r19557.
 2017-05-11 22:32:41 +00:00
elexis 3cd2055ca7 Use self-closing tags for empty elements everywhere (refs d21c0026ec and 06bbcd6b76). 
This was SVN commit r19556.
 2017-05-11 22:11:25 +00:00
elexis 9ef3447b2a Fix missing escaping in 06bbcd6b76. Reported by Vladislav, patch by Phormio. 
This was SVN commit r19555.
 2017-05-11 21:37:27 +00:00
elexis d074c4d809 Use GUISize constructor instead of string concatenation when only passing absolute values. 
Differential Revision: https://code.wildfiregames.com/D471
Reviewed By: bb
This was SVN commit r19554.
 2017-05-10 22:29:55 +00:00
elexis 3d8fd6e740 Fix the position of a treasure which couldn't be picked up on the skirmish map Mediterranean Cove. 
Patch By: Phormio
Fixes #4566

This was SVN commit r19553.
 2017-05-10 16:53:41 +00:00
elexis bbc7852df8 Use let keyword for cmpTrigger consistently, so that this reference to the component before deserialization can't be reused inside the Trigger component after deserialization which would cause an OOS on rejoin / savegame loading as experienced prior 53570da065. 
Differential Revision: https://code.wildfiregames.com/D195
Refs #4310, 53570da065, d124b32f6a
Reviewed By: Sandarac
This was SVN commit r19552.
 2017-05-10 14:03:51 +00:00
fatherbushido 11f90549c7 Add missing roundings for garrisoned arrows tooltips. Reviewed by elexis. 
Differential Revision: https://code.wildfiregames.com/D470
This was SVN commit r19551.
 2017-05-10 13:04:35 +00:00
fatherbushido bba42de375 Add Iberian heroes auras. Patch by Grugnas. 
Differential Revision: https://code.wildfiregames.com/D397
This was SVN commit r19550.
 2017-05-10 11:32:26 +00:00
elexis 51655081d8 Botswanan Haven random map. 
Differential Revision: https://code.wildfiregames.com/D362
Patch By: Hannibal_Baraq
This was SVN commit r19548.
 2017-05-09 20:09:18 +00:00
mimo d1108516af petra: adapt garrisoning to the attackers 
Summary: When a structure with arrow was attacked, it was garrisoned
independently of the attacker, which was not the best answer when
atacked by a ram for example. This patch tries to adapt the garrisoning
to the attackers.

Reviewed By: Sandarac
Differential Revision: https://code.wildfiregames.com/D446
This was SVN commit r19547.
 2017-05-09 17:53:59 +00:00