romanschenk37
							
						 | 
						
							
							
							
							
							
								
							
							
								8929d295b9
								
							
						 | 
						
							
							
								
								Merge pull request #21 from PM2-IT21bWIN-ruiz-mach-krea/track-feature
							
							
							
							
							
							
							
							Track feature 
							
						 | 
						
							2022-03-11 18:41:11 +01:00 | 
						
					
				
					
						
							
							
								 
								Andrin Fassbind
							
						 | 
						
							
							
							
							
							
								
							
							
								884b349077
								
							
						 | 
						
							
							
								
								- TrackTest done Track done
							
							
							
							
							
						 | 
						
							2022-03-11 16:01:49 +01:00 | 
						
					
				
					
						
							
							
								 
								romanschenk37
							
						 | 
						
							
							
							
							
							
								
							
							
								af6914f795
								
							
						 | 
						
							
							
								
								changes in Methods in Game.java
							
							
							
							
							
							
							
							created MainClass.java 
							
						 | 
						
							2022-03-11 12:08:17 +01:00 | 
						
					
				
					
						
							
							
								 
								romanschenk37
							
						 | 
						
							
							
							
							
							
								
							
							
								7e5d349f3f
								
							
						 | 
						
							
							
								
								changes in Methods in Game.java
							
							
							
							
							
						 | 
						
							2022-03-11 12:01:55 +01:00 | 
						
					
				
					
						
							
							
								 
								Leonardo Brandenberger
							
						 | 
						
							
							
							
							
							
								
							
							
								e159274085
								
							
						 | 
						
							
							
								
								finished method currentCarIndex, switchToNextActiveCar, willCarCrash
							
							
							
							
							
						 | 
						
							2022-03-11 10:37:54 +01:00 | 
						
					
				
					
						
							
							
								 
								Leonardo Brandenberger
							
						 | 
						
							
							
							
							
							
								
							
							
								dd987a5a14
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/Game' into Game
							
							
							
							
							
						 | 
						
							2022-03-10 19:04:21 +01:00 | 
						
					
				
					
						
							
							
								 
								Leonardo Brandenberger
							
						 | 
						
							
							
							
							
							
								
							
							
								bf08749f28
								
							
						 | 
						
							
							
								
								implemented calculatePath method.
							
							
							
							
							
						 | 
						
							2022-03-10 19:04:09 +01:00 | 
						
					
				
					
						
							
							
								 
								romanschenk37
							
						 | 
						
							
							
							
							
							
								
							
							
								dd625907c9
								
							
						 | 
						
							
							
								
								changes in Method initphase
							
							
							
							
							
							
							
							added Method printInformation in UserInterface.java 
							
						 | 
						
							2022-03-10 16:48:14 +01:00 | 
						
					
				
					
						
							
							
								 
								romanschenk37
							
						 | 
						
							
							
							
							
							
								
							
							
								3fe1bb1426
								
							
						 | 
						
							
							
								
								completed Method initphase
							
							
							
							
							
						 | 
						
							2022-03-10 16:30:33 +01:00 | 
						
					
				
					
						
							
							
								 
								Leonardo Brandenberger
							
						 | 
						
							
							
							
							
							
								
							
							
								6285cfe215
								
							
						 | 
						
							
							
								
								merged track into game
							
							
							
							
							
						 | 
						
							2022-03-10 15:39:58 +01:00 | 
						
					
				
					
						
							
							
								 
								Leonardo Brandenberger
							
						 | 
						
							
							
							
							
							
								
							
							
								156f6d0cab
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/track-feature' into Game
							
							
							
							
							
						 | 
						
							2022-03-10 15:36:00 +01:00 | 
						
					
				
					
						
							
							
								 
								Leonardo Brandenberger
							
						 | 
						
							
							
							
							
							
								
							
							
								ddbf666cc8
								
							
						 | 
						
							
							
								
								finished methods getCarPosition, getCarVelocity and get CarID
							
							
							
							
							
						 | 
						
							2022-03-10 15:33:20 +01:00 | 
						
					
				
					
						
							
							
								 
								romanschenk37
							
						 | 
						
							
							
							
							
							
								
							
							
								57a5d199a6
								
							
						 | 
						
							
							
								
								changes in Method initphase
							
							
							
							
							
						 | 
						
							2022-03-10 15:29:04 +01:00 | 
						
					
				
					
						
							
							
								 
								Leonardo Brandenberger
							
						 | 
						
							
							
							
							
							
								
							
							
								dca575999e
								
							
						 | 
						
							
							
								
								Added javadocs to exceptions.
							
							
							
							
							
						 | 
						
							2022-03-10 15:20:53 +01:00 | 
						
					
				
					
						
							
							
								 
								Leonardo Brandenberger
							
						 | 
						
							
							
							
							
							
								
							
							
								6080b48b82
								
							
						 | 
						
							
							
								
								finished both exceptions.
							
							
							
							
							
						 | 
						
							2022-03-10 15:18:16 +01:00 | 
						
					
				
					
						
							
							
								 
								romanschenk37
							
						 | 
						
							
							
							
							
							
								
							
							
								4ebe8cb1ed
								
							
						 | 
						
							
							
								
								created Method initphase in Game.java
							
							
							
							
							
						 | 
						
							2022-03-10 15:18:08 +01:00 | 
						
					
				
					
						
							
							
								 
								Leonardo Brandenberger
							
						 | 
						
							
							
							
							
							
								
							
							
								0fafa3e0e7
								
							
						 | 
						
							
							
								
								finished both exceptions.
							
							
							
							
							
						 | 
						
							2022-03-10 15:17:04 +01:00 | 
						
					
				
					
						
							
							
								 
								Andrin Fassbind
							
						 | 
						
							
							
							
							
							
								
							
							
								c4ea4d1920
								
							
						 | 
						
							
							
								
								- Crash Methoden hinzugefügt
							
							
							
							
							
						 | 
						
							2022-03-10 14:58:54 +01:00 | 
						
					
				
					
						
							
							
								 
								Leonardo Brandenberger
							
						 | 
						
							
							
							
							
							
								
							
							
								16e4460a47
								
							
						 | 
						
							
							
								
								Merge pull request #20 from PM2-IT21bWIN-ruiz-mach-krea/car
							
							
							
							
							
							
							
							Fixed Error in CarTest.java 
							
						 | 
						
							2022-03-10 14:51:26 +01:00 | 
						
					
				
					
						
							
							
								 
								romanschenk37
							
						 | 
						
							
							
							
							
							
								
							
							
								a67a96d19d
								
							
						 | 
						
							
							
								
								fix in CarTest.java
							
							
							
							
							
						 | 
						
							2022-03-10 14:46:51 +01:00 | 
						
					
				
					
						
							
							
								 
								Andrin Fassbind
							
						 | 
						
							
							
							
							
							
								
							
							
								46e6b838c2
								
							
						 | 
						
							
							
								
								- Methoden überarbeitet
							
							
							
							
							
						 | 
						
							2022-03-10 14:43:34 +01:00 | 
						
					
				
					
						
							
							
								 
								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 | 
						
					
				
					
						
							
							
								 
								Leonardo Brandenberger
							
						 | 
						
							
							
							
							
							
								
							
							
								19b227c59f
								
							
						 | 
						
							
							
								
								merged cartest branch into car branch
							
							
							
							
							
						 | 
						
							2022-03-10 14:18:33 +01:00 | 
						
					
				
					
						
							
							
								 
								Leonardo Brandenberger
							
						 | 
						
							
							
							
							
							
								
							
							
								cbc915bf50
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/CarTest' into car
							
							
							
							
							
						 | 
						
							2022-03-10 14:04:48 +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 | 
						
					
				
					
						
							
							
								 
								romanschenk37
							
						 | 
						
							
							
							
							
							
								
							
							
								5afd0b0b61
								
							
						 | 
						
							
							
								
								Merge pull request #18 from PM2-IT21bWIN-ruiz-mach-krea/Class_UserInterface
							
							
							
							
							
							
							
							created Class_UserInterface 
							
						 | 
						
							2022-03-08 13:54:37 +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 | 
						
					
				
					
						
							
							
								 
								romanschenk37
							
						 | 
						
							
							
							
							
							
								
							
							
								31a24120eb
								
							
						 | 
						
							
							
								
								added checks for method getVelocity in Test Movement in CarTest.java
							
							
							
							
							
						 | 
						
							2022-03-07 20:44:05 +01:00 | 
						
					
				
					
						
							
							
								 
								Andrin Fassbind
							
						 | 
						
							
							
							
							
							
								
							
							
								007d8ee393
								
							
						 | 
						
							
							
								
								- Methoden überarbeitet
							
							
							
							
							
							
							
							Teils provisorisch da genaue Umsetzung noch unklar
Siehe TODO 
							
						 | 
						
							2022-03-07 17:49:55 +01:00 | 
						
					
				
					
						
							
							
								 
								romanschenk37
							
						 | 
						
							
							
							
							
							
								
							
							
								dea430e418
								
							
						 | 
						
							
							
								
								Added Test for Method getID in CarTest.java
							
							
							
							
							
						 | 
						
							2022-03-07 17:43:32 +01:00 | 
						
					
				
					
						
							
							
								 
								romanschenk37
							
						 | 
						
							
							
							
							
							
								
							
							
								40cd4f7b72
								
							
						 | 
						
							
							
								
								Added Javadoc and comments in CarTest.java
							
							
							
							
							
						 | 
						
							2022-03-06 18:57:01 +01:00 | 
						
					
				
					
						
							
							
								 
								romanschenk37
							
						 | 
						
							
							
							
							
							
								
							
							
								8086111772
								
							
						 | 
						
							
							
								
								Fix in CarTest.java
							
							
							
							
							
							
							
							@Test setPosition 
							
						 | 
						
							2022-03-06 18:13:27 +01:00 | 
						
					
				
					
						
							
							
								 
								romanschenk37
							
						 | 
						
							
							
							
							
							
								
							
							
								972f011a08
								
							
						 | 
						
							
							
								
								changes in Tests car.CarTest
							
							
							
							
							
							
							
							setPosition, movement, crash, moveStrategy 
							
						 | 
						
							2022-03-06 17:06:42 +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
							
						 | 
						
							
							
							
							
							
								
							
							
								381ea44a9a
								
							
						 | 
						
							
							
								
								Created CarTest.java
							
							
							
							
							
							
							
							added Tests setPosition, nextPosition 
							
						 | 
						
							2022-03-05 16:39:08 +01:00 | 
						
					
				
					
						
							
							
								 
								romanschenk37
							
						 | 
						
							
							
							
							
							
								
							
							
								16d287e273
								
							
						 | 
						
							
							
								
								Initial commit
							
							
							
							
							
						 | 
						
							2022-03-04 09:04:12 +01:00 | 
						
					
				
					
						
							
							
								 
								fassband
							
						 | 
						
							
							
							
							
							
								
							
							
								19b297fb03
								
							
						 | 
						
							
							
								
								Initial commit
							
							
							
							
							
						 | 
						
							2022-03-04 08:58:05 +01:00 |