231 Commits (03dd937713a2306dc1ced5172f831c7397cece8b)

Author	SHA1	Message	Date
David Wu	03dd937713	Change fxml stuff. Added back to menu buttons.	8 years ago
David Wu	9f813ab7aa	Merged in development.	8 years ago
David Wu	288979be3b	Merge branch 'Development' into new_issue#19 ... # Conflicts: # racevisionGame/src/main/java/visualiser/Controllers/RaceController.java # racevisionGame/src/main/java/visualiser/app/App.java	8 years ago
David Wu	09eaf6d968	Merged master.	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
David Wu	fa5992bfb2	added App app to app.	8 years ago
David Wu	6bc81f566e	Issue 19 changes.	8 years ago
hwball	86d94ef27e	javadoc fix	8 years ago
Connor Taylor-Brown	4b3cc8e126	Created ack number generator for use by multiple services ... #story[1100]	8 years ago
zwu18	109b291973	Merged issue #20 fix and splash screen into development.	8 years ago
zwu18	317582aae8	Merge branch 'issue#20fix' into Development	8 years ago
zwu18	4e8b7d3b5a	Merge remote-tracking branch 'origin/master' into issue#20fix	8 years ago
zwu18	8759ac070e	Merge remote-tracking branch 'origin/splashScreen' into issue#20fix	8 years ago
Connor Taylor-Brown	f8150ef449	Added YachtEvent message with encoder and decoder ... - Updated Encoder and Decoder factories for the new message type - Added an enum for handling yacht event types #story[1100]	8 years ago
hba56	ee0cc4b704	Merge branch 'issue#40' into Development	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	8498701091	Removed commented-out file from master	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
hba56	fdd0b30a51	Added the ability to hide and show info table with a key press ... -the wind arrow also scales with the new size of the screen	8 years ago
fjc40	85e703cba5	RaceController/info table now makes a copy of the boat list, to avoid race conditions. ... #story[1095]	8 years ago
fjc40	bcb6b79f8d	Fixed player boat not being highlighted. ... #story[1095]	8 years ago
zwu18	5e0bcd2af5	Added control menu to title screen. Pressing control button will open a pop-up window showing game controls.	8 years ago
fjc40	a4755ed88b	Maybe fixed updating boat list on FX thread.	8 years ago
fjc40	0483859c40	Fixed sparkline y axis labelling. Reverted it to how it previously worked (negative data values instead of negative scale). ... issue #32	8 years ago
fjc40	9ab12a9c58	MockBoat: Removed redundant isAutoVMG() function. ... TackGybeCommand now disables autoVMG. Removed print statements from VMGCommand.	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
fjc40	c9875f3987	RaceLogic no longer uses AnimationTimer for its main loop (since that ran in javafx thread).	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
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
fjc40	175fb11178	Javadoc fixes. ... #story[1095]	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
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