45db731a60
Fixed a merge issue.
...
#story[923] #bug #refactor
2017-05-17 18:06:36 +12:00
8a3a41294a
Fixed error causing build failure.
...
#story[923] #bug #refactor
2017-05-17 17:41:45 +12:00
e5eab0a6c8
Merge remote-tracking branch 'origin/develop' into issue#1_wakes_3.0
...
# Conflicts:
# src/main/java/seng302/App.java
# src/main/java/seng302/models/BoatGroup.java
2017-05-17 17:27:34 +12:00
7c39368126
Removed unnecessary constant
2017-05-17 17:23:10 +12:00
c63c8e4d73
Stripped out excess code in Wake class.
2017-05-17 16:33:45 +12:00
1c01aab1e7
Merge on to develop
...
story[955]
2017-05-17 10:34:00 +12:00
6a85b0800f
Merge on to develop
...
story[955]
2017-05-17 10:06:50 +12:00
1acb0fbac4
Merge on to develop
...
story[955]
2017-05-17 10:04:28 +12:00
5fa47ff65b
Implemented elapsed time since last mark on annotation.
...
#story[927]
2017-05-15 16:31:04 +12:00
3a1c1a5e43
Merge remote-tracking branch 'origin/develop' into story36_elapsed_time
...
# Conflicts:
# src/main/java/seng302/models/BoatGroup.java
2017-05-15 15:54:44 +12:00
2e914a7704
Fixed estimate time to next mark to match acceptance criteria which is countdown in minutes and seconds.
...
#story[924]
2017-05-15 15:49:21 +12:00
e62a609b6b
Prepared StreamParser.java, BoatGroup.java, Yacht.java for leg timer annotation (story 36)
...
#story[927]
2017-05-15 13:47:30 +12:00
1ab6351d48
Fixed estimated time to next mark (annotation) to update correctly
...
#story[924]
2017-05-15 10:11:19 +12:00
89ef6e5277
Wake calculation now changed to be based off of the separation between wakes.
...
This allows wakes to auto correct their position better and stops the system reliance on "realistic data".
Wakes have several options for behaviour until the ideal settings are decided upon.
Note that MarkGroup position updating is currently disabled.
#implement #refactor #issue[1] #story[923]
2017-05-14 17:24:15 +12:00
47880d09bc
Implemented estimated time to next mark. Added checkbox for estimated time to next mark. To be fix: change from long to human readable time, update time every second
...
#story[923]
2017-05-12 20:04:09 +12:00
6935bd514e
Reimplemented race position in the race view. Removed Boat class and Yacht class is replaced completely. Race position "-" shows properly on start screen. Removed BoatTest and TeamsParserTest. Fixed estimated time till finish on server.
...
#story[818]
2017-05-04 13:50:06 +12:00
fd8ed92f88
Fix for wakes on internal data
...
#bug
2017-05-04 13:20:50 +12:00
3aefb14faf
Added testing.
2017-05-04 12:46:01 +12:00
a56e55ae70
Fix for some movement on racestart issues
...
#bug
2017-05-04 10:38:04 +12:00
178af141f0
Refactoring and documentation
...
#story[820]
2017-05-02 14:08:25 +12:00
d927531354
Removed broken time extracting method and replaced it with currently existing long extractor. Added speed to the setDestination method for the raceObject abstract class.
...
#story[820]
2017-05-01 18:22:08 +12:00
5fe330bfbb
Boat trials and wakes now work with both fast and slow data sets.
...
Instead of fixed, hard coded thresholds and scale factors dynamically changing values
that scale with the onscreen movement are used to determine how graphical objects
are drawn.
#implement #story[816]
2017-05-01 16:41:58 +12:00
6a361c0d4b
Documented some RaceObject classes.
...
#documentation
2017-05-01 14:30:41 +12:00
ec57851de2
Created annotation slider to display different levels of annotations
...
Removed toggleAnnotations method as abstract from race object and made only for boat group as it didnt make sense for markgroup, at least not currently as they have no annotations to show
#story[558]
2017-04-30 23:24:24 +12:00
0eb767b615
Finished tweaking wakes. Made marker movement smooth.
...
#implement #story[818]
2017-04-30 22:34:49 +12:00
45b77c05d4
Improvements to wake
2017-04-30 19:32:29 +12:00
b9900925b8
Fixing wakes, bug caused by attempting to fix a issue with jittery boats actually caused by parser.
...
#bug
2017-04-30 19:00:07 +12:00
1d28334346
Removed the parser from queing packets incorrectly. Used the marker boat location packets to get the live updates of the marker positions and implemented the markers being updated much like the boats currently are. This means the course more closely resembles the actual intended course design.
...
#story[820]
2017-04-29 20:10:39 +12:00
6149f7be60
Wakes no longer become out of sync with boats after extended periods of time. Added in
...
a limit to the length of boat trails.
#implement
2017-04-29 02:14:55 +12:00
474f0ee427
Further work on new wake system. Wakes turn correctly but need to scale with velocity and
...
eventually desync with the boats. Needs to reset to the boats position on straights.
2017-04-28 23:25:49 +12:00
765f27f987
Starting new wake implementation.
2017-04-28 17:08:08 +12:00
d1289b0de1
Fixed boats moving in the correct heading as according to the stream and attempted to fix the wakes direction.
...
#story[818]
2017-04-27 18:52:37 +12:00
67a702ffcd
Wakes still broken. Implemented dashed lines that track the progress of individual boats.
...
#implement #story[483]
2017-04-27 13:57:19 +12:00
65c0e6f77d
Fixed markergroup bugs. Improved wakes. Still WIP
2017-04-27 11:58:50 +12:00
245bd184b4
Mark drawing moved to MarkGroup class. RaceObject and it's sub classes now describe
...
all functionality required for a on screen object. Improved wakes. Branch currently
untested.
#story[812, 820] #refactor #implement.
2017-04-27 02:44:25 +12:00
eaff4c5aac
Added abstract class for all javafx object that a displayed during race. Began refactoring of mark implementation to be a subclass of the aforementioned abstract class.
2017-04-26 21:16:22 +12:00
95bafdc0d1
Fixed bug which caused boats to all travel to the same position.
2017-04-26 19:19:03 +12:00
c776d22941
Linking up course stream with visualiser. Boats moving, and course drawing. Boats however are not moving as intended. Needs to be fixed/looked into.
...
#story[820] #pair[kre39,cir27]
2017-04-26 18:45:58 +12:00
c73bf7dd3e
Started merging received packets from the sample stream and reading lats and lons to move boats from them.
...
#story[820]
2017-04-26 15:51:15 +12:00
42569e6ad7
Changed BoatPolygon is now a group instead of a polygon and is called BoatGroup.
...
BoatPolygon's functionality was more maintainable and scalable by having it extend Group.
#story30c
2017-04-25 04:30:44 +12:00
Calum
William Muir
Zhi You Tan
Kusal Ekanayake