Merge remote-tracking branch 'remotes/origin/master' into story77

# Conflicts: # racevisionGame/src/main/java/shared/model/Constants.java # racevisionGame/src/main/java/visualiser/Controllers/HostController.java # racevisionGame/src/main/resources/visualiser/scenes/hostgame.fxml
2017-09-12 15:13:35 +12:00
parent 2cda5ea70d 0ea647b9fd
commit e3ddb272c0
42 changed files with 985 additions and 824 deletions
@@ -42,6 +42,7 @@ public class SourceIdAllocator {
        }

        List<Integer> allocatedIDs = mockRace.getRaceDataSource().getParticipants();
+
        List<Integer> allIDs = new ArrayList<>(mockRace.getBoatDataSource().getBoats().keySet());

        //Get list of unallocated ids.