1
0
forked from 0ad/0ad
Commit Graph

10276 Commits

Author SHA1 Message Date
58e356babb allow trade with mirage markets, fixes #3894
This was SVN commit r18172.
2016-05-14 12:27:48 +00:00
866d04a22b Fix typo.
This was SVN commit r18171.
2016-05-14 12:15:41 +00:00
ac525fcd2a some cleanup in petra
This was SVN commit r18170.
2016-05-14 12:14:12 +00:00
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
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
0b8845eb4f fix 7f300bbf3d
This was SVN commit r18167.
2016-05-13 20:14:02 +00:00
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
148f485172 remove some unused var
This was SVN commit r18164.
2016-05-12 17:42:27 +00:00
a4cb84c8e0 ai cleanup, mainly trailing spaces
This was SVN commit r18163.
2016-05-12 17:38:58 +00:00
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
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
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
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
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
b0000da90e Fix small issue discovered by fatherbushido
This was SVN commit r18156.
2016-05-11 09:35:52 +00:00
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
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
2b0fa71d23 Session cleanup.
Use colorizePlayernameByID instead of replica.

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

This was SVN commit r18151.
2016-05-10 02:35:12 +00:00
6ba0d86ab6 Seleucid market commit
This was SVN commit r18150.
2016-05-09 22:45:50 +00:00
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
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
cf7a71965b Removing function euclid_distance as duplication of getDistance. Fixes #3968
This was SVN commit r18142.
2016-05-08 15:15:43 +00:00
7471a0db63 Separate global heightmap manipulation functions to a library. Fixes #3764
This was SVN commit r18141.
2016-05-08 14:58:57 +00:00
cc3d7d58ea Improve findIdleUnit and hasIdleUnit code. Patch by Clockwork-Muse. Fixes #3826
This was SVN commit r18139.
2016-05-08 09:32:16 +00:00
09fd6da38e Update credits
This was SVN commit r18136.
2016-05-06 07:26:51 +00:00
cd4957144c remove hardcoded inconsistencies in some templates, fixes #3954, patch by fatherbushido
This was SVN commit r18134.
2016-05-05 12:12:42 +00:00
503cc428b4 Add team option to autostart. Patch by Jonbaer
This was SVN commit r18133.
2016-05-04 06:51:34 +00:00
dfad4ec7d7 fix petra typo reported by falsevision, fixes #3955
This was SVN commit r18132.
2016-05-03 18:49:33 +00:00
051ba38f36 Reduce gather speed for elite units, as in their original template.
This was SVN commit r18131.
2016-05-03 17:40:21 +00:00
eaed715a13 Fix typo in aura tooltip
This was SVN commit r18129.
2016-05-02 18:02:24 +00:00
a2c3a8a8db Fix typo in AuraManager
This was SVN commit r18128.
2016-05-02 17:32:04 +00:00
c1b5e8c8b7 Gamesetup cleanup. Ensure the existance of the AI property after selecting a map or loading the persistmatchsettings.
This was SVN commit r18127.
2016-05-02 17:08:22 +00:00
36d8e0bf5b Remove unused function.
This was SVN commit r18126.
2016-05-02 16:53:38 +00:00
58569aa573 Fix some auras. Patch by fatherbushido. Fixes #3947
This was SVN commit r18125.
2016-05-02 16:26:27 +00:00
2378ecd35c Swap the civilizations when swapping players in the gamesetup. Based on patch by Vladislav, fixes #3804.
This was SVN commit r18124.
2016-05-02 13:42:37 +00:00
c3488df240 Clean up AuraManager objects while the game is running. Refs #3834
This was SVN commit r18123.
2016-05-02 10:31:32 +00:00
4ea49f374a Disable serialization of the AI when no AI players are present. Disable serialization of cached AI templates overall. Improve serialization of repetitive vectors and templatenames. Refs #3834
This was SVN commit r18121.
2016-05-02 09:26:07 +00:00
19ccdb8cf5 Updated Gaul Tavern. Thanks for Stan for the model and actors and wackyserious for the texture fix
This was SVN commit r18119.
2016-05-01 21:10:32 +00:00
bc19818e86 some petra cleaning
This was SVN commit r18118.
2016-05-01 15:03:23 +00:00
3bb1058950 Allow more structures in the structure tree. Patch by s0600204. Fixes #3938
This was SVN commit r18116.
2016-05-01 08:42:27 +00:00
32d8c60239 Implement team bonuses. Patch by fatherbushido. Fixes #2445
This was SVN commit r18115.
2016-05-01 08:38:59 +00:00
4471e0bf18 Colonnade for Seleucid city building
This was SVN commit r18114.
2016-05-01 04:35:24 +00:00
d8ed6d828a Separate some random map libraries into a new directory. Fixes #3900
This was SVN commit r18113.
2016-04-30 14:42:10 +00:00
983ef2ed2c Add translation context to the "Unknown" strings, allowing to chose a different translation for every occurance.
This was SVN commit r18112.
2016-04-30 14:01:07 +00:00
7ab5f8daf6 Allow filtering the replaylist by single/multiplayer, victorycondition and rated games. Patch by Imarok, fixes #3436.
This was SVN commit r18111.
2016-04-30 13:24:28 +00:00
4cfd0d64fb Only show the AI-difficulty button if there is an AI assigned to that playerslot. Patch by Imarok, fixes #3942.
This was SVN commit r18110.
2016-04-30 12:14:08 +00:00
d420717eba add some missing semicolon from b88f63b699
This was SVN commit r18109.
2016-04-29 19:56:58 +00:00
b88f63b699 Move the const from simulation/helpers/TraderGain.js into the templates (InternationalBonus and GainMultiplier)
Add a tech to improve the internalBonus and give an improved bonus to
cart
Patch from fatherbushido, fixes #3917

This was SVN commit r18108.
2016-04-29 18:52:44 +00:00
b780073e24 petra cleanup
This was SVN commit r18105.
2016-04-28 17:14:07 +00:00
c76b2a6c92 Session cleanup.
Remove an occurance of a hardcoded playerlimit.

This was SVN commit r18104.
2016-04-28 16:39:09 +00:00
3e177c7f84 Hide the link to the replay in the summary screen if the client rejoined, since the replay doesn't work in that case.
Patch by Imarok, refs #3437.

This was SVN commit r18103.
2016-04-28 09:10:16 +00:00
f24523dc8f Rename TechnologyTemplateManager to DataTemplateManager in order to reflect its new function. Fixes #3909. Disable serialisation of technology templates. Refs #3834
This was SVN commit r18100.
2016-04-27 08:25:47 +00:00
f7a618d233 Seleucid barracks edit
Seleucid wonder commit

This was SVN commit r18098.
2016-04-27 04:43:47 +00:00
7c6e2019e6 Petra: Prevent the AI to endlessly try building structures that none of its units can build,
This fixes the problem of romans not building defense towers

This was SVN commit r18097.
2016-04-26 19:14:13 +00:00
fd4d5cce64 petra: recomputes territory only when receiving some events, refs #3858
This was SVN commit r18096.
2016-04-26 18:26:18 +00:00
76a076e776 fix petra typos reported by falseVision, fixes #3926
This was SVN commit r18095.
2016-04-26 18:15:57 +00:00
d49f31cdcd Display health bar for garrisoned units. Patch by Imarok. Fixes #3114
This was SVN commit r18094.
2016-04-25 07:24:05 +00:00
d70062c348 Cleanup of the network code (range-based for, remove spaces between angle brackets, and other little things).
Based on a patch by elexis, fixes #3907

This was SVN commit r18091.
2016-04-24 20:48:53 +00:00
6137fea5ed Make order of persian buildings concistent in the panels. Patch by bb
This was SVN commit r18089.
2016-04-23 21:17:13 +00:00
644b3e6fa1 Improve the UI icon for the patrol button, refs #1720.
This was SVN commit r18088.
2016-04-23 10:48:14 +00:00
2f1c08de64 Greek rooftiles texture update
This was SVN commit r18087.
2016-04-23 09:04:22 +00:00
72421f97d8 Fix a typo (compability -> compatibility).
This was SVN commit r18086.
2016-04-22 22:32:20 +00:00
fca844eef6 Restore the previously selected item and filters when returning to the replay menu. Patch by Imarok, fixes #3742.
Also few cleanups and translate the mapnames in the correct place.

This was SVN commit r18085.
2016-04-22 22:25:50 +00:00
f0263086c4 Roman textures transparency fix
This was SVN commit r18084.
2016-04-22 16:47:56 +00:00
11d150ce59 Move animations for female citizens to separate variant files.
This was SVN commit r18083.
2016-04-22 12:51:09 +00:00
f9a7494d3f Roman rooftile update
This was SVN commit r18082.
2016-04-22 11:01:50 +00:00
7130e50d7f Improve the length of the new wall models a bit (still doesn't fit perfectly)
This was SVN commit r18081.
2016-04-22 07:34:49 +00:00
c226517f2f Seleucid walls, finally
Placeholder normalmaps and specmaps added too

This was SVN commit r18079.
2016-04-22 06:10:01 +00:00
b120404141 Reveal AI settings in the gamesetup to all players. Based on patch by Imarok, fixes #3911.
This was SVN commit r18078.
2016-04-21 20:07:39 +00:00
c2e42f0e55 Add capture animation to champion infantry of different civs
This was SVN commit r18077.
2016-04-21 09:05:13 +00:00
fa703a2613 Revert a copy&paste mistake in 46ead523b8 when auras were converted from XML to JSON. Patch by fatherbushido, refs #3792.
This was SVN commit r18076.
2016-04-20 22:39:31 +00:00
b2fdfeba53 New gamesetup option enabling the host to vary the time required to win the wonder-gamemode. Patch by svott, fixes #3234.
This was SVN commit r18075.
2016-04-20 21:01:58 +00:00
46443f92c9 Define animations for Spartan infantry in separate variant files.
This was SVN commit r18074.
2016-04-20 10:55:02 +00:00
d305371782 Define animations for Seleucid infantry in separate variant files.
This was SVN commit r18073.
2016-04-20 10:47:24 +00:00
2b3aa81c0e Define animations for Ptolemy infantry in separate variant files.
This was SVN commit r18072.
2016-04-20 09:58:34 +00:00
9ee2f75390 Define animations for Roman infantry in separate variant files.
This was SVN commit r18071.
2016-04-20 09:49:54 +00:00
a40857556a Define animations for Persian infantry in separate variant files.
This was SVN commit r18070.
2016-04-20 08:51:11 +00:00
532d495e6d Define animations for Mauryan infantry in separate variant files.
This was SVN commit r18069.
2016-04-20 08:33:59 +00:00
a032d5c8b5 Define animations for Macedonian infantry in separate variant files.
This was SVN commit r18068.
2016-04-20 08:03:13 +00:00
70feece690 Define animations for Iberian infantry in separate variant files.
This was SVN commit r18067.
2016-04-20 07:07:05 +00:00
5602454fe2 Correctly support different javelin types for different javelinists
This was SVN commit r18066.
2016-04-20 06:51:50 +00:00
bdabc459b0 Define animations for Hellenistic infantry in separate variant files.
This was SVN commit r18065.
2016-04-20 06:21:07 +00:00
481f90d107 Define animations for Celtic infantry in separate variant files.
This was SVN commit r18064.
2016-04-19 19:09:05 +00:00
2dea3f2ec4 Remove two more build limit tooltips. Patch by fatherbushido
This was SVN commit r18062.
2016-04-19 16:22:48 +00:00
61fcf29a9e Define animations for Carthagian infantry in separate variant files.
This was SVN commit r18061.
2016-04-19 16:15:01 +00:00
04794599ed GUI cleanup.
Use logical AND instead of the conditional operator.

This was SVN commit r18060.
2016-04-19 15:41:14 +00:00
82ad4998cc Move attack animations definitions for the Athenian civ to variation files too.
This was SVN commit r18059.
2016-04-19 12:59:27 +00:00
4b4de5204b Head and helmet of the Athenian hoplite must always appear together.
This was SVN commit r18058.
2016-04-19 12:25:48 +00:00
421a65ef41 Define civil tasks for infantry in separate variant files, and update the Athenian infantry to use it.
This was SVN commit r18057.
2016-04-19 10:10:49 +00:00
e81fdc3f4d Not sure how I managed to commit the wrong contents in the variant file ...
This was SVN commit r18056.
2016-04-19 08:30:25 +00:00
1e6c12de7b Allow variants to be defined in external files. Fixes #3286
This was SVN commit r18054.
2016-04-19 07:51:59 +00:00
5d8e5edbfb Improved farms from LordGood.
This was SVN commit r18053.
2016-04-18 22:46:46 +00:00
eb09c58b00 Remove build limit from tooltips (the limit text is generated automatically).
This was SVN commit r18051.
2016-04-18 13:09:00 +00:00
a60abaa1c8 Disable building most structures in unconnected territory. Fixes #3526
This was SVN commit r18049.
2016-04-18 07:00:22 +00:00
6dd8d77d32 The dialogs aren't unused, but used for triggers (currently at least the demo map)
This was SVN commit r18048.
2016-04-18 06:54:04 +00:00
de0500e274 Fix the shared dropsites unit action icon. Refs #3791
This was SVN commit r18047.
2016-04-17 21:00:51 +00:00
07b368f064 Thanks, IDE, for proper indentation detection...
This was SVN commit r18046.
2016-04-17 20:29:02 +00:00
27c46a0a68 Increases hack armour on buildings, since we have capturing now. Increase garrison regeneration rate for structures.
This was SVN commit r18045.
2016-04-17 20:18:13 +00:00
c25dc39b86 Distribute XP per hit. Fixes #3889
This was SVN commit r18044.
2016-04-17 17:52:22 +00:00
c9eb2fd05c Adds a build limit to Persian Halls.
This was SVN commit r18043.
2016-04-17 17:46:57 +00:00
9c6e9f70b5 ai: fix typo from 317e2b259d
This was SVN commit r18039.
2016-04-16 17:52:50 +00:00
259af9effc adapt the ai to recent changes in phase tech requirements
This was SVN commit r18038.
2016-04-16 13:15:41 +00:00
d38adc7cd0 Makes siege less useless.
This was SVN commit r18037.
2016-04-15 17:37:38 +00:00
15e44a89ff Fix structree with new 'notciv' tech requirement
This was SVN commit r18034.
2016-04-14 18:23:32 +00:00
3ddfa1695e Fix tests
This was SVN commit r18033.
2016-04-14 17:25:22 +00:00
a57bfc829e Add a button to the summary screen to replay the game that was just played (or replayed). Patch by Imarok, fixes #3437.
This was SVN commit r18031.
2016-04-14 14:45:03 +00:00
f4bfe7c3ad Disallow certain civs to use certain techs (which could have become available after capturing a building of a different civ). Patch by fatherbushido. Fixes #3902
This was SVN commit r18030.
2016-04-14 11:33:48 +00:00
317e2b259d AI: changes in the tech requirements (following what is done in the simulation) + some cleanup
This was SVN commit r18029.
2016-04-13 20:12:21 +00:00
8f4dffe3f0 add a new market component, fixes #3277
This was SVN commit r18028.
2016-04-13 19:56:18 +00:00
a69da3401f Completely hide techs that aren't researchable by the civ of the owner + cleanup of requirements checking. Patch by fatherbushido. Fixes #3899
This was SVN commit r18027.
2016-04-13 09:15:16 +00:00
4e4f0dbbd8 Fixes the handling of teams in the summary screen, along with some cleanup. Patch by Imarok, fixes #3150, #3561.
This was SVN commit r18026.
2016-04-12 19:34:41 +00:00
b5bf0c7e86 Nerfs champions and slows champion production speed.
This was SVN commit r18025.
2016-04-12 18:51:14 +00:00
60a2af2988 Adds some more civ-specific structures and formerly atlas-only structures. Adds loyalty regen and epic healing auras..
This was SVN commit r18024.
2016-04-12 18:38:23 +00:00
e23daa11ec AI: add a isMutualAlly function for #3526 and update the AI for e0cfcbd806
This was SVN commit r18023.
2016-04-12 17:37:04 +00:00
8aa5b1fa9e Center lake in random map schwarzwald
This was SVN commit r18022.
2016-04-12 12:03:48 +00:00
e0cfcbd806 Enable technologies on captured buildings. Allow a negation on the civ selection in the technology json files. Patch by fatherbushido
This was SVN commit r18021.
2016-04-11 19:40:53 +00:00
8c870f8633 petra: remove a leftover test
This was SVN commit r18020.
2016-04-11 17:20:45 +00:00
f83505986e Tune the size and angle of the valley generation of the Lion's Den map for smaller maps. Patch by _kali, fixes #3844.
This was SVN commit r18019.
2016-04-11 10:43:56 +00:00
649cc82ff1 Only send a gamereport to the lobbybot for 1v1s (as only those are rated), fixes #3040.
This was SVN commit r18018.
2016-04-11 09:54:06 +00:00
5ac76ecf89 Some style fixes reported by leper.
This was SVN commit r18016.
2016-04-10 16:57:12 +00:00
b5ff5a6969 make the force explicit such that the previous order is recorded in the workOrders
This was SVN commit r18015.
2016-04-10 16:41:00 +00:00
3183a4ea4a Improve selection rings for animals. Patch by Palaxin. Fixes #3786
This was SVN commit r18014.
2016-04-10 08:31:11 +00:00
f8e986d057 Fix territory not being updated when diplomacy changes. Fixes #3891
This was SVN commit r18012.
2016-04-09 19:57:34 +00:00
cc35f221c8 Add auras back to structure tree. Patch by bb. Fixes #3887
This was SVN commit r18010.
2016-04-09 16:00:42 +00:00
9f21806ef7 Properly round health and CP values. Patch by bb. Fixes #3855
This was SVN commit r18009.
2016-04-09 07:35:20 +00:00
e93c1e6bca add diversity to corral production, fixes #3877
This was SVN commit r18008.
2016-04-08 20:51:24 +00:00
2392f6fe8e lock/unlock simultaneously multiple dropsites when selected
This was SVN commit r18007.
2016-04-08 20:48:10 +00:00
90cb6ff6b6 petra: improve the sharing between support units and citizen soldiers
This was SVN commit r18006.
2016-04-08 18:31:09 +00:00
378c8bdf26 Remove references to a possibly undefined variable and improve some error messages.
This was SVN commit r18005.
2016-04-08 18:23:17 +00:00
fd8c181f9d dropsites are now shared by default, but still can be locked
This was SVN commit r18004.
2016-04-08 18:05:45 +00:00
a4f10d53f2 Fix indentation due to pastebin patch losing a newline
This was SVN commit r18003.
2016-04-08 14:43:06 +00:00
59c6fd44a0 Remove stamina completely. Patch by fatherbushido
This was SVN commit r18002.
2016-04-08 14:36:18 +00:00
524d35ffdc Stop defense tower techs from affecting wall tower stats
This was SVN commit r17999.
2016-04-07 16:57:00 +00:00
017d5cc7de petra: fix serialization on f057eb5aba and fix placement of rotary mills
This was SVN commit r17998.
2016-04-07 16:55:08 +00:00
dd7ee8f53f Rename StrictAlly to ExclusiveAlly, since that term was already used in the AI code.
This was SVN commit r17997.
2016-04-07 16:51:25 +00:00
3c40131c61 Player component cleanup.
Remove unneeded parenthesis.
Restore indentation.

This was SVN commit r17996.
2016-04-07 10:57:11 +00:00
f7099d364c Fix typo
This was SVN commit r17995.
2016-04-07 08:23:06 +00:00
ffe2c7bbb4 Add methods to check for strickt alliance. Patch by fatherbushido
This was SVN commit r17994.
2016-04-07 08:12:15 +00:00
f8ce6819b9 Add s1lence to credits
This was SVN commit r17993.
2016-04-07 07:24:14 +00:00
6471a54c9f Refactor GetEntityCollisions to make it clear what the function actually does since the new pathfinder
This was SVN commit r17992.
2016-04-06 17:36:47 +00:00
9aa829d034 Add female Greek voice and musicians credits.
This was SVN commit r17991.
2016-04-06 16:56:29 +00:00
7d9f64ca40 Set default model of cart wall tower to Idle while constructing. Fixes #3504
This was SVN commit r17990.
2016-04-06 12:59:23 +00:00
eeb07d8231 Don't show bridges on minimap, and don't let them change ownership
This was SVN commit r17989.
2016-04-06 11:44:05 +00:00
fd4e899f11 Remove useless History tags from the templates in preparation of #3212
This was SVN commit r17988.
2016-04-06 09:53:53 +00:00
ccf0f74970 Random-map-script cleanup.
Flatten 37 variables into 3 objects and give them proper names.

This was SVN commit r17987.
2016-04-05 22:32:51 +00:00
138724ce0f Random-map-script cleanup.
Rename biomeID to g_BiomeID.

This was SVN commit r17986.
2016-04-05 18:49:37 +00:00
5744c2c6b0 petra: improve warning and warn only once when garrisonManager gets muddled
This was SVN commit r17985.
2016-04-05 18:44:15 +00:00
8b0d24048a First unit test for auras
This was SVN commit r17983.
2016-04-05 15:28:38 +00:00
4be96ece08 Implement stackable auras + fix an issue with techs, auras and ownership changes. Patch by fatherbushido. Fixes #3792
This was SVN commit r17982.
2016-04-05 14:13:44 +00:00
70a3201b23 Remove triple X comment pollution from maps.
This was SVN commit r17981.
2016-04-05 11:53:05 +00:00
62b7c07353 Remove unused author and version tag from ardennes forest.
This was SVN commit r17980.
2016-04-05 11:22:16 +00:00
bfa94b87ae Bumps up version number.
This was SVN commit r17978.
2016-04-04 21:20:45 +00:00
a7806675fb This was SVN commit r17977. 2016-04-04 21:18:58 +00:00
6c3964f52a Cleanup of SoundGroup XML files.
Remove some useless settings using the default values.
Remove the obsolete <Replacement> tag.
Update some documentation in the code, fix whitespace and unify line
endings.

Patch by otero, fixes #3268

This was SVN commit r17976.
2016-04-04 20:54:48 +00:00
46ead523b8 Cleanup of the Auras code in preparation of stackable auras. Implements auras being enabled by techs. Refs #3792. Patch by fatherbushido
This was SVN commit r17974.
2016-04-04 18:55:44 +00:00
d7b62e0af7 cleanup of the ai api, with removal of some old stuff
This was SVN commit r17973.
2016-04-04 18:12:48 +00:00
f057eb5aba petra now uses corrals on maps with low starting resources
This was SVN commit r17971.
2016-04-03 09:16:14 +00:00
63fad07905 nerf a bit wall towers
This was SVN commit r17970.
2016-04-03 09:13:13 +00:00
1d0c0e00e5 allows destroying animals when controlAllUnits is set
This was SVN commit r17969.
2016-04-02 14:58:31 +00:00
8211f95978 petra cleanup
This was SVN commit r17968.
2016-04-02 14:49:08 +00:00
18960ddcf8 fix petra training of support units, fixes #3864
This was SVN commit r17967.
2016-04-02 14:23:14 +00:00
42b93c45b8 fix playerData of Forest Battle map
This was SVN commit r17966.
2016-04-02 14:21:20 +00:00
3f1b30a8e3 Update Translators credits and add texane to the list of contributors (refs #3863).
This was SVN commit r17964.
2016-03-28 00:23:04 +00:00
ad34950780 Add a missing check to 347ffabaeb as the previous one throws errors in case a dead sheep lies in the selection rectangle.
Thanks bb for reporting, refs #2407.

This was SVN commit r17957.
2016-03-27 12:46:18 +00:00
6b2a3bb549 Translate the "Observer" choice in the observer mode player selection dropdown.
This was SVN commit r17956.
2016-03-26 19:19:49 +00:00
c777e34cba Properly fix the typo mentioned in 91ed318f0d. The ++i in the for loop already increments i so doing it once more is not wanted.
Fixes #3854.

This was SVN commit r17955.
2016-03-26 13:25:51 +00:00
6b212dc6ad Fix promotion of barrack champions for the Macedonians. Fixes #3853. Patch by fatherbushido.
This was SVN commit r17954.
2016-03-26 11:21:49 +00:00
b0c74fdaa0 petra: fix a misbehaviour spotted by sanderd17, when the defenseManager tries to rescue units performing an attack
This was SVN commit r17953.
2016-03-25 18:21:13 +00:00
c5ede78373 Require players to own a wonder for 10minutes (instead of 5) before declaring them the winner of wonder-victory games.
This was SVN commit r17952.
2016-03-25 18:05:19 +00:00
6f0d0ff8f4 Round max hp of units in simulation. Refs #3855
This was SVN commit r17951.
2016-03-25 12:51:48 +00:00
e8decfbd2b Amend fdf7dabe18: the foundation component won't exist for a mirage (foundation inside the fog-of-war) so the miraged interface to it should be queried.
Fixes #3849.

This was SVN commit r17949.
2016-03-24 21:48:15 +00:00
aa64a92d1a Ignore production hotkeys for observers instead of throwing errors on press.
This was SVN commit r17948.
2016-03-24 21:26:34 +00:00
350422dcae Fix whitespace (leading mixed whitespace, trailing whitespace and missing newlines).
Remove three unused variables area, ix and iz.
Thanks mimo for reporting.

This was SVN commit r17947.
2016-03-24 15:53:53 +00:00
66267cb714 Remove a check for an edge case where the entrance of a bluff would be cutoff by the players territory.
Instead, reserve some space at the bottom of the slope for an entrance.
Finetune the terrain textures of bluffs depending on the biome.
Patch by _kali, refs #3455.

This was SVN commit r17946.
2016-03-24 15:34:36 +00:00
6312b71911 Improve the resource distribution on the map "Ambush" and maps using bluffs in general. Based on patch by _kali, refs #3455.
Bluffs:
Cover half instead of most of the area of bluffs with forests (to allow
placing CCs / forts there).
Proportionally reduce the likelyhood of placing metal/stone on bluffs.
Compensate the absence of forests on the savanna biome with more
straggler trees.

Ambush:
Place forests also on the mainland (so that players are not immediately
forced to expand to bluffs).
Reduce the amount of berries and animals a bit following 91e8248273.

This was SVN commit r17945.
2016-03-24 14:54:47 +00:00
ebfd214a19 Return Infinity instead of undefined in BuildingAI.GetMaxArrowCount. Refs #3196, #3846 and 82fa9d8f5b.
Notice the previous check `if (count > this.GetMaxArrowCount())`
implicitly relied on
numerical comparisons returning false if one of the two arguments is
undefined.

This was SVN commit r17944.
2016-03-24 13:25:47 +00:00
58d3425ad4 Reduce the number of lobby gamelist updates by roughly 60-80% by eliminating duplicate packets, refs #3847.
This was SVN commit r17943.
2016-03-24 12:08:00 +00:00
572847ddd4 Revert 1f34a004e5.
It breaks the Windows build by using time_t and it changes too many
things to the way lobby messages are processed to be entirely safe to
commit now.
Refs #3832.

As a side effect it reverts e514aca599, refs #3350.

This was SVN commit r17941.
2016-03-23 21:58:23 +00:00
c58bbfaa14 Select observer for defeated players, but keep the current player selected on win.
This was SVN commit r17940.
2016-03-23 13:49:59 +00:00
82fa9d8f5b Fix counting issue with previous commit
This was SVN commit r17939.
2016-03-23 10:01:27 +00:00
63d276b73b Fix counting of arrows in buildings: don't remove entities twice from the garrisonholder. Fixes #3846
This was SVN commit r17938.
2016-03-23 09:04:02 +00:00
e7deb587bb Random-map-script cleanup.
Use constants when checking for the biome type.
Remove unused code for nonexistent biomeID 0 from gaia.js.

This was SVN commit r17937.
2016-03-23 03:05:39 +00:00
cfb8a6e30e Fix confusion between concat and push in map Frontier, patch by _kali.
This was SVN commit r17936.
2016-03-23 02:06:06 +00:00
fc14e733bd Change an Object into a Map, this should stop the deserializer of reordering the keys in some cases and stop an OOS on rejoining. Refs #3375
This was SVN commit r17935.
2016-03-22 20:57:27 +00:00
c43ce2ca55 cleanup of missing semicolon
This was SVN commit r17934.
2016-03-21 20:33:05 +00:00
1a02684cf7 Check for GUID, as the playerIndex doesn't distinguish between observers. Refs #1767.
(Avoid private messages where sender and addressee are identical).

This was SVN commit r17933.
2016-03-21 18:58:52 +00:00
f8d05ed5c3 fix petra serialization (add two variables forgotten, and remove two useless ones)
This was SVN commit r17932.
2016-03-21 18:15:39 +00:00
820846b56b Completely initialise Auras even before ownership is set. Fixes #3843
This was SVN commit r17931.
2016-03-21 16:22:40 +00:00
0448a3de73 Lobby cleanup.
Make sense of the spammonitor by using an object instead of an array and
introducing a global constant instead of using magic numbers.

This was SVN commit r17930.
2016-03-21 14:29:41 +00:00
e514aca599 Display chat-timestamps in the lobby in the correct timezone, refs #3350.
This was SVN commit r17929.
2016-03-21 13:53:22 +00:00
1f34a004e5 Add timestamps to the GUI/chat-notifications sent from XmppClient, even if it's not a historical message.
Correct spammonitor behavior for historical messages and when returning
to the lobby from a game.
Patch by Josh, fixes #3832.

This was SVN commit r17928.
2016-03-21 13:48:22 +00:00
f8a09cf5c1 Seleucid barracks model, actor, AO
This was SVN commit r17926.
2016-03-21 10:25:01 +00:00
8f4daa9dd0 Lobby performance improvement.
Since 8b437a0b1c, updatePlayerList() is called everytime a muc-message
is received, calling playersBox.SelectionChange(), calling
displayProfile() which requests the profile from the server again.
Similar cases should be handled in #3840.

This was SVN commit r17924.
2016-03-21 03:44:01 +00:00
cfe169d2bc Reduce lobbybot load by only requesting a ratinglist when actually opening the leaderboard (as suggested by scythetwirler).
This was SVN commit r17923.
2016-03-21 01:51:05 +00:00
9e338f4461 Barter component cleanup. Replace deprecated for-each.
This was SVN commit r17922.
2016-03-21 00:45:32 +00:00
10b6022557 Convert string to int conversion in the lobby-leaderboard.
This was SVN commit r17921.
2016-03-21 00:38:31 +00:00
91e8248273 Make "Lion's Den" and "Empre" default maps.
Add more animals/berries to "Ambush".
Improve placing of initial resources on all of _kali's maps.

* Increase distance from chickens to CC from `7` to `9` (to account for
roman CCs, refs #3836)
* Increase number of initial trees from `5` to `25` (ensuring players
have enough wood to build a new CC)
* Avoid resource collisions by increasing the minDistance from `2` to
`4` (when not using angles)
* Ensure that initial resources are placed (by first placing mines and
adding retry-loops for the other resources)
  Notice The loop can't be moved to `createObjectGroup` since
    * the parameters (like `mAngle`) also need to randomized again
    * we need to place initial resources in range of the actual
playerbase

This was SVN commit r17920.
2016-03-20 19:03:43 +00:00
b84b9a374a Improve some strings based on translators' feedback.
This was SVN commit r17919.
2016-03-20 18:58:59 +00:00
81948477df fix the test when changing markets, fixes #3838
This was SVN commit r17918.
2016-03-20 14:00:49 +00:00