 William Muir
|
2b294702a9
|
Merge remote-tracking branch 'origin/develop' into 38a_Select_Boats
# Conflicts:
# src/main/java/seng302/controllers/RaceViewController.java
# src/main/java/seng302/models/BoatGroup.java
|
2017-05-17 09:53:18 +12:00 |
|
|
William Muir
|
764ae37ce4
|
Gave the boatgroups a selection attribute, allowing them to be highlighted upon clicking
Boats can be clicked on canvas or from selection drop down on the side
#story[955]
|
2017-05-15 14:09:09 +12:00 |
|
 Zhi You Tan
|
e62a609b6b
|
Prepared StreamParser.java, BoatGroup.java, Yacht.java for leg timer annotation (story 36)
#story[927]
|
2017-05-15 13:47:30 +12:00 |
|
|
Zhi You Tan
|
6935bd514e
|
Reimplemented race position in the race view. Removed Boat class and Yacht class is replaced completely. Race position "-" shows properly on start screen. Removed BoatTest and TeamsParserTest. Fixed estimated time till finish on server.
#story[818]
|
2017-05-04 13:50:06 +12:00 |
|
|
Zhi You Tan
|
07234ee33a
|
Updated start screen team list to show position in race. Created Yacht class to replace Boat class. Removed Boat class from XMLParser. Removed unused BoatParser.java.
#story[572]
|
2017-05-04 04:16:16 +12:00 |
|