Joseph Gardner d977d3f146 Merge branch 'visualiserAndDataLink' into splitIntoTwoModules ...

# Conflicts:
#	visualiser/src/main/java/seng302/Controllers/RaceController.java
#	visualiser/src/main/java/seng302/Controllers/StartController.java
#	visualiser/src/main/java/seng302/Mock/BoatXMLReader.java
#	visualiser/src/main/java/seng302/Mock/StreamedBoat.java
#	visualiser/src/main/java/seng302/Mock/StreamedCourse.java
#	visualiser/src/main/java/seng302/Mock/StreamedRace.java
#	visualiser/src/main/java/seng302/Model/BoatInRace.java
#	visualiser/src/main/java/seng302/Model/ConstantVelocityRace.java
#	visualiser/src/main/java/seng302/Model/Race.java
#	visualiser/src/main/java/seng302/RaceXMLReader.java
#	visualiser/src/test/java/seng302/Model/ConstantVelocityRaceTest.java

2017-04-28 13:26:12 +12:00

..

.idea

Worked on XML reader to read a given race.xml in the format for the AC35. Added the ability to read the course limit and race settings #Pair[jjg64, cbt24] #Story[782]

2017-04-21 16:43:35 +12:00

doc

Actually added sub modules this time

2017-04-20 11:16:19 +12:00

src

Merge branch 'visualiserAndDataLink' into splitIntoTwoModules

2017-04-28 13:26:12 +12:00

pom.xml

Renamed some directories, optimized imports, general code clean up

2017-04-25 17:41:10 +12:00