romanschenk37
							
						 | 
						
							
							
							
							
							
								
							
							
								e84bce43af
								
							
						 | 
						
							
							
								
								fix getWinner in Game.java
							
							
							
							
							
							
							
							working on PathFinderMoveStrategy 
							
						 | 
						
							2022-03-24 19:04:43 +01:00 | 
						
					
				
					
						
							
							
								 
								romanschenk37
							
						 | 
						
							
							
							
							
							
								
							
							
								d777b87549
								
							
						 | 
						
							
							
								
								fix in Method calculateNewWinPoints
							
							
							
							
							
						 | 
						
							2022-03-24 18:18:07 +01:00 | 
						
					
				
					
						
							
							
								 
								romanschenk37
							
						 | 
						
							
							
							
							
							
								
							
							
								82911fcfb6
								
							
						 | 
						
							
							
								
								merge Game.java
							
							
							
							
							
						 | 
						
							2022-03-24 17:45:15 +01:00 | 
						
					
				
					
						
							
							
								 
								romanschenk37
							
						 | 
						
							
							
							
							
							
								
							
							
								f133f4305d
								
							
						 | 
						
							
							
								
								Merge branch 'main' into Strategy
							
							
							
							
							
							
							
							# Conflicts:
#	src/main/java/ch/zhaw/pm2/racetrack/Game.java 
							
						 | 
						
							2022-03-24 17:43:40 +01:00 | 
						
					
				
					
						
							
							
								 
								romanschenk37
							
						 | 
						
							
							
							
							
							
								
							
							
								0656b77662
								
							
						 | 
						
							
							
								
								worked on PathFinderMoveStrategy and Refactoring in Game.java
							
							
							
							
							
						 | 
						
							2022-03-24 17:38:40 +01:00 | 
						
					
				
					
						
							
							
								 
								Andrin Fassbind
							
						 | 
						
							
							
							
							
							
								
							
							
								f6a16181cf
								
							
						 | 
						
							
							
								
								removed PositionVectorNotValidException.java
							
							
							
							
							
						 | 
						
							2022-03-24 17:27:30 +01:00 | 
						
					
				
					
						
							
							
								 
								romanschenk37
							
						 | 
						
							
							
							
							
							
								
							
							
								ad2e1c3104
								
							
						 | 
						
							
							
								
								worked on PathFinderMoveStrategy and Refactoring in Game.java
							
							
							
							
							
						 | 
						
							2022-03-24 17:09:05 +01:00 | 
						
					
				
					
						
							
							
								 
								Andrin Fassbind
							
						 | 
						
							
							
							
							
							
								
							
							
								eca2e2eb9b
								
							
						 | 
						
							
							
								
								refactored merge conflict in Track
							
							
							
							
							
						 | 
						
							2022-03-24 17:02:42 +01:00 | 
						
					
				
					
						
							
							
								 
								Andrin Fassbind
							
						 | 
						
							
							
							
							
							
								
							
							
								80b07111de
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/main'
							
							
							
							
							
							
							
							# Conflicts:
#	src/main/java/ch/zhaw/pm2/racetrack/Game.java
#	src/main/java/ch/zhaw/pm2/racetrack/Track.java 
							
						 | 
						
							2022-03-24 16:57:00 +01:00 | 
						
					
				
					
						
							
							
								 
								Andrin Fassbind
							
						 | 
						
							
							
							
							
							
								
							
							
								a143a9c7d7
								
							
						 | 
						
							
							
								
								refactoring several classes
							
							
							
							
							
						 | 
						
							2022-03-24 16:50:18 +01:00 | 
						
					
				
					
						
							
							
								 
								Leonardo Brandenberger
							
						 | 
						
							
							
							
							
							
								
							
							
								31ec1e9e64
								
							
						 | 
						
							
							
								
								refactoring done in several classes
							
							
							
							
							
						 | 
						
							2022-03-24 16:30:59 +01:00 | 
						
					
				
					
						
							
							
								 
								romanschenk37
							
						 | 
						
							
							
							
							
							
								
							
							
								4b5802a0d0
								
							
						 | 
						
							
							
								
								added PathFinderMoveStrategy in Game.
							
							
							
							
							
						 | 
						
							2022-03-24 13:59:46 +01:00 | 
						
					
				
					
						
							
							
								 
								romanschenk37
							
						 | 
						
							
							
							
							
							
								
							
							
								a689df5fe1
								
							
						 | 
						
							
							
								
								Merge branch 'main' into Strategy
							
							
							
							
							
						 | 
						
							2022-03-24 13:41:42 +01:00 | 
						
					
				
					
						
							
							
								 
								romanschenk37
							
						 | 
						
							
							
							
							
							
								
							
							
								fa4842e440
								
							
						 | 
						
							
							
								
								refactoring of Method calculatePath from Game.java to Track.java
							
							
							
							
							
						 | 
						
							2022-03-24 13:32:12 +01:00 | 
						
					
				
					
						
							
							
								 
								romanschenk37
							
						 | 
						
							
							
							
							
							
								
							
							
								2de3993921
								
							
						 | 
						
							
							
								
								Merge pull request #28 from PM2-IT21bWIN-ruiz-mach-krea/PathFollowerMoveStrategy
							
							
							
							
							
							
							
							implemented PathFollowerMoveStrategy.java 
							
						 | 
						
							2022-03-23 10:09:35 +01:00 | 
						
					
				
					
						
							
							
								 
								Andrin Fassbind
							
						 | 
						
							
							
							
							
							
								
							
							
								826f67d125
								
							
						 | 
						
							
							
								
								gamePhase() prevent null direction
							
							
							
							
							
						 | 
						
							2022-03-23 09:10:51 +01:00 | 
						
					
				
					
						
							
							
								 
								romanschenk37
							
						 | 
						
							
							
							
							
							
								
							
							
								6ac4f64456
								
							
						 | 
						
							
							
								
								Javadoc in PathFollowerMoveStrategy.java
							
							
							
							
							
						 | 
						
							2022-03-23 08:55:32 +01:00 | 
						
					
				
					
						
							
							
								 
								Andrin Fassbind
							
						 | 
						
							
							
							
							
							
								
							
							
								b1a4f3b3db
								
							
						 | 
						
							
							
								
								-CarTest added winpoint test
							
							
							
							
							
							
							
							-added Klassendiagramm
-create Constructor InvalidTrackFormatException 
							
						 | 
						
							2022-03-23 08:53:40 +01:00 | 
						
					
				
					
						
							
							
								 
								romanschenk37
							
						 | 
						
							
							
							
							
							
								
							
							
								45918124df
								
							
						 | 
						
							
							
								
								refactoring and javadoc in PathFollowerMoveStrategy.javaa
							
							
							
							
							
						 | 
						
							2022-03-23 08:48:46 +01:00 | 
						
					
				
					
						
							
							
								 
								Andrin Fassbind
							
						 | 
						
							
							
							
							
							
								
							
							
								dc34d984f8
								
							
						 | 
						
							
							
								
								-CarTest added winpoint test
							
							
							
							
							
							
							
							-added Klassendiagramm
-create Constructor InvalidTrackFormatException 
							
						 | 
						
							2022-03-22 19:04:26 +01:00 | 
						
					
				
					
						
							
							
								 
								romanschenk37
							
						 | 
						
							
							
							
							
							
								
							
							
								c59e4a30d8
								
							
						 | 
						
							
							
								
								Update MoveListStrategy.java
							
							
							
							
							
						 | 
						
							2022-03-22 18:31:15 +01:00 | 
						
					
				
					
						
							
							
								 
								romanschenk37
							
						 | 
						
							
							
							
							
							
								
							
							
								eddf9d3daa
								
							
						 | 
						
							
							
								
								implemented PathFollowerMoveStrategy.java
							
							
							
							
							
						 | 
						
							2022-03-22 18:20:23 +01:00 | 
						
					
				
					
						
							
							
								 
								Leonardo Brandenberger
							
						 | 
						
							
							
							
							
							
								
							
							
								cf1a8d703e
								
							
						 | 
						
							
							
								
								continued class PathFinderStrategy
							
							
							
							
							
						 | 
						
							2022-03-21 01:26:26 +01:00 | 
						
					
				
					
						
							
							
								 
								romanschenk37
							
						 | 
						
							
							
							
							
							
								
							
							
								fe74d017b2
								
							
						 | 
						
							
							
								
								Merge pull request #23 from PM2-IT21bWIN-ruiz-mach-krea/Game
							
							
							
							
							
							
							
							Game 
							
						 | 
						
							2022-03-20 16:56:33 +01:00 | 
						
					
				
					
						
							
							
								 
								Leonardo Brandenberger
							
						 | 
						
							
							
							
							
							
								
							
							
								7c841abfc6
								
							
						 | 
						
							
							
								
								continued class PathFinderStrategy
							
							
							
							
							
						 | 
						
							2022-03-20 16:33:03 +01:00 | 
						
					
				
					
						
							
							
								 
								Leonardo Brandenberger
							
						 | 
						
							
							
							
							
							
								
							
							
								0b423b759e
								
							
						 | 
						
							
							
								
								started method PathFinderStrategy, (much work needed still no real solution in mind)
							
							
							
							
							
						 | 
						
							2022-03-20 03:26:00 +01:00 | 
						
					
				
					
						
							
							
								 
								Andrin Fassbind
							
						 | 
						
							
							
							
							
							
								
							
							
								8826561963
								
							
						 | 
						
							
							
								
								GameTest startet
							
							
							
							
							
							
							
							++ Game and Main clean up 
							
						 | 
						
							2022-03-19 13:20:19 +01:00 | 
						
					
				
					
						
							
							
								 
								romanschenk37
							
						 | 
						
							
							
							
							
							
								
							
							
								a80ea0fa1c
								
							
						 | 
						
							
							
								
								fix doCarTurn in Game.java
							
							
							
							
							
						 | 
						
							2022-03-18 22:01:03 +01:00 | 
						
					
				
					
						
							
							
								 
								romanschenk37
							
						 | 
						
							
							
							
							
							
								
							
							
								fc78b10365
								
							
						 | 
						
							
							
								
								optimized Main Class. added Method quit to UserInterface.java
							
							
							
							
							
						 | 
						
							2022-03-18 21:48:27 +01:00 | 
						
					
				
					
						
							
							
								 
								romanschenk37
							
						 | 
						
							
							
							
							
							
								
							
							
								fec3aceaa6
								
							
						 | 
						
							
							
								
								Merge pull request #26 from PM2-IT21bWIN-ruiz-mach-krea/MoveListFeature
							
							
							
							
							
							
							
							Move list feature 
							
						 | 
						
							2022-03-18 20:54:27 +01:00 | 
						
					
				
					
						
							
							
								 
								romanschenk37
							
						 | 
						
							
							
							
							
							
								
							
							
								833b122d2b
								
							
						 | 
						
							
							
								
								Update Game.java
							
							
							
							
							
							
							
							Removed System.out.println... 
							
						 | 
						
							2022-03-18 20:54:04 +01:00 | 
						
					
				
					
						
							
							
								 
								Andrin Fassbind
							
						 | 
						
							
							
							
							
							
								
							
							
								837297cd31
								
							
						 | 
						
							
							
								
								MoveListStrategy implemented
							
							
							
							
							
						 | 
						
							2022-03-18 19:44:47 +01:00 | 
						
					
				
					
						
							
							
								 
								Andrin Fassbind
							
						 | 
						
							
							
							
							
							
								
							
							
								c30d7a2988
								
							
						 | 
						
							
							
								
								merge
							
							
							
							
							
						 | 
						
							2022-03-18 18:20:28 +01:00 | 
						
					
				
					
						
							
							
								 
								Andrin Fassbind
							
						 | 
						
							
							
							
							
							
								
							
							
								21da4feaf5
								
							
						 | 
						
							
							
								
								dev MoveListStrategy and test
							
							
							
							
							
						 | 
						
							2022-03-18 18:02:10 +01:00 | 
						
					
				
					
						
							
							
								 
								romanschenk37
							
						 | 
						
							
							
							
							
							
								
							
							
								dad57ea8ac
								
							
						 | 
						
							
							
								
								fix in CardoesCrash in Track.java (remove Car when crash)
							
							
							
							
							
						 | 
						
							2022-03-18 17:32:16 +01:00 | 
						
					
				
					
						
							
							
								 
								romanschenk37
							
						 | 
						
							
							
							
							
							
								
							
							
								e6fc0fde39
								
							
						 | 
						
							
							
								
								fix in makeCarMoveInTrack in Track.java (redraw finish line if car was on finish line)
							
							
							
							
							
						 | 
						
							2022-03-18 17:23:50 +01:00 | 
						
					
				
					
						
							
							
								 
								romanschenk37
							
						 | 
						
							
							
							
							
							
								
							
							
								9869e8e74d
								
							
						 | 
						
							
							
								
								fix in getWinner in Game.java
							
							
							
							
							
						 | 
						
							2022-03-18 16:48:37 +01:00 | 
						
					
				
					
						
							
							
								 
								romanschenk37
							
						 | 
						
							
							
							
							
							
								
							
							
								1c618ad09a
								
							
						 | 
						
							
							
								
								change in gamephase in Game.java
							
							
							
							
							
						 | 
						
							2022-03-18 16:45:16 +01:00 | 
						
					
				
					
						
							
							
								 
								romanschenk37
							
						 | 
						
							
							
							
							
							
								
							
							
								3684b5589e
								
							
						 | 
						
							
							
								
								fixes in Game.java and Track.java
							
							
							
							
							
						 | 
						
							2022-03-18 16:13:37 +01:00 | 
						
					
				
					
						
							
							
								 
								romanschenk37
							
						 | 
						
							
							
							
							
							
								
							
							
								fd4513e0d0
								
							
						 | 
						
							
							
								
								fixes in Game.java
							
							
							
							
							
						 | 
						
							2022-03-18 15:37:17 +01:00 | 
						
					
				
					
						
							
							
								 
								Andrin Fassbind
							
						 | 
						
							
							
							
							
							
								
							
							
								504d5c62ef
								
							
						 | 
						
							
							
								
								Fixed wrong encoding error
							
							
							
							
							
						 | 
						
							2022-03-18 14:18:07 +01:00 | 
						
					
				
					
						
							
							
								 
								Andrin Fassbind
							
						 | 
						
							
							
							
							
							
								
							
							
								848d62a5f9
								
							
						 | 
						
							
							
								
								Test commit
							
							
							
							
							
						 | 
						
							2022-03-18 14:06:14 +01:00 | 
						
					
				
					
						
							
							
								 
								romanschenk37
							
						 | 
						
							
							
							
							
							
								
							
							
								8dad26006c
								
							
						 | 
						
							
							
								
								change in Main.java
							
							
							
							
							
						 | 
						
							2022-03-18 13:34:51 +01:00 | 
						
					
				
					
						
							
							
								 
								Leonardo Brandenberger
							
						 | 
						
							
							
							
							
							
								
							
							
								268506a084
								
							
						 | 
						
							
							
								
								fixed errors in calculateWinner
							
							
							
							
							
						 | 
						
							2022-03-18 11:02:53 +01:00 | 
						
					
				
					
						
							
							
								 
								romanschenk37
							
						 | 
						
							
							
							
							
							
								
							
							
								74a83e790a
								
							
						 | 
						
							
							
								
								fixes in Game.java Method switchToNextActiveCar
							
							
							
							
							
						 | 
						
							2022-03-18 10:55:31 +01:00 | 
						
					
				
					
						
							
							
								 
								romanschenk37
							
						 | 
						
							
							
							
							
							
								
							
							
								e1e03d4ad4
								
							
						 | 
						
							
							
								
								fixes in Game.java Method gamePhase
							
							
							
							
							
						 | 
						
							2022-03-18 10:43:51 +01:00 | 
						
					
				
					
						
							
							
								 
								romanschenk37
							
						 | 
						
							
							
							
							
							
								
							
							
								63204a4b29
								
							
						 | 
						
							
							
								
								fixes in Game.java Method gamePhase
							
							
							
							
							
						 | 
						
							2022-03-18 10:43:22 +01:00 | 
						
					
				
					
						
							
							
								 
								romanschenk37
							
						 | 
						
							
							
							
							
							
								
							
							
								e5f45b7bb1
								
							
						 | 
						
							
							
								
								fixes in Game.java and UserInterface.java
							
							
							
							
							
						 | 
						
							2022-03-18 10:37:53 +01:00 | 
						
					
				
					
						
							
							
								 
								romanschenk37
							
						 | 
						
							
							
							
							
							
								
							
							
								a723ea16ec
								
							
						 | 
						
							
							
								
								merge track into game and fix in initphase
							
							
							
							
							
						 | 
						
							2022-03-18 10:19:23 +01:00 | 
						
					
				
					
						
							
							
								 
								romanschenk37
							
						 | 
						
							
							
							
							
							
								
							
							
								5ec7260b1e
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/track-feature' into Game
							
							
							
							
							
							
							
							# Conflicts:
#	src/main/java/ch/zhaw/pm2/racetrack/Track.java 
							
						 | 
						
							2022-03-18 10:03:26 +01:00 |