b9b03305b0
Fixed Annotations and bound windarrow
...
- Wind arrow for the bermuda race is bound between 215 and 235 degrees
- annotations will not correctly highlight what they are showing
#story[877] story[882]
9 years ago
12acaeb9ea
Merge branch 'story36_boundary_fix_attempt_2' into 'sprint4_master'
...
Fixes some issues with tacking/gybing.
Boats no longer go out of bounds, and only tack every 15 seconds.
Tested with all wind angles between [0,360] at 45 degree increments.
Also contains the visualiser wind scalar bug fix.
See merge request !12
9 years ago
e5ae2543f8
removed unneeded print statement and fixed incorrect comment (minor (2 lines))
9 years ago
1bd9fdd931
Merge remote-tracking branch 'origin/sprint4_master' into story36_boundary_fix_attempt_2
...
# Conflicts:
# mock/src/main/java/seng302/Model/Race.java
Resolved.
Also reverted the change to the prestart and preparatory time, as they had gotten flipped around (prestart is > 3min to start, preparatory is < 1 min to start).
9 years ago
f71e175f80
Mock.Race:
...
The race start time was current + prestart period + 1 second.
It is now current + prestart + 1 minute.
9 years ago
dc8403ec00
Merge branch '33CherryPick' into 'sprint4_master'
...
33 cherry pick
See merge request !11
9 years ago
495547161d
Merge branch '33CherryPick' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into 33CherryPick
9 years ago
2126c44db9
Last minute changes to get ready for DoD
...
#story[875]
9 years ago
0c235b0c02
Switched constant back to 3
...
#sotry[875]
9 years ago
b58c3b98ed
Integrated changes from story33-estimateTime branch
...
- Used refactored bearing methods
- Sent accurate current time to visualiser
#story[875]
9 years ago
8273cd5167
Merge branch 'sprint4_master' into story36_boundary_fix_attempt_2
9 years ago
5d8380be8d
Mock.Race:
...
Boats now tack only every 15 seconds (see tackPeriod variable).
Also doesn't attempt to calculate VMG (expensive operation) if it won't be used.
9 years ago
5f23f335e5
Added est time annotation to annotations that can be hidden and shown
...
#story[875]
9 years ago
0a022e275e
Added checkbox for est time to next mark to gui
...
#story[875]
9 years ago
92e5dc4490
Cherrypicked changes allowing vis to display est time from bugged branch to current master.
...
#story[875]
9 years ago
e9f3467d97
Reverted commits pushed to master accidentally
...
#story[875]
9 years ago
f0da2d4fee
Merge remote-tracking branch 'origin/sprint4_master' into 33CherryPick
9 years ago
230b458e5d
Cherrypicked changes allowing vis to display est time from bugged branch to current master.
...
#story[875]
9 years ago
dc9cdab4d7
Merge branch 'AuditRefactors' into 'sprint4_master'
...
Audit Refactors
- Created AC35RaceStatus class
- Deleted wait loop into a Thread.sleep()
- Deleted Entirely commented out class....
- Deleted duplicate draw that appeared again
#story[873]
See merge request !4
9 years ago
6e3d8dc75b
Merged Refactors with master
9 years ago
22e5996e64
Merge remote-tracking branch 'origin/sprint4_master' into AuditRefactors
...
# Conflicts:
# visualiser/src/main/java/seng302/VisualiserInput.java
9 years ago
37828ef0fe
Merge branch 'Story877' into 'sprint4_master'
...
Added Important and Partial Annotations and other refactors and documentation.
- Important, Partial, Hidden, Visible are all radiobuttons
- Fixed bug where the Visualiser would end the race before the last boat had finished
- Refactored the visualiser and the mock to use the race finished status message
- Added and Changed many Javadocs
#story[877]
See merge request !5
9 years ago
ba5e74ab9c
Merge with master complete
...
- merged with master
#story[877]
9 years ago
a3ccd75f4c
Merge remote-tracking branch 'origin/sprint4_master' into Story877
...
# Conflicts:
# mock/src/main/java/seng302/DataInput/BoatXMLReader.java
# mock/src/main/java/seng302/DataInput/XMLReader.java
# mock/src/main/java/seng302/Model/Boat.java
# mock/src/main/java/seng302/Model/CompoundMark.java
# mock/src/main/java/seng302/Model/Leg.java
# mock/src/main/java/seng302/Model/Mark.java
# mock/src/main/java/seng302/Model/Marker.java
# mock/src/main/java/seng302/Model/Race.java
# mock/src/test/java/seng302/Model/LegTest.java
# visualiser/src/main/java/seng302/Controllers/RaceController.java
# visualiser/src/main/java/seng302/Mock/StreamedRace.java
# visualiser/src/main/java/seng302/Model/ResizableRaceCanvas.java
# visualiser/src/main/resources/scenes/race.fxml
9 years ago
8a674bcaec
Merge branch 'sprint4_master' into Story877
9 years ago
e3c3def184
Fixed capitalisation that was pointed out by Erika in the Tests
...
- LegTest.java ORIGIN_Compound_MARKER is now ORIGIN_COMPOUND_MARKER
#story[877]
9 years ago
debc5d9c38
Added adjustments that PO requested
...
- hide will not deselect all checkboxes
- visible will now show all checkboxes that were deselected when hidden
- partial will now select abbreviation and speed only
- when another checkbox is selected/deselected from partial,hidden or important it will immediately jump to visible radio button.
#story[877]
9 years ago
7f3500202f
Mock.Polars:
...
Moved some code into isBearingInsideInterval and isFlippedInterval utility functions.
Mock.Race:
Appear to have fixed the boats going out bounds issue at last, by fixing a few bugs, simplifying the code, and removing the boat turning speeds.
9 years ago
adbb8f0a64
Merge branch 'story36' into 'sprint4_master'
...
Story36
See merge request !9
9 years ago
dc7aa359d7
boat time now saves
...
#story[878]
9 years ago
824a5ed3a2
Merge branch 'boat_boundarty_fix' into story36
...
# Conflicts:
# mock/src/main/java/seng302/Model/Race.java
Resolved.
9 years ago
9076606030
Fixed show all annotation not toggling annotations.
...
-Problem found with if statement to fix annotation toggling.
-Sparkline graph x-axis also increased slightly.
#story[878]
9 years ago
2ac932b4f3
fix to keep boats in the bounds
...
#story[#874 , 873]
9 years ago
db3f4a5b2b
fix to keep boats in the bounds
...
#story[#874 , 873]
9 years ago
6a74b5fe36
Merge remote-tracking branch 'remotes/origin/sprint4_master' into story36
...
# Conflicts:
# visualiser/src/main/java/seng302/Controllers/RaceController.java
# visualiser/src/main/java/seng302/Model/ResizableRaceCanvas.java
#story[878]
9 years ago
2a7f264444
Merge remote-tracking branch 'remotes/origin/sprint4_master' into story36
...
# Conflicts:
# visualiser/src/main/java/seng302/Controllers/RaceController.java
# visualiser/src/main/java/seng302/Model/ResizableRaceCanvas.java
#story[878]
9 years ago
e9ecdf5cbc
Merge branch 'noDependencyArrow' into 'sprint4_master'
...
story48
sprint4_master <- noDependencyArrow if DoD == true
See merge request !8
9 years ago
aa2f234393
Annotations are now clickable #fix
9 years ago
6a598c8a04
Arrow fxml I forgot to push
9 years ago
7c9b9c6426
Merge commit message was wrong, i wasn't watching the start up time
...
-small fix to java doc
#story[878]
9 years ago
139d7b41fb
re added story36 racefxml changes after merge
...
#story[878]
9 years ago
748a516d16
Boats not moving working on fix
...
Merge remote-tracking branch 'remotes/origin/sprint4_master' into story36
# Conflicts:
# mock/src/main/java/seng302/DataInput/XMLReader.java
# visualiser/src/main/java/seng302/Controllers/RaceController.java
# visualiser/src/main/java/seng302/Mock/StreamedRace.java
# visualiser/src/main/java/seng302/Model/ResizableRaceCanvas.java
# visualiser/src/main/resources/scenes/race.fxml
#story[878]
9 years ago
06359fb138
Had to changed race to fit the merge
9 years ago
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
9 years ago
e9a6c34e68
Merge branch 'story31.2_alternateTack' into 'sprint4_master'
...
story 31.1, 31.2, 32 merge request
See merge request !3
9 years ago
c8157f3476
Merge remote-tracking branch 'origin/sprint4_master' into story31.2_alternateTack
...
# Conflicts:
# visualiser/src/main/java/seng302/Mock/StreamedRace.java
# visualiser/src/main/java/seng302/Model/ResizableRaceCanvas.java
Resolved.
9 years ago
1234cbbb1f
Merge branch 'story34_v2' into 'sprint4_master'
...
Story34 v2
See merge request !7
9 years ago
2242b44398
forgot to remove imports
9 years ago
b678152cf8
Removed breaking dependency and made it so app doesn't need the breaking dependency any more.
9 years ago
abcaca719c
Javadoc fix
...
#story[878]
9 years ago
Fan-Wu Yang
Joseph Gardner
fjc40
Connor Taylor Brown
Erika Savell
Hamish Ball
David Wu
Jessica McAuslin