127 Commits (8c1eded926c64260454e6cb175783117aa965b82)

Author	SHA1	Message	Date
David Wu	8c1eded926	Boat collision packets are now sent. Command class created for boat collision. Currently prints out message depending on if user crashed or someone else crashed. #story[1195]	9 years ago
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.	9 years ago
David Wu	5234cdea66	Merge branch 'master' into new_issue#19 ... # Conflicts: # racevisionGame/src/main/java/visualiser/Controllers/TitleController.java	9 years ago
Joseph Gardner	5ba6f52669	fixed autovmg.	9 years ago
David Wu	f1ef75fb81	Merge branch 'master' into new_issue#19	9 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	9 years ago
Joseph Gardner	37fe7389ff	Rounding marks works.	9 years ago
David Wu	5a188f0582	Merge branch 'master' into new_issue#19	9 years ago
David Wu	c08bafa566	Fixed most of issue #19 with new master?	9 years ago
Fan-Wu Yang	2e9c6fe593	Merged most recent master in, #story[1092]	9 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	9 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	9 years ago
David Wu	6bc81f566e	Issue 19 changes.	9 years ago
Joseph Gardner	4cf8846cda	Map wind rotation works with multiplayer xml. #story[1092]	9 years ago
hwball	86d94ef27e	javadoc fix	9 years ago
Connor Taylor-Brown	4b3cc8e126	Created ack number generator for use by multiple services ... #story[1100]	9 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	9 years ago
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
cbt24	eaa0d2e82b	Boats bounce away from marks. ... - Changed onCollisionEnter signature to pass boat info #story[1100]	9 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]	9 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]	9 years ago
cbt24	8498701091	Removed commented-out file from master	9 years ago
cbt24	f44929f376	Spun off Locatable interface to make collision code more reusable ... #story[1100]	9 years ago
cbt24	ce14e93404	Removed CI-breaking docstring	9 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	9 years ago
cbt24	d63641c1e2	Cherry-picked multiple changes from master	9 years ago
Fan-Wu Yang	9f7c5d8c0c	Fixed other javadocs that were causing the build to fail #story[1092]	9 years ago
fjc40	9ab12a9c58	MockBoat: Removed redundant isAutoVMG() function. ... TackGybeCommand now disables autoVMG. Removed print statements from VMGCommand.	9 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	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
fjc40	c9875f3987	RaceLogic no longer uses AnimationTimer for its main loop (since that ran in javafx thread).	9 years ago
cbt24	9ca50aa66c	Ray casting now only supports distance specification. ... #story[1100]	9 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]	9 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	9 years ago
cbt24	da52082d70	Deleted duplicate method (again -.-)	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
Joseph Gardner	7d4f1cd925	Fixed first key press not working. #story[1098]	9 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	9 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]	9 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]	9 years ago
Fan-Wu Yang	70d5447e88	Moving stuff from school pc to home	9 years ago
hba56	dc9317fe2e	remove system.out statments ... #story[1101]	9 years ago
hba56	67bb7b81dc	Merge remote-tracking branch 'origin/story68' into story68	9 years ago
hba56	0d786f381b	fix for boats finishing the race ... #story[1101]	9 years ago
hba56	2acc36225e	Fix for placement of invis gates and checks that boats pass through these gates ... -see wiki on rounding #story[1101]	9 years ago
Jessica Syder	8b1561cdc7	Fixed nullpointer when boat passes finish line. ... - Added a condition in calculateBearingToNextMethod to avoid nullpointer	9 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]	9 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]	9 years ago