From 6bec22dafeddb4821233e3bc11ab715379540d20 Mon Sep 17 00:00:00 2001
From: Licht <johannes.huschke@gmx.de>
Date: Tue, 28 Oct 2014 12:54:00 +0100
Subject: [PATCH 1/3] =?UTF-8?q?Schiff-Bild=20hinzugef=C3=BCgt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 res/images/ship.png | Bin 0 -> 650 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 res/images/ship.png

diff --git a/res/images/ship.png b/res/images/ship.png
new file mode 100644
index 0000000000000000000000000000000000000000..1c29a614fca856d818d586dfd4611e07f5555529
GIT binary patch
literal 650
zcmV;50(Jd~P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px#32;bRa{vGf6951U69E94oEQKA00(qQO+^RZ3LFbCELBvJhyVZp8FWQhbVF}#
zZDnqB07G(RVRU6=Aa`kWXdp*PO;A^X4i^9b0ryEnK~z{r?N>2w0x=NuMG-Au-~qfL
zG$<9KN=K89h99Jk_&^%EG<2yDRj9}tcmQ9Zr6G)!IW23i<1-i0#L`K&*WQ_(UEiIn
z)44gL9S4KJ(%Ei<x$$`HR;yJopEGeETSVZ_<5ysYtxXb@R3HF;3GkhJb?*52;GVkO
zh|!+16si^Qkul;Ju=4$JIQW_O$;3uITb`FoZ@1EPa|JF4Fq9w_B1XusYXH%WMkBv!
zy<Rse$Y>D~Aommqe!gqTt=C~3CBTI`(wGB1*YEe;Znx9Z=J?LE6d3mVeZ31R<h0fZ
zNN}i-+mb2Bbt2bE`Kf~S4#2)v2>_g@fuwLMQbid(hD{=uxdymQ1^o1SJ?{=g(6ky?
z5db)=o{^Kld_MPpXp6<7?rS2&MVP8`f^Rm?;h9dSH31OC!~I1B7&*LBVj^%1;NfuQ
zpVMh}K>}+@qKH5YxDN5B1K^xiL;!`vTv{Mi^;VnEmvsOGzZpdY;6PWiBtkF%Yj6O|
z57t$u0HFF9N+PnatDm;336KPe3Lvo;5!P6WwfZI`39W(!j&-dPfI})E^Q;NUad8o*
zoc?w~{+s{+QnE_|$rP0Qk~N7QM4|+eKc&XSL`IbxJ@(xEx4c&1|6(F@n5+TgVuJlm
ka!<Ty5tdv`O29$l8*1DhU&4?ntpET307*qoM6N<$f=9j({{R30

literal 0
HcmV?d00001


From 3fdb185a247ba08421976055f5de0d39f858895d Mon Sep 17 00:00:00 2001
From: Licht <johannes.huschke@gmx.de>
Date: Tue, 28 Oct 2014 13:05:12 +0100
Subject: [PATCH 2/3] Making the .png's

---
 res/images/ship.png | Bin 650 -> 577 bytes
 res/images/shot.png | Bin 370 -> 375 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/res/images/ship.png b/res/images/ship.png
index 1c29a614fca856d818d586dfd4611e07f5555529..61f37757b62150df8212b0766dba5a4439ee2ac3 100644
GIT binary patch
delta 473
zcmV;~0Ve*61;GT6F%Je}OGiWi{{a60|De66laVeV2MhojK<6iCkya>woJmAMR9M69
zS21pbFcf`8C~K~e1NaQdf;w5Ax@GCc!VNlCTp$Zumu#IZPhm>WzyY{I)-3K&8QBIL
z1E!U#J}FX!jo$n3|IfFHQVL_Z9}d06&Gky$XPk2-gdmuK)JME|`W#$~DT0^|^oU;v
z-gpD<mpz`h+et)Y;!-PrG9R&nkJ}9Z@P0gc_r09YUWb0&0WwsC-Ws^<dxgk3SBx<L
zfRqwbYGJSlH9=?>EGfv;w-`d^f>Mg6X@d7Bh={grEf;=NfJsg%UG^bb0@Hr&g0CLZ
z*yOq!G^CW?q9ndq5CSvTj4>+}0I=KbIw3=DEE2#uSGwwT<XS*~S(e?ts;VqUOd&~(
z$X#giy8iy<c@EPh##r}$vLtfTV%PGz2C}R`mK9K{utaDfoO3nX0hicCmKE!Lh=dSC
z=W=w;lauw|tOIjq%yz)n+nS7!Q;%FqX$`FCZ8(Ni+Rz=xQp&*(QP7Df2DFGN>54uJ
zrXEZZtbj)yvbumYN45v2V9t?jO7u}LCUc_yznJ{3i^<g7N57cNy`Fyoil{Yh&X%87
P00000NkvXXu0mjfbh6yf

delta 549
zcmV+=0^0q-1d0WaF_A+a2MaJPRaBCQk!UD?_en%SR9HvtS21n^F%a}c5iMWf0lXnJ
zC>5egN0W|*AEb`>KpMI<bg2+ksK^_50AHY`A&iwdEo-miGZ)ds(n+@0-kF_U-<_+|
zxjCa92ZO-U*=~cm@p$Z3t5q<cGjShVMBvWjS73&%O%jz<AOL;|@SS^g?)drOp1R$C
zh|!+16si^Qkul;Ju=4$JIQW_O$;3uITb`FoZ@1EPa|JF4Fq9w_B1XusYXH%WMkBv!
zy<Rse$Y>D~Aommqe!gqTt=C~3CBTI`(wGB1*YEe;Znx9Z=J?LE6d3mVeZ31R<h0fZ
zNN}i-+mb2Bbt2bE`Kf~S4#2)v2>_gbr-7t!DpExmJ%&vpm$?SGOa=V(dOhzBM9{Pv
zR}la>tDcdQz<fUUfM|=wqV8)V#YLE^a)NI*&f%F(r!@f(#l!tY1Q<EIQeq--4B+8#
z=AYAPc0mGbNur2A47d*Qrvu=eRzv`W#9Ue+RrOYz(3f=p1HTzX1mHkdvm`=)FaT?C
z0Lu^7Ri^-;`WQ+gvahS3wyOz{1d0kEu@@26Sc<j!CL{^1f(4FstrCDkDj@T$3CVGB
z5vH8}c0&G~002_5O9IIhl>Cx4i5^6v1d>0c#>GTNl^Z?w-2At^R^b0)B6FCm0pntV
n{Y`RDyl4@YTue&9LE;-~+#X*L!jLJg00000NkvXXu0mjfiLLz%

diff --git a/res/images/shot.png b/res/images/shot.png
index 0b5ba277c67f94747da9faf28fee3bddc1724390..f905b8c34f71cf96faa680a194efe0d0c46ee91f 100644
GIT binary patch
delta 293
zcmV+=0owlZ0`~%t87Bq+001BJ|6u?C00DDSM?wIu&K&6g000JJOGiWi{{a60|De66
zlaVeV2Mh!OuI?+3kya>w(n&-?R5;76lPwN|Fcg5lw?Kkfg2SPaa~yyZ?4+E41K^O=
zb9Klih&RDjN-5hi_Egj4`}+PWL_$Gh_W}~$B{8tA3!>uQYABLDxVfY&xEm$_uDxAl
zBO&a-DtO*3B46T4aPSMPqE*n4(o#4{qM)0aE1-<fW;wQXf%aBtT?X!T50-pxk&e0&
zHl(g62|FRVa6ixI44Ea7IB_s`Gtg1V@Jje3=!S^~Z}w#X-kwb~%T53!0;0WLPr|&P
rz-yrd<nSW>XO+MGOd-4x{PLY2{(xhYFRt+r00000NkvXXu0mjfb2fq{

delta 288
zcmV+*0pI@j0`dZo85IHm005AYXf^-<00DDSM?wIu&K&8HKp_VU0t+23bCQv0D1YBc
zL_t(2Q=L*f4#F@DZBQz)AhC7p%*e(8dV-#`C+Gp#7(27EF(NUT=TB0nfGY45C+}lB
z4n$P>2%$)klz=!t3v@U&3qr3Fi5ASkp}S+9IpgJtbAP_^jc|mJ&;~s?kBQHqWsa4E
zN*JwBPY`Zb)kD=NCqllc8|c<K;B_b_2*A*fIhcGxhdmE~?v%+e(SF>Nk}lAX9Vc6K
z2u>NBMZTJTaDXbbt)w>rBcMK1X|JtRuW^;8C!VZcM0^K&p9hs@Vg#4+Sc!iAxc^o|
m?Y}LbTO<IJL!QRkdcOb%WN>7_`6D3!0000<MNUMnLSTXuHh7Bw


From 70ae98a4c7a44b279608f482f13f3af7b7705fe2 Mon Sep 17 00:00:00 2001
From: Jan Philipp Timme <jan.philipp@timme.it>
Date: Tue, 28 Oct 2014 13:19:08 +0100
Subject: [PATCH 3/3] Verhindern von OutOfBounds bei dem Keyboard.

---
 .../spacescooter/control/Keyboard.java            | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/de/teamteamteam/spacescooter/control/Keyboard.java b/src/de/teamteamteam/spacescooter/control/Keyboard.java
index 52c2f9c..d9ff803 100644
--- a/src/de/teamteamteam/spacescooter/control/Keyboard.java
+++ b/src/de/teamteamteam/spacescooter/control/Keyboard.java
@@ -2,25 +2,26 @@ package de.teamteamteam.spacescooter.control;
 
 import java.awt.event.KeyEvent;
 import java.awt.event.KeyListener;
+import java.util.ArrayList;
 
 
 public class Keyboard implements KeyListener {
 
-	private static boolean[] keys = new boolean[150]; //TODO: This might kill the game in case there are keycodes > 150
+	private static ArrayList<Integer> activeKeys = new ArrayList<Integer>();
 	
 	public static boolean isKeyDown(int keyCode) {
-		if (keyCode >= 0 && keyCode < keys.length) {
-			return keys[keyCode];
-		}
-		return false;
+		return Keyboard.activeKeys.contains((Integer) keyCode);
 	}
 
 	public void keyPressed(KeyEvent e) {
-		keys[e.getKeyCode()] = true;
+		if(Keyboard.activeKeys.contains((Integer) e.getKeyCode())) return;
+		Keyboard.activeKeys.add((Integer) e.getKeyCode());
 	}
 
 	public void keyReleased(KeyEvent e) {
-		keys[e.getKeyCode()] = false;
+		if(Keyboard.activeKeys.contains((Integer) e.getKeyCode())) {
+			Keyboard.activeKeys.remove((Integer) e.getKeyCode());
+		}
 	}
 	
 	public void keyTyped(KeyEvent e) {