From 38e018febf8906620c677ca4a60f6f3fd4f8eb9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mike=20Schw=C3=B6rer?= Date: Mon, 11 Aug 2014 15:47:58 +0200 Subject: [PATCH] Fixed last commit --- core/src/de/samdev/colorrunner/CRGame.java | 4 +--- .../{clorrunner => colorrunner}/screens/menu/MainMenu.java | 2 +- .../screens/menu/SplashScreen.java | 2 +- .../src/de/samdev/colorrunner/desktop/DesktopLauncher.java | 4 ++-- 4 files changed, 5 insertions(+), 7 deletions(-) rename core/src/de/samdev/{clorrunner => colorrunner}/screens/menu/MainMenu.java (98%) rename core/src/de/samdev/{clorrunner => colorrunner}/screens/menu/SplashScreen.java (98%) diff --git a/core/src/de/samdev/colorrunner/CRGame.java b/core/src/de/samdev/colorrunner/CRGame.java index 073d8de..41b7cc5 100644 --- a/core/src/de/samdev/colorrunner/CRGame.java +++ b/core/src/de/samdev/colorrunner/CRGame.java @@ -2,14 +2,12 @@ package de.samdev.colorrunner; import com.badlogic.gdx.Game; -import de.samdev.clorrunner.screens.menu.SplashScreen; -import de.samdev.colorrunner.screens.gameScreen.GameScreen; +import de.samdev.colorrunner.screens.menu.SplashScreen; public class CRGame extends Game { public final static boolean DEBUG = true; private SplashScreen SplashScreen; - public static final int WIDTH=1000,HEIGHT=563; @Override public void create() { diff --git a/core/src/de/samdev/clorrunner/screens/menu/MainMenu.java b/core/src/de/samdev/colorrunner/screens/menu/MainMenu.java similarity index 98% rename from core/src/de/samdev/clorrunner/screens/menu/MainMenu.java rename to core/src/de/samdev/colorrunner/screens/menu/MainMenu.java index 0e07b58..1cb356f 100644 --- a/core/src/de/samdev/clorrunner/screens/menu/MainMenu.java +++ b/core/src/de/samdev/colorrunner/screens/menu/MainMenu.java @@ -1,4 +1,4 @@ -package de.samdev.clorrunner.screens.menu; +package de.samdev.colorrunner.screens.menu; import com.badlogic.gdx.Game; import com.badlogic.gdx.Gdx; diff --git a/core/src/de/samdev/clorrunner/screens/menu/SplashScreen.java b/core/src/de/samdev/colorrunner/screens/menu/SplashScreen.java similarity index 98% rename from core/src/de/samdev/clorrunner/screens/menu/SplashScreen.java rename to core/src/de/samdev/colorrunner/screens/menu/SplashScreen.java index 05fd8ba..26fabb1 100644 --- a/core/src/de/samdev/clorrunner/screens/menu/SplashScreen.java +++ b/core/src/de/samdev/colorrunner/screens/menu/SplashScreen.java @@ -1,4 +1,4 @@ -package de.samdev.clorrunner.screens.menu; +package de.samdev.colorrunner.screens.menu; import com.badlogic.gdx.Game; import com.badlogic.gdx.Gdx; diff --git a/desktop/src/de/samdev/colorrunner/desktop/DesktopLauncher.java b/desktop/src/de/samdev/colorrunner/desktop/DesktopLauncher.java index 84b47ac..5ba7118 100644 --- a/desktop/src/de/samdev/colorrunner/desktop/DesktopLauncher.java +++ b/desktop/src/de/samdev/colorrunner/desktop/DesktopLauncher.java @@ -9,8 +9,8 @@ public class DesktopLauncher { LwjglApplicationConfiguration config = new LwjglApplicationConfiguration(); config.title = "ColorRunner"; - config.width = CRGame.WIDTH; - config.height = CRGame.HEIGHT; + config.width = 1000; + config.height = 563; /* * For FPS Independence Testing