mirrors
/
freecol
mirror of https://github.com/FreeCol/freecol.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
14,335 Commits 13 Branches 58 Tags 878 MiB
Commit Graph

14335 Commits

Author SHA1 Message Date
David Lewis 7de8062f39 GNU GPL LICENSE file to meet Community standards. 2017-09-08 13:27:13 -07:00
David Lewis bb2700d530 Merge pull request #2 from FreeCol/ticket/ir222 
Create preference option to show region naming dialog
 2017-09-08 12:28:34 -07:00
David Lewis 2eb830f02e Merge branch 'master' into ticket/ir222 2017-09-08 12:26:27 -07:00
David Lewis f0b22fa531 Merge pull request #4 from FreeCol/ticket/BR3093 
BR3093: Col1 Changes to Lost City Rumours
 2017-09-08 12:24:33 -07:00
David Lewis 26f42ce668 Merge pull request #3 from FreeCol/trade_modifier_option2 
BR3092 New Game Options for Trading with Natives
 2017-09-08 12:22:43 -07:00
David Lewis 34a3855e70 Change alerm bonus percent lower/more reasonable 2017-09-08 12:17:45 -07:00
David Lewis 648eb2fb40 Merge branch 'master' into trade_modifier_option2 2017-09-08 10:31:56 -07:00
Mike Pope 6bd3a52366 Whitespace cleanup in strings file. 2017-09-07 20:00:39 +09:30
Mike Pope 4ec58c09f5 Separate clean target, fixing installer-translations fail, BR#3091. 2017-09-07 19:42:45 +09:30
Niklas Laxström 3a8e610376 Localisation updates from https://translatewiki.net. 2017-09-07 07:37:31 +02:00
Niklas Laxström 85c5d83618 Localisation updates from https://translatewiki.net. 2017-09-07 07:18:42 +02:00
David Lewis de60164a73 BR3093: Col1 Changes to Lost City Rumours 
* Expert scouts never vanish
* DeSoto forces positive, always.
 2017-09-06 01:36:51 -07:00
David Lewis ef9a558e0e Fix lost city rumour modifier for percentBad 2017-09-06 00:59:20 -07:00
David Lewis fa6c423f2f Merge branch 'master' into trade_modifier_option2 2017-09-05 23:58:55 -07:00
Niklas Laxström 7157477f3c Localisation updates from https://translatewiki.net. 2017-09-04 09:01:20 +02:00
David Lewis 3bb0962646 Alarm Bonus for buying was too high 2017-09-03 03:53:01 -07:00
David Lewis db2814b3cb BR3092 New Game Options for Trading with Natives 2017-09-03 03:42:02 -07:00
David Lewis 57448df757 Merge branch 'master' into ticket/ir222 2017-09-02 12:09:20 -07:00
Mike Pope 751b33db30 Locale setting fixes. 2017-08-31 19:59:24 +09:30
Mike Pope c6ed9ba66b Add missing message. 2017-08-31 19:46:25 +09:30
Niklas Laxström ab73fbec66 Localisation updates from https://translatewiki.net. 2017-08-31 07:56:08 +02:00
Mike Pope 267a9408e7 Add and use StringUtils.{up,down}Case. 2017-08-30 19:11:08 +09:30
Mike Pope 0214170aa3 Prevent NPE in ColonyTile.improvedBy. 2017-08-30 10:40:47 +09:30
Niklas Laxström ad02e89aa3 Localisation updates from https://translatewiki.net. 2017-08-28 07:41:04 +02:00
Mike Pope 61db8110d9 Remove *all* units from the map on player death, preventing confusion in revenge mode. 2017-08-27 13:53:22 +09:30
Mike Pope 1fbe4b9012 Move units into free buildings, IR#220. 2017-08-27 11:15:07 +09:30
Mike Pope 5f533bb8ab Increase logging detail around socket connections, BR#3090. 2017-08-27 11:12:49 +09:30
Mike Pope 39caef2af5 Do not restrict sendToAll to live players, the dead need to be told they are dead, BR#3089b. 2017-08-26 12:44:44 +09:30
Mike Pope 2e81afeb96 Encourage multiple message AI subhandlers to run before the whole handler is considered complete. 2017-08-25 21:04:19 +09:30
Mike Pope 9e6d6630bf Cleanup with csWithdraw. 2017-08-25 21:03:12 +09:30
Mike Pope 686af78a28 Fix some more colony tile reassignment weirdness. 2017-08-25 11:48:39 +09:30
Mike Pope b4e82e7f82 Option merge log message collapse. 2017-08-24 19:15:06 +09:30
Mike Pope d51086b777 Suppress action option skip log. 2017-08-24 17:27:32 +09:30
Mike Pope 8c8470c7d9 Old REFs could be created without loading the navy. 2017-08-24 17:26:16 +09:30
Mike Pope 1468fae5c0 Clean up checkForDeath return. 2017-08-24 17:24:46 +09:30
Niklas Laxström 1f14123333 Localisation updates from https://translatewiki.net. 2017-08-24 09:26:46 +02:00
David Lewis 10132bf699 Updating bundled junit from 4.11 to 4.12 2017-08-21 15:04:44 -07:00
Niklas Laxström c630e40c70 Localisation updates from https://translatewiki.net. 2017-08-21 07:38:00 +02:00
Mike Pope aec0a25d44 Fix nation labelling, BR#3089a. 2017-08-20 10:49:07 +09:30
Mike Pope 502eff5bf6 Rewrite moveDirection et al for automatic movement, BR#3083. 2017-08-18 17:15:22 +09:30
David Lewis 7e4c75ffd6 Fix UnitTests for move and client connect 2017-08-17 17:06:14 -07:00
Niklas Laxström c9be1fd598 Localisation updates from https://translatewiki.net. 2017-08-17 15:32:47 +02:00
David Lewis 5895ab633f Add additional logging 
* Log server connection failure
* More info on template substitution failure
 2017-08-16 11:17:44 -07:00
Mike Pope 020c509ef7 Update developer bug fix status advice. 2017-08-16 19:16:24 +09:30
Niklas Laxström 5bad723818 Localisation updates from https://translatewiki.net. 2017-08-14 08:16:08 +02:00
Mike Pope 3a49377374 Merge commit '7aac650a672e2484d37f51c31f3b056d124b2e8f' into t-3088 2017-08-11 16:36:48 +09:30
Mike Pope 40c37804d4 Prevent kings regulars from being captured/surrendered. 2017-08-11 16:33:52 +09:30
Mike Pope cb9cc687b2 Add new fake nation type to enable missionary role in unit list options, BR#3066. 2017-08-11 16:03:43 +09:30
Mike Pope ee08ed9124 Fix template choice problem, BR#3085. 2017-08-11 09:41:08 +09:30
David Lewis 7aac650a67 Fixes tooltips for education buildings BR#3088 2017-08-10 15:10:38 -07:00