Merge branch 'Luca'

df159c74 · Leonard · 64242e61 · 833f12df · df159c74 · df159c74
Commit df159c74 authored 4 years ago by Leonard
--- a/.gitignore
+++ b/.gitignore
@@ -125,3 +125,34 @@ Thumbs.db
 !/ios-moe/xcode/*.xcodeproj/xcshareddata
 !/ios-moe/xcode/*.xcodeproj/project.pbxproj
 /ios-moe/xcode/native/
+
+#==========Gitignore for Documentation==========
+
+#===Ignore LaTeX outputs===
+*.aux
+*.lof
+*.lot
+*.fls
+*.out
+*.toc
+*.fmt
+*.fot
+*.cb
+*.cb2
+.*.lb
+
+# Versteckte Dateien (aber .gitignore behalten)
+.*
+!.gitignore
+
+#===Ignore PDF files===
+Architekturbeschreibung.pdf
+*.out.ps
+
+# Log file
+*.log
+
+# Package Files 
+*.tar.gz
+*.synctex.gz
+
--- a/GT_Modulsicht/GalaxyTrucker.vpp
+++ b/GT_Modulsicht/GalaxyTrucker.vpp
--- a/GT_Modulsicht/GalaxyTrucker.vpp.bak_000f
+++ b/GT_Modulsicht/GalaxyTrucker.vpp.bak_000f
--- a/GT_Modulsicht/GalaxyTrucker.vpp.bak_001d
+++ b/GT_Modulsicht/GalaxyTrucker.vpp.bak_001d
--- a/GT_Modulsicht/Gt Model.png
+++ b/GT_Modulsicht/Gt Model.png
--- a/Server/Server.iml
+++ b/Server/Server.iml
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
\ No newline at end of file
--- a/core/out/production/classes/com/galaxytrucker/galaxytruckerreloaded/IO/Screen/MainMenu.class
+++ b/core/out/production/classes/com/galaxytrucker/galaxytruckerreloaded/IO/Screen/MainMenu.class
--- a/core/out/production/classes/com/galaxytrucker/galaxytruckerreloaded/IO/Screen/Screen.class
+++ b/core/out/production/classes/com/galaxytrucker/galaxytruckerreloaded/IO/Screen/Screen.class
--- a/core/out/production/classes/com/galaxytrucker/galaxytruckerreloaded/Main.class
+++ b/core/out/production/classes/com/galaxytrucker/galaxytruckerreloaded/Main.class
--- a/core/out/production/classes/com/galaxytrucker/galaxytruckerreloaded/Model/Ship.class
+++ b/core/out/production/classes/com/galaxytrucker/galaxytruckerreloaded/Model/Ship.class
--- a/core/out/production/classes/com/galaxytrucker/galaxytruckerreloaded/Model/ShipLayout/Room.class
+++ b/core/out/production/classes/com/galaxytrucker/galaxytruckerreloaded/Model/ShipLayout/Room.class
--- a/core/out/production/classes/com/galaxytrucker/galaxytruckerreloaded/Model/Weapons/Weapon.class
+++ b/core/out/production/classes/com/galaxytrucker/galaxytruckerreloaded/Model/Weapons/Weapon.class
--- a/core/out/production/classes/com/galaxytrucker/galaxytruckerreloaded/View/BaseRenderer.class
+++ b/core/out/production/classes/com/galaxytrucker/galaxytruckerreloaded/View/BaseRenderer.class
--- a/desktop/out/production/classes/com/galaxytrucker/galaxytruckerreloaded/desktop/DesktopLauncher.class
+++ b/desktop/out/production/classes/com/galaxytrucker/galaxytruckerreloaded/desktop/DesktopLauncher.class
--- a/doc/.gitignore
+++ b/doc/.gitignore
-#==========Gitignore for Documentation==========
-
-#===Ignore LaTeX outputs===
-*.aux
-*.lof
-*.lot
-*.fls
-*.out
-*.toc
-*.fmt
-*.fot
-*.cb
-*.cb2
-.*.lb
-
-#===Ignore PDF files===
-Architekturbeschreibung.pdf
-*.out.ps
-
-# Log file
-*.log
-
-# Package Files 
-*.tar.gz
-*.synctex.gz
\ No newline at end of file