e501102bc5
Refactored the raceClock
...
- created a class that hosts the raceClock
- refactored the raceController to use a raceClock.
#story[761]
9 years ago
56d51ceaa9
Track point is now removed after its expiry and fades after the boat has stopped Story [758]
9 years ago
4e78ae2ae7
Fixed testing problem where race tests would sometimes fail because a boat did not finish
...
- Added an option to set the dnf chance, then set it to 0 is all tests
#story[760]
9 years ago
f25e2bac32
Changed countdown length to two minutes
9 years ago
62d220f1fb
Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story27
9 years ago
2d74cdc5dc
Fixed DNF position handling
...
- DNF position is now "-"
- If boat DNFs during leg, other boats' rankings are updated to remain accurate
#story[15]
9 years ago
680c6fb991
Increased minimum opacity so actual track from start is visible.
...
- No longer removes points from track
#story[25]
9 years ago
375202e7a0
Fades boat opacity every frame during and after race.
...
- Added TrackPoint with time added and expiry to calculate opacity each frame
- Modified drawTrackPoint to compute colour from TrackPoint alpha
- Removed getTrackPoint from BoatInRace
#pait[jjg64, cbt24]
9 years ago
63591ad1ec
Added fixed opacity points of fading and modified race time to keep updating when the race is finished. Pair [jjg64, cbt24] Story [758]
9 years ago
4eef872a60
Decoupled drawing and adding track points, added combobox selector for visible boats.
9 years ago
c31ea51068
Temporarily removed test for countdown timer as countdown timer now uses animation timer.
9 years ago
57d30a7a02
Fixed countdown timer not scaling.
...
-Countdown timer now also uses an animation timer
-Added scaling factor to countdown timer
9 years ago
2bf264c6bb
Populated starting boat table
...
- boat names shown in first column
- boat abbrevs. shown in second column
#story[760]
9 years ago
8112918c13
Attempted to load details in, but ran into problems with the string property/vs string distinction
...
#pair[jam330] #story[760]
9 years ago
101dadc003
Gave BoatInRace a track property that stores the coordinates of the track. Added a method in ResizableRaceCanvas that draws the points on the track every time the canvas updates. [Story 25]
9 years ago
7790322e04
Implemented the Time showing on Grid
...
- Added Label to scene
- Added Timezone formatting
#story[28] #pair[fwy13,hba56]
9 years ago
ee65e7eba5
Changed where the saved annotation set is declared.
...
-Annotation set is now initialized along with annotations.
#story[26]
9 years ago
d08a1c325f
Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7
9 years ago
5c89c1aeb7
Implemented functionality to select which annotations to display. Selected annotations can be temporarily saved and then displayed on a button press.
...
-Added checkboxes to display name, abbreviation, and speed in annotation.
-Changed single titlepane to an accordion.
-Moved all annotation controls to separate titlepane in accordion.
-Added buttons to save and load saved annotation settings.
#story[26]
9 years ago
58cae682ab
Merge branch 'story27' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story27
9 years ago
44fac754a7
Created screen for showing starters
...
- modified start pane
- added table to populate with starting boats
#Story[760]
9 years ago
47df6266d2
Created start race entry point in main controller so it could be called by start race controller
...
story[760]
9 years ago
71f0085268
Implemented geotimezone from com.github.bfsmith
...
- Calculates timezone from mark
#story[28] #pair[fwy13,hba56]
9 years ago
0772ca22c6
Re-engineered fxml controllers to use child controllers
...
- Removed a lot of unnecessary complexity in App class
#pair[jam339, esa46] #story[760]
9 years ago
a689ffc689
Added quick descriptions to params to get javadoc working
9 years ago
6866f65adf
Ignoring failing test to check CI is working.
...
- Test will be fixed as part of another stoy
9 years ago
94444e6662
Negligible change to check CI runner is working
9 years ago
8e70dfa2d5
Fixed boat position calculation
...
- Decoupled 'place' column data from position in table
- Set position in race after first mark passed
#story[15]
9 years ago
795b411f08
Added some doc strings
...
- Added doc strings to RaceXML
- Added a few minor changes to bermuda_AC35.xml
- Changes to the RaceXMLReader Unit Test
9 years ago
c105c2d01e
Fixed file paths so they work when it becomes an executable
...
- Changed file paths for the FXML files
9 years ago
ee72d85f6a
removed print messages
...
#story[20]
9 years ago
ec9574fd9d
Refactoring
...
#story[24]
9 years ago
e2f9a710aa
Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into changeStartingPositions2
9 years ago
fc1121b5b7
Removed extra < char from .mailmap
9 years ago
6344e12d8f
Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into changeStartingPositions2
9 years ago
9808c57ca7
GOat boats spread out at startline working
...
#story[20]
9 years ago
9f71c99ecf
Updated .mailmap
9 years ago
0e7d210cea
Amended wake tests to handle markers instead of direct coordinates
...
#test
9 years ago
970f0d0116
Fixed race scaling
...
- Races were completed far too quickly because a set SLEEPTIME was used as the time elapsed, instead of the actual break time
#story[16]
9 years ago
fb409af23b
Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into changeStartingPositions2
9 years ago
495158a621
Amended and added tests to cope with marker change
...
#test #story[20]
9 years ago
305326881f
Merged Boundaries branch
...
- Merged Boundaries branch.
#story[22]
9 years ago
461d894ac8
Merge branch 'boundaries'
...
# Conflicts:
# src/main/java/seng302/Controllers/RaceController.java
# src/main/java/seng302/Model/ResizableRaceCanvas.java
# src/main/resources/scenes/racepane.fxml
9 years ago
6ffe3d02a3
Fixed and merged heading-visualisation
...
- Fixed the boats not appearing at the starting line.
- Merged with master
#story[24]
9 years ago
edd9c2a48d
Merge remote-tracking branch 'origin/heading-visualisation'
...
# Conflicts:
# src/main/java/seng302/Controllers/RaceController.java
# src/main/java/seng302/Model/Boat.java
# src/main/java/seng302/Model/Race.java
# src/main/java/seng302/Model/ResizableRaceCanvas.java
# src/main/resources/scenes/racepane.fxml
9 years ago
eb97bd6aef
Implemented resizable map and boundary scaling.
...
- Map can now be downsized
- The boundaries are auto margined and fit in the center of the canvas.
#implement
9 years ago
1524ed5a0e
Merged annotation toggle and DNF features with heading visualisation.
9 years ago
9960317732
Removed tooltip
9 years ago
68fccc3216
Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7
9 years ago
4ee6624ff6
Changed abbreviations for teams
...
-Updated the team abbreviations to official ones
-Change methods that were public to private
9 years ago
Fan-Wu Yang
Joseph
Erika Savell
cbt24
zwu18
Jessica McAuslin