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 75315ab525f8037751af3070d1402fe0c9ed7f71..38353d2473443ed69347cbcea59f292abcdcf170 100644 --- a/src/main/java/de/hdm_stuttgart/battlearena/Controller/MenuBorderPaneController.java +++ b/src/main/java/de/hdm_stuttgart/battlearena/Controller/MenuBorderPaneController.java @@ -34,10 +34,10 @@ public class MenuBorderPaneController implements Initializable { private final SceneLoader sceneLoader = new SceneLoader(); private MediaPlayer musicPlayer, mediaPlayer; private MediaView mediaView; - private final String[] videoFiles = {"depression", "allMyFellas", "wooOOoo", "myMind", "dogCheese", "gta", "cat", "bobama", "roomba", "firework", "cheezburger", - "kangaroo", "lifeCouldBeMonke", "seal", "rolling", "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", "catJump", "bear", "pancake", "frog", "gtfo", "carl", "dog2", "slippery", "wolf", "legCat", "sad", "waaahhh"}; + private final String[] videoFiles = {"depression", "cpr", "allMyFellas", "minecraftCat3", "steak", "wooOOoo", "myMind", "gender", "dogCheese", "gta", "cat", "bobama", "roomba", "firework", "cheezburger", + "kangaroo", "lifeCouldBeMonke", "seal", "humping", "slap", "rolling", "spoderman", "imNotYou", "email", "parkingTickets", "russianKid", "rejectHumanity", "horse", "catSitting", "pablo", "holyCrap", + "lessGoo", "sadCat", "basketball", "yoinkySploinky", "spinSlot", "justTheTwoOfUs", "denied", "msPuff", "=D", "banana", "chaCha", "async", "sadHorse", "minecraftCat", "muecke", "top10Cats", "dog", + "pot", "catRave", "mineCraftCat2", "defense", "singingCat", "tutel", "catEating", "catJump", "bear", "pancake", "frog", "gtfo", "carl", "dog2", "slippery", "wolf", "legCat", "sad", "waaahhh"}; List<String> shuffledVideos = Arrays.asList(videoFiles); diff --git a/src/main/resources/styles/style.css b/src/main/resources/styles/style.css index 0389e5bbbcc594716ff89c2a3d73e0dfd7fc61a3..eeafd541a9d3cb523121b01656d888d4d299611e 100644 --- a/src/main/resources/styles/style.css +++ b/src/main/resources/styles/style.css @@ -51,7 +51,7 @@ #btnLeft { -fx-skin: none; - -fx-text-fill: #7a7a7a; + -fx-text-fill: #949494; } .accordion { diff --git a/src/main/resources/videos/catRave.mp4 b/src/main/resources/videos/catRave.mp4 new file mode 100644 index 0000000000000000000000000000000000000000..5f5c8bdda380c4acc510e85e54692e63fa941f7e Binary files /dev/null and b/src/main/resources/videos/catRave.mp4 differ diff --git a/src/main/resources/videos/cpr.mp4 b/src/main/resources/videos/cpr.mp4 new file mode 100644 index 0000000000000000000000000000000000000000..14dae5969f47dd64a2891c749b9bda379246da31 Binary files /dev/null and b/src/main/resources/videos/cpr.mp4 differ diff --git a/src/main/resources/videos/defense.mp4 b/src/main/resources/videos/defense.mp4 new file mode 100644 index 0000000000000000000000000000000000000000..f2284e229990768da37acd6f594945ba48bccfa2 Binary files /dev/null and b/src/main/resources/videos/defense.mp4 differ diff --git a/src/main/resources/videos/denied.mp4 b/src/main/resources/videos/denied.mp4 new file mode 100644 index 0000000000000000000000000000000000000000..897097e291b9ea326d3a8ab1671e4c05f88288d7 Binary files /dev/null and b/src/main/resources/videos/denied.mp4 differ diff --git a/src/main/resources/videos/email.mp4 b/src/main/resources/videos/email.mp4 new file mode 100644 index 0000000000000000000000000000000000000000..a7f8ff018aa6822c6ed2e5315ff164ffc184f7f2 Binary files /dev/null and b/src/main/resources/videos/email.mp4 differ diff --git a/src/main/resources/videos/gender.mp4 b/src/main/resources/videos/gender.mp4 new file mode 100644 index 0000000000000000000000000000000000000000..78d5dd209fd66aa77a3c0a7f93cfbce85440b305 Binary files /dev/null and b/src/main/resources/videos/gender.mp4 differ diff --git a/src/main/resources/videos/humping.mp4 b/src/main/resources/videos/humping.mp4 new file mode 100644 index 0000000000000000000000000000000000000000..b5da1c503f13e7f24cfef6ff7092e3c0e45d5b58 Binary files /dev/null and b/src/main/resources/videos/humping.mp4 differ diff --git a/src/main/resources/videos/justTheTwoOfUs.mp4 b/src/main/resources/videos/justTheTwoOfUs.mp4 new file mode 100644 index 0000000000000000000000000000000000000000..fb84e59fc4a0944075f234dcccdf7664bc1c5409 Binary files /dev/null and b/src/main/resources/videos/justTheTwoOfUs.mp4 differ diff --git a/src/main/resources/videos/minecraftCat3.mp4 b/src/main/resources/videos/minecraftCat3.mp4 new file mode 100644 index 0000000000000000000000000000000000000000..4158689b7a52d2540f3b0a008b13c0880142f317 Binary files /dev/null and b/src/main/resources/videos/minecraftCat3.mp4 differ diff --git a/src/main/resources/videos/singingCat.mp4 b/src/main/resources/videos/singingCat.mp4 new file mode 100644 index 0000000000000000000000000000000000000000..6ae8a7c59523354b806bef85c92f57828e344c46 Binary files /dev/null and b/src/main/resources/videos/singingCat.mp4 differ diff --git a/src/main/resources/videos/slap.mp4 b/src/main/resources/videos/slap.mp4 new file mode 100644 index 0000000000000000000000000000000000000000..bc300c857b72ebc2e7bf6cc3a7ae6a2a41d93033 Binary files /dev/null and b/src/main/resources/videos/slap.mp4 differ diff --git a/src/main/resources/videos/spinSlot.mp4 b/src/main/resources/videos/spinSlot.mp4 new file mode 100644 index 0000000000000000000000000000000000000000..075d8374389bd8f9fd1072b636a6015fe927dca5 Binary files /dev/null and b/src/main/resources/videos/spinSlot.mp4 differ diff --git a/src/main/resources/videos/spoderman.mp4 b/src/main/resources/videos/spoderman.mp4 new file mode 100644 index 0000000000000000000000000000000000000000..ea4e01d5c8ef5fe7a2ffc5d1bded4d8790a20dfe Binary files /dev/null and b/src/main/resources/videos/spoderman.mp4 differ diff --git a/src/main/resources/videos/steak.mp4 b/src/main/resources/videos/steak.mp4 new file mode 100644 index 0000000000000000000000000000000000000000..e2281e0c9e0681b18db249e73f6a144ffa61361d Binary files /dev/null and b/src/main/resources/videos/steak.mp4 differ diff --git a/src/main/resources/videos/tutel.mp4 b/src/main/resources/videos/tutel.mp4 new file mode 100644 index 0000000000000000000000000000000000000000..41b86a66a34d526ada9499cdba37107974066cd9 Binary files /dev/null and b/src/main/resources/videos/tutel.mp4 differ