7f40fb6283
Fixed bug left in last commit
2017-05-04 11:00:57 +12:00
83316f7a17
Merge branch 'develop' of https://eng-git.canterbury.ac.nz/seng302-2017/team-13 into develop
...
# Conflicts:
# src/main/java/seng302/App.java
# src/main/java/seng302/controllers/Controller.java
2017-05-04 10:48:06 +12:00
a56e55ae70
Fix for some movement on racestart issues
...
#bug
2017-05-04 10:38:04 +12:00
07234ee33a
Updated start screen team list to show position in race. Created Yacht class to replace Boat class. Removed Boat class from XMLParser. Removed unused BoatParser.java.
...
#story[572]
2017-05-04 04:16:16 +12:00
145d59df45
Removed unused imports
2017-05-04 01:18:41 +12:00
7e8c3af9ce
Removed extra 'minutes' labels
2017-05-04 01:08:18 +12:00
aa6ef72670
Merge remote-tracking branch 'origin/develop' into develop
2017-05-03 23:27:35 +12:00
ed8781b382
Added method to check if a boat is finished the race or not.
...
- updated server if all boats finish the race, then start sending race finished message.
- race simulator will terminate if all boats finish the race, and prints log.
#story[715]
2017-05-03 22:44:25 +12:00
7a5f4e8f8c
Removed minutes label from timestamp
...
Tags: #story[820]
2017-05-03 22:16:03 +12:00
d992422efd
Various bug fixes
...
- Made canvas fill entire screen
- Made window scale to screens that aren't 1920x1080
- Changed boat speeds in mock so they aren't too fast
- Added command line options to switch server
Tags: #story[829]
2017-05-03 21:56:51 +12:00
f0d6312fa5
Fix bugs that server doesn't send boat location before and after the race.
...
- server will sends boat location not only during the race, but also before the race and after all boats have finished the race.
- refactored simulator so that it runs at the begining to send boat location, and if its "isStarted" set to true, then it starts moving the boats.
#story[715]
2017-05-02 22:51:35 +12:00
772ece25a0
Implemented real time race clock on the start screen using data from stream.
...
#story[594]
2017-05-02 22:39:33 +12:00
d063a41ad4
Merge remote-tracking branch 'origin/wake_remake' into develop
...
# Conflicts:
# src/main/java/seng302/App.java
2017-05-02 22:09:03 +12:00
6d02f05f05
Quick change to stop adding course markers as they are dynamic and add them in the previous way
2017-05-02 21:51:04 +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
8233b75e05
Fixed the start screen team list after merging. Team list shows boats competing in event again.
...
#story[572]
2017-05-02 18:52:31 +12:00
3af15b2b95
Updated wind direction on race view controller so it responds to the stream.
...
#story[818]
2017-05-02 18:02:44 +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
04ce6f6103
Removed white behind fps counter
2017-05-02 14:18:40 +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
Calum
Zhi You Tan
Michael Rausch
Haoming Yin
William Muir
Kusal Ekanayake
Peter
Alistair McIntyre