You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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
..
Annotations.java	Merge remote-tracking branch 'remotes/origin/master' into story77	8 years ago
GraphCoordinate.java	java doc fixes to fix the ci build problems	9 years ago
Ping.java	Merge branch 'master' into story_64_sails	8 years ago
RaceConnection.java	Sails are displayed on first boat in a race. Optimised imports.	8 years ago
RaceMap.java	Added empty data sources, to be used by VisualiserRace.	8 years ago
ResizableCanvas.java	Check method moved to new class called ping so that refresh will be called on new thread.	9 years ago
ResizableRaceCanvas.java	Merge remote-tracking branch 'remotes/origin/master' into story77	8 years ago
Sparkline.java	Merge remote-tracking branch 'remotes/origin/master' into story77	8 years ago
ThisBoat.java	Merged master.	8 years ago
TrackPoint.java	Merge remote-tracking branch 'remotes/origin/master' into story77	8 years ago
VisualiserBoat.java	Merge remote-tracking branch 'remotes/origin/master' into story77	8 years ago
VisualiserRaceController.java	Added empty data sources, to be used by VisualiserRace.	8 years ago
VisualiserRaceEvent.java	Merge remote-tracking branch 'remotes/origin/master' into story77	8 years ago
VisualiserRaceService.java	Updated maven version to 2.0.	8 years ago
VisualiserRaceState.java	Merge branch 'master' into story_64_sails	8 years ago