bbe7cbee8f
Use canvas polygon to draw a triangle
...
#story[480]
2017-03-27 14:26:38 +13:00
55ba343426
Merge branch 'change-to-short-names' into 'master'
...
Changed the team names to their abbreviated versions
- Also halved the size of the wake lines
- Updated tests to support the shorter team names
- Wake lines are now hidden with the other annotations
Tags: #story[23,21]
See merge request !25
2017-03-24 21:01:55 +13:00
e6ace5fb2f
Changed the team names to their abbreviated versions
...
- Also halved the size of the wake lines
- Updated tests to support the shorter team names
- Wake lines are now hidden with the other annotations
Tags: #story[23,21]
2017-03-24 20:56:52 +13:00
550ab59231
Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-13
2017-03-24 20:45:49 +13:00
213303d674
Merge branch 'create-wake-line'
2017-03-24 20:39:21 +13:00
74c81eb7b3
Removed a character that was accidentally inserted
2017-03-24 20:37:32 +13:00
c33586e7f5
Changed test to work with the new getHeading method, and removed an unused import that was causing tests to fail
...
- There was a com.sun import that we were no longer using that was causing issues
Tags: story[466]
2017-03-24 20:33:53 +13:00
5dd5e50738
Implemented wake lines
...
- Changed heading calculation in event class
- The boats now go to the marker, rather than the center of a gate
Tags: #story[466]
2017-03-24 20:27:17 +13:00
304f30ece6
Reformatted and refactored the fileparser to get xml from resource folder
...
#fix #refactor #story[377] #pair[xyi25, zyt10]
2017-03-24 12:55:11 +13:00
e8b1720fee
Created a toggle checkbox to show and hide all annotation
...
#story[477]
2017-03-24 12:15:39 +13:00
e0cea098c1
Merge remote-tracking branch 'origin/master'
2017-03-24 11:52:17 +13:00
50ab481b18
added knots beside boat name #story[447]
2017-03-24 11:51:07 +13:00
d39aacba83
RaceController now uses new parsers & deleted OldApp and OldFileParser
...
#story[377]
2017-03-24 11:34:34 +13:00
798fe4da0e
Changed FPS to 30
2017-03-24 11:15:46 +13:00
e19f110f19
Merge branch 'origin/addBoatPositionsInSideBar'
2017-03-24 11:06:03 +13:00
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
590ef557d3
fixed bugs from last commit and updated some tests #story[426]
2017-03-23 22:24:42 +13:00
7bc5c8f8a4
Merge remote-tracking branch 'refs/remotes/origin/master'
...
Conflicts:
src/main/java/seng302/controllers/CanvasController.java
src/main/java/seng302/models/Boat.java
2017-03-23 22:17:45 +13:00
bf8244ce49
tried to test BoatPositionController but as it's connected to the fxml I am unsure if it is possible to test (test code is commented out) #story[426]
2017-03-23 22:04:25 +13:00
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
bb8c681270
added a markpos value to event for use in displaying the team positions #story[426]
2017-03-23 21:19:39 +13:00
9872095e50
Merge branch 'boat-labels' into 'master'
...
Display team name and speed beside boat
- Also slowed down the AnimationTimer
- Removed the need to scale the canvas
Tags: #implement #story[18] #story[19]
See merge request !23
2017-03-23 18:06:31 +13:00
403aaa76ae
Display team name and speed beside boat
...
- Also slowed down the AnimationTimer
- Removed the need to scale the canvas
Tags: #implement #story[18] #story[19]
2017-03-23 18:04:00 +13:00
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
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
a91b2b4f7e
Merge branch 'create-race-timer' into 'master'
...
Create race timer
Created race timer controller
#implement #test #story[16]
See merge request !22
2017-03-23 14:20:25 +13:00
24f9607e5a
Added tests for the RaceTimerController #test #story[16]
2017-03-23 14:18:27 +13:00
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
42ffd1b1f8
Add rotated wind direction arrow to race view.
...
#story[422]
2017-03-23 01:10:07 +13:00
a2d06909c9
Finished config parser to read race info from external xml file
...
- created config parser unit test.
- modified config.xml file
- write unit test for config parser
#story[422]
2017-03-23 00:21:18 +13:00
c8b7b95df8
Merge branch 'finish-race-results' into 'master'
...
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]
See merge request !21
2017-03-22 22:42:05 +13:00
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
a41f2e4bde
Changed marks from circles to squares #fix
2017-03-22 15:10:57 +13:00
039e61def6
Fixed broken JavaFX file #fix
2017-03-22 14:50:28 +13:00
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
f46a98fad9
Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-13
2017-03-22 14:39:37 +13:00
6a6816dda1
Merge branch 'create-finish-display'
2017-03-22 14:31:06 +13:00
f6ea2953e9
Changed lat/long for gates to midpoint and added colours for the marks
...
Tags: #fix #implement #story[10,11]
2017-03-22 14:28:51 +13:00
7591a79323
Fixed course rotation #fix
2017-03-22 14:05:55 +13:00
c12760b70a
Inserted missing } #fix
2017-03-22 12:53:42 +13:00
a526b0d65a
Rotated map by 180 degrees #fix
2017-03-22 12:52:43 +13:00
ef098e63d7
Added finishing events #implement and rotated the map by 180 degrees#fix
2017-03-22 12:51:03 +13:00
29a0b23670
Reformatted double value lat and lon to final double VIEW_CORNER_LAT and VIEW_CORNER_LON
2017-03-22 12:03:46 +13:00
44b5b0b771
Added side pane to GUI and resize to 1280x960
...
#story[426]
2017-03-22 11:46:39 +13:00
00f9cc4698
Merge branch 'fix-boat-postions-and-keyframes' into 'master'
...
Fixed x and y coordinates #fix #story[9]
See merge request !19
2017-03-21 17:42:13 +13:00
3d4d5a3dab
Fixed x and y coordinates #fix #story[9]
2017-03-20 21:13:30 +13:00
ed577fad6a
adding files missed in previous commit
2017-03-20 17:58:40 +13:00
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
0e4bb0f942
Changed getMark to getThisMark. Added start point to KeyFrame. Race now starts from start point and ends at finish point
...
#story[377]
2017-03-20 17:34:24 +13:00
ee34e5028f
Reformatted and refactored the canvas controller
...
#fix #refactor #story[377]
2017-03-20 17:23:33 +13:00
Haoming Yin
Michael Rausch
zyt10
Peter