ZHAW-IT21b_WIN
/
gruppe06-hufflepuff-projekt3-catan
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
182 Commits 1 Branch 0 Tags 5 MiB
Commit Graph

182 Commits

Author SHA1 Message Date
Andrin Fassbind 2d5cfc5e9e Merge remote-tracking branch 'origin/main' 2021-12-07 17:36:42 +01:00
Andrin Fassbind 161dec226e adjust countRoad in SiedlerGame 2021-12-07 17:36:29 +01:00
Speedy Gonzalez 7afd5b98a2 Merge remote-tracking branch 'origin/main' 2021-12-07 16:14:50 +01:00
Speedy Gonzalez 0bb1498ca0 begun to write the readme of Siedler of catan. 2021-12-07 16:14:35 +01:00
Andrin Fassbind 99a8feca03 Merge remote-tracking branch 'origin/main' 2021-12-07 15:33:48 +01:00
Andrin Fassbind 46484df77c adjust countRoad in SiedlerGame 2021-12-07 15:33:39 +01:00
Speedy Gonzalez bf32d978bc checked some warnings in class SiedlerGame. 2021-12-07 15:27:56 +01:00
Speedy Gonzalez 7f19c5acce Added java doc in parser class. 2021-12-07 15:27:01 +01:00
Speedy Gonzalez ecc75e14c8 updated german comments to english. 2021-12-07 15:03:41 +01:00
Speedy Gonzalez cff925de61 removed to do's and updated java docs. 2021-12-07 14:57:57 +01:00
Speedy Gonzalez 99da9715c5 Updated buildCity method. 2021-12-07 14:33:56 +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
Andrin Fassbind 21f144b294 adjust countRoad in SiedlerGame 2021-12-05 14:12:22 +01:00
Andrin Fassbind a79e1eefe3 Implemented longest Road logic in SiedlerGame 
-adjusted Road and Settlement to return position
 2021-12-05 13:53:36 +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
Leonardo Brandenberger 79a0b9175e fixed minor bug in Bank class 2021-12-04 16:43:15 +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
Leonardo Brandenberger 69e4c7146e Removed tradeWithBank method and modified constructor 2021-12-04 16:33:52 +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
Andrin Fassbind 260d7bf2f0 Merge remote-tracking branch 'origin/main' into main 
# Conflicts:
#	src/ch/zhaw/catan/SiedlerGame.java
 2021-12-04 14:06:19 +01:00
Andrin Fassbind 4a352dd40a Fixed Bug set strutcture in water and set bug addressource nullpointer exception 2021-12-04 14:02:06 +01:00
schrom01 f6865451a6 added Method handleDiceThrow7 in SiedlerGame 2021-12-04 13:20:09 +01:00
Andrin Fassbind 8f12b40e50 Merge remote-tracking branch 'origin/main' into main 
# Conflicts:
#	.gitignore
#	.idea/.gitignore
#	src/ch/zhaw/catan/Road.java
#	src/ch/zhaw/catan/SiedlerGame.java
 2021-12-04 12:59:31 +01:00
Leonardo Brandenberger 7129435fea SiedlerGame throwDice method implemented (for 7 not yet implemented) and method getResourcesforFaction implemented in SiedlerBoard 2021-12-03 16:39:11 +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
Speedy Gonzalez 4fe4daf730 Merge remote-tracking branch 'origin/main' 2021-12-03 11:28:50 +01:00
Speedy Gonzalez 2dfe55584e Added placeInitialRoad and placeInitialSettlement methods. 2021-12-03 11:28:42 +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
Speedy Gonzalez c45471c337 Added method buildCity. 2021-12-03 09:57:42 +01:00
Andrin Fassbind b4783c8009 changed javadoc 2021-12-03 09:52:42 +01:00
Andrin Fassbind a2e7f60836 Merge remote-tracking branch 'origin/main' 2021-12-03 09:49:01 +01:00
Speedy Gonzalez 86d998ddd7 Merge remote-tracking branch 'origin/main' 2021-12-03 09:48:36 +01:00
Speedy Gonzalez 70b27af038 Added method buildCity. 2021-12-03 09:48:30 +01:00
Andrin Fassbind 40dcfaa304 Merge remote-tracking branch 'origin/main' 
# Conflicts:
#	src/ch/zhaw/catan/SiedlerGame.java
 2021-12-03 09:47:04 +01:00
Andrin Fassbind a5f856313d created method in SiedlerGame: 
-checkAdjacentCornerList
-checkAdjacentEdgesList
-validPositionForSettlement
-validPositionForRoad

updated method in SiedlerGame:
-buildRoad
-buildSettlement
 2021-12-03 09:42:29 +01:00