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

1452 Commits

Author SHA1 Message Date
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
Mike Pope 757cc84449 Copy tile improvement style when importing terrain, BR#2967. 2016-07-02 15:28:49 +09:30
Michael Pope b12abb8095 Work locations routines split. 2016-07-01 19:00:57 +09:30
Michael Pope dd62c0c098 More routines split into list and stream version. 2016-06-30 19:05:18 +09:30
Mike Pope f171cb45a9 Add and use forEachMapEntry. 2016-06-25 21:05:00 +09:30
Mike Pope 1d940d4206 getSettlements splits 2016-06-23 07:45:34 +09:30
Michael Pope 31685c83dd get*Players splits into list and stream forms. 2016-06-23 07:39:21 +09:30
Michael Pope fc1e2142d4 Reintroduce getUnits() returning stream. 2016-06-22 07:36:37 +09:30
Michael Pope 5a43aebb39 Settlement routines now have stream and list forms. 2016-06-19 21:15:38 +09:30
Michael Pope 49301f5608 getUnits -> getUnitList 2016-06-18 19:50:52 +09:30
Michael Pope 903c7eb6d3 Generalize any/none and use. 2016-06-17 18:46:20 +09:30
Michael Pope 2a7064e8b1 Remove unnecessary use of Iterator. 2016-06-17 18:42:48 +09:30
Michael Pope 4ce16a7f4e Expand use of matchKey. 2016-06-16 19:27:43 +09:30
Michael Pope 2701122045 Cut over getModifiers to return a stream. 2016-06-16 07:44:03 +09:30
Michael Pope 7a452cf423 Use streams for WorkLocation input/output lists. 2016-06-15 19:06:06 +09:30
Michael Pope 488333cb35 Tile.getProductionModifiers returns Stream. 2016-06-15 10:21:52 +09:30
Michael Pope 706a47c7ce Simplification of getPossibleProduction. 2016-06-14 07:53:33 +09:30
Mike Pope 32620c1f1a Revert use of iterable, its crashing. 2016-06-11 07:38:32 +09:30
Michael Pope 81e0fb0ddc Generalize count() and use simply. 2016-06-10 18:20:46 +09:30
Michael Pope d16f726122 Use iterable instead of toList. 2016-06-10 18:19:24 +09:30
Michael Pope 82db15ac90 rearrange* do not need to return anything. 2016-06-08 19:17:52 +09:30
Michael Pope 0935038505 Enable more XML indenting. 2016-06-02 16:59:56 +09:30
Michael Pope 4caac0bfc1 Add and use CollectionUtils.fileStream. 2016-05-31 19:07:32 +09:30
Michael Pope a138ed115f Cleanups in CollectionUtils. 2016-05-31 07:43:42 +09:30
Michael Pope b163c83911 Use Stream for ProductionType.getInputs. 2016-05-24 18:27:24 +09:30
Michael Pope 8a7abebb0f Use Stream for ProductionType.getOutputs. 2016-05-23 21:19:49 +09:30
Michael Pope 97bc840032 Bring back Unit.getWorkTile using WorkLocation.getWorkTile. 2016-05-06 11:57:05 +09:30
Michael Pope fe4e9b4408 Simplification of colony tile casting. 2016-05-05 07:26:47 +09:30
Michael Pope d8caccec7d Add and use WorkLocation.getWorkTile. 2016-05-03 15:06:05 +09:30
Mike Pope 35e8d06c47 Add and use generic getAdjacentSettlement. 2016-04-16 14:33:40 +09:30
Mike Pope 6ef6f2c379 Move public enums to .../common/model/Constants. 2016-03-28 15:26:20 +10:30
Mike Pope 13527192f7 Fix fail in difficulty levels, BR#2948. 2016-03-23 20:25:16 +10:30
Mike Pope 63e8148c99 Simplify native settlement count handling. 2016-03-08 20:54:53 +10:30
Mike Pope 10a2a2f849 getTradeRouteByName gains an exclusion parameter. 2016-03-08 11:17:45 +10:30
Mike Pope 13a05a96ea DOM removal from SetTradeRoutesMessage. 2016-02-23 13:10:52 +10:30
Mike Pope 8e661cecd4 Drop DOM-specific test, which is about to become inoperative. 2016-02-21 14:42:23 +10:30
Mike Pope 58864bfde1 FreeColGameObjectType -> FreeColSpecObjectType. 2016-02-14 14:50:57 +10:30
Michael Pope 24dbf1444e Add and use FreeColSpecObject. 2016-02-12 21:27:30 +10:30
Michael Pope 31f684fc7c More clean up in server IGC. 2016-01-28 20:27:00 +10:30
Mike Pope 545b7eb45c Drop DOM from GoodsTest. 2016-01-14 09:10:25 +10:30
Mike Pope 6c8a1d7e2e Update copyright year. 2016-01-04 19:37:25 +10:30
Michael Pope 8b8a998677 getXMLElementTagName -> getTagName 2016-01-04 19:28:04 +10:30
Michael Pope 90342b8dd0 Add and use StringTemplate.addTagged as a documentary aid. 2015-12-25 20:37:15 +10:30
Michael Pope 176f0961b5 Add transform wrapper for much of the J8 streams code. 2015-12-12 16:01:22 +10:30
Michael Pope 7c31a3a331 Move saving of active unit into the Game. 2015-12-03 19:48:57 +10:30
Mike Pope 2c38e06e7b Synchronize access to TIC.tileItems. 2015-11-16 18:47:44 +10:30
Michael Pope b517eb1162 Add and use TileItem.getLayer. 2015-11-16 12:02:23 +10:30
Mike Pope dd566cde09 Only accumulate attrition for units that are subject to it. 2015-10-25 09:28:21 +10:30
Sebastian Zhorel 61d68ccad9 Clean up unused variables in MissionAssignmentTest 2015-10-18 22:40:05 +02:00
Michael Pope 010064f103 Basic comparator simplifications. 2015-10-15 18:57:00 +10:30
Michael Pope 9a73ce4efd Add buildBuilding. 2015-10-01 07:50:47 +09:30
Michael Pope 6477d11771 Game.getPlayer -> getPlayerByNation{,Id}. 2015-09-29 17:53:09 +09:30
Michael Pope ca77900e6b Another test fix for occasional fail of testTrackerBug1616384. 2015-09-28 18:38:42 +09:30
Mike Pope b18b82e279 Do not keep trying to talk to the metaserver after first failure. 2015-09-26 21:12:21 +09:30
Mike Pope 7c7dd93d15 Many uses of Unit.getClosestSettlement checked the wrong return. 2015-09-26 11:28:36 +09:30
Sebastian Zhorel 127ee763a5 Clean up unused imports 2015-09-25 16:49:20 +02:00
Michael Pope 1effea1f36 Fix another test conditions failure. 2015-09-25 19:40:18 +09:30
Michael Pope bad6ab6cf2 Java8 stream list collections, including sorting. 2015-09-19 16:01:07 +09:30
Michael Pope 53d695109b Make tests more robust against unit placement. 2015-09-16 20:50:37 +09:30
Michael Pope 751cef07c2 Simplify file filters. 2015-09-15 20:47:15 +09:30
Mike Pope 3a4f5674cc More float->double conversion in combat. 2015-09-14 06:54:25 +09:30
Michael Pope 517330c735 Move lumber delivery bonuses to spec, BR#2884. 2015-09-02 10:36:31 +09:30
Mike Pope 9321ceef09 Convert functional Runnable creation to lambdas. 2015-08-30 21:11:07 +09:30
Sebastian Zhorel fe52024d3c Collect all z-index constants in a single place 2015-08-29 12:58:25 +02:00
Sebastian Zhorel 143f6361b2 Clean up all unused imports 2015-08-24 20:39:09 +02:00
Michael Pope b6e27151d8 Suppress tile improvement bonus for unattended non-food production on built improvements. 2015-08-11 10:30:09 +09:30
Michael Pope 5de4460fc3 Enforce IntegerOption limits. 2015-07-29 20:26:25 +09:30
Mike Pope fe0fe8cfeb Fix limit evaluation for player settlement lists, BR#2873. 2015-07-25 12:23:32 +09:30
Michael Pope cbcc95f4bb Rework loadClientOptions to not completely trust user supplied options. 2015-07-10 20:40:43 +09:30
Michael Pope bab07161ae Add simplifying alternate versions of getDefaultUnitType. 2015-07-01 18:43:18 +09:30
Michael Pope 90b3e0d679 Move Occupation out of Colony. 2015-06-30 19:54:36 +09:30
Michael Pope 4cb0756f0c Add loading of ModMessages*.properties for active mods only. 2015-06-24 19:22:30 +09:30
Mike Pope 90104dec36 Revalidate build queue after building addition, BR#2869. 2015-06-21 10:03:15 +09:30
Mike Pope ecbe391603 Omission from region key change. 2015-06-19 20:43:16 +09:30
Michael Pope 4119506837 Convert region name key to a stem key. 2015-06-19 15:45:01 +09:30
Michael Pope 0367281169 Stop using a Map to store Regions. 2015-06-18 20:11:00 +09:30
Michael Pope a5e07c2cd6 First part of the region fixes. 2015-06-17 19:51:07 +09:30
Michael Pope e1099e6ae2 Add Specification.getStorableGoodsTypeList. 2015-06-03 17:09:08 +09:30
Mike Pope eb314e51b3 Get rid of Turn.Season. 2015-06-01 10:39:20 +09:30
Mike Pope c5164c261d Fixed version of ages move. 2015-05-31 20:19:37 +09:30
Sebastian Zhorel d8932c3b23 Revert "Move ages out of Turn, add GameOptions.AGES to contain it." 
This reverts commit 200912ba5e.
 2015-05-31 12:15:01 +02:00
Mike Pope 200912ba5e Move ages out of Turn, add GameOptions.AGES to contain it. 2015-05-31 11:54:48 +09:30
Michael Pope 0b3a218ff8 Remove TurnSelector which is no longer used. 2015-05-29 20:36:42 +09:30
Michael Pope a66c5f21ba Move useful scripts to ./bin. 2015-05-13 09:46:25 +09:30
Mike Pope a3c5bb21bc Score AI European trade. 2015-05-12 07:28:01 +09:30
Mike Pope c06622c8b3 Simplify AbstractGoods.toString. 2015-05-09 16:38:54 +09:30
Michael Pope 64afca7f12 Fix indent on AI log analyzer. 2015-05-04 18:11:22 +09:30
Sebastian Zhorel cdd2d041fa Split up large constructor of FreeColClient and improve the order of calls a bit 2015-04-27 15:17:36 +02:00
Sebastian Zhorel c13893afda Clean up base resources partially, to improve game startup 2015-04-26 19:00:00 +02:00
Mike Pope 16ed8d1f0e Mass message renaming. 2015-04-23 21:34:50 +09:30
Sebastian Zhorel abdbd940e5 Move and fix SoundTest 2015-04-15 18:35:15 +02:00
Michael Pope fbaae685d6 Drop unitFormat glue, use StringTemplate.label()s. 2015-04-15 21:25:58 +09:30
Mike Pope da1111800f Add and use MonarchAction.getKey(). 2015-04-11 16:56:33 +09:30
Mike Pope 9b1de7e009 Time to split out Stance. 2015-04-11 16:07:30 +09:30
Mike Pope 558fdf27c8 Make use of expanded getDefaultUnitType, and add test. 2015-04-11 14:56:13 +09:30
Mike Pope c1fcb23565 Expand default units to include native and REF nation types. 2015-04-11 13:11:25 +09:30
Sebastian Zhorel efc950e230 Clean up unnecessary boxing/unboxing 2015-04-07 23:32:18 +02:00
Mike Pope 88a5859db4 Its time to promote Direction out of Map. 2015-04-05 15:30:11 +09:30
Sebastian Zhorel c3b9e36b83 Add @override everywhere its needed 2015-04-04 15:21:11 +02:00
Michael Pope f7c4395685 Move all map generation logging to LogBuilder. 2015-03-26 19:19:38 +10:30
Mike Pope 23a5378fa6 Clean up StringTemplate some more. 2015-03-25 19:32:28 +10:30