Skip to content

Loading…

Fixed Issue #696: Character image covering slider in options menu. #717

Closed
wants to merge 2 commits into from

2 participants

@Mebibyte

Also added names to CreditsScreen.

@danielduner

Message to collaborators: Any merge of this should now be done to develop. Unless it is a bugfix? If so, merge to release instead (the release branch aims at a stable 1.0.0 version with no more new features). Fore more info, see the tutorial for the new branching model.

@danielduner

So in this case, please remake the pull request to Maescool:develop. Thank you :)

@danielduner danielduner closed this
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Showing with 5 additions and 6 deletions.
  1. +1 −1 src/com/mojang/mojam/gui/CreditsScreen.java
  2. +4 −5 src/com/mojang/mojam/gui/OptionsMenu.java
View
2 src/com/mojang/mojam/gui/CreditsScreen.java
@@ -19,7 +19,7 @@
public String[] officialDev = {"Borsty", "danielduner", "flet", "judgedead53", "Maescool",
"master-lincoln", "mkalam-alami", "Scorpion1122"};
public String[] communityMan = {"Austin01", "zorro300"};
- public String[] others = {"xPaw", "BubblegumBalloon", "Elosanda", "GreenLightning"};
+ public String[] others = {"xPaw", "BubblegumBalloon", "Elosanda", "GreenLightning", "Mebibyte", "Hammy55"};
public CreditsScreen(int gameWidth, int gameHeight) {
super();
View
9 src/com/mojang/mojam/gui/OptionsMenu.java
@@ -1,9 +1,7 @@
package com.mojang.mojam.gui;
import java.awt.event.KeyEvent;
-
import paulscode.sound.SoundSystem;
-
import com.mojang.mojam.MojamComponent;
import com.mojang.mojam.Options;
import com.mojang.mojam.screen.Art;
@@ -61,10 +59,11 @@ public OptionsMenu(boolean inGame) {
volume));
ClickableComponent musicVol = addButton(new Slider(TitleMenu.MUSIC,
- MojamComponent.texts.getStatic("options.music"), xOffset - xOffset / 3 - 6,
- yOffset += offset, musicVolume));
+ MojamComponent.texts.getStatic("options.music"), xOffset - xOffset / 3 - 20,
+ yOffset += offset + 2, musicVolume));
+
ClickableComponent soundsVol = addButton(new Slider(TitleMenu.SOUND,
- MojamComponent.texts.getStatic("options.sounds"), xOffset + xOffset / 3 + 6,
+ MojamComponent.texts.getStatic("options.sounds"), xOffset + xOffset / 3 + 20,
yOffset, soundsVolume));
ClickableComponent creativeModeBtn = addButton(new Checkbox(TitleMenu.CREATIVE_ID,
Something went wrong with that request. Please try again.