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

2017-09-13 16:13:14 +12:00

..

Annotations.java

Merge remote-tracking branch 'remotes/origin/master' into story77

2017-09-13 14:00:40 +12:00

GraphCoordinate.java

java doc fixes to fix the ci build problems

2017-07-21 10:25:36 +12:00

Ping.java

Merge branch 'master' into story_64_sails

2017-08-17 09:13:49 +12:00

RaceConnection.java

Sails are displayed on first boat in a race. Optimised imports.

2017-08-07 12:20:52 +12:00

RaceMap.java

Added empty data sources, to be used by VisualiserRace.

2017-08-14 00:53:05 +12:00

ResizableCanvas.java

Check method moved to new class called ping so that refresh will be called on new thread.

2017-07-26 21:59:43 +12:00

ResizableRaceCanvas.java

Merge remote-tracking branch 'remotes/origin/master' into story77

2017-09-13 14:00:40 +12:00

Sparkline.java

Merge remote-tracking branch 'remotes/origin/master' into story77

2017-09-13 14:00:40 +12:00

ThisBoat.java

Merged master.

2017-08-17 09:27:41 +12:00

TrackPoint.java

Merge remote-tracking branch 'remotes/origin/master' into story77

2017-09-13 14:00:40 +12:00

VisualiserBoat.java

Merge remote-tracking branch 'remotes/origin/master' into story77

2017-09-13 14:00:40 +12:00

VisualiserRaceController.java

Added empty data sources, to be used by VisualiserRace.

2017-08-14 00:53:05 +12:00

VisualiserRaceEvent.java

Merge remote-tracking branch 'remotes/origin/master' into story77

2017-09-13 14:00:40 +12:00

VisualiserRaceService.java

Updated maven version to 2.0.

2017-08-18 22:55:50 +12:00

VisualiserRaceState.java

Merge branch 'master' into story_64_sails

2017-08-17 16:04:53 +12:00