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

14308 Commits

Author SHA1 Message Date
David Lewis 0eef9440cb Absolute path for junit.jar lib 2017-08-21 17:21:29 -07:00
David Lewis 835af81790 Add new target for ci builds 2017-08-21 17:12:23 -07:00
David Lewis ec7bcaec8e Merge branch 'master' into travis_ci_test 2017-08-21 15:09:17 -07: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
David Lewis 389b8e934a Restart build with deploy 2017-08-20 21:48:12 -07:00
David Lewis ad390ef633 Change configuration for deploy 2017-08-20 21:31:31 -07:00
David Lewis 7556b97208 Add test branch 2017-08-20 21:01:26 -07:00
David Lewis aa01bad5da Allow deployments from all branches for now 2017-08-20 20:56:11 -07:00
David Lewis 6d3f99bb6a Add missing target branch 2017-08-20 20:49:57 -07:00
David Lewis 96a4f4429c Complete deploy script 2017-08-20 20:47:08 -07:00
David Lewis 4f2cc42fe9 Add Travis deployment for reports 2017-08-20 14:34:47 -07: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 1e8bee3e93 Change ant test command to testall 2017-08-17 17:21:45 -07:00
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
Mike Pope 62d86a3917 Fix choice of native trade transaction item, BR#3071. 2017-08-03 19:41:56 +09:30
Mike Pope 6114343a6a Fix migrant list truncation, BR#3066. 2017-08-03 19:13:08 +09:30
Niklas Laxström d7f8513cd6 Localisation updates from https://translatewiki.net. 2017-08-03 09:30:29 +02:00
Mike Pope 455290d0ec Handle predefined immigrant numbers, BR#3066. 2017-08-02 11:30:25 +09:30
Mike Pope a5d1522a51 Add (disabled) debug version of BuildableType.isAvailableTo. 2017-08-02 08:02:08 +09:30
Mike Pope bc795bb887 IndianSettlementPanel message fix, IR#221. 2017-08-02 08:00:22 +09:30
Mike Pope 739e495c01 Update unit display post-trade, BR#3070. 2017-08-01 18:24:57 +09:30
Mike Pope 522adb693a More type/role interaction fixes for BR#3058. 2017-08-01 11:15:30 +09:30