Merge branch 'development' of https://github.com/PTE-SH/ShadowHunterGame into development
This commit is contained in:
nawfe
commit
c07fb7afca
@ -332,7 +332,7 @@ public class PlayersController implements Initializable{
|
|||||||
}
|
}
|
||||||
public boolean textVide() {
|
public boolean textVide() {
|
||||||
for(int i=0;i<txt.size();i++) {
|
for(int i=0;i<txt.size();i++) {
|
||||||
if(txt.get(i).isEditable() && txt.get(i).getText().equals("") || txt.get(i).isEditable() && txt.get(i).getText().isBlank()) {
|
if(txt.get(i).isEditable() && txt.get(i).getText().equals("") && txt.get(i).getText().isBlank()) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -377,19 +377,7 @@ public class PlayersController implements Initializable{
|
|||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
/* public boolean nomAutorise() {
|
|
||||||
|
|
||||||
int i=0;
|
|
||||||
while(i<txt.size()) {
|
|
||||||
if(txt.get(i).isEditable() && txt.get(i).getText().isBlank()) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
i++;
|
|
||||||
}
|
|
||||||
|
|
||||||
return true;
|
|
||||||
|
|
||||||
}*/
|
|
||||||
@FXML
|
@FXML
|
||||||
public void retour(MouseEvent me) throws IOException {
|
public void retour(MouseEvent me) throws IOException {
|
||||||
InputStream fileSound1 = getClass().getResourceAsStream("/ihm/ressources/musique/BEEP1.wav");
|
InputStream fileSound1 = getClass().getResourceAsStream("/ihm/ressources/musique/BEEP1.wav");
|
||||||
|
|||||||
@ -19,111 +19,119 @@
|
|||||||
<Font size="48.0" />
|
<Font size="48.0" />
|
||||||
</font>
|
</font>
|
||||||
</Label>
|
</Label>
|
||||||
<VBox>
|
<HBox prefHeight="100.0" prefWidth="200.0">
|
||||||
<children>
|
<children>
|
||||||
<Label style="-fx-border-width: 0 0 0.5 0; -fx-border-color: #e2e2e2;" text="%sons">
|
<VBox prefHeight="322.0" prefWidth="315.0">
|
||||||
<font>
|
|
||||||
<Font size="18.0" />
|
|
||||||
</font>
|
|
||||||
</Label>
|
|
||||||
<HBox alignment="CENTER_LEFT">
|
|
||||||
<children>
|
<children>
|
||||||
<Label text="%musique">
|
<Label style="-fx-border-width: 0 0 0.5 0; -fx-border-color: #e2e2e2;" text="%sons">
|
||||||
<HBox.margin>
|
|
||||||
<Insets right="300.0" />
|
|
||||||
</HBox.margin>
|
|
||||||
<font>
|
<font>
|
||||||
<Font size="14.0" />
|
<Font size="18.0" />
|
||||||
</font>
|
</font>
|
||||||
</Label>
|
</Label>
|
||||||
<CheckBox fx:id="cbMusique" mnemonicParsing="false">
|
<HBox alignment="CENTER_LEFT">
|
||||||
<HBox.margin>
|
<children>
|
||||||
|
<Label text="%musique">
|
||||||
|
<HBox.margin>
|
||||||
|
<Insets />
|
||||||
|
</HBox.margin>
|
||||||
|
<font>
|
||||||
|
<Font size="14.0" />
|
||||||
|
</font>
|
||||||
|
</Label>
|
||||||
|
</children>
|
||||||
|
<VBox.margin>
|
||||||
<Insets bottom="5.0" />
|
<Insets bottom="5.0" />
|
||||||
</HBox.margin>
|
</VBox.margin>
|
||||||
</CheckBox>
|
</HBox>
|
||||||
</children>
|
<HBox>
|
||||||
<VBox.margin>
|
<children>
|
||||||
<Insets bottom="5.0" />
|
<Slider fx:id="sliderMusiquePause" blockIncrement="1.0" majorTickUnit="1.0" max="1.0" minorTickCount="10" onMouseClicked="#slideVolumeMusique" prefHeight="14.0" prefWidth="194.0" value="0.1" />
|
||||||
</VBox.margin>
|
</children>
|
||||||
</HBox>
|
</HBox>
|
||||||
<HBox prefHeight="0.0" prefWidth="540.0">
|
<Label prefHeight="18.0" prefWidth="198.0" styleClass="text" stylesheets="@style/plateau.css" text="The Red Fox Tavern - Curran Son">
|
||||||
<children>
|
<opaqueInsets>
|
||||||
<Slider fx:id="sliderMusiquePause" blockIncrement="1.0" majorTickUnit="1.0" max="1.0" minorTickCount="10" onMouseClicked="#slideVolumeMusique" prefHeight="14.0" prefWidth="194.0" value="0.1" />
|
<Insets />
|
||||||
</children>
|
</opaqueInsets>
|
||||||
</HBox>
|
<padding>
|
||||||
<Label prefHeight="18.0" prefWidth="198.0" styleClass="text" stylesheets="@style/plateau.css" text="The Red Fox Tavern - Curran Son">
|
<Insets bottom="20.0" left="5.0" />
|
||||||
<opaqueInsets>
|
</padding>
|
||||||
<Insets />
|
</Label>
|
||||||
</opaqueInsets>
|
<HBox alignment="CENTER_LEFT">
|
||||||
<padding>
|
<children>
|
||||||
<Insets bottom="20.0" left="5.0" />
|
<Label text="%effet">
|
||||||
</padding>
|
<HBox.margin>
|
||||||
</Label>
|
<Insets />
|
||||||
<HBox alignment="CENTER_LEFT">
|
</HBox.margin>
|
||||||
<children>
|
<font>
|
||||||
<Label text="%effet">
|
<Font size="14.0" />
|
||||||
<HBox.margin>
|
</font>
|
||||||
<Insets right="273.0" />
|
</Label>
|
||||||
</HBox.margin>
|
</children>
|
||||||
|
</HBox>
|
||||||
|
<HBox prefHeight="0.0" prefWidth="540.0">
|
||||||
|
<children>
|
||||||
|
<Slider fx:id="sliderEffetsPause" blockIncrement="1.0" majorTickUnit="1.0" max="0.0" min="-20.0" minorTickCount="10" onMouseClicked="#slideVolumeEffets" prefHeight="14.0" prefWidth="194.0" />
|
||||||
|
</children>
|
||||||
|
</HBox>
|
||||||
|
<Button fx:id="reglesPause" mnemonicParsing="false" onMouseClicked="#afficherReglePause" text="%regles">
|
||||||
<font>
|
<font>
|
||||||
<Font size="14.0" />
|
<Font size="14.0" />
|
||||||
</font>
|
</font>
|
||||||
|
<VBox.margin>
|
||||||
|
<Insets top="30.0" />
|
||||||
|
</VBox.margin>
|
||||||
|
</Button>
|
||||||
|
<Label style="-fx-border-width: 0 0 0.5 0; -fx-border-color: #e2e2e2;" text="%jeux">
|
||||||
|
<VBox.margin>
|
||||||
|
<Insets top="50.0" />
|
||||||
|
</VBox.margin>
|
||||||
|
<font>
|
||||||
|
<Font size="18.0" />
|
||||||
|
</font>
|
||||||
</Label>
|
</Label>
|
||||||
<CheckBox fx:id="cbEffet" mnemonicParsing="false" />
|
<HBox>
|
||||||
|
<VBox.margin>
|
||||||
|
<Insets top="5.0" />
|
||||||
|
</VBox.margin>
|
||||||
|
<children>
|
||||||
|
<Button mnemonicParsing="false" onMouseClicked="#reprendre" text="%reprendre.partie">
|
||||||
|
<HBox.margin>
|
||||||
|
<Insets right="25.0" />
|
||||||
|
</HBox.margin>
|
||||||
|
<font>
|
||||||
|
<Font size="14.0" />
|
||||||
|
</font>
|
||||||
|
</Button>
|
||||||
|
</children>
|
||||||
|
</HBox>
|
||||||
</children>
|
</children>
|
||||||
</HBox>
|
<padding>
|
||||||
<HBox prefHeight="0.0" prefWidth="540.0">
|
<Insets left="100.0" />
|
||||||
|
</padding>
|
||||||
|
</VBox>
|
||||||
|
<VBox prefHeight="325.0" prefWidth="199.0">
|
||||||
<children>
|
<children>
|
||||||
<Slider fx:id="sliderEffetsPause" blockIncrement="1.0" majorTickUnit="1.0" max="0.0" min="-20.0" minorTickCount="10" onMouseClicked="#slideVolumeEffets" prefHeight="14.0" prefWidth="194.0" />
|
<CheckBox fx:id="cbMusique" mnemonicParsing="false">
|
||||||
</children>
|
<VBox.margin>
|
||||||
</HBox>
|
<Insets bottom="50.0" top="30.0" />
|
||||||
<Button fx:id="reglesPause" mnemonicParsing="false" onMouseClicked="#afficherReglePause" text="%regles">
|
</VBox.margin>
|
||||||
<font>
|
</CheckBox>
|
||||||
<Font size="14.0" />
|
<CheckBox fx:id="cbEffet" alignment="CENTER" mnemonicParsing="false" />
|
||||||
</font>
|
|
||||||
<VBox.margin>
|
|
||||||
<Insets top="30.0" />
|
|
||||||
</VBox.margin>
|
|
||||||
</Button>
|
|
||||||
<Label style="-fx-border-width: 0 0 0.5 0; -fx-border-color: #e2e2e2;" text="%jeux">
|
|
||||||
<VBox.margin>
|
|
||||||
<Insets top="50.0" />
|
|
||||||
</VBox.margin>
|
|
||||||
<font>
|
|
||||||
<Font size="18.0" />
|
|
||||||
</font>
|
|
||||||
</Label>
|
|
||||||
<HBox>
|
|
||||||
<VBox.margin>
|
|
||||||
<Insets top="5.0" />
|
|
||||||
</VBox.margin>
|
|
||||||
<children>
|
|
||||||
<Button mnemonicParsing="false" onMouseClicked="#reprendre" text="%reprendre.partie">
|
|
||||||
<HBox.margin>
|
|
||||||
<Insets right="25.0" />
|
|
||||||
</HBox.margin>
|
|
||||||
<font>
|
|
||||||
<Font size="14.0" />
|
|
||||||
</font>
|
|
||||||
</Button>
|
|
||||||
<Button mnemonicParsing="false" onMouseClicked="#quitter" style="-fx-text-fill: red;" text="%quitter.jeu">
|
<Button mnemonicParsing="false" onMouseClicked="#quitter" style="-fx-text-fill: red;" text="%quitter.jeu">
|
||||||
<HBox.margin>
|
|
||||||
<Insets left="25.0" />
|
|
||||||
</HBox.margin>
|
|
||||||
<font>
|
<font>
|
||||||
<Font size="14.0" />
|
<Font size="14.0" />
|
||||||
</font>
|
</font>
|
||||||
|
<VBox.margin>
|
||||||
|
<Insets top="171.0" />
|
||||||
|
</VBox.margin>
|
||||||
</Button>
|
</Button>
|
||||||
</children>
|
</children>
|
||||||
</HBox>
|
<HBox.margin>
|
||||||
|
<Insets />
|
||||||
|
</HBox.margin>
|
||||||
|
</VBox>
|
||||||
</children>
|
</children>
|
||||||
<VBox.margin>
|
</HBox>
|
||||||
<Insets top="50.0" />
|
|
||||||
</VBox.margin>
|
|
||||||
<padding>
|
|
||||||
<Insets left="100.0" />
|
|
||||||
</padding>
|
|
||||||
</VBox>
|
|
||||||
</children>
|
</children>
|
||||||
</VBox>
|
</VBox>
|
||||||
</children>
|
</children>
|
||||||
|
|||||||
@ -16,7 +16,6 @@
|
|||||||
<?import javafx.scene.layout.RowConstraints?>
|
<?import javafx.scene.layout.RowConstraints?>
|
||||||
<?import javafx.scene.layout.StackPane?>
|
<?import javafx.scene.layout.StackPane?>
|
||||||
<?import javafx.scene.layout.VBox?>
|
<?import javafx.scene.layout.VBox?>
|
||||||
<?import javafx.scene.shape.Circle?>
|
|
||||||
<?import javafx.scene.text.Font?>
|
<?import javafx.scene.text.Font?>
|
||||||
|
|
||||||
<AnchorPane fx:id="rootPane" styleClass="background" stylesheets="@style/plateau.css" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ihm.controller.PlateauController">
|
<AnchorPane fx:id="rootPane" styleClass="background" stylesheets="@style/plateau.css" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ihm.controller.PlateauController">
|
||||||
@ -300,23 +299,6 @@
|
|||||||
<RowConstraints vgrow="ALWAYS" />
|
<RowConstraints vgrow="ALWAYS" />
|
||||||
</rowConstraints>
|
</rowConstraints>
|
||||||
<children>
|
<children>
|
||||||
<GridPane>
|
|
||||||
<columnConstraints>
|
|
||||||
<ColumnConstraints />
|
|
||||||
</columnConstraints>
|
|
||||||
<rowConstraints>
|
|
||||||
<RowConstraints vgrow="SOMETIMES" />
|
|
||||||
<RowConstraints vgrow="SOMETIMES" />
|
|
||||||
<RowConstraints vgrow="SOMETIMES" />
|
|
||||||
<RowConstraints vgrow="SOMETIMES" />
|
|
||||||
</rowConstraints>
|
|
||||||
<children>
|
|
||||||
<Circle fill="#ff1f1f" radius="10.0" stroke="BLACK" strokeType="INSIDE" />
|
|
||||||
<Circle fill="#ffd71f" radius="10.0" stroke="BLACK" strokeType="INSIDE" GridPane.rowIndex="1" />
|
|
||||||
<Circle fill="#ecff1f" radius="10.0" stroke="BLACK" strokeType="INSIDE" GridPane.rowIndex="2" />
|
|
||||||
<Circle fill="#64ff1f" radius="10.0" stroke="BLACK" strokeType="INSIDE" GridPane.rowIndex="3" />
|
|
||||||
</children>
|
|
||||||
</GridPane>
|
|
||||||
<GridPane fx:id="gridPaneLieux" hgap="20.0" GridPane.columnIndex="1">
|
<GridPane fx:id="gridPaneLieux" hgap="20.0" GridPane.columnIndex="1">
|
||||||
<columnConstraints>
|
<columnConstraints>
|
||||||
<ColumnConstraints />
|
<ColumnConstraints />
|
||||||
@ -389,23 +371,6 @@
|
|||||||
</HBox>
|
</HBox>
|
||||||
</children>
|
</children>
|
||||||
</GridPane>
|
</GridPane>
|
||||||
<GridPane GridPane.columnIndex="2">
|
|
||||||
<columnConstraints>
|
|
||||||
<ColumnConstraints />
|
|
||||||
</columnConstraints>
|
|
||||||
<rowConstraints>
|
|
||||||
<RowConstraints vgrow="SOMETIMES" />
|
|
||||||
<RowConstraints vgrow="SOMETIMES" />
|
|
||||||
<RowConstraints vgrow="SOMETIMES" />
|
|
||||||
<RowConstraints vgrow="SOMETIMES" />
|
|
||||||
</rowConstraints>
|
|
||||||
<children>
|
|
||||||
<Circle fill="#21ffee" radius="10.0" stroke="BLACK" strokeType="INSIDE" />
|
|
||||||
<Circle fill="#2168ff" radius="10.0" stroke="BLACK" strokeType="INSIDE" GridPane.rowIndex="1" />
|
|
||||||
<Circle fill="#d921ff" radius="10.0" stroke="BLACK" strokeType="INSIDE" GridPane.rowIndex="2" />
|
|
||||||
<Circle fill="#ff21ad" radius="10.0" stroke="BLACK" strokeType="INSIDE" GridPane.rowIndex="3" />
|
|
||||||
</children>
|
|
||||||
</GridPane>
|
|
||||||
</children>
|
</children>
|
||||||
</GridPane>
|
</GridPane>
|
||||||
<Button mnemonicParsing="false" onMouseClicked="#mettreEnPause" styleClass="boutonPause">
|
<Button mnemonicParsing="false" onMouseClicked="#mettreEnPause" styleClass="boutonPause">
|
||||||
@ -420,7 +385,7 @@
|
|||||||
<Insets bottom="-50.0" top="-45.0" />
|
<Insets bottom="-50.0" top="-45.0" />
|
||||||
</VBox.margin>
|
</VBox.margin>
|
||||||
</Button>
|
</Button>
|
||||||
<GridPane>
|
<GridPane alignment="CENTER" hgap="5.0" vgap="5.0">
|
||||||
<columnConstraints>
|
<columnConstraints>
|
||||||
<ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
|
<ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
|
||||||
<ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
|
<ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
|
||||||
@ -469,10 +434,12 @@
|
|||||||
<VBox alignment="CENTER" prefHeight="200.0" prefWidth="100.0">
|
<VBox alignment="CENTER" prefHeight="200.0" prefWidth="100.0">
|
||||||
<children>
|
<children>
|
||||||
<Label styleClass="text" text="Charles" />
|
<Label styleClass="text" text="Charles" />
|
||||||
<Label layoutX="29.0" layoutY="16.0" styleClass="text" text="Metamorphe" />
|
<Label layoutX="29.0" layoutY="16.0" styleClass="text" text="Metamorphe">
|
||||||
|
<font>
|
||||||
|
<Font size="10.0" />
|
||||||
|
</font></Label>
|
||||||
</children>
|
</children>
|
||||||
</VBox>
|
</VBox>
|
||||||
<VBox prefHeight="200.0" prefWidth="100.0" />
|
|
||||||
</children>
|
</children>
|
||||||
</StackPane>
|
</StackPane>
|
||||||
<StackPane prefHeight="150.0" prefWidth="200.0" GridPane.columnIndex="12">
|
<StackPane prefHeight="150.0" prefWidth="200.0" GridPane.columnIndex="12">
|
||||||
@ -498,7 +465,10 @@
|
|||||||
<children>
|
<children>
|
||||||
<VBox alignment="CENTER" prefHeight="200.0" prefWidth="100.0">
|
<VBox alignment="CENTER" prefHeight="200.0" prefWidth="100.0">
|
||||||
<children>
|
<children>
|
||||||
<Label styleClass="text" text="Loup-Garou" />
|
<Label styleClass="text" text="Loup-Garou">
|
||||||
|
<font>
|
||||||
|
<Font size="10.0" />
|
||||||
|
</font></Label>
|
||||||
<Label layoutX="38.0" layoutY="16.0" styleClass="text" text="George" />
|
<Label layoutX="38.0" layoutY="16.0" styleClass="text" text="George" />
|
||||||
</children>
|
</children>
|
||||||
</VBox>
|
</VBox>
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user