212 Commits (58cde8ce445658aa74a860b7fddac227f6ff3ebe)

Author SHA1 Message Date
Joseph Gardner 1a7152f54e Boats stop when the sails are out. Merged dev. #story[1098]
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
Connor Taylor-Brown 638413da1a Merge remote-tracking branch 'remotes/origin/story63' into Development
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
zwu18 53c9192130 Merge branch 'CommandFactory' into Development
8 years ago
cbt24 2920b6cf23 Removed build-breaking code from MockRace
8 years ago
Connor Taylor-Brown 8ee4e84236 Merge remote-tracking branch 'remotes/origin/story63' into Development
8 years ago
Connor Taylor-Brown dad4fa57c6 Fixed WindCommand not updating downwind command when moving upwind.
8 years ago
Connor Taylor-Brown e76de1cbf9 Added test for WindCommand
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
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
zwu18 3d417c3a40 Merge branch 'story63' into CommandFactory
8 years ago
fjc40 b1922fc3fc Added RaceStatusEncoder.
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
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
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
Connor Taylor-Brown c8621a7be5 Merge branch 'RaceFactory' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into RaceFactory
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
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
9 years ago
hba56 c633de21f5 added new methods to the mock boats to let them check which side a mark is on to them
9 years ago
Joseph Gardner 27cf0e1539 Started splitting MockRace into RaceLogic and RaceState. #refactor #story[1094]
9 years ago
Joseph Gardner b258e94a54 Merged wind generator into this branch. #story[1094]
9 years ago
Joseph Gardner fba256113a Merged wind generator into this branch. #story[1094]
9 years ago
Joseph Gardner 51bbdf9a50 Merge branch 'issue_26_wind' into RaceFactory
9 years ago
fjc40 ed12ff659d mock:
9 years ago
Joseph Gardner 81eeca3533 Split wind off from Race and made it its own class. Deleted dnfChance as it is no longer used.
9 years ago
Joseph Gardner 775c32ca92 Made new branch for command architecture.
9 years ago
Joseph Gardner a87879eaa9 Made new branch for command architecture.
9 years ago
fjc40 99f3310d8b Created a setWind(bearing, knots) in Race, which updates the Wind with new values.
9 years ago
fjc40 7d3cf6ee80 I had accidentally broken the raceXML construction - fixed it.
9 years ago
fjc40 abbbf70146 Refactored Race, MockRace, and VisualiserRace to use RaceClock instead of keeping their own timers.
9 years ago
fjc40 8e18ad62ca Added LatestMessages to network.Messages. This is an object that encapsulates the latest up to date set of race messages.
9 years ago
fjc40 8d36d89570 Refactored and moved RaceXMLReader to shared/dataInput.
9 years ago
fjc40 7f027c8cc5 Refactored and moved XMLReader, RaceDataSource, BoatXMLReader, BoatDataSource, RegattaXMLReader to shared/dataInput.
9 years ago
fjc40 bbbb1f2eb0 Renamed sharedModel module to racevisionGame - this is intended to be our single module program.
9 years ago