 Zhi You Tan
|
a1eda8d91d
|
Fix boatPos in StreamParser.java being empty and affecting all the assessors
|
2017-05-25 12:58:11 +12:00 |
|
|
Zhi You Tan
|
5ed02a1fe1
|
Merge remote-tracking branch 'origin/develop' into issue#8_create_finish_screen
# Conflicts:
# src/main/java/seng302/controllers/CanvasController.java
|
2017-05-25 12:32:10 +12:00 |
|
|
Zhi You Tan
|
66d4a4b958
|
Fix finish screen showing wrong ("-" as) position
|
2017-05-25 12:28:13 +12:00 |
|
 Calum
|
a6d9c66fc9
|
Removed unused import statements and class variables. Removed non error print statements.
|
2017-05-25 10:20:39 +12:00 |
|
 Alistair McIntyre
|
e51c966969
|
Made sure only boats in participant list are replaced. Also removed mark coloring as it wasn't as accurate as was necessary.
#story[923]
|
2017-05-22 16:05:24 +12:00 |
|
|
Alistair McIntyre
|
5d6b356602
|
all marks displaying except currently gate marks are displaying as a single dot
#story[923] #pair[ajm412, ptg19]
|
2017-05-18 18:02:25 +12:00 |
|
 Peter Galloway
|
0f79353936
|
fixes from merge #story[923]
|
2017-05-17 20:15:47 +12:00 |
|
|
Peter Galloway
|
38b44fa92b
|
Merge branch 'develop' into Issue#4_boat_movement
# Conflicts:
# src/main/java/seng302/controllers/Controller.java
# src/main/java/seng302/controllers/RaceController.java
# src/main/java/seng302/controllers/RaceViewController.java
# src/main/java/seng302/models/BoatGroup.java
# src/main/java/seng302/models/mark/MarkGroup.java
# src/main/java/seng302/models/stream/StreamParser.java
# src/test/java/seng302/models/stream/StreamReceiverTest.java
|
2017-05-17 20:05:40 +12:00 |
|
|
Peter Galloway
|
9e3036e134
|
Stripped down the boatgroup to the basic movement components and then tried to adjust how position updates are being dealt with to make everything more logically understandable. I made some progress in terms of understanding but the position update is still not as reliable as I would like. I will be explaining to other team members how this part of the code is working so the time I have spent is not completely wasted #story[923]
|
2017-05-15 23:17:36 +12:00 |
|
|
Peter Galloway
|
fc3ca70e5d
|
Merge branch 'issue#10_unifying_marks' into Issue#4_boat_movement
# Conflicts:
# src/main/java/seng302/controllers/CanvasController.java
# src/main/java/seng302/controllers/Controller.java
# src/main/java/seng302/controllers/RaceViewController.java
# src/main/java/seng302/models/stream/StreamPacket.java
# src/main/java/seng302/models/stream/StreamParser.java
|
2017-05-15 18:09:47 +12:00 |
|
|
Peter Galloway
|
ae5678482b
|
changed package "parsers" to be called "stream" #story[923]
|
2017-05-14 20:26:49 +12:00 |
|