dallasgroot/0ad
1
0
Fork 0
mirror of https://gitea.wildfiregames.com/0ad/0ad synced 2026-07-04 05:55:47 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions
16271 commits 1 branch 39 tags 169 MiB
Commit graph

10380 commits

Author SHA1 Message Date
elexis
a214f83017 Trader cleanup. 
Remove unused required goods.
Won't be used since setting the goods individually for every trader is
overkill.

This was SVN commit r18393.
 2016-06-16 20:54:31 +00:00
elexis
7c9c715ddc Tech tree cleanup. 
Newlines.
Eliminate deprecated for each.
One or two simplifications.

This was SVN commit r18392.
 2016-06-16 20:26:36 +00:00
elexis
a874b3c1c3 Colorize playernames in the kick/ban chat notification, refs #3241. 
This was SVN commit r18391.
 2016-06-16 17:13:02 +00:00
sanderd17
450973a624 Clean up some code-style issues reported by leper 
This was SVN commit r18390.
 2016-06-16 14:51:12 +00:00
elexis
ed7924f9ca Session GUI cleanup 
Use arrow functions.
Inline exchangeResources which was defined in the wrong file.
Remove unused selectRequiredGoods. Related code should be removed likely
too.
Add missing translate.

This was SVN commit r18389.
 2016-06-16 01:08:36 +00:00
elexis
8aea8d0849 Replace magic number with a readable string, refs #3436. 
This was SVN commit r18388.
 2016-06-16 00:40:21 +00:00
mimo
f25921ba24 improve 2392f6fe8e as these checks are also done in Commands.js, thanks to leper 
This was SVN commit r18387.
 2016-06-15 21:20:04 +00:00
mimo
6da94fef96 petra cleanup, spotted by leper 
This was SVN commit r18386.
 2016-06-15 21:06:09 +00:00
elexis
ed225e1fc4 Chat cleanup, refs #3870. 
Remove toggleChatWindow which duped openChat and closeChat.
Toggling the chat window with hotkeys is pointless due to the focus.
Inline setTeamChat.
Add some newlines, 2 missing semicolons and remove unneeded comments.

This was SVN commit r18384.
 2016-06-15 16:54:16 +00:00
elexis
8302eeaf73 Rest of the previous commit. 
This was SVN commit r18383.
 2016-06-15 16:16:55 +00:00
elexis
0ce02441ee Simulation cleanup 
Use QueryPlayerIDInterface to remove duplication as suggested by leper.
Remove its duplicate GetPlayerComponent.
Add IsOwnedByHelper and IsOwnedByEntityHelper to remove duplicated ally
check functions.
Remove unused function GetPlayerFilter from 17c473f2f3.
Remove unused variables and access to undefined ones identified using
jshint.
Rename cmpPlayerMan.

This was SVN commit r18382.
 2016-06-15 16:13:08 +00:00
elexis
997ea01b2b Fix typo in 366085e037 as reported by mimo. 
This was SVN commit r18380.
 2016-06-14 21:29:37 +00:00
elexis
8d9255eaee Lobby cleanup. 
Remove duplicate assignments in updateGameSelection.
Add function senderFont to remove duplication.
Add newlines to reduce line length and have properties of different
objects start on the same level of indentation.
Use logical OR instead of ternary in two occurances (mapTypeIdx).

This was SVN commit r18377.
 2016-06-14 13:28:54 +00:00
elexis
b65594832d Lobby cleanup. 
Use let instead of var.
Merge redundant assignment in updateSubject.

This was SVN commit r18376.
 2016-06-14 12:34:46 +00:00
elexis
fb5e738920 Lobby cleanup. Patch by scythetwirler, refs #3865. 
Replace an ugly workaround of ccb534259d with a proper check.

This was SVN commit r18375.
 2016-06-14 12:17:37 +00:00
elexis
949f22b67d Victory check cleanup. 
Use let instead of var.
Add newlines and a missing semicolon.
Remove an excess semicolon.

This was SVN commit r18374.
 2016-06-14 11:18:28 +00:00
elexis
62061557db Host on arbitrary UDP ports. Patch in cooperation with Imarok, fixes #3575. 
This was SVN commit r18372.
 2016-06-13 16:56:14 +00:00
elexis
7b655b7ea6 Implement multiplayer dialog retries, fixes #4035, refs #3575. 
Cleanup:
Move all code to hide elements to switchSetupPage.
Remove nasty second argument from switchSetupPage by just hiding every
page.
To avoid another state variable, immediately set g_IsConnecting to true
by calling startConnectionStatus when trying to host.
Use .some instead of a loop.

This was SVN commit r18371.
 2016-06-13 14:29:52 +00:00
elexis
320798f901 Don't select "everyone" but the previously selected chat addressee when someone connected or disconnected. Fixes #3956. 
This was SVN commit r18369.
 2016-06-12 21:11:01 +00:00
sanderd17
929711febb Fix skirmish entities to use Hellenic actors after removing the Athenian duplicates. 
This was SVN commit r18367.
 2016-06-12 15:13:09 +00:00
elexis
6e2106edd8 Fix whitespace, refs #3000. 
This was SVN commit r18365.
 2016-06-12 13:54:00 +00:00
elexis
38c7d7224a Elephants are not expected to capture buildings. 
This was SVN commit r18363.
 2016-06-11 16:07:28 +00:00
elexis
a0960f4f89 Show the player color and name of units from other players garrisoned in allied buildings. Fixes #4052. 
This was SVN commit r18362.
 2016-06-11 15:02:34 +00:00
elexis
d7d1d8ccb5 Implement buttons for up to 10 heroes. Patch by Clockwork-Muse, fixes #3000. 
This was SVN commit r18361.
 2016-06-11 13:46:04 +00:00
FeXoR
759aaa2264 Fixes a bug introduced in 0bf90da597 that prevents entity placement on some rectangular maps e.g. Phoenician Levant and Corsica vs Sardinia. Also fixes a typo in the Phoenician Levant .js and .json files. Fixes #4012 
This was SVN commit r18360.
 2016-06-11 11:16:07 +00:00
elexis
ab9cef172b Savegame cleanup. 
Implement loading of multiplayer savegames that were created by
observers.

This was SVN commit r18359.
 2016-06-11 00:30:11 +00:00
elexis
c94cd66a57 Savegame cleanup. 
Remove the player assignments altogether (506350d6fa) as the C++ part
already saves the playerID.
Grab the playerID directly from the game instead of passing it around
needlessly.

This was SVN commit r18357.
 2016-06-10 19:04:57 +00:00
elexis
6ba90a2555 Session cleanup. 
Move message polling code from onTick to messages.js and blend it in.

This was SVN commit r18356.
 2016-06-10 13:17:47 +00:00
elexis
506350d6fa Savegame, session and gamesetup cleanup. 
Don't save the player assignments to savegames as
the GUIDs are outdated and the GUI data only applies to the player that
saved the game.
Remove unneeded argument from getPlayerData.
Remove invalid (ready should be status) and unneeded playerAssignment
data when selecting a map in singleplayer mode.
Show filenames of saved games in the debug log.

This was SVN commit r18355.
 2016-06-10 13:03:13 +00:00
mimo
a792503cab completes the ai adaptation to cost multipliers, fixes #4003 
This was SVN commit r18353.
 2016-06-09 19:28:54 +00:00
mimo
dd823dd572 ai cleanup 
This was SVN commit r18352.
 2016-06-09 19:25:40 +00:00
elexis
91e4ac58e3 Ensure in the simulation that locked teams and last man standing aren't enabled simultaneously. Suggested by leper, refs #3970. 
This was SVN commit r18348.
 2016-06-09 15:35:12 +00:00
elexis
f92447f88b Observer mode cleanup, refs #3168. 
For consistency remove grayout from unit action commands (unload all,
delete, ...) as suggested by sanderd17 some time ago.
Remove unneeded grayout from unittype specific ungarrison buttons (as
the grayout is added automatically in this case).
Allow focusing on rallypoints for observers (should be added to the
allied commands too).
Add newlines and inline some variables.

This was SVN commit r18347.
 2016-06-09 15:32:41 +00:00
elexis
4bb9c80001 Continue to allow cheating and some other commands after winning the game. Refs #3168. 
This was SVN commit r18346.
 2016-06-09 14:47:25 +00:00
elexis
fab2e9274a Lobby cleanup. Based on patch by Imarok, refs #3575. 
Fix a typo and use let instead of var.

This was SVN commit r18345.
 2016-06-09 13:59:40 +00:00
elexis
2165250316 Clarify translated string, as reported on transifex. 
This was SVN commit r18343.
 2016-06-08 11:12:10 +00:00
elexis
cd3c52c53f Last Man Standing mode. Based on patch by Sandarac, fixes #3970. 
Also fix a simulation bug (check for allied victory on game start).
The mode is not a victory condition as it applies to all victoriy
conditions.

This was SVN commit r18342.
 2016-06-08 11:03:16 +00:00
sanderd17
ffd1639f05 Implement damage variants with an example for the Iberian fire ship. Fixes #3983 
This was SVN commit r18340.
 2016-06-07 13:21:32 +00:00
mimo
29a069b6fb petra cleanup 
This was SVN commit r18337.
 2016-06-05 20:52:21 +00:00
Itms
260f925ad9 Some fixes and improvements suggested by leper 
This was SVN commit r18336.
 2016-06-05 20:48:22 +00:00
LordGood
ee8061d867 fixed market actor and seleucid spec texture 
This was SVN commit r18335.
 2016-06-05 15:31:48 +00:00
mimo
d3ffa91fa9 petra cleanup 
This was SVN commit r18334.
 2016-06-05 14:44:17 +00:00
mimo
e260fab9a0 petra: first part of adaptation to cost multipliers, ref #4003 
This was SVN commit r18333.
 2016-06-05 14:39:37 +00:00
sanderd17
98f1d02d88 Fix garrison flag on new seleucid blacksmith 
This was SVN commit r18332.
 2016-06-05 08:47:22 +00:00
LordGood
f064b0566c Seleucids blacksmith, fixed a few things with the corral and barracks too 
This was SVN commit r18331.
 2016-06-05 05:31:05 +00:00
mimo
756d23c987 petra cleanup 
This was SVN commit r18330.
 2016-06-04 17:36:14 +00:00
sanderd17
f6b9cbf280 Remove duplicate temple actors 
This was SVN commit r18329.
 2016-06-04 14:15:52 +00:00
sanderd17
29b6f8273f Fix garrison flags of hellenistic civs + remove duplication for a number of athen vs hele actors + clean up some actors 
This was SVN commit r18328.
 2016-06-04 14:02:19 +00:00
sanderd17
279a9ed785 Move old Persian building 
This was SVN commit r18327.
 2016-06-04 13:29:08 +00:00
sanderd17
e573ea54a2 Move some old hellenistic actors to the old directory 
This was SVN commit r18326.
 2016-06-04 13:25:30 +00:00
mimo
04123e7725 some cleanup, reported by leper 
This was SVN commit r18325.
 2016-06-04 12:43:02 +00:00
sanderd17
c08bde9100 Fix garrison flags on Spartan buildings + clean up some actors 
This was SVN commit r18323.
 2016-06-04 12:18:47 +00:00
elexis
248a48d88a Major network cleanup. Patch by Imarok. 
Access the server from the client only, not from the GUI (except for
autostarted games).
Thereby lay the foundation for clients to setup the game (refs #3806)
and dedicated hosting (refs #3556).
Doesn't transfer nor remove the SetTurnLength showcase from 0ebe3486b6.

This was SVN commit r18322.
 2016-06-04 12:08:30 +00:00
sanderd17
1871213496 Fix garrison flags on Seleucid buildings + clean up some actors 
This was SVN commit r18321.
 2016-06-04 12:06:48 +00:00
sanderd17
9a38ae6455 Fix garrison flags on Roman buildings + clean up some actors 
This was SVN commit r18320.
 2016-06-04 11:58:10 +00:00
sanderd17
c0f0f6fb53 Fix garrison flags on Ptolemaeic buildings + clean up some actors 
This was SVN commit r18319.
 2016-06-04 11:31:21 +00:00
elexis
6377670543 Simulation cleanup. 
Fix previous commit and add missing semicolon.

This was SVN commit r18318.
 2016-06-04 02:33:53 +00:00
elexis
40e8600a58 Statistics tracker cleanup. 
Inline some variables.
Simplify domestic animal check.
Remove trailing whitespace.

This was SVN commit r18317.
 2016-06-04 01:58:37 +00:00
elexis
a84b9a087c Fix some string issues pointed out by leper. 
This was SVN commit r18316.
 2016-06-04 00:59:46 +00:00
elexis
4110fee44e Session cleanup and bugfix. 
Rename "hosts" following 903803ceec in session and join dialog.
Move join/leave code to new functions OnClientJoin and OnClientLeave.

This was SVN commit r18315.
 2016-06-03 16:54:00 +00:00
elexis
80ea90ec4b Summary screen cleanup. 
Use 8b30273a50 to remove hardcoding of the available panels.
Access the summary panels by name instead of numerical index.
Move nested function to global scope.
Add newlines.
Remove unneeded comments.
Use join(" ") to construct the size property.

This was SVN commit r18314.
 2016-06-03 16:22:02 +00:00
elexis
92f2a21ac5 Summary screen cleanup. 
Thou shalt not repeat thyself when formatting numbers.
Renaming of 1-character variables by Imarok.

This was SVN commit r18313.
 2016-06-03 16:17:21 +00:00
FeXoR
0bf90da597 Fixes a bug for random maps where Map.validT didn't apply the distance parameter properly on rectangular maps. Fixes #4012 
This was SVN commit r18312.
 2016-06-03 15:29:28 +00:00
sanderd17
3cf766126b Fix garrison flags on Persian buildings + clean up some actors 
This was SVN commit r18311.
 2016-06-03 15:12:07 +00:00
sanderd17
4048c0e03c Fix garrison flags on Mauryan buildings + clean up some actors 
This was SVN commit r18310.
 2016-06-03 14:21:07 +00:00
sanderd17
81eb22d01a Fix garrison flags on Macedonian buildings + clean up some actors 
This was SVN commit r18309.
 2016-06-03 14:00:59 +00:00
sanderd17
03060c4307 Fix skirmish replacements 
This was SVN commit r18308.
 2016-06-03 13:49:26 +00:00
sanderd17
81512a5558 Fix garrison flags on iberian buildings + clean up some actors 
This was SVN commit r18307.
 2016-06-03 13:11:47 +00:00
sanderd17
8e2fb41f92 Rename the not-so-new celtic actors 
This was SVN commit r18306.
 2016-06-03 11:38:04 +00:00
sanderd17
80ffd7ecb6 Move old celtic actors to a separate directory 
This was SVN commit r18305.
 2016-06-03 11:26:03 +00:00
sanderd17
1a3ed203b6 Fix previous commit where SVN messed up a bit between copying and moving files 
This was SVN commit r18304.
 2016-06-03 11:04:41 +00:00
sanderd17
b881c4e327 Move old athenian actors to separate directory + rename the not-so-new actors to regular names 
This was SVN commit r18303.
 2016-06-03 10:09:03 +00:00
sanderd17
df622b5614 Remove magic number from credits code. 
This was SVN commit r18301.
 2016-06-03 09:37:58 +00:00
elexis
903803ceec Gamesetup ready- and PlayerAssignments-cleanup. 
Split logic to onClientJoin onClientLeave.
Remove duplicate, yet slightly different ready button caption.
Rename hosts to newAssignments in the GUI message sent by the NetClient.

This was SVN commit r18299.
 2016-06-03 02:28:29 +00:00
elexis
0f8b10fc0e Gamesetup cleanup. 
Call updateGameAttributes instead of copying the function contents.
Inline numPlayers and remove ternary that returns the same value in both
cases.
Add newlines, change some comments.

This was SVN commit r18298.
 2016-06-03 00:21:21 +00:00
elexis
c941a2f352 Gamesetup cleanup. 
Determine the Seed, AISeed and matchID only once (when starting the
game).
Only specify Seed on random maps.

This was SVN commit r18297.
 2016-06-02 23:54:18 +00:00
elexis
8b30273a50 GUI engine improvement + gamesetup cleanup. 
Grab the list of children of a GUI object directly instead of hardcoding
the names.

This was SVN commit r18296.
 2016-06-02 22:49:28 +00:00
elexis
31a7181eb8 Hide the continue button from d9caf157e2 once pressed, refs #4031. 
This was SVN commit r18295.
 2016-06-02 22:39:02 +00:00
sanderd17
53ffe766d8 Fix garrison flags on Gallic and Celtic structures + clean up the Gallic and Celtic structure actors 
This was SVN commit r18294.
 2016-06-02 20:18:06 +00:00
sanderd17
0fc9a47c85 Fix garrison flags on Carthaginian structures + clean up the Carthaginian structure actors 
This was SVN commit r18293.
 2016-06-02 19:59:02 +00:00
sanderd17
b0b0495fc9 Fix garrison flags on Briton structures + clean up the Briton structure actors 
This was SVN commit r18292.
 2016-06-02 19:44:16 +00:00
sanderd17
d4fa905cb1 Fix garrison flags on Athenian structures + clean up the Athenian structure actors 
This was SVN commit r18291.
 2016-06-02 19:35:59 +00:00
mimo
5be948019b ai cleanup 
This was SVN commit r18290.
 2016-06-02 18:08:14 +00:00
elexis
d9caf157e2 Fix a confirmation hotkey bug in the multiplayer dialog. Patch by Imarok, fixes #4031. 
Remove a duplicate button and move code from XML to JS.

This was SVN commit r18289.
 2016-06-02 16:47:24 +00:00
elexis
6df3b0d794 Wall placement cleanup. Somewhat based on patch by bb, refs #3811. 
Early return instead of a big if-statement.
Inline r, targetX, targetZ, towerX and towerZ.
Rename s to spacing.
Remove unneeded else keywords.
Eliminate deprecated for-each.
Use let instead of var.
Quote object keys.
++i instead of i++.
Some newlines.

This was SVN commit r18288.
 2016-06-02 12:52:54 +00:00
elexis
00c3b09008 Patch by Sandarac and bb, fixes #3859. 
This was SVN commit r18287.
 2016-06-02 12:14:32 +00:00
elexis
f15abb066c Allow garrisoning elephants at the elephant stables. Patch by jonbaer. 
Also add missing obstruction class to the elephant archer and fix its
walking speed.

This was SVN commit r18286.
 2016-06-02 12:05:41 +00:00
elexis
74e672d879 Observermode cleanup, fixes #3850. 
Recalculate status bars when changing the perspective.

This was SVN commit r18285.
 2016-06-02 00:20:02 +00:00
elexis
00ea7763f7 GUIInterface / observermode cleanup as recommended by leper, fixes #3999. 
Default to the viewed player in the GUIInterface to avoid passing that
separately in some places, refs #3168.
Thus GetEntityState will be called for the viewed player instead of
observer playerID, therefore
fixes a fog-of-war selection relict when changing the perspective, refs
#3850.
Also remove some unused player arguments.

This was SVN commit r18283.
 2016-06-02 00:09:21 +00:00
elexis
662f8ec620 Template cleanup. Patch by fatherbushido, refs #4021. 
Move duplicate military colony template to a new parent template.

This was SVN commit r18282.
 2016-06-01 23:33:29 +00:00
sanderd17
4223fad060 Make it easier for mods to add their own credits. Fixes #3986 
This was SVN commit r18281.
 2016-06-01 19:37:24 +00:00
mimo
ab4c656ff6 make healer more proactive, patch by causative, fixes #3932 
decrease a bit the increase of heal range with techs, and also decrease
a bit the cost of such techs

This was SVN commit r18280.
 2016-06-01 17:59:06 +00:00
elexis
8a8c0b526d Template Cleanup. Some string fixes for 802d0f0de8 and d238128960 as suggested by leper. 
This was SVN commit r18277.
 2016-06-01 00:13:57 +00:00
elexis
8a4af2e7b5 Template cleanup. Patch by Palaxin, refs #4021. 
Move duplicate library template to a new parent template.

This was SVN commit r18276.
 2016-05-31 23:49:44 +00:00
elexis
1bd82494a3 Template cleanup. Patch by Palaxin, fixes #4022. 
Move duplicate rotary mill template to a new parent template.

This was SVN commit r18275.
 2016-05-31 23:12:07 +00:00
mimo
3eea0df931 ai cleanup 
This was SVN commit r18274.
 2016-05-31 21:06:53 +00:00
mimo
7060ca888c petra: continue splitting of attack function in smaller functions, + some cleanup 
This was SVN commit r18273.
 2016-05-31 21:04:13 +00:00
elexis
246c758085 All wonders should have rallypoints. Patch by Sandarac, fixes #4002. 
This was SVN commit r18271.
 2016-05-31 09:49:14 +00:00
elexis
2bcb5f7d18 Actually delete it, refs #4016. 
This was SVN commit r18270.
 2016-05-31 02:16:11 +00:00
elexis
8f02ae3fd2 Template cleanup. Patch by fatherbushido, fixes #4016. 
Removes duplicate theatron templates and use a parent template instead.
Removes unused Theban theatron.
Fixes a buildtime inconsistency.
Also improve the tooltip string as suggested by leper.

This was SVN commit r18269.
 2016-05-31 02:13:20 +00:00
sanderd17
83af69286d Allow simulation to set the actor variant selection, and use it for the garrison flag. Fixes #3952 Refs #2679, #3983 
This was SVN commit r18266.
 2016-05-30 14:07:48 +00:00
sanderd17
df971c3885 Allow to give a frequency to animations, and allow to sync randomly selected animations on base model and prop. Fixes #2324 
This was SVN commit r18265.
 2016-05-30 11:53:19 +00:00
mimo
92e28ba947 more petra cleanup 
This was SVN commit r18263.
 2016-05-29 18:37:02 +00:00
sanderd17
25e637dcac Fix issue with undefined newValue while origValue is defined. 
This was SVN commit r18262.
 2016-05-29 18:10:57 +00:00
elexis
1edacf6153 Add another missing hotkey to the ingame manual as mentioned by sanderd17. 
This was SVN commit r18261.
 2016-05-29 17:44:46 +00:00
sanderd17
a8c05c8df3 Revert ba071f8b4e as it is unsafe for serialization 
This was SVN commit r18260.
 2016-05-29 14:51:15 +00:00
mimo
3d6c48e357 ai cleanup, mainly var -> let 
This was SVN commit r18258.
 2016-05-29 12:26:41 +00:00
mimo
f1610ce4fa petra: wip changes to make it less dumb against walls 
and start splitting the huge attack function in small parts

This was SVN commit r18257.
 2016-05-29 12:16:53 +00:00
sanderd17
ba071f8b4e Reduce number of rallypoint recalculations when a target has moved before, but doesn't move now. 
This was SVN commit r18256.
 2016-05-29 12:15:24 +00:00
elexis
d238128960 Balance the wonder and improve unique building tooltips. 
Increase the armor of buildings following 27c46a0a68.
Triple the research time for the population tech, as it is the most
powerful tech in the game.
Mention that unique building auras stack.
Fix a bad tooltip in pop_wonder.json.

This was SVN commit r18255.
 2016-05-28 20:49:45 +00:00
sanderd17
50ba14d16d Restructure unit_actions.js. Fixes #4007 
This was SVN commit r18254.
 2016-05-28 14:46:20 +00:00
elexis
16bad4ee07 Properly handle the case of removed hotkeys in 6162c6388f, refs #3051. 
This was SVN commit r18253.
 2016-05-28 10:50:22 +00:00
elexis
6162c6388f Show hotkeys in the tooltips of six buttons. 
This was SVN commit r18252.
 2016-05-27 23:49:14 +00:00
elexis
39bf451d49 Use relative template for 0b2f0ea042. 
This was SVN commit r18251.
 2016-05-27 23:42:34 +00:00
mimo
1b598eaccf ai: remove some redundant get functions 
This was SVN commit r18250.
 2016-05-27 19:59:27 +00:00
elexis
0b2f0ea042 Balance hellenic champions. 
Double the metal cost of elite spartan citizen soldiers, as they have
stats near those of champions.
Use a more reasonable cost for age 2 champions.
Differentiate the armored swordsmen from the other sword champions by
actually increasing it's armor.

This was SVN commit r18249.
 2016-05-27 18:58:52 +00:00
elexis
802d0f0de8 Unique building aura balancing, refs #3930 
Owning multiple libraries and theatrons increases the aura bonus
proportionally, so as to incentivize capturing.
Make the library aura more appealing by giving a 10% research time
bonus.
Improve a tooltip.

This was SVN commit r18248.
 2016-05-27 17:13:31 +00:00
elexis
06b77c1522 Update manual with some new hotkeys. 
This was SVN commit r18247.
 2016-05-27 17:01:18 +00:00
elexis
038e45cba8 Rotate icon, refs #3805. 
This was SVN commit r18244.
 2016-05-27 13:22:10 +00:00
elexis
965e658463 Make ptolemian bolt shooter available. Patch by fatherbushido, fixes #4006. 
Let ptolemians produce it in a captured siege workshop.
Remove bolt shooter technology from seleucids, as they don't have that
weapon.

This was SVN commit r18243.
 2016-05-27 11:57:20 +00:00
sanderd17
f422b67eb0 Fix issue with hidden techs after researching it 
This was SVN commit r18242.
 2016-05-27 08:37:44 +00:00
elexis
67149137c8 Reduce the size of the "Team" label to not overlap the reset-civ button when using 1024x768. Patch by Sandarac, refs #3805. 
This was SVN commit r18240.
 2016-05-27 01:49:15 +00:00
elexis
78accf3d97 Add a button to the gamesetup to reset the selected civilizations of all players to random. 
Code by Sandarac, icon by Lionkanzen, fixes #3805.

This was SVN commit r18239.
 2016-05-26 22:58:30 +00:00
elexis
30e7b3bf25 Implement hotkey to delete units and buildings without confirmation dialog. Patch by Sandarac, fixes #3962. 
This was SVN commit r18238.
 2016-05-26 22:33:38 +00:00
sanderd17
dacecd0f33 Better syntax for e84e0611b0 
This was SVN commit r18237.
 2016-05-26 20:04:20 +00:00
sanderd17
e84e0611b0 Fix an issue 1b0fbee2d9. Selecting ents with and without production queue gave undefined tech cost multipliersOC. 
This was SVN commit r18236.
 2016-05-26 19:56:14 +00:00
sanderd17
4bf0dddace Add javelin to samnite skirmisher projectile attachpoint. Fixes #4005 
This was SVN commit r18235.
 2016-05-26 18:10:22 +00:00
mimo
0856dde011 fix a typo in 58e356babb, plus a missing semicolon 
This was SVN commit r18234.
 2016-05-26 17:58:08 +00:00
sanderd17
1b0fbee2d9 Let auras and techs modify tech cost. Patch by fatherbushido. Fixes #3930 
This was SVN commit r18233.
 2016-05-26 06:28:23 +00:00
mimo
9c67cd6743 transfer the entities angles to the AIs 
This was SVN commit r18231.
 2016-05-25 19:03:41 +00:00
mimo
07007f1963 some cleanup in ai 
This was SVN commit r18230.
 2016-05-25 18:43:48 +00:00
LordGood
3d27d47d54 Seleucid corral 
This was SVN commit r18229.
 2016-05-25 12:39:16 +00:00
Itms
09907351a0 Little update to the musicians list, plus alphabetic order for instrument players. 
This was SVN commit r18228.
 2016-05-24 19:17:07 +00:00
elexis
d7e7a24168 Gamesetup cleanup (game/map-description), refs #3994. 
Add linebreaks.
Eliminate unneeded variables mapName and gameDescription.
Remove a check as g_GameAttributes.map is always defined.
Sort the two one-line statements above the helper variable declarations
to make it more more obvious that the statements don't use them.

This was SVN commit r18227.
 2016-05-24 12:56:52 +00:00
elexis
a99f314a61 Session cleanup. 
Use let instead of var.

This was SVN commit r18225.
 2016-05-24 12:06:22 +00:00
elexis
6e17a7d2ff Session / unit-actions cleanup. 
Eliminate deprecated for-each.
Merge if-conditions.
Add linebreaks to objects, so that each property is declared on a
separate line, refs #252.
For consistency, use returns in negative instead of positive cases.
Make three functions global, one of which had been defined thrice.
Remove comments stating the same as the code.

This was SVN commit r18224.
 2016-05-24 12:03:33 +00:00
elexis
9cc98aaf47 Take new observermode into account in some missing places, refs #3850, #3168. 
This was SVN commit r18223.
 2016-05-23 15:26:47 +00:00
sanderd17
33f6713f94 New attempt to get the aura translations included. See 1606d40f68 
This was SVN commit r18221.
 2016-05-23 10:40:26 +00:00
mimo
6171f66d06 AI: fix serialization of template changes, fixes #3993, refs #3858 
This was SVN commit r18219.
 2016-05-22 20:25:41 +00:00
sanderd17
a951762d6c Add support to the structure tree for units with technologies in their production queue. Patch by s0600204. Fixes #4001 
This was SVN commit r18218.
 2016-05-22 15:32:47 +00:00
mimo
9c9796d8ad Changes in AI: Decrease a bit the required number of champions in attacks because of the recent increase of their cost, 
Make more use of corrals when no fields and Cleanups

This was SVN commit r18216.
 2016-05-21 17:06:25 +00:00
mimo
682086b7fb do not let the captureStrength become infinite when capturing a damaged structure, fix #3973, patch by fatherbushido 
This was SVN commit r18215.
 2016-05-21 16:44:20 +00:00
elexis
4b5f8dfca6 Remove trailing whitespace and simplify some length checks. Refs #252. 
This was SVN commit r18214.
 2016-05-21 16:20:27 +00:00
sanderd17
a2bd82d171 Complete phase tooltips. Patch by fatherbushido. Fixes #3451 
This was SVN commit r18213.
 2016-05-21 11:18:06 +00:00
sanderd17
1606d40f68 I18n of auras. Based on patch by fatherbushido. Fixes #3982 
This was SVN commit r18212.
 2016-05-21 09:18:05 +00:00
FeXoR
ff342619c7 Fixes a bug in random map schwarzwald.js introduced in 7471a0db63 that prevented the starting positions to be flattened. 
This was SVN commit r18211.
 2016-05-20 20:36:10 +00:00
sanderd17
a84b923380 Fix timing of previous patch 
This was SVN commit r18210.
 2016-05-20 14:05:19 +00:00
sanderd17
804fd4be61 Update 'survival of the fittest' to work with capturing (include siege engines in the attacking units) + add some randomness to the waves + make the timing a bit more challenging 
This was SVN commit r18209.
 2016-05-20 14:02:47 +00:00
elexis
7cd43ba8cf Fix whitespace and remove duplicate comment, refs #1950. 
This was SVN commit r18208.
 2016-05-20 12:51:27 +00:00
sanderd17
9368ffe345 Fix tech modifications calculations so we don't bump into stupid mistakes again (f.e. multiplying two positive numbers is now guaranteed to stay positive). See 7f300bbf3d and 0b8845eb4f 
This was SVN commit r18207.
 2016-05-20 11:20:51 +00:00
elexis
ec1696ded3 Send a network message to update the GUI if another player pauses a multiplayer game. Patch by echotangoecho, fixes #1950. 
Pause animations then and on disconnect.
Don't unpause unintentionally when closing a message box in
singleplayer.

This was SVN commit r18204.
 2016-05-19 22:10:38 +00:00
elexis
856dc1c999 Network cleanup. 
Send the "client has rejoined" message after the synchronization
finished instead of right after the loading screen.
Patch by echotangoecho, refs #1949, #1950.

This was SVN commit r18203.
 2016-05-19 21:03:46 +00:00
elexis
1b3a12ea92 Also update this file following 1c5a7f6267. 
This was SVN commit r18200.
 2016-05-19 17:51:56 +00:00
sanderd17
09ceb841f3 Add some useful warnings on missing or abnormal template/technology data. 
This was SVN commit r18199.
 2016-05-19 15:12:28 +00:00
FeXoR
1c5a7f6267 Moved BUILDING_ANGlE from the maps to BUILDING_ORIENTATION in a random map lib. Made some arguments optional with the default set to that constant, renamed some arguments and moved "orientation" in placeCivDefaultEntities to kwargs. Removed unneeded comments. Fixes #3988 
This was SVN commit r18198.
 2016-05-19 14:48:21 +00:00
elexis
4921056b9e Revert de06dc76f7 as it's broken in several ways and revealed a simulation bug. Refs #3288. 
This was SVN commit r18197.
 2016-05-19 09:33:17 +00:00
mimo
b57a103e81 petra cleanup, mainly unneeded parentheses 
This was SVN commit r18196.
 2016-05-17 19:35:33 +00:00
mimo
329caed9dd petra: be more inclined to help an ally attacked by several enemies 
This was SVN commit r18195.
 2016-05-17 19:31:03 +00:00
elexis
de06dc76f7 Show researchable techs of all selected entities, not only the first one. Fixes #3288. 
This was SVN commit r18194.
 2016-05-17 19:05:18 +00:00
elexis
67cdbedb24 Fix an option comment. 
This was SVN commit r18192.
 2016-05-17 16:35:48 +00:00
elexis
b49414b03e Gamesetup cleanup. 
Use JSdoc comments and use rgbToGuiColor as pointed out by sanderd17.

This was SVN commit r18191.
 2016-05-17 16:05:36 +00:00
sanderd17
0501ff9f59 Fix Seleucus aura 
This was SVN commit r18190.
 2016-05-17 11:44:29 +00:00
elexis
23a43cb0f6 Allow more choices for the wonder timeout, refs #3234. 
This was SVN commit r18189.
 2016-05-16 18:32:24 +00:00
elexis
2de117618b Fix typo in 46ead523b8. Patch by fatherbushido, refs #3792. 
This was SVN commit r18188.
 2016-05-16 13:57:45 +00:00
elexis
c34998b85a Show the playerselection dropdown in front of the "Follow player" observer option in case they overlap. 
This was SVN commit r18187.
 2016-05-16 13:18:26 +00:00
mimo
0b6c7ca1b0 ai: remove some unneeded parentheses 
This was SVN commit r18186.
 2016-05-16 10:48:52 +00:00
mimo
7ddfc89c18 petra: fix buildLimit when it is 0, reported by fatherbushido 
This was SVN commit r18185.
 2016-05-16 10:23:35 +00:00
elexis
24b262e4d1 Remove the trigger keyword from these maps as they either use the Tutorial AI for scripting or use a script only to place entities on load, refs #3013. 
This was SVN commit r18182.
 2016-05-16 00:21:44 +00:00
elexis
9eccf5cd07 Use an actual playername instead of "You" in singleplayer, fixes #3979. 
Differentiate between SP and MP name and allow editing it in the
settings.
Defaults to the OS username.
Makes sharing singleplayer replays more effective.
Also fixes a troublesome colorization of "You" in a translated sentence,
refs #3501.

This was SVN commit r18180.
 2016-05-15 17:13:35 +00:00
elexis
6680fe82e2 Add maplist filter for maps that come with triggerscripts. Patch by fabio and Stan, refs #3013. 
This was SVN commit r18179.
 2016-05-15 04:19:45 +00:00
elexis
4944d9b83c GUI / messagebox cleanup. 
Remove pointless "mode" argument from messageBox and add newlines to its
calls.
Remove unused variable codes, trailing whitespace and useless comments.
Remove redundant button init code by using a loop (forEach to avoid a
closure).
Inline many unneeded variables.
Add missing translate to gamesetup_mp.js.
Quote object keys and capitalize globals correctly.

This was SVN commit r18178.
 2016-05-15 04:04:31 +00:00
elexis
b562db2f27 Update the loading screen tooltips following 60a2af2988. 
This was SVN commit r18177.
 2016-05-15 01:14:33 +00:00
elexis
f64f1c4ade Show a hint when failed to connect to a game stating that it is likely caused by the host not forwarding the UDP port. Patch by Stan, fixes #3570. 
This was SVN commit r18176.
 2016-05-15 00:37:58 +00:00
sanderd17
5a5f05f8d9 Remove gather penalty from some more units (the penalty is added as tech). Units discovered by fatherbushido. 
This was SVN commit r18175.
 2016-05-14 20:17:04 +00:00
mimo
6dbdaf1160 fix 58e356babb 
This was SVN commit r18174.
 2016-05-14 18:25:35 +00:00
elexis
dd26d683c6 Summary screen cleanup. 
Few simplifications, newlines for sprintf calls.

This was SVN commit r18173.
 2016-05-14 13:10:50 +00:00
mimo
58e356babb allow trade with mirage markets, fixes #3894 
This was SVN commit r18172.
 2016-05-14 12:27:48 +00:00
elexis
866d04a22b Fix typo. 
This was SVN commit r18171.
 2016-05-14 12:15:41 +00:00
mimo
ac525fcd2a some cleanup in petra 
This was SVN commit r18170.
 2016-05-14 12:14:12 +00:00
elexis
f5cfda84b8 Gamesetup cleanup. Patch by Imarok, fixes #3980. 
Rename GUI objects to numPlayers, mapFilter and mapType for consistency.
Thus use loops to remove code duplication for hiding controls.

This was SVN commit r18169.
 2016-05-14 12:07:41 +00:00
mimo
721c47a9e8 remove the hardcoded gain in petra, fixes #3943, patch by LittleDev 
This was SVN commit r18168.
 2016-05-14 12:04:44 +00:00
mimo
0b8845eb4f fix 7f300bbf3d 
This was SVN commit r18167.
 2016-05-13 20:14:02 +00:00
sanderd17
7f300bbf3d Fix issue with elite units not being able to gather anything 
This was SVN commit r18165.
 2016-05-12 19:04:24 +00:00
mimo
148f485172 remove some unused var 
This was SVN commit r18164.
 2016-05-12 17:42:27 +00:00
mimo
a4cb84c8e0 ai cleanup, mainly trailing spaces 
This was SVN commit r18163.
 2016-05-12 17:38:58 +00:00
elexis
7eea4bd81a GUI cleanup. 
A commit against colored spaces.
Use helper function to shorten code while keeping the space apparent.
Inline username variable.
Rename playerIndex to playerID.

This was SVN commit r18162.
 2016-05-12 16:08:26 +00:00
elexis
7c2ff117f3 Distinguish resign- and defeat-chatmessage. Patch by dpiquet, fixes #3501. 
For consistency, also colorize the "You" part in the singleplayer
variants.

This was SVN commit r18161.
 2016-05-12 14:02:05 +00:00
elexis
366085e037 Savegame cleanup. 
Simplify the error message for savegames with different mods enabled.
Remove deprecated for-each with map and for-of.
Simplify code that used conditional operator by replacing it with
logical operators.
Add linebreaks.
Quote object keys.
Early return.
Prefix global with g_.
Remove unneeded sprintf in error messages.
Capitalize comments.

This was SVN commit r18160.
 2016-05-12 12:14:22 +00:00
elexis
518ad5380d Replay menu cleanup 
Add the version number to the incompatibility message.
Add missing translate for the comma-separation.

This was SVN commit r18159.
 2016-05-12 11:48:08 +00:00
elexis
8b14bfe78b Balance garrisoned regeneration rate as proposed by mimo and scythetwirler. 
Reduce rate in village phase from 10 to 5.
Increase town phase addition from 2 to 7 and city phase addition from
1.5 to 9.

This was SVN commit r18157.
 2016-05-11 22:32:33 +00:00
sanderd17
b0000da90e Fix small issue discovered by fatherbushido 
This was SVN commit r18156.
 2016-05-11 09:35:52 +00:00
elexis
9414674cfc Train naked fanatics in town phase to promote rushing, completes b5bf0c7e86. 
This was SVN commit r18155.
 2016-05-11 00:42:56 +00:00
elexis
f5dccae966 Display the carried resources when selecting a group of units. Patch by Imarok, fixes #3113. 
Shows the information for all selected units and for all units of a
given type.
Rename g_CostDisplayNames to g_CostDisplayIcons.

This was SVN commit r18154.
 2016-05-11 00:07:38 +00:00
elexis
2b0fa71d23 Session cleanup. 
Use colorizePlayernameByID instead of replica.

This was SVN commit r18152.
 2016-05-10 03:14:51 +00:00
elexis
71c441b092 GUI cleanup. 
Remove a wrong translation comment.
Nuke duplicate calls.

This was SVN commit r18151.
 2016-05-10 02:35:12 +00:00
LordGood
6ba0d86ab6 Seleucid market commit 
This was SVN commit r18150.
 2016-05-09 22:45:50 +00:00
elexis
7d4fb0d4d9 Limit population cost to at most 3, as suggested by scythetwirler. 
This was SVN commit r18149.
 2016-05-09 20:02:32 +00:00
elexis
18e9c4e558 Session cleanup. 
Remove a pointless conditional operator (which had been introduced with
the other format-message functions that distinguish more strings).
Remove unneeded parenthesis and try once more to align this if-statement
properly.

This was SVN commit r18147.
 2016-05-09 01:00:34 +00:00
FeXoR
cf7a71965b Removing function euclid_distance as duplication of getDistance. Fixes #3968 
This was SVN commit r18142.
 2016-05-08 15:15:43 +00:00
FeXoR
7471a0db63 Separate global heightmap manipulation functions to a library. Fixes #3764 
This was SVN commit r18141.
 2016-05-08 14:58:57 +00:00