101 Commits (58cde8ce445658aa74a860b7fddac227f6ff3ebe)

Author	SHA1	Message	Date
David Wu	3adc5330b4	Merge branch 'master' into story1292_hp_punish ... # Conflicts: # racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java # racevisionGame/src/main/resources/visualiser/scenes/newRaceView.fxml # racevisionGame/src/main/resources/visualiser/scenes/raceView.fxml	8 years ago
zwu18	1b8fa59f0e	Having 0 hp now removes the boat from being an active boat. #story[1292]	8 years ago
Fan-Wu Yang	980d1d7977	Merge remote-tracking branch 'origin/issue58_sails_collision_fix' into story1297_sails	8 years ago
Joseph Gardner	332722e099	Attempt to fix sails in / out colliding issue. Going to test on dev for a better visual representation. #story[1297]	8 years ago
fjc40	46192af628	Race now has a 10 minute delay before starting (which is increased whenever it falls below 5 minutes). ... The start button (visible to host) starts the race in whatever the prepatory time is. #story[1352]	8 years ago
fjc40	612b4b455e	Added start button for host on the ingameLobby screen. ... #story[1352]	8 years ago
Connor Taylor-Brown	1b4b980081	Exponentially decrease speed as boat loses health ... - Boat halves in speed after 90% health loss #story[1291]	8 years ago
Connor Taylor-Brown	7eb59cdcfc	Allowed fractional health deductions per frame ... - Fixed boundary penalty system #story[1291]	8 years ago
Connor Taylor-Brown	50d5dd02a2	BoatState message can be received from mock by visualiser ... - Basic penalties have been made for out of bounds and collisions - RaceServer packages and sends BoatState messages for each boat - ServerConnection routes BoatState messages instead of dropping by default - VisualiserRaceCommandFactory produces BoatStateCommands #story[1291]	8 years ago
Connor Taylor-Brown	8d9624db96	Recovered sails smoothing ... - Boat default position is now overridden only by collision command - Sails command overrides boat velocity #story[1195]	8 years ago
Connor Taylor-Brown	90c258e9e9	Reset collision tag on visualiser boat after displaying collision ... - Modified View3D to index subjects rather than shapes by source ID - Enforced one collision per boat on server to reduce rendering load - Changed collision radius to less than bounce radius - Fixed game-breaking null command bug #story[1195]	8 years ago
hba56	fd120edaf9	Merge remote-tracking branch 'remotes/origin/master' into story77 ... # Conflicts: # racevisionGame/src/main/java/mock/app/Event.java # racevisionGame/src/main/java/mock/xml/RaceXMLCreator.java # racevisionGame/src/main/java/visualiser/Controllers/HostGameController.java # racevisionGame/src/main/java/visualiser/Controllers/LobbyController.java # racevisionGame/src/main/java/visualiser/Controllers/TitleController.java # racevisionGame/src/main/java/visualiser/app/App.java # settings/keyBindings.xml	8 years ago
fjc40	b655b3e233	Fixed merge bug, and an unrelated null pointer exception.	8 years ago
fjc40	6761778dd4	Merge remote-tracking branch 'origin/master' into story_51_rounding_fix ... # Conflicts: # racevisionGame/src/main/java/mock/app/Event.java	8 years ago
Fan-Wu Yang	e87173ee39	Fixed Tutorial not being able to run #story[1185]	8 years ago
fjc40	d29a47ec23	Merge remote-tracking branch 'origin/master' into story_51_rounding_fix ... # Conflicts: # racevisionGame/src/main/java/mock/app/Event.java # racevisionGame/src/main/java/mock/model/MockRace.java # racevisionGame/src/main/java/shared/model/Constants.java	8 years ago
fjc40	3fa6b9200d	Finished MarkRoundingSequence class. Added MarkRoundingData class. ... RaceState has a MarkRoundingSequenceMember. The temporary rounding line drawing in canvas uses MarkRoundingSequence. MockRace now uses MarkRoundingSequence. #story[1185]	8 years ago
Fan-Wu Yang	d92410b9b4	Fixed XML Issue where sometimes the last boat would not display itself #story[1188]	8 years ago
fjc40	346aa148ef	Added some debug statements, and WIP MarkRoundingSequence class. ... Temporarily disabled source id allocator time checks. Added mark rounding stuff to race canvas to help debug. #story[1185]	8 years ago
Joseph Gardner	2868f921e2	Only one angular command can be active at a time. Only one velocity command can be active at a time. #story[1196]	8 years ago
Joseph Gardner	df624a8437	Angular movement when auto vmg is pressed is smoothed. #story[1196]	8 years ago
cbt24	9cba3934ea	Sails command now applies acceleration to boat ... - Race only has control over speed while Sails command is not in action - This is governed by a default velocity property on the boat - Sails command returns control when sails are out and boat is up to speed - Speed never falls below 0 - Speed never goes above VMG velocity to prevent exploitation #story[1196]	8 years ago
cbt24	eba70ab2d4	Sails command now listens to race to check if goal velocity is met ... #story[1196]	8 years ago
cbt24	b62344261a	Merge remote-tracking branch 'remotes/origin/master' into storyB-)	8 years ago
cbt24	844b48a81a	Resolved issue #42 - "putting sails out changes boat bearing to face target gate" ... #story[1196]	8 years ago
Fan-Wu Yang	ae1526c457	Merge branch 'master' into vmg_fix ... # Conflicts: # racevisionGame/src/main/java/visualiser/Controllers/MainController.java	8 years ago
hba56	6b9c041c6b	Merge remote-tracking branch 'remotes/origin/master' into wind_(story53) ... # Conflicts: # racevisionGame/src/main/java/mock/app/Event.java # racevisionGame/src/main/java/mock/model/MockRace.java	8 years ago
Fan-Wu Yang	06517b7b47	Tidied up code ... - Removed prints from tests - Added Javadocs in necessary places - Reenabled boat status message to send - Added boat average angle - pulled out modulateAngle function - Commented harder to read loops - Disabled toggled VMG #story[1182]	8 years ago
Fan-Wu Yang	d602c1ec6f	VMG is now working and fixed, however, it feels a bit odd #story[1182]	8 years ago
Fan-Wu Yang	7331ad1a20	VMG now works however some little bug in the interpolation in some quadrant that is making the speed all the same in the quadrant #story[1182]	8 years ago
Joseph	f4cb1a3ac4	Made ObserverCommands and made racestate an observable. ObserverCommands observes the race passes in the params. #story[1196]	8 years ago
Fan-Wu Yang	71dcc8ee6c	Added POlar Linear Interpolation #story[1186]	8 years ago
fjc40	16bf57e333	javadoc fixes.	8 years ago
Fan-Wu Yang	34cfe48df0	Got VMG quad detection working, however, the speeds are completley wrong. #story[1186]	8 years ago
fjc40	d0eebcdb2f	SourceIdAllocator now allocates from the BoatDataSource and RaceDataSource exposed by MockRace, instead of having its own source IDs. Can only allocate ids during PRESTART period. ... RaceLogic now calls MockRace.initialiseBoats() after the prestart period has finished. MockRace create a VisualiserBoat when a source ID is allocated. MockOutput now sends updated XML messages during the race, instead of only at the start. #story[1188]	8 years ago
fjc40	3176e76c8c	MockRace: ... Now uses RaceState as its base class, rather than Race. This aligns it with VisualiserRace. RaceState contains the shared race state between the client and server, and stores most of its data in RaceDataSource etc..., instead of maintaining its own copy. Moved collider registry member to MockRace. XMLUtilities: Added documentation to two important functions, and updated them to use generics instead of Objects. #story[1188]	8 years ago
Fan-Wu Yang	9a5d20bdf2	Added new polar function, currently it does not distinguish between up wind and downwind and doesn't find it in the correct quadrant #story[1186]	8 years ago
Joseph Gardner	64e96a1b8b	Class for shifting wind. #story[1187]	8 years ago
Joseph Gardner	5ba6f52669	fixed autovmg.	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
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