102 Commits (8cc4d7741ca47efba026e752fcda2f9a76cf1b27)

Author	SHA1	Message	Date
David Wu	8cc4d7741c	Fixed issue where games can't be hosted if you quit as host in the lobby menu. Added more doc.#story[1188]	8 years ago
David Wu	89ce8a7cc0	Pre-race countdown implementation.	8 years ago
hba56	ae8fa312a3	removed sout and added a longer startup time. Also fixed race xmls to remove set boats	8 years ago
Fan-Wu Yang	18a689b110	Changed a constant to be using the one in the constants file (prepartory start time) and temporarily made it so that the race can start in 3 seconds. #story[1261]	8 years ago
Connor Taylor-Brown	e3e61e5b28	Merge remote-tracking branch 'remotes/origin/master' into storyD-3D	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
cbt24	3ecf203cba	Recovered stable rotation of the player's boat ... - Uses AnimationTimer rather than listeners - Reduced pre-start time to speed up testing #story[1261]	8 years ago
fjc40	361856ea1d	Updated timescale.	8 years ago
fjc40	16bf57e333	javadoc fixes.	8 years ago
fjc40	8c76d6c26e	Added boats.xml schema. ... RaceServer now creates an XMLMessage when the race's BoatDataSource changes. #story[1188]	8 years ago
fjc40	298fcd03dc	Added regatta schema. ... RaceServer now creates an XMLMessage when the race's RegattaDataSource changes. #story[1188]	8 years ago
fjc40	ec58f0c847	Participants can now join during the warning period as well. ... Added RaceDataSourceToXML. RaceServer now create an XMLMessage when the race's RaceDataSource changes. #story[1188]	8 years ago
fjc40	9156bde8af	Moved XML message creation to RaceServer instead of ConnectionAcceptor. ... RaceServer does not currently generate new XMLMessages - NYI. Added a sequence number to RaceDataSource - this is used to indicate that the data source has been modified. #story[1188]	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
Joseph Gardner	0be5b731c3	Merge branch 'master' into wind_(story53)	8 years ago
Joseph Gardner	12e2ae9c01	Started implementing wind oscillation. #story[1187]	8 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.	8 years ago
fjc40	0d2be85d17	Brought over long/latitude fix from "rounding_line_visible_hack" branch.	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
David Wu	f1ef75fb81	Merge branch 'master' into new_issue#19	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	e26fb73627	Merged master.	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	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
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	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	f7d0e9d466	Boats bounce during collision if pointing into collision ... #story[1100]	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	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	8d87da6206	fixed java doc issues on my side #story[1092]	8 years ago
Fan-Wu Yang	a4e1dfb3d7	Fixed import that was messing up the build #story[1092]	8 years ago
fjc40	dc4610d6eb	Fixed sparkline not updating. ... #story[1095]	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	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
hba56	1bdf80417d	javadoc ... #story[1087]	8 years ago
Fan-Wu Yang	a5b21799d3	Fixed java doc issue #story[1092]	8 years ago