67bb7b81dcMerge remote-tracking branch 'origin/story68' into story68
hba56
2017-08-13 19:10:31 +1200
0d786f381bfix for boats finishing the race #story[1101]
hba56
2017-08-13 19:10:16 +1200
2acc36225eFix for placement of invis gates and checks that boats pass through these gates -see wiki on rounding #story[1101]
hba56
2017-08-13 18:11:53 +1200
820898d92cpushed work from school computer to do at home
Fan-Wu Yang
2017-08-13 16:02:33 +1200
f90648e4ceFixing a silly mistake where starboard side rounding checks for a port side rounding (Thank goodness for documenting manual tests) #story[1101]
hba56
2017-08-12 23:40:28 +1200
7c6f0931baTransferring files from my laptop to desktop to work on, may be broken.
Fan-Wu Yang
2017-08-12 23:18:54 +1200
a05ffd023dFixing a silly mistake where starboard side rounding checks for a port side rounding (Thank goodness for documenting manual tests) #story[1101]
hba56
2017-08-12 22:55:25 +1200
f386a4b989added checks for gates and moved second rounding check to be in line with the next mark to move towards #story[1101]
hba56
2017-08-12 22:27:27 +1200
fe91264aecfix for the tests #story[1101]
hba56
2017-08-12 21:10:31 +1200
89b0aa8b77Implemented MessageRouter. Added ConnectionToServerCommandFactory, and JoinSuccessfulCommand, RaceParticipantsFullCOmmand, ServerFullCommand. Added IncomingHeartBeatCommandFactory, and IncomingHeartBeatCommand. Added ConnectionToServerState, which represents the client's connection state to server. Renamed VisualiserInput to VisualiserRaceController. Added ConnectionToServer, which tracks the client's connection to server. Added ConnectionToServerController, which accepts JoinAcceptance messages, turns them into commands, and passes them to ConnectionToServer. Added IncomingHeartBeatService, which tracks the heart beat status of the connection. Added IncomingHeartBeatController, which accepts HeartBeat messages, turns them into commands, and passes them to IncomingHeartBeatService. Refactored ServerConnection a bit. #story[1095]
fjc40
2017-08-12 19:58:47 +1200
a31eb078a6Created a splash screen for application.
zwu18
2017-08-12 16:27:12 +1200
d70a711a3dMerge branch 'master' into story68 -updated port and starboard boat checks -added gps method to check if on correct side of a line -updated pos check method to make boats round marks with the new tech
hba56
2017-08-12 03:26:28 +1200
499a409d4fMerge branch 'master' into story68 -updated port and starboard boat checks -added gps method to check if on correct side of a line -updated pos check method to make boats round marks with the new tech
hba56
2017-08-12 03:24:20 +1200
848edfc6a4Removed commented out code. Merged master in.
zwu18
2017-08-12 03:20:21 +1200
c3ea62dfeeMerge branch 'master' into CommandFactory
zwu18
2017-08-12 03:18:24 +1200
9c902dab46Added javadoc to classes.
zwu18
2017-08-12 02:11:23 +1200
6e5fb62880Added REQUEST_RECEIVED and DECLINED to ConnnectionStateEnum. #story[1095]
fjc40
2017-08-12 01:05:45 +1200
41b0a5d7f7Merge branch 'story_61' of eng-git.canterbury.ac.nz:seng302-2017/team-7 into story_61
fjc40
2017-08-11 22:38:55 +1200
b625b6ab05XMLReader.readXMLFileToString no longer throws a Transformer exception.
fjc40
2017-08-11 22:38:39 +1200
e4b72fdfebUpdate appearance on client arrow.
zwu18
2017-08-11 20:38:54 +1200
7474de9816Created foundation classes and interfaces for collision architecture. - Added Collider interface - Added Collision class - Added ColliderRegistry class
Connor Taylor-Brown
2017-08-11 14:05:36 +1200
39b5cc2edcMockBoat has autoVMG disabled by default. Wind/Tack commands disable autoVMG. VMG command enables it. Upwind command was turning until boat was at 0 degrees, instead of being aligned with wind direction, but that's fixed. #story[1096]
fjc40
2017-08-10 12:44:42 +1200
1a7152f54eBoats stop when the sails are out. Merged dev. #story[1098]
Joseph Gardner
2017-08-10 12:32:05 +1200
4da3734804added the ability to toggle the race guide line on and off #story[1087]
hba56
2017-08-10 12:17:19 +1200
7cc39abe57WIP. Probably need to cherry pick stuff out of here. Added ClientConnection and server-side handshake. Added MessageSerialiser and Deserialiser. #story[1095]
fjc40
2017-08-10 12:13:40 +1200
1302769a50Merge branch 'Development' into story_64_sails
Joseph Gardner
2017-08-10 11:56:09 +1200
e23f20753dMerged master. Added commands for sails in and out. Added logic to stop boat from moving when sails are out. Testing if the boat stops with sails out is blocked until command factory is merged. #story[1098]
Joseph
2017-08-10 09:42:59 +1200
41d09f587eMerge branch 'master' into story_64_sails
Joseph
2017-08-10 08:58:43 +1200
74f04a13f8Merge remote-tracking branch 'origin/Development' into Development
hba56
2017-08-09 23:27:04 +1200
e53d72f24bcompound marks now can give the mark they have that needs to be rounded this is used to draw the line around the correct mark #story[1101]
hba56
2017-08-09 23:25:42 +1200
da9915174cMerge branch 'master' into Development
Connor Taylor-Brown
2017-08-09 23:05:07 +1200
3cf0cf2ee0Merge branch 'master' into story63
Connor Taylor-Brown
2017-08-09 22:56:55 +1200
638413da1aMerge remote-tracking branch 'remotes/origin/story63' into Development
Connor Taylor-Brown
2017-08-09 22:46:26 +1200
ce973fecfeSails are displayed correctly for all wind and active boat directions.
Jessica Syder
2017-08-09 21:48:17 +1200
03713d3699Added checkPosition into MockRace which was removed. Boat now updates legs again.
zwu18
2017-08-09 16:37:29 +1200
e021dd328dChanged CompositeCommand stack to queue
Connor Taylor-Brown
2017-08-08 23:56:59 +1200
e2605c3c7cMerge remote-tracking branch 'remotes/origin/story68' into Development
hba56
2017-08-08 23:29:57 +1200
bb75806781Cleaned up line to be in a shippable shape #story[1101]
hba56
2017-08-08 23:23:46 +1200
3ec87582d3Merge remote-tracking branch 'origin/master' into story_61
fjc40
2017-08-08 20:58:53 +1200
568458aca4Merge branch 'story48' into 'master'
David Wu
2017-08-08 20:50:41 +1200
22722286efall paths now join up #story[1087]
hba56
2017-08-08 14:47:11 +1200
53c9192130Merge branch 'CommandFactory' into Development
zwu18
2017-08-08 02:52:29 +1200
ef3f468b19arrows displayed for each leg #story[1101]
hba56
2017-08-08 00:02:07 +1200
ace1252c1dFixed sails so they behave correctly
Jessica Syder
2017-08-07 17:40:21 +1200
2920b6cf23Removed build-breaking code from MockRace
cbt24
2017-08-07 16:47:25 +1200
a460df3e4dFixed Javadocs that were causing the build to fail. #story[1096]
Fan-Wu Yang
2017-08-07 16:30:06 +1200
0f9b191ccbAdded doc strings to RaceXML Creator #story[1096]
Fan-Wu Yang
2017-08-07 16:13:15 +1200
8ee4e84236Merge remote-tracking branch 'remotes/origin/story63' into Development
Connor Taylor-Brown
2017-08-07 15:02:13 +1200
f6cdf66bfeSails can be toggled on the visualiser and the rotate sails button rotates the sail visually. #story[1098]
Joseph Gardner
2017-08-07 15:01:16 +1200
dad4fa57c6Fixed WindCommand not updating downwind command when moving upwind.
Connor Taylor-Brown
2017-08-07 14:51:32 +1200
55798447abCherry-picked CommandFactory connection between ControllerServer and RaceLogic.
Connor Taylor-Brown
2017-08-07 14:25:30 +1200
e76de1cbf9Added test for WindCommand
Connor Taylor-Brown
2017-08-07 14:13:14 +1200
634d78ab70Added names to threads created. MockOutput had a nested while loop, but it wasn't needed. Also tidied some of the error handling in MockOutput.
fjc40
2017-08-07 13:42:50 +1200
62752c142abuilding blocks for drawing the race line around the course #story[1087]
hba56
2017-08-07 12:47:55 +1200
747c31b948Merge remote-tracking branch 'remotes/origin/story68' into Development
hba56
2017-08-07 12:29:56 +1200
7c5670f8c2Sails are displayed on first boat in a race. Optimised imports.
Jessica Syder
2017-08-07 12:20:52 +1200
950a801d16rounding fix for the xml #story[1087]
hba56
2017-08-07 12:16:37 +1200
0bf2c6106bBoat updating speed after key press has been fixed. #fix #story[1094]
Joseph Gardner
2017-08-07 12:03:34 +1200
ddaa2623caAdded tests for TackGybeCommand class.
zwu18
2017-08-07 02:56:24 +1200
fef35d0b00The race is rotated with it's initial rotation in mind - RaceXMLCreator now checks the bearing of the race with getLineAngle() - Split some methods into functions so that it is more readable #story[1096]
Fan-Wu Yang
2017-08-07 02:37:05 +1200
2ce1c0786eThe course points can now be rotated, - Created markToGPSCoordinate Class - Added Rotation to marks #story[1092]
Fan-Wu Yang
2017-08-07 02:01:41 +1200
134586f407The message encoders and decoders now catch exceptions, and throw InvalidMessageException. Removed the big switch statement from BinaryMessageDecoder - it now uses the decoder factory instead. issue #35#36 #story[1095]
fjc40
2017-08-06 22:25:43 +1200
9c64b678e3Added MarkRoundingEncoder. Refactored MarkRoundingDecoder - it now implements MessageDecoder. Tidied up MarkRounding - it is now documented and has getters. Also Created MarkRoundingBoatStatusEnum, MarkRoundingIDEnum, MarkRoundingSideEnum, MarkRoundingTypeEnum. Added MarkRoundingDecoderTest. issue #35#36 #story[1095]
fjc40
2017-08-06 21:38:12 +1200
da800e659aAdded AverageWindEncoder. Refactored AverageWindDecoder - it now implements MessageDecoder. Refactored AverageWind - it now uses milliseconds and knots, instead of packed MMperSec and tenths of a second. It also exposes its attributes now. Added (un)packAverageWindPeriod to AC35UnitConverter. Added AverageWindDecoderTest. issue #35#36 #story[1095]
fjc40
2017-08-06 20:31:21 +1200
ce63f58429Added RaceStartStatusEncoder. Added RaceStartTypeEnum. Refactored RaceStartStatusDecoder to implement the MessageDecoder interface. Documented RaceStartStatus, and it actually exposes its properties now. Updated RaceStartStatusDecoderTest. issue #35#36 #story[1095]
fjc40
2017-08-06 19:36:21 +1200
750ea5c141Added MessageDecoder interface. All decoder implement this. Added DecoderFactory. This creates an appropriate decoder based on a MessageType. BoatActionDecoder implements MessageDecoder. BoatLocationDecoder implements MessageDecoder. HeartBeatDecoder implements MessageDecoder. JoinAcceptance implements MessageDecoder. RaceStatusDecoder implements MessageDecoder. RequestToJoinDecoder implements MessageDecoder. XMLMessageDecoder implements MessageDecoder. Refactored CourseWind decoder/encoder. CourseWind decoder/encoder is for an individual CourseWind. CourseWinds decoder/encoder is for the combined message from the API. Documented BoatAction, and it now contains a BoatActionEnum instead of a byte. Refactored CourseWind and CourseWinds classes. They now expose correct units, instead of packed units. Added CourseWindDecoderTest, and updated CourseWindsDecoderTest. issue #35#36 #story[1095]
fjc40
2017-08-06 18:51:13 +1200
a388989827Reworked TackGybeCommand. Current boat in race will now tack and gybe when control is pressed.
zwu18
2017-08-06 16:38:44 +1200
1fbdd09d70Refactored BoatLocation message, encoders, decoders. It now exposes datatypes that we actually use in the program (double knots, bearings, etc..), instead of the bits-on-the-wire packed units (like int mmPerSec). Also documented it, and updated test. issue #35#36 #story[1095]
fjc40
2017-08-06 16:13:25 +1200
18f14c7542VMGCommand now toggles autoVMG on and off. Linked up observer and observable so the current boat can now be controlled. Fixed autoVMG not working.
zwu18
2017-08-06 16:12:53 +1200
ff262a6227Added Knots <-> MMperSec conversions to AC35UnitConverter. Removed redundant/unused conversions. Documented all of the conversions, and renamed them to pack/unpackX, to match the API spec. Updated/added some tests in AC35UnitConverterTest. RaceStatus now contains a Bearing instead of a packed int bearing. RaceStatus now contains wind speed in knots, instead of MMperSec packed. This means that only RaceStatus decoder/encoder need to care about the bits-over-wire packed values. issue #35#36 #story[1095]
fjc40
2017-08-06 14:57:51 +1200
dab0f2b402Merge branch 'story63' into CommandFactory
zwu18
2017-08-06 14:54:21 +1200
074e2e590bVMGCommand now toggles autoVMG on and off. Linked up observer and observable so the current boat can now be controlled.
zwu18
2017-08-06 14:48:46 +1200
a0f98eadaaAdded some documentation to BoatStatus. issue #35#36 #story[1095]
fjc40
2017-08-06 13:57:09 +1200
3d417c3a40Merge branch 'story63' into CommandFactory
zwu18
2017-08-06 13:48:41 +1200
b1922fc3fcAdded RaceStatusEncoder. Refactored RaceStatusDecoder to be more consistent with other decoders - it now has a getMessage() function. Added BoatStatus encoder and decoder - the RaceStatus encoder and decoder uses this for BoatStatuses. The BoatStatus encoder doesn't implement the MessageEncoder interface as BoatStatus is not a proper message type (doesn't inherit from AC35Data). Added remaining cases to EncoderFactory, but commented them out. BoatStatus now uses BoatStatusEnum instead of a byte. Added some comments to RaceStatus, and it uses enums instead of bytes. MockOutput logs a warning if a RaceStatus cannot be encoded. Added a BoatStatusDecoderTest. Updated RaceStatusDecoder to use new encoders/decoders. issue #35#36 #story[1095]
fjc40
2017-08-06 13:38:27 +1200
e464ee298ejavadoc fixes for some warnings.
fjc40
2017-08-06 01:08:47 +1200
b486f99dbeAdded XMLMessageEncoder. Refactored XMLMessageDecoder to be consistent with other decoders - only needs to expose the XMLMessage. Refactored BoatLocationDecoder to be consistent with other decoders - only needs to expose the BoatLocation. Updated XMLMessageDecoderTest to use new encoder/decoder. Also tests all three message types. Removed XMLMessageEncoderTest as it was redundant. Updated BinaryMessageDecoderTest.xmlMessageTest() to use updated XMLMessage encoder/decoder. issue #35#36 #story[1095]
fjc40
2017-08-06 01:01:05 +1200
8ef906472bRenamed Heartbeat to HeartBeat. Added HeartBeatDecoder. Added HeartBeatEncoder. BinaryMessageDecoder now uses HeartBeatDecoder. MockOutput now logs a warning if a heartBeat cannot be encoded. Added HeartBeatDecoderTest. issue #35#36 #story[1095]
fjc40
2017-08-05 23:27:28 +1200
c3ed30019cAdded BoatLocationEncoder. Updated BoatLocationDecoder test to use new encoder. Updated MockOutput to use new encoder. It logs a warning if encoding fails.
fjc40
2017-08-05 22:11:54 +1200
31ce9fff94Added BoatActonEncoder. Updated ControllerClient to use RaceVisionByteEncoder.encode(message). It also logs a warning if the encoding fails. Also removed pointless and out of place encode/decode of the action enum. Added a BoatActionDecoderTest which tests encoding/decoding a BoatAction Message. issue #35#36 #story[1095]
fjc40
2017-08-05 21:53:54 +1200
16686678a7Added an InvalidMessageTypeException - thrown whenever we encounter a MessageType that isn't recognised or isn't supported. Added EncoderFactory. This creates specific MessageEncoders. Supports JoinAcceptance and RequestToJoin. Added MessageEncoder interface. Added JoinAcceptanceEncoder. Added encode(AC35Data) function to RaceVisionByteEncoder. Added RequestToJonEncoder. Updated RequestToJoin and JoinAcceptance decode/encode tests to use the above.
fjc40
2017-08-05 21:31:47 +1200
7ea5b31fa1RequestToJoinEnum contains an int instead of a byte. Added requestToJoin and joinAcceptance encoding functions to RaceVisionByteEncoder. Implemented JoinAcceptanceDecoder. Implemented RequestToJoinDecoder. Added tests for encoding/decoding RequestToJoin and JoinAcceptance messages.
fjc40
2017-08-05 20:42:25 +1200
Fan-Wu Yang 2017-08-13 22:16:16 +1200
hba56 2017-08-13 19:33:46 +1200
Jessica Syder 2017-08-13 16:08:14 +1200
fjc40 2017-08-12 19:58:47 +1200
zwu18 2017-08-12 16:27:12 +1200
Connor Taylor-Brown 2017-08-11 14:05:36 +1200
Joseph Gardner 2017-08-10 13:25:57 +1200