Commit Graph

186 Commits

Author SHA1 Message Date
Andrin Fassbind 1b6983dace Merge remote-tracking branch 'origin/main'
# Conflicts:
#	src/ch/zhaw/catan/Road.java
2021-12-10 11:14:24 +01:00
Andrin Fassbind 5cf79daa8b misc language lvl updated 2021-12-10 11:13:55 +01:00
Leonardo Brandenberger a05da8fb34 Finished Road Class (Java Doc and Code Style) 2021-12-10 11:13:12 +01:00
Leonardo Brandenberger 9096e28d78 Merge remote-tracking branch 'origin/main' 2021-12-10 11:11:27 +01:00
Leonardo Brandenberger 7f3376c1a4 Finished Player Class (Java Doc and Code Style) 2021-12-10 11:11:19 +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
MikeZyeman 09cb993b65 Merge remote-tracking branch 'origin/main' into main 2021-12-10 11:02:49 +01:00
MikeZyeman 320e9a3fdc Moved Nested Test Class LongestRoadTest to class SiedlerBoardTest, added parameterized positive and negative tests 2021-12-10 11:02:34 +01:00
Leonardo Brandenberger 3661498216 Finished Parser winpoints min 3 set. 2021-12-10 11:02:15 +01:00
Leonardo Brandenberger 4aa4dcde3b Merge remote-tracking branch 'origin/main' 2021-12-10 11:00:23 +01:00
Leonardo Brandenberger 3192039ca4 Finished Parser winpoints min 3 set. 2021-12-10 11:00:15 +01:00
schrom01 c88d85f575 changes in README.md 2021-12-10 11:00:05 +01:00
Andrin Fassbind b8fcf85514 Merge remote-tracking branch 'origin/main' 2021-12-10 10:57:41 +01:00
Andrin Fassbind 828218023f Javadoc Player 2021-12-10 10:57:28 +01:00
Leonardo Brandenberger f30c145dcf Finished Class Parser just one open question remaining winpoints (Cleanup and Javadoc) 2021-12-10 10:52:58 +01:00
Leonardo Brandenberger 792944a7ce Finished Class Field (Cleanup and Javadoc) 2021-12-10 10:46:48 +01:00
Leonardo Brandenberger 211c2fda63 Command Class(Cleanup and Javadoc) 2021-12-10 10:38:53 +01:00
Leonardo Brandenberger d1d6db894b Merge remote-tracking branch 'origin/main' 2021-12-10 10:38:08 +01:00
Leonardo Brandenberger 74e19ad416 Finished Class City (Cleanup and Javadoc) 2021-12-10 10:38:01 +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
Leonardo Brandenberger 9bb4550926 Merge remote-tracking branch 'origin/main' 2021-12-10 09:50:55 +01:00
Leonardo Brandenberger 609e406d6f Finished Class Bank (Cleanup and Javadoc) 2021-12-10 09:50:47 +01:00
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
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
Speedy Gonzalez 3f625e1e47 Merge remote-tracking branch 'origin/main' 2021-12-10 09:08:44 +01:00
Speedy Gonzalez 75d8d5220c the readme of Siedler of catan has been written. 2021-12-10 09:08:31 +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
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
schrom01 187302afd5 Refactoring getLongestRoadFaction 2021-12-09 17:42:43 +01:00
Leonardo Brandenberger ffc97a39ef Minor Grammar and Cameltow fixes 2021-12-09 17:19:40 +01:00
MikeZyeman f3b9cd2771 Merge remote-tracking branch 'origin/main' into main 2021-12-09 16:15:09 +01:00
MikeZyeman 5770d86a6f Added test classes for separation of purpose. 2021-12-09 16:14:47 +01:00
Speedy Gonzalez 0e3fccb8d4 Merge remote-tracking branch 'origin/main' 2021-12-09 16:13:11 +01:00
Speedy Gonzalez f0e8e20511 First comand of the readme of Siedler of catan has been written. 2021-12-09 16:12:57 +01:00
Leonardo Brandenberger 78ce0e43bc Minor Grammar and Cameltow fixes 2021-12-09 16:11:17 +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
Leonardo Brandenberger f913eaaa2b Merge remote-tracking branch 'origin/main' 2021-12-09 15:23:47 +01:00
Leonardo Brandenberger 9983d3ea1d Deleted Dummy Class and minor fixes in several classes and use of Config Value MINPLAYER 2021-12-09 15:23:39 +01:00
schrom01 c28efe5331 Using Values of Config in SiedlerGame.java 2021-12-09 15:23:34 +01:00