Skip to content
Snippets Groups Projects
Commit dcb0ab89 authored by Tran Peter's avatar Tran Peter
Browse files

fix(controller): minor fixes after merge

parent 9f5b83a4
No related branches found
No related tags found
5 merge requests!74V1,!73Initial commit,!71Merge DataBase into Development,!27Player can now place bombs that have a explosion radius that dont go through the wall.,!26Merge game scene into development
...@@ -57,7 +57,7 @@ public class MenuBorderPaneController implements Initializable { ...@@ -57,7 +57,7 @@ public class MenuBorderPaneController implements Initializable {
imgLeft.setFitWidth(imageWidth); imgLeft.setFitWidth(imageWidth);
imgLeft.setPreserveRatio(true); imgLeft.setPreserveRatio(true);
// backgroundMusic("cocBackgroundMusicTest.mp3"); backgroundMusic("cocBackgroundMusicTest.mp3");
easterEgg(); easterEgg();
// shuffle meme order // shuffle meme order
......
...@@ -38,7 +38,7 @@ public class Driver extends Application { ...@@ -38,7 +38,7 @@ public class Driver extends Application {
Font.loadFont(getClass().getResourceAsStream("/fonts/Arthemis-mLA22.ttf"), 50); Font.loadFont(getClass().getResourceAsStream("/fonts/Arthemis-mLA22.ttf"), 50);
Font.loadFont(getClass().getResourceAsStream("/fonts/ShadowsIntoLight-Regular.ttf"), 50); Font.loadFont(getClass().getResourceAsStream("/fonts/ShadowsIntoLight-Regular.ttf"), 50);
Parent root = FXMLLoader.load(Objects.requireNonNull(getClass().getResource("/fxml/GameScene.fxml"))); Parent root = FXMLLoader.load(Objects.requireNonNull(getClass().getResource("/fxml/Intro.fxml")));
Scene scene = new Scene(root); Scene scene = new Scene(root);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment