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
|
9 years ago |
|
Joseph Gardner
|
f377cf6471
|
Changed it so Boat can be used as a superclass for StreamedBoat and BoatInRace properly and removed ConstantVelocityRace. Everything that used to use BoatInRace or StreamedBoat now uses it superclass (boat). #pair[jjg64, cbt24] #refactor #story[782]
|
9 years ago |
fjc40
|
ecebace9f1
|
Merge branch 'splitIntoTwoModules' of eng-git.canterbury.ac.nz:seng302-2017/team-7 into splitIntoTwoModules
|
9 years ago |
Connor Taylor-Brown
|
7f273f8ba0
|
Fixed time source for visualiser, replacing local time
- StreamedCourse now provides start time for clock from XML
#story[782]
|
9 years ago |
Erika Savell
|
83dfe1a60c
|
Renamed some directories, optimized imports, general code clean up
#story[778]
|
9 years ago |
|
Joseph Gardner
|
84c518f89f
|
Timer now shows and updates correctly on the start menu. #story[761]
|
9 years ago |
|
Joseph Gardner
|
e89a269565
|
initialised time in raceclock (1 line)
|
9 years ago |
|
cbt24
|
a59342a668
|
Modified RaceClock to support arbitrary start times
- Amended RaceDataSource interface to require time instead of mark for calculating time.
#story[758]
|
9 years ago |
|
Joseph Gardner
|
0d0b9e143f
|
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]
|
9 years ago |
|
Erika Savell
|
a584400e24
|
Actually added sub modules this time
#story[778]
|
9 years ago |
