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

Merge

Browse Source
This commit is contained in:
Paul Gross
2020-04-30 11:43:55 +02:00
parent b6932c530e b293b3ed01
commit 56a1177eaf
5 changed files with 71 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/ihm/ressources/Jouer_tour(2)carte_lieux.fxml
View File

@@ -3,24 +3,24 @@
<?import javafx.scene.control.Button?>
<?import javafx.scene.control.Label?>
<?import javafx.scene.image.ImageView?>
<?import javafx.scene.layout.AnchorPane?>
<?import javafx.scene.layout.Pane?>
<?import javafx.scene.text.Font?>
<Pane fx:id="rootPane" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="480.0" prefWidth="640.0" stylesheets="@style/popUp.css" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ihm.controller.JouerSonTour2Controller">
<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="180.0" prefWidth="255.0" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ihm.controller.JouerSonTour2Controller">
<children>
<Label fx:id="descriptionLieu" layoutX="315.0" layoutY="151.0" text="%description.capacite.carte.lieux">
<font>
<Font size="18.0" />
</font>
</Label>
<Button layoutX="356.0" layoutY="227.0" mnemonicParsing="false" onMouseClicked="#capaciteLieu" text="%utiliser.capaciter.lieux">
<font>
<Font size="18.0" />
</font></Button>
<Button layoutX="389.0" layoutY="307.0" mnemonicParsing="false" onMouseClicked="#ignorerEtape" text="%sauter.etape">
<font>
<Font size="18.0" />
</font></Button>
<ImageView fitHeight="326.0" fitWidth="233.5" layoutX="64.0" layoutY="84.0" pickOnBounds="true" preserveRatio="true" />
<Pane fx:id="rootPane" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="180.0" prefWidth="255.0" stylesheets="@style/popUp.css">
<children>
<Button layoutX="112.0" layoutY="128.0" mnemonicParsing="false" onMouseClicked="#capaciteLieu" text="%utiliser.capaciter.lieux" />
<Button layoutX="136.0" layoutY="90.0" mnemonicParsing="false" onMouseClicked="#ignorerEtape" text="%sauter.etape" />
<ImageView fitHeight="114.0" fitWidth="82.0" layoutX="14.0" layoutY="33.0" pickOnBounds="true" preserveRatio="true" />
<Label fx:id="descriptionLieu" layoutX="96.0" layoutY="33.0" text="%description.capacite.carte.lieux">
<font>
<Font size="11.0" />
</font>
</Label>
</children>
</Pane>
</children>
</Pane>
</AnchorPane>

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

@@ -288,7 +288,7 @@
</VBox>
</left>
<right>
<VBox alignment="CENTER_RIGHT" prefHeight="854.0" prefWidth="436.0" BorderPane.alignment="CENTER">
<VBox alignment="CENTER_RIGHT" prefHeight="864.0" prefWidth="444.0" BorderPane.alignment="CENTER">
<children>
<VBox fx:id="joueur7" alignment="CENTER" prefHeight="285.0" prefWidth="445.0" rotate="270.0">
<children>
@@ -374,7 +374,7 @@
</VBox>
</right>
<center>
<HBox alignment="CENTER" prefHeight="720.0" prefWidth="1036.0" BorderPane.alignment="CENTER">
<HBox alignment="CENTER" prefHeight="720.0" prefWidth="1078.0" BorderPane.alignment="CENTER">
<children>
<VBox alignment="CENTER_LEFT" prefWidth="22.0">
<children>
@@ -409,7 +409,7 @@
</VBox>
<VBox alignment="CENTER" prefHeight="496.0" prefWidth="739.0">
<children>
<HBox alignment="TOP_CENTER" prefHeight="339.0" prefWidth="676.0">
<HBox fx:id="lieux" alignment="TOP_CENTER" prefHeight="339.0" prefWidth="676.0">
<children>
<VBox alignment="CENTER" prefHeight="223.0" prefWidth="0.0">
<children>
@@ -468,7 +468,7 @@
</VBox>
</children>
</HBox>
<VBox alignment="BOTTOM_CENTER" prefHeight="200.0" prefWidth="100.0">
<VBox alignment="BOTTOM_CENTER" prefHeight="200.0" prefWidth="771.0">
<children>
<HBox alignment="CENTER_RIGHT" prefHeight="60.0" prefWidth="671.0">
<children>
@@ -500,7 +500,7 @@
</VBox>
</children>
</HBox>
<HBox prefHeight="58.0" prefWidth="655.0">
<HBox fx:id="vie" prefHeight="58.0" prefWidth="655.0">
<children>
<HBox prefHeight="100.0" prefWidth="0.0" />
<HBox alignment="CENTER" prefHeight="64.0" prefWidth="50.0" stylesheets="@style/plateau.css">