Commit Graph

118 Commits

Author SHA1 Message Date
Andrin Fassbind 1a3a96218c refactor Track 2022-03-24 18:49:07 +01:00
Andrin Fassbind 19eb41066c GameTest.java correct 2022-03-24 18:45:59 +01:00
romanschenk37 30162df956 Merge remote-tracking branch 'origin/Strategy' into Strategy 2022-03-24 18:18:20 +01:00
romanschenk37 d777b87549 fix in Method calculateNewWinPoints 2022-03-24 18:18:07 +01:00
Andrin Fassbind 7b6fc70e05 removed PositionVectorNotValidException.java 2022-03-24 17:53:35 +01:00
Andrin Fassbind a2dcc1b0d8 Merge remote-tracking branch 'origin/Strategy' into Strategy 2022-03-24 17:52:21 +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
Leonardo Brandenberger bc0dd52360 added elements to README.md 2022-03-24 14:38:08 +01:00
Leonardo Brandenberger 015dbac96c added elements to README.md 2022-03-24 14:36:48 +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
Leonardo Brandenberger 4ce26578b9 Merge pull request #30 from PM2-IT21bWIN-ruiz-mach-krea/Game
refactoring of Method calculatePath from Game.java to Track.java
2022-03-24 13:35:38 +01:00
romanschenk37 fa4842e440 refactoring of Method calculatePath from Game.java to Track.java 2022-03-24 13:32:12 +01:00
Leonardo Brandenberger dc704cce4c continued readme 2022-03-23 21:32:15 +01:00
Leonardo Brandenberger 082d1414f5 started readme 2022-03-23 21:19:37 +01:00
Leonardo Brandenberger 7c87f4b2fd started readme 2022-03-23 21:11:36 +01:00
Leonardo Brandenberger 1c63c0cb21 started readme 2022-03-23 21:08:57 +01:00
Leonardo Brandenberger 787ddd7155 Merge remote-tracking branch 'origin/main' 2022-03-23 21:07:55 +01:00
Leonardo Brandenberger a14327a2a7 started readme 2022-03-23 21:07:44 +01:00
romanschenk37 ded9023ff1 adapted CarTest.java for PathFolowerMoveStrategy.java 2022-03-23 11:24:58 +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
romanschenk37 de91717a48 Merge pull request #29 from PM2-IT21bWIN-ruiz-mach-krea/GameTest
Game test
2022-03-23 09:18:59 +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 b8dda0b96a Merge branch 'main' into GameTest 2022-03-22 19:36:43 +01:00
Andrin Fassbind dc34d984f8 -CarTest added winpoint test
-added Klassendiagramm
-create Constructor InvalidTrackFormatException
2022-03-22 19:04:26 +01:00
Andrin Fassbind 8877f1476f GameTest 2022-03-22 18:47:14 +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
Andrin Fassbind 6403ee958f Merge remote-tracking branch 'origin/Strategy' into Strategy 2022-03-20 16:59:50 +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
Andrin Fassbind ae62f9e98c Merge branch 'Game' into Strategy 2022-03-20 13:45:44 +01:00
Andrin Fassbind b467a79596 Changed mainClass in build.gradle to Main 2022-03-20 13:44:54 +01:00
fassband d7a593be30 Merge pull request #27 from PM2-IT21bWIN-ruiz-mach-krea/GameTest
GameTest startet
2022-03-20 13:40:48 +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