b6fd90e9d7
Updated .mailmap for Zhi You Tan's information
2017-04-24 18:33:06 +12:00
672194adb4
changed Peter Galloway's name to specified format
2017-04-23 19:04:45 +12:00
fdb84b6675
Update .mailmap for Haoming Yin's information.
2017-04-23 18:51:36 +12:00
dd480080c9
Updated .mailmap to have the correct username for Kusal Ekanayake.
2017-04-23 14:57:26 +12:00
9817fc9093
Fixed JavaDoc errors by adding missing @params
2017-04-04 19:29:05 +12:00
dde4b2fcba
gitlab ci test (passing)
2017-04-04 19:15:41 +12:00
623600a8a9
gitlab ci test (failing)
2017-04-04 19:15:01 +12:00
bff4986242
Gitlab CI Build Test
2017-04-04 19:10:01 +12:00
c689530068
Gitlab CI Build Test
2017-04-04 19:03:45 +12:00
7022be1979
Fixed unit test which failed due to the change of configure file.
...
#story[445]
2017-03-30 16:16:30 +13:00
971a3920a3
Fixed race timer to display real race time, and made race time scalable.
...
#story[445]
2017-03-30 16:12:01 +13:00
b252797e9b
Removed test case that failed when the config file was changed
2017-03-30 14:48:47 +13:00
c758afe3e3
Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-13
2017-03-30 14:46:22 +13:00
f8d3f53158
changed boat speed to a lower value
2017-03-30 14:45:33 +13:00
4a8672a20b
Updated race timer test to use new controller
...
Tags:story[455]
2017-03-30 14:44:57 +13:00
32109e8565
Merge branch 'controller-refacto' into origin/master
2017-03-29 15:03:38 +13:00
5d6060c690
Merge remote-tracking branch 'origin/master' into controller-refacto
2017-03-29 15:01:38 +13:00
a95d030817
Controllers and Fxml nicely refactored, tests still broken #story[463]
2017-03-29 14:59:37 +13:00
ffa84c6e87
Removed testNextColor for now as the test seems to be broken..
2017-03-29 13:28:49 +13:00
4a6978ff79
Fxml refactored, partway through refactoring controllers (app does not run) #story[463]
2017-03-29 12:58:49 +13:00
1497858cc0
Deleted the print exception stack statement to make terminal more tidy.
...
- the exception is aim to happen, so no need to print it out.
#story[377]
2017-03-28 19:38:57 +13:00
2c125d4ce0
Fixed test case for the boat heading #story[466]
2017-03-28 19:25:04 +13:00
8bf5455f42
Updated fxml and canvas controller to display a resizable canvas.
...
#story[377]
2017-03-27 17:05:49 +13:00
48f7e41905
Merge branch 'master' of /home/cosc/student/zyt10/Documents/[SENG302]/team-13 with conflicts.
2017-03-27 16:52:31 +13:00
b50ac62a4b
Merge branch 'add-fps-counter'
2017-03-27 16:47:34 +13:00
6fc55bb82c
Added toggle for fps #story[463]
2017-03-27 16:45:02 +13:00
65ac864bf2
added count for fps inside handle loop and displayed fps on the canvas #story[463]
2017-03-27 16:34:54 +13:00
cf6bbdd1f1
Fixed boat heading calculation method to get a correct direction
...
#story[480] #pair[hyi25, ptg19]
2017-03-27 14:29:03 +13:00
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
Zhi You Tan
Peter Galloway
Haoming Yin
Kusal Ekanayake
Michael Rausch