 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 |
|
|
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 |
|
|
Jessica Syder
|
108643b59d
|
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:05:24 +12:00 |
|
 Jessica Syder
|
a5050b8ea8
|
Adding back lost changes and finishing splitting last controllers.
- renamed fxml and their controllers to match
- removed old controllers
- finished lobby and lobbyhost controllers
#story[1261]
|
2017-09-08 18:08:58 +12:00 |
|