Andrin Fassbind
							
						 | 
						
							
							
							
							
							
								
							
							
								ee68bf9a1d
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/main' into track-feature
							
							
							
							
							
							
							
							# Conflicts:
#	src/main/java/ch/zhaw/pm2/racetrack/Car.java 
							
						 | 
						
							2022-03-10 14:36:30 +01:00 | 
						
					
				
					
						
							
							
								 
								Andrin Fassbind
							
						 | 
						
							
							
							
							
							
								
							
							
								befc67f4f0
								
							
						 | 
						
							
							
								
								- Methoden überarbeitet
							
							
							
							
							
						 | 
						
							2022-03-10 14:35:33 +01:00 | 
						
					
				
					
						
							
							
								 
								romanschenk37
							
						 | 
						
							
							
							
							
							
								
							
							
								d6a46f3cae
								
							
						 | 
						
							
							
								
								Merge pull request #19 from PM2-IT21bWIN-ruiz-mach-krea/car
							
							
							
							
							
							
							
							created Branch car 
							
						 | 
						
							2022-03-10 14:04:06 +01:00 | 
						
					
				
					
						
							
							
								 
								Leonardo Brandenberger
							
						 | 
						
							
							
							
							
							
								
							
							
								b6f69d3c1c
								
							
						 | 
						
							
							
								
								created Branch car
							
							
							
							
							
							
							
							finished all TODOS in car and created needed method getID and getVelocity. 
							
						 | 
						
							2022-03-10 13:31:51 +01:00 | 
						
					
				
					
						
							
							
								 
								Andrin Fassbind
							
						 | 
						
							
							
							
							
							
								
							
							
								15123b05bb
								
							
						 | 
						
							
							
								
								- Methoden überarbeitet
							
							
							
							
							
						 | 
						
							2022-03-08 11:27:05 +01:00 | 
						
					
				
					
						
							
							
								 
								romanschenk37
							
						 | 
						
							
							
							
							
							
								
							
							
								77b5f4cbfb
								
							
						 | 
						
							
							
								
								created Class_UserInterface
							
							
							
							
							
						 | 
						
							2022-03-07 22:03:43 +01:00 | 
						
					
				
					
						
							
							
								 
								Andrin Fassbind
							
						 | 
						
							
							
							
							
							
								
							
							
								007d8ee393
								
							
						 | 
						
							
							
								
								- Methoden überarbeitet
							
							
							
							
							
							
							
							Teils provisorisch da genaue Umsetzung noch unklar
Siehe TODO 
							
						 | 
						
							2022-03-07 17:49:55 +01:00 | 
						
					
				
					
						
							
							
								 
								Andrin Fassbind
							
						 | 
						
							
							
							
							
							
								
							
							
								571728b6fd
								
							
						 | 
						
							
							
								
								- Method toString done
							
							
							
							
							
						 | 
						
							2022-03-06 16:10:18 +01:00 | 
						
					
				
					
						
							
							
								 
								Andrin Fassbind
							
						 | 
						
							
							
							
							
							
								
							
							
								8ff70ab3ac
								
							
						 | 
						
							
							
								
								-Method readFile done and tested
							
							
							
							
							
							
							
							-Method getSpaceType done and once tested 
							
						 | 
						
							2022-03-06 15:15:39 +01:00 | 
						
					
				
					
						
							
							
								 
								romanschenk37
							
						 | 
						
							
							
							
							
							
								
							
							
								16d287e273
								
							
						 | 
						
							
							
								
								Initial commit
							
							
							
							
							
						 | 
						
							2022-03-04 09:04:12 +01:00 |