removed 800x480 resolution (lol nobodies going to need that...)

This commit is contained in:
Harrison Deng 2017-10-29 19:33:17 -05:00
parent f506e934ab
commit 29e0dfbcc8
21 changed files with 10 additions and 16 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 389 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 24 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 101 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 90 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 104 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 298 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 364 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 84 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 424 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 202 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.9 KiB

View File

@ -65,7 +65,6 @@ public class RhythmBullet extends Game {
} }
Resolution[] resolution = { Resolution[] resolution = {
new Resolution(800, 480, "800x480"),
new Resolution(1280, 720, "1280x720"), new Resolution(1280, 720, "1280x720"),
new Resolution(1366, 768, "1366x768"), new Resolution(1366, 768, "1366x768"),
new Resolution(1280, 800, "1280x800"), new Resolution(1280, 800, "1280x800"),

View File

@ -25,8 +25,7 @@ public class GraphicsOptions extends Table {
_1920x1080, _1920x1080,
_1280x800, _1280x800,
_1280x720, _1280x720,
_1366x768, _1366x768;
_800x480;
public GraphicsOptions(MainMenu mainMenu, Skin skin, Preferences prefs) { public GraphicsOptions(MainMenu mainMenu, Skin skin, Preferences prefs) {
@ -44,7 +43,7 @@ public class GraphicsOptions extends Table {
public void changed(ChangeEvent event, Actor actor) { public void changed(ChangeEvent event, Actor actor) {
save(); save();
if (glowShader.isChecked()) { if (glowShader.isChecked()) {
mainMenu.loadShaders(); mainMenu.attemptLoadShaders();
enhancedGlow.setDisabled(false); enhancedGlow.setDisabled(false);
} else { } else {
enhancedGlow.setChecked(false); enhancedGlow.setChecked(false);
@ -113,16 +112,12 @@ public class GraphicsOptions extends Table {
add(_1280x800).fillX(); add(_1280x800).fillX();
row(); row();
_1280x720 = new ResolutionButton(1280, 720, skin, prefs);
add(_1280x720).fillX();
row();
_1366x768 = new ResolutionButton(1366, 768, skin, prefs); _1366x768 = new ResolutionButton(1366, 768, skin, prefs);
add(_1366x768).fillX(); add(_1366x768).fillX();
row(); row();
_800x480 = new ResolutionButton(800, 480, skin, prefs); _1280x720 = new ResolutionButton(1280, 720, skin, prefs);
add(_800x480).fillX(); add(_1280x720).fillX();
row(); row();
pack(); pack();
} }

View File

@ -56,7 +56,7 @@ public class MusicSelectable extends WidgetGroup implements Disposable {
authorLabel = new ShortenedTextLabel("Loading...", skin, "sub-font", skin.getColor("default")); authorLabel = new ShortenedTextLabel("Loading...", skin, "sub-font", skin.getColor("default"));
vGroup.addActor(authorLabel); vGroup.addActor(authorLabel);
table.add(vGroup).expandX().center().fillX(); table.add(vGroup).expandX().fillX().center();
addActor(table); addActor(table);
} }

View File

@ -57,7 +57,7 @@ public class MusicSelectionPage extends Page {
scrollbar = new ScrollPane(songTable, skin); scrollbar = new ScrollPane(songTable, skin);
scrollbar.setSize(0.45f*getWidth(), getHeightBelowTitle()); scrollbar.setSize(0.45f*getWidth(), getHeightBelowTitle());
scrollbar.setFadeScrollBars(false); scrollbar.setFadeScrollBars(false);
scrollbar.setOverscroll(false, false);
addActor(scrollbar); addActor(scrollbar);
selectables = new Array<>(); selectables = new Array<>();
back = new TextButton("Back", skin); back = new TextButton("Back", skin);
@ -119,7 +119,7 @@ public class MusicSelectionPage extends Page {
MusicSelectable selectable = new MusicSelectable(songList.getSongFileHandleFromIndex(i), musicFileAnnotation, skin, assets.get("defaultCover.png", Texture.class)); MusicSelectable selectable = new MusicSelectable(songList.getSongFileHandleFromIndex(i), musicFileAnnotation, skin, assets.get("defaultCover.png", Texture.class));
selectables.add(selectable); selectables.add(selectable);
songTable.add(selectable).expandX().fillX().height(200f); songTable.add(selectable).expandX().fillX().height((getHeight() >= 2160 ? 300f : 200f));
songTable.row(); songTable.row();
} }

View File

@ -78,7 +78,7 @@ public class MainMenu extends ScreenAdapter implements TransitionAdapter, Observ
@Override @Override
public void postTransition() { public void postTransition() {
loadShaders(); attemptLoadShaders();
mainPage = new MainPage(core, cameraPosition, sc); mainPage = new MainPage(core, cameraPosition, sc);
mainPage.setPosition(0, 0); mainPage.setPosition(0, 0);
@ -139,8 +139,8 @@ public class MainMenu extends ScreenAdapter implements TransitionAdapter, Observ
Gdx.app.debug("Post Transition", "Beginning screen setup for Main menu."); Gdx.app.debug("Post Transition", "Beginning screen setup for Main menu.");
} }
public void loadShaders() { public void attemptLoadShaders() {
if (core.getPrefs().getBoolean("glow shader")) { if (core.getPrefs().getBoolean("glow shader", true)) {
if (core.getPrefs().getBoolean("enhanced glow", false)) { if (core.getPrefs().getBoolean("enhanced glow", false)) {
blurlvl = 5; blurlvl = 5;
} else { } else {