Merge branch 'main' of https://gitlab.sowgro.net/guitarheros/guitarhero

3 files changed, 1 insertions, 110 deletions

diff --git a/.gitignore b/.gitignore
index b3826ee..58702fa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 *.class
 /bin/
+/.vscode/
diff --git a/.vscode/launch.json b/.vscode/launch.json
deleted file mode 100644
index 99c7b5f..0000000
--- a/.vscode/launch.json
+++ /dev/null
@@ -1,101 +0,0 @@
-{
-    // Use IntelliSense to learn about possible attributes.
-    // Hover to view descriptions of existing attributes.
-    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
-    "version": "0.2.0",
-    "configurations": [
-        {
-            "type": "java",
-            "name": "JFXaudioPlayer",
-            "request": "launch",
-            "mainClass": "test.JFXaudioPlayer",
-            "projectName": "GuitarHero"
-        },
-        {
-            "type": "java",
-            "name": "Table",
-            "request": "launch",
-            "mainClass": "test.Table",
-            "projectName": "GuitarHero",
-            "vmArgs": "--module-path lib/windows/lib --add-modules javafx.base,javafx.media,javafx.graphics,javafx.controls,javafx.fxml"
-        },
-        {
-            "type": "java",
-            "name": "GUIDriver",
-            "request": "launch",
-            "mainClass": "gui.GUIDriver",
-            "projectName": "GuitarHero",
-            "vmArgs": "--module-path lib/linux --add-modules javafx.base,javafx.media,javafx.graphics,javafx.controls,javafx.fxml"
-        },
-        {
-            "type": "java",
-            "name": "resizeTest",
-            "request": "launch",
-            "mainClass": "test.resizeTest",
-            "projectName": "GuitarHero",
-            "vmArgs": "--module-path lib/linux --add-modules javafx.base,javafx.media,javafx.graphics,javafx.controls,javafx.fxml"
-        },
-        {
-            "type": "java",
-            "name": "focusTest",
-            "request": "launch",
-            "mainClass": "main.focusTest",
-            "projectName": "GuitarHero",
-            "vmArgs": "--module-path lib/linux --add-modules javafx.base,javafx.media,javafx.graphics,javafx.controls,javafx.fxml"
-        },
-        {
-            "type": "java",
-            "name": "Level",
-            "request": "launch",
-            "mainClass": "gui.Level",
-            "projectName": "GuitarHero",
-            "vmArgs": "--module-path lib/linux --add-modules javafx.graphics,javafx.controls,javafx.fxml"
-        },
-        {
-            "type": "java",
-            "name": "JFXaudioPlayer",
-            "request": "launch",
-            "mainClass": "main.JFXaudioPlayer",
-            "projectName": "GuitarHero",
-            "vmArgs": "--module-path lib/linux --add-modules javafx.base,javafx.media,javafx.graphics,javafx.controls,javafx.fxml"
-        },
-        {
-            "type": "java",
-            "name": "Driver2",
-            "request": "launch",
-            "mainClass": "gui.Driver2",
-            "projectName": "GuitarHero",
-            "vmArgs": "--module-path lib/linux --add-modules javafx.controls,javafx.fxml"
-        },
-        {
-            "type": "java",
-            "name": "Driver",
-            "request": "launch",
-            "mainClass": "gui.Driver",
-            "projectName": "GuitarHero",
-            "vmArgs": "--module-path lib/windows/lib --add-modules javafx.controls,javafx.fxml"
-        },
-        {
-            "type": "java",
-            "name": "Driver",
-            "request": "launch",
-            "mainClass": "fallTest.Driver",
-            "projectName": "GuitarHero",
-            "vmArgs": "--module-path lib/windows/lib --add-modules javafx.base,javafx.media,javafx.graphics,javafx.controls,javafx.fxml"
-        },
-        {
-            "type": "java",
-            "name": "Driver",
-            "request": "launch",
-            "mainClass": "main.Driver",
-            "projectName": "GuitarHero"
-        },
-        {
-            "type": "java",
-            "name": "Launch App",
-            "request": "launch",
-            "mainClass": "main.jfxTest",
-            "vmArgs": "--module-path lib/linux --add-modules javafx.controls,javafx.fxml"
-        }
-    ]
-}
\ No newline at end of file
diff --git a/.vscode/settings.json b/.vscode/settings.json
deleted file mode 100644
index 4321e74..0000000
--- a/.vscode/settings.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "java.project.sourcePaths": ["src"],
-    "java.project.outputPath": "bin",
-    "java.project.referencedLibraries": [
-        "lib/linux/**/*.jar",
-        "lib/**/*.jar"
-    ],
-    "java.debug.settings.onBuildFailureProceed": true
-}
\ No newline at end of file