schrom01
							
						 | 
						
							
							
							
							
							
								
							
							
								0c63540616
								
							
						 | 
						
							
							
								
								changes in mainMethod
							
							
							
							
							
							
							
							added Method displayPlayerResourceStock to Parser 
							
						 | 
						
							2021-12-02 19:05:14 +01:00 | 
						
					
				
					
						
							
							
								 
								schrom01
							
						 | 
						
							
							
							
							
							
								
							
							
								7c84f7f600
								
							
						 | 
						
							
							
								
								changes in mainMethod
							
							
							
							
							
						 | 
						
							2021-12-02 18:47:00 +01:00 | 
						
					
				
					
						
							
							
								 
								schrom01
							
						 | 
						
							
							
							
							
							
								
							
							
								7b23ed5380
								
							
						 | 
						
							
							
								
								changes in mainMethod
							
							
							
							
							
						 | 
						
							2021-12-02 18:12:04 +01:00 | 
						
					
				
					
						
							
							
								 
								Leonardo Brandenberger
							
						 | 
						
							
							
							
							
							
								
							
							
								be26fc77cd
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/main'
							
							
							
							
							
						 | 
						
							2021-12-02 18:07:09 +01:00 | 
						
					
				
					
						
							
							
								 
								Leonardo Brandenberger
							
						 | 
						
							
							
							
							
							
								
							
							
								4748643163
								
							
						 | 
						
							
							
								
								added method trade to Parser
							
							
							
							
							
						 | 
						
							2021-12-02 18:07:02 +01:00 | 
						
					
				
					
						
							
							
								 
								schrom01
							
						 | 
						
							
							
							
							
							
								
							
							
								fb38fc07b0
								
							
						 | 
						
							
							
								
								completed founding Phase
							
							
							
							
							
						 | 
						
							2021-12-02 17:57:28 +01:00 | 
						
					
				
					
						
							
							
								 
								schrom01
							
						 | 
						
							
							
							
							
							
								
							
							
								b75afdc6a0
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/main'
							
							
							
							
							
						 | 
						
							2021-12-02 17:39:42 +01:00 | 
						
					
				
					
						
							
							
								 
								schrom01
							
						 | 
						
							
							
							
							
							
								
							
							
								9294cbc3e3
								
							
						 | 
						
							
							
								
								fix bug in switchToPreviousPlayer
							
							
							
							
							
						 | 
						
							2021-12-02 17:39:33 +01:00 | 
						
					
				
					
						
							
							
								 
								Leonardo Brandenberger
							
						 | 
						
							
							
							
							
							
								
							
							
								f65449df56
								
							
						 | 
						
							
							
								
								eroorMessage method prinlText Output minorly changed
							
							
							
							
							
						 | 
						
							2021-12-02 17:23:48 +01:00 | 
						
					
				
					
						
							
							
								 
								schrom01
							
						 | 
						
							
							
							
							
							
								
							
							
								9916d38073
								
							
						 | 
						
							
							
								
								first draft of foundigPhase Method
							
							
							
							
							
						 | 
						
							2021-12-02 17:13:43 +01:00 | 
						
					
				
					
						
							
							
								 
								Leonardo Brandenberger
							
						 | 
						
							
							
							
							
							
								
							
							
								c4a3346fad
								
							
						 | 
						
							
							
								
								eroorMessage method prinln added
							
							
							
							
							
						 | 
						
							2021-12-02 17:01:53 +01:00 | 
						
					
				
					
						
							
							
								 
								Leonardo Brandenberger
							
						 | 
						
							
							
							
							
							
								
							
							
								0e5a4c6254
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/main'
							
							
							
							
							
						 | 
						
							2021-12-02 16:49:52 +01:00 | 
						
					
				
					
						
							
							
								 
								Leonardo Brandenberger
							
						 | 
						
							
							
							
							
							
								
							
							
								a7a2085632
								
							
						 | 
						
							
							
								
								Implemented the functionality of all methods in Parser.java and created missing Enum Instances in Command.java.
							
							
							
							
							
						 | 
						
							2021-12-02 16:49:44 +01:00 | 
						
					
				
					
						
							
							
								 
								MikeZyeman
							
						 | 
						
							
							
							
							
							
								
							
							
								b1ba5636ce
								
							
						 | 
						
							
							
								
								Removed TODO comments of finished methods and removed unnecessary variable
							
							
							
							
							
						 | 
						
							2021-12-02 16:25:38 +01:00 | 
						
					
				
					
						
							
							
								 
								Leonardo Brandenberger
							
						 | 
						
							
							
							
							
							
								
							
							
								60d1c9a90b
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/main'
							
							
							
							
							
						 | 
						
							2021-12-02 15:37:36 +01:00 | 
						
					
				
					
						
							
							
								 
								Leonardo Brandenberger
							
						 | 
						
							
							
							
							
							
								
							
							
								014b838187
								
							
						 | 
						
							
							
								
								displayGameboard method added.
							
							
							
							
							
						 | 
						
							2021-12-02 15:37:27 +01:00 | 
						
					
				
					
						
							
							
								 
								Speedy Gonzalez
							
						 | 
						
							
							
							
							
							
								
							
							
								c8d560b8c9
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/main'
							
							
							
							
							
						 | 
						
							2021-12-02 15:28:20 +01:00 | 
						
					
				
					
						
							
							
								 
								Speedy Gonzalez
							
						 | 
						
							
							
							
							
							
								
							
							
								68cc2402b4
								
							
						 | 
						
							
							
								
								Added player switches
							
							
							
							
							
						 | 
						
							2021-12-02 15:28:00 +01:00 | 
						
					
				
					
						
							
							
								 
								Leonardo Brandenberger
							
						 | 
						
							
							
							
							
							
								
							
							
								684bf9e553
								
							
						 | 
						
							
							
								
								gameStart method now returns HashMap
							
							
							
							
							
						 | 
						
							2021-12-02 15:22:33 +01:00 | 
						
					
				
					
						
							
							
								 
								Leonardo Brandenberger
							
						 | 
						
							
							
							
							
							
								
							
							
								cba5a6b22c
								
							
						 | 
						
							
							
								
								gameStart method now returns HashMap
							
							
							
							
							
						 | 
						
							2021-12-02 15:20:30 +01:00 | 
						
					
				
					
						
							
							
								 
								Leonardo Brandenberger
							
						 | 
						
							
							
							
							
							
								
							
							
								e48371a121
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/main'
							
							
							
							
							
							
							
							# Conflicts:
#	.idea/misc.xml 
							
						 | 
						
							2021-12-02 15:16:00 +01:00 | 
						
					
				
					
						
							
							
								 
								Leonardo Brandenberger
							
						 | 
						
							
							
							
							
							
								
							
							
								3c67d62e42
								
							
						 | 
						
							
							
								
								Several new methods added in Parser class
							
							
							
							
							
						 | 
						
							2021-12-02 15:15:39 +01:00 | 
						
					
				
					
						
							
							
								 
								Andrin Fassbind
							
						 | 
						
							
							
							
							
							
								
							
							
								d6c225a5aa
								
							
						 | 
						
							
							
								
								created method storeResourceToBank in Bank.java
							
							
							
							
							
							
							
							adapted method buildRoad and buildSettlement in SiedlerGame.java 
							
						 | 
						
							2021-12-02 14:12:12 +01:00 | 
						
					
				
					
						
							
							
								 
								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 |