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

remise de la partie ihm

Browse Source
This commit is contained in:
Chiara
2020-04-17 11:46:51 +02:00
parent bb13df4941 88af998484
commit b1a64cbb7a
11 changed files with 278 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/ihm/ressources/Menu.fxml
View File

@ -7,12 +7,20 @@
<Pane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" onMouseClicked="#afficheBonjour" prefHeight="400.0" prefWidth="600.0" styleClass="background" stylesheets="@style/menu.css" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ihm.controller.MenuController">
<children>
<<<<<<< HEAD
<Button layoutX="231.0" layoutY="161.0" mnemonicParsing="false" onMouseClicked="#commencerPartie" prefHeight="39.0" prefWidth="139.0" styleClass="bouton" stylesheets="@style/menu.css" text="Jouer">
=======
<Button layoutX="231.0" layoutY="161.0" mnemonicParsing="false" onMouseClicked="#changerNom" prefHeight="39.0" prefWidth="139.0" styleClass="bouton" stylesheets="@style/menu.css" text="Jouer">
>>>>>>> 88af99848491a78118cac6121fa65e6c2ffd3f56
<font>
<Font size="18.0" />
</font>
</Button>
<<<<<<< HEAD
<Button layoutX="230.0" layoutY="244.0" mnemonicParsing="false" onMouseClicked="#afficherRegle" styleClass="bouton" stylesheets="@style/menu.css" text="Règles du jeux">
=======
<Button layoutX="230.0" layoutY="244.0" mnemonicParsing="false" styleClass="bouton" stylesheets="@style/menu.css" text="Règles du jeux">
>>>>>>> 88af99848491a78118cac6121fa65e6c2ffd3f56
<font>
<Font size="18.0" />
</font>

14
src/ihm/ressources/Plateau.fxml
View File

@ -180,10 +180,17 @@
<children>
<VBox alignment="CENTER" prefHeight="136.0" prefWidth="17.0">
<children>
<<<<<<< HEAD
<Circle fill="#ff1f1f" radius="8.0" stroke="BLACK" strokeType="INSIDE" />
<Circle fill="#fccb0a" radius="8.0" stroke="BLACK" strokeType="INSIDE" />
<Circle fill="#f1ff1f" radius="8.0" stroke="BLACK" strokeType="INSIDE" />
<Circle fill="#1fff35" radius="8.0" stroke="BLACK" strokeType="INSIDE" />
=======
<Circle fill="DODGERBLUE" radius="8.0" stroke="BLACK" strokeType="INSIDE" />
<Circle fill="DODGERBLUE" radius="8.0" stroke="BLACK" strokeType="INSIDE" />
<Circle fill="DODGERBLUE" radius="8.0" stroke="BLACK" strokeType="INSIDE" />
<Circle fill="DODGERBLUE" radius="8.0" stroke="BLACK" strokeType="INSIDE" />
>>>>>>> 88af99848491a78118cac6121fa65e6c2ffd3f56
</children>
</VBox>
<HBox alignment="CENTER" prefHeight="100.0" prefWidth="200.0">
@ -206,10 +213,17 @@
</HBox>
<VBox alignment="CENTER" prefHeight="136.0" prefWidth="19.0">
<children>
<<<<<<< HEAD
<Circle fill="#21e9ff" radius="8.0" stroke="BLACK" strokeType="INSIDE" />
<Circle fill="#4421ff" radius="8.0" stroke="BLACK" strokeType="INSIDE" />
<Circle fill="#ff21d8" radius="8.0" stroke="BLACK" strokeType="INSIDE" />
<Circle fill="#d521ff" radius="8.0" stroke="BLACK" strokeType="INSIDE" />
=======
<Circle fill="DODGERBLUE" radius="8.0" stroke="BLACK" strokeType="INSIDE" />
<Circle fill="DODGERBLUE" radius="8.0" stroke="BLACK" strokeType="INSIDE" />
<Circle fill="DODGERBLUE" radius="8.0" stroke="BLACK" strokeType="INSIDE" />
<Circle fill="DODGERBLUE" radius="8.0" stroke="BLACK" strokeType="INSIDE" />
>>>>>>> 88af99848491a78118cac6121fa65e6c2ffd3f56
</children>
</VBox>
</children>