179 Commits (ab9aeeb58f1b948780e0f8adec14c1c252c8a1a4)

Author	SHA1	Message	Date
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
hba56	1bdf80417d	javadoc ... #story[1087]	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
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	fe91264aec	fix for the tests ... #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	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	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 ... # 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
Fraser Cope	7b382e48ac	Merge branch 'story63' into 'master' ... 63. [C, M] I'd like to be able to make small adjustments to the heading of my boat, as Gemma, either upwind or downwind. Note: each keypress should change the boat's heading by a small amount (3 degrees?) Pressing the 'upwind' key will turn the boat's head towards the wind by that small amount, while the 'downwind' key will do the opposite. Continuing to press the downwind key when the boat is already heading straight downwind, or upwind when heading directly upwind, achieves nothing. Acceptance criteria: - The player boat turns towards wind a small amount for each press of the 'upwind' key. - The player boat turns away from the wind by a small amount for each press of the 'downwind' key. - If the boat heading is directly into wind after a series of 'upwind' keypresses, the heading will continue to change in the same direction for one more keypress. - Substitute 'downwind' for 'upwind' for the downwind case. See merge request !21	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
hba56	4da3734804	added the ability to toggle the race guide line on and off ... #story[1087]	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 ... #story[1101]	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. ... #Story[1097]	8 years ago
Connor Taylor-Brown	e021dd328d	Changed CompositeCommand stack to queue ... #story[1096]	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 ... #story[1101]	8 years ago
hba56	22722286ef	all paths now join up ... #story[1087]	8 years ago
zwu18	53c9192130	Merge branch 'CommandFactory' into Development ... # Conflicts: # racevisionGame/src/main/java/visualiser/gameController/ControllerServer.java	8 years ago
hba56	ef3f468b19	arrows displayed for each leg ... #story[1101]	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
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	62752c142a	building blocks for drawing the race line around the course ... #story[1087]	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
zwu18	ddaa2623ca	Added tests for TackGybeCommand class. ... #Story[1097]	8 years ago
fjc40	134586f407	The message encoders and decoders now catch exceptions, and throw InvalidMessageException. ... Removed the big switch statement from BinaryMessageDecoder - it now uses the decoder factory instead. issue #35 #36 #story[1095]	8 years ago