9a864cc2bd
Merge remote-tracking branch 'origin/Mark_to_MarkGroup' into wake_remake
...
# Conflicts:
# src/main/java/seng302/App.java
# src/main/java/seng302/controllers/Controller.java
# src/main/java/seng302/models/BoatGroup.java
# src/main/java/seng302/models/Wake.java
# src/main/java/seng302/models/parsers/StreamParser.java
# src/main/resources/views/MainView.fxml
2017-05-01 15:59:14 +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
d94290c58d
Merge branch 'Mark_to_MarkGroup' of https://eng-git.canterbury.ac.nz/seng302-2017/team-13 into Mark_to_MarkGroup
2017-04-30 18:15:24 +12:00
25038da2a1
Created BoatsParser.java to parse boats from server boat.xml and created a table on the start screen to display all the teams from server
...
#story[572]
2017-04-30 17:17:47 +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
a0624cfef6
Merge branch 'wake_remake' into Mark_to_MarkGroup
...
# Conflicts:
# src/main/java/seng302/controllers/CanvasController.java
# src/main/java/seng302/models/BoatGroup.java
# src/main/java/seng302/models/Wake.java
# src/main/java/seng302/models/parsers/StreamParser.java
# src/main/resources/views/RaceView.fxml
2017-04-29 14:29:12 +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
f3ee618900
Fixed broken race timer and timer now using stream timer data.
...
#story[818]
2017-04-28 21:44:23 +12:00
ffdfc24e65
Created a start screen with a timer which shows the race progress
...
#story[572]
2017-04-28 20:09:17 +12:00
0f4ad48de0
Fixed and enables the old wakes. Enabled the fps counter by implementing the team-27s fps counter from their code, fixed trails from starting at the start of the startline no matter at what point in the race the stream is connected to (this is means the map starts a lot cleaner). Added live tracked speeds which are taken from the boat location packet. Linked the speeds coming in to their specified boats and allowed the onscreen speed tracker to keep up with the speeds. Linked the current speeds to the wakes so the wakes are redrawn for each change in speed and size to match the speed. Also added the toggle functionality back to the fps counter so they can be toggled on an off.
...
#story[818]
2017-04-28 16:41:35 +12:00
a95d030817
Controllers and Fxml nicely refactored, tests still broken #story[463]
2017-03-29 14:59:37 +13:00
Zhi You Tan
William Muir
cir27
Peter Galloway
Kusal Ekanayake