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

232 Commits

Author SHA1 Message Date
schrom01 1cc0dc3ff1 Update in README.md 2021-12-10 22:52:45 +01:00
schrom01 99cf5432b9 Update in README.md 2021-12-10 22:51:51 +01:00
schrom01 828890c7e6 updated SiedlerGameTest 2021-12-10 22:48:40 +01:00
schrom01 577484457c updated SiedlerGameTest 2021-12-10 22:39:12 +01:00
schrom01 9ccdfd9f2b updated SiedlerGameTest 2021-12-10 22:37:24 +01:00
schrom01 9f9a1e872d Merge remote-tracking branch 'origin/main' 2021-12-10 22:36:56 +01:00
schrom01 69ce8e72e2 updated classdiagram.png 2021-12-10 22:36:48 +01:00
Leonardo Brandenberger 43e282a0b0 Merge remote-tracking branch 'origin/main' 2021-12-10 22:27:58 +01:00
Leonardo Brandenberger 04d6013cf2 Refactoring grammar and cameltoe 2021-12-10 22:26:00 +01:00
schrom01 a2429801a4 added new classdiagram.png 2021-12-10 22:11:14 +01:00
schrom01 678777094f Merge remote-tracking branch 'origin/main' 2021-12-10 21:59:21 +01:00
schrom01 1575c1b353 added javaDoc in Bank.java 2021-12-10 21:59:11 +01:00
Leonardo Brandenberger c8cbd1cacc Improved Readme 2021-12-10 21:35:42 +01:00
Leonardo Brandenberger 3740cc175e Improved Readme a little, more room for improvement still. 2021-12-10 20:25:04 +01:00
Leonardo Brandenberger 6730fd722b Merge remote-tracking branch 'origin/main' 2021-12-10 20:19:30 +01:00
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
Leonardo Brandenberger 204025662d Improved Readme a little, more room for improvement still. 2021-12-10 19:37:37 +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