fanwuyang/SENG302
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	racevisionGame/src/main/java/visualiser/Controllers/HostController.java
This commit is contained in:
hba56
2017-09-08 13:34:48 +12:00
parent a494eb4a6d 028428da2c
commit 63e2cc1fd0
12 changed files with 576 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files
racevisionGame/src/main/java/visualiser/Controllers/LobbyController.java
+1 -1
View File
@@ -29,7 +29,7 @@ import java.util.ResourceBundle;
public class LobbyController extends Controller {
@FXML
AnchorPane lobbyWrapper;
private AnchorPane lobbyWrapper;
@FXML
private TableView<RaceConnection> lobbyTable;
@FXML