1
0
forked from mirrors/0ad
Commit Graph

16878 Commits

Author SHA1 Message Date
mimo 00aa8b3c02 switch to the new bribe icon
This was SVN commit r19279.
2017-03-06 22:42:03 +00:00
Pureon 8f01868cce Bribes icon
This was SVN commit r19278.
2017-03-06 22:13:07 +00:00
Pureon a6bd32c0c0 Updated Wonder structure icon
This was SVN commit r19277.
2017-03-06 21:52:03 +00:00
mimo caabffd70a create maps/tutorials folder and move the starting_economy_walkthrough map there for the tutorial patch (D179) as these maps are currently useless (tutorialAI broken) and phabricator does not deal correctly with such changes
This was SVN commit r19276.
2017-03-06 21:29:45 +00:00
mimo 21798caa45 petra support of disabled technologies, fixes #4500
Reviewed By: Sandarac
Differential Revision: https://code.wildfiregames.com/D178
This was SVN commit r19275.
2017-03-06 19:23:18 +00:00
elexis 46eb20c5ea Ships should not heal units. Patch Stan, fixes #4398.
This was SVN commit r19274.
2017-03-06 14:18:21 +00:00
elexis 0b20e8c5f0 Private chat hotkey.
Patch by: OptimusShepard
Differential Revision: https://code.wildfiregames.com/D163
Fixes #4422.

This was SVN commit r19272.
2017-03-04 21:24:14 +00:00
elexis 08fbf223f6 Unify random integer and float helper functions of GUI, Simulation and AI.
Patch By: bb
Differential Revision: D121
Refs: #4326

Removes the Random.js simulation helper and randomFloat function of the
random map scripts library.
Adds randomIntInclusive and randomIntExclusive to make the calls more
readable and fix and prevent off-by-one mistakes.
Adds randBool and use it in an AI occurance. It will be used in many
places by the random map scripts.
Use the pickRandom function introduced in 3c56638e8b in more applicable
occurances.
Replace remaining occurances of Math.random() with the new functions to
easily test completeness.

Cleanup of the random map script functions will come in a separate
commit.

This was SVN commit r19270.
2017-03-03 21:13:10 +00:00
mimo 487737b407 petra: fix an undefined variable, and remove some unneeded array conversion
This was SVN commit r19269.
2017-03-03 17:35:35 +00:00
elexis 380a429fc9 Move ingame time and ceasefire timer code from gui/common/ to gui/session/.
Use an array instead of string concatenation to avoid duplication and to
enforce newlines on the syntax layer.
Move closeDiplomacy and toggleDiplomacy to openDiplomacy.

Differential Revision: https://code.wildfiregames.com/D183
Reviewed By: bb
This was SVN commit r19268.
2017-03-03 15:12:50 +00:00
elexis 399ba92058 Update the Offline hint in the selection panel immediately when a player rejoins or disconnects instead of waiting for the next turn.
Differential Revision: https://code.wildfiregames.com/D182
Reviewed By: Imarok
This was SVN commit r19266.
2017-03-03 00:10:40 +00:00
elexis e75fc5080d Display a phase name tooltip in the structure tree.
Remove duplication and use ES6 startsWith instead of substr.

Differential Revision: https://code.wildfiregames.com/D110
Reviewed By: s0600204
This was SVN commit r19265.
2017-03-03 00:04:38 +00:00
scythetwirler 17068bbf82 Update Lobby Bot README.
Reviewers: Itms

Reviewed By: Itms
Differential Revision: https://code.wildfiregames.com/D79
This was SVN commit r19264.
2017-03-02 19:19:45 +00:00
elexis 38aefa96d4 Remove Iberian walls from Polar Sea, make debug messages optional and make wolves ignore sheep in their initial attack.
Start the first wave minute 5 instead of 3 so that players have more
time to invest their initial wood.
Add two missing semicolons.

Differential Revision: https://code.wildfiregames.com/D184
Reviewed By: Hannibal_Barca
This was SVN commit r19263.
2017-03-02 18:50:19 +00:00
mimo aadf9d70f6 Petra: improve dynamic management of guard units
Summary:
Petra will not add guards when it has a low population, and will remove
any citizen-soldier guards so they can be used for other tasks.
Petra will also use a healer queue for training healer guards, and this
is done mainly so that Petra doesn't clog the villager queue with
healers, as villages should always have a higher priority. Also this
queue could be used in the future for training healer units for other
purposes.

Patch by Sandarac

Differential Revision: https://code.wildfiregames.com/D165
This was SVN commit r19262.
2017-03-02 18:37:40 +00:00
mimo c5d515721d add some missing semicolon
This was SVN commit r19261.
2017-03-02 18:12:22 +00:00
elexis 716af19f1c Add a GUI notification when the ceasefire ended so that devs and modders can do fancy things with that event and
use it to fix an oversight in 1022619d98 (the diplomacy dialog wasn't
updated).

Differential Revision: https://code.wildfiregames.com/D181
Reviewed By: mimo
This was SVN commit r19260.
2017-03-02 18:02:59 +00:00
fatherbushido 89e9c90ebc Unit test for VisionSharing component.
Summary: Following D117

Test Plan: -

Reviewers: mimo, Itms

Reviewed By: Itms
Subscribers: elexis, Vulcan

Differential Revision: https://code.wildfiregames.com/D170
This was SVN commit r19258.
2017-03-02 09:13:03 +00:00
mimo 1022619d98 cleanup of the updateDiplomacy functions
Summary: Following d9d1f1bbeb the diplomacy window is updated on each
tick, so we can remove the old updateDiplomacy function which now only
updates the player data, and rename updateDiplomacyPanel to
updateDiplomacy for consistency with other windows.

Reviewed By: elexis
Differential Revision: https://code.wildfiregames.com/D172
This was SVN commit r19257.
2017-03-01 20:15:12 +00:00
elexis 3be6460e88 Remove a TODO which was fixed by f3e4e619bc / D164.
This was SVN commit r19256.
2017-03-01 11:21:24 +00:00
mimo b80ea8bf07 Fix ambiguous tooltip in the trade window help
Reviewed By: Gallaecio
Differential Revision: https://code.wildfiregames.com/D168
This was SVN commit r19255.
2017-02-28 22:27:31 +00:00
elexis 79fb493da3 Polar Sea random map script.
Based on map by Hannibal Baraq.
Differential Revision: https://code.wildfiregames.com/D156
Map generation reviewed by FeXoR
Trigger Script and UnitAI change reviewed by Sandarac
Environment settings reviewed by niektb and wowgetoffyourcellphone

This was SVN commit r19254.
2017-02-28 20:53:51 +00:00
mimo 0c058d7d05 AddSpy should always return something
Reviewed By: fatherbushido
Differential Revision: https://code.wildfiregames.com/D175
This was SVN commit r19253.
2017-02-28 19:53:24 +00:00
Imarok e07b02980b Merge player caption and label in replay menu
Reviewed by elexis

https://code.wildfiregames.com/P29

This was SVN commit r19252.
2017-02-28 12:25:48 +00:00
Imarok cd1b190938 Some small replaymenu gui fixes
Reviewed by: elexis
Differential Revision: https://code.wildfiregames.com/D85
This was SVN commit r19251.
2017-02-28 12:06:37 +00:00
elexis 39fcd1d031 Implement clientside kick/ban support for the lobby.
Displays a chat notification for all lobby clients if a client is kicked
or banned, pop up a message box for the affected one, including the kick
reason.
Clean the player- and gamelist upon disconnect and disable the control
elements.

Reviewed By: Imarok
Differential Revision: https://code.wildfiregames.com/D116
This was SVN commit r19250.
2017-02-28 11:16:46 +00:00
elexis e14ad3c771 Focus camera on the spy after bribing it.
Reviewed By: mimo, Imarok
Differential Revision: https://code.wildfiregames.com/D169
This was SVN commit r19249.
2017-02-27 21:14:47 +00:00
Imarok 52d5c62f61 Fix oversight in 5f8f7bae20
Spotted and reviewed by elexis

This was SVN commit r19248.
2017-02-27 20:36:04 +00:00
mimo d9d1f1bbeb Add spying to the game
Summary:
With c2d0327af9 we can now add spying into the game: you have first to
research a tech (available in phase 3, espionage), and then you can
bribe a random unit (defined as Bribable in its template) from a chosen
player and share its vision during 15s.
There is also an option in the gamesetup to disable this feature,
analoguous to the treasure disabling option.
In the current version, only traders (land and naval ones) are
bribables.
Reviewed By: Itms, elexis
Differential Revision: https://code.wildfiregames.com/D117
This was SVN commit r19247.
2017-02-27 18:17:40 +00:00
mimo f3e4e619bc RangeManager returns Gaia entities in GetNonGaiaEntities
refs #4495
Reviewed By: leper, elexis
Differential Revision: https://code.wildfiregames.com/D164
This was SVN commit r19245.
2017-02-26 10:26:35 +00:00
elexis b6e9514029 Remove the (only) inconsistent UnitMotion walk speed entry in the civ specific unit templates (cavalry) and an unneeded one (ship).
Patch by: Grugnas
Differential Revision: https://code.wildfiregames.com/D162
This was SVN commit r19244.
2017-02-26 07:27:16 +00:00
leper b062fbef17 Stop relying on the internal structure of the current Trader component.
Get the required information by returning it in the proper places.
Also clean up some pointless modulo operations.
This code is pulled out of the Silk Road code (refs #4314).

Reviewed By: mimo
Differential Revision: https://code.wildfiregames.com/D161
This was SVN commit r19243.
2017-02-24 21:59:23 +00:00
mimo 360ba27865 Cleanup of CCmprangeManager
Summary: Following discussions in https://code.wildfiregames.com/D60 the
use of u8 to store each boolean has been cleanup up. Now only one u8 is
used, thus reducing the size of the struct.

Reviewed By: leper
Differential Revision: https://code.wildfiregames.com/D101
refs #3834

This was SVN commit r19242.
2017-02-24 19:15:54 +00:00
mimo b6d2fad596 Petra: assign guards to the hero in regicide games
Summary:
Petra will assign military units as guards to the hero in the regicide
victory condition, preferring any available Champion units.

Also this diff fixes a broken loop through a Map in D140/a443bcfa65 that
was introduced when switching `criticalEnts.guards` from a Set to a Map.

Patch by Sandarac

Differential Revision: https://code.wildfiregames.com/D157
This was SVN commit r19241.
2017-02-24 18:26:53 +00:00
leper a0a0895a12 Pass some strings and a vector as const refs.
Reviewed By: Imarok
Differential Revision: https://code.wildfiregames.com/D160
This was SVN commit r19240.
2017-02-24 17:02:10 +00:00
leper 1aa5ecb8a7 Remove entity if spawning fails.
Reviewed By: fatherbushido
Differential Revision: https://code.wildfiregames.com/D159
This was SVN commit r19239.
2017-02-24 15:41:19 +00:00
elexis b2c3fc83da Nuke session/utility_functions.js since the file is much shorter than the others and since the functions are not logically related.
Slight cleanup while moving the affected code.

Differential Revision: https://code.wildfiregames.com/D108
Reviewed By: shookes
This was SVN commit r19238.
2017-02-23 23:34:35 +00:00
elexis fb6e694fdd Show the tribute chat notification if a team member sends to another and if teams are locked. Fixes #4308.
Add a new options panel for the chat notifications (attack, barter,
tribute), so that players and observers can disable them if they appear
too noisy.

Patch By: Sandarac
Differential Revision: https://code.wildfiregames.com/D106
This was SVN commit r19237.
2017-02-23 19:35:55 +00:00
elexis 2c86b54838 Remove non-functional shallow generation code from the Unknown random maps.
The code paints far below the waterheight and the potential shallow
generation on that central river variation is done by the passageMaker
call some lines above.

Reviewed By: bb
(on #0ad-dev today)

Also add a declaration forgotton in 6036b48c1d.

This was SVN commit r19236.
2017-02-22 22:49:21 +00:00
leper 5e5b5be656 Improve component cache lookup performance slightly.
We do not need iteration order, and this makes this explicit.

Reviewed By: echotangoecho
Differential Revision: https://code.wildfiregames.com/D82
This was SVN commit r19235.
2017-02-22 19:27:58 +00:00
elexis e1e4ef0370 Add UpdateAutoScroll calls to some events where they were missing. For example when deleting, cutting, pasting, autocompleting or doubleclicking text. Patch by Vladislav, fixes #4401.
This was SVN commit r19234.
2017-02-22 15:28:09 +00:00
elexis baea68def2 Copy the victory and defeat icons, so that they can be replaced easily by artists without changing the code or even looking at it.
Differential Revision: https://code.wildfiregames.com/D131
Reviewed By: leper
This was SVN commit r19233.
2017-02-22 03:50:05 +00:00
mimo 3894902bec Check the capturePoint state when diplomacyChanged, fixes #4491
Reviewed by elexis

This was SVN commit r19232.
2017-02-21 20:42:28 +00:00
elexis 7536afe2ee Fix lineendings of new files added in recent months.
This was SVN commit r19231.
2017-02-21 01:26:12 +00:00
mimo fa257c285b Petra: cleanup of the gameTypeManager (follow up of a443bcfa65)
Patch by Sandarac
Differential Revision: https://code.wildfiregames.com/D149
This was SVN commit r19230.
2017-02-20 18:13:04 +00:00
Imarok ef46059796 Splash Damage shape tooltip
Reviewed by: elexis
Differential Revision: https://code.wildfiregames.com/D142
Fixes #4328

This was SVN commit r19229.
2017-02-20 15:39:36 +00:00
mimo d0224c913e petra: finetuning of builder number
This was SVN commit r19228.
2017-02-19 16:06:07 +00:00
mimo 997d0fb6ee petra: fix a bug preventing petra to build additionnal markets if its second market was destroyed while still a foundation
This was SVN commit r19227.
2017-02-14 17:36:58 +00:00
mimo a443bcfa65 Petra: assign guards to wonders in wonder games
Patch by Sandarac
Differential Revision: https://code.wildfiregames.com/D140
This was SVN commit r19226.
2017-02-14 17:21:54 +00:00
elexis e0f7578fbe Ensure unique client GUIDs. Patch by sbirmi, fixes #3949.
Two clients chosing the same GUID is highly unlikely, yet possible.
A malicious client chosing an existing GUID would have resulted in
unassigning the player with that GUID.

This was SVN commit r19225.
2017-02-14 16:54:34 +00:00