Commit Graph

160 Commits

Author SHA1 Message Date
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