From 606b03ca924d9a52d375f0ad0ec15ad1d2d81b25 Mon Sep 17 00:00:00 2001 From: ZartaX0O3 <76948902+ZartaX0O3@users.noreply.github.com> Date: Wed, 22 Dec 2021 17:57:35 +0100 Subject: [PATCH] =?UTF-8?q?D=C3=A9but=20pre=20start=20game=20menu?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- code/ressources/fxml/ConfigurationMenu.fxml | 2 +- .../fxml/GameConfigurationMenu.fxml | 36 ++++- code/ressources/fxml/MainPage.fxml | 4 +- code/ressources/fxml/PageGame.fxml | 3 +- code/ressources/fxml/sample.fxml | 151 ++++++++++++++++++ code/ressources/fxml/viewJeu1.fxml | 39 ----- .../controller/GameConfigMenuController.java | 55 +++++-- code/src/controller/MainPageController.java | 5 +- code/src/launcher/Main.java | 11 +- 9 files changed, 231 insertions(+), 75 deletions(-) create mode 100644 code/ressources/fxml/sample.fxml delete mode 100644 code/ressources/fxml/viewJeu1.fxml diff --git a/code/ressources/fxml/ConfigurationMenu.fxml b/code/ressources/fxml/ConfigurationMenu.fxml index 4a61b55..a04d8e2 100644 --- a/code/ressources/fxml/ConfigurationMenu.fxml +++ b/code/ressources/fxml/ConfigurationMenu.fxml @@ -6,7 +6,7 @@ - + diff --git a/code/ressources/fxml/GameConfigurationMenu.fxml b/code/ressources/fxml/GameConfigurationMenu.fxml index 6c8b7f7..15b372b 100644 --- a/code/ressources/fxml/GameConfigurationMenu.fxml +++ b/code/ressources/fxml/GameConfigurationMenu.fxml @@ -1,6 +1,7 @@ + @@ -11,10 +12,9 @@ - - + - + - + - + @@ -88,13 +88,33 @@ - - - + + + + + + + + + + + + + + + + + + diff --git a/code/ressources/fxml/MainPage.fxml b/code/ressources/fxml/MainPage.fxml index a336485..14124f6 100644 --- a/code/ressources/fxml/MainPage.fxml +++ b/code/ressources/fxml/MainPage.fxml @@ -9,8 +9,8 @@ - - + diff --git a/code/ressources/fxml/sample.fxml b/code/ressources/fxml/sample.fxml new file mode 100644 index 0000000..ef104af --- /dev/null +++ b/code/ressources/fxml/sample.fxml @@ -0,0 +1,151 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/ressources/fxml/viewJeu1.fxml b/code/ressources/fxml/viewJeu1.fxml deleted file mode 100644 index 02c3ea9..0000000 --- a/code/ressources/fxml/viewJeu1.fxml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - -