269 Commits (f1ef75fb81109a65238b0eebaf0358485b45752b)

Author SHA1 Message Date
zwu18 5e0bcd2af5 Added control menu to title screen. Pressing control button will open a pop-up window showing game controls.
8 years ago
fjc40 a4755ed88b Maybe fixed updating boat list on FX thread.
8 years ago
Fan-Wu Yang a4e1dfb3d7 Fixed import that was messing up the build #story[1092]
8 years ago
fjc40 0483859c40 Fixed sparkline y axis labelling. Reverted it to how it previously worked (negative data values instead of negative scale).
8 years ago
fjc40 9ab12a9c58 MockBoat: Removed redundant isAutoVMG() function.
8 years ago
fjc40 dc4610d6eb Fixed sparkline not updating.
8 years ago
fjc40 5ae8393126 Fixed null pointer exception when a boat finishes the race.
8 years ago
fjc40 3a0bd10a57 Merge remote-tracking branch 'origin/master' into story_61
8 years ago
fjc40 c9875f3987 RaceLogic no longer uses AnimationTimer for its main loop (since that ran in javafx thread).
8 years ago
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
hba56 1bdf80417d javadoc
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
fjc40 5bc51343f5 Merge remote-tracking branch 'origin/master' into pom_profile_fix
8 years ago
fjc40 130ffcbf07 Fixed some merge issues.
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
fjc40 39b5cc2edc MockBoat has autoVMG disabled by default.
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
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
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
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
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
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