Merge remote-tracking branch 'origin/master' into story_51_rounding_fix

# Conflicts: # racevisionGame/src/main/java/mock/app/Event.java # racevisionGame/src/main/java/mock/model/MockRace.java # racevisionGame/src/main/java/shared/model/Constants.java
2017-09-13 13:30:51 +12:00
parent 2ad947b57d d1f74dec3a
commit d29a47ec23
25 changed files with 314 additions and 139 deletions
@@ -77,7 +77,6 @@ public class Event {
     * @throws EventConstructionException Thrown if we cannot create an Event for any reason.
     */
    public Event(boolean singlePlayer, int mapIndex) throws EventConstructionException {
-
        this.mapIndex = mapIndex;
        String raceXMLFile;
        String boatsXMLFile = "mock/mockXML/boatTest.xml";