diff --git a/src/main/java/de/hdm_stuttgart/battlearena/Controller/MenuBorderPaneController.java b/src/main/java/de/hdm_stuttgart/battlearena/Controller/MenuBorderPaneController.java index 72a114e105f886889164db756b6813b17bd4aaf0..81b05ca9a8de2670edb504e78a78fb3e20ca2ebd 100644 --- a/src/main/java/de/hdm_stuttgart/battlearena/Controller/MenuBorderPaneController.java +++ b/src/main/java/de/hdm_stuttgart/battlearena/Controller/MenuBorderPaneController.java @@ -32,10 +32,10 @@ public class MenuBorderPaneController implements Initializable { private final SceneLoader sceneLoader = new SceneLoader(); private MediaPlayer musicPlayer, mediaPlayer; private MediaView mediaView; - private final String[] videoFiles = {"allMyFellas", "wooOOoo", "myMind", "dogCheese", "gta", "cat", "bobama", "roomba", "firework", "cheezburger", - "kangaroo", "lifeCouldBeMonke", "imNotYou", "parkingTickets", "russianKid", "rejectHumanity", "horse", "catSitting", "pablo", "holyCrap", - "lessGoo", "sadCat", "basketball", "msPuff", "=D", "banana", "chaCha", "async", "sadHorse", "minecraftCat", "muecke", "top10Cats", "dog", - "pot", "mineCraftCat2", "bear", "pancake", "frog", "gtfo", "carl", "dog2", "slippery", "wolf", "legCat", "sad", "waaahhh"}; + private final String[] videoFiles = {"depression", "allMyFellas", "wooOOoo", "myMind", "dogCheese", "gta", "cat", "bobama", "roomba", "firework", "cheezburger", + "kangaroo", "lifeCouldBeMonke", "seal", "imNotYou", "parkingTickets", "russianKid", "rejectHumanity", "horse", "catSitting", "pablo", "holyCrap", + "lessGoo", "sadCat", "basketball", "yoinkySploinky", "msPuff", "=D", "banana", "chaCha", "async", "sadHorse", "minecraftCat", "muecke", "top10Cats", "dog", + "pot", "mineCraftCat2", "catEating", "bear", "pancake", "frog", "gtfo", "carl", "dog2", "slippery", "wolf", "legCat", "sad", "waaahhh"}; List<String> shuffledVideos = Arrays.asList(videoFiles); diff --git a/src/main/java/de/hdm_stuttgart/battlearena/Controller/SkinSelectionController.java b/src/main/java/de/hdm_stuttgart/battlearena/Controller/SkinSelectionController.java index dd4d841d898f47df3c9e516ff919315b67407945..6015655a06d8dad0530362087a84c6e87e646f57 100644 --- a/src/main/java/de/hdm_stuttgart/battlearena/Controller/SkinSelectionController.java +++ b/src/main/java/de/hdm_stuttgart/battlearena/Controller/SkinSelectionController.java @@ -1,5 +1,6 @@ package de.hdm_stuttgart.battlearena.Controller; +import de.hdm_stuttgart.battlearena.Controller.Utilities.MusicPlayerSingleton; import de.hdm_stuttgart.battlearena.Controller.Utilities.SceneLoader; import javafx.fxml.FXML; import javafx.fxml.FXMLLoader; diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java index 13a3d1d34ef25e809dd1dd1467218739070f8357..8a3132800c32f2c5b0c2bb3dabef96a0aae98b5d 100644 --- a/src/main/java/module-info.java +++ b/src/main/java/module-info.java @@ -12,4 +12,6 @@ module gui { exports de.hdm_stuttgart.battlearena.Model.Entity; exports de.hdm_stuttgart.battlearena.Model.Inputs; exports de.hdm_stuttgart.battlearena.Model.Map; + exports de.hdm_stuttgart.battlearena.Controller.Utilities; + opens de.hdm_stuttgart.battlearena.Controller.Utilities to javafx.fxml; } \ No newline at end of file diff --git a/src/main/resources/videos/catEating.mp4 b/src/main/resources/videos/catEating.mp4 new file mode 100644 index 0000000000000000000000000000000000000000..530059520bc6a7ec848fca40e27371fac757171a Binary files /dev/null and b/src/main/resources/videos/catEating.mp4 differ diff --git a/src/main/resources/videos/depression.mp4 b/src/main/resources/videos/depression.mp4 new file mode 100644 index 0000000000000000000000000000000000000000..9e282df3676adcb28bc15d9238025fe6b37d9fcb Binary files /dev/null and b/src/main/resources/videos/depression.mp4 differ diff --git a/src/main/resources/videos/seal.mp4 b/src/main/resources/videos/seal.mp4 new file mode 100644 index 0000000000000000000000000000000000000000..5f5f39382d212d1b1cf15a9eaf44fb90ee06e4f9 Binary files /dev/null and b/src/main/resources/videos/seal.mp4 differ diff --git a/src/main/resources/videos/yoinkySploinky.mp4 b/src/main/resources/videos/yoinkySploinky.mp4 new file mode 100644 index 0000000000000000000000000000000000000000..ea88b4578ccc74f0228669792b4266b9860e3f0c Binary files /dev/null and b/src/main/resources/videos/yoinkySploinky.mp4 differ