Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into controllerSplit

# Conflicts: # racevisionGame/src/main/java/visualiser/Controllers/MainController.java
2017-09-08 16:50:28 +12:00
parent a2b3ba44c0 321359be07
commit a5d3434a70
19 changed files with 695 additions and 43 deletions
@@ -42,6 +42,7 @@ public class MainController extends Controller {
     * Transitions from the StartController screen (displays pre-race information) to the RaceController (displays the actual race).
     * @param visualiserRace The object modelling the race.
     * @param controllerClient Socket Client that manipulates the controller.
+     * @param isHost if the client is the host of a race or not.
     */
    public void beginRace(VisualiserRaceEvent visualiserRace, ControllerClient controllerClient, Boolean isHost) {
        raceController.startRace(visualiserRace, controllerClient, isHost);