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/8] 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 @@
+
+
+
+
+
+
\ 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 @@
+
+
+
+
+
+
+
+
\ 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 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 1601469582604
+
+
+ 1601469582604
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ 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 @@
+
+
+
+
+
+
+
+
+
+
+
\ 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/8] 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 @@
+
+
+
+
+
+
\ 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 @@
+
+
+
@@ -17,6 +20,7 @@
+
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/8] 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 @@
-
+
+
+
+
+
+
+
+
+
+
@@ -23,6 +36,20 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -34,6 +61,7 @@
1601469582604
+
@@ -41,6 +69,22 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
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=UIb5350zXzZQ>HQq#IaM|I3r$!4L4G#Mvk)
z;=<1G-kX`n?)%5<8-Oz$BnZ%p5DwADK(Mz`Pb#gIt7u#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-%NE0ijThL?de>h-UD!9){3z%TJD
zjC+cSF|pIk^qjrVI@6htuh(|~o3KrU5H=985JgNNeI@T?sUFVH^_z2GyE+q7=0&6}_n`?yf3t=-ug_
zF`sf&$33`hH(c*X29S)?ZOT?%dP>JX$%uccdZak4Ewi{SRYxFapZ>RD>e9QQee@rh
zkaK+w0@GO<2=o%#8q&OuD?J$2l5PO
zEi;K(&eqTO9OfA%kSAVm3_;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/8] 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 3532d06bfaff7c594f9b801d3c1f96bb46e1da28 Mon Sep 17 00:00:00 2001
From: signetoftgaard <56248226+signetoftgaard@users.noreply.github.com>
Date: Mon, 5 Oct 2020 14:33:11 +0200
Subject: [PATCH 5/8] tank variables and such
---
Tank game - Client/.idea/workspace.xml | 5 ++---
Tank game - Client/src/Tank.java | 27 ++++++++++++++++++++++++++
2 files changed, 29 insertions(+), 3 deletions(-)
diff --git a/Tank game - Client/.idea/workspace.xml b/Tank game - Client/.idea/workspace.xml
index 6ab45cd0..5a910a93 100644
--- a/Tank game - Client/.idea/workspace.xml
+++ b/Tank game - Client/.idea/workspace.xml
@@ -2,10 +2,8 @@
-
-
-
+
@@ -62,6 +60,7 @@
1601469582604
+
diff --git a/Tank game - Client/src/Tank.java b/Tank game - Client/src/Tank.java
index 7b8b20f5..97919653 100644
--- a/Tank game - Client/src/Tank.java
+++ b/Tank game - Client/src/Tank.java
@@ -1,2 +1,29 @@
public class Tank {
+ private int xPos, yPos;
+ private static int WIDTH;
+ private static int HEIGHT;
+ boolean hit = false;
+
+
+
+ void moveTank(){
+
+ }
+
+ //====GET & SET X & Y====
+ public void setxPos(int xPos) {
+ this.xPos = xPos;
+ }
+
+ public void setyPos(int yPos) {
+ this.yPos = yPos;
+ }
+
+ public int getxPos() {
+ return xPos;
+ }
+
+ public int getyPos() {
+ return yPos;
+ }
}
From 439f8dd8b21969b1988dbbd16e61714ec02513ff Mon Sep 17 00:00:00 2001
From: signetoftgaard <56248226+signetoftgaard@users.noreply.github.com>
Date: Mon, 12 Oct 2020 12:56:43 +0200
Subject: [PATCH 6/8] javafx tests
---
Tank game - Client/.idea/libraries/lib.xml | 13 ++
Tank game - Client/.idea/workspace.xml | 129 ++++++++++--
Tank game - Client/Tank game - Client.iml | 1 +
.../META-INF/Tank game - Client.kotlin_module | Bin 0 -> 16 bytes
.../production/Tank game - Client/Map.class | Bin 587 -> 928 bytes
.../production/Tank game - Client/Tank.class | Bin 237 -> 756 bytes
.../Tank game - Client/Test2$1.class | Bin 0 -> 1881 bytes
.../Tank game - Client/Test2$2.class | Bin 0 -> 787 bytes
.../production/Tank game - Client/Test2.class | Bin 0 -> 2872 bytes
.../Tank game - Client/Test4$MyTimer.class | Bin 0 -> 576 bytes
.../production/Tank game - Client/Test4.class | Bin 0 -> 1715 bytes
.../Tank game - Client/test3$1$1.class | Bin 0 -> 1568 bytes
.../Tank game - Client/test3$1.class | Bin 0 -> 879 bytes
.../production/Tank game - Client/test3.class | Bin 0 -> 2134 bytes
.../Tank game - Client/test5$1.class | Bin 0 -> 583 bytes
.../Tank game - Client/test5$2.class | Bin 0 -> 787 bytes
.../Tank game - Client/test5$Sprite.class | Bin 0 -> 2726 bytes
.../production/Tank game - Client/test5.class | Bin 0 -> 6330 bytes
Tank game - Client/src/Test2.java | 101 ++++++++++
Tank game - Client/src/test5.java | 188 ++++++++++++++++++
20 files changed, 413 insertions(+), 19 deletions(-)
create mode 100644 Tank game - Client/.idea/libraries/lib.xml
create mode 100644 Tank game - Client/out/production/Tank game - Client/META-INF/Tank game - Client.kotlin_module
create mode 100644 Tank game - Client/out/production/Tank game - Client/Test2$1.class
create mode 100644 Tank game - Client/out/production/Tank game - Client/Test2$2.class
create mode 100644 Tank game - Client/out/production/Tank game - Client/Test2.class
create mode 100644 Tank game - Client/out/production/Tank game - Client/Test4$MyTimer.class
create mode 100644 Tank game - Client/out/production/Tank game - Client/Test4.class
create mode 100644 Tank game - Client/out/production/Tank game - Client/test3$1$1.class
create mode 100644 Tank game - Client/out/production/Tank game - Client/test3$1.class
create mode 100644 Tank game - Client/out/production/Tank game - Client/test3.class
create mode 100644 Tank game - Client/out/production/Tank game - Client/test5$1.class
create mode 100644 Tank game - Client/out/production/Tank game - Client/test5$2.class
create mode 100644 Tank game - Client/out/production/Tank game - Client/test5$Sprite.class
create mode 100644 Tank game - Client/out/production/Tank game - Client/test5.class
create mode 100644 Tank game - Client/src/Test2.java
create mode 100644 Tank game - Client/src/test5.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..2fa94bd7
--- /dev/null
+++ b/Tank game - Client/.idea/libraries/lib.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Tank game - Client/.idea/workspace.xml b/Tank game - Client/.idea/workspace.xml
index 5a910a93..afd6d2b7 100644
--- a/Tank game - Client/.idea/workspace.xml
+++ b/Tank game - Client/.idea/workspace.xml
@@ -2,8 +2,15 @@
+
+
+
+
+
-
+
+
+