Merge branch 'development' of https://github.com/PTE-SH/ShadowHunterGame into development

src/ihm/controller/ChoisirEquipement.java

@@ -1,17 +1,15 @@
 package ihm.controller;
 
-import java.io.InputStream;
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.ResourceBundle;
 
+import carte.CarteEquipement;
 import javafx.fxml.FXML;
 import javafx.fxml.Initializable;
-import javafx.scene.image.Image;
 import javafx.scene.image.ImageView;
 import javafx.scene.layout.GridPane;
-import carte.CarteEquipement;
 
 public class ChoisirEquipement implements Initializable{
 	@FXML private GridPane grilleEquipement;

src/ihm/controller/PauseController.java

@@ -8,6 +8,7 @@ import java.util.ResourceBundle;
 
 import ihm.EffetSonore;
 import ihm.Musique;
+import ihm.PopUp;
 import javafx.fxml.FXML;
 import javafx.fxml.FXMLLoader;
 import javafx.fxml.Initializable;
@@ -167,10 +168,17 @@ public class PauseController implements Initializable {
 		final ResourceBundle bundle = ResourceBundle.getBundle("domaine.properties.langue", ParametreController.LaLangue);
 		final FXMLLoader fxmlLoader = new FXMLLoader(fxmlURL, bundle);
         AnchorPane pane = fxmlLoader.load();
+        
+        
         Scene scene = new Scene(pane);
         Stage appStage = (Stage) ((Node) mouseEvent.getSource()).getScene().getWindow();
         appStage.setScene(scene);
         appStage.show();
+        
+        /*
+		PopUp pu = new PopUp(pane, "Regles");
+		pu.display();
+		*/
     
     }
 

src/ihm/ressources/parametre.fxml

@@ -23,6 +23,21 @@
                      <padding>
                         <Insets top="-20.0" />
                      </padding></Slider>
+                  <HBox prefHeight="18.0" prefWidth="249.0">
+                     <children>
+                        <Label prefHeight="18.0" prefWidth="198.0" styleClass="text" stylesheets="@style/plateau.css" text="The Red Fox Tavern - Curran Son">
+                           <opaqueInsets>
+                              <Insets />
+                           </opaqueInsets>
+                           <HBox.margin>
+                              <Insets />
+                           </HBox.margin>
+                        </Label>
+                     </children>
+                     <VBox.margin>
+                        <Insets top="-35.0" />
+                     </VBox.margin>
+                  </HBox>
                   <CheckBox fx:id="cbEffetSonore" mnemonicParsing="false" styleClass="checkBox" text="%effet" />
                   <Slider fx:id="sliderEffets" blockIncrement="1.0" layoutX="10.0" layoutY="125.0" majorTickUnit="1.0" max="0.0" min="-20.0" minorTickCount="10" onMouseClicked="#slideVolumeEffet" value="-10.0">
                      <padding>