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

Controls button in title screen now opens the key mapping menu. #story[1197]

Browse Source
This commit is contained in:
David Wu
2017-09-01 13:44:09 +12:00
parent 716a99aac7
commit 086206a623
2 changed files with 1 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
racevisionGame/src/main/java/visualiser/Controllers/TitleController.java
+1 -1
View File
@@ -89,7 +89,7 @@ public class TitleController extends Controller {
*/ */
public void controlBtnPressed(){ public void controlBtnPressed(){
FXMLLoader loader = new FXMLLoader(); FXMLLoader loader = new FXMLLoader();
loader.setLocation(getClass().getResource("/visualiser/scenes/controls.fxml")); loader.setLocation(getClass().getResource("/visualiser/scenes/keyBindings.fxml"));
Parent layout; Parent layout;
try { try {
layout = loader.load(); layout = loader.load();
racevisionGame/src/main/java/visualiser/app/App.java
-8
View File
@@ -168,14 +168,6 @@ public class App extends Application {
System.exit(0); System.exit(0);
} }
}); });
// TODO: remove later, just for testing
Parent root2 = FXMLLoader.load(getClass().getResource
("/visualiser/scenes/keyBindings.fxml"));
Stage stage2 = new Stage();
stage2.setScene(new Scene(root2));
stage2.centerOnScreen();
stage2.show();
} }
/** /**