1519 Commits (6187b8352498a167618963615b42d762bedc4f0d)
 

Author SHA1 Message Date
Hamish Ball 992b6c91fc Merge branch 'fix_time_since_last_marker' into 'sprint4_master'
9 years ago
fjc40 a095f15eac Fixed finish controller not being stretch and centered.
9 years ago
fjc40 42ae89d20c Merge remote-tracking branch 'origin/sprint4_master' into fix_time_since_last_marker
9 years ago
Connor Taylor Brown ea02752dc0 Merge branch 'bindWind' into 'sprint4_master'
9 years ago
Fan-Wu Yang 512169010c Fixed Annotations and bound windarrow
9 years ago
fjc40 fdc03275fe Merge remote-tracking branch 'origin/sprint4_master' into fix_time_since_last_marker
9 years ago
fjc40 234748d056 Visualiser:
9 years ago
Fan-Wu Yang b9b03305b0 Fixed Annotations and bound windarrow
9 years ago
Joseph Gardner 12acaeb9ea Merge branch 'story36_boundary_fix_attempt_2' into 'sprint4_master'
9 years ago
Joseph Gardner e5ae2543f8 removed unneeded print statement and fixed incorrect comment (minor (2 lines))
9 years ago
fjc40 1bd9fdd931 Merge remote-tracking branch 'origin/sprint4_master' into story36_boundary_fix_attempt_2
9 years ago
fjc40 f71e175f80 Mock.Race:
9 years ago
Connor Taylor Brown dc8403ec00 Merge branch '33CherryPick' into 'sprint4_master'
9 years ago
cbt24 495547161d Merge branch '33CherryPick' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into 33CherryPick
9 years ago
cbt24 2126c44db9 Last minute changes to get ready for DoD
9 years ago
Erika Savell 0c235b0c02 Switched constant back to 3
9 years ago
cbt24 b58c3b98ed Integrated changes from story33-estimateTime branch
9 years ago
fjc40 8273cd5167 Merge branch 'sprint4_master' into story36_boundary_fix_attempt_2
9 years ago
fjc40 5d8380be8d Mock.Race:
9 years ago
Erika Savell 5f23f335e5 Added est time annotation to annotations that can be hidden and shown
9 years ago
Erika Savell 0a022e275e Added checkbox for est time to next mark to gui
9 years ago
Erika Savell 92e5dc4490 Cherrypicked changes allowing vis to display est time from bugged branch to current master.
9 years ago
Erika Savell e9f3467d97 Reverted commits pushed to master accidentally
9 years ago
Erika Savell f0da2d4fee Merge remote-tracking branch 'origin/sprint4_master' into 33CherryPick
9 years ago
Erika Savell 230b458e5d Cherrypicked changes allowing vis to display est time from bugged branch to current master.
9 years ago
Erika Savell dc9cdab4d7 Merge branch 'AuditRefactors' into 'sprint4_master'
9 years ago
Fan-Wu Yang 6e3d8dc75b Merged Refactors with master
9 years ago
Fan-Wu Yang 22e5996e64 Merge remote-tracking branch 'origin/sprint4_master' into AuditRefactors
9 years ago
Connor Taylor Brown 37828ef0fe Merge branch 'Story877' into 'sprint4_master'
9 years ago
Fan-Wu Yang ba5e74ab9c Merge with master complete
9 years ago
Fan-Wu Yang a3ccd75f4c Merge remote-tracking branch 'origin/sprint4_master' into Story877
9 years ago
Fan-Wu Yang 8a674bcaec Merge branch 'sprint4_master' into Story877
9 years ago
Fan-Wu Yang e3c3def184 Fixed capitalisation that was pointed out by Erika in the Tests
9 years ago
Fan-Wu Yang debc5d9c38 Added adjustments that PO requested
9 years ago
fjc40 7f3500202f Mock.Polars:
9 years ago
Hamish Ball adbb8f0a64 Merge branch 'story36' into 'sprint4_master'
9 years ago
hba56 dc7aa359d7 boat time now saves
9 years ago
fjc40 824a5ed3a2 Merge branch 'boat_boundarty_fix' into story36
9 years ago
David Wu 9076606030 Fixed show all annotation not toggling annotations.
9 years ago
hba56 2ac932b4f3 fix to keep boats in the bounds
9 years ago
hba56 db3f4a5b2b fix to keep boats in the bounds
9 years ago
hba56 6a74b5fe36 Merge remote-tracking branch 'remotes/origin/sprint4_master' into story36
9 years ago
hba56 2a7f264444 Merge remote-tracking branch 'remotes/origin/sprint4_master' into story36
9 years ago
Jessica McAuslin e9ecdf5cbc Merge branch 'noDependencyArrow' into 'sprint4_master'
9 years ago
Joseph aa2f234393 Annotations are now clickable #fix
9 years ago
Joseph 6a598c8a04 Arrow fxml I forgot to push
9 years ago
hba56 7c9b9c6426 Merge commit message was wrong, i wasn't watching the start up time
9 years ago
hba56 139d7b41fb re added story36 racefxml changes after merge
9 years ago
hba56 748a516d16 Boats not moving working on fix
9 years ago
Joseph Gardner 06359fb138 Had to changed race to fit the merge
9 years ago