Merge branch 'master' of gogs.informatik.hs-fulda.de:Kai/Kaigo

GameProject/src/base/MultiLevellGame.java

@@ -0,0 +1,26 @@
+package base;
+
+import java.io.IOException;
+
+import playground.Level1;
+import playground.LevelHitTwice;
+import playground.Level3;
+import playground.LevelBoss;
+
+public class MultiLevellGame extends GameLoop{
+
+	@Override
+	  void defineLevels() {  
+	    this.resetLevels();
+	    this.addLevel(new Level1());
+	    this.addLevel(new LevelHitTwice());
+	    this.addLevel(new Level3());
+	    this.addLevel(new LevelBoss());
+	  }
+	
+	
+	public static void main(String[] args) throws IOException {
+	    MultiLevellGame gl = new MultiLevellGame();    
+	    gl.runGame(args);
+	  }
+}

Infos.txt

@@ -0,0 +1,13 @@
+eclipse ini datei ändern für java
+openFile
+-vm
+C:\Java\JDK\1.8\bin\javaw.exe
+
+
+in konerts branch springen und pull machen merge mit master in eigenem repo anders hats nich geklappt
+
+
+
+git remote add prog2 https://gogs.informatik.hs-fulda.de/jkonert/prog2-codebase.git
+
+git pull prog2 main:master --allow-unrelated-histories

Test.txt

@@ -0,0 +1 @@
+Test