1
0
forked from 0ad/0ad
Commit Graph

15901 Commits

Author SHA1 Message Date
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
0e5815b78f Remove trailing whitespace.
This was SVN commit r18158.
2016-05-12 11:27:21 +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
2a830fdb6a Support building with mozjs 31.5 used in Ubuntu PPA.
Fixes #3039.

This was SVN commit r18153.
2016-05-10 09:02:58 +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
b45e3e46f7 add non-blocking obstruction to mirages, fixes #3957, refs #2951
This was SVN commit r18145.
2016-05-08 17:26:43 +00:00
883d1aaf48 Fix Windows build. Those includes in 1a3fb29ff3 didn't resolve properly on Windows, refs #3953.
This was SVN commit r18143.
2016-05-08 16:25:00 +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
1a3fb29ff3 Network cleanup, fixes #3953.
Don't compare for "127.0.0.1" to identify the host, but check for a new
boolean flag that is set by the client, refs #2854.
Remove an unneeded IP address conversion from u32 to string, refs #3241.

This was SVN commit r18140.
2016-05-08 11:46:19 +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
77224548bf Use references instead of copies
This was SVN commit r18130.
2016-05-02 19:03:19 +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
462540585b Network cleanup.
Only send the network-warnings to clients that successfully joined the
gamesetup or game.
Thus save a bit performance and
prevents a rare, harmless FSM update error (like in refs #3199) in case
a client received the message while authenticating.
Reported by fatherbushido, refs #3264.

This was SVN commit r18117.
2016-05-01 10:33:51 +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