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

14316 Commits

Author SHA1 Message Date
David Lewis 87677089ff Rename visible strings from Indian to Native 2017-09-03 16:45:46 -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
Mike Pope ccd70e6f4b Fix HighScoresMessage serialization, BR#3084. 2017-08-10 18:52:44 +09:30
Mike Pope 6b845fff1a Move HighScoreMessage to HighScoresMessage to avoid confusion with its HighScore elements. 2017-08-10 18:30:01 +09:30
Mike Pope d4e513ec05 Fix use of compareVersion to not accept null case, BR#3087. 2017-08-10 18:23:01 +09:30
David Lewis ff42a124d3 Add Travis CI Build Status and YAML 
Add ant-optional, Travis omits JUnit by default
    Add git ignore entry for MACOS .DS_Store files
    Add Travis CI yml file for testing builds

    https://travis-ci.org/FreeCol/freecol
 2017-08-09 14:43:05 -07:00
David Lewis 1729b96f6e Add Shippable Wagons Mod 
commit bdcdbea3e7469db33330cb8b006890c2fb93e38d
Author: David Lewis <highwayoflife@gmail.com>
Date:   Wed Aug 9 11:42:04 2017 -0700

    Remove information not needed in embedded mod README

commit b66cef10732a1181ffc815f57cab558dffded879
Author: David Lewis <highwayoflife@gmail.com>
Date:   Sun Aug 6 10:09:28 2017 -0700

    Add Shippable Wagons Mod
 2017-08-09 11:52:03 -07:00
David Lewis 8522d0c293 Add enhanced Seasoned Scouts mod 
Squashed commit of the following:

commit a2b25654f4281c1a9328876a5814d60ccbba9bd7
Author: David Lewis <highwayoflife@gmail.com>
Date:   Wed Aug 9 11:43:06 2017 -0700

    Remove useless info from embedded mod README

commit ddddfd3774ab5c0f5eea80466fe82e0058691b54
Author: David Lewis <highwayoflife@gmail.com>
Date:   Sun Aug 6 10:08:27 2017 -0700

    Adding Enhanced Scouts Mod
 2017-08-09 11:50:22 -07:00
David Lewis 48c2af609f Adding expandExperience mod, allowing experience in buildings 2017-08-09 11:49:27 -07:00
David Lewis 89fe688e37 Add resources for native colonist dragoon and scout 2017-08-08 19:25:44 -07:00
Mike Pope eb5fd8c75d Suppress warning due to creating Intervention Force land units at sea, BR#3082. 2017-08-07 11:50:57 +09:30
Mike Pope 962e04bbad Defend against NPE, BR#3075. 2017-08-06 18:55:49 +09:30
Mike Pope 183a9a1f4a Merge commit 'a24d7017630c4a7df839cebd118a8fb134496474' 2017-08-06 12:06:14 +09:30
Mike Pope 99d1aee609 Debug improvement from David Lewis. 2017-08-06 11:55:55 +09:30
Mike Pope 6a6b628dc5 Fix crash in Requirements panel, BR#3073. 2017-08-05 19:16:47 +09:30
Mike Pope 1bcee16993 Add special pricing for ManOWar so it can be costed as part of a mercenary force. 2017-08-05 16:03:44 +09:30
Mike Pope 8f3842c53f Fix randomization crash, BR#3076. 2017-08-05 16:01:27 +09:30
Mike Pope 5b6d58f45e Fix bad mercenary offer, BR#3072. 2017-08-05 14:46:47 +09:30
David Lewis a24d701763 Fix NPE on Turn Report for European Markets after player is rebel 2017-08-03 17:21:31 -07:00