diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 00000000..9d351354 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,14 @@ +root = true + +[*] +charset = utf-8 +end_of_line = lf +insert_final_newline = true +trim_trailing_whitespace = true + +[*.java] +indent_style = space +indent_size = 4 + +[*.txt] +indent_style = tab diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 00000000..ba1edb95 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,59 @@ +# Git configuration files +.gitattributes text +.gitignore text +.gitconfig text +.gitmodules text + +# Documentation +*.md text +*.txt text +AUTHORS text +CHANGELOG text +CHANGES text +CONTRIBUTING text +COPYING text +INSTALL text +LICENSE text +NEWS text +TODO text + +# Java sources +*.java text diff=java +*.kt text diff=kotlin +*.groovy text diff=java +*.scala text diff=java +*.gradle text diff=java +*.gradle.kts text diff=kotlin + +# Normalize text files (Convert crlf => lf) +*.css text diff=css +*.scss text diff=css +*.sass text +*.df text +*.htm text diff=html +*.html text diff=html +*.js text +*.mjs text +*.cjs text +*.jsp text +*.jspf text +*.jspx text +*.properties text +*.tld text +*.tag text +*.tagx text +*.xml text + +# Binary files +# (binary is a macro for -text -diff) +*.class binary +*.dll binary +*.ear binary +*.jar binary +*.so binary +*.war binary +*.jks binary + +# Build tool wrappers +mvnw text eol=lf +gradlew text eol=lf diff --git a/.gitignore b/.gitignore index a3152bdd..164fc10a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,26 +1,43 @@ -# Gradle .gradle -build +build/ +#!gradle/wrapper/gradle-wrapper.jar +#!**/src/main/**/build/ +#!**/src/test/**/build/ -# VSC -bin - -# IntelliJ -*.iml +### IntelliJ IDEA ### .idea -out +.idea/modules.xml +.idea/jarRepositories.xml +.idea/compiler.xml +.idea/libraries/ +*.iws +*.iml +*.ipr +out/ +#!**/src/main/**/out/ +#!**/src/test/**/out/ -# Eclipse +### Eclipse ### +.apt_generated .classpath +.factorypath .project +.settings +.springBeans +.sts4-cache +bin/ +#!**/src/main/**/bin/ +#!**/src/test/**/bin/ -# Libraries -*.so -*.dylib -*.dll -*.jar -*.class +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ +### VS Code ### +.vscode/ + +### Mac OS ### .DS_Store -!Projekte/gradle/wrapper/gradle-wrapper.jar - diff --git a/Projekte/.gitignore b/Projekte/.gitignore deleted file mode 100644 index 8ec73278..00000000 --- a/Projekte/.gitignore +++ /dev/null @@ -1,43 +0,0 @@ -.gradle -build/ -!gradle/wrapper/gradle-wrapper.jar -!**/src/main/**/build/ -!**/src/test/**/build/ - -### IntelliJ IDEA ### -.idea -.idea/modules.xml -.idea/jarRepositories.xml -.idea/compiler.xml -.idea/libraries/ -*.iws -*.iml -*.ipr -out/ -!**/src/main/**/out/ -!**/src/test/**/out/ - -### Eclipse ### -.apt_generated -.classpath -.factorypath -.project -.settings -.springBeans -.sts4-cache -bin/ -!**/src/main/**/bin/ -!**/src/test/**/bin/ - -### NetBeans ### -/nbproject/private/ -/nbbuild/ -/dist/ -/nbdist/ -/.nb-gradle/ - -### VS Code ### -.vscode/ - -### Mac OS ### -.DS_Store \ No newline at end of file diff --git a/Projekte/mdga/client/Screenshot 2024-11-12 184708.png b/Projekte/mdga/client/Screenshot 2024-11-12 184708.png new file mode 100644 index 00000000..fd8abaf3 Binary files /dev/null and b/Projekte/mdga/client/Screenshot 2024-11-12 184708.png differ diff --git a/Projekte/mdga/client/build.gradle b/Projekte/mdga/client/build.gradle index 5d05e92b..06605dff 100644 --- a/Projekte/mdga/client/build.gradle +++ b/Projekte/mdga/client/build.gradle @@ -18,5 +18,5 @@ implementation project(":mdga:model") application { mainClass = 'pp.mdga.client.MdgaApp' - applicationName = 'mdga' + applicationName = 'MDGA' } diff --git a/Projekte/mdga/client/src/main/java/pp/mdga/client/MdgaApp.java b/Projekte/mdga/client/src/main/java/pp/mdga/client/MdgaApp.java new file mode 100644 index 00000000..115d51ee --- /dev/null +++ b/Projekte/mdga/client/src/main/java/pp/mdga/client/MdgaApp.java @@ -0,0 +1,15 @@ +package pp.mdga.client; + +import com.jme3.app.SimpleApplication; + +public class MdgaApp extends SimpleApplication { + public static void main(String[] args) { + MdgaApp app = new MdgaApp(); + app.start(); + } + + @Override + public void simpleInitApp() { + + } +} \ No newline at end of file diff --git a/Projekte/mdga/client/src/main/resources/bigTent/bigTent.j3o b/Projekte/mdga/client/src/main/resources/bigTent/bigTent.j3o new file mode 100644 index 00000000..c198720f Binary files /dev/null and b/Projekte/mdga/client/src/main/resources/bigTent/bigTent.j3o differ diff --git a/Projekte/mdga/client/src/main/resources/bigTent/bigTent_diff.png b/Projekte/mdga/client/src/main/resources/bigTent/bigTent_diff.png new file mode 100644 index 00000000..bd81c5d0 Binary files /dev/null and b/Projekte/mdga/client/src/main/resources/bigTent/bigTent_diff.png differ diff --git a/Projekte/mdga/client/src/main/resources/cardStack/cardStack.j3o b/Projekte/mdga/client/src/main/resources/cardStack/cardStack.j3o new file mode 100644 index 00000000..c630107e Binary files /dev/null and b/Projekte/mdga/client/src/main/resources/cardStack/cardStack.j3o differ diff --git a/Projekte/mdga/client/src/main/resources/cardStack/cardStack_diff.png b/Projekte/mdga/client/src/main/resources/cardStack/cardStack_diff.png new file mode 100644 index 00000000..69865447 Binary files /dev/null and b/Projekte/mdga/client/src/main/resources/cardStack/cardStack_diff.png differ diff --git a/Projekte/mdga/client/src/main/resources/cir/cir.j3o b/Projekte/mdga/client/src/main/resources/cir/cir.j3o new file mode 100644 index 00000000..f82bcda2 Binary files /dev/null and b/Projekte/mdga/client/src/main/resources/cir/cir.j3o differ diff --git a/Projekte/mdga/client/src/main/resources/cir/cir_diff.png b/Projekte/mdga/client/src/main/resources/cir/cir_diff.png new file mode 100644 index 00000000..0f74c0d5 Binary files /dev/null and b/Projekte/mdga/client/src/main/resources/cir/cir_diff.png differ diff --git a/Projekte/mdga/client/src/main/resources/heer/heer.j3o b/Projekte/mdga/client/src/main/resources/heer/heer.j3o new file mode 100644 index 00000000..30773da6 Binary files /dev/null and b/Projekte/mdga/client/src/main/resources/heer/heer.j3o differ diff --git a/Projekte/mdga/client/src/main/resources/heer/heer_diff.png b/Projekte/mdga/client/src/main/resources/heer/heer_diff.png new file mode 100644 index 00000000..ae3c3ade Binary files /dev/null and b/Projekte/mdga/client/src/main/resources/heer/heer_diff.png differ diff --git a/Projekte/mdga/client/src/main/resources/jet/jet.j3o b/Projekte/mdga/client/src/main/resources/jet/jet.j3o new file mode 100644 index 00000000..162b937c Binary files /dev/null and b/Projekte/mdga/client/src/main/resources/jet/jet.j3o differ diff --git a/Projekte/mdga/client/src/main/resources/jet/jet_diff.png b/Projekte/mdga/client/src/main/resources/jet/jet_diff.png new file mode 100644 index 00000000..525a8452 Binary files /dev/null and b/Projekte/mdga/client/src/main/resources/jet/jet_diff.png differ diff --git a/Projekte/mdga/client/src/main/resources/lw/lw.j3o b/Projekte/mdga/client/src/main/resources/lw/lw.j3o new file mode 100644 index 00000000..dce37b62 Binary files /dev/null and b/Projekte/mdga/client/src/main/resources/lw/lw.j3o differ diff --git a/Projekte/mdga/client/src/main/resources/lw/lw_diff.png b/Projekte/mdga/client/src/main/resources/lw/lw_diff.png new file mode 100644 index 00000000..5363a231 Binary files /dev/null and b/Projekte/mdga/client/src/main/resources/lw/lw_diff.png differ diff --git a/Projekte/mdga/client/src/main/resources/marine/marine.j3o b/Projekte/mdga/client/src/main/resources/marine/marine.j3o new file mode 100644 index 00000000..9f32d72f Binary files /dev/null and b/Projekte/mdga/client/src/main/resources/marine/marine.j3o differ diff --git a/Projekte/mdga/client/src/main/resources/marine/marine_diff.png b/Projekte/mdga/client/src/main/resources/marine/marine_diff.png new file mode 100644 index 00000000..015b7b37 Binary files /dev/null and b/Projekte/mdga/client/src/main/resources/marine/marine_diff.png differ diff --git a/Projekte/mdga/client/src/main/resources/node_home/node_home.j3o b/Projekte/mdga/client/src/main/resources/node_home/node_home.j3o new file mode 100644 index 00000000..0c35652a Binary files /dev/null and b/Projekte/mdga/client/src/main/resources/node_home/node_home.j3o differ diff --git a/Projekte/mdga/client/src/main/resources/node_home/node_home_black_diff.png b/Projekte/mdga/client/src/main/resources/node_home/node_home_black_diff.png new file mode 100644 index 00000000..534203e7 Binary files /dev/null and b/Projekte/mdga/client/src/main/resources/node_home/node_home_black_diff.png differ diff --git a/Projekte/mdga/client/src/main/resources/node_home/node_home_blue.png b/Projekte/mdga/client/src/main/resources/node_home/node_home_blue.png new file mode 100644 index 00000000..a228bb76 Binary files /dev/null and b/Projekte/mdga/client/src/main/resources/node_home/node_home_blue.png differ diff --git a/Projekte/mdga/client/src/main/resources/node_home/node_home_green_diff.png b/Projekte/mdga/client/src/main/resources/node_home/node_home_green_diff.png new file mode 100644 index 00000000..d79c8768 Binary files /dev/null and b/Projekte/mdga/client/src/main/resources/node_home/node_home_green_diff.png differ diff --git a/Projekte/mdga/client/src/main/resources/node_home/node_home_yellow_diff.png b/Projekte/mdga/client/src/main/resources/node_home/node_home_yellow_diff.png new file mode 100644 index 00000000..cbd14eca Binary files /dev/null and b/Projekte/mdga/client/src/main/resources/node_home/node_home_yellow_diff.png differ diff --git a/Projekte/mdga/client/src/main/resources/node_normal/node_bonus_diff.png b/Projekte/mdga/client/src/main/resources/node_normal/node_bonus_diff.png new file mode 100644 index 00000000..da9c5d9f Binary files /dev/null and b/Projekte/mdga/client/src/main/resources/node_normal/node_bonus_diff.png differ diff --git a/Projekte/mdga/client/src/main/resources/node_normal/node_normal.j3o b/Projekte/mdga/client/src/main/resources/node_normal/node_normal.j3o new file mode 100644 index 00000000..20dd17a4 Binary files /dev/null and b/Projekte/mdga/client/src/main/resources/node_normal/node_normal.j3o differ diff --git a/Projekte/mdga/client/src/main/resources/node_normal/node_normal_diff.png b/Projekte/mdga/client/src/main/resources/node_normal/node_normal_diff.png new file mode 100644 index 00000000..633560c9 Binary files /dev/null and b/Projekte/mdga/client/src/main/resources/node_normal/node_normal_diff.png differ diff --git a/Projekte/mdga/client/src/main/resources/node_normal/node_start_diff.png b/Projekte/mdga/client/src/main/resources/node_normal/node_start_diff.png new file mode 100644 index 00000000..749e7ded Binary files /dev/null and b/Projekte/mdga/client/src/main/resources/node_normal/node_start_diff.png differ diff --git a/Projekte/mdga/client/src/main/resources/radar/radar.j3o b/Projekte/mdga/client/src/main/resources/radar/radar.j3o new file mode 100644 index 00000000..a79bb7fd Binary files /dev/null and b/Projekte/mdga/client/src/main/resources/radar/radar.j3o differ diff --git a/Projekte/mdga/client/src/main/resources/radar/radar_diff.png b/Projekte/mdga/client/src/main/resources/radar/radar_diff.png new file mode 100644 index 00000000..b7ffdb4e Binary files /dev/null and b/Projekte/mdga/client/src/main/resources/radar/radar_diff.png differ diff --git a/Projekte/mdga/client/src/main/resources/shieldCard/shieldCard.j3o b/Projekte/mdga/client/src/main/resources/shieldCard/shieldCard.j3o new file mode 100644 index 00000000..e27250cf Binary files /dev/null and b/Projekte/mdga/client/src/main/resources/shieldCard/shieldCard.j3o differ diff --git a/Projekte/mdga/client/src/main/resources/shieldCard/shieldCard_diff.png b/Projekte/mdga/client/src/main/resources/shieldCard/shieldCard_diff.png new file mode 100644 index 00000000..678d04f1 Binary files /dev/null and b/Projekte/mdga/client/src/main/resources/shieldCard/shieldCard_diff.png differ diff --git a/Projekte/mdga/client/src/main/resources/ship/ship.j3o b/Projekte/mdga/client/src/main/resources/ship/ship.j3o new file mode 100644 index 00000000..dfc26431 Binary files /dev/null and b/Projekte/mdga/client/src/main/resources/ship/ship.j3o differ diff --git a/Projekte/mdga/client/src/main/resources/ship/ship_diff.png b/Projekte/mdga/client/src/main/resources/ship/ship_diff.png new file mode 100644 index 00000000..b454b6d5 Binary files /dev/null and b/Projekte/mdga/client/src/main/resources/ship/ship_diff.png differ diff --git a/Projekte/mdga/client/src/main/resources/smallTent/smallTent.j3o b/Projekte/mdga/client/src/main/resources/smallTent/smallTent.j3o new file mode 100644 index 00000000..61c4a41d Binary files /dev/null and b/Projekte/mdga/client/src/main/resources/smallTent/smallTent.j3o differ diff --git a/Projekte/mdga/client/src/main/resources/smallTent/smallTent_diff.png b/Projekte/mdga/client/src/main/resources/smallTent/smallTent_diff.png new file mode 100644 index 00000000..70ed8a75 Binary files /dev/null and b/Projekte/mdga/client/src/main/resources/smallTent/smallTent_diff.png differ diff --git a/Projekte/mdga/client/src/main/resources/swapCard/swapCard.j3o b/Projekte/mdga/client/src/main/resources/swapCard/swapCard.j3o new file mode 100644 index 00000000..a829dfa2 Binary files /dev/null and b/Projekte/mdga/client/src/main/resources/swapCard/swapCard.j3o differ diff --git a/Projekte/mdga/client/src/main/resources/swapCard/swapCard_diff.png b/Projekte/mdga/client/src/main/resources/swapCard/swapCard_diff.png new file mode 100644 index 00000000..ac448059 Binary files /dev/null and b/Projekte/mdga/client/src/main/resources/swapCard/swapCard_diff.png differ diff --git a/Projekte/mdga/client/src/main/resources/tank/tank.j3o b/Projekte/mdga/client/src/main/resources/tank/tank.j3o new file mode 100644 index 00000000..bcb37cab Binary files /dev/null and b/Projekte/mdga/client/src/main/resources/tank/tank.j3o differ diff --git a/Projekte/mdga/client/src/main/resources/tank/tank_diff.png b/Projekte/mdga/client/src/main/resources/tank/tank_diff.png new file mode 100644 index 00000000..083de2d7 Binary files /dev/null and b/Projekte/mdga/client/src/main/resources/tank/tank_diff.png differ diff --git a/Projekte/mdga/client/src/main/resources/turboCard/turboCard.j3o b/Projekte/mdga/client/src/main/resources/turboCard/turboCard.j3o new file mode 100644 index 00000000..61d897da Binary files /dev/null and b/Projekte/mdga/client/src/main/resources/turboCard/turboCard.j3o differ diff --git a/Projekte/mdga/client/src/main/resources/turboCard/turboCard_diff.png b/Projekte/mdga/client/src/main/resources/turboCard/turboCard_diff.png new file mode 100644 index 00000000..31c73694 Binary files /dev/null and b/Projekte/mdga/client/src/main/resources/turboCard/turboCard_diff.png differ diff --git a/Projekte/mdga/client/src/main/resources/world/world.j3o b/Projekte/mdga/client/src/main/resources/world/world.j3o new file mode 100644 index 00000000..422656cc Binary files /dev/null and b/Projekte/mdga/client/src/main/resources/world/world.j3o differ diff --git a/Projekte/mdga/client/src/main/resources/world/world_diff.png b/Projekte/mdga/client/src/main/resources/world/world_diff.png new file mode 100644 index 00000000..cde901b6 Binary files /dev/null and b/Projekte/mdga/client/src/main/resources/world/world_diff.png differ diff --git a/Projekte/settings.gradle b/Projekte/settings.gradle index 34558071..fbaa68b5 100644 --- a/Projekte/settings.gradle +++ b/Projekte/settings.gradle @@ -32,3 +32,8 @@ } } } +include 'mdga:client' +findProject(':mdga:client')?.name = 'client' +include 'mdga:client' +findProject(':mdga:client')?.name = 'client' +