Erika Savell
|
e927242707
|
Merge branch 'splitIntoTwoModules' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into splitIntoTwoModules
|
9 years ago |
|
Erika Savell
|
3f748bfdb6
|
Removed BoatInRace from shared model, refactored
#story[778]
|
9 years ago |
Joseph Gardner
|
10dd066302
|
Removed error checking within XML readers and ensured XML readers fail. Did this so an XML reader is not made with an invalid file. #story[782]
|
9 years ago |
Connor Taylor-Brown
|
06e65c2cd2
|
Generate StreamedCourse from VisualiserInput
- Allow Race to get boat location messages (added last commit)
- Removed faulty import statement (this commit)
#story[782]
|
9 years ago |
|
Connor Taylor-Brown
|
68a8f64fd3
|
Generate StreamedCourse from VisualiserInput
#story[782]
|
9 years ago |
|
Joseph Gardner
|
bbd725d069
|
Merge
|
9 years ago |
|
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
|
39d3cc7c28
|
Removed boats being able to store colour, this is now down the in the ResizableRaceCanvas. #refactor #story[782]
|
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 |
|
cbt24
|
7d35312644
|
Merge remote-tracking branch 'origin/splitIntoTwoModules' into splitIntoTwoModules
|
9 years ago |
|
cbt24
|
5f3f3770bb
|
Temporarily ignore out-of-bound race markers in testing.
#story[758]
|
9 years ago |
|
Joseph Gardner
|
3d284c4a2b
|
Merge branch 'splitIntoTwoModules' into visualiserAndDataLink
# Conflicts:
# visualiser/src/main/java/seng302/Model/ResizableRaceCanvas.java
|
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 |
|
Connor Taylor-Brown
|
02511db2b9
|
Implemented marker visualisation from XML in ResizableRaceCanvas
- Replaced and deprecated Constants
- Added getMarkers to RaceDataSource interface
- Added boundary testing for source data
#story[782]
|
9 years ago |
|
Joseph
|
033198ca2c
|
Linked the streamedRace course to the visualiser, linked the boats to the visualiser (this needs to be tests) #story[768]
|
9 years ago |
|
fjc40
|
06d786d581
|
Merge remote-tracking branch 'origin/networkingTest' into splitIntoTwoModules
# Conflicts:
# mock/src/main/java/seng302/RaceEventMessages/BoatLocationMessage.java
# Selected copy from splitIntoTwoModules.
|
9 years ago |
|
Erika Savell
|
83dfe1a60c
|
Renamed some directories, optimized imports, general code clean up
#story[778]
|
9 years ago |
|
Erika Savell
|
073102d1a3
|
Merge branch 'splitIntoTwoModules' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into isolatingMock
|
9 years ago |
|
Joseph Gardner
|
c328c4f3bc
|
Linked raceData from new xml formats to current program. Current app now shows the starting list and course boundary. #story[782]
|
9 years ago |
|
cbt24
|
cb40302c13
|
Merge remote-tracking branch 'remotes/origin/story30_XMLs' into splitIntoTwoModules
|
9 years ago |
|
cbt24
|
1653003cf0
|
Implemented Leg generation from Race.xml format
- StreamedCourse now utilises StreamedCourseXMLReader as data source
#story[758]
|
9 years ago |
|
Joseph Gardner
|
84c518f89f
|
Timer now shows and updates correctly on the start menu. #story[761]
|
9 years ago |
|
Erika Savell
|
03f63b2c61
|
Added boat data xml tests
#story[778]
|
9 years ago |
|
Joseph Gardner
|
26380f2677
|
Merge branch 'story30_XMLs' into splitIntoTwoModules
|
9 years ago |
|
Joseph Gardner
|
e89a269565
|
initialised time in raceclock (1 line)
|
9 years ago |
|
Joseph Gardner
|
a3e87f2c61
|
Got rid of test using a deprecated method
|
9 years ago |
|
Joseph Gardner
|
ea79f47c83
|
Merge branch 'story30_XMLs' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story30_XMLs
|
9 years ago |
|
Joseph Gardner
|
3461a2c0b7
|
Added the ability to reads boats from both race.xml and boat.xml. Linked the two xmls via the StreamedCource class. #story[782]
|
9 years ago |
|
cbt24
|
858db3f45e
|
Fixed interface implementation for StreamedCourse
#story[758]
|
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 |
hba56
|
e9578fc63b
|
refactored networking code from networkingTest
#story[778, 782]
|
9 years ago |
|
hba56
|
4b5ebbd9e4
|
refactored networking code from networkingTest branch
#story[778, 782]
|
9 years ago |
|
Joseph
|
22075ee415
|
Started on the boat XML parser, reads only boat data from the XML and makes a StreamedBoat for each boat in the XML. #story[861]
|
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 |
|
Joseph Gardner
|
9e3ca68df8
|
added skeleton for StreamedRace and StreamedCourse #Pair[jjg64, cbt24] #Story[782]
|
9 years ago |
|
Joseph Gardner
|
a85bf292d5
|
new branch for xml readers for the visuliser
|
9 years ago |
|
Erika Savell
|
a584400e24
|
Actually added sub modules this time
#story[778]
|
9 years ago |
