376 Commits (2a6085c9e8954c4807fe6e961571478decd8f363)

Author SHA1 Message Date
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
fjc40 ed12ff659d mock:
8 years ago
Joseph Gardner 81eeca3533 Split wind off from Race and made it its own class. Deleted dnfChance as it is no longer used.
8 years ago
Joseph Gardner 775c32ca92 Made new branch for command architecture.
8 years ago
Joseph Gardner a87879eaa9 Made new branch for command architecture.
8 years ago
fjc40 99f3310d8b Created a setWind(bearing, knots) in Race, which updates the Wind with new values.
8 years ago
fjc40 5af3053537 Added shared.model.Wind class.
8 years ago
David Wu f2932e8bae New branch created for development.
8 years ago
fjc40 fcea323cfd The racevisionGame pom still had "profiles", which aren't needed with a single jar build, and the built jar didn't have a mainifest/main class.
9 years ago
Fan-Wu Yang 442920f9f6 DOD, and added javadocs/fixed javadocs #story[1087]
9 years ago
Jessica Syder 9eaf24e699 Fixed title screen having whitespace on different screen resolutions.
9 years ago
Jessica Syder 402df18b71 Merge remote-tracking branch 'remotes/origin/master' into css
9 years ago
fjc40 669b8167cd Merge branch 'cbt-multi-controller' of eng-git.canterbury.ac.nz:seng302-2017/team-7 into cbt-multi-controller
9 years ago
fjc40 1b5926007c Visualiser ConnectionController:
9 years ago
Joseph Gardner 67c7c88b32 Print statements now print off the actual key action. #story[1089]
9 years ago
fjc40 f91f7055de Visualiser RaceController:
9 years ago
hba56 92b8b7b77f moved the tm symbol
9 years ago
David Wu 2b8b334486 Updated host to show the hosted address and port. Fixed css issue with lobby text field.
9 years ago
hba56 f4eb03e79e Merge remote-tracking branch 'origin/css' into css
9 years ago
hba56 85347c169d You can now resize all windows other than the title screen
9 years ago
David Wu 28e6709890 Merge remote-tracking branch 'origin/css' into css
9 years ago
David Wu 90f9ec2b98 Changed host menu. Will update soon.
9 years ago
Joseph Gardner 6492ba89ab Merging main features into story 6. App now sends and receives key strokes. #story[1007, 1089]
9 years ago
Joseph Gardner 0ea7fb8c84 Merging main features into story 6. App now sends and receives key strokes. #story[1007, 1089]
9 years ago
hba56 59058da09c textfields now show better colour that contrasts more
9 years ago
hba56 7fafddcf50 updated text to be easily read on daymode
9 years ago
hba56 64b4aa539a added and option to swap between css files in the title pane
9 years ago
Connor Taylor-Brown 0352e3310d Set up Boat Action Message encoding
9 years ago
Connor Taylor-Brown e670ded66d ControllerClient can retrieve valid protocol code from each key press
9 years ago
Connor Taylor-Brown 86e8cb7560 Refactored KeyFactory to ensure single instance of each key state handler.
9 years ago
Connor Taylor-Brown cc264f318e Added ControllerClient and ControllerServer
9 years ago
zwu18 8bb66bc5e4 Commented out test failure. Test was failing due to refactor.
9 years ago
zwu18 53a01402e1 Check method moved to new class called ping so that refresh will be called on new thread.
9 years ago
zwu18 243c450790 Merged with multi visualiser branch so now multiple visualisers can connect to the same host.
9 years ago
zwu18 88604df66d Merge branch 'cbt-multi-controller' into css
9 years ago
zwu18 9c9b98f882 Added functionality to host game and join a game in lobby. Host name and game name are not implemented yet.
9 years ago
Connor Taylor-Brown 9a76fa592c Added keyboard handling to RaceController
9 years ago
David Wu 578f04c74f Merge branch 'css' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into css
9 years ago
David Wu 9159e16a21 Set up controller classes for lobby and host. Made changes to TitleController and MainController. Title screen can now enter lobby and host.
9 years ago
Connor Taylor-Brown 7e3e865563 Host starts with button in ConnectionController
9 years ago
hba56 684611a52c added a background to the water so it is not just white
9 years ago
Connor Taylor-Brown a27c16d413 Merge remote-tracking branch 'remotes/origin/Game_Controller' into cbt-multi-controller
9 years ago
hba56 913946265d Merge branch 'css' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into css
9 years ago
hba56 afadabfecc small fix for the sparkline so that it goes from 1 to 6 rather than 0 to 7 for a 6 boat race
9 years ago
Fan-Wu Yang eec0cb3493 Added fairness to mockOuput list so the index will correspond to the player in order that they entered the hosted game, #story[1010]
9 years ago
Jessica McAuslin 4ba9c6b774 Added a pretty title screen to the application.
9 years ago
Fan-Wu Yang cfd858194e Removed Unecessary Print Messages
9 years ago
Fan-Wu Yang 9f99e21232 Added functionality for more than one visualiser to connect to the mock.
9 years ago
hba56 9d9321522d Linked the first fxml id tags from the fxml files for the new start up screens
9 years ago
hba56 eda7d062ec merged in the changes from the master branch so that latter mergers can run smoothly
9 years ago
hba56 595e1a8727 Merge remote-tracking branch 'remotes/origin/master' into css
9 years ago
hba56 1ebbb8d4c7 merged in the changes from the master branch so that latter mergers can run smoothly
9 years ago
hba56 738a765a0a Merge remote-tracking branch 'remotes/origin/master' into Game_Controller
9 years ago
fjc40 0598724117 Added two more missing javadocs.
9 years ago
hba56 956ad1f59b merged in the changes from the sprint5_refactor branch
9 years ago
hba56 0d5bede349 java doc fixes to fix the ci build problems
9 years ago
hba56 08f74f608f trying to see if ci works while logged in to the ienabler when ssh
9 years ago
fjc40 38f3fe16a0 Revert "Added travis_wait to test CI build order."
9 years ago
fjc40 350ec41beb Added travis_wait to test CI build order.
9 years ago
fjc40 5cddaaed8e mock.app.App now tells mock.app.Event that the xml file strings are XMLFileType.Contents.
9 years ago
fjc40 4bcfc01ceb shared.dataInput:
9 years ago
fjc40 10e80bca05 Moved mock.app.App#readFile(...) to shared.dataInput.XMLReader#readXMLFileToString(...).
9 years ago
fjc40 d0c6b5f716 Moved mock.model and mock.dataInput tests into the racevisionGame.tests.mock package.
9 years ago
fjc40 3a85fad211 Currently, mock/pom.xml and visualiser/pom.xml build racevisionGame mock and visualiser.
9 years ago
fjc40 cab9bf9574 RaceClock no has run(), or is runnable, as it wasn't needed.
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 f057ad58b7 LatestMessages can hold MarkRounding messages. It also holds XMLMessage for each message type.
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 3a0b81834f Refactored mock.Event to work with MockRace.
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 d0d63ca236 Copied remaining files into appropriate package. These need to be refactored and put into the shared package.
9 years ago
fjc40 bbbb1f2eb0 Renamed sharedModel module to racevisionGame - this is intended to be our single module program.
9 years ago