Commit Graph

116 Commits

Author SHA1 Message Date
Peter 59a4a74a97 changed boatPositionController to also add velocity to the boat ordering shown in the side bar #story[447] 2017-03-23 22:50:04 +13:00
Peter a860cc0ec1 connected up all the javafx components and got team positions displaying on the sidebar #story[426] 2017-03-23 21:21:54 +13:00
Peter 8578bc4a5b changed the "sea" color of the canvas to be actually drawn on the canvas rather than the pane behind #story[377] 2017-03-23 16:18:42 +13:00
Peter ed004d1423 Merge branch 'master'
Conflicts:
	src/main/java/seng302/controllers/CanvasController.java
	src/main/resources/RaceView.fxml
2017-03-23 15:16:11 +13:00
Michael Rausch 2384013139 Created race timer
- Race starts when timer reaches 1 second
- Race waits 10 seconds before it starts

Tags: #implement #story[16]
2017-03-23 14:11:12 +13:00
Haoming Yin 42ffd1b1f8 Add rotated wind direction arrow to race view.
#story[422]
2017-03-23 01:10:07 +13:00
Michael Rausch 9e22eac4d8 Added the race results to the RaceResultController. Also fixed some bugs
- Fixed a bug where the race results would be out of order.
- Changed the colour of the start and finish gates
- Added the race results to the RaceResultController and updated view

Tags: #fix #implement #story[13, 10, 11]
2017-03-22 22:30:49 +13:00
Michael Rausch 039e61def6 Fixed broken JavaFX file #fix 2017-03-22 14:50:28 +13:00
Peter 54d329c5cf changed raceView javafx structure and added an example of how the handle function works with keyframes #story[426] 2017-03-22 14:44:40 +13:00
Michael Rausch f46a98fad9 Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-13 2017-03-22 14:39:37 +13:00
Michael Rausch ef098e63d7 Added finishing events #implement and rotated the map by 180 degrees#fix 2017-03-22 12:51:03 +13:00
zyt10 44b5b0b771 Added side pane to GUI and resize to 1280x960
#story[426]
2017-03-22 11:46:39 +13:00
Peter ed577fad6a adding files missed in previous commit 2017-03-20 17:58:40 +13:00
Peter ae61260665 created a javafx view for the race finish and created a rough wireframe for the controller to change the view from race to finish #story[414] 2017-03-20 17:56:14 +13:00
Ryan Tan ffa39e6a9c Changed size of canvas to 720 x 360
#story[377]
2017-03-16 17:40:31 +13:00
Peter 550812d8e1 Currently displaying basic javafx window with canvas. Also changed the file structure a bit.
At this point the javafx is not tied to the old code in any way #story[377]
2017-03-15 18:16:43 +13:00