32 Commits (8c1eded926c64260454e6cb175783117aa965b82)

Author	SHA1	Message	Date
Joseph	47fc55245c	Merged master.	9 years ago
Joseph	f60809bdd4	Merge branch 'master' into story_64_sails ... # Conflicts: # racevisionGame/src/main/java/mock/app/MockOutput.java # racevisionGame/src/main/java/mock/model/MockRace.java # racevisionGame/src/main/java/mock/model/commandFactory/CommandFactory.java # racevisionGame/src/main/java/network/MessageDecoders/BoatActionDecoder.java # racevisionGame/src/main/java/network/MessageDecoders/BoatLocationDecoder.java # racevisionGame/src/main/java/visualiser/app/VisualiserInput.java # racevisionGame/src/main/java/visualiser/gameController/ControllerServer.java # racevisionGame/src/main/java/visualiser/model/ResizableRaceCanvas.java # racevisionGame/src/main/java/visualiser/model/VisualiserRace.java # racevisionGame/src/main/resources/visualiser/scenes/connect.fxml # racevisionGame/src/main/resources/visualiser/scenes/lobby.fxml # racevisionGame/src/test/java/mock/model/MockRaceTest.java # racevisionGame/src/test/java/network/Utils/AC35UnitConverterTest.java # racevisionGame/src/test/java/network/XMLMessageEncoderTest.java	9 years ago
fjc40	9ab12a9c58	MockBoat: Removed redundant isAutoVMG() function. ... TackGybeCommand now disables autoVMG. Removed print statements from VMGCommand.	9 years ago
fjc40	3a0bd10a57	Merge remote-tracking branch 'origin/master' into story_61 ... # Conflicts: # racevisionGame/src/main/java/mock/model/MockRace.java # racevisionGame/src/main/java/mock/model/commandFactory/CommandFactory.java # racevisionGame/src/main/java/visualiser/gameController/ControllerClient.java # racevisionGame/src/main/java/visualiser/gameController/ControllerServer.java # racevisionGame/src/main/resources/visualiser/scenes/race.fxml	9 years ago
Connor Taylor-Brown	847cd1251e	Merge remote-tracking branch 'remotes/origin/master' into CommandFactory ... # Conflicts: # racevisionGame/src/main/java/mock/model/commandFactory/TackGybeCommand.java # racevisionGame/src/main/java/mock/model/commandFactory/VMGCommand.java	9 years ago
Connor Taylor-Brown	b97bfe62a6	Fixed documentation bugs not relevant to story.	9 years ago
zwu18	848edfc6a4	Removed commented out code. Merged master in. ... #story[1097]	9 years ago
zwu18	c3ea62dfee	Merge branch 'master' into CommandFactory ... # Conflicts: # racevisionGame/src/main/java/mock/app/ConnectionAcceptor.java # racevisionGame/src/main/java/mock/app/Event.java # racevisionGame/src/main/java/mock/model/commandFactory/TackGybeCommand.java # racevisionGame/src/main/java/mock/model/commandFactory/VMGCommand.java # racevisionGame/src/main/java/visualiser/gameController/ControllerServer.java	9 years ago
zwu18	9c902dab46	Added javadoc to classes. ... #story[1097]	9 years ago
fjc40	19984772c0	Merge branch 'master' into story_61 ... Also got client-server handshake working. Multiple clients can connect and control their own boat. The client's boat has a larger black triangle drawn around it. Probably needs tidying up. Added isClientBoat boolean to VisualiserBoat. WindGenerator is now an interface, implemented by ConstantWindGenerator (useful for testing) and RandomWindGenerator. Added ConstantWindGeneratorTest. RandomWindGenerator was formerly WindGenerator. The WindGenerator is passed in to MockRace. CommandFactory throws a CommandConstructionException if it cannot create a command. MessageSerialiser and MessageDeserialiser correctly terminate on error. Readded VisualiserInput's switch statement in the main loop, pending a refactor. Removed the sleep statement from LobbyController - it was blocking javaFX thread. Lobby.fxml: moved buttons and text input into grid panes, so they don't break when you resize screen. Added some test object creation functions in several test classes (MockRaceTest.createMockRace(), BoatXMLReaderTest.createBoatDataSource(), etc...). #story[1095]	9 years ago
Joseph Gardner	20302496f0	Made SailsInCommand and SailsOutCommand one class. #story[1098]	9 years ago
fjc40	39b5cc2edc	MockBoat has autoVMG disabled by default. ... Wind/Tack commands disable autoVMG. VMG command enables it. Upwind command was turning until boat was at 0 degrees, instead of being aligned with wind direction, but that's fixed. #story[1096]	9 years ago
Joseph Gardner	1a7152f54e	Boats stop when the sails are out. Merged dev. #story[1098]	9 years ago
fjc40	7cc39abe57	WIP. Probably need to cherry pick stuff out of here. ... Added ClientConnection and server-side handshake. Added MessageSerialiser and Deserialiser. #story[1095]	9 years ago
Joseph Gardner	1302769a50	Merge branch 'Development' into story_64_sails ... # Conflicts: # racevisionGame/src/main/java/mock/model/commandFactory/CommandFactory.java # racevisionGame/src/main/java/visualiser/model/ResizableRaceCanvas.java # racevisionGame/src/test/java/mock/model/MockBoatTest.java	9 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]	9 years ago
Connor Taylor-Brown	638413da1a	Merge remote-tracking branch 'remotes/origin/story63' into Development	9 years ago
Connor Taylor-Brown	e021dd328d	Changed CompositeCommand stack to queue ... #story[1096]	9 years ago
zwu18	53c9192130	Merge branch 'CommandFactory' into Development ... # Conflicts: # racevisionGame/src/main/java/visualiser/gameController/ControllerServer.java	9 years ago
Connor Taylor-Brown	dad4fa57c6	Fixed WindCommand not updating downwind command when moving upwind. ... #story[1096]	9 years ago
Connor Taylor-Brown	e76de1cbf9	Added test for WindCommand ... #story[1096]	9 years ago
zwu18	ddaa2623ca	Added tests for TackGybeCommand class. ... #Story[1097]	9 years ago
zwu18	a388989827	Reworked TackGybeCommand. Current boat in race will now tack and gybe when control is pressed. ... #Story[1097]	9 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. ... #Story[1097]	9 years ago
zwu18	074e2e590b	VMGCommand now toggles autoVMG on and off. Linked up observer and observable so the current boat can now be controlled. ... #Story[1097]	9 years ago
Connor Taylor-Brown	554f8a2a0f	Added WindCommand and multiple command execution to RaceLogic ... - Dispatch commands with CompositeCommand - Single WindCommand handles upwind and downwind logic - Changed key bindings as Mac lacks PgUp PgDn - ControllerServer is observable, RaceLogic updates CompositeCommand as observer	9 years ago
fjc40	148108a658	CommandFactory uses BoatActionEnum instead of raw ints. ... #story[1094]	9 years ago
Connor Taylor-Brown	c83442761c	Implemented Factory for Command objects and fixed Command Pattern implementation. ... - Commands now have standard 0-parameter execute method - Commands are created by CommandFactory #story[1094]	9 years ago
zwu18	d9679c1497	Build failing due to junit even though junit passes all tests. Commented out VMGCommand and TackGybeCommand content.	9 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. ... #story[1097]	9 years ago
zwu18	7fc1347377	Created class TackGybeCommand which implements the CommandFactory interface. ... #story[1097]	9 years ago
Joseph Gardner	775c32ca92	Made new branch for command architecture.	9 years ago