ajout d'une musique

2020-04-24 14:19:30 +02:00
parent cd9de06a76 962e4e4abd
commit 628e14095e
4 changed files with 79 additions and 66 deletions
--- a/src/ihm/Main.java
+++ b/src/ihm/Main.java
@@ -12,7 +12,11 @@ public class Main extends Application{
 	@Override
    public void start(Stage primaryStage) throws Exception{
 		System.out.println("Lancement de l'application");
+<<<<<<< HEAD
        Pane root = FXMLLoader.load(getClass().getResource("ressources/Menu.fxml")); // "ressources/Jouer_tour(1)lancer_des.fxml"
+=======
+        Pane root = FXMLLoader.load(getClass().getResource("ressources/Menu.fxml"));
+>>>>>>> 962e4e4abd757404ab08839e67817494b857931a
        primaryStage.setTitle("Shadow Hunters");
        primaryStage.setScene(new Scene(root));
        primaryStage.centerOnScreen();