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
3b8dd11758
Added drawBoats for use in animation timer, also fixed gate marks only drawing one mark #story[378]
2017-03-20 16:11:04 +13:00
cc04e2dd6d
Fixed boat colour, was in the wrong constructor
...
#story[377]
2017-03-20 16:03:07 +13:00
b88cf6a101
Merge branch 'refactor-file-parser'
2017-03-18 21:38:38 +13:00
d10985f890
Finished team parser to read team info from external xml file
...
- created team parser unit test
- refactored team parser functions
#fix #refactor #implement
2017-03-18 21:32:12 +13:00
c08504293b
Created canvas and race controllers to display boats on canvas and modified marks and parsers to support them.
...
#story[377] #pair[zyt10, ptg19]
2017-03-17 18:21:11 +13:00
4bc49da10d
Merge remote-tracking branch 'origin/master'
2017-03-17 16:18:24 +13:00
683f4ba94e
Mostly got boats going to marks on the canvas (code currently broken) #story[377] #pair[zyt10, ptg19]
2017-03-17 16:18:01 +13:00
8fd06c84ac
Merged the refactored mark related class with course parser.
...
#fix #refactor #story[9] #story[10] #story[11]
2017-03-17 15:56:37 +13:00
23b163e6c1
Merge branch 'master' into refactor-file-parser
...
# Conflicts:
# src/main/java/seng302/models/GateMark.java
2017-03-17 15:44:16 +13:00
6383b9a6f8
Deleted the old Mark and GateMark files
2017-03-17 15:26:38 +13:00
0b3ebf229f
Refactor mark related classes.
...
- Mark is an abstract class which containing its name and type
- Single Mark is a sub class of Mark which containing only one GPS location
- Gate Mark is a sub class of Mark which containing two Single Marks
#refactor #fix #story[10] #story[11] #story[12]
2017-03-17 15:21:04 +13:00
d6fe155d4d
Changed distance calculation to use latitude and longitude
...
Tags: #fix
2017-03-17 11:08:35 +13:00
8829728f19
Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-13
2017-03-17 10:27:04 +13:00
a6c9156ae5
Changed Main-Class in pom.xml to our new main class
...
Tags: #fix
2017-03-17 10:26:09 +13:00
121f996a43
created config, teams xml file, and teamsParser class
...
#implement
2017-03-17 01:04:10 +13:00
44d4f25413
Implemented Color Enum & boat will call function from enum to get next color. Using static colour cycling for now.
...
#story[377]
2017-03-17 00:57:50 +13:00
16abfcffda
Created course parser as a subclass of file parser
...
- refactored file parser as an abstract class
- created course parser to parse course xml file
#implement #fix #refactor #story[9] #story[10]
2017-03-17 00:54:43 +13:00
e7ba9d962d
Deleted and modified previous sprint parser to cater the sprint2’s new requirement
...
- also added new method for GateMark
#story[9] #story[10] #fix
2017-03-17 00:53:08 +13:00
b7631c0b46
Create unit test for course parser, and modified course xml file
...
#implement #fix #story[10] #story[9]
2017-03-17 00:51:16 +13:00
0039703f03
Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-13
2017-03-16 20:50:41 +13:00
d439c9673f
removed intellij files #chore
2017-03-16 20:50:27 +13:00
f255b0ea6d
Add intellij file type to .gitignore.
2017-03-16 20:47:55 +13:00
9d01ed8eb3
Merge branch 'refactor-events-to-update-boat-positions' into 'master'
...
Removed Legs from the race, using coordinates instead
Tags: #implement #refactor #test #story[9]
See merge request !17
2017-03-16 20:30:48 +13:00
94e4e853c3
Removed Legs from the race, using coordinates instead
...
Tags: #implement #refactor #test #story[9]
2017-03-16 20:29:17 +13:00
ffa39e6a9c
Changed size of canvas to 720 x 360
...
#story[377]
2017-03-16 17:40:31 +13:00
9e4ae60885
Added a function to draw boat on canvas
...
#story[377]
2017-03-16 17:25:17 +13:00
2cd4366d07
added course xml file #story[378]
2017-03-16 17:15:45 +13:00
11c5e1e9ba
Added gate mark and refactored marker to mark #story[378]
2017-03-16 16:11:48 +13:00
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
9ca5f5e7fd
Updated design decision file in doc.
2017-03-09 16:22:40 +13:00
abc5df7837
Added unit for boat velocity
...
#fix #story[6]
2017-03-09 15:00:48 +13:00
debe2c0cca
Fixed documentation for FileParserTest and LegTest
...
#document #fix
2017-03-09 14:52:13 +13:00
cfa851b968
Added user manual
...
Tags: #docs
2017-03-09 12:54:37 +13:00
37f4b55b04
Merge branch 'read_config_from_args' into 'master'
...
Added ability to pass the config file as a command line argument
Tags: #implement
See merge request !16
2017-03-09 12:42:53 +13:00
c1aa38c1b0
Added ability to pass the config file as a command line argument
...
Tags: #implement
2017-03-09 12:41:44 +13:00
260bf06219
Merge branch 'make-tests' into 'master'
...
Added tests
Tags: #test
See merge request !15
2017-03-09 12:23:23 +13:00
8d85557e10
Added tests
...
Tags: #test
2017-03-09 12:22:38 +13:00
d33a88d313
Added docstrings to classes
...
Tags: #docs
2017-03-08 23:02:45 +13:00
d3b71c21e5
Merge branch 'format-and-doc'
2017-03-08 22:57:59 +13:00
Michael Rausch
zyt10
Peter
Haoming Yin
Ryan Tan