0f79353936
fixes from merge #story[923]
2017-05-17 20:15:47 +12:00
38b44fa92b
Merge branch 'develop' into Issue#4_boat_movement
...
# Conflicts:
# src/main/java/seng302/controllers/Controller.java
# src/main/java/seng302/controllers/RaceController.java
# src/main/java/seng302/controllers/RaceViewController.java
# src/main/java/seng302/models/BoatGroup.java
# src/main/java/seng302/models/mark/MarkGroup.java
# src/main/java/seng302/models/stream/StreamParser.java
# src/test/java/seng302/models/stream/StreamReceiverTest.java
2017-05-17 20:05:40 +12:00
2e375978bd
cleaned up code for merging back to develop #story[923]
2017-05-17 19:18:31 +12:00
95e353c14e
fixed initialization bug #story[923]
2017-05-17 17:55:21 +12:00
aaa3dc93f1
boat movement working reliably now, still need to fix one bug at initialization #story[923]
2017-05-17 17:34:47 +12:00
6e3d037021
Merge branch 'develop' into 38a_Select_Boats
2017-05-17 14:34:10 +12:00
7d160eaf54
Removed unused imports from controller.java
2017-05-17 13:16:00 +12:00
4da8c1645e
Split Start Screen out from Main View view and controller.
...
#story[923]
2017-05-17 12:56:13 +12:00
2b294702a9
Merge remote-tracking branch 'origin/develop' into 38a_Select_Boats
...
# Conflicts:
# src/main/java/seng302/controllers/RaceViewController.java
# src/main/java/seng302/models/BoatGroup.java
2017-05-17 09:53:18 +12:00
afd97d6e05
Reformating of code to google style.
...
#story[955]
2017-05-17 00:34:36 +12:00
2d5a7a8a49
Large tidying of RaceViewController class. Fixing updating for combo boxes
...
#story[955]
2017-05-16 15:06:01 +12:00
9e3036e134
Stripped down the boatgroup to the basic movement components and then tried to adjust how position updates are being dealt with to make everything more logically understandable. I made some progress in terms of understanding but the position update is still not as reliable as I would like. I will be explaining to other team members how this part of the code is working so the time I have spent is not completely wasted #story[923]
2017-05-15 23:17:36 +12:00
e03e121da4
Merge branch 'develop' into Story47CourseLimits
...
Conflicts:
src/main/java/seng302/App.java
2017-05-15 18:37:31 +12:00
fc3ca70e5d
Merge branch 'issue#10_unifying_marks' into Issue#4_boat_movement
...
# Conflicts:
# src/main/java/seng302/controllers/CanvasController.java
# src/main/java/seng302/controllers/Controller.java
# src/main/java/seng302/controllers/RaceViewController.java
# src/main/java/seng302/models/stream/StreamPacket.java
# src/main/java/seng302/models/stream/StreamParser.java
2017-05-15 18:09:47 +12:00
9c7144c918
Removed dud print statement
...
#story[889]
2017-05-15 17:55:06 +12:00
ed8d70c3b3
commented out buffered code and cleaned up some other areas to try and make the boatgroup clear enough to modify #story[923]
2017-05-15 17:53:11 +12:00
fa501460cb
Cleaned up code for merge.
...
#story[889]
2017-05-15 17:21:56 +12:00
51f090324a
CSS on annotation selection and minor bug fixes. Changed annotation slider to only have None, important and All
...
#story[955]
2017-05-15 16:44:28 +12:00
5fa47ff65b
Implemented elapsed time since last mark on annotation.
...
#story[927]
2017-05-15 16:31:04 +12:00
764ae37ce4
Gave the boatgroups a selection attribute, allowing them to be highlighted upon clicking
...
Boats can be clicked on canvas or from selection drop down on the side
#story[955]
2017-05-15 14:09:09 +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
ccda5f2a2e
changing branch name #story[923]
2017-05-15 12:40:11 +12:00
94d1982670
Shifted the canvas to the back of the window when updated.
...
This is to preserve the way the boats are still shown on the front when the course i reloaded.
As the main live stream has been down, this still needs to be tested.
2017-05-15 10:46:28 +12:00
39efafc75f
Fixed Annotation.java, ImportantAnnotationController.java, RaceViewController.java to include estimate time to next mark after merge
...
#story[924]
2017-05-15 10:36:20 +12:00
afe0c9f1a6
Merge branch 'develop' into Story47CourseLimits
...
# Conflicts:
# src/main/resources/views/RaceView.fxml
2017-05-15 10:33:22 +12:00
04b105d74b
Merge branch 'develop' into story33_add_estimated_time_annotation
...
# Conflicts:
# src/main/java/seng302/controllers/RaceViewController.java
2017-05-15 10:19:58 +12:00
256ec046fc
adjusted givePointsXY to try and use the marks from the XML parser, stopped partway as the marks from the XML parser and the standard marks need to be merged before this can be fixed properly #story[923]
2017-05-14 22:12:16 +12:00
ff6bfc9516
Important annotations are displayed correctly when updated.
...
- Important annotations can be selected, the live view updates in real time
- Change local time text colour to white
- Split the important annotations state into a separate class
Tags: #story[926]
2017-05-14 20:27:25 +12:00
ae5678482b
changed package "parsers" to be called "stream" #story[923]
2017-05-14 20:26:49 +12:00
03ca60f2e1
deleted a whole bunch of legacy code, primarily the old controllers and old parsers #story[923]
2017-05-14 20:12:35 +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
5472765b95
Removed unused methods in RaceViewController.java
...
#story[923]
2017-05-12 18:24:28 +12:00
14d975dce4
Fixed a bug where clicking "watch race" before race starts will cause boats to travel in unexpected ways.
...
#story[923]
2017-05-12 17:41:47 +12:00
a23bdd0c53
Added functionality to select important annotations and ui changes
...
- Added CSS for the race view & welcome screen
- Added view to select important annotations
- Annotations are enabled/disabled when the user changes the important annotations
Tags: #story[926]
2017-05-11 21:44:56 +12:00
4a75c062ce
Making the course limits change when a new xml packet is received..
...
#story[889]
2017-05-11 15:49:49 +12:00
fe90a3bf13
Merge branch 'master' into story35_create_annotation_view
2017-05-11 13:43:02 +12:00
711f6f4c45
Merge branch 'master' into develop
2017-05-11 13:29:51 +12:00
6d7697a0eb
commented out the problematic buffering functionality #story[923]
2017-05-10 13:58:10 +12:00
b529d621e9
changed course size to 720x720
2017-05-04 16:42:23 +12:00
24667991f1
Merge on to master
...
Final Push
2017-05-04 14:39:29 +12:00
ac3f3bfd55
Added a check if race started, then start screen switches to race view automatically.
...
#story[572]
2017-05-04 14:32:06 +12:00
3080c1bf27
Merge remote-tracking branch 'origin/Story28_GetCorrectTimeZone' into develop
...
# Conflicts:
# src/main/java/seng302/controllers/Controller.java
2017-05-04 14:15:05 +12:00
59809c39ea
Began figuring out how to implement XML data in place of mock data.
...
#story[820] #pair[ajm412, wmu16]
2017-05-04 14:13:03 +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
a4cc5f222c
Refactored course boundary to be a shade rather than a line and made the stream parser and stream receiver exit gracefully before the app closes.
...
#story[820]
2017-05-04 13:29:53 +12:00
7f40fb6283
Fixed bug left in last commit
2017-05-04 11:00:57 +12:00
83316f7a17
Merge branch 'develop' of https://eng-git.canterbury.ac.nz/seng302-2017/team-13 into develop
...
# Conflicts:
# src/main/java/seng302/App.java
# src/main/java/seng302/controllers/Controller.java
2017-05-04 10:48:06 +12:00
a56e55ae70
Fix for some movement on racestart issues
...
#bug
2017-05-04 10:38:04 +12:00
07234ee33a
Updated start screen team list to show position in race. Created Yacht class to replace Boat class. Removed Boat class from XMLParser. Removed unused BoatParser.java.
...
#story[572]
2017-05-04 04:16:16 +12:00
7e8c3af9ce
Removed extra 'minutes' labels
2017-05-04 01:08:18 +12:00
Peter Galloway
Michael Rausch
Zhi You Tan
William Muir
Michael Rausch
Kusal Ekanayake
Alistair McIntyre
Calum