Commit Graph

13 Commits

Author SHA1 Message Date
Speedy Gonzalez 3fb5d72699 Merge remote-tracking branch 'origin/main'
# Conflicts:
#	.idea/misc.xml
#	src/ch/zhaw/catan/Road.java
#	src/ch/zhaw/catan/SiedlerBoard.java
2021-12-10 11:19:19 +01:00
Andrin Fassbind 5cf79daa8b misc language lvl updated 2021-12-10 11:13:55 +01:00
schrom01 1a3c4d6076 reformat Code 2021-12-10 10:33:33 +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
Leonardo Brandenberger afd874bafa fixed minor refactoring issues and removed import of ch.zhaw.catan in SiedlerBoard and used as package. 2021-12-09 18:18:10 +01:00
Leonardo Brandenberger ffc97a39ef Minor Grammar and Cameltow fixes 2021-12-09 17:19:40 +01:00
Leonardo Brandenberger 78ce0e43bc Minor Grammar and Cameltow fixes 2021-12-09 16:11:17 +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
MikeZyeman c2d2f11d2a Added superclass structure to roads and settlement 2021-11-29 16:02:38 +01:00
Andrin Fassbind ef51b7c980 overworked Settlement 2021-11-29 15:55:36 +01:00
schrom01 3adec5bd43 changed Datatype of Road and Settlement in SiedlerBoard 2021-11-26 11:25:56 +01:00
Andrin Fassbind 456ea5356f Settlement.java and changes SiedlerGame buildRoad Method 2021-11-26 10:43:04 +01:00