fanwuyang/SENG302
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,017 Commits 1 Branch 0 Tags
7086af6057b64b04144667409ecde22c21160e19
Commit Graph
1017 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
fjc40 42ae89d20c Merge remote-tracking branch 'origin/sprint4_master' into fix_time_since_last_marker 2017-05-25 16:22:23 +12:00
Connor Taylor Brown ea02752dc0 Merge branch 'bindWind' into 'sprint4_master' 
Bind wind



See merge request !14
 2017-05-25 16:09:02 +12:00
Fan-Wu Yang 512169010c 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]
 2017-05-25 14:45:13 +12:00
fjc40 fdc03275fe Merge remote-tracking branch 'origin/sprint4_master' into fix_time_since_last_marker 2017-05-25 14:42:07 +12:00
fjc40 234748d056 Visualiser: 
Fixed the issue where a boat's time since last mark started counting from when the race screen loaded.
It now starts counting when the race actually starts.
 2017-05-25 14:41:51 +12:00
Fan-Wu Yang 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]
 2017-05-25 14:34:29 +12:00
Joseph Gardner 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
 2017-05-25 14:33:52 +12:00
Joseph Gardner e5ae2543f8 removed unneeded print statement and fixed incorrect comment (minor (2 lines)) 2017-05-25 14:30:12 +12:00
fjc40 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).
 2017-05-25 14:04:06 +12:00
fjc40 f71e175f80 Mock.Race: 
The race start time was current + prestart period + 1 second.
It is now current + prestart + 1 minute.
 2017-05-25 13:53:27 +12:00
Connor Taylor Brown dc8403ec00 Merge branch '33CherryPick' into 'sprint4_master' 
33 cherry pick



See merge request !11
 2017-05-25 13:47:02 +12:00
cbt24 495547161d Merge branch '33CherryPick' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into 33CherryPick 2017-05-25 13:36:34 +12:00
cbt24 2126c44db9 Last minute changes to get ready for DoD 
#story[875]
 2017-05-25 13:35:40 +12:00
Erika Savell 0c235b0c02 Switched constant back to 3 
#sotry[875]
 2017-05-25 12:56:25 +12:00
cbt24 b58c3b98ed Integrated changes from story33-estimateTime branch 
- Used refactored bearing methods
- Sent accurate current time to visualiser

#story[875]
 2017-05-25 12:53:40 +12:00
fjc40 8273cd5167 Merge branch 'sprint4_master' into story36_boundary_fix_attempt_2 2017-05-25 12:49:18 +12:00
fjc40 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.
 2017-05-25 12:35:57 +12:00
Erika Savell 5f23f335e5 Added est time annotation to annotations that can be hidden and shown 
#story[875]
 2017-05-25 02:29:56 +12:00
Erika Savell 0a022e275e Added checkbox for est time to next mark to gui 
#story[875]
 2017-05-25 02:11:09 +12:00
Erika Savell 92e5dc4490 Cherrypicked changes allowing vis to display est time from bugged branch to current master. 
#story[875]
 2017-05-25 01:34:23 +12:00
Erika Savell e9f3467d97 Reverted commits pushed to master accidentally 
#story[875]
 2017-05-25 01:23:44 +12:00
Erika Savell f0da2d4fee Merge remote-tracking branch 'origin/sprint4_master' into 33CherryPick 2017-05-25 01:15:14 +12:00
Erika Savell 230b458e5d Cherrypicked changes allowing vis to display est time from bugged branch to current master. 
#story[875]
 2017-05-25 01:14:54 +12:00
Erika Savell 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
 2017-05-25 00:49:07 +12:00
Fan-Wu Yang 6e3d8dc75b Merged Refactors with master 2017-05-24 23:50:17 +12:00
Fan-Wu Yang 22e5996e64 Merge remote-tracking branch 'origin/sprint4_master' into AuditRefactors 
# Conflicts:
#	visualiser/src/main/java/seng302/VisualiserInput.java
 2017-05-24 23:49:00 +12:00
Connor Taylor Brown 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
 2017-05-24 23:45:50 +12:00
Fan-Wu Yang ba5e74ab9c Merge with master complete 
- merged with master
#story[877]
 2017-05-24 23:13:59 +12:00
Fan-Wu Yang 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
 2017-05-24 22:57:31 +12:00
Fan-Wu Yang 8a674bcaec Merge branch 'sprint4_master' into Story877 2017-05-24 22:30:23 +12:00
Fan-Wu Yang e3c3def184 Fixed capitalisation that was pointed out by Erika in the Tests 
- LegTest.java ORIGIN_Compound_MARKER is now ORIGIN_COMPOUND_MARKER
#story[877]
 2017-05-24 22:29:51 +12:00
Fan-Wu Yang 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]
 2017-05-24 22:24:37 +12:00
fjc40 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.
 2017-05-24 19:20:30 +12:00
Hamish Ball adbb8f0a64 Merge branch 'story36' into 'sprint4_master' 
Story36



See merge request !9
 2017-05-24 18:05:04 +12:00
hba56 dc7aa359d7 boat time now saves 
#story[878]
 2017-05-24 17:59:02 +12:00
fjc40 824a5ed3a2 Merge branch 'boat_boundarty_fix' into story36 
# Conflicts:
#	mock/src/main/java/seng302/Model/Race.java
Resolved.
 2017-05-23 18:35:39 +12:00
David Wu 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]
 2017-05-23 17:49:00 +12:00
hba56 2ac932b4f3 fix to keep boats in the bounds 
#story[#874, 873]
 2017-05-23 15:17:19 +12:00
hba56 db3f4a5b2b fix to keep boats in the bounds 
#story[#874, 873]
 2017-05-23 14:56:07 +12:00
hba56 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]
 2017-05-23 13:19:48 +12:00
hba56 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]
 2017-05-23 13:19:11 +12:00
Jessica McAuslin e9ecdf5cbc Merge branch 'noDependencyArrow' into 'sprint4_master' 
story48

sprint4_master <- noDependencyArrow if DoD == true

See merge request !8
 2017-05-23 12:52:51 +12:00
Joseph aa2f234393 Annotations are now clickable #fix 2017-05-23 12:22:30 +12:00
Joseph 6a598c8a04 Arrow fxml I forgot to push 2017-05-23 11:17:54 +12:00
hba56 7c9b9c6426 Merge commit message was wrong, i wasn't watching the start up time 
-small fix to java doc
#story[878]
 2017-05-22 17:56:47 +12:00
hba56 139d7b41fb re added story36 racefxml changes after merge 
#story[878]
 2017-05-22 17:46:51 +12:00
hba56 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]
 2017-05-22 17:45:45 +12:00
Joseph Gardner 06359fb138 Had to changed race to fit the merge 2017-05-22 16:39:26 +12:00
Joseph Gardner 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
 2017-05-22 15:28:53 +12:00
Joseph Gardner e9a6c34e68 Merge branch 'story31.2_alternateTack' into 'sprint4_master' 
story 31.1, 31.2, 32 merge request



See merge request !3
 2017-05-22 15:01:07 +12:00