David Wu
4efab9091d
Merge remote-tracking branch 'origin/story9' into story9
...
# Conflicts:
# src/main/java/seng302/Model/Boat.java
2017-03-20 17:12:06 +13:00
David Wu
293f63ca8b
Added abbreviations to each boat
...
-BoatInRace now takes extra parameter "abbrev"
#story [18]
2017-03-20 17:08:25 +13:00
David Wu
b5496b07de
Merge branch 'story9' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story9
2017-03-20 16:47:09 +13:00
David Wu
98c5c46569
Implemented displayText to display boat name and speed with mark
...
-method takes in boat name, boat speed and coordinates
#story [18, 19]
2017-03-20 16:46:59 +13:00
David Wu
c33ce60e71
Changed labels for timer
...
-preRace countdown now has text saying "Time until race starts:"
-Timer during race now says "Race clock:"
#story [16]
2017-03-20 16:26:18 +13:00
David Wu
1842b8f0b2
Merge remote-tracking branch 'origin/story9' into story9
...
# Conflicts:
# src/main/java/seng302/Model/Race.java
2017-03-20 16:22:12 +13:00
David Wu
946b9d0a72
Implement countdown clock
...
-Added method countdownTimer() that countdowns from the current time to an selected time
-Method is called in run (in Race) before the simulatedRace
-Private integer PRERACE_TIME is used to set time before the race begins
#story [16]
2017-03-20 16:20:05 +13:00
David Wu
e04fdc79c9
Merge remote-tracking branch 'origin/story9' into story9
...
# Conflicts:
# .idea/compiler.xml
# .idea/misc.xml
2017-03-20 15:34:12 +13:00
David Wu
ca966e6c7b
Implement race clock
...
-Added label to fxml racepane.fxml
-Added calcTime method to calculate time elapsed
-Added updateTime method in Race to update label text
-Added setTimer in RaceController to update label text
#story [16] #pair [fwy13, zwu18]
2017-03-20 15:33:37 +13:00
David Wu
b3b200fb02
Fixed arrow not resizing with resizable canvas
...
#story [14]
2017-03-17 12:30:22 +13:00
David Wu
8bb2558b7e
Timer is now in race loop
...
-Timer is currently printing out
-Later will implement so that it is displayed on gui
#story [16]
2017-03-17 12:06:35 +13:00
David Wu
ddbb77a610
Arrow is now movable around the canvas
...
-Arrow method is changed to take coordinates and an angle
-Arrow will now be drawn around the coordinate
#story [14]
2017-03-16 17:44:24 +13:00
David Wu
ec03ec9be9
Merge remote-tracking branch 'origin/story9' into story9
...
# Conflicts:
# src/main/java/seng302/Controllers/RaceController.java
2017-03-15 12:36:43 +13:00
David Wu
b4baba8c15
Implemented display a gate as a line
...
-method created to add a line to canvas
-added points for mark, north gate, and south gate
#story [12]
2017-03-15 12:35:14 +13:00
David Wu