Commit Graph

Select branches

Hide Pull Requests

main

Mono Color

• b30f15e7c5 updating JavaDoc in SiedlerBoard schrom01 2021-12-08 12:41:42 +01:00
• 2d5cfc5e9e Merge remote-tracking branch 'origin/main' Andrin Fassbind 2021-12-07 17:36:42 +01:00
• 161dec226e adjust countRoad in SiedlerGame Andrin Fassbind 2021-12-07 17:36:29 +01:00
• 7afd5b98a2 Merge remote-tracking branch 'origin/main' Speedy Gonzalez 2021-12-07 16:14:50 +01:00
• 0bb1498ca0 begun to write the readme of Siedler of catan. Speedy Gonzalez 2021-12-07 16:14:35 +01:00
• 99a8feca03 Merge remote-tracking branch 'origin/main' Andrin Fassbind 2021-12-07 15:33:48 +01:00
• 46484df77c adjust countRoad in SiedlerGame Andrin Fassbind 2021-12-07 15:33:39 +01:00
• bf32d978bc checked some warnings in class SiedlerGame. Speedy Gonzalez 2021-12-07 15:27:56 +01:00
• 7f19c5acce Added java doc in parser class. Speedy Gonzalez 2021-12-07 15:27:01 +01:00
• ecc75e14c8 updated german comments to english. Speedy Gonzalez 2021-12-07 15:03:41 +01:00
• cff925de61 removed to do's and updated java docs. Speedy Gonzalez 2021-12-07 14:57:57 +01:00
• 99da9715c5 Updated buildCity method. Speedy Gonzalez 2021-12-07 14:33:56 +01:00
• b758e08fdb refactoring Method storeResourcesToBank schrom01 2021-12-07 13:57:33 +01:00
• 038bc65b3d fixing Method throwDice in SiedlerGame.java schrom01 2021-12-07 13:55:10 +01:00
• 458905ddd4 fixing Method checkResourceToBuild schrom01 2021-12-07 11:45:22 +01:00
• 4c56518ba0 fixing Method checkResourceToBuild schrom01 2021-12-07 11:44:51 +01:00
• da6913d997 refactoring in SiedlerGame.java and Player.java schrom01 2021-12-07 10:59:02 +01:00
• 8052ac97ff Completed Java Doc in Siedler.java schrom01 2021-12-07 09:08:10 +01:00
• d35c7299ae refactoring in Siedler.java schrom01 2021-12-07 08:30:14 +01:00
• 21f144b294 adjust countRoad in SiedlerGame Andrin Fassbind 2021-12-05 14:12:22 +01:00
• a79e1eefe3 Implemented longest Road logic in SiedlerGame -adjusted Road and Settlement to return position Andrin Fassbind 2021-12-05 13:53:36 +01:00
• 51e61a8e00 Set Variable citiesToUse in Constructor of Player schrom01 2021-12-04 23:29:19 +01:00
• 7752d6ff7e completed handleDiceThrow7 in Player.java schrom01 2021-12-04 17:44:15 +01:00
• 6bd4f1dcbe moved handleDiceThrow7 in Player.java schrom01 2021-12-04 17:03:51 +01:00
• 79a0b9175e fixed minor bug in Bank class Leonardo Brandenberger 2021-12-04 16:43:15 +01:00
• 5eece3125b Merge remote-tracking branch 'origin/main' schrom01 2021-12-04 16:34:12 +01:00
• 4b0bedcabf changes in Methods for trading with bank. schrom01 2021-12-04 16:33:55 +01:00
• 69e4c7146e Removed tradeWithBank method and modified constructor Leonardo Brandenberger 2021-12-04 16:33:52 +01:00
• e23f8bcdde Merge remote-tracking branch 'origin/main' schrom01 2021-12-04 15:44:17 +01:00
• 212acc0fc5 fix payout in Method placeInitialSettlement in SiedlerGame schrom01 2021-12-04 15:39:25 +01:00
• 260d7bf2f0 Merge remote-tracking branch 'origin/main' into main Andrin Fassbind 2021-12-04 14:06:19 +01:00
• 4a352dd40a Fixed Bug set strutcture in water and set bug addressource nullpointer exception Andrin Fassbind 2021-12-04 14:02:06 +01:00
• f6865451a6 added Method handleDiceThrow7 in SiedlerGame schrom01 2021-12-04 13:20:09 +01:00
• 8f12b40e50 Merge remote-tracking branch 'origin/main' into main Andrin Fassbind 2021-12-04 12:59:31 +01:00
• 7129435fea SiedlerGame throwDice method implemented (for 7 not yet implemented) and method getResourcesforFaction implemented in SiedlerBoard Leonardo Brandenberger 2021-12-03 16:39:11 +01:00
• 8b2b9e2882 rename variables in SiedlerBoard schrom01 2021-12-03 11:54:12 +01:00
• c910c00c38 Merge remote-tracking branch 'origin/main' schrom01 2021-12-03 11:52:41 +01:00
• b38e24b612 changes in Siedler Board. Usage of Field Class added. schrom01 2021-12-03 11:52:32 +01:00
• 4fe4daf730 Merge remote-tracking branch 'origin/main' Speedy Gonzalez 2021-12-03 11:28:50 +01:00
• 2dfe55584e Added placeInitialRoad and placeInitialSettlement methods. Speedy Gonzalez 2021-12-03 11:28:42 +01:00
• 7c913089b5 reated Class Field schrom01 2021-12-03 11:15:07 +01:00
• 8fc77abdd0 added Method toString in City schrom01 2021-12-03 10:48:59 +01:00
• 8cb13ce0a6 change in getCurrentPlayerWinpoints schrom01 2021-12-03 10:36:53 +01:00
• 442cce6761 solved merge problems schrom01 2021-12-03 10:09:17 +01:00
• c45471c337 Added method buildCity. Speedy Gonzalez 2021-12-03 09:57:42 +01:00
• b4783c8009 changed javadoc Andrin Fassbind 2021-12-03 09:52:42 +01:00
• a2e7f60836 Merge remote-tracking branch 'origin/main' Andrin Fassbind 2021-12-03 09:49:01 +01:00
• 86d998ddd7 Merge remote-tracking branch 'origin/main' Speedy Gonzalez 2021-12-03 09:48:36 +01:00
• 70b27af038 Added method buildCity. Speedy Gonzalez 2021-12-03 09:48:30 +01:00
• 40dcfaa304 Merge remote-tracking branch 'origin/main' Andrin Fassbind 2021-12-03 09:47:04 +01:00
• a5f856313d created method in SiedlerGame: -checkAdjacentCornerList -checkAdjacentEdgesList -validPositionForSettlement -validPositionForRoad Andrin Fassbind 2021-12-03 09:42:29 +01:00
• 8811410e44 change in Main Method changed Method getWinner and getCurrentPlayerWinpoints schrom01 2021-12-03 09:37:19 +01:00
• 8a494b247b change in Main Method schrom01 2021-12-03 09:01:24 +01:00
• 7d1a326dc0 change in Main Method schrom01 2021-12-03 08:54:27 +01:00
• c387420ca8 Siedler Class minor bug fixes Leonardo Brandenberger 2021-12-03 08:52:26 +01:00
• 6e1c06f769 Merge remote-tracking branch 'origin/main' Leonardo Brandenberger 2021-12-03 08:48:40 +01:00
• ff734bce23 Delected CommandWords.java added quit Method in Parser Fixed minor grammar mistakes in Siedler Game Leonardo Brandenberger 2021-12-03 08:48:26 +01:00
• 1e49424b9c fixed Error in Main Method schrom01 2021-12-03 08:35:37 +01:00
• d233e5f67f Merge remote-tracking branch 'origin/main' schrom01 2021-12-03 08:34:57 +01:00
• f60b65af83 fixed Error in Main Method schrom01 2021-12-03 08:34:48 +01:00
• 57649df6ba Fixed grammar error in method displayPlayerResource Stock. Leonardo Brandenberger 2021-12-03 08:32:51 +01:00
• d749838600 fixed Error in trade method in Parser Leonardo Brandenberger 2021-12-03 08:28:58 +01:00
• 060310aebc change in Main Method schrom01 2021-12-03 08:12:21 +01:00
• 2de44a1b99 change Method throwDice in Siedler schrom01 2021-12-03 07:56:38 +01:00
• 1c90d18510 created Method throwDice in Siedler schrom01 2021-12-02 19:16:28 +01:00
• 1362850570 changes in mainMethod schrom01 2021-12-02 19:13:16 +01:00
• 0c63540616 changes in mainMethod added Method displayPlayerResourceStock to Parser schrom01 2021-12-02 19:05:14 +01:00
• 7c84f7f600 changes in mainMethod schrom01 2021-12-02 18:47:00 +01:00
• 7b23ed5380 changes in mainMethod schrom01 2021-12-02 18:12:04 +01:00
• be26fc77cd Merge remote-tracking branch 'origin/main' Leonardo Brandenberger 2021-12-02 18:07:09 +01:00
• 4748643163 added method trade to Parser Leonardo Brandenberger 2021-12-02 18:07:02 +01:00
• fb38fc07b0 completed founding Phase schrom01 2021-12-02 17:57:28 +01:00
• b75afdc6a0 Merge remote-tracking branch 'origin/main' schrom01 2021-12-02 17:39:42 +01:00
• 9294cbc3e3 fix bug in switchToPreviousPlayer schrom01 2021-12-02 17:39:33 +01:00
• f65449df56 eroorMessage method prinlText Output minorly changed Leonardo Brandenberger 2021-12-02 17:23:48 +01:00
• 9916d38073 first draft of foundigPhase Method schrom01 2021-12-02 17:13:43 +01:00
• c4a3346fad eroorMessage method prinln added Leonardo Brandenberger 2021-12-02 17:01:53 +01:00
• 0e5a4c6254 Merge remote-tracking branch 'origin/main' Leonardo Brandenberger 2021-12-02 16:49:52 +01:00
• a7a2085632 Implemented the functionality of all methods in Parser.java and created missing Enum Instances in Command.java. Leonardo Brandenberger 2021-12-02 16:49:44 +01:00
• b1ba5636ce Removed TODO comments of finished methods and removed unnecessary variable MikeZyeman 2021-12-02 16:25:38 +01:00
• 60d1c9a90b Merge remote-tracking branch 'origin/main' Leonardo Brandenberger 2021-12-02 15:37:36 +01:00
• 014b838187 displayGameboard method added. Leonardo Brandenberger 2021-12-02 15:37:27 +01:00
• c8d560b8c9 Merge remote-tracking branch 'origin/main' Speedy Gonzalez 2021-12-02 15:28:20 +01:00
• 68cc2402b4 Added player switches Speedy Gonzalez 2021-12-02 15:28:00 +01:00
• 684bf9e553 gameStart method now returns HashMap Leonardo Brandenberger 2021-12-02 15:22:33 +01:00
• cba5a6b22c gameStart method now returns HashMap Leonardo Brandenberger 2021-12-02 15:20:30 +01:00
• e48371a121 Merge remote-tracking branch 'origin/main' Leonardo Brandenberger 2021-12-02 15:16:00 +01:00
• 3c67d62e42 Several new methods added in Parser class Leonardo Brandenberger 2021-12-02 15:15:39 +01:00
• d6c225a5aa created method storeResourceToBank in Bank.java adapted method buildRoad and buildSettlement in SiedlerGame.java Andrin Fassbind 2021-12-02 14:12:12 +01:00
• 9e347e8792 implementing part of Parser class Leonardo Brandenberger 2021-12-01 23:24:16 +01:00
• 3830cf6594 implemented Method getWinner and getWinPoints added Class City for later use. schrom01 2021-11-30 20:20:48 +01:00
• 54b1d794f8 new Class Parser and corresponding enums created Leonardo Brandenberger 2021-11-29 17:23:55 +01:00
• cb9e22ea92 Merge remote-tracking branch 'origin/main' Andrin Fassbind 2021-11-29 16:47:41 +01:00
• 971cfe8868 SiedlerGame.java added few methodes Andrin Fassbind 2021-11-29 16:47:02 +01:00
• cf94a835fc Fixed display error toString in structure MikeZyeman 2021-11-29 16:39:29 +01:00
• 3ddd86e4e1 activePlayer Datafield added Leonardo Brandenberger 2021-11-29 16:21:13 +01:00
• c2d2f11d2a Added superclass structure to roads and settlement MikeZyeman 2021-11-29 16:02:38 +01:00
• d70a3daed0 Merge remote-tracking branch 'origin/main' into main MikeZyeman 2021-11-29 15:57:01 +01:00
• ce31d0f439 Added superclass structure to roads and settlement MikeZyeman 2021-11-29 15:56:52 +01:00
• ef51b7c980 overworked Settlement Andrin Fassbind 2021-11-29 15:55:36 +01:00