 Zhi You Tan
|
559a9f38c0
|
Merge remote-tracking branch 'origin/develop' into issue#8_create_finish_screen
# Conflicts:
# src/main/java/seng302/controllers/CanvasController.java
# src/main/java/seng302/models/stream/StreamParser.java
|
2017-05-25 16:12:44 +12:00 |
|
 Kusal Ekanayake
|
53f6a6b8c5
|
Implimented a new way to determine positions
#story[952]
|
2017-05-25 14:06:33 +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 |
|
 Calum
|
a6d9c66fc9
|
Removed unused import statements and class variables. Removed non error print statements.
|
2017-05-25 10:20:39 +12:00 |
|
|
Zhi You Tan
|
e7060d4b6f
|
Finish screen will show when race finishes, added functionality to return to start screen when in finish screen, updated finishScreenView.fxml to have controller and also four corner anchors to fit to parent
|
2017-05-24 16:17:56 +12:00 |
|
|
Zhi You Tan
|
6d7c36e31f
|
Updated code to check if boat is in the race before displaying in the leaderboard
#story[923]
|
2017-05-23 20:00:23 +12:00 |
|
|
Zhi You Tan
|
ffd40fef6d
|
Merge remote-tracking branch 'origin/develop' into issue#5_fix_pre-race_boats_on_leaderboard
# Conflicts:
# src/main/java/seng302/controllers/RaceController.java
# src/main/java/seng302/controllers/StartScreenController.java
|
2017-05-23 11:31:18 +12:00 |
|
 Peter Galloway
|
0367805f0f
|
fixed bug from merge where est time to next mark was null on some boats #story[923]
|
2017-05-22 15:01:04 +12:00 |
|
 Michael Rausch
|
aaf2e6a3f0
|
Added boat wakes back to the visualiser
#story[923]
|
2017-05-19 16:57:29 +12:00 |
|
|
Zhi You Tan
|
b17bba3629
|
Fixed leaderboard on start screen and race view to show all boats correctly during pre-race.
#story[923]
|
2017-05-18 12:18:51 +12:00 |
|
|
Peter Galloway
|
0f79353936
|
fixes from merge #story[923]
|
2017-05-17 20:15:47 +12:00 |
|
|
Zhi You Tan
|
4da8c1645e
|
Split Start Screen out from Main View view and controller.
#story[923]
|
2017-05-17 12:56:13 +12:00 |
|