Jessica Syder 669a303e9b Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into controllerSplit ...

# Conflicts:
#	racevisionGame/src/main/java/visualiser/Controllers/HostGameController.java
#	racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java
#	racevisionGame/src/main/java/visualiser/Controllers/StartController.java
#	racevisionGame/src/main/java/visualiser/Controllers/hostgame.fxml
#	racevisionGame/src/main/java/visualiser/Controllers/lobbyHosting.fxml
#	racevisionGame/src/main/java/visualiser/Controllers/main.fxml
#	racevisionGame/src/main/java/visualiser/Controllers/raceView.fxml

2017-09-11 20:19:10 +12:00

..

app

Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into controllerSplit

2017-09-11 20:19:10 +12:00

dataInput

VMG now works however some little bug in the interpolation in some quadrant that is making the speed all the same in the quadrant #story[1182]

2017-09-05 19:26:06 +12:00

enums

Added REQUEST_RECEIVED and DECLINED to ConnnectionStateEnum.

2017-08-12 01:05:45 +12:00

exceptions

Merge branch 'master' into story_61

2017-08-10 23:49:21 +12:00

model

removed sout and added a longer startup time. Also fixed race xmls to remove set boats

2017-09-09 15:37:35 +12:00

xml

Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into controllerSplit

2017-09-11 20:19:10 +12:00