School-DUT-info/M431-ShadowHunterGame
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Traducion

Browse Source
This commit is contained in:
nawfe
2020-04-30 13:09:18 +02:00
parent d4a52236e1
commit 255e8012bf
7 changed files with 28 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/ihm/Main.java
View File

@ -15,11 +15,7 @@ public class Main extends Application {
public void start(Stage primaryStage) throws Exception {
System.out.println("Lancement de l'application");
<<<<<<< HEAD
final URL fxmlURL = getClass().getResource("ressources/parametre.fxml"); // "ressources/Jouer_tour(1)lancer_des.fxml"
=======
final URL fxmlURL = getClass().getResource("ressources/Menu.fxml"); // "ressources/Jouer_tour(1)lancer_des.fxml"
>>>>>>> 47a2be32525b7a871993afd9411befb3fd20fac1
final URL fxmlURL = getClass().getResource("ressources/Menu.fxml"); // "ressources/Jouer_tour(1)lancer_des.fxml"
final ResourceBundle bundle = ResourceBundle.getBundle("domaine.properties.langue", Locale.ENGLISH);
final FXMLLoader fxmlLoader = new FXMLLoader(fxmlURL, bundle);
Pane root = fxmlLoader.load();

2
src/ihm/controller/ParametreController.java
View File

@ -83,7 +83,7 @@ public class ParametreController implements Initializable {
*/
final URL fxmlURL = getClass().getResource("../ressources/Jouer_tour(3)attaquer.fxml");
final ResourceBundle bundle = ResourceBundle.getBundle("domaine.properties.langue", Locale.ENGLISH);
final ResourceBundle bundle = ResourceBundle.getBundle("domaine.properties.langue", Locale.FRANCE);
final FXMLLoader fxmlLoader = new FXMLLoader(fxmlURL, bundle);
Pane pane = fxmlLoader.load();

4
src/ihm/controller/PlateauController.java
View File

@ -27,10 +27,6 @@ import javafx.scene.image.ImageView;
import javafx.scene.layout.AnchorPane;
import javafx.scene.layout.HBox;
import javafx.scene.layout.VBox;
<<<<<<< HEAD
=======
import javafx.util.Duration;
>>>>>>> eea99d2341b1df015a2831034aa39534addff16e
import main.Joueur;
import main.View;

2
src/ihm/controller/PlayersController.java
View File

@ -118,7 +118,7 @@ public class PlayersController implements Initializable{
final URL fxmlURL = getClass().getResource("../ressources/Plateau.fxml");
final ResourceBundle bundle = ResourceBundle.getBundle("domaine.properties.langue", Locale.FRENCH);
final FXMLLoader fxmlLoader = new FXMLLoader(fxmlURL, bundle);
Parent root = fxmlLoader.load();
AnchorPane root = fxmlLoader.load();
PlateauController pc = fxmlLoader.getController();
GestionnaireJeu.setPlateauController(pc);
GestionnaireJeu.setConfiguration(new Configuration(this.joueurs));