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

1452 Commits

Author SHA1 Message Date
Mike Pope b6efe3f389 Clean up some exception softening (findbugs). 2019-02-24 10:14:34 +10:30
Mike Pope 4cec44f8d0 Add and use 2-arg Specification.findType. 2019-02-22 19:41:32 +10:30
Mike Pope 799817f03a Move some code into more natural places. 2019-02-20 09:32:41 +10:30
Mike Pope c10348d385 Clean up IndianSettlementBuilder. 2019-02-18 09:22:48 +10:30
Mike Pope 3779f73242 Move some constants to Constants. 2019-02-16 15:51:22 +10:30
Mike Pope 37291e6e5e Add and use ScopeContainer. 2019-02-14 07:18:15 +10:30
Mike Pope 5684152394 Player unit list should be a set. 2019-02-08 12:17:09 +10:30
Mike Pope c1548d4594 Use Files.new*putStream not new File*putStream. 2019-02-06 20:49:01 +10:30
Mike Pope a475318159 Improve use of findPath, catch null end early so it can be debugged. 2019-01-24 16:42:41 +10:30
Mike Pope f678aae63d Add and use Map.populateTiles. 2019-01-18 10:41:04 +10:30
Mike Pope 8bd48215e7 Replace getAllTiles with getTiles(<pred>). 2019-01-17 11:12:16 +10:30
Mike Pope 4bd173c546 Fix some misleading names in MapBuilder. 2019-01-15 08:38:45 +10:30
Mike Pope ebb4bf3c13 Make sure region discoverer is correctly synchronized. 2019-01-12 13:14:11 +10:30
Mike Pope f7a76b015c Bump copyright year. 2019-01-07 19:59:49 +10:30
Mike Pope 3ba15eb665 REF not growing, BR#3151. 2019-01-07 12:16:10 +10:30
Mike Pope 2eb2a96a02 Fix test failure, experience gets reset on upgrade. 2018-08-12 16:48:16 +09:30
calebrw 5b6b8996e8 Update all applicable Copyright tags to 2018 2018-05-06 21:47:39 -05:00
Mike Pope 966c2cbf90 Synchronize trade route stop handling. 2018-01-15 15:10:35 +10:30
Mike Pope 523c683c4b Yet another pathfinding rework, allowing goto path to village, BR#3126. 2018-01-13 12:42:26 +10:30
Mike Pope bd76fc6520 Rename maps to .fsm. 2017-12-21 18:54:46 +10:30
Mike Pope 688ff91f7b Clean up file filters. 2017-12-19 18:42:12 +10:30
Mike Pope 16da4bb8e3 Break European transactions up into chunks, BR#3108. 2017-12-12 19:58:36 +10:30
Mike Pope c148009794 Audit uses of setMap. 2017-10-16 18:12:52 +10:30
Mike Pope e308f4fc52 Revise map generation to work in place. 2017-10-13 10:10:40 +10:30
Mike Pope 3d6eb35144 Clean up uses of "new ServerGame". 2017-10-11 19:49:53 +10:30
Mike Pope 3661074e30 Abstract out game in map generator/s. 2017-10-10 18:29:44 +10:30
Mike Pope eae5c99c62 Synchronize access to Game.players. 2017-10-06 14:25:33 +10:30
Mike Pope b578952ed2 Add localhost fallback for server socket creation, BR#3090. 2017-09-28 19:43:16 +09:30
Mike Pope 267d6aad81 Clean up unnecessary getOption calls and use of non-specific option accessors. 2017-09-12 19:07:15 +09:30
Mike Pope 17f78d9a3c Clean up Specification option handling. 2017-09-12 13:56:42 +09:30
David Lewis 081f2246fc Disable sound test for now 
To enable build failure on Travis CI builds, which don't have a mixer available.
 2017-09-11 10:04:07 -07:00
Mike Pope 751b33db30 Locale setting fixes. 2017-08-31 19:59:24 +09:30
Mike Pope 1468fae5c0 Clean up checkForDeath return. 2017-08-24 17:24:46 +09:30
David Lewis 10132bf699 Updating bundled junit from 4.11 to 4.12 2017-08-21 15:04:44 -07:00
David Lewis 7e4c75ffd6 Fix UnitTests for move and client connect 2017-08-17 17:06:14 -07:00
Mike Pope 79517bf4c7 Start removing DOMMessage references. 2017-07-09 16:07:53 +09:30
Mike Pope 6190847473 Time out with error message on initialization fail, rather than just hanging. 2017-06-16 09:30:14 +09:30
Mike Pope 7905d4e1da Tidy exception handling of the FCXW constructor. 2017-06-12 17:22:00 +09:30
Mike Pope 08f3e246a6 Distinguish set/add for FCGOs. 2017-05-29 18:09:38 +09:30
Mike Pope fc125172dc Robustness improvement for FF-test. 2017-04-28 11:34:42 +09:30
Mike Pope 650361492c TileImprovement warning cleanup. 2017-04-27 18:49:42 +09:30
Mike Pope 0b88066852 Move most colony warnings to csWarnings, called at the end of Player.csNewTurn, BR#3042. 2017-04-24 17:47:36 +09:30
Mike Pope 739b7a4865 priceGoods now throws FreeColException if the trade is impossible, BR#3040 2017-04-24 17:39:26 +09:30
Mike Pope a5b4de3da6 Move UnitChange to UnitTypeChange as FCSOT, so they need an identifier field. 2017-03-17 16:37:59 +10:30
Mike Pope 3e823ba2f0 @compat 0.10.x removal: Cleanup in difficulty option handling. 2017-03-10 18:34:57 +10:30
Sebastian Zhorel b469331367 Merge branch 'master' into more-river-styles 2017-02-20 18:33:01 +01:00
Mike Pope 37b8c74686 Lock access to Game.freeColGameObjects. 2017-02-13 18:27:23 +10:30
Mike Pope 05711b1781 Add and use Utils.delay. 2017-02-11 14:08:49 +10:30
Sebastian Zhorel 5298a1e283 Remove old TileImprovementStyle, update tests and code checking the style on xml-reading 2017-02-10 18:34:06 +01:00
Sebastian Zhorel e163ed2f62 Fix test relying on being able to create broken rivers, which is not possible anymore 2017-02-08 13:36:34 +01:00
Mike Pope a4d0e2b6a4 Owned unit removal still failing. 2017-01-31 11:46:44 +10:30
Mike Pope 9a7a4659b0 Expand FreeColObject.copy. 2017-01-24 14:17:16 +10:30
Mike Pope 08a75bc07d Cache TCs in FreeColTcFile. 2017-01-19 07:51:36 +10:30
Mike Pope 8c52aab51b Add and use FreeColDirectories.getModFileList. 2017-01-13 18:31:34 +10:30
Mike Pope 4c1c123be2 Missed a use for getMapFileList. 2017-01-13 18:28:16 +10:30
Mike Pope 3ede64899f Add and use FreeColDirectories.getTcFileList. 2017-01-12 19:02:22 +10:30
Mike Pope ce59321e13 Move ChangeSet to common/networking. 2017-01-09 13:03:09 +10:30
calebrw 45f652fdb3 Bump year to 2017 2017-01-01 20:55:05 -06:00
Mike Pope 4cb58eb310 Move guts of PGIH.login to ConnectController. 2016-12-24 12:44:05 +10:30
Mike Pope 46bfce7ff0 Route all logouts through CC.requestLogout. 2016-12-24 12:19:25 +10:30
Mike Pope 01abb56a09 Display European price when selling, IR#43, from Brian Kim, Louise Zhang, Seongmin Park and Michael Jeffers 2016-12-20 19:27:34 +10:30
Mike Pope 032d5b579f More reconnect fixes. 2016-12-19 19:00:28 +10:30
Mike Pope 4f8ac2b4c3 Drop underused client.Worker. 2016-12-19 17:32:43 +10:30
Mike Pope 62747e19af Handle logout in client. 2016-12-17 16:21:21 +10:30
Mike Pope 3ca57121ff FreeColServer.GameState -> ServerState. 2016-11-26 14:41:35 +10:30
Michael Pope ac0794ba0d Separate "startGame" functionality from login(). 2016-11-26 11:40:51 +10:30
Mike Pope 1aec16103d Clean up FreeColServer especially GameState handling. 2016-11-21 18:46:23 +10:30
Michael Pope c3b9c20787 Simplify/split ServerPlayer constructor. 2016-11-14 18:45:55 +10:30
Michael Pope f11a15c234 Header cleanup in UnitTest. 2016-11-14 18:21:21 +10:30
Mike Pope fce73e52c8 Expand serverHandler to PreGameController. 2016-11-12 16:25:17 +10:30
Mike Pope ce5b602170 Factor out some common code in FreeColServer. 2016-11-07 17:53:10 +10:30
Mike Pope f1a752fe1e Update Casas, use new UnitChangeTypes. 2016-11-01 19:28:43 +10:30
Mike Pope b46d5c935f Remove potential for crash in BaseCostDeciderTest. 2016-10-18 19:40:12 +10:30
Mike Pope 1a97d56109 Move GameOptions into options, like MapGeneratorOptions. 2016-10-17 19:51:41 +10:30
Mike Pope 616ca770a1 Added sound for meeting the Sioux, from Caleb, BR#2043d 2016-10-16 11:00:16 +10:30
Mike Pope e871dd59e9 Bring error message into ConnectController.login. 2016-10-14 19:36:11 +10:30
Mike Pope 60428bc238 ConnectController.login() explicit start-now handling. 2016-10-14 18:40:53 +10:30
Michael Pope 2c36892ec6 Drop Role.compareTo. 2016-09-27 07:47:34 +09:30
Mike Pope 2d9078852a Use List.sort, not Collections.sort. 2016-09-25 12:21:28 +09:30
Mike Pope 7352e08a5f Revert git misadventure. 2016-09-24 17:09:47 +09:30
calebrw c233e6128d Merge recent core changes into personal repository 
# Conflicts:
#	src/net/sf/freecol/client/FreeColClient.java
#	src/net/sf/freecol/client/control/InGameController.java
#	src/net/sf/freecol/client/control/InGameInputHandler.java
#	src/net/sf/freecol/client/gui/panel/BuildQueuePanel.java
#	src/net/sf/freecol/client/gui/panel/CargoPanel.java
#	src/net/sf/freecol/client/gui/panel/LabourData.java
#	src/net/sf/freecol/client/gui/panel/QuickActionMenu.java
#	src/net/sf/freecol/client/gui/panel/UnitPanel.java
#	src/net/sf/freecol/common/model/ColonyTile.java
#	src/net/sf/freecol/common/model/Europe.java
#	src/net/sf/freecol/common/model/Market.java
#	src/net/sf/freecol/common/model/Role.java
#	src/net/sf/freecol/common/model/Settlement.java
#	src/net/sf/freecol/common/model/Tile.java
#	src/net/sf/freecol/common/model/Unit.java
#	src/net/sf/freecol/common/model/UnitLocation.java
#	src/net/sf/freecol/common/model/UnitType.java
#	src/net/sf/freecol/common/resources/ResourceManager.java
#	src/net/sf/freecol/server/control/InGameController.java
#	src/net/sf/freecol/server/generator/River.java
#	src/net/sf/freecol/server/model/ServerUnit.java
 2016-09-23 21:00:40 -05:00
Michael Pope 211e150555 Clean up last uses of <code>. 2016-09-23 16:23:11 +09:30
calebrw 1f0ace1c9d Make methods static as available. 2016-09-22 21:18:55 -05:00
calebrw 49f8422c19 Improve wording of TEST-HOWTO to increase legibility and fix some typos 2016-08-31 00:34:40 -05:00
Mike Pope 9126703b37 isMilitaryGoods -> getMilitary, and drop hardcoded goods types in IndianSettlement. 2016-08-08 19:56:49 +09:30
Mike Pope e76e25f33e Add muskets production to testFactoryProduction. 2016-08-05 10:19:52 +09:30
Mike Pope 4f8527b055 Cross production fixes, BR#2981. 2016-08-05 10:03:06 +09:30
Mike Pope f9f663bd37 Lumber production fixes, BR#2981. 2016-08-04 15:23:36 +09:30
Mike Pope 5dfcf3c717 Rework unit goods-specific production bonuses. 2016-08-04 14:42:52 +09:30
Mike Pope 2a11f361ff Rework colony bonus handling. 2016-08-04 13:51:20 +09:30
Mike Pope 62879eedc0 Make factory production test more generic. 2016-08-04 12:59:04 +09:30
Mike Pope 6c51b05847 Fix level-multiplier to goods penalties for weak units, BR#2979. 2016-08-03 18:59:59 +09:30
Mike Pope cc866f2608 Add comprehensive test of tool production, data contributed by Lone_Wolf. 2016-07-31 14:36:44 +09:30
Mike Pope ecccfcb567 Migrate downgrade/upgrade to unit-change-type. 2016-07-30 16:32:43 +09:30
Mike Pope 71c5267672 Silver should need minerals to be produced on some tile types, BR#2978. 2016-07-29 12:41:36 +09:30
Michael Pope d32efaac14 login() returns error message. 2016-07-20 12:43:25 +09:30
Michael Pope 7671eeec31 Clean up some use of iterable(). 2016-07-19 18:54:48 +09:30
Michael Pope 5dd4f822c9 Add map form of forEach and use it. 2016-07-18 18:00:37 +09:30
Michael Pope 4616d44679 Add and use forEachTile. 2016-07-15 18:27:35 +09:30
Michael Pope 6da2682541 Move UnitTypeChange to FCSOT. 2016-07-15 18:11:43 +09:30