ZHAW-IT21b_WIN/gruppe06-hufflepuff-projekt3-catan
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
197 Commits 1 Branch 0 Tags
ae8c06d7ffd49427fac5a16933595ae1c506f3b3
Commit Graph
66 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
schrom01 ae8c06d7ff added Coordinates to README.md 2021-12-10 11:47:18 +01:00
schrom01 6343b55717 added draft of class diagramm to README.md 2021-12-10 11:43:37 +01:00
schrom01 ea08188973 Merge remote-tracking branch 'origin/main' 2021-12-10 11:03:10 +01:00
schrom01 f327273462 Merge remote-tracking branch 'origin/main' 2021-12-10 11:03:04 +01:00
schrom01 71344de9f4 merge 2021-12-10 11:02:57 +01:00
schrom01 c88d85f575 changes in README.md 2021-12-10 11:00:05 +01:00
schrom01 c9757f22fc Merge remote-tracking branch 'origin/main' 2021-12-10 10:33:42 +01:00
schrom01 1a3c4d6076 reformat Code 2021-12-10 10:33:33 +01:00
schrom01 9d0468ec6e update codeStyleConfig 2021-12-10 09:41:11 +01:00
schrom01 0b4e5d5cc1 Merge remote-tracking branch 'origin/main' 2021-12-10 09:12:25 +01:00
schrom01 bf512128f7 update testLongestRoad 2021-12-10 09:12:16 +01:00
schrom01 3b721301fa update testLongestRoad 2021-12-10 08:31:45 +01:00
schrom01 99eab9ad69 updates in JavaDoc 2021-12-09 19:29:00 +01:00
schrom01 378fdde58a Merge remote-tracking branch 'origin/main' 
# Conflicts:
#	src/ch/zhaw/catan/Settlement.java
 2021-12-09 18:19:19 +01:00
schrom01 06382959b1 javaDoc in Settlement 2021-12-09 18:18:30 +01:00
schrom01 187302afd5 Refactoring getLongestRoadFaction 2021-12-09 17:42:43 +01:00
schrom01 c28efe5331 Using Values of Config in SiedlerGame.java 2021-12-09 15:23:34 +01:00
schrom01 b30f15e7c5 updating JavaDoc in SiedlerBoard 2021-12-08 12:41:42 +01:00
schrom01 b758e08fdb refactoring Method storeResourcesToBank 2021-12-07 13:57:33 +01:00
schrom01 038bc65b3d fixing Method throwDice in SiedlerGame.java 2021-12-07 13:55:10 +01:00
schrom01 458905ddd4 fixing Method checkResourceToBuild 2021-12-07 11:45:22 +01:00
schrom01 4c56518ba0 fixing Method checkResourceToBuild 2021-12-07 11:44:51 +01:00
schrom01 da6913d997 refactoring in SiedlerGame.java and Player.java 2021-12-07 10:59:02 +01:00
schrom01 8052ac97ff Completed Java Doc in Siedler.java 2021-12-07 09:08:10 +01:00
schrom01 d35c7299ae refactoring in Siedler.java 2021-12-07 08:30:14 +01:00
schrom01 51e61a8e00 Set Variable citiesToUse in Constructor of Player 2021-12-04 23:29:19 +01:00
schrom01 7752d6ff7e completed handleDiceThrow7 in Player.java 2021-12-04 17:44:15 +01:00
schrom01 6bd4f1dcbe moved handleDiceThrow7 in Player.java 2021-12-04 17:03:51 +01:00
schrom01 5eece3125b Merge remote-tracking branch 'origin/main' 2021-12-04 16:34:12 +01:00
schrom01 4b0bedcabf changes in Methods for trading with bank. 2021-12-04 16:33:55 +01:00
schrom01 e23f8bcdde Merge remote-tracking branch 'origin/main' 
# Conflicts:
#	src/ch/zhaw/catan/SiedlerGame.java
 2021-12-04 15:44:17 +01:00
schrom01 212acc0fc5 fix payout in Method placeInitialSettlement in SiedlerGame 2021-12-04 15:39:25 +01:00
schrom01 f6865451a6 added Method handleDiceThrow7 in SiedlerGame 2021-12-04 13:20:09 +01:00
schrom01 8b2b9e2882 rename variables in SiedlerBoard 2021-12-03 11:54:12 +01:00
schrom01 c910c00c38 Merge remote-tracking branch 'origin/main' 2021-12-03 11:52:41 +01:00
schrom01 b38e24b612 changes in Siedler Board. Usage of Field Class added. 2021-12-03 11:52:32 +01:00
schrom01 7c913089b5 reated Class Field 2021-12-03 11:15:07 +01:00
schrom01 8fc77abdd0 added Method toString in City 2021-12-03 10:48:59 +01:00
schrom01 8cb13ce0a6 change in getCurrentPlayerWinpoints 2021-12-03 10:36:53 +01:00
schrom01 442cce6761 solved merge problems 2021-12-03 10:09:17 +01:00
schrom01 8811410e44 change in Main Method 
changed Method getWinner and getCurrentPlayerWinpoints
 2021-12-03 09:37:19 +01:00
schrom01 8a494b247b change in Main Method 2021-12-03 09:01:24 +01:00
schrom01 7d1a326dc0 change in Main Method 2021-12-03 08:54:27 +01:00
schrom01 1e49424b9c fixed Error in Main Method 2021-12-03 08:35:37 +01:00
schrom01 d233e5f67f Merge remote-tracking branch 'origin/main' 2021-12-03 08:34:57 +01:00
schrom01 f60b65af83 fixed Error in Main Method 2021-12-03 08:34:48 +01:00
schrom01 060310aebc change in Main Method 2021-12-03 08:12:21 +01:00
schrom01 2de44a1b99 change Method throwDice in Siedler 2021-12-03 07:56:38 +01:00
schrom01 1c90d18510 created Method throwDice in Siedler 2021-12-02 19:16:28 +01:00
schrom01 1362850570 changes in mainMethod 2021-12-02 19:13:16 +01:00
schrom01 0c63540616 changes in mainMethod 
added Method displayPlayerResourceStock to Parser
 2021-12-02 19:05:14 +01:00
schrom01 7c84f7f600 changes in mainMethod 2021-12-02 18:47:00 +01:00
schrom01 7b23ed5380 changes in mainMethod 2021-12-02 18:12:04 +01:00
schrom01 fb38fc07b0 completed founding Phase 2021-12-02 17:57:28 +01:00
schrom01 b75afdc6a0 Merge remote-tracking branch 'origin/main' 2021-12-02 17:39:42 +01:00
schrom01 9294cbc3e3 fix bug in switchToPreviousPlayer 2021-12-02 17:39:33 +01:00
schrom01 9916d38073 first draft of foundigPhase Method 2021-12-02 17:13:43 +01:00
schrom01 3830cf6594 implemented Method getWinner and getWinPoints 
added Class City for later use.
 2021-11-30 20:20:48 +01:00
schrom01 235798ff97 Merge remote-tracking branch 'origin/main' 2021-11-26 11:44:31 +01:00
schrom01 98316bb566 changed Datatype of Road and Settlement in SiedlerBoardTextView 2021-11-26 11:44:22 +01:00
schrom01 3adec5bd43 changed Datatype of Road and Settlement in SiedlerBoard 2021-11-26 11:25:56 +01:00
schrom01 8b61927eae created Class Siedler 2021-11-24 17:16:13 +01:00
schrom01 ad1227ac98 completed method getFieldsForDiceValue in SiedlerBoard 2021-11-24 17:03:55 +01:00
schrom01 ffdeea1dc8 Merge remote-tracking branch 'origin/main' 
# Conflicts:
#	.idea/.gitignore
#	.idea/libraries/lib.xml
#	.idea/misc.xml
#	gruppe06-hufflepuff-projekt3-catan.iml
 2021-11-19 10:55:52 +01:00
schrom01 8094aa7167 add untracked files 2021-11-19 10:54:49 +01:00
schrom01 e4a56b73c9 test commit 2021-11-19 10:03:52 +01:00