323 Commits (df03cc5a6677cc248fc65990489f461768479416)

Author SHA1 Message Date
cbt24 9ca50aa66c Ray casting now only supports distance specification.
8 years ago
cbt24 7d64a43350 Allow collision checking to provide collision parameters to ray casting method
8 years ago
cbt24 2fbb96afd7 Created ray casting methods for MockBoat and CompoundMark
8 years ago
cbt24 da52082d70 Deleted duplicate method (again -.-)
8 years ago
Connor Taylor-Brown 847cd1251e Merge remote-tracking branch 'remotes/origin/master' into CommandFactory
8 years ago
Connor Taylor-Brown b97bfe62a6 Fixed documentation bugs not relevant to story.
8 years ago
fjc40 5a03d97713 Added comment.
8 years ago
fjc40 b07c30704a The trackpoint line is now a line (poly-line) instead of a sequence of circles. A point along the poly-line is added every 250ms.
8 years ago
Joseph Gardner 7d4f1cd925 Fixed first key press not working. #story[1098]
8 years ago
hba56 1bdf80417d javadoc
8 years ago
Jessica Syder 0558629dc6 Added luffing sails image.
8 years ago
Fan-Wu Yang a5b21799d3 Fixed java doc issue #story[1092]
8 years ago
Fan-Wu Yang ac42c07c69 Merge branch 'master' into MapWindRotation
8 years ago
Fan-Wu Yang b5e414f97a Made all the model classes extend off the schema xml classes for race, and made xml builder, validator and reader utility class.
8 years ago
fjc40 175fb11178 Javadoc fixes.
8 years ago
fjc40 7366aba5ec Added empty data sources, to be used by VisualiserRace.
8 years ago
Fan-Wu Yang 70d5447e88 Moving stuff from school pc to home
8 years ago
Fan-Wu Yang 8999cddf8b Pre merge commit
8 years ago
hba56 dc9317fe2e remove system.out statments
8 years ago
hba56 67bb7b81dc Merge remote-tracking branch 'origin/story68' into story68
8 years ago
hba56 0d786f381b fix for boats finishing the race
8 years ago
hba56 2acc36225e Fix for placement of invis gates and checks that boats pass through these gates
8 years ago
Jessica Syder 8b1561cdc7 Fixed nullpointer when boat passes finish line.
8 years ago
Fan-Wu Yang 820898d92c pushed work from school computer to do at home
8 years ago
hba56 f90648e4ce Fixing a silly mistake where starboard side rounding checks for a port side rounding (Thank goodness for documenting manual tests)
8 years ago
Fan-Wu Yang 7c6f0931ba Transferring files from my laptop to desktop to work on, may be broken.
8 years ago
hba56 a05ffd023d Fixing a silly mistake where starboard side rounding checks for a port side rounding (Thank goodness for documenting manual tests)
8 years ago
hba56 f386a4b989 added checks for gates and moved second rounding check to be in line with the next mark to move towards
8 years ago
hba56 fe91264aec fix for the tests
8 years ago
fjc40 89b0aa8b77 Implemented MessageRouter.
8 years ago
zwu18 a31eb078a6 Created a splash screen for application.
8 years ago
hba56 62e37489ee starboard rounding update
8 years ago
hba56 d70a711a3d Merge branch 'master' into story68
8 years ago
hba56 499a409d4f Merge branch 'master' into story68
8 years ago
zwu18 848edfc6a4 Removed commented out code. Merged master in.
8 years ago
zwu18 c3ea62dfee Merge branch 'master' into CommandFactory
8 years ago
zwu18 9c902dab46 Added javadoc to classes.
8 years ago
fjc40 6e5fb62880 Added REQUEST_RECEIVED and DECLINED to ConnnectionStateEnum.
8 years ago
fjc40 41b0a5d7f7 Merge branch 'story_61' of eng-git.canterbury.ac.nz:seng302-2017/team-7 into story_61
8 years ago
fjc40 b625b6ab05 XMLReader.readXMLFileToString no longer throws a Transformer exception.
8 years ago
zwu18 e4b72fdfeb Update appearance on client arrow.
8 years ago
Connor Taylor-Brown 7474de9816 Created foundation classes and interfaces for collision architecture.
8 years ago
fjc40 61d18f85c5 javadoc fixes.
8 years ago
fjc40 19984772c0 Merge branch 'master' into story_61
8 years ago
Joseph Gardner d8628b4289 Boats now start the race with sails out. #story[1098]
8 years ago
fjc40 5bc51343f5 Merge remote-tracking branch 'origin/master' into pom_profile_fix
8 years ago
fjc40 130ffcbf07 Fixed some merge issues.
8 years ago
Joseph Gardner 20302496f0 Made SailsInCommand and SailsOutCommand one class. #story[1098]
8 years ago
fjc40 805c12bf41 Merge remote-tracking branch 'origin/master' into issue_28_36_decoders
8 years ago
Fraser Cope 7b382e48ac Merge branch 'story63' into 'master'
8 years ago
Jessica Syder 321dcde72f Implemented luffing sail without image (yet).
8 years ago
fjc40 39b5cc2edc MockBoat has autoVMG disabled by default.
8 years ago
Joseph Gardner 1a7152f54e Boats stop when the sails are out. Merged dev. #story[1098]
8 years ago
hba56 4da3734804 added the ability to toggle the race guide line on and off
8 years ago
fjc40 7cc39abe57 WIP. Probably need to cherry pick stuff out of here.
8 years ago
Joseph Gardner 1302769a50 Merge branch 'Development' into story_64_sails
8 years ago
Joseph e23f20753d Merged 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]
8 years ago
Joseph 41d09f587e Merge branch 'master' into story_64_sails
8 years ago
hba56 74f04a13f8 Merge remote-tracking branch 'origin/Development' into Development
8 years ago
hba56 e53d72f24b compound marks now can give the mark they have that needs to be rounded this is used to draw the line around the correct mark
8 years ago
Connor Taylor-Brown da9915174c Merge branch 'master' into Development
8 years ago
Connor Taylor-Brown 3cf0cf2ee0 Merge branch 'master' into story63
8 years ago
Connor Taylor-Brown 638413da1a Merge remote-tracking branch 'remotes/origin/story63' into Development
8 years ago
Jessica Syder ce973fecfe Sails are displayed correctly for all wind and active boat directions.
8 years ago
zwu18 03713d3699 Added checkPosition into MockRace which was removed. Boat now updates legs again.
8 years ago
Connor Taylor-Brown e021dd328d Changed CompositeCommand stack to queue
8 years ago
hba56 e2605c3c7c Merge remote-tracking branch 'remotes/origin/story68' into Development
8 years ago
hba56 bb75806781 Cleaned up line to be in a shippable shape
8 years ago
fjc40 3ec87582d3 Merge remote-tracking branch 'origin/master' into story_61
8 years ago
hba56 22722286ef all paths now join up
8 years ago
zwu18 53c9192130 Merge branch 'CommandFactory' into Development
8 years ago
hba56 ef3f468b19 arrows displayed for each leg
8 years ago
Jessica Syder ace1252c1d Fixed sails so they behave correctly
8 years ago
cbt24 2920b6cf23 Removed build-breaking code from MockRace
8 years ago
Fan-Wu Yang a460df3e4d Fixed Javadocs that were causing the build to fail. #story[1096]
8 years ago
Fan-Wu Yang 0f9b191ccb Added doc strings to RaceXML Creator #story[1096]
8 years ago
Connor Taylor-Brown 8ee4e84236 Merge remote-tracking branch 'remotes/origin/story63' into Development
8 years ago
Joseph Gardner f6cdf66bfe Sails can be toggled on the visualiser and the rotate sails button rotates the sail visually. #story[1098]
8 years ago
Connor Taylor-Brown dad4fa57c6 Fixed WindCommand not updating downwind command when moving upwind.
8 years ago
Connor Taylor-Brown 55798447ab Cherry-picked CommandFactory connection between ControllerServer and RaceLogic.
8 years ago
Connor Taylor-Brown e76de1cbf9 Added test for WindCommand
8 years ago
fjc40 634d78ab70 Added names to threads created.
8 years ago
hba56 62752c142a building blocks for drawing the race line around the course
8 years ago
hba56 747c31b948 Merge remote-tracking branch 'remotes/origin/story68' into Development
8 years ago
hba56 4195d41814 removed outdated comments
8 years ago
Jessica Syder 7c5670f8c2 Sails are displayed on first boat in a race. Optimised imports.
8 years ago
hba56 950a801d16 rounding fix for the xml
8 years ago
Joseph Gardner 0bf2c6106b Boat updating speed after key press has been fixed. #fix #story[1094]
8 years ago
zwu18 ddaa2623ca Added tests for TackGybeCommand class.
8 years ago
Fan-Wu Yang fef35d0b00 The race is rotated with it's initial rotation in mind
8 years ago
Fan-Wu Yang 2ce1c0786e The course points can now be rotated,
8 years ago
fjc40 134586f407 The message encoders and decoders now catch exceptions, and throw InvalidMessageException.
8 years ago
fjc40 9c64b678e3 Added MarkRoundingEncoder.
8 years ago
fjc40 da800e659a Added AverageWindEncoder.
8 years ago
fjc40 ce63f58429 Added RaceStartStatusEncoder.
8 years ago
fjc40 e99ad00294 Javadoc fixes.
8 years ago
fjc40 750ea5c141 Added MessageDecoder interface. All decoder implement this.
8 years ago
zwu18 a388989827 Reworked TackGybeCommand. Current boat in race will now tack and gybe when control is pressed.
8 years ago
fjc40 1fbdd09d70 Refactored 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.
8 years ago
zwu18 18f14c7542 VMGCommand now toggles autoVMG on and off. Linked up observer and observable so the current boat can now be controlled. Fixed autoVMG not working.
8 years ago
fjc40 ff262a6227 Added Knots <-> MMperSec conversions to AC35UnitConverter.
8 years ago
zwu18 dab0f2b402 Merge branch 'story63' into CommandFactory
8 years ago
zwu18 074e2e590b VMGCommand now toggles autoVMG on and off. Linked up observer and observable so the current boat can now be controlled.
8 years ago
fjc40 a0f98eadaa Added some documentation to BoatStatus.
8 years ago
zwu18 3d417c3a40 Merge branch 'story63' into CommandFactory
8 years ago
fjc40 b1922fc3fc Added RaceStatusEncoder.
8 years ago
fjc40 e464ee298e javadoc fixes for some warnings.
8 years ago
fjc40 b486f99dbe Added XMLMessageEncoder.
8 years ago
fjc40 8ef906472b Renamed Heartbeat to HeartBeat.
8 years ago
fjc40 c3ed30019c Added BoatLocationEncoder.
8 years ago
fjc40 31ce9fff94 Added BoatActonEncoder.
8 years ago
fjc40 16686678a7 Added an InvalidMessageTypeException - thrown whenever we encounter a MessageType that isn't recognised or isn't supported.
8 years ago
fjc40 7ea5b31fa1 RequestToJoinEnum contains an int instead of a byte.
8 years ago
fjc40 ca2b8a8899 Added missing javadoc.
8 years ago
fjc40 f65ed79619 Implemented RequestToJoin and JoinAcceptance messages.
8 years ago
fjc40 1385500e68 Added JoinAcceptance and RequestToJoin enumerations.
8 years ago
fjc40 7feddeb49f Merge branch 'master' into story48
8 years ago
Connor Taylor-Brown 554f8a2a0f Added WindCommand and multiple command execution to RaceLogic
8 years ago
hba56 0b74acadff rounding checks are now done by port or starboard side depending on what the compound marks type is
8 years ago
hba56 db1efab225 rounding checks are now done by port or starboard side depending on what the compound marks type is
8 years ago
hba56 be8b0e672d Updated the xml reader to pull in the rounding type of the compound marks and set each mark with that value
8 years ago
Connor Taylor-Brown 425cc7f91f Changed ControlKey to use BoatActionEnum instead of magic numbers.
8 years ago
zwu18 14ce5fcaff Made changes to TackGybeCommand and VMGCommand classes to fit pattern layout.
8 years ago
zwu18 6e699f7037 Merge branch 'RaceFactory' into CommandFactory
8 years ago
Fan-Wu Yang f23c3f854d Seperated race xml creation into a class of its own
8 years ago
Connor Taylor-Brown 851bbb4fde Merged branch "RaceFactory" with master
8 years ago
fjc40 148108a658 CommandFactory uses BoatActionEnum instead of raw ints.
8 years ago
Connor Taylor-Brown c83442761c Implemented Factory for Command objects and fixed Command Pattern implementation.
8 years ago
Joseph Gardner 40a3ed1bb0 Boats now store whether autoVMG is on or off, boat speed scales off their bearing relative to the TWA. #story[1094]
8 years ago
hba56 f212414bd9 Added in a new basis for boats to round marks, gave mockboats a status to say how far through a rounding they are and made a method in GPScoordinate public so it can be used to calculate intersections.
8 years ago
fjc40 2e325d5177 Added WindGeneratorTest.
8 years ago
fjc40 e4999a3c93 Added a light variant of the arrow image.
8 years ago
fjc40 2a5d0938ff Merge branch 'story48' into Development
8 years ago
Connor Taylor-Brown c8621a7be5 Merge branch 'RaceFactory' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into RaceFactory
8 years ago
Fan-Wu Yang 4e8d4f2433 Created Schema for Race xml's and generated classes for reading xml with xjc, made the RaceXMLReader read Corner classes in as well as making a corner class #story[1092]
8 years ago
zwu18 d9679c1497 Build failing due to junit even though junit passes all tests. Commented out VMGCommand and TackGybeCommand content.
8 years ago
Connor Taylor-Brown 2672c2b13b Separated RaceLogic from MockRace
8 years ago
zwu18 b581b01a44 Merge branch 'RaceFactory' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into RaceFactory
8 years ago
zwu18 ad61dc6bce Implemented runCommand method in VMGCommand and TackGybeCommand classes. Both classes currently rely on the MockRace class so changes will be required when MockRace is refactored.
8 years ago
Connor Taylor-Brown 0466292bd0 Partially removed VMG optimisation, separated server-specific functionality
8 years ago
zwu18 7fc1347377 Created class TackGybeCommand which implements the CommandFactory interface.
8 years ago
fjc40 e1905e9e36 javadoc fix.
8 years ago
fjc40 9889a474ee Added ArrowController. This is the controller for arrow.fxml.
8 years ago
hba56 b7af4e19cf new method to check if a boat is between gates as well as updated the gps values to fit better with real life values
8 years ago
hba56 13922bc284 updated javadoc
8 years ago
hba56 c633de21f5 added new methods to the mock boats to let them check which side a mark is on to them
8 years ago
Joseph Gardner 27cf0e1539 Started splitting MockRace into RaceLogic and RaceState. #refactor #story[1094]
8 years ago
Joseph Gardner b258e94a54 Merged wind generator into this branch. #story[1094]
8 years ago
Joseph Gardner fba256113a Merged wind generator into this branch. #story[1094]
8 years ago
Joseph Gardner 51bbdf9a50 Merge branch 'issue_26_wind' into RaceFactory
8 years ago