 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 |
|
|
Joseph Gardner
|
39d3cc7c28
|
Removed boats being able to store colour, this is now down the in the ResizableRaceCanvas. #refactor #story[782]
|
2017-04-28 12:44:53 +12:00 |
|
|
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]
|
2017-04-28 12:35:00 +12:00 |
|
|
Joseph Gardner
|
3d284c4a2b
|
Merge branch 'splitIntoTwoModules' into visualiserAndDataLink
# Conflicts:
# visualiser/src/main/java/seng302/Model/ResizableRaceCanvas.java
|
2017-04-28 11:23:59 +12:00 |
|
|
Joseph
|
033198ca2c
|
Linked the streamedRace course to the visualiser, linked the boats to the visualiser (this needs to be tests) #story[768]
|
2017-04-28 00:53:07 +12:00 |
|
|
Joseph Gardner
|
c328c4f3bc
|
Linked raceData from new xml formats to current program. Current app now shows the starting list and course boundary. #story[782]
|
2017-04-25 16:06:24 +12:00 |
|
|
Joseph Gardner
|
84c518f89f
|
Timer now shows and updates correctly on the start menu. #story[761]
|
2017-04-25 15:04:42 +12:00 |
|
|
Joseph Gardner
|
26380f2677
|
Merge branch 'story30_XMLs' into splitIntoTwoModules
|
2017-04-25 14:01:09 +12:00 |
|
|
Joseph Gardner
|
e89a269565
|
initialised time in raceclock (1 line)
|
2017-04-25 14:00:41 +12:00 |
|
|
Joseph Gardner
|
a3e87f2c61
|
Got rid of test using a deprecated method
|
2017-04-25 13:20:10 +12:00 |
|
|
Joseph Gardner
|
ea79f47c83
|
Merge branch 'story30_XMLs' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story30_XMLs
|
2017-04-25 13:15:23 +12:00 |
|
|
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]
|
2017-04-25 13:14:59 +12:00 |
|
|
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]
|
2017-04-25 02:13:57 +12:00 |
|
|
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]
|
2017-04-21 16:43:35 +12:00 |
|
|
Joseph Gardner
|
9e3ca68df8
|
added skeleton for StreamedRace and StreamedCourse #Pair[jjg64, cbt24] #Story[782]
|
2017-04-21 13:28:55 +12:00 |
|
|
Joseph Gardner
|
a85bf292d5
|
new branch for xml readers for the visuliser
|
2017-04-21 12:23:02 +12:00 |
|
|
Joseph Gardner
|
3321727999
|
Tests for RegattaXMLReader #Story[782]
|
2017-04-19 17:41:53 +12:00 |
|
|
Joseph Gardner
|
b825790acd
|
Moved package to correct spot
|
2017-04-19 17:24:00 +12:00 |
|
|
Joseph Gardner
|
c40967f972
|
Added Regatta class and Regatta xml reader. This will be needed for the mock #Story[30]
|
2017-04-19 17:15:08 +12:00 |
|
|
Joseph Gardner
|
fc15c3d151
|
Added annotation to toggle all boat paths on and off #Pair[jjg64, zwu18] #Story[759]
|
2017-04-19 13:09:45 +12:00 |
|
|
Joseph Gardner
|
eb9fce1f22
|
Track scales with time scale #Pair[jjg64, zwu18] #Story[758]
|
2017-04-19 12:46:26 +12:00 |
|
|
Joseph Gardner
|
af9d6769e5
|
Story 25 merged #Story[758]
|
2017-04-19 12:22:52 +12:00 |
|
|
Joseph Gardner
|
b07e881edc
|
Merge branch 'story_25'
# Conflicts:
# src/main/java/seng302/Controllers/RaceController.java
# src/main/java/seng302/Model/ResizableRaceCanvas.java
# src/main/resources/scenes/racepane.fxml
|
2017-04-19 12:12:12 +12:00 |
|
|
Joseph Gardner
|
2945c8446e
|
Points now last whole race with a lower opacity #Story[25]
|
2017-04-19 11:59:09 +12:00 |
|
|
Joseph
|
56d51ceaa9
|
Track point is now removed after its expiry and fades after the boat has stopped Story [758]
|
2017-04-18 09:07:02 +12:00 |
|
|
Joseph Gardner
|
63591ad1ec
|
Added fixed opacity points of fading and modified race time to keep updating when the race is finished. Pair [jjg64, cbt24] Story [758]
|
2017-04-07 13:06:52 +12:00 |
|
|
Joseph Gardner
|
101dadc003
|
Gave BoatInRace a track property that stores the coordinates of the track. Added a method in ResizableRaceCanvas that draws the points on the track every time the canvas updates. [Story 25]
|
2017-04-06 17:11:24 +12:00 |
|