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
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
1e1e482b79
Added a delay for reading packets from the packet buffer so packets that are recieved out of order have time to order by timestamp in the priority queue #story[820]
2017-04-29 18:56:41 +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
749c6b7fef
Fixed bugs caused by horizontally scaling maps
2017-04-26 17:18:33 +12:00
912c081606
Added marks with the test data coords to the xml
...
#story[820]
2017-04-26 15:55:51 +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
971a3920a3
Fixed race timer to display real race time, and made race time scalable.
...
#story[445]
2017-03-30 16:12:01 +13:00
f8d3f53158
changed boat speed to a lower value
2017-03-30 14:45:33 +13:00
a95d030817
Controllers and Fxml nicely refactored, tests still broken #story[463]
2017-03-29 14:59:37 +13:00
4a6978ff79
Fxml refactored, partway through refactoring controllers (app does not run) #story[463]
2017-03-29 12:58:49 +13:00
8bf5455f42
Updated fxml and canvas controller to display a resizable canvas.
...
#story[377]
2017-03-27 17:05:49 +13:00
48f7e41905
Merge branch 'master' of /home/cosc/student/zyt10/Documents/[SENG302]/team-13 with conflicts.
2017-03-27 16:52:31 +13:00
6fc55bb82c
Added toggle for fps #story[463]
2017-03-27 16:45:02 +13:00
304f30ece6
Reformatted and refactored the fileparser to get xml from resource folder
...
#fix #refactor #story[377] #pair[xyi25, zyt10]
2017-03-24 12:55:11 +13:00
e8b1720fee
Created a toggle checkbox to show and hide all annotation
...
#story[477]
2017-03-24 12:15:39 +13:00
59a4a74a97
changed boatPositionController to also add velocity to the boat ordering shown in the side bar #story[447]
2017-03-23 22:50:04 +13:00
a860cc0ec1
connected up all the javafx components and got team positions displaying on the sidebar #story[426]
2017-03-23 21:21:54 +13:00
8578bc4a5b
changed the "sea" color of the canvas to be actually drawn on the canvas rather than the pane behind #story[377]
2017-03-23 16:18:42 +13:00
ed004d1423
Merge branch 'master'
...
Conflicts:
src/main/java/seng302/controllers/CanvasController.java
src/main/resources/RaceView.fxml
2017-03-23 15:16:11 +13:00
2384013139
Created race timer
...
- Race starts when timer reaches 1 second
- Race waits 10 seconds before it starts
Tags: #implement #story[16]
2017-03-23 14:11:12 +13:00
42ffd1b1f8
Add rotated wind direction arrow to race view.
...
#story[422]
2017-03-23 01:10:07 +13:00
9e22eac4d8
Added the race results to the RaceResultController. Also fixed some bugs
...
- Fixed a bug where the race results would be out of order.
- Changed the colour of the start and finish gates
- Added the race results to the RaceResultController and updated view
Tags: #fix #implement #story[13, 10, 11]
2017-03-22 22:30:49 +13:00
039e61def6
Fixed broken JavaFX file #fix
2017-03-22 14:50:28 +13:00
54d329c5cf
changed raceView javafx structure and added an example of how the handle function works with keyframes #story[426]
2017-03-22 14:44:40 +13:00
f46a98fad9
Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-13
2017-03-22 14:39:37 +13:00
ef098e63d7
Added finishing events #implement and rotated the map by 180 degrees#fix
2017-03-22 12:51:03 +13:00
44b5b0b771
Added side pane to GUI and resize to 1280x960
...
#story[426]
2017-03-22 11:46:39 +13:00
ed577fad6a
adding files missed in previous commit
2017-03-20 17:58:40 +13:00
ae61260665
created a javafx view for the race finish and created a rough wireframe for the controller to change the view from race to finish #story[414]
2017-03-20 17:56:14 +13:00
ffa39e6a9c
Changed size of canvas to 720 x 360
...
#story[377]
2017-03-16 17:40:31 +13:00
550812d8e1
Currently displaying basic javafx window with canvas. Also changed the file structure a bit.
...
At this point the javafx is not tied to the old code in any way #story[377]
2017-03-15 18:16:43 +13:00
William Muir
Kusal Ekanayake
Peter Galloway
cir27
Haoming Yin
Zhi You Tan
Michael Rausch
Ryan Tan