From 18e0d86a4d0ceecb235ea00778d48d4575acb69b Mon Sep 17 00:00:00 2001
From: AtleNyhus <55181788+AtleNyhus@users.noreply.github.com>
Date: Wed, 30 Sep 2020 14:43:09 +0200
Subject: [PATCH 1/6] mappe

---
 Tank game - Client/.idea/misc.xml         |  6 +++
 Tank game - Client/.idea/modules.xml      |  8 ++++
 Tank game - Client/.idea/workspace.xml    | 49 +++++++++++++++++++++++
 Tank game - Client/Tank game - Client.iml | 11 +++++
 4 files changed, 74 insertions(+)
 create mode 100644 Tank game - Client/.idea/misc.xml
 create mode 100644 Tank game - Client/.idea/modules.xml
 create mode 100644 Tank game - Client/.idea/workspace.xml
 create mode 100644 Tank game - Client/Tank game - Client.iml

diff --git a/Tank game - Client/.idea/misc.xml b/Tank game - Client/.idea/misc.xml
new file mode 100644
index 00000000..5217e29a
--- /dev/null
+++ b/Tank game - Client/.idea/misc.xml	
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_13" default="true" project-jdk-name="13" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/out" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/Tank game - Client/.idea/modules.xml b/Tank game - Client/.idea/modules.xml
new file mode 100644
index 00000000..03ae1cf6
--- /dev/null
+++ b/Tank game - Client/.idea/modules.xml	
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/Tank game - Client.iml" filepath="$PROJECT_DIR$/Tank game - Client.iml" />
+    </modules>
+  </component>
+</project>
\ No newline at end of file
diff --git a/Tank game - Client/.idea/workspace.xml b/Tank game - Client/.idea/workspace.xml
new file mode 100644
index 00000000..c85ae4d3
--- /dev/null
+++ b/Tank game - Client/.idea/workspace.xml	
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ChangeListManager">
+    <list default="true" id="f716ca59-c1f0-4a46-90bb-e7de6626bdf2" name="Default Changelist" comment="" />
+    <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="ProjectId" id="1iEP41JV2RovnOi5egWgnkih7Yl" />
+  <component name="ProjectViewState">
+    <option name="hideEmptyMiddlePackages" value="true" />
+    <option name="showExcludedFiles" value="true" />
+    <option name="showLibraryContents" value="true" />
+  </component>
+  <component name="PropertiesComponent">
+    <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
+    <property name="WebServerToolWindowFactoryState" value="false" />
+    <property name="aspect.path.notification.shown" value="true" />
+    <property name="settings.editor.selected.configurable" value="settings.github" />
+  </component>
+  <component name="SvnConfiguration">
+    <configuration />
+  </component>
+  <component name="TaskManager">
+    <task active="true" id="Default" summary="Default task">
+      <changelist id="f716ca59-c1f0-4a46-90bb-e7de6626bdf2" name="Default Changelist" comment="" />
+      <created>1601469582604</created>
+      <option name="number" value="Default" />
+      <option name="presentableId" value="Default" />
+      <updated>1601469582604</updated>
+      <workItem from="1601469586513" duration="67000" />
+    </task>
+    <servers />
+  </component>
+  <component name="TypeScriptGeneratedFilesManager">
+    <option name="version" value="1" />
+  </component>
+  <component name="WindowStateProjectService">
+    <state x="277" y="55" key="SettingsEditor" timestamp="1601469654290">
+      <screen x="0" y="0" width="1536" height="824" />
+    </state>
+    <state x="277" y="55" key="SettingsEditor/0.0.1536.824@0.0.1536.824" timestamp="1601469654290" />
+    <state x="431" y="145" key="search.everywhere.popup" timestamp="1601469659992">
+      <screen x="0" y="0" width="1536" height="824" />
+    </state>
+    <state x="431" y="145" key="search.everywhere.popup/0.0.1536.824@0.0.1536.824" timestamp="1601469659992" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/Tank game - Client/Tank game - Client.iml b/Tank game - Client/Tank game - Client.iml
new file mode 100644
index 00000000..c90834f2
--- /dev/null
+++ b/Tank game - Client/Tank game - Client.iml	
@@ -0,0 +1,11 @@
+<?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

From ae31b0ab967aa1c41d8560560fa1d6b176809d7d Mon Sep 17 00:00:00 2001
From: AtleNyhus <55181788+AtleNyhus@users.noreply.github.com>
Date: Wed, 30 Sep 2020 14:50:14 +0200
Subject: [PATCH 2/6] added classed

---
 Tank game - Client/.idea/vcs.xml       | 6 ++++++
 Tank game - Client/.idea/workspace.xml | 4 ++++
 Tank game - Client/src/Collision.java  | 2 ++
 Tank game - Client/src/Map.java        | 2 ++
 Tank game - Client/src/Tank.java       | 2 ++
 5 files changed, 16 insertions(+)
 create mode 100644 Tank game - Client/.idea/vcs.xml
 create mode 100644 Tank game - Client/src/Collision.java
 create mode 100644 Tank game - Client/src/Map.java
 create mode 100644 Tank game - Client/src/Tank.java

diff --git a/Tank game - Client/.idea/vcs.xml b/Tank game - Client/.idea/vcs.xml
new file mode 100644
index 00000000..6c0b8635
--- /dev/null
+++ b/Tank game - Client/.idea/vcs.xml	
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$/.." vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/Tank game - Client/.idea/workspace.xml b/Tank game - Client/.idea/workspace.xml
index c85ae4d3..4a04cb18 100644
--- a/Tank game - Client/.idea/workspace.xml	
+++ b/Tank game - Client/.idea/workspace.xml	
@@ -7,6 +7,9 @@
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
+  <component name="Git.Settings">
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/.." />
+  </component>
   <component name="ProjectId" id="1iEP41JV2RovnOi5egWgnkih7Yl" />
   <component name="ProjectViewState">
     <option name="hideEmptyMiddlePackages" value="true" />
@@ -17,6 +20,7 @@
     <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
     <property name="settings.editor.selected.configurable" value="settings.github" />
   </component>
   <component name="SvnConfiguration">
diff --git a/Tank game - Client/src/Collision.java b/Tank game - Client/src/Collision.java
new file mode 100644
index 00000000..2d43efe3
--- /dev/null
+++ b/Tank game - Client/src/Collision.java	
@@ -0,0 +1,2 @@
+public class Collision {
+}
diff --git a/Tank game - Client/src/Map.java b/Tank game - Client/src/Map.java
new file mode 100644
index 00000000..5eb30427
--- /dev/null
+++ b/Tank game - Client/src/Map.java	
@@ -0,0 +1,2 @@
+public class Map {
+}
diff --git a/Tank game - Client/src/Tank.java b/Tank game - Client/src/Tank.java
new file mode 100644
index 00000000..7b8b20f5
--- /dev/null
+++ b/Tank game - Client/src/Tank.java	
@@ -0,0 +1,2 @@
+public class Tank {
+}

From 0cd823fe2a39783885cb84a6a62a2f1ba67dd13e Mon Sep 17 00:00:00 2001
From: AtleNyhus <55181788+AtleNyhus@users.noreply.github.com>
Date: Wed, 30 Sep 2020 15:12:53 +0200
Subject: [PATCH 3/6] ting og sager

---
 Tank game - Client/.idea/workspace.xml        |  46 +++++++++++++++++-
 .../Tank game - Client/Collision.class        | Bin 0 -> 252 bytes
 .../production/Tank game - Client/Main.class  | Bin 0 -> 355 bytes
 .../production/Tank game - Client/Map.class   | Bin 0 -> 587 bytes
 .../production/Tank game - Client/Tank.class  | Bin 0 -> 237 bytes
 Tank game - Client/src/Collision.java         |   3 ++
 Tank game - Client/src/Main.java              |   7 +++
 Tank game - Client/src/Map.java               |  21 +++++++-
 8 files changed, 75 insertions(+), 2 deletions(-)
 create mode 100644 Tank game - Client/out/production/Tank game - Client/Collision.class
 create mode 100644 Tank game - Client/out/production/Tank game - Client/Main.class
 create mode 100644 Tank game - Client/out/production/Tank game - Client/Map.class
 create mode 100644 Tank game - Client/out/production/Tank game - Client/Tank.class
 create mode 100644 Tank game - Client/src/Main.java

diff --git a/Tank game - Client/.idea/workspace.xml b/Tank game - Client/.idea/workspace.xml
index 4a04cb18..6ab45cd0 100644
--- a/Tank game - Client/.idea/workspace.xml	
+++ b/Tank game - Client/.idea/workspace.xml	
@@ -1,16 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="f716ca59-c1f0-4a46-90bb-e7de6626bdf2" name="Default Changelist" comment="" />
+    <list default="true" id="f716ca59-c1f0-4a46-90bb-e7de6626bdf2" name="Default Changelist" comment="">
+      <change afterPath="$PROJECT_DIR$/src/Main.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Collision.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Collision.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Map.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Map.java" 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="Class" />
+      </list>
+    </option>
+  </component>
   <component name="Git.Settings">
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/.." />
   </component>
   <component name="ProjectId" id="1iEP41JV2RovnOi5egWgnkih7Yl" />
+  <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
   <component name="ProjectViewState">
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showExcludedFiles" value="true" />
@@ -23,6 +36,20 @@
     <property name="last_opened_file_path" value="$PROJECT_DIR$" />
     <property name="settings.editor.selected.configurable" value="settings.github" />
   </component>
+  <component name="RunManager">
+    <configuration name="Map" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
+      <option name="MAIN_CLASS_NAME" value="Map" />
+      <module name="Tank game - Client" />
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
+    <recent_temporary>
+      <list>
+        <item itemvalue="Application.Map" />
+      </list>
+    </recent_temporary>
+  </component>
   <component name="SvnConfiguration">
     <configuration />
   </component>
@@ -34,6 +61,7 @@
       <option name="presentableId" value="Default" />
       <updated>1601469582604</updated>
       <workItem from="1601469586513" duration="67000" />
+      <workItem from="1601470118480" duration="1294000" />
     </task>
     <servers />
   </component>
@@ -41,6 +69,22 @@
     <option name="version" value="1" />
   </component>
   <component name="WindowStateProjectService">
+    <state width="1493" height="210" key="GridCell.Tab.0.bottom" timestamp="1601471008675">
+      <screen x="0" y="0" width="1536" height="824" />
+    </state>
+    <state width="1493" height="210" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1601471008675" />
+    <state width="1493" height="210" key="GridCell.Tab.0.center" timestamp="1601471008675">
+      <screen x="0" y="0" width="1536" height="824" />
+    </state>
+    <state width="1493" height="210" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1601471008675" />
+    <state width="1493" height="210" key="GridCell.Tab.0.left" timestamp="1601471008675">
+      <screen x="0" y="0" width="1536" height="824" />
+    </state>
+    <state width="1493" height="210" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1601471008675" />
+    <state width="1493" height="210" key="GridCell.Tab.0.right" timestamp="1601471008675">
+      <screen x="0" y="0" width="1536" height="824" />
+    </state>
+    <state width="1493" height="210" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1601471008675" />
     <state x="277" y="55" key="SettingsEditor" timestamp="1601469654290">
       <screen x="0" y="0" width="1536" height="824" />
     </state>
diff --git a/Tank game - Client/out/production/Tank game - Client/Collision.class b/Tank game - Client/out/production/Tank game - Client/Collision.class
new file mode 100644
index 0000000000000000000000000000000000000000..2bdf3c6ac6c8b69fb76d8b749c053d5898381eb7
GIT binary patch
literal 252
zcmX|5y9&ZU5S)#PG4Y9iV5b(Q7R5%e3R)=kmw4!fGY2vHUsi&JAK*ucdqLcV*`3)3
z^Zq<v0H)}La8UE%w&0;o=w;$2A}#V`v`I3VmW29T<*Hl|YQxdqM}rV7jn?X-Oipl@
z<{$~(SmknkJtwl*iA1x~k4-A{UKGmmpXin+bs;q4|A!eN+?s2V%9XNbo&RKFtzZD3
n9oisH_Q)78iz*Iy;|J)@f`gFJj_qobu~qdR*LJ0K7#(!KZ)7mm

literal 0
HcmV?d00001

diff --git a/Tank game - Client/out/production/Tank game - Client/Main.class b/Tank game - Client/out/production/Tank game - Client/Main.class
new file mode 100644
index 0000000000000000000000000000000000000000..8553bff78e1b83abdfbe889ef5633cf6e53a0e5a
GIT binary patch
literal 355
zcmZut!AiqG6r7i)jfvH2E8e}e3g#>=UIb5350zXzZQ>HQq#IaM|I3r$!4L4G#Mvk)
z;=<1G-kX`n?)%5<8-Oz$BnZ%p5DwADK(Mz`Pb#gIt<sxfrOQ?@SQu;Cb3t!9%Oh+F
z!YgGg>7u#Uf>CCyzTT`0?QT_3vop?`Qq{R~#@FA?uzfI(Ov}7^PWQSCIh@{QKRcJL
zGq#$~a?X{jsGs~Z79`7N<4S#L{JPjDp860RA>w=d2_XJO#F$k|7IOdi1@hdD6QUo3
kcbho;5|DRT#n{D&9dADAG}QeyhQEybI_!7CF)_g86PN%!;s5{u

literal 0
HcmV?d00001

diff --git a/Tank game - Client/out/production/Tank game - Client/Map.class b/Tank game - Client/out/production/Tank game - Client/Map.class
new file mode 100644
index 0000000000000000000000000000000000000000..c92f984576dc5f58a98f3715e09cf037c8cc3897
GIT binary patch
literal 587
zcmZvZ+fKqj6h-%NE0ijTh<C+%kwl&i#utqVrsxBPM12~t>L?de>h-UD!9){3z%TJD
zjC+cSF|pIk^qjrVI@6htuh(|~o3KrU5H=985JgNNeI@T?sU<rXrNhRR+w=uuTdJe{
zZGo^|s2hk2WVGp_)Vo)-?eBTA?Z#mWnAOMpt|xWcgaJ!4hXlrK=a*XZJ<8=mT{}`1
z(z<KpMmDc?B4c3`S(19LUspZVXt`AFlYu>FVH^_z2GyE+q7=0&6}_n`?yf3t=-ug_
zF`sf&$33`hH(c*X29S)?ZOT?%dP>JX$%uccdZak4Ewi{SRYxFapZ>RD>e9QQee@rh
zkaK+w0@<MU@9B_j*1ES|)7?}0kK*jNq0a;hnB)cMCj>GO<2=o%#8q&OuD?J$2l5PO
zEi;K(&eqTO9OfA%kSA<V+(0;h&b`4n&Lm!tbc%fp7bAU)6i33JeES&trRGS~1e0SJ
fNnU})4nskg+<=5dEYV{ki)E~^kH9M95Z1l{1Ho=f

literal 0
HcmV?d00001

diff --git a/Tank game - Client/out/production/Tank game - Client/Tank.class b/Tank game - Client/out/production/Tank game - Client/Tank.class
new file mode 100644
index 0000000000000000000000000000000000000000..3af8ce1de6b20bda0b1a8bcb9c60929396204210
GIT binary patch
literal 237
zcmXYrO%8%E5QSg)6+|K4z@55~wb8gSaYb|?VPCM(B0_@Ty<C~N@BkjlI3;$HH}k&f
zwDbAC-T)Q|Txig37#>Vm3_;HCJS=#53ioL)vWCH0$x=3J27NM3Z1fn6n3oqyo9ZYS
z{79B!*IrXm$2={FjG`*zMZ#;T{2v<4S>EWiNDVI;+(XsYnb=A-;V3v)e`5@rR#Jyi
k&{Cuhxv=wqIeUUV2xxFgRa;%{lX_ikQXX_{NUFjA0fWUVZ2$lO

literal 0
HcmV?d00001

diff --git a/Tank game - Client/src/Collision.java b/Tank game - Client/src/Collision.java
index 2d43efe3..b5606e75 100644
--- a/Tank game - Client/src/Collision.java	
+++ b/Tank game - Client/src/Collision.java	
@@ -1,2 +1,5 @@
 public class Collision {
+
+
+
 }
diff --git a/Tank game - Client/src/Main.java b/Tank game - Client/src/Main.java
new file mode 100644
index 00000000..1c30f2ff
--- /dev/null
+++ b/Tank game - Client/src/Main.java	
@@ -0,0 +1,7 @@
+public class Main {
+    public static void main(String[] args) {
+
+    }
+
+
+}
diff --git a/Tank game - Client/src/Map.java b/Tank game - Client/src/Map.java
index 5eb30427..c251a49a 100644
--- a/Tank game - Client/src/Map.java	
+++ b/Tank game - Client/src/Map.java	
@@ -1,2 +1,21 @@
-public class Map {
+import java.awt.*;
+import java.awt.image.BufferedImage;
+import javax.swing.*;
+
+public class Map extends JPanel {
+
+    public static void main(String[] args) {
+
+        JFrame frame = new JFrame("My Drawing");
+        frame.pack();
+        frame.setVisible(true);
+        frame.setSize(720,720);
+        ImageIcon pic = new ImageIcon("path");
+        Image tank = pic.getImage();
+    }
+
+    protected void paintComponent(Graphics g) {
+        super.paintComponent(g);
+    }
 }
+

From bc58dbfb7ca4cbf90e39e638a5ad03a360d1a22c Mon Sep 17 00:00:00 2001
From: AsgerLanghoff <54887248+AsgerLanghoff@users.noreply.github.com>
Date: Mon, 5 Oct 2020 14:11:46 +0200
Subject: [PATCH 4/6] Setup of client and server folders

---
 .vscode/settings.json  | 8 ++++++++
 Server/ServerMain.Java | 0
 2 files changed, 8 insertions(+)
 create mode 100644 .vscode/settings.json
 create mode 100644 Server/ServerMain.Java

diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 00000000..2421e386
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,8 @@
+{
+    "files.exclude": {
+        "**/.classpath": true,
+        "**/.project": true,
+        "**/.settings": true,
+        "**/.factorypath": true
+    }
+}
\ No newline at end of file
diff --git a/Server/ServerMain.Java b/Server/ServerMain.Java
new file mode 100644
index 00000000..e69de29b

From 262bb1dfb5cd63dc1123ad64ac3080b5bc290f92 Mon Sep 17 00:00:00 2001
From: AtleNyhus <55181788+AtleNyhus@users.noreply.github.com>
Date: Mon, 5 Oct 2020 15:40:48 +0200
Subject: [PATCH 5/6] det virker ikke

---
 Tank game - Client/.idea/libraries/lib.xml    | 13 ++++++
 .../.idea/libraries/openjfx_11_0.xml          |  7 +++
 Tank game - Client/.idea/workspace.xml        | 42 ++++++++++++------
 Tank game - Client/Tank game - Client.iml     |  2 +
 Tank game - Client/src/Projectile.java        | 44 +++++++++++++++++++
 5 files changed, 94 insertions(+), 14 deletions(-)
 create mode 100644 Tank game - Client/.idea/libraries/lib.xml
 create mode 100644 Tank game - Client/.idea/libraries/openjfx_11_0.xml
 create mode 100644 Tank game - Client/src/Projectile.java

diff --git a/Tank game - Client/.idea/libraries/lib.xml b/Tank game - Client/.idea/libraries/lib.xml
new file mode 100644
index 00000000..59fbaf73
--- /dev/null
+++ b/Tank game - Client/.idea/libraries/lib.xml	
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="lib">
+    <CLASSES>
+      <root url="file://$USER_HOME$/Downloads/openjfx-11.0.2_windows-x64_bin-sdk/javafx-sdk-11.0.2/lib" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="file://$USER_HOME$/Downloads/openjfx-11.0.2_windows-x64_bin-sdk/javafx-sdk-11.0.2/lib" />
+    </SOURCES>
+    <jarDirectory url="file://$USER_HOME$/Downloads/openjfx-11.0.2_windows-x64_bin-sdk/javafx-sdk-11.0.2/lib" recursive="false" />
+    <jarDirectory url="file://$USER_HOME$/Downloads/openjfx-11.0.2_windows-x64_bin-sdk/javafx-sdk-11.0.2/lib" recursive="false" type="SOURCES" />
+  </library>
+</component>
\ No newline at end of file
diff --git a/Tank game - Client/.idea/libraries/openjfx_11_0.xml b/Tank game - Client/.idea/libraries/openjfx_11_0.xml
new file mode 100644
index 00000000..6637306e
--- /dev/null
+++ b/Tank game - Client/.idea/libraries/openjfx_11_0.xml	
@@ -0,0 +1,7 @@
+<component name="libraryTable">
+  <library name="openjfx-11.0">
+    <CLASSES />
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>
\ No newline at end of file
diff --git a/Tank game - Client/.idea/workspace.xml b/Tank game - Client/.idea/workspace.xml
index 6ab45cd0..e4fd39b7 100644
--- a/Tank game - Client/.idea/workspace.xml	
+++ b/Tank game - Client/.idea/workspace.xml	
@@ -2,10 +2,10 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="f716ca59-c1f0-4a46-90bb-e7de6626bdf2" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/src/Main.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/.idea/libraries/openjfx_11_0.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/Projectile.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Collision.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Collision.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Map.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Map.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Tank game - Client.iml" beforeDir="false" afterPath="$PROJECT_DIR$/Tank game - Client.iml" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -31,15 +31,20 @@
   </component>
   <component name="PropertiesComponent">
     <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
+    <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
+    <property name="last_opened_file_path" value="$USER_HOME$/Downloads/openjfx-11.0.2_windows-x64_bin-sdk/javafx-sdk-11.0.2/lib" />
+    <property name="project.structure.last.edited" value="Libraries" />
+    <property name="project.structure.proportion" value="0.15" />
+    <property name="project.structure.side.proportion" value="0.2" />
     <property name="settings.editor.selected.configurable" value="settings.github" />
   </component>
   <component name="RunManager">
     <configuration name="Map" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
       <option name="MAIN_CLASS_NAME" value="Map" />
       <module name="Tank game - Client" />
+      <option name="VM_PARAMETERS" value="--module-path C:\Users\atlen\Downloads\openjfx-11.0.2_windows-x64_bin-sdk\javafx-sdk-11.0.2\lib --add-modules javafx.controls,javafx.fxml" />
       <method v="2">
         <option name="Make" enabled="true" />
       </method>
@@ -62,6 +67,7 @@
       <updated>1601469582604</updated>
       <workItem from="1601469586513" duration="67000" />
       <workItem from="1601470118480" duration="1294000" />
+      <workItem from="1601905011997" duration="227000" />
     </task>
     <servers />
   </component>
@@ -69,26 +75,34 @@
     <option name="version" value="1" />
   </component>
   <component name="WindowStateProjectService">
-    <state width="1493" height="210" key="GridCell.Tab.0.bottom" timestamp="1601471008675">
+    <state x="223" y="67" key="#com.intellij.execution.impl.EditConfigurationsDialog" timestamp="1601905144979">
       <screen x="0" y="0" width="1536" height="824" />
     </state>
-    <state width="1493" height="210" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1601471008675" />
-    <state width="1493" height="210" key="GridCell.Tab.0.center" timestamp="1601471008675">
+    <state x="223" y="67" key="#com.intellij.execution.impl.EditConfigurationsDialog/0.0.1536.824@0.0.1536.824" timestamp="1601905144979" />
+    <state x="549" y="167" key="FileChooserDialogImpl" timestamp="1601905228837">
       <screen x="0" y="0" width="1536" height="824" />
     </state>
-    <state width="1493" height="210" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1601471008675" />
-    <state width="1493" height="210" key="GridCell.Tab.0.left" timestamp="1601471008675">
+    <state x="549" y="167" key="FileChooserDialogImpl/0.0.1536.824@0.0.1536.824" timestamp="1601905228837" />
+    <state width="1493" height="103" key="GridCell.Tab.0.bottom" timestamp="1601904959616">
       <screen x="0" y="0" width="1536" height="824" />
     </state>
-    <state width="1493" height="210" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1601471008675" />
-    <state width="1493" height="210" key="GridCell.Tab.0.right" timestamp="1601471008675">
+    <state width="1493" height="103" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1601904959616" />
+    <state width="1493" height="103" key="GridCell.Tab.0.center" timestamp="1601904959615">
       <screen x="0" y="0" width="1536" height="824" />
     </state>
-    <state width="1493" height="210" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1601471008675" />
-    <state x="277" y="55" key="SettingsEditor" timestamp="1601469654290">
+    <state width="1493" height="103" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1601904959615" />
+    <state width="1493" height="103" key="GridCell.Tab.0.left" timestamp="1601904959615">
       <screen x="0" y="0" width="1536" height="824" />
     </state>
-    <state x="277" y="55" key="SettingsEditor/0.0.1536.824@0.0.1536.824" timestamp="1601469654290" />
+    <state width="1493" height="103" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1601904959615" />
+    <state width="1493" height="103" key="GridCell.Tab.0.right" timestamp="1601904959615">
+      <screen x="0" y="0" width="1536" height="824" />
+    </state>
+    <state width="1493" height="103" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1601904959615" />
+    <state x="277" y="0" key="SettingsEditor" timestamp="1601905234324">
+      <screen x="0" y="0" width="1536" height="824" />
+    </state>
+    <state x="277" y="0" key="SettingsEditor/0.0.1536.824@0.0.1536.824" timestamp="1601905234324" />
     <state x="431" y="145" key="search.everywhere.popup" timestamp="1601469659992">
       <screen x="0" y="0" width="1536" height="824" />
     </state>
diff --git a/Tank game - Client/Tank game - Client.iml b/Tank game - Client/Tank game - Client.iml
index c90834f2..443d7b43 100644
--- a/Tank game - Client/Tank game - Client.iml	
+++ b/Tank game - Client/Tank game - Client.iml	
@@ -7,5 +7,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="openjfx-11.0" level="project" />
+    <orderEntry type="library" name="lib" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/Tank game - Client/src/Projectile.java b/Tank game - Client/src/Projectile.java
new file mode 100644
index 00000000..2d457b02
--- /dev/null
+++ b/Tank game - Client/src/Projectile.java	
@@ -0,0 +1,44 @@
+import javafx.application.Application;
+import javafx.scene.Group;
+import javafx.scene.Scene;
+import javafx.scene.paint.Color;
+import javafx.scene.shape.Circle;
+import javafx.scene.shape.Rectangle;
+import javafx.scene.text.Font;
+import javafx.scene.text.Text;
+import javafx.stage.Stage;
+
+import java.awt.event.KeyEvent;
+import java.awt.event.MouseEvent;
+
+
+public class Main extends Application {
+
+    public static void main(String[] args) {
+        Application.launch(args);
+    }
+
+    int x = 25;
+    int y = 25;
+
+    @Override
+    public void start(Stage stage) throws Exception {
+        Group root = new Group();
+        Scene scene = new Scene(root, 500, 500);
+
+        stage.setTitle("Welcome to JavaFX!");
+        stage.setScene(scene);
+        stage.sizeToScene();
+        stage.show();
+
+        Rectangle r = new Rectangle(x, y, 250, 250);
+        r.setFill(Color.AQUA);
+
+        root.getChildren().add(r);
+
+        scene.addEventListener(KeyEvent, keyEvent -> {
+            System.out.println(keyEvent);
+        });
+    }
+
+}

From cee81bd6c58e48f856e00b005c2b9269c444c641 Mon Sep 17 00:00:00 2001
From: AtleNyhus <55181788+AtleNyhus@users.noreply.github.com>
Date: Fri, 9 Oct 2020 09:23:29 +0200
Subject: [PATCH 6/6] Update workspace.xml

---
 Tank game - Client/.idea/workspace.xml | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/Tank game - Client/.idea/workspace.xml b/Tank game - Client/.idea/workspace.xml
index e4fd39b7..7dc2feb1 100644
--- a/Tank game - Client/.idea/workspace.xml	
+++ b/Tank game - Client/.idea/workspace.xml	
@@ -2,10 +2,7 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="f716ca59-c1f0-4a46-90bb-e7de6626bdf2" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/openjfx_11_0.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/Projectile.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Tank game - Client.iml" beforeDir="false" afterPath="$PROJECT_DIR$/Tank game - Client.iml" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -34,7 +31,7 @@
     <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
-    <property name="last_opened_file_path" value="$USER_HOME$/Downloads/openjfx-11.0.2_windows-x64_bin-sdk/javafx-sdk-11.0.2/lib" />
+    <property name="last_opened_file_path" value="$USER_HOME$/IdeaProjects/Homework 3/Homework 3 client" />
     <property name="project.structure.last.edited" value="Libraries" />
     <property name="project.structure.proportion" value="0.15" />
     <property name="project.structure.side.proportion" value="0.2" />
@@ -68,6 +65,7 @@
       <workItem from="1601469586513" duration="67000" />
       <workItem from="1601470118480" duration="1294000" />
       <workItem from="1601905011997" duration="227000" />
+      <workItem from="1602059390530" duration="191000" />
     </task>
     <servers />
   </component>
@@ -79,10 +77,10 @@
       <screen x="0" y="0" width="1536" height="824" />
     </state>
     <state x="223" y="67" key="#com.intellij.execution.impl.EditConfigurationsDialog/0.0.1536.824@0.0.1536.824" timestamp="1601905144979" />
-    <state x="549" y="167" key="FileChooserDialogImpl" timestamp="1601905228837">
+    <state x="549" y="167" key="FileChooserDialogImpl" timestamp="1602059582174">
       <screen x="0" y="0" width="1536" height="824" />
     </state>
-    <state x="549" y="167" key="FileChooserDialogImpl/0.0.1536.824@0.0.1536.824" timestamp="1601905228837" />
+    <state x="549" y="167" key="FileChooserDialogImpl/0.0.1536.824@0.0.1536.824" timestamp="1602059582174" />
     <state width="1493" height="103" key="GridCell.Tab.0.bottom" timestamp="1601904959616">
       <screen x="0" y="0" width="1536" height="824" />
     </state>
@@ -103,6 +101,10 @@
       <screen x="0" y="0" width="1536" height="824" />
     </state>
     <state x="277" y="0" key="SettingsEditor/0.0.1536.824@0.0.1536.824" timestamp="1601905234324" />
+    <state x="209" y="114" key="new project wizard" timestamp="1602059510755">
+      <screen x="0" y="0" width="1536" height="824" />
+    </state>
+    <state x="209" y="114" key="new project wizard/0.0.1536.824@0.0.1536.824" timestamp="1602059510755" />
     <state x="431" y="145" key="search.everywhere.popup" timestamp="1601469659992">
       <screen x="0" y="0" width="1536" height="824" />
     </state>