hba56 079d93fc0f Merge remote-tracking branch 'remotes/origin/master' into story77 ...

# Conflicts:
#	racevisionGame/src/main/java/mock/app/Event.java
#	racevisionGame/src/main/java/visualiser/Controllers/HostController.java
#	racevisionGame/src/main/java/visualiser/Controllers/LobbyController.java
#	racevisionGame/src/main/java/visualiser/Controllers/MainController.java
#	racevisionGame/src/main/resources/visualiser/scenes/main.fxml
#	settings/keyBindings.xml

2017-09-13 14:22:46 +12:00

..

images

Merge branch 'master' into story70

2017-09-11 14:27:12 +12:00

mock/mockXML

Created xml for tutorial that contains start and finish line. TODO: Add gate/mark. #story[1189]

2017-08-30 14:51:56 +12:00

raceXML

Refactored Race, MockRace, and VisualiserRace to use RaceClock instead of keeping their own timers.

2017-07-08 23:21:29 +12:00

scenes

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

2017-09-13 14:22:46 +12:00