From cf910d3f2ef903b67e47d42ee373b66deac3a78b Mon Sep 17 00:00:00 2001 From: Kai Date: Mon, 25 Apr 2022 15:31:55 +0200 Subject: [PATCH 1/6] Testdatei --- Test.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 Test.txt diff --git a/Test.txt b/Test.txt new file mode 100644 index 0000000..8318c86 --- /dev/null +++ b/Test.txt @@ -0,0 +1 @@ +Test \ No newline at end of file From b5a613bc8ed7f9800cdde48db9b154767843410c Mon Sep 17 00:00:00 2001 From: Kai Date: Mon, 25 Apr 2022 16:12:30 +0200 Subject: [PATCH 2/6] Added Infos bout Git and eclipse stuff --- Infos.txt | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 Infos.txt diff --git a/Infos.txt b/Infos.txt new file mode 100644 index 0000000..9f92113 --- /dev/null +++ b/Infos.txt @@ -0,0 +1,7 @@ +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 From 18bba2941eef0134462b5b1850da4ac5abe10973 Mon Sep 17 00:00:00 2001 From: Kai Date: Mon, 25 Apr 2022 16:31:38 +0200 Subject: [PATCH 3/6] =?UTF-8?q?Neue=20Klasse=20MultiLevelgame,=20start=20f?= =?UTF-8?q?=C3=BCr=20eigenes=20spiel?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- GameProject/src/base/MultiLevellGame.java | 26 +++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 GameProject/src/base/MultiLevellGame.java diff --git a/GameProject/src/base/MultiLevellGame.java b/GameProject/src/base/MultiLevellGame.java new file mode 100644 index 0000000..2780ff8 --- /dev/null +++ b/GameProject/src/base/MultiLevellGame.java @@ -0,0 +1,26 @@ +package base; + +import java.io.IOException; + +import playground.Level1; +import playground.HitTwiceLevel; +import playground.Level3; +import playground.LevelBoss; + +public class MultiLevellGame extends GameLoop{ + + @Override + void defineLevels() { + this.resetLevels(); + this.addLevel(new Level1()); + this.addLevel(new HitTwiceLevel()); + this.addLevel(new Level3()); + this.addLevel(new LevelBoss()); + } + + + public static void main(String[] args) throws IOException { + MultiLevellGame gl = new MultiLevellGame(); + gl.runGame(args); + } +} From 0bdbbf29d0b510ff3a3693b87dce472929b417f1 Mon Sep 17 00:00:00 2001 From: Kai Date: Mon, 25 Apr 2022 16:33:42 +0200 Subject: [PATCH 4/6] Korrektur, richtiger import und aufrufen des zweiten levels --- GameProject/src/base/MultiLevellGame.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/GameProject/src/base/MultiLevellGame.java b/GameProject/src/base/MultiLevellGame.java index 2780ff8..b82d37c 100644 --- a/GameProject/src/base/MultiLevellGame.java +++ b/GameProject/src/base/MultiLevellGame.java @@ -3,7 +3,7 @@ package base; import java.io.IOException; import playground.Level1; -import playground.HitTwiceLevel; +import playground.LevelHitTwice; import playground.Level3; import playground.LevelBoss; @@ -13,7 +13,7 @@ public class MultiLevellGame extends GameLoop{ void defineLevels() { this.resetLevels(); this.addLevel(new Level1()); - this.addLevel(new HitTwiceLevel()); + this.addLevel(new LevelHitTwice()); this.addLevel(new Level3()); this.addLevel(new LevelBoss()); } From 86164d59b44ac99736c51718e531457dc75d031b Mon Sep 17 00:00:00 2001 From: Kai Simon Date: Mon, 25 Apr 2022 17:55:29 +0200 Subject: [PATCH 5/6] added pull line --- Infos.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Infos.txt b/Infos.txt index 9f92113..dcd1f6b 100644 --- a/Infos.txt +++ b/Infos.txt @@ -5,3 +5,5 @@ 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 pull prog2 main:master --allow-unrelated-histories From d1b3c1db4d04b35d23f7bbc3297a76cf869b7a04 Mon Sep 17 00:00:00 2001 From: Kai Simon Date: Mon, 25 Apr 2022 17:59:32 +0200 Subject: [PATCH 6/6] Added line to add remote repository --- Infos.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Infos.txt b/Infos.txt index dcd1f6b..9d70c41 100644 --- a/Infos.txt +++ b/Infos.txt @@ -6,4 +6,8 @@ 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