LingASDJ/Magic_Ling_Pixel_Dungeon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

v0.6.2b: manifest commit

Browse Source
This commit is contained in:
Evan Debenham 2017-11-09 18:25:49 -05:00 committed by Evan Debenham
parent 4ee449c918
commit 759ff2fb9d
4 changed files with 36 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/main/AndroidManifest.xml
View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.shatteredpixel.shatteredpixeldungeon"
android:versionCode="224"
android:versionName="0.6.2a"
android:versionCode="226"
android:versionName="0.6.2b"
android:installLocation="auto">
<uses-permission android:name="android.permission.VIBRATE"/>

33
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/ChangesScene.java
View File

@ -128,7 +128,38 @@ public class ChangesScene extends PixelScene {
// v0.6.2
//**********************
ChangeInfo changes = new ChangeInfo("v0.6.2a", true, "");
ChangeInfo changes = new ChangeInfo("v0.6.2b", true, "");
changes.hardlight(Window.TITLE_COLOR);
infos.add(changes);
changes.addButton( new ChangeButton(new CloakOfShadows(),
"Increased the base charge speed of the Cloak of Shadows by 20%, charge speed at higher levels unchanged."));
changes.addButton( new ChangeButton(Icons.get(Icons.PREFS), Messages.get(this, "misc"),
"_-_ Increased the brightness of the game's fog of war across all brightness settings.\n\n" +
"_-_ Added more detailed information to historical updates in the changes list.\n\n" +
"_-_ Wands that fire magical bolts now push on their detonation area, opening doors and trampling grass.\n\n" +
"_-_ Improved the visuals of alchemy pots."));
changes.addButton( new ChangeButton(new Image(Assets.SPINNER, 144, 0, 16, 16), Messages.get(this, "bugfixes"),
"Fixed (caused by 0.6.2):\n" +
"_-_ Various crash fixes\n" +
"_-_ Distortion traps not clearing journal entries\n\n" +
"Fixed (Existed prior to 0.6.2):\n" +
"_-_ Various crash fixes\n" +
"_-_ Game failing to save in rare cases\n" +
"_-_ Mimics spawning over pits in rare cases\n" +
"_-_ Game music not correctly pausing on android 2.2 and 2.3\n" +
"_-_ Items being removed from quickslots when containers are bought\n"));
changes.addButton( new ChangeButton(Icons.get(Icons.LANGS), Messages.get(this, "language"),
"_-_ Fixed various text errors with venom\n" +
"\n" +
"_-_ Various Translation Updates\n\n" +
"_-_ New Language: _Czech_"));
changes = new ChangeInfo("v0.6.2a", true, "");
changes.hardlight(Window.TITLE_COLOR);
infos.add(changes);

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/GameScene.java
View File

@ -902,7 +902,7 @@ public class GameScene extends PixelScene {
}
static boolean cancel() {
if (Dungeon.hero != null || Dungeon.hero.curAction != null || Dungeon.hero.resting) {
if (Dungeon.hero != null && (Dungeon.hero.curAction != null || Dungeon.hero.resting)) {
Dungeon.hero.curAction = null;
Dungeon.hero.resting = false;

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/WelcomeScene.java
View File

@ -136,7 +136,7 @@ public class WelcomeScene extends PixelScene {
message = Messages.get(this, "patch_intro");
message += "\n\n" + Messages.get(this, "patch_bugfixes");
message += "\n" + Messages.get(this, "patch_translations");
//message += "\n" + Messages.get(this, "patch_balance");
message += "\n" + Messages.get(this, "patch_balance");
}
} else {