Merge pull request #68 from DjLegolas/devel

JavaFX release
DjLegolas · Jun 20, 2017 · 099cf15 · 099cf15
2 parents 8bb28c2 + 4147d60
commit 099cf15
Show file tree

Hide file tree

Showing 37 changed files with 2,655 additions and 82 deletions.
diff --git a/.idea/artifacts/WordiadaApp.xml b/.idea/artifacts/WordiadaApp.xml
diff --git a/.idea/artifacts/WordiadaEngine_jar.xml b/.idea/artifacts/WordiadaEngine_jar.xml
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/DesktopUI/DesktopUI.iml b/DesktopUI/DesktopUI.iml
@@ -0,0 +1,12 @@
+<?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" />
+    <orderEntry type="module" module-name="GameEngine" />
+  </component>
+</module>
diff --git a/DesktopUI/src/META-INF/MANIFEST.MF b/DesktopUI/src/META-INF/MANIFEST.MF
@@ -0,0 +1,4 @@
+Manifest-Version: 1.0
+Class-Path: WordiadaEngine.jar
+Main-Class: desktopUI.Main
+