Commit Graph

36 Commits

Author SHA1 Message Date
Leonardo Brandenberger 00debf7fa5 improved java docs 2022-03-25 20:51:27 +01:00
Andrin Fassbind 8581b7ee64 - updated javadoc
- added playscenario to GameTest
2022-03-25 11:06:08 +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
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 7c8cf55ac2 fix calculateNewWinPoints 2022-03-24 19:14:36 +01:00
Andrin Fassbind 1a3a96218c refactor Track 2022-03-24 18:49:07 +01:00
Andrin Fassbind 95ef0b9d76 refactor gametest 2022-03-24 18:33:29 +01:00
romanschenk37 d777b87549 fix in Method calculateNewWinPoints 2022-03-24 18:18:07 +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
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
romanschenk37 fa4842e440 refactoring of Method calculatePath from Game.java to Track.java 2022-03-24 13:32:12 +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 3684b5589e fixes in Game.java and Track.java 2022-03-18 16:13:37 +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 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
Andrin Fassbind 884b349077 - TrackTest done Track done 2022-03-11 16:01:49 +01:00
Leonardo Brandenberger 6285cfe215 merged track into game 2022-03-10 15:39:58 +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 befc67f4f0 - Methoden überarbeitet 2022-03-10 14:35:33 +01:00
Andrin Fassbind 15123b05bb - Methoden überarbeitet 2022-03-08 11:27: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
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