diff --git a/.idea/workspace (conflicted copy 2023-12-18 141946).xml b/.idea/workspace (conflicted copy 2023-12-18 141946).xml
new file mode 100644
index 0000000000000000000000000000000000000000..0b7bbac108f1f913a5949491647316c625a19d96
--- /dev/null
+++ b/.idea/workspace (conflicted copy 2023-12-18 141946).xml
@@ -0,0 +1,154 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="AutoImportSettings">
+ <option name="autoReloadType" value="SELECTIVE" />
+ </component>
+ <component name="ChangeListManager">
+ <list default="true" id="85811dc3-2e20-44db-bc82-166e5cc3178c" name="Changes" comment="">
+ <change beforePath="$PROJECT_DIR$/src/main/java/de/hdm_stuttgart/battlearena/Controller/MainMenuController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/de/hdm_stuttgart/battlearena/Controller/MainMenuController.java" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/src/main/java/de/hdm_stuttgart/battlearena/Controller/MenuBorderPaneController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/de/hdm_stuttgart/battlearena/Controller/MenuBorderPaneController.java" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/src/main/java/de/hdm_stuttgart/battlearena/Main/Main.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/de/hdm_stuttgart/battlearena/Main/Main.java" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/src/main/resources/fxml/LocalCreate.fxml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/fxml/LocalCreate.fxml" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/src/main/resources/styles/style.css" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/styles/style.css" afterDir="false" />
+ </list>
+ <option name="SHOW_DIALOG" value="false" />
+ <option name="HIGHLIGHT_CONFLICTS" value="true" />
+ <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
+ <option name="LAST_RESOLUTION" value="IGNORE" />
+ </component>
+ <component name="FileTemplateManagerImpl">
+ <option name="RECENT_TEMPLATES">
+ <list>
+ <option value="FxmlFile" />
+ <option value="Class" />
+ </list>
+ </option>
+ </component>
+ <component name="Git.Settings">
+ <option name="RECENT_BRANCH_BY_REPOSITORY">
+ <map>
+ <entry key="$PROJECT_DIR$" value="sound" />
+ </map>
+ </option>
+ <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
+ </component>
+ <component name="MarkdownSettingsMigration">
+ <option name="stateVersion" value="1" />
+ </component>
+ <component name="ProblemsViewState">
+ <option name="selectedTabId" value="ProjectErrors" />
+ </component>
+ <component name="ProjectColorInfo">{
+ "customColor": "",
+ "associatedIndex": 5
+}</component>
+ <component name="ProjectId" id="2Z4oKUF1PqD2ipZvfH4PkIBw4CG" />
+ <component name="ProjectViewState">
+ <option name="hideEmptyMiddlePackages" value="true" />
+ <option name="showLibraryContents" value="true" />
+ </component>
+ <component name="PropertiesComponent">{
+ "keyToString": {
+ "ASKED_ADD_EXTERNAL_FILES": "true",
+ "RunOnceActivity.OpenProjectViewOnStart": "true",
+ "RunOnceActivity.ShowReadmeOnStart": "true",
+ "WebServerToolWindowFactoryState": "false",
+ "git-widget-placeholder": "ui",
+ "last_opened_file_path": "C:/Program Files/Git/bin/sh.exe",
+ "node.js.detected.package.eslint": "true",
+ "node.js.detected.package.tslint": "true",
+ "node.js.selected.package.eslint": "(autodetect)",
+ "node.js.selected.package.tslint": "(autodetect)",
+ "nodejs_package_manager_path": "npm",
+ "settings.editor.selected.configurable": "preferences.keymap",
+ "vue.rearranger.settings.migration": "true"
+ }
+}</component>
+ <component name="RecentsManager">
+ <key name="CopyFile.RECENT_KEYS">
+ <recent name="E:\Nextcloud\03_3.Semester\SE3\battlearena\src\main\resources\textures\videos" />
+ </key>
+ <key name="MoveFile.RECENT_KEYS">
+ <recent name="E:\Nextcloud\03_3.Semester\SE3\battlearena\src\main\resources" />
+ <recent name="E:\Nextcloud\03_3.Semester\SE3\battlearena\src\main\resources\textures\videos" />
+ </key>
+ <key name="ExtractSuperBase.RECENT_KEYS">
+ <recent name="de.hdm_stuttgart.battlearena.Controller" />
+ </key>
+ </component>
+ <component name="RunManager">
+ <configuration name="Main" type="Application" factoryName="Application">
+ <option name="MAIN_CLASS_NAME" value="de.hdm_stuttgart.battlearena.Main.Main" />
+ <module name="BattleArena" />
+ <method v="2">
+ <option name="Make" enabled="true" />
+ </method>
+ </configuration>
+ </component>
+ <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
+ <component name="TaskManager">
+ <task active="true" id="Default" summary="Default task">
+ <changelist id="85811dc3-2e20-44db-bc82-166e5cc3178c" name="Changes" comment="" />
+ <created>1701690651345</created>
+ <option name="number" value="Default" />
+ <option name="presentableId" value="Default" />
+ <updated>1701690651345</updated>
+ <workItem from="1701690657366" duration="1732000" />
+ <workItem from="1701701583196" duration="6151000" />
+ <workItem from="1701779049601" duration="10584000" />
+ <workItem from="1701810007575" duration="7977000" />
+ <workItem from="1701853301971" duration="186000" />
+ <workItem from="1701858986716" duration="754000" />
+ <workItem from="1701869636945" duration="5267000" />
+ <workItem from="1701902568151" duration="4194000" />
+ <workItem from="1701907247490" duration="79000" />
+ <workItem from="1701944124236" duration="926000" />
+ <workItem from="1701951134267" duration="183000" />
+ <workItem from="1701991272942" duration="4335000" />
+ <workItem from="1702051901631" duration="897000" />
+ <workItem from="1702052800013" duration="19047000" />
+ <workItem from="1702121227510" duration="11900000" />
+ <workItem from="1702213282532" duration="18776000" />
+ <workItem from="1702294618906" duration="4283000" />
+ <workItem from="1702322034937" duration="8689000" />
+ <workItem from="1702475808643" duration="13569000" />
+ <workItem from="1702554815625" duration="4878000" />
+ <workItem from="1702595121040" duration="1690000" />
+ <workItem from="1702678190801" duration="3652000" />
+ <workItem from="1702767288258" duration="1299000" />
+ <workItem from="1702843257335" duration="1923000" />
+ <workItem from="1702845222593" duration="32000" />
+ <workItem from="1702854091786" duration="420000" />
+ <workItem from="1702904587037" duration="978000" />
+ <workItem from="1702905548984" duration="38000" />
+ </task>
+ <task id="LOCAL-00001" summary="update(ui): add pressed visualisation to skin selection scene #14">
+ <option name="closed" value="true" />
+ <created>1702856159981</created>
+ <option name="number" value="00001" />
+ <option name="presentableId" value="LOCAL-00001" />
+ <option name="project" value="LOCAL" />
+ <updated>1702856159981</updated>
+ </task>
+ <option name="localTasksCounter" value="2" />
+ <servers />
+ </component>
+ <component name="TypeScriptGeneratedFilesManager">
+ <option name="version" value="3" />
+ </component>
+ <component name="Vcs.Log.Tabs.Properties">
+ <option name="TAB_STATES">
+ <map>
+ <entry key="MAIN">
+ <value>
+ <State />
+ </value>
+ </entry>
+ </map>
+ </option>
+ </component>
+ <component name="VcsManagerConfiguration">
+ <MESSAGE value="update(ui): add pressed visualisation to skin selection scene #14" />
+ <option name="LAST_COMMIT_MESSAGE" value="update(ui): add pressed visualisation to skin selection scene #14" />
+ </component>
+</project>
\ No newline at end of file
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 6ab3e400cfe572b8447f782b1a505ff06b45ddfa..d4843e4c26050d33aafdb28a421f1e39d11d38c3 100644
--- a/src/main/java/de/hdm_stuttgart/battlearena/Controller/MenuBorderPaneController.java
+++ b/src/main/java/de/hdm_stuttgart/battlearena/Controller/MenuBorderPaneController.java
@@ -29,8 +29,8 @@ public class MenuBorderPaneController implements Initializable {
private final SceneLoader sceneLoader = new SceneLoader();
private MediaPlayer musicPlayer, mediaPlayer;
private MediaView mediaView;
- private final String[] videoFiles = {"allMyFellas", "wooOOoo", "dogCheese", "gta", "cat", "bobama", "roomba", "firework", "kangaroo", "lifeCouldBeMonke", "parkingTickets", "russianKid", "rejectHumanity", "horse",
- "catSitting", "pablo", "holyCrap", "lessGoo", "basketball", "msPuff", "=D", "banana", "async", "sadHorse", "minecraftCat", "muecke", "top10Cats", "dog", "bear", "frog", "gtfo", "dog2", "slippery", "legCat"};
+ private final String[] videoFiles = {"allMyFellas", "wooOOoo", "dogCheese", "gta", "cat", "bobama", "roomba", "firework", "cheezburger", "kangaroo", "lifeCouldBeMonke", "parkingTickets", "russianKid", "rejectHumanity", "horse",
+ "catSitting", "pablo", "holyCrap", "lessGoo", "sadCat", "basketball", "msPuff", "=D", "banana", "async", "sadHorse", "minecraftCat", "muecke", "top10Cats", "dog", "bear", "frog", "gtfo", "dog2", "slippery", "legCat"};
Rectangle2D screen = Screen.getPrimary().getVisualBounds();
Screen windows = Screen.getPrimary();
diff --git a/src/main/java/de/hdm_stuttgart/battlearena/Controller/OptionsController.java b/src/main/java/de/hdm_stuttgart/battlearena/Controller/OptionsController.java
index 800f776b8fd3a703db55472eb6bef4f7ba097686..c7f55e22f971315590eb6423c0d362c65b14b195 100644
--- a/src/main/java/de/hdm_stuttgart/battlearena/Controller/OptionsController.java
+++ b/src/main/java/de/hdm_stuttgart/battlearena/Controller/OptionsController.java
@@ -38,7 +38,6 @@ public class OptionsController implements Initializable {
private void setVolume() {
// need a runtime database to save volume
volumeSlider.valueProperty().addListener((observableValue, oldValue, newValue) -> {
- musicPlayer.getMediaPlayer().setVolume(volume);
volume = newValue.doubleValue() / 100;
musicPlayer.getMediaPlayer().setVolume(volume);
System.out.println(volume);
diff --git a/src/main/resources/videos/cheezburger.mp4 b/src/main/resources/videos/cheezburger.mp4
new file mode 100644
index 0000000000000000000000000000000000000000..28c72a6ebeb79d0d858e060ff98e0458d909e4f1
Binary files /dev/null and b/src/main/resources/videos/cheezburger.mp4 differ
diff --git a/src/main/resources/videos/sadCat.mp4 b/src/main/resources/videos/sadCat.mp4
new file mode 100644
index 0000000000000000000000000000000000000000..6daceb2c5e67a7b328aa541cb4f076249ce1fdf5
Binary files /dev/null and b/src/main/resources/videos/sadCat.mp4 differ