diff --git a/src/main/java/de/hdm_stuttgart/battlearena/Controller/IntroController.java b/src/main/java/de/hdm_stuttgart/battlearena/Controller/IntroController.java index 6a99c538617e193578e4a80332c60baa7c0bcf5e..570f4d01972ac7ad9b346deac6cb578293df70b9 100644 --- a/src/main/java/de/hdm_stuttgart/battlearena/Controller/IntroController.java +++ b/src/main/java/de/hdm_stuttgart/battlearena/Controller/IntroController.java @@ -26,7 +26,7 @@ public class IntroController implements Initializable { private BorderPane introParent; private final String fileName = "src/main/resources/videos/"; // nextVideo() will iterate through this array so the next video will be played TODO: change the videos to non memes lmao - private final String[] videos = {"sony.mp4", "gamecube.mp4", "gameboy.mp4", "monke.mp4"}; + private final String[] videos = {"sony.mp4", "monke.mp4"}; private File file = new File(fileName + videos[0]); private int counter = 0; private MediaPlayer mediaPlayer; diff --git a/src/main/java/de/hdm_stuttgart/battlearena/Controller/MapForgeController.java b/src/main/java/de/hdm_stuttgart/battlearena/Controller/MapForgeController.java index 784361391329dab062e1c64e5aee944381861ff1..62f830fe384cdf134338ce7f20dbe320e40a8627 100644 --- a/src/main/java/de/hdm_stuttgart/battlearena/Controller/MapForgeController.java +++ b/src/main/java/de/hdm_stuttgart/battlearena/Controller/MapForgeController.java @@ -20,7 +20,7 @@ public class MapForgeController { @FXML private void mapEditorScene() { try { - parent.getScene().setRoot(FXMLLoader.load(Objects.requireNonNull(getClass().getResource("/fxml/PlayerCreateScene.fxml")))); + parent.getScene().setRoot(FXMLLoader.load(Objects.requireNonNull(getClass().getResource("/fxml/Placeholder.fxml")))); MusicPlayerSingleton.getInstance().getMediaPlayer().dispose(); } catch (IOException e) { throw new RuntimeException(); diff --git a/src/main/java/de/hdm_stuttgart/battlearena/Main/Driver.java b/src/main/java/de/hdm_stuttgart/battlearena/Main/Driver.java index 66f93ada9d0e18cccb86262356517c4f79d881e3..3c296f75fcc5cbe62f220a50248ce70474712ac5 100644 --- a/src/main/java/de/hdm_stuttgart/battlearena/Main/Driver.java +++ b/src/main/java/de/hdm_stuttgart/battlearena/Main/Driver.java @@ -38,7 +38,7 @@ public class Driver extends Application { Font.loadFont(getClass().getResourceAsStream("/fonts/Arthemis-mLA22.ttf"), 50); Font.loadFont(getClass().getResourceAsStream("/fonts/ShadowsIntoLight-Regular.ttf"), 50); - Parent root = FXMLLoader.load(Objects.requireNonNull(getClass().getResource("/fxml/LoadingScreen.fxml"))); + Parent root = FXMLLoader.load(Objects.requireNonNull(getClass().getResource("/fxml/Intro.fxml"))); Scene scene = new Scene(root); diff --git a/src/main/resources/fxml/LocalCreate.fxml b/src/main/resources/fxml/LocalCreate.fxml index f100d9b68a8eab3fc0d6554e02f8cbd29cd16373..bcbb8b50cde25e26483083f93b92426a1836b4a2 100644 --- a/src/main/resources/fxml/LocalCreate.fxml +++ b/src/main/resources/fxml/LocalCreate.fxml @@ -110,7 +110,7 @@ <RadioButton mnemonicParsing="false" selected="true" text="No" toggleGroup="$group3" /> </children> </HBox> - <Button mnemonicParsing="false" onAction="#skinSelectionScene" text="Start" /> + <Button mnemonicParsing="false" onAction="#skinSelectionScene" text="Next" /> <Button mnemonicParsing="false" onAction="#backButton" text="Back"> <VBox.margin> <Insets bottom="50.0" /> diff --git a/src/main/resources/fxml/MultiplayerCreate.fxml b/src/main/resources/fxml/MultiplayerCreate.fxml index f95e2126f13aee4f89541b835ef2c90ffbbc7d9b..d12125df3dd7a924880ef1b6ea27e85e567c9a40 100644 --- a/src/main/resources/fxml/MultiplayerCreate.fxml +++ b/src/main/resources/fxml/MultiplayerCreate.fxml @@ -16,16 +16,16 @@ <HBox alignment="TOP_CENTER" spacing="20.0"> <children> <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Text:" /> - <TextField /> + <TextField alignment="CENTER" /> </children> <VBox.margin> <Insets top="50.0" /> </VBox.margin> </HBox> - <HBox alignment="TOP_CENTER" maxWidth="-Infinity" minWidth="-Infinity" prefHeight="25.0" prefWidth="213.0" spacing="20.0"> + <HBox alignment="TOP_CENTER" maxWidth="-Infinity" spacing="20.0"> <children> <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Text:" /> - <TextField /> + <TextField alignment="CENTER" /> </children> </HBox> <HBox alignment="TOP_CENTER" spacing="10.0"> @@ -47,7 +47,7 @@ <Insets top="20.0" /> </VBox.margin> </AnchorPane> - <Button mnemonicParsing="false" onAction="#start" text="Start" /> + <Button mnemonicParsing="false" text="Start" /> <Button mnemonicParsing="false" onAction="#backButton" text="Back" /> <Pane VBox.vgrow="ALWAYS" /> <Pane VBox.vgrow="ALWAYS" /> diff --git a/src/main/resources/fxml/MultiplayerJoin.fxml b/src/main/resources/fxml/MultiplayerJoin.fxml index 117cf38cd7ba79fb3f41209f4a4b869e4a11e889..50328301d12e960ca362bc1a19d067f58d41a4d9 100644 --- a/src/main/resources/fxml/MultiplayerJoin.fxml +++ b/src/main/resources/fxml/MultiplayerJoin.fxml @@ -10,7 +10,7 @@ <children> <Pane maxHeight="1.7976931348623157E308" prefHeight="200.0" prefWidth="200.0" /> <Text strokeType="OUTSIDE" strokeWidth="0.0" text="IP Adress:" /> - <TextField maxWidth="-Infinity" /> + <TextField alignment="CENTER" maxWidth="-Infinity" /> <Button mnemonicParsing="false" text="Connect" VBox.vgrow="ALWAYS" /> <Text strokeType="OUTSIDE" strokeWidth="0.0" text="[Error Message]" /> <Pane maxHeight="1.7976931348623157E308" prefHeight="200.0" prefWidth="200.0" VBox.vgrow="ALWAYS" /> diff --git a/src/main/resources/fxml/SkinSelection.fxml b/src/main/resources/fxml/SkinSelection.fxml index b98b91af38434be6169c8cdfead739ef20587460..c8b09f8e6f80b3447949f928e38c900e368b22de 100644 --- a/src/main/resources/fxml/SkinSelection.fxml +++ b/src/main/resources/fxml/SkinSelection.fxml @@ -44,7 +44,7 @@ </ToggleButton> </children> </HBox> - <Button mnemonicParsing="false" onAction="#gameScene" text="Start" /> + <Button mnemonicParsing="false" onAction="#gameScene" text="Next" /> <Button mnemonicParsing="false" onAction="#backButton" text="Back" /> </children> </VBox> diff --git a/src/main/resources/videos/monke.mp4 b/src/main/resources/videos/monke.mp4 index 980756e7cd8fa4c3c00d5a246ad179b143c1fae1..5759b5af794cd74dd84a37d76d422473911db35c 100644 Binary files a/src/main/resources/videos/monke.mp4 and b/src/main/resources/videos/monke.mp4 differ