ZHAW-IT21b_WIN
/
team02-AngryNerds-projekt1-racetrack
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
53 Commits 12 Branches 0 Tags 611 KiB
Commit Graph

53 Commits

Author SHA1 Message Date
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
fassband 67c5a79174 Merge pull request #25 from PM2-IT21bWIN-ruiz-mach-krea/track-feature 
Track feature
 2022-03-18 19:57:18 +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
romanschenk37 9b6908ef47 implemented Movestrategies in Game.java 2022-03-18 10:00:28 +01:00
Leonardo Brandenberger 06ad28fbe8 implemented getWinner method 2022-03-18 09:58:13 +01:00
Leonardo Brandenberger b606f20d9f implemented calculate winner and needed int in in car to hold winpoints. 2022-03-18 09:51:11 +01:00
Leonardo Brandenberger e94053fee8 started method calculateWinner 2022-03-14 00:17:45 +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
romanschenk37 4ebe8cb1ed created Method initphase in Game.java 2022-03-10 15:18:08 +01:00
Andrin Fassbind c4ea4d1920 - Crash Methoden hinzugefügt 2022-03-10 14:58:54 +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
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
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