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

2020-05-07 16:58:36 +02:00
parent 144ffd5434 a2bc3f1dd4
commit 892dd6da73
6 changed files with 52 additions and 13 deletions
--- a/src/ihm/ressources/Choix_joueur.fxml
+++ b/src/ihm/ressources/Choix_joueur.fxml
@@ -164,6 +164,14 @@
                        <Insets top="20.0" />
                     </VBox.margin>
                  </Button>
+                  <Button layoutX="283.0" layoutY="379.0" mnemonicParsing="false" onMouseClicked="#retour" prefHeight="55.0" prefWidth="247.0" styleClass="bouton" stylesheets="@style/menu.css" text="retour">
+                     <font>
+                        <Font size="24.0" />
+                     </font>
+                     <VBox.margin>
+                        <Insets top="20.0" />
+                     </VBox.margin>
+                  </Button>
               </children>
            </VBox>
         </center>