From 2bb0642d0b4d6784fb04b9b0b32258250274b7c4 Mon Sep 17 00:00:00 2001 From: ZIRTR0X <76250995+ZIRTR0X@users.noreply.github.com> Date: Tue, 28 Dec 2021 20:42:28 +0100 Subject: [PATCH] melange des deux codes bug de la imageView --- .../code/fxml/ConfigurationMenu.fxml | 2 +- .../code/fxml/GameConfigurationMenu.fxml | 36 ++- code/out/production/code/fxml/MainPage.fxml | 4 +- code/out/production/code/fxml/PageGame.fxml | 61 ++--- code/out/production/code/fxml/sample.fxml | 151 +++++++++++ code/out/production/code/fxml/viewGame.fxml | 51 ++++ code/out/production/code/fxml/viewJeu1.fxml | 39 --- code/out/production/code/image/PageGame.fxml | 40 --- .../code/image/personnage/Perso1.10.png | Bin 0 -> 1000 bytes .../code/image/personnage/Perso1.11.png | Bin 0 -> 970 bytes .../code/image/personnage/Perso1.12.png | Bin 0 -> 989 bytes .../code/image/personnage/Perso2.1.png | Bin 0 -> 1082 bytes .../code/image/personnage/Perso2.10.png | Bin 0 -> 978 bytes .../code/image/personnage/Perso2.11.png | Bin 0 -> 970 bytes .../code/image/personnage/Perso2.12.png | Bin 0 -> 970 bytes .../code/image/personnage/Perso2.2.png | Bin 0 -> 1115 bytes .../code/image/personnage/Perso2.3.png | Bin 0 -> 1100 bytes .../code/image/personnage/Perso2.4.png | Bin 0 -> 1061 bytes .../code/image/personnage/Perso2.5.png | Bin 0 -> 1061 bytes .../code/image/personnage/Perso2.6.png | Bin 0 -> 1069 bytes .../code/image/personnage/Perso2.7.png | Bin 0 -> 1037 bytes .../code/image/personnage/Perso2.8.png | Bin 0 -> 1026 bytes .../code/image/personnage/Perso2.9.png | Bin 0 -> 1012 bytes .../code/image/personnage/Perso3.1.png | Bin 0 -> 1179 bytes .../code/image/personnage/Perso3.10.png | Bin 0 -> 955 bytes .../code/image/personnage/Perso3.11.png | Bin 0 -> 910 bytes .../code/image/personnage/Perso3.12.png | Bin 0 -> 927 bytes .../code/image/personnage/Perso3.2.png | Bin 0 -> 1195 bytes .../code/image/personnage/Perso3.3.png | Bin 0 -> 1167 bytes .../code/image/personnage/Perso3.4.png | Bin 0 -> 1132 bytes .../code/image/personnage/Perso3.5.png | Bin 0 -> 1128 bytes .../code/image/personnage/Perso3.6.png | Bin 0 -> 1125 bytes .../code/image/personnage/Perso3.7.png | Bin 0 -> 1103 bytes .../code/image/personnage/Perso3.8.png | Bin 0 -> 1106 bytes .../code/image/personnage/Perso3.9.png | Bin 0 -> 1113 bytes .../production/code/image/terrain/chemin.png | Bin 0 -> 2423 bytes .../production/code/image/terrain/herbe.png | Bin 0 -> 2620 bytes code/ressources/fxml/PageGame.fxml | 60 +++-- code/ressources/fxml/viewGame.fxml | 8 +- code/ressources/image/PageGame.fxml | 40 --- .../ressources/image/personnage/Perso1.10.png | Bin 0 -> 1000 bytes .../ressources/image/personnage/Perso1.11.png | Bin 0 -> 970 bytes .../ressources/image/personnage/Perso1.12.png | Bin 0 -> 989 bytes code/ressources/image/personnage/Perso2.1.png | Bin 0 -> 1082 bytes .../ressources/image/personnage/Perso2.10.png | Bin 0 -> 978 bytes .../ressources/image/personnage/Perso2.11.png | Bin 0 -> 970 bytes .../ressources/image/personnage/Perso2.12.png | Bin 0 -> 970 bytes code/ressources/image/personnage/Perso2.2.png | Bin 0 -> 1115 bytes code/ressources/image/personnage/Perso2.3.png | Bin 0 -> 1100 bytes code/ressources/image/personnage/Perso2.4.png | Bin 0 -> 1061 bytes code/ressources/image/personnage/Perso2.5.png | Bin 0 -> 1061 bytes code/ressources/image/personnage/Perso2.6.png | Bin 0 -> 1069 bytes code/ressources/image/personnage/Perso2.7.png | Bin 0 -> 1037 bytes code/ressources/image/personnage/Perso2.8.png | Bin 0 -> 1026 bytes code/ressources/image/personnage/Perso2.9.png | Bin 0 -> 1012 bytes code/ressources/image/personnage/Perso3.1.png | Bin 0 -> 1179 bytes .../ressources/image/personnage/Perso3.10.png | Bin 0 -> 955 bytes .../ressources/image/personnage/Perso3.11.png | Bin 0 -> 910 bytes .../ressources/image/personnage/Perso3.12.png | Bin 0 -> 927 bytes code/ressources/image/personnage/Perso3.2.png | Bin 0 -> 1195 bytes code/ressources/image/personnage/Perso3.3.png | Bin 0 -> 1167 bytes code/ressources/image/personnage/Perso3.4.png | Bin 0 -> 1132 bytes code/ressources/image/personnage/Perso3.5.png | Bin 0 -> 1128 bytes code/ressources/image/personnage/Perso3.6.png | Bin 0 -> 1125 bytes code/ressources/image/personnage/Perso3.7.png | Bin 0 -> 1103 bytes code/ressources/image/personnage/Perso3.8.png | Bin 0 -> 1106 bytes code/ressources/image/personnage/Perso3.9.png | Bin 0 -> 1113 bytes .../controller/GameConfigMenuController.java | 12 +- code/src/controller/GamePlayController.java | 217 +++++++++++++++- code/src/controller/MapController.java | 102 ++++++++ code/src/controller/MusiqueController.java | 28 +++ code/src/controller/PageGameController.java | 234 ++++++++++++++++++ code/src/controller/PersoController.java | 53 ++++ code/src/launcher/Main.java | 46 +--- code/src/model/Album.java | 18 -- code/src/model/Map.java | 26 +- 76 files changed, 966 insertions(+), 262 deletions(-) create mode 100644 code/out/production/code/fxml/sample.fxml create mode 100644 code/out/production/code/fxml/viewGame.fxml delete mode 100644 code/out/production/code/fxml/viewJeu1.fxml delete mode 100644 code/out/production/code/image/PageGame.fxml create mode 100644 code/out/production/code/image/personnage/Perso1.10.png create mode 100644 code/out/production/code/image/personnage/Perso1.11.png create mode 100644 code/out/production/code/image/personnage/Perso1.12.png create mode 100644 code/out/production/code/image/personnage/Perso2.1.png create mode 100644 code/out/production/code/image/personnage/Perso2.10.png create mode 100644 code/out/production/code/image/personnage/Perso2.11.png create mode 100644 code/out/production/code/image/personnage/Perso2.12.png create mode 100644 code/out/production/code/image/personnage/Perso2.2.png create mode 100644 code/out/production/code/image/personnage/Perso2.3.png create mode 100644 code/out/production/code/image/personnage/Perso2.4.png create mode 100644 code/out/production/code/image/personnage/Perso2.5.png create mode 100644 code/out/production/code/image/personnage/Perso2.6.png create mode 100644 code/out/production/code/image/personnage/Perso2.7.png create mode 100644 code/out/production/code/image/personnage/Perso2.8.png create mode 100644 code/out/production/code/image/personnage/Perso2.9.png create mode 100644 code/out/production/code/image/personnage/Perso3.1.png create mode 100644 code/out/production/code/image/personnage/Perso3.10.png create mode 100644 code/out/production/code/image/personnage/Perso3.11.png create mode 100644 code/out/production/code/image/personnage/Perso3.12.png create mode 100644 code/out/production/code/image/personnage/Perso3.2.png create mode 100644 code/out/production/code/image/personnage/Perso3.3.png create mode 100644 code/out/production/code/image/personnage/Perso3.4.png create mode 100644 code/out/production/code/image/personnage/Perso3.5.png create mode 100644 code/out/production/code/image/personnage/Perso3.6.png create mode 100644 code/out/production/code/image/personnage/Perso3.7.png create mode 100644 code/out/production/code/image/personnage/Perso3.8.png create mode 100644 code/out/production/code/image/personnage/Perso3.9.png create mode 100644 code/out/production/code/image/terrain/chemin.png create mode 100644 code/out/production/code/image/terrain/herbe.png delete mode 100644 code/ressources/image/PageGame.fxml create mode 100644 code/ressources/image/personnage/Perso1.10.png create mode 100644 code/ressources/image/personnage/Perso1.11.png create mode 100644 code/ressources/image/personnage/Perso1.12.png create mode 100644 code/ressources/image/personnage/Perso2.1.png create mode 100644 code/ressources/image/personnage/Perso2.10.png create mode 100644 code/ressources/image/personnage/Perso2.11.png create mode 100644 code/ressources/image/personnage/Perso2.12.png create mode 100644 code/ressources/image/personnage/Perso2.2.png create mode 100644 code/ressources/image/personnage/Perso2.3.png create mode 100644 code/ressources/image/personnage/Perso2.4.png create mode 100644 code/ressources/image/personnage/Perso2.5.png create mode 100644 code/ressources/image/personnage/Perso2.6.png create mode 100644 code/ressources/image/personnage/Perso2.7.png create mode 100644 code/ressources/image/personnage/Perso2.8.png create mode 100644 code/ressources/image/personnage/Perso2.9.png create mode 100644 code/ressources/image/personnage/Perso3.1.png create mode 100644 code/ressources/image/personnage/Perso3.10.png create mode 100644 code/ressources/image/personnage/Perso3.11.png create mode 100644 code/ressources/image/personnage/Perso3.12.png create mode 100644 code/ressources/image/personnage/Perso3.2.png create mode 100644 code/ressources/image/personnage/Perso3.3.png create mode 100644 code/ressources/image/personnage/Perso3.4.png create mode 100644 code/ressources/image/personnage/Perso3.5.png create mode 100644 code/ressources/image/personnage/Perso3.6.png create mode 100644 code/ressources/image/personnage/Perso3.7.png create mode 100644 code/ressources/image/personnage/Perso3.8.png create mode 100644 code/ressources/image/personnage/Perso3.9.png create mode 100644 code/src/controller/MapController.java create mode 100644 code/src/controller/MusiqueController.java create mode 100644 code/src/controller/PageGameController.java create mode 100644 code/src/controller/PersoController.java diff --git a/code/out/production/code/fxml/ConfigurationMenu.fxml b/code/out/production/code/fxml/ConfigurationMenu.fxml index 4a61b55..a04d8e2 100644 --- a/code/out/production/code/fxml/ConfigurationMenu.fxml +++ b/code/out/production/code/fxml/ConfigurationMenu.fxml @@ -6,7 +6,7 @@ - + diff --git a/code/out/production/code/fxml/GameConfigurationMenu.fxml b/code/out/production/code/fxml/GameConfigurationMenu.fxml index 6c8b7f7..15b372b 100644 --- a/code/out/production/code/fxml/GameConfigurationMenu.fxml +++ b/code/out/production/code/fxml/GameConfigurationMenu.fxml @@ -1,6 +1,7 @@ + @@ -11,10 +12,9 @@ - - + - + - + - + @@ -88,13 +88,33 @@ - - - + + + + + + + + + + + + + + + + + + diff --git a/code/out/production/code/fxml/MainPage.fxml b/code/out/production/code/fxml/MainPage.fxml index a336485..14124f6 100644 --- a/code/out/production/code/fxml/MainPage.fxml +++ b/code/out/production/code/fxml/MainPage.fxml @@ -9,8 +9,8 @@ - - - - - - - - - - - - - - - - - - - -