Merged master into branch.

This commit is contained in:
David Wu
2017-08-17 17:02:24 +12:00
parent 5234cdea66
commit 37095bfc6c
@@ -1,6 +1,9 @@
package visualiser.Controllers; package visualiser.Controllers;
import javafx.fxml.FXML; import javafx.fxml.FXML;
import javafx.fxml.FXMLLoader;
import javafx.scene.Parent;
import javafx.scene.Scene;
import javafx.scene.control.Button; import javafx.scene.control.Button;
import javafx.scene.control.RadioButton; import javafx.scene.control.RadioButton;
import javafx.scene.layout.AnchorPane; import javafx.scene.layout.AnchorPane;
@@ -19,6 +22,7 @@ import java.util.ResourceBundle;
* the game. * the game.
*/ */
public class TitleController extends Controller { public class TitleController extends Controller {
//FXML stuff
@FXML @FXML
Button btnJoin; Button btnJoin;
@FXML @FXML