1
0
forked from 0ad/0ad
Commit Graph

15431 Commits

Author SHA1 Message Date
8859f33b38 Rename PickFriendlyEntitiesOnScreen to PickPlayerEntitiesOnScreen.
Rename PickFriendlyEntitiesInRect to PickPlayerEntitiesInRect.
Rename PickSimilarFriendlyEntities to PickSimilarPlayerEntities.
Add comment.
Refs #3215.

This was SVN commit r17622.
2016-01-10 14:47:09 +00:00
4a9d6d2e5f Update all OS X libraries to their latest versions (exlcuding currently unused libjpeg, see #2828). Some also include security fixes. Fixes #3721.
Also disable unused wxwidgets features. Patch by trompetin17, refs
#2924.
Tested by wraitii.

This was SVN commit r17621.
2016-01-10 13:23:25 +00:00
893ca29723 Allow 10 clients to conncet to the server by default (allows 8 players and 2 observers). Refs #3254.
This was SVN commit r17620.
2016-01-10 01:06:07 +00:00
ead85b1572 Update the control-all-units checkbox when changing the perspective and onSimulationUpdate so that it always shows the correct value.
This was SVN commit r17619.
2016-01-10 00:59:28 +00:00
9a623a8e00 Style fixes.
This was SVN commit r17618.
2016-01-09 23:01:07 +00:00
6b710f35b0 Show the selection panels to observers / in replays, fixes #3731.
This allows observers to see the training queue, researched techs, unit
stance, constructable buildings, garrisoned units, market prices etc.
for all players without changing the perspective.
All buttons are disabled if the user isn't allowed to control the
affected player.
Notice updateUnitCommands() fills out the panel differently in case of
selecting an allied building.
Extends the GUIInterface methods "GetNeededResources",
"CheckTechnologyRequirements" and "IsTechnologyResearched" to optionally
take a different player-argument.

This was SVN commit r17617.
2016-01-09 22:01:08 +00:00
9b922ebadd Remove invisible character introduced in deaa224785.
This was SVN commit r17616.
2016-01-09 12:12:42 +00:00
629e73a768 Fix a compiler warning.
This was SVN commit r17615.
2016-01-09 09:52:51 +00:00
491cba314a Translate some notification messages. Refs #3665.
This was SVN commit r17614.
2016-01-08 23:22:45 +00:00
caa81a1d31 Remove garrison code duplication.
This was SVN commit r17613.
2016-01-08 23:02:26 +00:00
deaa224785 Fix some Gallic leader names, based on historic_bruno's suggestions. Fixes #3675
This was SVN commit r17612.
2016-01-08 20:12:25 +00:00
87a93b2498 Add version command line option. Fixes #2965.
This was SVN commit r17611.
2016-01-08 19:35:33 +00:00
b4f187b8d4 Defeat the player if he/she has no more units, nor buildings that can train units. Fixes #3229.
This was SVN commit r17610.
2016-01-08 12:21:40 +00:00
5b60f2d1f6 Display the buildrate of foundations in the tooltip. Patch by bb, fixes #3395.
This was SVN commit r17609.
2016-01-08 11:53:48 +00:00
e1e4a00ad7 Enable sky by default. This is usually not needed during gameplay (no sky visible), but it is with cinematic, committed in 89aef0b6eb, where camera can point to the sky.
Can still be disabled in game options menu.
Refs: #3301.

This was SVN commit r17607.
2016-01-07 12:38:43 +00:00
1cc1ba2b17 Fix non-visual replaymode. Refs #3301 (cinematic camera). Patch by Vladislav. Bug reported by eternaf.
This was SVN commit r17606.
2016-01-06 21:40:59 +00:00
a7743e95b9 cleanup of unused counters
This was SVN commit r17605.
2016-01-06 21:15:58 +00:00
e0a1e2beb1 Session cleanup.
Don't send the simstate as an argument of reportGame().
Eliminate a for-each loop.
Remove some superfluous comments.

This was SVN commit r17604.
2016-01-05 03:02:59 +00:00
b18cd3254c Test FixedVector{2,3}D script conversions, and test calling functions of the prototypes.
Also ENSURE that the given value identifier is actually present in the
cache instead of creating one if it is not.

This was SVN commit r17603.
2016-01-04 21:41:40 +00:00
4c4beb8450 cleanup
This was SVN commit r17602.
2016-01-04 18:10:04 +00:00
9f334036ef Do not align object properties.
Do not construct objects if they only contain two atomic elements.
Revert getDisconnectReason so as to have a custom message for the error
case. Add a warning.

This was SVN commit r17601.
2016-01-04 17:59:12 +00:00
ab4668ac79 Remove legacy error codes from strings.
This was SVN commit r17600.
2016-01-04 17:58:28 +00:00
7a3f011587 Fix a typo.
This was SVN commit r17599.
2016-01-04 17:05:43 +00:00
5033fd6cbf Some const and fix the indentation.
This was SVN commit r17598.
2016-01-04 17:05:39 +00:00
24b14fe201 allow the AI to build near walls (but not gates), fixes #3725
This was SVN commit r17596.
2016-01-03 21:04:23 +00:00
89aef0b6eb Cinematic camera core functionality. Patch by Vladislav Belov.
Based on existing code that was still around from an old(not working)
implementation.
Supports basic control from trigger scirpts (queue, start and stop
camera paths) and works in multiplayer.

This was SVN commit r17594.
2016-01-03 12:41:04 +00:00
d313a1934a Code style cleanups for CinemaPath in preparation for the cinematic camera patch.
Refs #3301

This was SVN commit r17593.
2016-01-02 20:14:14 +00:00
a32aa3b6cf petra: use the proper attack number when deserializing, refs #3720
This was SVN commit r17592.
2016-01-02 18:16:50 +00:00
036f985017 Add missing semicolons.
Update timestamp.

This was SVN commit r17591.
2016-01-02 18:12:02 +00:00
8773d816ae add specific regeneration when idle, fixes #3606, patch by Guuts
This was SVN commit r17590.
2016-01-02 18:10:10 +00:00
1d00164b6b petra: make better use of the new fishing tech
This was SVN commit r17589.
2016-01-02 17:50:56 +00:00
d5d60d53ed Replace JS_ASSERT (which is renamed to MOZ_ASSERT in SpiderMonkey 38) with TS_ASSERT, since the former was used for no apparent reason.
This was SVN commit r17588.
2016-01-01 21:28:25 +00:00
9281aaf25e Map more specific messages from the Gloox documentation to registration results and stanza errors in the lobby code. Also, don't request translation of more arcane errors. Fixes #3047
This was SVN commit r17587.
2016-01-01 18:38:50 +00:00
371a41c216 seems that line was missing, with the result that garrisoned units sent a TerritoryPositionChanged message each turn
This was SVN commit r17586.
2016-01-01 17:45:53 +00:00
7c89cfb3ba fix typo in petra debug outputs
This was SVN commit r17585.
2016-01-01 17:41:49 +00:00
9f9db45a03 Fix broken feedback display logic and broken error handling from ccb534259d. Additionally, streamline logic in prelobby.js and remove an unexplained check in lobby.js added by 76a1a84a58.
This was SVN commit r17584.
2016-01-01 17:18:17 +00:00
ccb534259d Major lobby cleanup.
Create an object holding the handling of all netmessage types.
Display private messages sent by moderators.

Details:
 Switch back the second and third argument of CreateSimpleMessage, so it
relates again to the switch/object.
 Reduce the dimension/nesting of the object/switch from three to two.
 Hence remove the useless "standard" and "internal" value send in the
text field.
 Rename CreateSimpleMessage to CreateGUIMessage
 Use the property "level" instead of "text" for "connect" and
"disconnect".
 Remove the handling of the "connect" event in lobby.js, since it is
never called.
 Translate the disconnect event.
 Add comments and explicit checks to handleMessage and handleMUCMessage
to make obvious where they differ.
 Remove the "message" property from those GUI messages, since it should
just use "text".
 Move the login-fail handling to JS.
 Remove useless sprintf calls from warning messages.
 Inline some variables.
 Add missing semicolons.

This was SVN commit r17581.
2015-12-31 17:08:23 +00:00
2bf194134b Repairrate cleanup. Refs #3395, patch by bb.
Rename ratio to rate.
Simplify translation.
Round in GUI, not simulation.
Check for div/0.
Fix wrong variable name in test_GuiInterface.js.

This was SVN commit r17580.
2015-12-31 15:20:12 +00:00
75eed7cc79 Missing semicolons, two wrong commata, jshint ftw.
This was SVN commit r17579.
2015-12-31 14:02:59 +00:00
a144ec7e08 Indentation corrections and other code style fixes in preparation for the cinematic camera patch.
Refs #3301

This was SVN commit r17578.
2015-12-31 13:40:56 +00:00
460f17e6f7 Fix mauryan pillar of ashoka GUI panel bug. Refs #3639.
It can only be built while ashoka is alive.
Previously the structure was selectable from the panel but not placable
while he was absent.

This was SVN commit r17577.
2015-12-31 12:19:45 +00:00
f7a262fa4a Remove trailing whitespace. Based on patch by otero, refs #3268.
This was SVN commit r17576.
2015-12-31 11:45:13 +00:00
8d9cfd66b8 Reorganize code in different files in prepartion for the cinematic camera patch (by Vladislav Belov).
Refs #3301

This was SVN commit r17575.
2015-12-30 21:16:35 +00:00
969008befd Add shebang to ease running the script as a program.
Update replay command adding needed -mod=public.

This was SVN commit r17574.
2015-12-30 14:29:28 +00:00
36c08193ba optimizes range queries, fixes #3717
This was SVN commit r17573.
2015-12-30 13:44:51 +00:00
082a32802b Refresh the diplomacy and trade window in case the playerselection (change perspective) has changed.
This was SVN commit r17572.
2015-12-30 12:10:11 +00:00
aa8e0159a0 Only regain health while idle (Battlefield Medicine tech). Fixes #3606, patch by Guuts.
This was SVN commit r17571.
2015-12-30 11:37:50 +00:00
6cdd99474a Fix fail.
This was SVN commit r17570.
2015-12-30 11:17:50 +00:00
7648b4f482 Gamesetup and session cleanup.
Convert network commands to an object and simplify the formating of
system chat messages.

This was SVN commit r17569.
2015-12-29 15:29:24 +00:00
46a42c04ef Gamesetup message cleanup.
Transform switch-statements into objects.
Make them more consistent, in particular the kick/ban and
ready-messages.
Also colorizes the playername in disconnect messages.
Fix a wrong comment in the network code and remove a duplicate check
(AIs).

This was SVN commit r17568.
2015-12-29 14:45:53 +00:00