Commit Graph

144 Commits

Author SHA1 Message Date
Leonardo Brandenberger 9e347e8792 implementing part of Parser class 2021-12-01 23:24:16 +01:00
schrom01 3830cf6594 implemented Method getWinner and getWinPoints
added Class City for later use.
2021-11-30 20:20:48 +01:00
Leonardo Brandenberger 54b1d794f8 new Class Parser and corresponding enums created 2021-11-29 17:23:55 +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
MikeZyeman cf94a835fc Fixed display error toString in structure 2021-11-29 16:39:29 +01:00
Leonardo Brandenberger 3ddd86e4e1 activePlayer Datafield added 2021-11-29 16:21:13 +01:00
MikeZyeman c2d2f11d2a Added superclass structure to roads and settlement 2021-11-29 16:02:38 +01:00
MikeZyeman d70a3daed0 Merge remote-tracking branch 'origin/main' into main
# Conflicts:
#	.idea/misc.xml
2021-11-29 15:57:01 +01:00
MikeZyeman ce31d0f439 Added superclass structure to roads and settlement 2021-11-29 15:56:52 +01:00
Andrin Fassbind ef51b7c980 overworked Settlement 2021-11-29 15:55:36 +01:00
Leonardo Brandenberger 8fb406bea0 Delete out directory 2021-11-28 01:42:33 +01:00
Leonardo Brandenberger b30a019566 createFixGamefield method finished and removed depreciated code 2021-11-28 01:14:34 +01:00
Leonardo Brandenberger e27d9b38b2 createFixGamefield method finished and removed depreciated code 2021-11-28 01:12:08 +01:00
Leonardo Brandenberger 30617ff655 createFixGamefield method finished and removed depreciated code 2021-11-28 01:09:56 +01:00
leobr c4c30670b4 finished Method tradeWithBankFourToOne
Modified Class Bank to work with mentioned Method
2021-11-27 02:13:55 +01:00
Leonardo Brandenberger 2f9f93d862 Bank Klasse erstellt (wird warscheinlich wieder entfernt da Funktionalität in SiedlerGame sein soll) 2021-11-27 01:45:14 +01:00
Leonardo Brandenberger ebc63b996d Merge remote-tracking branch 'origin/main' 2021-11-26 15:27:50 +01:00
Leonardo Brandenberger e99e6ec87e modified createFixGamefield method and deleted now depreciated method that where used by it 2021-11-26 15:27:25 +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
schrom01 235798ff97 Merge remote-tracking branch 'origin/main' 2021-11-26 11:44:31 +01:00
schrom01 98316bb566 changed Datatype of Road and Settlement in SiedlerBoardTextView 2021-11-26 11:44:22 +01:00
Leonardo Brandenberger 647fa90f30 Merge remote-tracking branch 'origin/main' 2021-11-26 11:41:15 +01:00
Leonardo Brandenberger fcf8c842fb getLandsForCorner method created. 2021-11-26 11:41:06 +01:00
Andrin Fassbind aef0479cf5 Player created 2021-11-26 11:41:00 +01:00
schrom01 3adec5bd43 changed Datatype of Road and Settlement in SiedlerBoard 2021-11-26 11:25:56 +01:00
Speedy Gonzalez ef484a31ea Merge remote-tracking branch 'origin/main' 2021-11-26 10:58:27 +01:00
Speedy Gonzalez 5e8db04f0d Added new class player. 2021-11-26 10:58:19 +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
schrom01 8b61927eae created Class Siedler 2021-11-24 17:16:13 +01:00
schrom01 ad1227ac98 completed method getFieldsForDiceValue in SiedlerBoard 2021-11-24 17:03:55 +01:00
Leonardo Brandenberger 6c36037444 Merge remote-tracking branch 'origin/main'
# Conflicts:
#	.idea/libraries/lib.xml
#	.idea/misc.xml
#	gruppe06-hufflepuff-projekt3-catan.iml
#	out/production/gruppe06-hufflepuff-projekt3-catan/ch/zhaw/catan/Config$Faction.class
#	out/production/gruppe06-hufflepuff-projekt3-catan/ch/zhaw/catan/Config$Land.class
#	out/production/gruppe06-hufflepuff-projekt3-catan/ch/zhaw/catan/Config$Resource.class
#	out/production/gruppe06-hufflepuff-projekt3-catan/ch/zhaw/catan/Config$Structure.class
#	out/production/gruppe06-hufflepuff-projekt3-catan/ch/zhaw/catan/Config.class
#	out/production/gruppe06-hufflepuff-projekt3-catan/ch/zhaw/catan/Dummy$1.class
#	out/production/gruppe06-hufflepuff-projekt3-catan/ch/zhaw/catan/Dummy$Actions.class
#	out/production/gruppe06-hufflepuff-projekt3-catan/ch/zhaw/catan/Dummy.class
#	out/production/gruppe06-hufflepuff-projekt3-catan/ch/zhaw/catan/SiedlerBoard.class
#	out/production/gruppe06-hufflepuff-projekt3-catan/ch/zhaw/catan/SiedlerBoardTextView.class
#	out/production/gruppe06-hufflepuff-projekt3-catan/ch/zhaw/catan/SiedlerGame.class
#	out/production/gruppe06-hufflepuff-projekt3-catan/ch/zhaw/hexboard/Edge.class
#	out/production/gruppe06-hufflepuff-projekt3-catan/ch/zhaw/hexboard/FieldAnnotationPosition.class
#	out/production/gruppe06-hufflepuff-projekt3-catan/ch/zhaw/hexboard/HexBoard.class
#	out/production/gruppe06-hufflepuff-projekt3-catan/ch/zhaw/hexboard/HexBoardTextView.class
#	out/production/gruppe06-hufflepuff-projekt3-catan/ch/zhaw/hexboard/Label.class
2021-11-24 16:19:39 +01:00
Leonardo Brandenberger e6b2882591 New methods in SiedlerBoard created 2021-11-24 16:18:49 +01:00
schrom01 ffdeea1dc8 Merge remote-tracking branch 'origin/main'
# Conflicts:
#	.idea/.gitignore
#	.idea/libraries/lib.xml
#	.idea/misc.xml
#	gruppe06-hufflepuff-projekt3-catan.iml
2021-11-19 10:55:52 +01:00
schrom01 8094aa7167 add untracked files 2021-11-19 10:54:49 +01:00
Speedy Gonzalez 5e2fcdb2e6 Added unversioned files. 2021-11-19 10:51:45 +01:00
schrom01 e4a56b73c9 test commit 2021-11-19 10:03:52 +01:00
fassband f2fe06f720 Add files via upload 2021-11-19 08:32:32 +01:00
fassband e9a9181cd0 Initial commit 2021-11-19 08:28:53 +01:00