 fjc40
|
eb2ed45ed2
|
Merge branch 'master' into spectate_mode_basic
# Conflicts:
# racevisionGame/src/main/java/visualiser/Controllers/LobbyController.java
|
2017-09-15 00:46:07 +12:00 |
|
 hba56
|
004aebceb5
|
fix null pointer when playing tutorial
|
2017-09-14 16:27:36 +12:00 |
|
|
fjc40
|
43a1fbcb64
|
Spectate mode can be selected by clients when they join a game.
#story[1194]
|
2017-09-14 14:33:21 +12:00 |
|
|
hba56
|
4c52673fc1
|
javadoc fixes
#story[1188]
|
2017-09-13 17:12:24 +12:00 |
|
|
hba56
|
00780e17e9
|
Merge remote-tracking branch 'remotes/origin/temp77' into story77
# Conflicts:
# racevisionGame/src/main/java/visualiser/Controllers/InGameLobbyController.java
# racevisionGame/src/main/resources/visualiser/scenes/gameLobby.fxml
# racevisionGame/src/main/resources/visualiser/scenes/hostgame.fxml
|
2017-09-13 15:17:37 +12:00 |
|
|
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 |
|
|
hba56
|
70ccb4cf1c
|
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:00:40 +12:00 |
|