216 Commits (2ad947b57d9b3bb813c4c5cd85e632910ddad1c3)

Author	SHA1	Message	Date
fjc40	a9fde95b39	Updated maven version to 2.0. ... Added a dedicatedServer module. Removed Visualiser module. Removed mock module. Removed network module. Fixed weird exception non-handling that appeared for some reason.	8 years ago
fjc40	666c7b029f	Disabled map rotation - temp fix for the demo. ... Set race to use 3 boat race.xml file.	8 years ago
David Wu	5234cdea66	Merge branch 'master' into new_issue#19 ... # Conflicts: # racevisionGame/src/main/java/visualiser/Controllers/TitleController.java	8 years ago
Joseph Gardner	5ba6f52669	fixed autovmg.	8 years ago
David Wu	f1ef75fb81	Merge branch 'master' into new_issue#19	8 years ago
Joseph Gardner	dcd1df2999	Merged master.	8 years ago
Joseph Gardner	014b78f166	Merge branch 'master' into story_64_sails	8 years ago
Fan-Wu Yang	83b0c0a6b4	Fixed issue using File from java.io.File which did not like maven	8 years ago
Joseph Gardner	d41e52766b	Merge branch 'master' into story_64_sails ... # Conflicts: # racevisionGame/src/main/java/mock/model/MockRace.java # racevisionGame/src/main/java/visualiser/Controllers/ConnectionController.java # racevisionGame/src/main/java/visualiser/model/VisualiserBoat.java	8 years ago
David Wu	09eaf6d968	Merged master.	8 years ago
Joseph Gardner	37fe7389ff	Rounding marks works.	8 years ago
David Wu	5a188f0582	Merge branch 'master' into new_issue#19	8 years ago
David Wu	c08bafa566	Fixed most of issue #19 with new master?	8 years ago
Fan-Wu Yang	2e9c6fe593	Merged most recent master in, #story[1092]	8 years ago
Fan-Wu Yang	7546c65893	Merge branch 'master' into MapWindRotation ... # Conflicts: # racevisionGame/src/main/java/shared/model/CompoundMark.java # racevisionGame/src/main/java/shared/model/Mark.java	8 years ago
Joseph Gardner	20c9870fea	Merge branch 'master' into story_64_sails ... # Conflicts: # racevisionGame/src/main/java/shared/model/Boat.java # racevisionGame/src/main/java/visualiser/Commands/VisualiserRaceCommands/BoatLocationCommand.java	8 years ago
David Wu	6bc81f566e	Issue 19 changes.	8 years ago
Joseph Gardner	a3fe57ed5a	Removed print statement. #story[1092]	8 years ago
Joseph Gardner	4cf8846cda	Map wind rotation works with multiplayer xml. #story[1092]	8 years ago
hwball	86d94ef27e	javadoc fix	8 years ago
Connor Taylor-Brown	4b3cc8e126	Created ack number generator for use by multiple services ... #story[1100]	8 years ago
Joseph Gardner	1e7ba8cd51	Merge branch 'master' into MapWindRotation ... # Conflicts: # racevisionGame/src/main/java/mock/app/Event.java # racevisionGame/src/main/java/mock/model/MockRace.java # racevisionGame/src/main/java/mock/model/commandFactory/CommandFactory.java # racevisionGame/src/main/java/shared/dataInput/RaceXMLReader.java # racevisionGame/src/main/java/shared/model/CompoundMark.java # racevisionGame/src/main/java/shared/model/Mark.java # racevisionGame/src/main/java/visualiser/Controllers/ConnectionController.java # racevisionGame/src/main/java/visualiser/Controllers/HostController.java # racevisionGame/src/main/java/visualiser/app/VisualiserInput.java # racevisionGame/src/main/java/visualiser/gameController/ControllerServer.java # racevisionGame/src/main/java/visualiser/model/VisualiserRace.java	8 years ago
Joseph	47fc55245c	Merged master.	8 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	8 years ago
cbt24	eaa0d2e82b	Boats bounce away from marks. ... - Changed onCollisionEnter signature to pass boat info #story[1100]	8 years ago
cbt24	8113867576	Bubbles collision events to RaceLogic ... - ColliderRegistry collects and forwards all Collision events - RaceLogic observes the ColliderRegistry of its single Race instance #story[1100]	8 years ago
cbt24	79f3c41d45	Moved generic ray casting to Collider abstract class ... - Boat is now collider - Collider subclasses specify their own collision ray and collision handler #story[1100]	8 years ago
cbt24	8498701091	Removed commented-out file from master	8 years ago
cbt24	f44929f376	Spun off Locatable interface to make collision code more reusable ... #story[1100]	8 years ago
cbt24	ce14e93404	Removed CI-breaking docstring	8 years ago
cbt24	f0d750cae1	Merge remote-tracking branch 'remotes/origin/master' into story66-collision ... # Conflicts: # racevisionGame/src/main/java/mock/model/MockBoat.java # racevisionGame/src/main/java/mock/model/RaceLogic.java # racevisionGame/src/main/java/shared/model/CompoundMark.java # racevisionGame/src/main/java/shared/model/Race.java # racevisionGame/src/test/java/mock/model/MockBoatTest.java	8 years ago
cbt24	d63641c1e2	Cherry-picked multiple changes from master	8 years ago
Fan-Wu Yang	9f7c5d8c0c	Fixed other javadocs that were causing the build to fail #story[1092]	8 years ago
Fan-Wu Yang	8d87da6206	fixed java doc issues on my side #story[1092]	8 years ago
fjc40	bcb6b79f8d	Fixed player boat not being highlighted. ... #story[1095]	8 years ago
fjc40	9ab12a9c58	MockBoat: Removed redundant isAutoVMG() function. ... TackGybeCommand now disables autoVMG. Removed print statements from VMGCommand.	8 years ago
fjc40	5ae8393126	Fixed null pointer exception when a boat finishes the race. ... Boats now default to have position (0, 0). Added mark rounding data to single player race.xml	8 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	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. ... #story[1100]	8 years ago
cbt24	7d64a43350	Allow collision checking to provide collision parameters to ray casting method ... - Added tests for MockBoat collision direction and distance #story[1100]	8 years ago
cbt24	2fbb96afd7	Created ray casting methods for MockBoat and CompoundMark ... - Added ColliderRegistry to Race - Added collision triggering to RaceLogic - Created basic collision handlers 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 ... # Conflicts: # racevisionGame/src/main/java/mock/model/commandFactory/TackGybeCommand.java # racevisionGame/src/main/java/mock/model/commandFactory/VMGCommand.java	8 years ago
Connor Taylor-Brown	b97bfe62a6	Fixed documentation bugs not relevant to story.	8 years ago
Joseph Gardner	7d4f1cd925	Fixed first key press not working. #story[1098]	8 years ago
Fan-Wu Yang	ac42c07c69	Merge branch 'master' into MapWindRotation ... # Conflicts: # racevisionGame/src/main/java/mock/app/Event.java # racevisionGame/src/main/java/mock/model/MockRace.java # racevisionGame/src/main/java/visualiser/app/VisualiserInput.java # racevisionGame/src/main/java/visualiser/model/VisualiserRace.java	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. ... #story[1092]	8 years ago
fjc40	7366aba5ec	Added empty data sources, to be used by VisualiserRace. ... Created FrameRateTracker which can be used to track framerate. Updated RequestToJoinEnum and JoinAcceptanceEnum to match the agreed connection API. Added AssignPlayerBoat message, which is used internally on the client to assign the player a source ID once they have connected. Fixed some race conditions in the MessageRouter. Updated ConnectionAcceptor.CheckClientConnection to wait slightly longer before removing connection (there was a slight race condition before). Race no longer has a reference to LatestMessages. LatestMessages no longer has specific messages types in it. Created RaceState class, which contains the state that is shared between VisualiserRaceState and MockRaceState (currently only used on visualiser). Split VisualiserRace into VisualiserRaceState and VisualiserRaceService. Added the VisualiserRace commands (BoatLocatonCommand, RaceStatusCommand, etc...). Slightly increased the preferred width of race.fxml table columns. issues #27 #37 #35 #story[1095]	8 years ago
Fan-Wu Yang	70d5447e88	Moving stuff from school pc to home	8 years ago
hba56	dc9317fe2e	remove system.out statments ... #story[1101]	8 years ago
hba56	67bb7b81dc	Merge remote-tracking branch 'origin/story68' into story68	8 years ago
hba56	0d786f381b	fix for boats finishing the race ... #story[1101]	8 years ago
hba56	2acc36225e	Fix for placement of invis gates and checks that boats pass through these gates ... -see wiki on rounding #story[1101]	8 years ago
Jessica Syder	8b1561cdc7	Fixed nullpointer when boat passes finish line. ... - Added a condition in calculateBearingToNextMethod to avoid nullpointer	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) ... #story[1101]	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) ... #story[1101]	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 ... #story[1101]	8 years ago
fjc40	89b0aa8b77	Implemented MessageRouter. ... Added ConnectionToServerCommandFactory, and JoinSuccessfulCommand, RaceParticipantsFullCOmmand, ServerFullCommand. Added IncomingHeartBeatCommandFactory, and IncomingHeartBeatCommand. Added ConnectionToServerState, which represents the client's connection state to server. Renamed VisualiserInput to VisualiserRaceController. Added ConnectionToServer, which tracks the client's connection to server. Added ConnectionToServerController, which accepts JoinAcceptance messages, turns them into commands, and passes them to ConnectionToServer. Added IncomingHeartBeatService, which tracks the heart beat status of the connection. Added IncomingHeartBeatController, which accepts HeartBeat messages, turns them into commands, and passes them to IncomingHeartBeatService. Refactored ServerConnection a bit. #story[1095]	8 years ago
hba56	62e37489ee	starboard rounding update ... #story[1101]	8 years ago
hba56	d70a711a3d	Merge branch 'master' into story68 ... -updated port and starboard boat checks -added gps method to check if on correct side of a line -updated pos check method to make boats round marks with the new tech # 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	8 years ago
hba56	499a409d4f	Merge branch 'master' into story68 ... -updated port and starboard boat checks -added gps method to check if on correct side of a line -updated pos check method to make boats round marks with the new tech # 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	8 years ago
zwu18	848edfc6a4	Removed commented out code. Merged master in. ... #story[1097]	8 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	8 years ago
zwu18	9c902dab46	Added javadoc to classes. ... #story[1097]	8 years ago
fjc40	6e5fb62880	Added REQUEST_RECEIVED and DECLINED to ConnnectionStateEnum. ... #story[1095]	8 years ago
fjc40	b625b6ab05	XMLReader.readXMLFileToString no longer throws a Transformer exception.	8 years ago
Connor Taylor-Brown	7474de9816	Created foundation classes and interfaces for collision architecture. ... - Added Collider interface - Added Collision class - Added ColliderRegistry class #story[1100]	8 years ago
fjc40	61d18f85c5	javadoc fixes.	8 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]	8 years ago
Joseph Gardner	d8628b4289	Boats now start the race with sails out. #story[1098]	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 ... # Conflicts: # racevisionGame/src/main/java/mock/app/ConnectionAcceptor.java # racevisionGame/src/main/java/mock/app/Event.java # racevisionGame/src/main/java/visualiser/gameController/ControllerServer.java	8 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]	8 years ago
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. ... Added ClientConnection and server-side handshake. Added MessageSerialiser and Deserialiser. #story[1095]	8 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	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 ... # Conflicts: # racevisionGame/src/main/java/visualiser/gameController/Keys/ControlKey.java # racevisionGame/src/main/java/visualiser/gameController/Keys/SailsToggleKey.java # racevisionGame/src/main/java/visualiser/gameController/Keys/VMGKey.java # racevisionGame/src/main/java/visualiser/model/ResizableRaceCanvas.java	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. ... #Story[1097]	8 years ago
Connor Taylor-Brown	e021dd328d	Changed CompositeCommand stack to queue ... #story[1096]	8 years ago
zwu18	53c9192130	Merge branch 'CommandFactory' into Development ... # Conflicts: # racevisionGame/src/main/java/visualiser/gameController/ControllerServer.java	8 years ago
cbt24	2920b6cf23	Removed build-breaking code from MockRace ... #story[1096]	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 ... # Conflicts: # racevisionGame/src/main/java/mock/model/MockBoat.java # racevisionGame/src/main/java/mock/model/MockRace.java	8 years ago
Connor Taylor-Brown	dad4fa57c6	Fixed WindCommand not updating downwind command when moving upwind. ... #story[1096]	8 years ago
Connor Taylor-Brown	55798447ab	Cherry-picked CommandFactory connection between ControllerServer and RaceLogic. ... #story[1096]	8 years ago
Connor Taylor-Brown	e76de1cbf9	Added test for WindCommand ... #story[1096]	8 years ago
fjc40	634d78ab70	Added names to threads created. ... MockOutput had a nested while loop, but it wasn't needed. Also tidied some of the error handling in MockOutput. #story[1095]	8 years ago
hba56	747c31b948	Merge remote-tracking branch 'remotes/origin/story68' into Development	8 years ago
hba56	4195d41814	removed outdated comments ... #story[1087]	8 years ago
Jessica Syder	7c5670f8c2	Sails are displayed on first boat in a race. Optimised imports. ... - Implemented drawSails method - Sail position is displayed and updated using a boat's heading - Sails conform to 'Points of sail' - Javadoc'd new method and tidied up existing - Sped up track point frequency (visualiserBoat class) - Optimised imports (any other classes changed) - A lot of canvas drawing and sail rotating issues were discovered and eventually overcome along the way. Using a sail image to draw and rotate on the existing canvas rather than a JavaFX shape on a new canvas was the final decision. #story[1098]	8 years ago
hba56	950a801d16	rounding fix for the xml ... #story[1087]	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. ... #Story[1097]	8 years ago
Fan-Wu Yang	fef35d0b00	The race is rotated with it's initial rotation in mind ... - RaceXMLCreator now checks the bearing of the race with getLineAngle() - Split some methods into functions so that it is more readable #story[1096]	8 years ago