Merge branch 'master' into storyB-)

# Conflicts: # racevisionGame/src/main/java/shared/model/Constants.java
2017-09-12 15:40:49 +12:00
parent 2868f921e2 0ea647b9fd
commit fbd124e602
50 changed files with 1542 additions and 1174 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.