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
1524ed5a0e
Merged annotation toggle and DNF features with heading visualisation.
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
6fe80ad52c
Fixed speed displayed in table view
...
#story [17]
9 years ago
24dec0bb2f
Fixed participating boats not outputting correctly
...
-toString method in Boat class now uses getValue
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
f8147be4df
Merge remote-tracking branch 'origin/story9' into story9
...
# Conflicts:
# src/main/java/seng302/Constants.java
# src/main/java/seng302/Model/Race.java
# src/main/java/seng302/Model/ResizableRaceCanvas.java
9 years ago
af45be1147
Implemented Animation Timer, FPS counter and modified display boat names and speed
...
-Race now uses Animation Timer to simulate the race in Race class
-FPS counter displayed in bottom left corner. TODO: Toggle fps view
-Boat names and speed will now reposition so it is not blocked by the border of the canvas
#story [18, 20]
9 years ago
4c7295998b
Added scaler variable to mulitply the race clock and the boats' velocities by
...
- Races take roughly 15 mins realtime with a slowest boat of ~20 knots. Therefore scale by 3 for a 5 min race, and 15 for a 1 min race
#story[16] #implement
9 years ago
df8b711cf5
Tests for BoatInRace, imported Mockito
...
#test #story[24]
9 years ago
13c5c12db3
Added table column to display speed of each boat
...
-BoatInRace now has a column to called boatSpeedColumn that displays boat
#story [17] #pair[fwy13, zwu18]
9 years ago
4efab9091d
Merge remote-tracking branch 'origin/story9' into story9
...
# Conflicts:
# src/main/java/seng302/Model/Boat.java
9 years ago
293f63ca8b
Added abbreviations to each boat
...
-BoatInRace now takes extra parameter "abbrev"
#story [18]
9 years ago
a9601eb760
Switched latitude/longitude around
...
We were using latitude on the x plane and longitude on the y plane
#story[9] #fix
9 years ago
d97802e06c
Refactored the refreshTable into propeties that listen.
...
- Added currentLegName as a String Property
- Refactored Name of the Boat as a StringProperty
#story[15]
9 years ago
d393766027
Partially completed story 13
9 years ago
6f509e25ea
Implementing the boats movement throught a race
...
-Not complete! Still need to create function to calculate new coordinates
-Doesn't run because of problems with resource folder
#refactor
9 years ago
Fan-Wu Yang
cbt24
David Wu
Erika Savell