diff --git a/src/main/resources/fxml/LocalCreate.fxml b/src/main/resources/fxml/LocalCreate.fxml index 1da41963855b8d1448d6ad8828763194d3c61e50..50ecdfe94ed078789b47d315fe133810e54bdc28 100644 --- a/src/main/resources/fxml/LocalCreate.fxml +++ b/src/main/resources/fxml/LocalCreate.fxml @@ -17,7 +17,7 @@ <VBox fx:id="parent" alignment="BOTTOM_CENTER" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/21" xmlns:fx="http://javafx.com/fxml/1" fx:controller="de.hdm_stuttgart.battlearena.Controller.LocalCreateController"> <children> <Pane VBox.vgrow="ALWAYS" /> - <HBox alignment="TOP_CENTER" spacing="20.0"> + <HBox alignment="CENTER" spacing="20.0"> <children> <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Rounds:" /> <Accordion> @@ -52,7 +52,7 @@ </VBox.margin> </HBox> <Pane VBox.vgrow="ALWAYS" /> - <HBox alignment="TOP_CENTER" spacing="20.0"> + <HBox alignment="CENTER" spacing="20.0"> <children> <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Time:" /> <Accordion> diff --git a/src/main/resources/fxml/MapSelection.fxml b/src/main/resources/fxml/MapSelection.fxml index 1e30251d4dfa7c27720efbf14466425362af6208..0d975539ecdb7d9a755ef8584c8fddb424ab7459 100644 --- a/src/main/resources/fxml/MapSelection.fxml +++ b/src/main/resources/fxml/MapSelection.fxml @@ -12,70 +12,77 @@ <?import javafx.scene.layout.VBox?> <?import javafx.scene.text.Text?> -<VBox fx:id="parent" alignment="CENTER" prefHeight="400.0" prefWidth="600.0" spacing="20.0" xmlns="http://javafx.com/javafx/21" xmlns:fx="http://javafx.com/fxml/1" fx:controller="de.hdm_stuttgart.battlearena.Controller.MapSelectionController"> + +<HBox xmlns="http://javafx.com/javafx/21" xmlns:fx="http://javafx.com/fxml/1" fx:controller="de.hdm_stuttgart.battlearena.Controller.MapSelectionController"> <children> - <Pane VBox.vgrow="ALWAYS" /> - <HBox alignment="TOP_CENTER" spacing="20.0"> + <Pane HBox.hgrow="ALWAYS" /> + <VBox fx:id="parent" alignment="CENTER" prefHeight="400.0" prefWidth="600.0" spacing="20.0"> <children> - <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Maps:" /> - <Accordion> - <panes> - <TitledPane fx:id="maps" text="Select"> - <content> - <ScrollPane minViewportHeight="200.0"> + <Pane VBox.vgrow="ALWAYS" /> + <HBox alignment="CENTER_LEFT" spacing="20.0"> + <children> + <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Maps:" /> + <Accordion> + <panes> + <TitledPane fx:id="maps" text="Select"> <content> - <VBox fx:id="boxBox" /> + <ScrollPane minViewportHeight="200.0"> + <content> + <VBox fx:id="boxBox" /> + </content> + </ScrollPane> </content> - </ScrollPane> - </content> - </TitledPane> - </panes> - </Accordion> - </children> - <VBox.margin> - <Insets /> - </VBox.margin> - </HBox> - <HBox alignment="TOP_CENTER" spacing="20.0"> - <children> - <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Texture pack:" /> - <Accordion> - <panes> - <TitledPane fx:id="textures" text="Select"> - <content> - <ScrollPane minViewportHeight="200.0"> + </TitledPane> + </panes> + </Accordion> + </children> + <VBox.margin> + <Insets /> + </VBox.margin> + </HBox> + <HBox alignment="CENTER_LEFT" spacing="20.0"> + <children> + <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Texture pack:" /> + <Accordion> + <panes> + <TitledPane fx:id="textures" text="Select"> <content> - <VBox fx:id="boxBox1" alignment="CENTER_LEFT"> - <children> - <ToggleButton mnemonicParsing="false" text="Bomberman"> - <toggleGroup> - <ToggleGroup fx:id="textureToggle" /> - </toggleGroup> - </ToggleButton> - <ToggleButton mnemonicParsing="false" text="Dark Lands" toggleGroup="$textureToggle" /> - <ToggleButton mnemonicParsing="false" text="Forrest" toggleGroup="$textureToggle" /> - <ToggleButton mnemonicParsing="false" text="Grass" toggleGroup="$textureToggle" /> - </children> - </VBox> + <ScrollPane minViewportHeight="200.0"> + <content> + <VBox fx:id="boxBox1" alignment="CENTER_LEFT"> + <children> + <ToggleButton mnemonicParsing="false" text="Bomberman"> + <toggleGroup> + <ToggleGroup fx:id="textureToggle" /> + </toggleGroup> + </ToggleButton> + <ToggleButton mnemonicParsing="false" text="Dark Lands" toggleGroup="$textureToggle" /> + <ToggleButton mnemonicParsing="false" text="Forrest" toggleGroup="$textureToggle" /> + <ToggleButton mnemonicParsing="false" text="Grass" toggleGroup="$textureToggle" /> + </children> + </VBox> + </content> + </ScrollPane> </content> - </ScrollPane> - </content> - </TitledPane> - </panes> - </Accordion> - </children> - </HBox> - <HBox alignment="TOP_CENTER" maxWidth="-Infinity" minWidth="-Infinity" prefHeight="25.0" prefWidth="213.0" spacing="20.0"> - <children> - <Text fx:id="selectedMapText" strokeType="OUTSIDE" strokeWidth="0.0" /> + </TitledPane> + </panes> + </Accordion> + </children> + </HBox> + <HBox alignment="TOP_CENTER" maxWidth="-Infinity" minWidth="-Infinity" prefHeight="25.0" prefWidth="213.0" spacing="20.0"> + <children> + <Text fx:id="selectedMapText" strokeType="OUTSIDE" strokeWidth="0.0" /> + </children> + </HBox> + <Button mnemonicParsing="false" onAction="#gameScene" text="Start" /> + <Button mnemonicParsing="false" onAction="#backButton" text="Back"> + <VBox.margin> + <Insets bottom="50.0" /> + </VBox.margin> + </Button> + <Pane VBox.vgrow="ALWAYS" /> </children> - </HBox> - <Button mnemonicParsing="false" onAction="#gameScene" text="Start" /> - <Button mnemonicParsing="false" onAction="#backButton" text="Back"> - <VBox.margin> - <Insets bottom="50.0" /> - </VBox.margin> - </Button> - <Pane VBox.vgrow="ALWAYS" /> + </VBox> + <Pane HBox.hgrow="ALWAYS" /> </children> -</VBox> +</HBox> diff --git a/src/main/resources/player/appSettings.json b/src/main/resources/player/appSettings.json index cabb64eaff39680907636d982d66c8408a5a6e26..6e8517eb1092946b8be3b33ce9d41d7658918398 100644 --- a/src/main/resources/player/appSettings.json +++ b/src/main/resources/player/appSettings.json @@ -1,4 +1,4 @@ { - "sfxVolume": 0, + "sfxVolume": 27, "musicVolume": 11 } \ No newline at end of file