 Joseph
|
aa2f234393
|
Annotations are now clickable #fix
|
2017-05-23 12:22:30 +12:00 |
|
|
Joseph
|
6a598c8a04
|
Arrow fxml I forgot to push
|
2017-05-23 11:17:54 +12:00 |
|
|
Joseph Gardner
|
06359fb138
|
Had to changed race to fit the merge
|
2017-05-22 16:39:26 +12:00 |
|
|
Joseph Gardner
|
40421e5a83
|
Merge branch 'sprint4_master' into noDependencyArrow
# Conflicts:
# mock/src/main/java/seng302/Model/Race.java
# network/src/main/java/seng302/Networking/Messages/RaceStatus.java
# visualiser/src/main/java/seng302/Controllers/RaceController.java
# visualiser/src/main/java/seng302/Model/ResizableRaceCanvas.java
# visualiser/src/main/resources/scenes/race.fxml
|
2017-05-22 15:28:53 +12:00 |
|
|
Joseph Gardner
|
e9a6c34e68
|
Merge branch 'story31.2_alternateTack' into 'sprint4_master'
story 31.1, 31.2, 32 merge request
See merge request !3
|
2017-05-22 15:01:07 +12:00 |
|
|
Joseph
|
2242b44398
|
forgot to remove imports
|
2017-05-22 11:53:38 +12:00 |
|
|
Joseph
|
b678152cf8
|
Removed breaking dependency and made it so app doesn't need the breaking dependency any more.
|
2017-05-22 11:49:40 +12:00 |
|
|
Joseph Gardner
|
eba2eb3cd6
|
Boats no longer change colour during a race and fixed the sparklines for the boats to be in the correct position #story[876]
|
2017-05-18 16:39:16 +12:00 |
|
|
Joseph Gardner
|
93347fd7ef
|
merged master
|
2017-05-15 16:28:01 +12:00 |
|
|
Joseph Gardner
|
5d34b49316
|
Merge branch 'master' into submission
# Conflicts:
# mock/src/main/java/seng302/Model/Race.java
# mock/src/test/java/seng302/Model/RaceTest.java
# visualiser/src/main/java/seng302/Model/ResizableRaceCanvas.java
|
2017-05-15 16:08:46 +12:00 |
|
|
Joseph Gardner
|
405f01c900
|
rearranged dependency order (hopefully this makes the ci download it properly)
|
2017-05-15 15:38:28 +12:00 |
|
|
Joseph Gardner
|
a77a58dc66
|
trying new repo
|
2017-05-15 14:37:22 +12:00 |
|
|
Joseph Gardner
|
f272c4ff47
|
trying new repo
|
2017-05-15 14:23:50 +12:00 |
|
|
Joseph Gardner
|
12bff9a1e8
|
trying new dependency
|
2017-05-15 14:20:25 +12:00 |
|
|
Joseph Gardner
|
93c539b68b
|
mock pom had the name visualiser 🤔
|
2017-05-15 11:42:42 +12:00 |
|
|
Joseph Gardner
|
63f7857e2f
|
Changed dependency version (repository pls download properly)
|
2017-05-12 12:59:53 +12:00 |
|
|
Joseph Gardner
|
04fdeaf2e2
|
Optimised boundary checking #story[873]
|
2017-05-12 11:58:31 +12:00 |
|
|
Joseph Gardner
|
eca6b7e374
|
Fixed imports
|
2017-05-11 15:57:54 +12:00 |
|
|
Joseph Gardner
|
602bc0686e
|
Changed public functions in the RaceXMLReader to make a new list every time and reassign the list to avoid duplicates in a list. #story[873]
|
2017-05-11 14:55:50 +12:00 |
|
|
Joseph Gardner
|
8c0c03dcf2
|
Fixed tests that were reading the file again making them fail. #story[873]
|
2017-05-11 14:49:17 +12:00 |
|
|
Joseph Gardner
|
a13899b6a7
|
Implemented and tested to check if a point is inside or outside of a boundary using a ray tracing algorithm. The function is public static for a GPSCoordinate and takes a list of GPSCoordinates and the comparing coordinate. #story[873]
|
2017-05-11 14:40:24 +12:00 |
|
|
Joseph Gardner
|
3bc8ad0a07
|
Arrow is now displayed on screen more vividly, the arrow can be customised to a different colour scheme if needed. #story[882]
|
2017-05-10 16:30:32 +12:00 |
|
|
Joseph Gardner
|
e1ba2ae5b6
|
Now reads course wind direction from the live stream, so the wind arrow now changes when the wind changes. #story[882]
|
2017-05-08 17:23:55 +12:00 |
|
|
Joseph Gardner
|
618073d04e
|
Merge remote-tracking branch 'origin/splitIntoTwoModules' into splitIntoTwoModules
|
2017-05-04 12:11:47 +12:00 |
|
|
Joseph Gardner
|
94ad164a45
|
Boat table and positions now update. #story[782]
|
2017-05-04 12:11:36 +12:00 |
|
|
Joseph Gardner
|
e43353c322
|
Boat table and positions now update. #story[782]
|
2017-05-04 12:10:13 +12:00 |
|
|
Joseph Gardner
|
9eae70fb82
|
Merge remote-tracking branch 'origin/splitIntoTwoModules' into splitIntoTwoModules
# Conflicts:
# visualiser/src/main/java/seng302/VisualiserInput.java
|
2017-05-01 19:42:30 +12:00 |
|
|
Joseph Gardner
|
32dabdb187
|
Fixed course xml reader. #story[782]
|
2017-05-01 19:42:17 +12:00 |
|
|
Joseph Gardner
|
18e9234240
|
Merge remote-tracking branch 'origin/splitIntoTwoModules' into splitIntoTwoModules
|
2017-05-01 19:15:44 +12:00 |
|
|
Joseph Gardner
|
f0943d232a
|
Date formatting now supports both old and new formatting and dnf has been added to boat. #story[782]
|
2017-05-01 19:15:33 +12:00 |
|
|
Joseph Gardner
|
2a2fe6de59
|
Race clock now works and the setup for the racestart now checks if the tag has "Start" or "Time". #story[782]
|
2017-05-01 18:16:21 +12:00 |
|
|
Joseph Gardner
|
9eefbbd7fa
|
Merge remote-tracking branch 'origin/splitIntoTwoModules' into splitIntoTwoModules
|
2017-05-01 16:51:48 +12:00 |
|
|
Joseph Gardner
|
8117e11ff2
|
Merge branch 'NetworkedVisualiser' into splitIntoTwoModules
# Conflicts:
# visualiser/src/main/java/seng302/VisualiserInput.java
|
2017-05-01 16:51:03 +12:00 |
|
|
Joseph Gardner
|
41a94495aa
|
Changed the XML reader to take an InputStream rather than InputSource- this has changed everything that used an InputSource to use an InputStream. Made the XML Readers actually read after they received a new InputStream. Changed it so the table updates when the boats in the race change. #pair[jjg64, cbt24] #story[782]
|
2017-05-01 16:42:47 +12:00 |
|
|
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]
|
2017-05-01 14:15:34 +12:00 |
|
|
Joseph Gardner
|
3b24d35677
|
Merge remote-tracking branch 'origin/splitIntoTwoModules' into splitIntoTwoModules
|
2017-04-28 13:27:38 +12:00 |
|
|
Joseph Gardner
|
bbd725d069
|
Merge
|
2017-04-28 13:27:32 +12:00 |
|
|
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 |
|