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
d10c6a54f5
Added and fixed docstrings
...
Tags: #docs
2017-03-08 22:53:22 +13:00
0a86dde7e4
Fixed docstrings
...
Tags: #docs
2017-03-08 22:31:05 +13:00
ae80b434f6
Added and fixed docstrings
...
Tags #docs
2017-03-08 22:25:52 +13:00
2d7ee975af
Added docstrings for Marker class
...
Tags: #docs
2017-03-08 14:56:28 +13:00
b0cd7c8c08
Reformatted doctring and import statements
2017-03-08 14:45:06 +13:00
27f9776de8
Fixed typo
...
Tags #fix
2017-03-08 14:28:51 +13:00
245fbc75c2
Fixed file parser test
2017-03-08 14:25:41 +13:00
0efb18b04d
Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-13
2017-03-08 14:20:38 +13:00
05a2c441b3
Merge branch 'fix-headings'
2017-03-08 14:20:10 +13:00
16b58dcbaf
Fixed conflict
2017-03-08 14:19:54 +13:00
0ab2e7881f
Fixed fileParser in order to read time scale in decimal
...
- json-simple can read either long or double. Updated getScaleTime to make it capable to read a decimal number.
#fix #story[5]
2017-03-08 14:13:23 +13:00
92556fffca
Fixed incorrect headings and velocity display location
...
- Velocity is now shown in the list of starting boats #fix
- Headings have been corrected
Tags: #fix
2017-03-08 14:11:09 +13:00
2adf39ee43
Merge remote-tracking branch 'origin/master'
2017-03-08 13:33:22 +13:00
2b464d16f9
Fixed some bugs
...
/#pair[hyi25, mra106]
2017-03-08 13:31:44 +13:00
4a0776fcda
Merge branch 'add-speed-to-starting-list' into 'master'
...
Moved boat velocity to starting list
Tags: #fix
See merge request !12
2017-03-08 13:29:13 +13:00
bc6762d2dd
Moved boat velocity to starting list
...
Tags: #fix
2017-03-08 13:28:00 +13:00
88167773dd
Merge branch 'story-7' into 'master'
...
Race events now display the boats heading and direction
- The boats velocity is being read from the config file
- The event text is now being printed when the leg starts #fix
Tags: #story[7] #implement
See merge request !11
2017-03-08 12:34:27 +13:00
ab1445f1c2
Race events now display the boats heading and direction
...
- The boats velocity is being read from the config file
- The event text is now being printed when the leg starts #fix
Tags: #story[7] #implement
2017-03-08 12:31:31 +13:00
76faa53222
Merge branch 'calculate-time' into 'master'
...
Calculate time
See merge request !10
2017-03-07 21:33:12 +13:00
Haoming Yin
Michael Rausch
Ryan Tan
Peter