3a72409fb8
Merge remote-tracking branch 'origin/develop' into develop
2017-05-02 21:50:30 +12:00
b3a89279d6
Quick change to stop adding course markers as they are dynamic and add them in the previous way
2017-05-02 21:31:38 +12:00
4432ba26e5
Merge remote-tracking branch 'origin/develop' into develop
2017-05-02 21:12:22 +12:00
fe824a8f71
Finished implementing drawing of border from XML
...
Border is drawn onto canvas, it is static.
#story[469]
2017-05-02 21:05:53 +12:00
fd092bb7e1
Merge remote-tracking branch 'origin/develop' into develop
...
# Conflicts:
# src/main/java/seng302/App.java
2017-05-02 16:41:49 +12:00
9c60521d00
Merge branch 'develop' of C:\Users\CJIRWIN\Documents\team-13 with conflicts.
2017-05-02 16:41:40 +12:00
a4dfcca302
Fixed a boat bearing bug.
...
- server should send LastPastCorner's heading bearing, instead of headingCorner's bearing
#story[715]
2017-05-02 14:51:44 +12:00
178af141f0
Refactoring and documentation
...
#story[820]
2017-05-02 14:08:25 +12:00
c5c2d4375d
Changed the canvas controller to read marks from the XML as received from the server (PROTOTYPE)
...
Gates appear to draw in the correct places although a bit jittery for some reason
Boundary marks are a bit sporadic and still need lines drawn in between
Large refactor of canvas controller and XMLParser still required if these two are going to work together well. Currently canvas controller is a bit of a mess.
#story[469]
2017-05-01 23:10:15 +12:00
3aa183042f
Merge remote-tracking branch 'origin/wake_remake' into wake_remake
2017-05-01 22:00:15 +12:00
944755fde1
Merge branch 'wake_remake' of /home/cosc/student/wmu16/Documents/300/SENG302/team-13 with conflicts.
2017-05-01 22:00:12 +12:00
cd78c35bf6
Merge remote-tracking branch 'origin/wake_remake' into wake_remake
2017-05-01 20:37:58 +12:00
f8d003002b
fixing error from merge #story[820]
2017-05-01 20:37:46 +12:00
56fab768f3
fixing error from merge #story[820]
2017-05-01 20:37:26 +12:00
c92744f21c
Merge branch 'wake_remake' into develop
2017-05-01 20:35:15 +12:00
1f71fd1967
Merge branch 'wake_remake' into Story30b_correcting_boat_movement
...
# Conflicts:
# src/main/java/seng302/App.java
# src/main/java/seng302/controllers/CanvasController.java
# src/main/java/seng302/models/BoatGroup.java
# src/main/java/seng302/models/RaceObject.java
# src/main/java/seng302/models/mark/MarkGroup.java
# src/main/java/seng302/models/parsers/StreamParser.java
2017-05-01 20:33:09 +12:00
33ae7beeb4
merging with wake remake #story[820]
2017-05-01 20:09:51 +12:00
130efa3a51
Merge branch 'wake_remake' into Story30b_correcting_boat_movement
...
# Conflicts:
# src/main/java/seng302/controllers/CanvasController.java
# src/main/java/seng302/models/BoatGroup.java
# src/main/java/seng302/models/parsers/StreamParser.java
2017-05-01 19:09:09 +12:00
7df55fc1a3
problems appear to be fixed and the boats are updating properly from the timeValid field of the boat location. #story[820]
2017-05-01 18:55:21 +12:00
3adadcc1e1
Updated the timer to show two decimals for the seconds.
...
#story[572]
2017-05-01 18:49:58 +12:00
5b027a29d8
Merge remote-tracking branch 'origin/wake_remake' into wake_remake
2017-05-01 18:35:56 +12:00
2a9d0fb82c
Removed 2 bad import statements that halted the build form building.
2017-05-01 18:35:48 +12:00
ee6a543f8d
Fixed timer separator instead of dot to semicolon, and fixed the timer position in race canvas, and updated the start screen so it does not grow vertically
...
#story[572]
2017-05-01 18:35:17 +12:00
d927531354
Removed broken time extracting method and replaced it with currently existing long extractor. Added speed to the setDestination method for the raceObject abstract class.
...
#story[820]
2017-05-01 18:22:08 +12:00
1d47df09eb
Merge branch 'merge_branch_front' into wake_remake
...
# Conflicts:
# src/main/java/seng302/App.java
2017-05-01 17:46:16 +12:00
a9709c4f84
Merged the mock server to visualisation.
...
#story[715] #story[716]
2017-05-01 17:42:07 +12:00
a06806c42d
Merge remote-tracking branch 'origin/wake_remake' into wake_remake
2017-05-01 17:35:51 +12:00
57de058582
Began figuring out how to implement XML data in place of mock data.
...
#story[820] #pair[ajm412, wmu16]
2017-05-01 17:35:39 +12:00
978493853d
Merge branch 'Story29' into merge_branch_front
...
# Conflicts:
# src/main/java/seng302/App.java
# src/main/java/seng302/controllers/CanvasController.java
# src/main/java/seng302/controllers/Controller.java
# src/main/java/seng302/controllers/RaceViewController.java
# src/main/java/seng302/models/Boat.java
# src/main/java/seng302/models/Colors.java
# src/main/java/seng302/models/Event.java
# src/main/java/seng302/models/Race.java
# src/main/java/seng302/models/mark/GateMark.java
# src/main/java/seng302/models/mark/Mark.java
# src/main/java/seng302/models/mark/MarkType.java
# src/main/java/seng302/models/mark/SingleMark.java
# src/main/java/seng302/models/parsers/CourseParser.java
# src/main/java/seng302/models/parsers/TeamsParser.java
# src/main/resources/views/MainView.fxml
# src/main/resources/views/RaceView.fxml
# src/test/java/seng302/BoatTest.java
# src/test/java/seng302/ColorsTest.java
# src/test/java/seng302/EventTest.java
# src/test/java/seng302/models/mark/MarkTest.java
# src/test/java/seng302/models/parsers/CourseParserTest.java
2017-05-01 17:06:17 +12:00
a5ca9218da
Discovered the time valid timestamp in the boat location packet is quite inconsistent and either the stream or my implementation is making the display really buggy. Because the way it was before I changed things is more reliable at the moment, I have decided to wait until our mock stream is merged before continuing this development. #story[820]
2017-05-01 16:56:53 +12:00
5fe330bfbb
Boat trials and wakes now work with both fast and slow data sets.
...
Instead of fixed, hard coded thresholds and scale factors dynamically changing values
that scale with the onscreen movement are used to determine how graphical objects
are drawn.
#implement #story[816]
2017-05-01 16:41:58 +12:00
c80cff87f7
Updated import statements after merge
2017-05-01 16:02:09 +12:00
9a864cc2bd
Merge remote-tracking branch 'origin/Mark_to_MarkGroup' into wake_remake
...
# Conflicts:
# src/main/java/seng302/App.java
# src/main/java/seng302/controllers/Controller.java
# src/main/java/seng302/models/BoatGroup.java
# src/main/java/seng302/models/Wake.java
# src/main/java/seng302/models/parsers/StreamParser.java
# src/main/resources/views/MainView.fxml
2017-05-01 15:59:14 +12:00
c07f13180f
Merged Story 30b branch into 30c branch
...
#story[820]
2017-05-01 15:32:23 +12:00
f672eafd6d
Merge remote-tracking branch 'origin/Story30A_InputStreamCheckingHead' into wake_remake
...
# Conflicts:
# src/main/java/seng302/models/parsers/StreamPacket.java
# src/main/java/seng302/models/parsers/StreamParser.java
# src/main/java/seng302/models/parsers/StreamReceiver.java
2017-05-01 15:27:51 +12:00
6a361c0d4b
Documented some RaceObject classes.
...
#documentation
2017-05-01 14:30:41 +12:00
b597f010dc
Added some missing fields. Added missing getters.
...
#story[820]
2017-05-01 00:36:10 +12:00
a670f677e9
Added other email to .mailmap
2017-05-01 00:10:07 +12:00
50083a9297
Added tests for reverse and intToBytes
...
#story[829]
2017-04-30 23:54:32 +12:00
d5aa430d4a
Fixed a method that was converting the timestamp bytes incorrectly
...
- If an argument is passed to the application, it will use the internal mock server
Tags: #story[820]
2017-04-30 23:41:21 +12:00
e7f9954970
Removed unneeded files, also fixed heading calculation
...
Tags #story[829]
2017-04-30 23:29:15 +12:00
ec57851de2
Created annotation slider to display different levels of annotations
...
Removed toggleAnnotations method as abstract from race object and made only for boat group as it didnt make sense for markgroup, at least not currently as they have no annotations to show
#story[558]
2017-04-30 23:24:24 +12:00
0eb767b615
Finished tweaking wakes. Made marker movement smooth.
...
#implement #story[818]
2017-04-30 22:34:49 +12:00
45b77c05d4
Improvements to wake
2017-04-30 19:32:29 +12:00
b9900925b8
Fixing wakes, bug caused by attempting to fix a issue with jittery boats actually caused by parser.
...
#bug
2017-04-30 19:00:07 +12:00
d94290c58d
Merge branch 'Mark_to_MarkGroup' of https://eng-git.canterbury.ac.nz/seng302-2017/team-13 into Mark_to_MarkGroup
2017-04-30 18:15:24 +12:00
f50aabff7b
Documentation added to graphics classes.
...
#document
2017-04-30 18:15:16 +12:00
d07c660eb9
Merge remote-tracking branch 'origin/Story29' into Story29
2017-04-30 17:47:05 +12:00
6491efec4c
Fixed race status sent in race status messages
...
#story[829]
2017-04-30 17:46:56 +12:00
25038da2a1
Created BoatsParser.java to parse boats from server boat.xml and created a table on the start screen to display all the teams from server
...
#story[572]
2017-04-30 17:17:47 +12:00
cir27
William Muir
Haoming Yin
Kusal Ekanayake
Peter
Zhi You Tan
Alistair McIntyre
alistairjmcintyre
Michael Rausch
Michael Rausch