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

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

Browse Source
This commit is contained in:
Chiara
2020-04-27 15:37:19 +02:00
parent bff45c162a d2acd6c92c
commit cefc6ceb75
8 changed files with 388 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/ihm/ressources/Choix_joueur.fxml
View File

@ -17,14 +17,14 @@
<left>
<VBox alignment="CENTER" prefHeight="688.0" prefWidth="240.0" BorderPane.alignment="CENTER">
<children>
<HBox fx:id="hb5" alignment="CENTER" prefHeight="67.0" prefWidth="340.0" rotate="90.0">
<HBox fx:id="hb5" alignment="CENTER_RIGHT" prefHeight="67.0" prefWidth="340.0" rotate="90.0">
<children>
<TextField>
<TextField prefHeight="51.0" prefWidth="149.0">
<font>
<Font size="24.0" />
</font>
</TextField>
<Button mnemonicParsing="false" prefHeight="55.0" prefWidth="100.0" styleClass="bouton" stylesheets="@style/menu.css" text="+">
<Button mnemonicParsing="false" prefHeight="55.0" prefWidth="45.0" styleClass="bouton" stylesheets="@style/menu.css" text="+">
<font>
<Font size="24.0" />
</font>
@ -45,14 +45,14 @@
<Insets bottom="150.0" left="-100.0" />
</VBox.margin>
</HBox>
<HBox fx:id="hb7" alignment="CENTER" rotate="90.0">
<HBox fx:id="hb7" alignment="CENTER_LEFT" rotate="90.0">
<children>
<TextField prefHeight="51.0" prefWidth="298.0">
<TextField prefHeight="51.0" prefWidth="149.0">
<font>
<Font size="24.0" />
</font>
</TextField>
<Button mnemonicParsing="false" prefHeight="55.0" prefWidth="100.0" styleClass="bouton" stylesheets="@style/menu.css" text="+">
<Button mnemonicParsing="false" prefHeight="55.0" prefWidth="45.0" styleClass="bouton" stylesheets="@style/menu.css" text="+">
<font>
<Font size="24.0" />
</font>
@ -79,14 +79,14 @@
<right>
<VBox alignment="CENTER" prefHeight="688.0" prefWidth="248.0" BorderPane.alignment="CENTER">
<children>
<HBox fx:id="hb6" alignment="CENTER" prefHeight="100.0" prefWidth="200.0" rotate="270.0">
<HBox fx:id="hb6" alignment="CENTER_LEFT" prefHeight="100.0" prefWidth="200.0" rotate="270.0">
<children>
<TextField>
<TextField prefHeight="51.0" prefWidth="149.0">
<font>
<Font size="24.0" />
</font>
</TextField>
<Button mnemonicParsing="false" prefHeight="55.0" prefWidth="100.0" styleClass="bouton" stylesheets="@style/menu.css" text="+">
<Button mnemonicParsing="false" prefHeight="55.0" prefWidth="45.0" styleClass="bouton" stylesheets="@style/menu.css" text="+">
<font>
<Font size="24.0" />
</font>
@ -107,23 +107,23 @@
<Insets bottom="150.0" right="-100.0" />
</VBox.margin>
</HBox>
<HBox fx:id="hb8" alignment="CENTER" prefHeight="100.0" prefWidth="200.0" rotate="270.0">
<HBox fx:id="hb8" alignment="CENTER_RIGHT" prefHeight="100.0" prefWidth="200.0" rotate="270.0">
<children>
<TextField>
<TextField prefHeight="51.0" prefWidth="149.0">
<font>
<Font size="24.0" />
</font>
</TextField>
<Button mnemonicParsing="false" prefHeight="55.0" prefWidth="100.0" styleClass="bouton" stylesheets="@style/menu.css" text="+">
<Button mnemonicParsing="false" prefHeight="55.0" prefWidth="45.0" styleClass="bouton" stylesheets="@style/menu.css" text="+">
<font>
<Font size="24.0" />
</font>
<HBox.margin>
<Insets left="10.0" right="10.0" />
</HBox.margin>
<padding>
<Insets right="5.0" />
</padding>
<HBox.margin>
<Insets left="10.0" right="10.0" />
</HBox.margin>
</Button>
<CheckBox mnemonicParsing="false">
<font>

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

@ -19,8 +19,6 @@
<children>
<VBox fx:id="joueur1" alignment="CENTER" prefHeight="164.0" prefWidth="212.0" rotate="180.0">
<children>
<Label styleClass="text" stylesheets="@style/plateau.css" text="Nom Faction" />
<Label styleClass="text" stylesheets="@style/plateau.css" text="Nom Perssonage" />
<Label styleClass="text" stylesheets="@style/plateau.css" text="Nom joueur" />
<HBox alignment="CENTER" prefHeight="46.0" prefWidth="212.0">
<children>
@ -54,8 +52,6 @@
</VBox>
<VBox fx:id="joueur2" alignment="CENTER" prefHeight="164.0" prefWidth="212.0" rotate="180.0">
<children>
<Label styleClass="text" stylesheets="@style/plateau.css" text="Nom Faction" />
<Label styleClass="text" stylesheets="@style/plateau.css" text="Nom Perssonage" />
<Label styleClass="text" stylesheets="@style/plateau.css" text="Nom joueur" />
<HBox alignment="CENTER" prefHeight="46.0" prefWidth="212.0">
<children>
@ -95,8 +91,6 @@
<children>
<VBox fx:id="joueur3" alignment="CENTER" prefHeight="164.0" prefWidth="212.0">
<children>
<Label styleClass="text" stylesheets="@style/plateau.css" text="Nom Faction" />
<Label styleClass="text" stylesheets="@style/plateau.css" text="Nom Personnage" />
<Label styleClass="text" stylesheets="@style/plateau.css" text="Nom joueur" />
<HBox alignment="CENTER" prefHeight="44.0" prefWidth="274.0">
<children>
@ -129,8 +123,6 @@
</VBox>
<VBox fx:id="joueur4" alignment="CENTER" prefHeight="164.0" prefWidth="212.0">
<children>
<Label styleClass="text" stylesheets="@style/plateau.css" text="Nom Faction" />
<Label styleClass="text" stylesheets="@style/plateau.css" text="Nom Personnage" />
<Label styleClass="text" stylesheets="@style/plateau.css" text="Nom joueur" />
<HBox alignment="CENTER" prefHeight="44.0" prefWidth="274.0">
<children>
@ -169,8 +161,6 @@
<children>
<VBox fx:id="joueur5" alignment="CENTER" prefHeight="181.0" prefWidth="333.0" rotate="90.0">
<children>
<Label styleClass="text" stylesheets="@style/plateau.css" text="Nom Faction" />
<Label styleClass="text" stylesheets="@style/plateau.css" text="Nom personnage" />
<Label styleClass="text" stylesheets="@style/plateau.css" text="Nom joueur" />
<HBox alignment="CENTER" prefHeight="53.0" prefWidth="198.0">
<children>
@ -203,8 +193,6 @@
</VBox>
<VBox fx:id="joueur7" alignment="CENTER" prefHeight="179.0" prefWidth="329.0" rotate="90.0">
<children>
<Label styleClass="text" stylesheets="@style/plateau.css" text="Nom Faction" />
<Label styleClass="text" stylesheets="@style/plateau.css" text="Nom personnage" />
<Label styleClass="text" stylesheets="@style/plateau.css" text="Nom joueur" />
<HBox alignment="CENTER" prefHeight="53.0" prefWidth="198.0">
<children>
@ -243,8 +231,6 @@
<children>
<VBox fx:id="joueur6" alignment="CENTER" prefHeight="163.0" prefWidth="329.0" rotate="270.0">
<children>
<Label styleClass="text" stylesheets="@style/plateau.css" text="Nom Faction" />
<Label styleClass="text" stylesheets="@style/plateau.css" text="Nom perssonage" />
<Label styleClass="text" stylesheets="@style/plateau.css" text="Nom joueur" />
<HBox alignment="CENTER" prefHeight="39.0" prefWidth="214.0">
<children>
@ -277,8 +263,6 @@
</VBox>
<VBox fx:id="joueur8" alignment="CENTER" prefHeight="163.0" prefWidth="329.0" rotate="270.0">
<children>
<Label styleClass="text" stylesheets="@style/plateau.css" text="Nom Faction" />
<Label styleClass="text" stylesheets="@style/plateau.css" text="Nom perssonage" />
<Label styleClass="text" stylesheets="@style/plateau.css" text="Nom joueur" />
<HBox alignment="CENTER" prefHeight="39.0" prefWidth="214.0">
<children>
@ -411,7 +395,6 @@
</VBox>
<VBox alignment="CENTER" prefHeight="60.0" prefWidth="50.0">
<children>
<Label styleClass="text" stylesheets="@style/plateau.css" text="Inconnu" />
<Label styleClass="text" stylesheets="@style/plateau.css" text="Charles" />
</children>
</VBox>