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

# Conflicts:
#	racevisionGame/src/main/java/visualiser/Controllers/HostController.java
#	racevisionGame/src/main/java/visualiser/Controllers/MainController.java
#	racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java
#	racevisionGame/src/main/java/visualiser/Controllers/StartController.java
#	racevisionGame/src/main/java/visualiser/Controllers/TitleController.java
#	racevisionGame/src/main/resources/visualiser/scenes/raceView.fxml
#	racevisionGame/src/main/resources/visualiser/scenes/titleScreen.fxml

2017-09-11 23:07:53 +12:00

..

app

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

2017-09-11 23:07:53 +12:00

Commands

Merge branch 'master' into story_64_sails

2017-08-17 12:59:25 +12:00

Controllers

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

2017-09-11 23:07:53 +12:00

enums

Made changes based on DoD review. Class documentation and commenting added. Removed annotation features. Removed sout commands. #story[1189]

2017-09-11 21:07:52 +12:00

gameController

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

2017-09-11 20:05:24 +12:00

layout

Added more descriptive documentation to new classes and functionality

2017-09-08 23:48:47 +12:00

model

Changes to code to use new controller structure.

2017-09-08 22:07:16 +12:00

network

Adding back lost changes and finishing splitting last controllers.

2017-09-08 18:08:58 +12:00

utils

Added more descriptive documentation to new classes and functionality

2017-09-08 23:48:47 +12:00