Commit Graph

136 Commits

Author SHA1 Message Date
romanschenk37 09ab684fdd Merge remote-tracking branch 'origin/main' 2022-03-25 10:52:43 +01:00
romanschenk37 ff41150e44 Javadoc in PathFinderMoveStrategy.java 2022-03-25 10:52:32 +01:00
Leonardo Brandenberger d038132055 Merge remote-tracking branch 'origin/main' 2022-03-25 09:27:09 +01:00
Leonardo Brandenberger 38728f0921 finished Java 2022-03-25 09:27:00 +01:00
romanschenk37 483d800484 Merge pull request #31 from PM2-IT21bWIN-ruiz-mach-krea/Strategy
Strategy
2022-03-25 09:24:21 +01:00
romanschenk37 7f9b0bafe4 Merge branch 'main' into Strategy
# Conflicts:
#	src/main/java/ch/zhaw/pm2/racetrack/Game.java
#	src/main/java/ch/zhaw/pm2/racetrack/Track.java
#	src/test/java/ch/zhaw/pm2/racetrack/GameTest.java
2022-03-25 09:21:12 +01:00
Leonardo Brandenberger 2366f798ca added all javadocs to class Track 2022-03-25 08:58:34 +01:00
romanschenk37 d6a9b5f1aa fixed PathFinderMoveStrategy 2022-03-25 08:58:01 +01:00
Leonardo Brandenberger 13012c1d4b Merge remote-tracking branch 'origin/main'
# Conflicts:
#	src/main/java/ch/zhaw/pm2/racetrack/Track.java
2022-03-25 08:52:41 +01:00
romanschenk37 448e34e869 fixed PathFinderMoveStrategy 2022-03-25 00:10:07 +01:00
romanschenk37 b01bee0142 fixed PathFinderMoveStrategy 2022-03-25 00:02:04 +01:00
romanschenk37 7c8cf55ac2 fix calculateNewWinPoints 2022-03-24 19:14:36 +01:00
romanschenk37 0a57afc3c7 Merge remote-tracking branch 'origin/Strategy' into Strategy 2022-03-24 19:05:01 +01:00
romanschenk37 e84bce43af fix getWinner in Game.java
working on PathFinderMoveStrategy
2022-03-24 19:04:43 +01:00
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
Andrin Fassbind 95ef0b9d76 refactor gametest 2022-03-24 18:33:29 +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
Andrin Fassbind badec0d16f removed PositionVectorNotValidException.java 2022-03-24 17:50:03 +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
Leonardo Brandenberger c997730abf Merge remote-tracking branch 'origin/main'
# Conflicts:
#	src/main/java/ch/zhaw/pm2/racetrack/Track.java
2022-03-24 17:33:11 +01:00
Andrin Fassbind f6a16181cf removed PositionVectorNotValidException.java 2022-03-24 17:27:30 +01:00
Leonardo Brandenberger 2b2834f47a added all javadocs to class Track 2022-03-24 17:26:44 +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