Merge branch 'master' into new_issue#19

This commit is contained in:
David Wu
2017-08-17 13:52:04 +12:00
29 changed files with 537 additions and 325 deletions
@@ -25,7 +25,6 @@ import visualiser.gameController.ControllerClient;
import visualiser.gameController.Keys.ControlKey;
import visualiser.gameController.Keys.KeyFactory;
import visualiser.model.*;
import visualiser.network.ServerConnection;
import java.io.IOException;
import java.net.URL;
@@ -324,7 +323,7 @@ public class RaceController extends Controller {
//Current place within race.
boatPlacingColumn.setCellValueFactory(
cellData -> cellData.getValue().positionProperty() );
cellData -> cellData.getValue().placingProperty() );
}