1090 Commits (321359be07ebd6e7e57553d060bb6ecbcba9ca38)
 

Author SHA1 Message Date
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
Fraser Cope a8af866228 Merge branch 'pom_profile_fix' into 'master'
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
Fraser Cope cdb6219cce Merge branch 'issue_28_36_decoders' into 'master'
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
David Wu 568458aca4 Merge branch 'story48' into 'master'
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