Commit Graph
32 Commits
Author SHA1 Message Date
Andrin Fassbind 8e307e0617 removed warning in SiedlerBoard 2021-12-10 09:50:23 +01:00
Andrin Fassbind 57bdf372f1 Merge remote-tracking branch 'origin/main' 2021-12-10 09:42:06 +01:00
Andrin Fassbind 6fa5764e14 refactored longestRoad in SiedlerBoard 2021-12-10 09:41:58 +01:00
Andrin Fassbind 1bbb05ebfd Merge remote-tracking branch 'origin/main' 2021-12-09 16:05:55 +01:00
Andrin Fassbind 572926d3c8 refactored longestRoad implementation from SiedlerGame to SiedlerBoard and updated Test Method longestRoad 2021-12-09 16:05:46 +01:00
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
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
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
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
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
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
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
Andrin Fassbind d6c225a5aa created method storeResourceToBank in Bank.java
adapted method buildRoad and buildSettlement in SiedlerGame.java
2021-12-02 14:12:12 +01:00
Andrin Fassbind cb9e22ea92 Merge remote-tracking branch 'origin/main'
# Conflicts:
#	src/ch/zhaw/catan/Structure.java
2021-11-29 16:47:41 +01:00
Andrin Fassbind 971cfe8868 SiedlerGame.java added few methodes 2021-11-29 16:47:02 +01:00
Andrin Fassbind ef51b7c980 overworked Settlement 2021-11-29 15:55:36 +01:00
Andrin Fassbind 9a79bf0cf4 Player added methods and javadoc 2021-11-26 12:32:26 +01:00
Andrin Fassbind 5e0ebedfea Player added methods and javadoc 2021-11-26 12:21:57 +01:00
Andrin Fassbind b23e210bb2 Merge remote-tracking branch 'origin/main' 2021-11-26 12:15:30 +01:00
Andrin Fassbind bfb1433fd2 Player added methods and javadoc 2021-11-26 12:15:18 +01:00
Andrin Fassbind aef0479cf5 Player created 2021-11-26 11:41:00 +01:00
Andrin Fassbind 456ea5356f Settlement.java and changes SiedlerGame buildRoad Method 2021-11-26 10:43:04 +01:00
Andrin Fassbind 0db6be32b6 Road.java and changes SiedlerGame buildRoad Method 2021-11-26 10:05:02 +01:00
Andrin Fassbind 79cc4f3f3c New Class Road
Start to edit SiedlerGame.buildRoad
2021-11-25 17:26:18 +01:00
fassbandandGitHub Enterprise f2fe06f720 Add files via upload 2021-11-19 08:32:32 +01:00
fassbandandGitHub Enterprise e9a9181cd0 Initial commit 2021-11-19 08:28:53 +01:00