62 Commits (d41e52766b8e2c7699cd3d6d764e457336bbb5f2)

Author	SHA1	Message	Date
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
Joseph Gardner	37fe7389ff	Rounding marks works.	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
Joseph Gardner	4cf8846cda	Map wind rotation works with multiplayer xml. #story[1092]	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
cbt24	f44929f376	Spun off Locatable interface to make collision code more reusable ... #story[1100]	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
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
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
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	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
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
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	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
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
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
zwu18	03713d3699	Added checkPosition into MockRace which was removed. Boat now updates legs again. ... #Story[1097]	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
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
hba56	747c31b948	Merge remote-tracking branch 'remotes/origin/story68' into Development	8 years ago
hba56	4195d41814	removed outdated comments ... #story[1087]	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
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. ... issue #35 #36 #story[1095]	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. ... #Story[1097]	8 years ago
hba56	0b74acadff	rounding checks are now done by port or starboard side depending on what the compound marks type is ... #story[1101]	8 years ago
hba56	db1efab225	rounding checks are now done by port or starboard side depending on what the compound marks type is ... #story[1101]	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. ... This branch will not run the game any more as boats can't move on to the next leg until they can be controlled by the user. #story[1087]	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
Connor Taylor-Brown	2672c2b13b	Separated RaceLogic from MockRace ... - MockRace satisfies refactor requirement for RaceState - VisualiserRace directly implements Runnable to remove method from MockRace #story[1094]	8 years ago
zwu18	b581b01a44	Merge branch 'RaceFactory' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into RaceFactory ... # Conflicts: # racevisionGame/src/main/java/mock/model/MockRace.java	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. ... #story[1097]	8 years ago