5fa47ff65b
Implemented elapsed time since last mark on annotation.
...
#story[927]
2017-05-15 16:31:04 +12:00
3a1c1a5e43
Merge remote-tracking branch 'origin/develop' into story36_elapsed_time
...
# Conflicts:
# src/main/java/seng302/models/BoatGroup.java
2017-05-15 15:54:44 +12:00
4c7f530458
Merge branch 'story33_add_estimated_time_annotation' into 'develop'
...
Story33 add estimated time annotation
Added estimated time to next mark to annotation
See merge request !28
2017-05-15 15:50:46 +12:00
2e914a7704
Fixed estimate time to next mark to match acceptance criteria which is countdown in minutes and seconds.
...
#story[924]
2017-05-15 15:49:21 +12:00
081d7e3dcb
Fixed the parsing of bytes being off by one byte in the stream parser fr the race status packet.
...
#story[924] #pair[kre39,zyt10]
2017-05-15 14:52:57 +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
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
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
1ab6351d48
Fixed estimated time to next mark (annotation) to update correctly
...
#story[924]
2017-05-15 10:11:19 +12:00
85d4d63287
Merge branch 'story35_create_annotation_view' into 'develop'
...
Story35 create annotation view
## Addresses issue #9 and story 35
# Change Log
* Styled application using CSS (Issue #9 )
* User can select to only show important annotations using the annotation slider
* Added view to select important annotations
* Important annotations are updated in real-time
# Testing
* Unit tests in test/java/seng302/visualizer/annotations/*
* Controllers have been tested manually
# Acceptance Criteria
* There is a mechanism to chose the ‘important’ annotations while viewing a race.
* Any number of annotations (from zero to the number of annotations) can be chosen.
* If the partial annotations toggle is active, choosing an annotation makes that annotation immediately visible for all boats, and deselecting an annotation should likewise remove it from all boats.
* When the partial annotations toggle becomes active, all annotations chosen as ‘important’, and only those annotations, should be shown.
See merge request !27
2017-05-14 22:00:02 +12:00
213d36ed56
Merge remote-tracking branch 'origin/develop' into story35_create_annotation_view
2017-05-14 21:05:48 +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
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
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
2cb09b81f8
Updated .mailmap for everyone
2017-05-04 16:53:16 +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
f2c4929656
Merge remote-tracking branch 'origin/master'
2017-05-04 14:22:49 +12:00
4c038a823a
Merge branch 'master' into develop
...
# Conflicts:
# .mailmap
2017-05-04 14:22:20 +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
9b063190ce
Merge branch 'develop' of https://eng-git.canterbury.ac.nz/seng302-2017/team-13 into develop
...
# Conflicts:
# src/test/java/seng302/models/MarkGroupTest.java
2017-05-04 14:04:52 +12:00
49f2398669
Merge branch 'develop' of https://eng-git.canterbury.ac.nz/seng302-2017/team-13 into develop
2017-05-04 14:01:32 +12:00
d7a4d20ceb
Merge branch 'develop' of https://eng-git.canterbury.ac.nz/seng302-2017/team-13 into develop
...
# Conflicts:
# src/test/java/seng302/models/MarkGroupTest.java
2017-05-04 14:01:19 +12:00
0855e268c8
Removed another test that was causing failing due CI not having disply
2017-05-04 14:01:06 +12:00
49b8d75aea
Merge branch 'develop' of https://eng-git.canterbury.ac.nz/seng302-2017/team-13 into develop
...
# Conflicts:
# src/test/java/seng302/models/BoatGroupTest.java
2017-05-04 14:00:44 +12:00
b1a9a7845b
Merge branch 'develop' of https://eng-git.canterbury.ac.nz/seng302-2017/team-13 into develop
...
# Conflicts:
# src/test/java/seng302/models/BoatGroupTest.java
2017-05-04 14:00:24 +12:00
b1e749bafb
Removed test that was failing due to CI not having a display
2017-05-04 13:59:44 +12:00
f6fc6c0693
Merge remote-tracking branch 'origin/develop' into develop
2017-05-04 13:53:49 +12:00
ad1371bce0
Commented out tests that were causing build failures.
...
Issue is related to tests failing to get the source code from our project needed to build. They run
fine when run from the IDE.
2017-05-04 13:52:47 +12:00
e77df0a5dd
Changed port number and added standalone flag
...
- can use -standalone to just run the server
- Changed port number as to not conflict with some web servers
2017-05-04 13:52:36 +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
a0bb7b85b4
potential fix for build failures
2017-05-04 13:26:29 +12:00
fd8ed92f88
Fix for wakes on internal data
...
#bug
2017-05-04 13:20:50 +12:00
c7b6261602
Merge branch 'develop' of https://eng-git.canterbury.ac.nz/seng302-2017/team-13 into develop
2017-05-04 12:46:07 +12:00
3aefb14faf
Added testing.
2017-05-04 12:46:01 +12:00
8521b68855
Server thread stops when window has been closed
2017-05-04 12:35:36 +12:00
e37b244f45
Fixed a bug where boat statuses were being sent incorrectly
...
- Boats now have an estimated time until finish
- Boat packets are being sent correctly
Tags: #story[829]
2017-05-04 12:27:59 +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
145d59df45
Removed unused imports
2017-05-04 01:18:41 +12:00
7e8c3af9ce
Removed extra 'minutes' labels
2017-05-04 01:08:18 +12:00
Zhi You Tan
Michael Rausch
Kusal Ekanayake
Peter Galloway
Michael Rausch
William Muir
Alistair McIntyre
Calum