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

216 Commits

Author SHA1 Message Date
schrom01 57e49db1f0 reformat Code in SiedlerGameTest 2021-12-10 20:15:48 +01:00
MikeZyeman 1bdbc80c06 Redo if statement with exception throwing 2021-12-10 19:56:10 +01:00
MikeZyeman c16ddc6bca Redo if statement with exception throwing 2021-12-10 19:55:22 +01:00
MikeZyeman 3049650bc4 Finished test case throwDice with 7 and TestGameAfterSetupPhase 2021-12-10 19:48:17 +01:00
MikeZyeman 47b5a8b0bb Merge remote-tracking branch 'origin/main' into main 2021-12-10 19:30:51 +01:00
MikeZyeman 407863055a Removed unfinished tests 2021-12-10 19:30:44 +01:00
Leonardo Brandenberger 8a5dab76e4 Merge remote-tracking branch 'origin/main' 2021-12-10 18:34:41 +01:00
Andrin Fassbind 71899e8acc Merge remote-tracking branch 'origin/main' 
# Conflicts:
#	src/ch/zhaw/catan/Siedler.java
 2021-12-10 18:09:03 +01:00
Andrin Fassbind fc6eed48e8 create Method getBoardTextView in SiedlerGame 2021-12-10 18:07:59 +01:00
schrom01 6a5b7f2245 renamed Method getTextView to toString in SiedlerBoard 2021-12-10 18:06:52 +01:00
schrom01 70b2415b6b renamed Method getTextView to toString in SiedlerBoard 2021-12-10 18:06:43 +01:00
Andrin Fassbind 0ea44905e2 updated javaodoc SiedlerGame 
updated constructor SiedlerGame
 2021-12-10 13:39:19 +01:00
schrom01 faca966394 changes in README.md 2021-12-10 13:09:26 +01:00
schrom01 7e9fa8e6a8 Fix Method soutDistribution in SiedlerGameTest 2021-12-10 12:13:39 +01:00
schrom01 470666ed75 Merge remote-tracking branch 'origin/main' 2021-12-10 11:47:26 +01:00
schrom01 ae8c06d7ff added Coordinates to README.md 2021-12-10 11:47:18 +01:00
MikeZyeman f4adf68b9f Merge remote-tracking branch 'origin/main' into main 2021-12-10 11:46:06 +01:00
MikeZyeman daa367260f Added test case TestGameAfterSetup 2021-12-10 11:45:57 +01:00
schrom01 6343b55717 added draft of class diagramm to README.md 2021-12-10 11:43:37 +01:00
Speedy Gonzalez 91ab0aef47 Merge remote-tracking branch 'origin/main' 2021-12-10 11:36:02 +01:00
Andrin Fassbind d3ebcc7566 updated javaodoc SiedlerGame 2021-12-10 11:34:23 +01:00
Leonardo Brandenberger 41174d30ad Merge remote-tracking branch 'origin/main' 2021-12-10 11:22:08 +01:00
Leonardo Brandenberger 295eb9191f Started Java Doc Structure 2021-12-10 11:21:58 +01:00
Andrin Fassbind 20d73bd5e0 updated javaodoc SiedlerBoard 2021-12-10 11:20:56 +01:00
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 0386d43529 updated javaodoc Siedler 2021-12-10 11:18:06 +01:00
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
Speedy Gonzalez 25e86a2710 Merge remote-tracking branch 'origin/main' 
# Conflicts:
#	test/ch/zhaw/catan/SiedlerGameTest.java
 2021-12-10 11:03:21 +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
Speedy Gonzalez c468680542 Merge remote-tracking branch 'origin/main' 2021-12-10 11:02:42 +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
Speedy Gonzalez 91f1e67b63 Merge remote-tracking branch 'origin/main' 2021-12-10 10:44:29 +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