From 2aed246949e382bd50f80162ab9b4b365fb34734 Mon Sep 17 00:00:00 2001 From: Recrown Date: Fri, 21 Apr 2017 13:59:22 -0500 Subject: [PATCH] added default album cover, changed control page layout --- android/assets/1280x720/PolyjetTitle.png | Bin android/assets/1280x720/Tech-Circle1.png | Bin android/assets/1280x720/cube.png | Bin android/assets/1280x720/cybercircle1.png | Bin android/assets/1280x720/cybercircle3B.png | Bin android/assets/1280x720/polyjet-standard.png | Bin android/assets/1280x720/splashlogo.png | Bin android/assets/1280x720/square.png | Bin android/assets/1280x800/PolyjetTitle.png | Bin android/assets/1280x800/Tech-Circle1.png | Bin android/assets/1280x800/cube.png | Bin android/assets/1280x800/cybercircle1.png | Bin android/assets/1280x800/cybercircle3B.png | Bin android/assets/1280x800/polyjet-standard.png | Bin android/assets/1280x800/splashlogo.png | Bin android/assets/1280x800/square.png | Bin android/assets/1366x768/PolyjetTitle.png | Bin android/assets/1366x768/Tech-Circle1.png | Bin android/assets/1366x768/cube.png | Bin android/assets/1366x768/cybercircle1.png | Bin android/assets/1366x768/cybercircle3B.png | Bin android/assets/1366x768/polyjet-standard.png | Bin android/assets/1366x768/splashlogo.png | Bin android/assets/1366x768/square.png | Bin android/assets/1920x1080/PolyjetTitle.png | Bin android/assets/1920x1080/Tech-Circle1.png | Bin android/assets/1920x1080/cube.png | Bin android/assets/1920x1080/cybercircle1.png | Bin android/assets/1920x1080/cybercircle3B.png | Bin android/assets/1920x1080/polyjet-standard.png | Bin android/assets/1920x1080/splashlogo.png | Bin android/assets/1920x1080/square.png | Bin android/assets/1920x1200/PolyjetTitle.png | Bin android/assets/1920x1200/Tech-Circle1.png | Bin android/assets/1920x1200/cube.png | Bin android/assets/1920x1200/cybercircle1.png | Bin android/assets/1920x1200/cybercircle3B.png | Bin android/assets/1920x1200/polyjet-standard.png | Bin android/assets/1920x1200/splashlogo.png | Bin android/assets/1920x1200/square.png | Bin android/assets/2560x1440/PolyjetTitle.png | Bin android/assets/2560x1440/Tech-Circle1.png | Bin android/assets/2560x1440/cube.png | Bin android/assets/2560x1440/cybercircle1.png | Bin android/assets/2560x1440/cybercircle3B.png | Bin android/assets/2560x1440/polyjet-standard.png | Bin android/assets/2560x1440/splashlogo.png | Bin android/assets/2560x1440/square.png | Bin android/assets/800x480/PolyjetTitle.png | Bin android/assets/800x480/Tech-Circle1.png | Bin android/assets/800x480/cube.png | Bin android/assets/800x480/cybercircle1.png | Bin android/assets/800x480/cybercircle3B.png | Bin android/assets/800x480/polyjet-standard.png | Bin android/assets/800x480/splashlogo.png | Bin android/assets/800x480/square.png | Bin .../polyjet/ui/builders/SetControls.java | 50 +++++++----------- .../zero1hd/polyjet/ui/pages/OptionsPage.java | 1 - 58 files changed, 20 insertions(+), 31 deletions(-) mode change 100755 => 100644 android/assets/1280x720/PolyjetTitle.png mode change 100755 => 100644 android/assets/1280x720/Tech-Circle1.png mode change 100755 => 100644 android/assets/1280x720/cube.png mode change 100755 => 100644 android/assets/1280x720/cybercircle1.png mode change 100755 => 100644 android/assets/1280x720/cybercircle3B.png mode change 100755 => 100644 android/assets/1280x720/polyjet-standard.png mode change 100755 => 100644 android/assets/1280x720/splashlogo.png mode change 100755 => 100644 android/assets/1280x720/square.png mode change 100755 => 100644 android/assets/1280x800/PolyjetTitle.png mode change 100755 => 100644 android/assets/1280x800/Tech-Circle1.png mode change 100755 => 100644 android/assets/1280x800/cube.png mode change 100755 => 100644 android/assets/1280x800/cybercircle1.png mode change 100755 => 100644 android/assets/1280x800/cybercircle3B.png mode change 100755 => 100644 android/assets/1280x800/polyjet-standard.png mode change 100755 => 100644 android/assets/1280x800/splashlogo.png mode change 100755 => 100644 android/assets/1280x800/square.png mode change 100755 => 100644 android/assets/1366x768/PolyjetTitle.png mode change 100755 => 100644 android/assets/1366x768/Tech-Circle1.png mode change 100755 => 100644 android/assets/1366x768/cube.png mode change 100755 => 100644 android/assets/1366x768/cybercircle1.png mode change 100755 => 100644 android/assets/1366x768/cybercircle3B.png mode change 100755 => 100644 android/assets/1366x768/polyjet-standard.png mode change 100755 => 100644 android/assets/1366x768/splashlogo.png mode change 100755 => 100644 android/assets/1366x768/square.png mode change 100755 => 100644 android/assets/1920x1080/PolyjetTitle.png mode change 100755 => 100644 android/assets/1920x1080/Tech-Circle1.png mode change 100755 => 100644 android/assets/1920x1080/cube.png mode change 100755 => 100644 android/assets/1920x1080/cybercircle1.png mode change 100755 => 100644 android/assets/1920x1080/cybercircle3B.png mode change 100755 => 100644 android/assets/1920x1080/polyjet-standard.png mode change 100755 => 100644 android/assets/1920x1080/splashlogo.png mode change 100755 => 100644 android/assets/1920x1080/square.png mode change 100755 => 100644 android/assets/1920x1200/PolyjetTitle.png mode change 100755 => 100644 android/assets/1920x1200/Tech-Circle1.png mode change 100755 => 100644 android/assets/1920x1200/cube.png mode change 100755 => 100644 android/assets/1920x1200/cybercircle1.png mode change 100755 => 100644 android/assets/1920x1200/cybercircle3B.png mode change 100755 => 100644 android/assets/1920x1200/polyjet-standard.png mode change 100755 => 100644 android/assets/1920x1200/splashlogo.png mode change 100755 => 100644 android/assets/1920x1200/square.png mode change 100755 => 100644 android/assets/2560x1440/PolyjetTitle.png mode change 100755 => 100644 android/assets/2560x1440/Tech-Circle1.png mode change 100755 => 100644 android/assets/2560x1440/cube.png mode change 100755 => 100644 android/assets/2560x1440/cybercircle1.png mode change 100755 => 100644 android/assets/2560x1440/cybercircle3B.png mode change 100755 => 100644 android/assets/2560x1440/polyjet-standard.png mode change 100755 => 100644 android/assets/2560x1440/splashlogo.png mode change 100755 => 100644 android/assets/2560x1440/square.png mode change 100755 => 100644 android/assets/800x480/PolyjetTitle.png mode change 100755 => 100644 android/assets/800x480/Tech-Circle1.png mode change 100755 => 100644 android/assets/800x480/cube.png mode change 100755 => 100644 android/assets/800x480/cybercircle1.png mode change 100755 => 100644 android/assets/800x480/cybercircle3B.png mode change 100755 => 100644 android/assets/800x480/polyjet-standard.png mode change 100755 => 100644 android/assets/800x480/splashlogo.png mode change 100755 => 100644 android/assets/800x480/square.png diff --git a/android/assets/1280x720/PolyjetTitle.png b/android/assets/1280x720/PolyjetTitle.png old mode 100755 new mode 100644 diff --git a/android/assets/1280x720/Tech-Circle1.png b/android/assets/1280x720/Tech-Circle1.png old mode 100755 new mode 100644 diff --git a/android/assets/1280x720/cube.png b/android/assets/1280x720/cube.png old mode 100755 new mode 100644 diff --git a/android/assets/1280x720/cybercircle1.png b/android/assets/1280x720/cybercircle1.png old mode 100755 new mode 100644 diff --git a/android/assets/1280x720/cybercircle3B.png b/android/assets/1280x720/cybercircle3B.png old mode 100755 new mode 100644 diff --git a/android/assets/1280x720/polyjet-standard.png b/android/assets/1280x720/polyjet-standard.png old mode 100755 new mode 100644 diff --git a/android/assets/1280x720/splashlogo.png b/android/assets/1280x720/splashlogo.png old mode 100755 new mode 100644 diff --git a/android/assets/1280x720/square.png b/android/assets/1280x720/square.png old mode 100755 new mode 100644 diff --git a/android/assets/1280x800/PolyjetTitle.png b/android/assets/1280x800/PolyjetTitle.png old mode 100755 new mode 100644 diff --git a/android/assets/1280x800/Tech-Circle1.png b/android/assets/1280x800/Tech-Circle1.png old mode 100755 new mode 100644 diff --git a/android/assets/1280x800/cube.png b/android/assets/1280x800/cube.png old mode 100755 new mode 100644 diff --git a/android/assets/1280x800/cybercircle1.png b/android/assets/1280x800/cybercircle1.png old mode 100755 new mode 100644 diff --git a/android/assets/1280x800/cybercircle3B.png b/android/assets/1280x800/cybercircle3B.png old mode 100755 new mode 100644 diff --git a/android/assets/1280x800/polyjet-standard.png b/android/assets/1280x800/polyjet-standard.png old mode 100755 new mode 100644 diff --git a/android/assets/1280x800/splashlogo.png b/android/assets/1280x800/splashlogo.png old mode 100755 new mode 100644 diff --git a/android/assets/1280x800/square.png b/android/assets/1280x800/square.png old mode 100755 new mode 100644 diff --git a/android/assets/1366x768/PolyjetTitle.png b/android/assets/1366x768/PolyjetTitle.png old mode 100755 new mode 100644 diff --git a/android/assets/1366x768/Tech-Circle1.png b/android/assets/1366x768/Tech-Circle1.png old mode 100755 new mode 100644 diff --git a/android/assets/1366x768/cube.png b/android/assets/1366x768/cube.png old mode 100755 new mode 100644 diff --git a/android/assets/1366x768/cybercircle1.png b/android/assets/1366x768/cybercircle1.png old mode 100755 new mode 100644 diff --git a/android/assets/1366x768/cybercircle3B.png b/android/assets/1366x768/cybercircle3B.png old mode 100755 new mode 100644 diff --git a/android/assets/1366x768/polyjet-standard.png b/android/assets/1366x768/polyjet-standard.png old mode 100755 new mode 100644 diff --git a/android/assets/1366x768/splashlogo.png b/android/assets/1366x768/splashlogo.png old mode 100755 new mode 100644 diff --git a/android/assets/1366x768/square.png b/android/assets/1366x768/square.png old mode 100755 new mode 100644 diff --git a/android/assets/1920x1080/PolyjetTitle.png b/android/assets/1920x1080/PolyjetTitle.png old mode 100755 new mode 100644 diff --git a/android/assets/1920x1080/Tech-Circle1.png b/android/assets/1920x1080/Tech-Circle1.png old mode 100755 new mode 100644 diff --git a/android/assets/1920x1080/cube.png b/android/assets/1920x1080/cube.png old mode 100755 new mode 100644 diff --git a/android/assets/1920x1080/cybercircle1.png b/android/assets/1920x1080/cybercircle1.png old mode 100755 new mode 100644 diff --git a/android/assets/1920x1080/cybercircle3B.png b/android/assets/1920x1080/cybercircle3B.png old mode 100755 new mode 100644 diff --git a/android/assets/1920x1080/polyjet-standard.png b/android/assets/1920x1080/polyjet-standard.png old mode 100755 new mode 100644 diff --git a/android/assets/1920x1080/splashlogo.png b/android/assets/1920x1080/splashlogo.png old mode 100755 new mode 100644 diff --git a/android/assets/1920x1080/square.png b/android/assets/1920x1080/square.png old mode 100755 new mode 100644 diff --git a/android/assets/1920x1200/PolyjetTitle.png b/android/assets/1920x1200/PolyjetTitle.png old mode 100755 new mode 100644 diff --git a/android/assets/1920x1200/Tech-Circle1.png b/android/assets/1920x1200/Tech-Circle1.png old mode 100755 new mode 100644 diff --git a/android/assets/1920x1200/cube.png b/android/assets/1920x1200/cube.png old mode 100755 new mode 100644 diff --git a/android/assets/1920x1200/cybercircle1.png b/android/assets/1920x1200/cybercircle1.png old mode 100755 new mode 100644 diff --git a/android/assets/1920x1200/cybercircle3B.png b/android/assets/1920x1200/cybercircle3B.png old mode 100755 new mode 100644 diff --git a/android/assets/1920x1200/polyjet-standard.png b/android/assets/1920x1200/polyjet-standard.png old mode 100755 new mode 100644 diff --git a/android/assets/1920x1200/splashlogo.png b/android/assets/1920x1200/splashlogo.png old mode 100755 new mode 100644 diff --git a/android/assets/1920x1200/square.png b/android/assets/1920x1200/square.png old mode 100755 new mode 100644 diff --git a/android/assets/2560x1440/PolyjetTitle.png b/android/assets/2560x1440/PolyjetTitle.png old mode 100755 new mode 100644 diff --git a/android/assets/2560x1440/Tech-Circle1.png b/android/assets/2560x1440/Tech-Circle1.png old mode 100755 new mode 100644 diff --git a/android/assets/2560x1440/cube.png b/android/assets/2560x1440/cube.png old mode 100755 new mode 100644 diff --git a/android/assets/2560x1440/cybercircle1.png b/android/assets/2560x1440/cybercircle1.png old mode 100755 new mode 100644 diff --git a/android/assets/2560x1440/cybercircle3B.png b/android/assets/2560x1440/cybercircle3B.png old mode 100755 new mode 100644 diff --git a/android/assets/2560x1440/polyjet-standard.png b/android/assets/2560x1440/polyjet-standard.png old mode 100755 new mode 100644 diff --git a/android/assets/2560x1440/splashlogo.png b/android/assets/2560x1440/splashlogo.png old mode 100755 new mode 100644 diff --git a/android/assets/2560x1440/square.png b/android/assets/2560x1440/square.png old mode 100755 new mode 100644 diff --git a/android/assets/800x480/PolyjetTitle.png b/android/assets/800x480/PolyjetTitle.png old mode 100755 new mode 100644 diff --git a/android/assets/800x480/Tech-Circle1.png b/android/assets/800x480/Tech-Circle1.png old mode 100755 new mode 100644 diff --git a/android/assets/800x480/cube.png b/android/assets/800x480/cube.png old mode 100755 new mode 100644 diff --git a/android/assets/800x480/cybercircle1.png b/android/assets/800x480/cybercircle1.png old mode 100755 new mode 100644 diff --git a/android/assets/800x480/cybercircle3B.png b/android/assets/800x480/cybercircle3B.png old mode 100755 new mode 100644 diff --git a/android/assets/800x480/polyjet-standard.png b/android/assets/800x480/polyjet-standard.png old mode 100755 new mode 100644 diff --git a/android/assets/800x480/splashlogo.png b/android/assets/800x480/splashlogo.png old mode 100755 new mode 100644 diff --git a/android/assets/800x480/square.png b/android/assets/800x480/square.png old mode 100755 new mode 100644 diff --git a/core/src/zero1hd/polyjet/ui/builders/SetControls.java b/core/src/zero1hd/polyjet/ui/builders/SetControls.java index fed9f75..a89cc8a 100755 --- a/core/src/zero1hd/polyjet/ui/builders/SetControls.java +++ b/core/src/zero1hd/polyjet/ui/builders/SetControls.java @@ -14,39 +14,13 @@ import zero1hd.polyjet.maps.KeyMap; public class SetControls extends Table { public SetControls(Skin skin, KeyMap keyMap) { super(skin); - + + //first Label forwardKeyLabel = new Label("Forward: ",skin); forwardKeyLabel.setName(KeyMap.UP); add(forwardKeyLabel).left(); KeySetter forwardKeySetter = new KeySetter(keyMap, KeyMap.UP); - add(forwardKeySetter); - - row(); - - Label backwardKeyLabel = new Label("Backward: ", skin); - backwardKeyLabel.setName(KeyMap.DOWN); - add(backwardKeyLabel).left(); - KeySetter backwardKeySetter = new KeySetter(keyMap, KeyMap.DOWN); - add(backwardKeySetter); - - row(); - - Label leftKeyLabel = new Label("Left: ", skin); - leftKeyLabel.setName(KeyMap.LEFT); - add(leftKeyLabel).left(); - KeySetter leftKeySetter = new KeySetter(keyMap, KeyMap.LEFT); - add(leftKeySetter); - - row(); - - Label rightKeyLabel = new Label("Right: ", skin); - rightKeyLabel.setName(KeyMap.RIGHT); - add(rightKeyLabel).left(); - KeySetter rightKeySetter = new KeySetter(keyMap, KeyMap.RIGHT); - add(rightKeySetter); - - row(); - + add(forwardKeySetter).spaceRight(45f); Label shootKeyLabel = new Label("Shoot: ", skin); shootKeyLabel.setName(KeyMap.SHOOT); add(shootKeyLabel).left(); @@ -54,7 +28,13 @@ public class SetControls extends Table { add(shootKeySetter); row(); - + + //second + Label backwardKeyLabel = new Label("Backward: ", skin); + backwardKeyLabel.setName(KeyMap.DOWN); + add(backwardKeyLabel).left(); + KeySetter backwardKeySetter = new KeySetter(keyMap, KeyMap.DOWN); + add(backwardKeySetter).spaceRight(45f); Label sector1TPKeyLabel = new Label("Left Teleport", skin); sector1TPKeyLabel.setName(KeyMap.FIRSTTHIRDTELEPORT); add(sector1TPKeyLabel).left(); @@ -63,6 +43,11 @@ public class SetControls extends Table { row(); + Label leftKeyLabel = new Label("Left: ", skin); + leftKeyLabel.setName(KeyMap.LEFT); + add(leftKeyLabel).left(); + KeySetter leftKeySetter = new KeySetter(keyMap, KeyMap.LEFT); + add(leftKeySetter).spaceRight(45f); Label sector2TPKeyLabel = new Label("Middle Teleport: ", skin); sector2TPKeyLabel.setName(KeyMap.SECONDTHIRDTELEPORT); add(sector2TPKeyLabel).left(); @@ -71,6 +56,11 @@ public class SetControls extends Table { row(); + Label rightKeyLabel = new Label("Right: ", skin); + rightKeyLabel.setName(KeyMap.RIGHT); + add(rightKeyLabel).left(); + KeySetter rightKeySetter = new KeySetter(keyMap, KeyMap.RIGHT); + add(rightKeySetter).spaceRight(45f); Label sector3TPKeyLabel = new Label("Right Teleport: ", skin); sector3TPKeyLabel.setName(KeyMap.THIRDTHIRDTELEPORT); add(sector3TPKeyLabel).left(); diff --git a/core/src/zero1hd/polyjet/ui/pages/OptionsPage.java b/core/src/zero1hd/polyjet/ui/pages/OptionsPage.java index 6923b17..f681596 100755 --- a/core/src/zero1hd/polyjet/ui/pages/OptionsPage.java +++ b/core/src/zero1hd/polyjet/ui/pages/OptionsPage.java @@ -146,7 +146,6 @@ public class OptionsPage extends Page { public void saveOptions(Preferences prefs) { prefs.putFloat("music vol", musicVolSlider.getValue()); prefs.putFloat("fx vol", fxVolSlider.getValue()); - System.out.println(directoryField.getText()); prefs.putString("music dir", directoryField.getText()); prefs.flush(); }