diff --git a/android/assets/1280x720/title.png b/android/assets/1280x720/title.png index fb61520..4518a31 100755 Binary files a/android/assets/1280x720/title.png and b/android/assets/1280x720/title.png differ diff --git a/android/assets/1280x800/title.png b/android/assets/1280x800/title.png index 0c3eef9..1831d2d 100755 Binary files a/android/assets/1280x800/title.png and b/android/assets/1280x800/title.png differ diff --git a/android/assets/1366x768/title.png b/android/assets/1366x768/title.png index d3fcb0c..867f5de 100755 Binary files a/android/assets/1366x768/title.png and b/android/assets/1366x768/title.png differ diff --git a/android/assets/1920x1080/title.png b/android/assets/1920x1080/title.png index 1a04291..2cd73ba 100755 Binary files a/android/assets/1920x1080/title.png and b/android/assets/1920x1080/title.png differ diff --git a/android/assets/1920x1200/title.png b/android/assets/1920x1200/title.png index 75916a6..5eb9541 100755 Binary files a/android/assets/1920x1200/title.png and b/android/assets/1920x1200/title.png differ diff --git a/android/assets/2560x1440/title.png b/android/assets/2560x1440/title.png index 46736ba..285514e 100755 Binary files a/android/assets/2560x1440/title.png and b/android/assets/2560x1440/title.png differ diff --git a/android/assets/3840x2160/title.png b/android/assets/3840x2160/title.png index fa18134..f232203 100755 Binary files a/android/assets/3840x2160/title.png and b/android/assets/3840x2160/title.png differ diff --git a/android/assets/800x480/title.png b/android/assets/800x480/title.png index b12ec8e..6fa8509 100755 Binary files a/android/assets/800x480/title.png and b/android/assets/800x480/title.png differ diff --git a/android/assets/uiskin.png b/android/assets/uiskin.png index ad56bcc..b81dd73 100755 Binary files a/android/assets/uiskin.png and b/android/assets/uiskin.png differ diff --git a/core/src/zero1hd/rhythmbullet/screens/CreativeDebugScreen.java b/core/src/zero1hd/rhythmbullet/screens/CreativeDebugScreen.java index 879f799..e8d8a58 100755 --- a/core/src/zero1hd/rhythmbullet/screens/CreativeDebugScreen.java +++ b/core/src/zero1hd/rhythmbullet/screens/CreativeDebugScreen.java @@ -5,6 +5,8 @@ import com.badlogic.gdx.InputMultiplexer; import com.badlogic.gdx.Preferences; import com.badlogic.gdx.ScreenAdapter; import com.badlogic.gdx.graphics.GL20; +import com.badlogic.gdx.graphics.Texture; +import com.badlogic.gdx.graphics.g2d.SpriteBatch; import zero1hd.rhythmbullet.RhythmBullet; import zero1hd.rhythmbullet.ui.stages.CreativeHUD; @@ -15,6 +17,9 @@ public class CreativeDebugScreen extends ScreenAdapter { GamePlayArea gamePlayArea; InputMultiplexer inputs; + SpriteBatch bgBatch; + private Texture background; + Preferences prefs; public CreativeDebugScreen(RhythmBullet core, MainMenu mainMenu) { @@ -24,6 +29,10 @@ public class CreativeDebugScreen extends ScreenAdapter { inputs = new InputMultiplexer(creative, gamePlayArea); this.prefs = core.getPrefs(); + + background = core.getAssetManager().get("star_bg.png"); + bgBatch = new SpriteBatch(1); + } @Override @@ -38,6 +47,10 @@ public class CreativeDebugScreen extends ScreenAdapter { Gdx.gl.glClearColor(0.2f, 0.2f, 0.2f, 1f); Gdx.gl.glClear(GL20.GL_COLOR_BUFFER_BIT | GL20.GL_DEPTH_BUFFER_BIT); + bgBatch.begin(); + bgBatch.draw(background, 0f, 0f); + bgBatch.end(); + gamePlayArea.getViewport().apply(); gamePlayArea.act(); gamePlayArea.draw(); diff --git a/core/src/zero1hd/rhythmbullet/screens/GameScreen.java b/core/src/zero1hd/rhythmbullet/screens/GameScreen.java index 938636c..235711c 100755 --- a/core/src/zero1hd/rhythmbullet/screens/GameScreen.java +++ b/core/src/zero1hd/rhythmbullet/screens/GameScreen.java @@ -57,16 +57,6 @@ public class GameScreen extends ScreenAdapter { inputs.addProcessor(gameArea); background = core.getAssetManager().get("star_bg.png"); - } - - @Override - public void show() { - Gdx.input.setInputProcessor(inputs); - gameArea.loadShaders(core.getPrefs()); - - if (!gameHUD.isPaused()) { - music.getPlaybackMusic().play(); - } if (core.getPrefs().getBoolean("bg shader")) { Gdx.app.debug("Shader", "using background shader"); @@ -85,6 +75,17 @@ public class GameScreen extends ScreenAdapter { } else { bgBatch = new SpriteBatch(2); } + } + + @Override + public void show() { + Gdx.input.setInputProcessor(inputs); + gameArea.loadShaders(core.getPrefs()); + + if (!gameHUD.isPaused()) { + music.getPlaybackMusic().play(); + } + super.show(); } diff --git a/core/src/zero1hd/rhythmbullet/ui/pages/MainPage.java b/core/src/zero1hd/rhythmbullet/ui/pages/MainPage.java index b0d90bd..0b0b725 100755 --- a/core/src/zero1hd/rhythmbullet/ui/pages/MainPage.java +++ b/core/src/zero1hd/rhythmbullet/ui/pages/MainPage.java @@ -28,7 +28,7 @@ public class MainPage extends Page { public MainPage(final RhythmBullet core, final Vector3 targetPosition) { title = new Image(core.getAssetManager().get("title.png", Texture.class)); - title.setPosition(15, getHeight() - title.getHeight()-15); + title.setPosition(10, getHeight() - title.getHeight()-30); addActor(title); versionLabel = new Label("Version: " + RhythmBullet.VERSION, core.getDefaultSkin(), "sub-font", core.getDefaultSkin().getColor("default")); diff --git a/core/src/zero1hd/rhythmbullet/ui/windows/SpawnerWindow.java b/core/src/zero1hd/rhythmbullet/ui/windows/SpawnerWindow.java index 40d9df4..0e9593d 100755 --- a/core/src/zero1hd/rhythmbullet/ui/windows/SpawnerWindow.java +++ b/core/src/zero1hd/rhythmbullet/ui/windows/SpawnerWindow.java @@ -66,8 +66,9 @@ public class SpawnerWindow extends Window { coords.set(Gdx.input.getX(), Gdx.input.getY()); stage.screenToStageCoordinates(coords); - Entity entity; - if ((entity = ec.getIndex().get(listOfEntities.getSelected()).buildEntity()) != null) { + + if (ec.getIndex().get(listOfEntities.getSelected()) != null) { + Entity entity = ec.getIndex().get(listOfEntities.getSelected()).buildEntity(); switch(entity.getEntityType()) { case LASER: Laser laser = (Laser) entity;