f5472bf595
Merge remote-tracking branch 'remotes/origin/master' into story28
...
-anchors now fills stage
-added time label
# Conflicts:
# pom.xml
# src/main/java/seng302/Controllers/RaceController.java
# src/main/resources/scenes/racepane.fxml
#pair[fwy13, hba56]
#story[761]
9 years ago
edabe58b03
Merge remote-tracking branch 'remotes/origin/master' into story28
...
-anchors now fills stage
-added time label
# Conflicts:
# pom.xml
# src/main/java/seng302/Controllers/RaceController.java
# src/main/resources/scenes/racepane.fxml
#pair[fwy13, hba56]
#story[761]
9 years ago
a00b066f8d
Quick fix to zoneId to make it set correctly
...
- removed local zoneId
#story[761]
#pair[fwy13, hba56]
9 years ago
e501102bc5
Refactored the raceClock
...
- created a class that hosts the raceClock
- refactored the raceController to use a raceClock.
#story[761]
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
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
57d30a7a02
Fixed countdown timer not scaling.
...
-Countdown timer now also uses an animation timer
-Added scaling factor to countdown timer
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
a689ffc689
Added quick descriptions to params to get javadoc 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
ec9574fd9d
Refactoring
...
#story[24]
9 years ago
9808c57ca7
GOat boats spread out at startline working
...
#story[20]
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
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
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
98be99a975
Merge remote-tracking branch 'origin/master'
9 years ago
eb4c02557d
Changing xml reader to take both coordinates of a marker
...
- Have commented out tests for now because a lot of rearranging and fixing needed
#story[20]
9 years ago
b943b38d61
Merge remote-tracking branch 'origin/master'
...
# Conflicts:
# src/main/java/seng302/Model/Boat.java
9 years ago
99cb4bd526
Implemented DNF with random chance in Race
...
#story [17]
9 years ago
d2de426f58
Fixed so the animation timer will exit when all boats finish the race
...
-Moved listeners for annotation to initialize
-Fixed compass arrow not rescaling properly with canvas
-Fixed scaling issue with race clock
9 years ago
d1d46f2cf5
Created Marker class
...
- Holds the start and end coordinate of a gate or marker, and has a method to calculate the middle point
- Each leg will hold a start Marker and end Marker
#story[20]
9 years ago
6fe80ad52c
Fixed speed displayed in table view
...
#story [17]
9 years ago
45fcd22cc5
Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into changeStartingPositions2
9 years ago
33b94cdf5b
Changed implementation for Anno(annotations)
...
-drawRaceMap is now called for annotation to update map
#story[23]
9 years ago
224c16a713
Implemented Map Boundaries in XML
...
- RaceXMLReader will calculate the top left latitude and longitude and the bottom right latitude and longitude, and make the layout the map accordingly.
- The Boundaries are draw on the Race Canvas in Aqua.
#story[22]
9 years ago
2d2f4692a9
Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into changeStartingPositions2
9 years ago
bb6b881392
Adding end coords to get test running gain
...
#story[20]
9 years ago
cfbb27513d
Fixed wake scale for realistic speeds.
...
#story[21]
9 years ago
3aaee1291d
Implemented heading visualisation
...
- Boats are represented as isosceles triangles
- Boats are rotated toward heading while in race
- As heading is only available in race, RaceController draws boats on start line and in race separately
#story [24]
9 years ago
176b644aaf
Created boat initialise method to run through boats setting correct start position
...
- Running funny, try pulling changes from master
#story[20]
9 years ago
d15cd2b881
Wrote method to calculate spread positions across start line
...
- Also began work to make sure it is called. Requires refactoring
- WIP, this porgramme shouldn't run atm
#story[20]
9 years ago
24dec0bb2f
Fixed participating boats not outputting correctly
...
-toString method in Boat class now uses getValue
9 years ago
bd072af0c4
Modified size of mark
...
-Size of the mark changed to avoid confusion between mark and boats.
9 years ago
073bcaa4a3
Added checkbox to change visibility of annotation to GUI
...
-Checkbox is used to toggle the text displayed beside boats
-Race Clock is now scaled using the scale factor
#story [23]
9 years ago
0df8235a28
Added TitledPane and Checkbox to GUI.
...
-Checkbox is used to control the visibility of the FPS counter
#story [20]
9 years ago
f8dff6359d
Merge branch 'story9'
...
# Conflicts:
# src/main/java/seng302/Controllers/RaceController.java
# src/main/java/seng302/Model/Race.java
# src/main/java/seng302/Model/ResizableRaceCanvas.java
# src/main/resources/scenes/racepane.fxml
9 years ago
306e98172b
Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into heading-visualisation
9 years ago
bd86690e85
Filled in javadoc, optimised imports, rearranged code
...
#refactor #story[16]
9 years ago
e8cd9b2ee8
Implemented wake visualisation for each boat
...
- Added and tested wake calculation for BoatInRace
- Draws boat in canvas between start and entering Finish leg
- Allow boat velocity to be set after initialisation for testing
#story [21]
9 years ago
f5ba7c95c8
Fixing merge and resulting failing tests
...
#fix #story[16]
9 years ago
e923fe671b
Changed race clock to display negative time before race
...
#story[16] #implement
9 years ago
hba56
Fan-Wu Yang
Erika Savell
cbt24
zwu18