From ad263f7eea5c0cc3da5d3275739b8f1abe0395b4 Mon Sep 17 00:00:00 2001
From: rgarcia <bladecoder@gmail.com>
Date: Mon, 14 Jan 2019 12:02:26 +0100
Subject: [PATCH 1/6] Backport dialog ui arrow fix + warning message.

---
 .../com/bladecoder/engine/ui/DialogUI.java    | 77 +++++++++++--------
 .../bladecoder/engine/ui/LoadSaveScreen.java  | 21 ++---
 .../com/bladecoder/engine/ui/MenuScreen.java  | 58 ++++++++------
 3 files changed, 89 insertions(+), 67 deletions(-)

diff --git a/blade-engine/src/com/bladecoder/engine/ui/DialogUI.java b/blade-engine/src/com/bladecoder/engine/ui/DialogUI.java
index 860f77083..79c506177 100644
--- a/blade-engine/src/com/bladecoder/engine/ui/DialogUI.java
+++ b/blade-engine/src/com/bladecoder/engine/ui/DialogUI.java
@@ -18,8 +18,6 @@
 import java.util.List;
 
 import com.badlogic.gdx.scenes.scene2d.Actor;
-import com.badlogic.gdx.scenes.scene2d.Event;
-import com.badlogic.gdx.scenes.scene2d.EventListener;
 import com.badlogic.gdx.scenes.scene2d.InputEvent;
 import com.badlogic.gdx.scenes.scene2d.ui.Button;
 import com.badlogic.gdx.scenes.scene2d.ui.ScrollPane;
@@ -33,6 +31,7 @@
 import com.bladecoder.engine.i18n.I18N;
 import com.bladecoder.engine.model.World;
 import com.bladecoder.engine.util.DPIUtils;
+import com.bladecoder.engine.util.EngineLogger;
 
 public class DialogUI extends ScrollPane {
 	public static final String DIALOG_END_COMMAND = "dialog_end";
@@ -70,29 +69,6 @@ public DialogUI(UI ui) {
 		setVisible(false);
 		panel.defaults().expandX().fillX().top().left().padBottom(DPIUtils.getSpacing());
 
-		addListener(new EventListener() {
-
-			@Override
-			public boolean handle(Event event) {
-				if (isScrollY()) {
-
-					if (getScrollPercentY() > 0f && up.isVisible() == false) {
-						up.setVisible(true);
-					} else if (getScrollPercentY() == 0f && up.isVisible() == true) {
-						up.setVisible(false);
-					}
-
-					if (getScrollPercentY() < 1f && down.isVisible() == false) {
-						down.setVisible(true);
-					} else if (getScrollPercentY() == 1f && down.isVisible() == true) {
-						down.setVisible(false);
-					}
-				}
-
-				return false;
-			}
-		});
-
 		up.addListener(new ChangeListener() {
 			@Override
 			public void changed(ChangeEvent event, Actor actor) {
@@ -107,27 +83,57 @@ public void changed(ChangeEvent event, Actor actor) {
 			}
 		});
 	}
-	
+
+	private void setUpDownVisibility() {
+		EngineLogger.debug(
+				"setUpDownVisibility: " + isScrollY() + " maxY: " + getMaxY() + " Margin: " + DPIUtils.getMarginSize());
+		if (isScrollY() && getMaxY() > DPIUtils.getMarginSize()) {
+
+			if (getScrollPercentY() > 0f && up.isVisible() == false) {
+				up.setVisible(true);
+			} else if (getScrollPercentY() == 0f && up.isVisible() == true) {
+				up.setVisible(false);
+			}
+
+			if (getScrollPercentY() < 1f && down.isVisible() == false) {
+				down.setVisible(true);
+			} else if (getScrollPercentY() == 1f && down.isVisible() == true) {
+				down.setVisible(false);
+			}
+		} else {
+			up.setVisible(false);
+			down.setVisible(false);
+		}
+	}
+
 	@Override
-	public void setVisible (boolean visible) {
+	public void setVisible(boolean visible) {
 		super.setVisible(visible);
-		
-		if(visible) {
-			if(getParent() != null)
+
+		if (visible) {
+			if (getParent() != null)
 				show();
 		} else {
+			up.setVisible(false);
+			down.setVisible(false);
 			up.remove();
 			down.remove();
 		}
 	}
 
+	@Override
+	public void setScrollY(float pixels) {
+		super.setScrollY(pixels);
+		setUpDownVisibility();
+	}
+
 	private void show() {
 		choices = World.getInstance().getDialogOptions();
 
 		if (choices.size() == 0)
 			return;
 
-		else if (style.autoselect && choices.size() == 1) { 
+		else if (style.autoselect && choices.size() == 1) {
 			// If only has one option, autoselect it
 			select(0);
 			return;
@@ -149,6 +155,7 @@ else if (style.autoselect && choices.size() == 1) {
 			ob.getLabel().setAlignment(Align.left);
 
 			ob.addListener(new ClickListener() {
+				@Override
 				public void clicked(InputEvent event, float x, float y) {
 					int i = (Integer) event.getListenerActor().getUserObject();
 
@@ -167,12 +174,14 @@ public void clicked(InputEvent event, float x, float y) {
 		getStage().addActor(up);
 		up.setSize(size, size);
 		up.setPosition(getX() + getWidth() - size - margin, getY() + getHeight() - margin - size);
-		up.setVisible(false);
 
 		getStage().addActor(down);
 		down.setSize(size, size);
 		down.setPosition(getX() + getWidth() - size - margin, getY() + margin);
-		down.setVisible(false);
+
+		layout();
+
+		setUpDownVisibility();
 	}
 
 	private void select(int i) {
@@ -192,7 +201,7 @@ static public class DialogUIStyle {
 		public Drawable background;
 
 		public TextButtonStyle textButtonStyle;
-		
+
 		// If only one option is visible, auto select it.
 		public boolean autoselect = true;
 
diff --git a/blade-engine/src/com/bladecoder/engine/ui/LoadSaveScreen.java b/blade-engine/src/com/bladecoder/engine/ui/LoadSaveScreen.java
index 7f7bcd08c..e6291856f 100644
--- a/blade-engine/src/com/bladecoder/engine/ui/LoadSaveScreen.java
+++ b/blade-engine/src/com/bladecoder/engine/ui/LoadSaveScreen.java
@@ -24,8 +24,8 @@
 
 import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.Input;
-import com.badlogic.gdx.ScreenAdapter;
 import com.badlogic.gdx.Input.Keys;
+import com.badlogic.gdx.ScreenAdapter;
 import com.badlogic.gdx.files.FileHandle;
 import com.badlogic.gdx.graphics.GL20;
 import com.badlogic.gdx.graphics.Texture;
@@ -37,13 +37,13 @@
 import com.badlogic.gdx.scenes.scene2d.Stage;
 import com.badlogic.gdx.scenes.scene2d.ui.Button;
 import com.badlogic.gdx.scenes.scene2d.ui.Button.ButtonStyle;
-import com.badlogic.gdx.scenes.scene2d.ui.TextButton.TextButtonStyle;
 import com.badlogic.gdx.scenes.scene2d.ui.Container;
 import com.badlogic.gdx.scenes.scene2d.ui.Dialog;
 import com.badlogic.gdx.scenes.scene2d.ui.Image;
 import com.badlogic.gdx.scenes.scene2d.ui.Label;
 import com.badlogic.gdx.scenes.scene2d.ui.Skin;
 import com.badlogic.gdx.scenes.scene2d.ui.Table;
+import com.badlogic.gdx.scenes.scene2d.ui.TextButton.TextButtonStyle;
 import com.badlogic.gdx.scenes.scene2d.utils.ClickListener;
 import com.badlogic.gdx.scenes.scene2d.utils.Drawable;
 import com.badlogic.gdx.scenes.scene2d.utils.TextureRegionDrawable;
@@ -71,7 +71,7 @@ public class LoadSaveScreen extends ScreenAdapter implements BladeScreen {
 	private int slotHeight = 0;
 
 	// texture list for final dispose
-	private final ArrayList<Texture> textureList = new ArrayList<Texture>();
+	private final ArrayList<Texture> textureList = new ArrayList<>();
 
 	private Pointer pointer;
 
@@ -123,7 +123,7 @@ public void show() {
 		stage = new Stage(new ScreenViewport());
 
 		slotWidth = (int) (stage.getViewport().getWorldWidth() / (ROW_SLOTS + 1) - 2 * pad);
-		slotHeight = (int) (slotWidth * stage.getViewport().getScreenHeight() / stage.getViewport().getScreenWidth());
+		slotHeight = slotWidth * stage.getViewport().getScreenHeight() / stage.getViewport().getScreenWidth();
 
 		LoadSaveScreenStyle style = skin.get(LoadSaveScreenStyle.class);
 
@@ -146,6 +146,7 @@ public void show() {
 		Button back = new Button(skin, "back");
 
 		back.addListener(new ClickListener() {
+			@Override
 			public void clicked(InputEvent event, float x, float y) {
 				ui.setCurrentScreen(Screens.MENU_SCREEN);
 			}
@@ -153,7 +154,7 @@ public void clicked(InputEvent event, float x, float y) {
 
 		Table header = new Table();
 		// header.padBottom(pad);
-		Container<Button> cont = new Container<Button>(back);
+		Container<Button> cont = new Container<>(back);
 		cont.size(size);
 		header.add(cont);
 		header.add(title).fillX().expandX().left();
@@ -208,7 +209,7 @@ public boolean keyUp(InputEvent event, int keycode) {
 			removeButton.setName(s);
 			removeButton.addListener(removeClickListener);
 
-			Container<Button> container = new Container<Button>(removeButton);
+			Container<Button> container = new Container<>(removeButton);
 			container.size(DPIUtils.getPrefButtonSize() * .75f);
 			container.align(Align.topRight);
 
@@ -295,7 +296,7 @@ private Button getSlotButton(String slot) {
 	}
 
 	private List<String> getSlots() {
-		final List<String> al = new ArrayList<String>();
+		final List<String> al = new ArrayList<>();
 
 		FileHandle[] list = EngineAssetManager.getInstance().getUserFolder().list();
 
@@ -331,7 +332,7 @@ else if (EngineAssetManager.getInstance().assetExists("tests/" + filename))
 			savedFile = EngineAssetManager.getInstance().getAsset("tests/" + filename);
 		else {
 			Drawable d = ui.getSkin().getDrawable("black");
-			
+
 			return new Image(d);
 		}
 
@@ -349,8 +350,9 @@ public void clicked(InputEvent event, float x, float y) {
 			final World world = World.getInstance();
 			final String filename = event.getListenerActor().getName() + World.GAMESTATE_EXT;
 
-			if (world.savedGameExists()) {
+			if (world.savedGameExists() || world.getCurrentScene() != null) {
 				Dialog d = new Dialog("", ui.getSkin()) {
+					@Override
 					protected void result(Object object) {
 						if (((Boolean) object).booleanValue()) {
 							try {
@@ -402,6 +404,7 @@ public void clicked(InputEvent event, float x, float y) {
 			final Actor listenerActor = event.getListenerActor();
 
 			Dialog d = new Dialog("", ui.getSkin()) {
+				@Override
 				protected void result(Object object) {
 					if (((Boolean) object).booleanValue()) {
 						final World world = World.getInstance();
diff --git a/blade-engine/src/com/bladecoder/engine/ui/MenuScreen.java b/blade-engine/src/com/bladecoder/engine/ui/MenuScreen.java
index daab51689..962eb9a4a 100644
--- a/blade-engine/src/com/bladecoder/engine/ui/MenuScreen.java
+++ b/blade-engine/src/com/bladecoder/engine/ui/MenuScreen.java
@@ -18,8 +18,8 @@
 import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.Input;
 import com.badlogic.gdx.Input.Keys;
-import com.badlogic.gdx.audio.Music;
 import com.badlogic.gdx.ScreenAdapter;
+import com.badlogic.gdx.audio.Music;
 import com.badlogic.gdx.graphics.GL20;
 import com.badlogic.gdx.graphics.Texture;
 import com.badlogic.gdx.graphics.Texture.TextureFilter;
@@ -51,7 +51,7 @@
 import com.bladecoder.engine.util.EngineLogger;
 
 public class MenuScreen extends ScreenAdapter implements BladeScreen {
-//	private final static float BUTTON_PADDING = DPIUtils.UI_SPACE;
+	// private final static float BUTTON_PADDING = DPIUtils.UI_SPACE;
 
 	private UI ui;
 
@@ -103,7 +103,7 @@ public void dispose() {
 				bgTexFile.dispose();
 				bgTexFile = null;
 			}
-			
+
 			if (titleTexFile != null) {
 				titleTexFile.dispose();
 				titleTexFile = null;
@@ -130,7 +130,7 @@ public void show() {
 
 		// Image background = new Image(style.background);
 		Drawable bg = style.background;
-		
+
 		float scale = 1;
 
 		if (bg == null && style.bgFile != null) {
@@ -140,7 +140,7 @@ public void show() {
 			scale = (float) bgTexFile.getHeight() / (float) stage.getViewport().getScreenHeight();
 
 			int width = (int) (stage.getViewport().getScreenWidth() * scale);
-			int x0 = (int) ((bgTexFile.getWidth() - width) / 2);
+			int x0 = (bgTexFile.getWidth() - width) / 2;
 
 			bg = new TextureRegionDrawable(new TextureRegion(bgTexFile, x0, 0, width, bgTexFile.getHeight()));
 		}
@@ -163,7 +163,7 @@ public boolean keyUp(InputEvent event, int keycode) {
 		menuButtonTable.align(getAlign());
 		menuButtonTable.pad(DPIUtils.getMarginSize() * 2);
 		menuButtonTable.defaults().pad(DPIUtils.getSpacing()).width(buttonWidth).align(getAlign());
-//		menuButtonTable.debug();
+		// menuButtonTable.debug();
 
 		stage.setKeyboardFocus(menuButtonTable);
 
@@ -177,14 +177,15 @@ public boolean keyUp(InputEvent event, int keycode) {
 			menuButtonTable.add(title).padBottom(DPIUtils.getMarginSize() * 2);
 			menuButtonTable.row();
 		}
-		
-		if(style.titleFile != null) {
+
+		if (style.titleFile != null) {
 			titleTexFile = new Texture(EngineAssetManager.getInstance().getResAsset(style.titleFile));
 			titleTexFile.setFilter(TextureFilter.Linear, TextureFilter.Linear);
-			
+
 			Image img = new Image(titleTexFile);
-			
-			menuButtonTable.add(img).width((float)titleTexFile.getWidth() / scale).height((float)titleTexFile.getHeight() / scale).padBottom(DPIUtils.getMarginSize() * 2);
+
+			menuButtonTable.add(img).width(titleTexFile.getWidth() / scale).height(titleTexFile.getHeight() / scale)
+					.padBottom(DPIUtils.getMarginSize() * 2);
 			menuButtonTable.row();
 		}
 
@@ -193,6 +194,7 @@ public boolean keyUp(InputEvent event, int keycode) {
 			continueGame.getLabel().setAlignment(getAlign());
 
 			continueGame.addListener(new ClickListener() {
+				@Override
 				public void clicked(InputEvent event, float x, float y) {
 					if (world.getCurrentScene() == null)
 						try {
@@ -212,9 +214,11 @@ public void clicked(InputEvent event, float x, float y) {
 		TextButton newGame = new TextButton(I18N.getString("ui.new"), skin, style.textButtonStyle);
 		newGame.getLabel().setAlignment(getAlign());
 		newGame.addListener(new ClickListener() {
+			@Override
 			public void clicked(InputEvent event, float x, float y) {
-				if (world.savedGameExists()) {
+				if (world.savedGameExists() || world.getCurrentScene() != null) {
 					Dialog d = new Dialog("", skin) {
+						@Override
 						protected void result(Object object) {
 							if (((Boolean) object).booleanValue()) {
 								try {
@@ -262,6 +266,7 @@ protected void result(Object object) {
 		TextButton loadGame = new TextButton(I18N.getString("ui.load"), skin, style.textButtonStyle);
 		loadGame.getLabel().setAlignment(getAlign());
 		loadGame.addListener(new ClickListener() {
+			@Override
 			public void clicked(InputEvent event, float x, float y) {
 				ui.setCurrentScreen(Screens.LOAD_GAME_SCREEN);
 			}
@@ -273,6 +278,7 @@ public void clicked(InputEvent event, float x, float y) {
 		TextButton quit = new TextButton(I18N.getString("ui.quit"), skin, style.textButtonStyle);
 		quit.getLabel().setAlignment(getAlign());
 		quit.addListener(new ClickListener() {
+			@Override
 			public void clicked(InputEvent event, float x, float y) {
 				Gdx.app.exit();
 			}
@@ -288,6 +294,7 @@ public void clicked(InputEvent event, float x, float y) {
 		// BOTTOM-RIGHT BUTTON STACK
 		credits = new Button(skin, "credits");
 		credits.addListener(new ClickListener() {
+			@Override
 			public void clicked(InputEvent event, float x, float y) {
 				ui.setCurrentScreen(Screens.CREDIT_SCREEN);
 			}
@@ -295,6 +302,7 @@ public void clicked(InputEvent event, float x, float y) {
 
 		help = new Button(skin, "help");
 		help.addListener(new ClickListener() {
+			@Override
 			public void clicked(InputEvent event, float x, float y) {
 				ui.setCurrentScreen(Screens.HELP_SCREEN);
 			}
@@ -302,6 +310,7 @@ public void clicked(InputEvent event, float x, float y) {
 
 		debug = new Button(skin, "debug");
 		debug.addListener(new ClickListener() {
+			@Override
 			public void clicked(InputEvent event, float x, float y) {
 				DebugScreen debugScr = new DebugScreen();
 				debugScr.setUI(ui);
@@ -333,6 +342,7 @@ public void clicked(InputEvent event, float x, float y) {
 			int count = 0;
 			long time = System.currentTimeMillis();
 
+			@Override
 			public void clicked(InputEvent event, float x, float y) {
 				if (System.currentTimeMillis() - time < 500) {
 					count++;
@@ -363,6 +373,7 @@ public void clicked(InputEvent event, float x, float y) {
 		stage.addActor(version);
 
 		debug.addListener(new ClickListener() {
+			@Override
 			public void clicked(InputEvent event, float x, float y) {
 				DebugScreen debugScr = new DebugScreen();
 				debugScr.setUI(ui);
@@ -402,24 +413,23 @@ protected UI getUI() {
 	protected MenuScreenStyle getStyle() {
 		return ui.getSkin().get(MenuScreenStyle.class);
 	}
-	
+
 	private int getAlign() {
-		if(getStyle().align == null ||
-				"center".equals(getStyle().align))
+		if (getStyle().align == null || "center".equals(getStyle().align))
 			return Align.center;
-		
-		if("top".equals(getStyle().align))
+
+		if ("top".equals(getStyle().align))
 			return Align.top;
-		
-		if("bottom".equals(getStyle().align))
+
+		if ("bottom".equals(getStyle().align))
 			return Align.bottom;
-		
-		if("left".equals(getStyle().align))
+
+		if ("left".equals(getStyle().align))
 			return Align.left;
-		
-		if("right".equals(getStyle().align))
+
+		if ("right".equals(getStyle().align))
 			return Align.right;
-		
+
 		return Align.center;
 	}
 

From 3e7485f4b347ab391dd9390659a807cd10193bf7 Mon Sep 17 00:00:00 2001
From: rgarcia <bladecoder@gmail.com>
Date: Mon, 14 Jan 2019 12:43:17 +0100
Subject: [PATCH 2/6] Fix RectangleRenderer color bug.

---
 .../engineeditor/ui/panels/InputPanel.java    | 147 +++++++++---------
 .../ui/defaults/DefaultSceneScreen.java       |  11 +-
 .../engine/util/RectangleRenderer.java        |  24 +--
 gradle.properties                             |   6 +-
 4 files changed, 98 insertions(+), 90 deletions(-)

diff --git a/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/panels/InputPanel.java b/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/panels/InputPanel.java
index 1df5fa0a4..4dbe8d942 100644
--- a/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/panels/InputPanel.java
+++ b/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/panels/InputPanel.java
@@ -25,90 +25,89 @@
 
 public abstract class InputPanel extends Table {
 	private static final boolean USE_TOOLTIPS = true;
-	
+
 	protected Actor field;
-    private Label title;
-    private Label desc;
-    private boolean mandatory = false;
-
-    InputPanel() {
-    }
-    
-    protected void init(Skin skin, String title, String desc, Actor c, boolean mandatory, String defaultValue) {
-    	//debug();
-    	
-    	this.mandatory = mandatory;
-    	
-       	this.setSkin(skin);
-    	LabelStyle style = new LabelStyle(skin.get(LabelStyle.class));
-    	this.title = new Label(title, style);
-    	
-        this.desc = new Label(desc,skin, "subtitle");
-        this.desc.setWrap(false);  
-    	     	
-       	this.field = c;
-       	
-//       	row().expand();
-       	float titleWidth = this.title.getStyle().font.getSpaceWidth() * 35;
-       	add(this.title).width(titleWidth).left().top();
-       	this.title.setWidth(titleWidth);
-       	this.title.setWrap(true);
-       	//row().expand();
-       	add(field).expandX().left().top();
-       	
-       	if(USE_TOOLTIPS) {
-       		TextTooltip t = new TextTooltip(desc, skin);
-    		this.title.addListener(t);
-    		this.field.addListener(t);
-       	} else {
-       		row().expand();
-       		add(this.desc).colspan(2).left();
-       	}
-    	
-       	if(defaultValue != null)
-    		setText(defaultValue);
-    }
-    
-    
-    public void setMandatory(boolean value) {
-    	mandatory = value;
-    }
-    
-    public boolean isMandatory() {
-    	return mandatory;
-    }
+	private Label title;
+	private Label desc;
+	private boolean mandatory = false;
+
+	InputPanel() {
+	}
+
+	protected void init(Skin skin, String title, String desc, Actor c, boolean mandatory, String defaultValue) {
+		// debug();
+
+		this.mandatory = mandatory;
+
+		this.setSkin(skin);
+		LabelStyle style = new LabelStyle(skin.get(LabelStyle.class));
+		this.title = new Label(title, style);
+
+		this.desc = new Label(desc, skin, "subtitle");
+		this.desc.setWrap(false);
+
+		this.field = c;
+
+		// row().expand();
+		float titleWidth = this.title.getStyle().font.getSpaceXadvance() * 35;
+		add(this.title).width(titleWidth).left().top();
+		this.title.setWidth(titleWidth);
+		this.title.setWrap(true);
+		// row().expand();
+		add(field).expandX().left().top();
+
+		if (USE_TOOLTIPS) {
+			TextTooltip t = new TextTooltip(desc, skin);
+			this.title.addListener(t);
+			this.field.addListener(t);
+		} else {
+			row().expand();
+			add(this.desc).colspan(2).left();
+		}
+
+		if (defaultValue != null)
+			setText(defaultValue);
+	}
+
+	public void setMandatory(boolean value) {
+		mandatory = value;
+	}
+
+	public boolean isMandatory() {
+		return mandatory;
+	}
 
 	public void setError(boolean value) {
-    	if(value)
-    		title.getStyle().fontColor = Color.RED;
-    	else
-    		title.getStyle().fontColor = Color.WHITE;
-    }
-    
+		if (value)
+			title.getStyle().fontColor = Color.RED;
+		else
+			title.getStyle().fontColor = Color.WHITE;
+	}
+
 	public abstract String getText();
-	
+
 	public abstract void setText(String text);
-    
-    public String getTitle() {
-    	return title.getText().toString();
-    }
-    
-    public Actor getField() {
-    	return field;
-    }
-	
+
+	public String getTitle() {
+		return title.getText().toString();
+	}
+
+	public Actor getField() {
+		return field;
+	}
+
 	public boolean validateField() {
-	
+
 		String s = getText();
-		
-		if(mandatory) {
-			if(s == null || s.trim().isEmpty()) {
+
+		if (mandatory) {
+			if (s == null || s.trim().isEmpty()) {
 				setError(true);
 				return false;
-			}		
+			}
 		}
-		
-		setError(false);	
+
+		setError(false);
 		return true;
 	}
 }
diff --git a/blade-engine/src/com/bladecoder/engine/ui/defaults/DefaultSceneScreen.java b/blade-engine/src/com/bladecoder/engine/ui/defaults/DefaultSceneScreen.java
index 1a760474d..0711bbc4a 100644
--- a/blade-engine/src/com/bladecoder/engine/ui/defaults/DefaultSceneScreen.java
+++ b/blade-engine/src/com/bladecoder/engine/ui/defaults/DefaultSceneScreen.java
@@ -57,8 +57,8 @@
 import com.bladecoder.engine.model.Transition;
 import com.bladecoder.engine.model.Verb;
 import com.bladecoder.engine.model.World;
-import com.bladecoder.engine.model.WorldListener;
 import com.bladecoder.engine.model.World.AssetState;
+import com.bladecoder.engine.model.WorldListener;
 import com.bladecoder.engine.ui.DialogUI;
 import com.bladecoder.engine.ui.InventoryButton;
 import com.bladecoder.engine.ui.InventoryUI;
@@ -334,6 +334,7 @@ public DefaultSceneScreen() {
 		fastLeave = Config.getProperty(Config.FAST_LEAVE, false);
 	}
 
+	@Override
 	public UI getUI() {
 		return ui;
 	}
@@ -384,10 +385,12 @@ private void setUIState(UIStates s) {
 	 * @param s
 	 *            The multiplier speed. ej. 2.0
 	 */
+	@Override
 	public void setSpeed(float s) {
 		speed = s;
 	}
 
+	@Override
 	public float getSpeed() {
 		return speed;
 	}
@@ -798,6 +801,7 @@ public void resize(int width, int height) {
 				stage.getViewport().getScreenHeight() - menuButton.getHeight() - margin);
 	}
 
+	@Override
 	public void dispose() {
 		renderer.dispose();
 		stage.dispose();
@@ -852,6 +856,7 @@ private void sceneClick(int button, int count) {
 		}
 	}
 
+	@Override
 	public void actorClick(InteractiveActor a, int button) {
 		final boolean lookat = button == 1;
 
@@ -897,6 +902,7 @@ private void getInputUnProject(Vector3 out) {
 	 * @param verb
 	 * @param target
 	 */
+	@Override
 	public void runVerb(InteractiveActor a, String verb, String target) {
 		// COMMENTED BECAUSE THE INVENTORY ONLY HIDES WHEN CUTMODE
 		// if (inventoryUI.isVisible())
@@ -1005,10 +1011,12 @@ public void resume() {
 		}
 	}
 
+	@Override
 	public Viewport getViewport() {
 		return viewport;
 	}
 
+	@Override
 	public InteractiveActor getCurrentActor() {
 		return currentActor;
 	}
@@ -1037,6 +1045,7 @@ public void setUI(final UI ui) {
 		pie.setVisible(false);
 
 		menuButton.addListener(new ClickListener() {
+			@Override
 			public void clicked(InputEvent event, float x, float y) {
 				ui.setCurrentScreen(Screens.MENU_SCREEN);
 			}
diff --git a/blade-engine/src/com/bladecoder/engine/util/RectangleRenderer.java b/blade-engine/src/com/bladecoder/engine/util/RectangleRenderer.java
index 208e0dcf2..ed4d43bed 100644
--- a/blade-engine/src/com/bladecoder/engine/util/RectangleRenderer.java
+++ b/blade-engine/src/com/bladecoder/engine/util/RectangleRenderer.java
@@ -33,21 +33,21 @@ private static Texture makePixel() {
 		return _temp;
 	}
 
-	public static void draw(Batch batch, float posX, float posY,
-			float width, float height, Color color) {
-		
-		if(texture == null) texture = makePixel();
-		
-		Color tmp = batch.getColor();
+	public static void draw(Batch batch, float posX, float posY, float width, float height, Color color) {
+
+		if (texture == null)
+			texture = makePixel();
+
+		float tmp = batch.getPackedColor();
 		batch.setColor(color);
-		batch.draw(texture, posX, posY, 0,
-				0, width, height, 1, 1, 0, 0, 0, 1, 1, false, false);
-		
-		batch.setColor(tmp);
+		batch.draw(texture, posX, posY, 0, 0, width, height, 1, 1, 0, 0, 0, 1, 1, false, false);
+
+		batch.setPackedColor(tmp);
 	}
-	
+
 	public static void dispose() {
-		if(texture!=null) texture.dispose();
+		if (texture != null)
+			texture.dispose();
 		texture = null;
 	}
 
diff --git a/gradle.properties b/gradle.properties
index 20ef2a36d..7866ecd43 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,7 +1,7 @@
 version=2.0.6
-libgdxVersion=1.9.8
-roboVMVersion=2.3.3
-roboVMGradlePluginVersion=2.3.3
+libgdxVersion=1.9.9
+roboVMVersion=2.3.5
+roboVMGradlePluginVersion=2.3.5
 buildToolsVersion=23.0.3
 androidAPILevel=23
 androidGradlePluginVersion=2.3.0

From 8750a980c551628224460612d2cdee23dda6d187 Mon Sep 17 00:00:00 2001
From: rgarcia <bladecoder@gmail.com>
Date: Mon, 14 Jan 2019 13:17:11 +0100
Subject: [PATCH 3/6] Prepare for v2.0.7

---
 adventure-editor/src/main/resources/versions.properties | 8 ++++----
 gradle.properties                                       | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/adventure-editor/src/main/resources/versions.properties b/adventure-editor/src/main/resources/versions.properties
index 53cc7dffa..df5babd19 100644
--- a/adventure-editor/src/main/resources/versions.properties
+++ b/adventure-editor/src/main/resources/versions.properties
@@ -2,7 +2,7 @@ androidAPILevel=23
 androidGradlePluginVersion=2.3.0
 bladeInkVersion=0.4.4
 buildToolsVersion=23.0.3
-libgdxVersion=1.9.8
-roboVMGradlePluginVersion=2.3.3
-roboVMVersion=2.3.3
-version=2.0.6
\ No newline at end of file
+libgdxVersion=1.9.9
+roboVMGradlePluginVersion=2.3.5
+roboVMVersion=2.3.5
+version=2.0.7
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index 7866ecd43..3c3d4a86c 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
-version=2.0.6
+version=2.0.7
 libgdxVersion=1.9.9
 roboVMVersion=2.3.5
 roboVMGradlePluginVersion=2.3.5

From a1e1cc1b70b362f27173bf5d34fcff1d570cdfb9 Mon Sep 17 00:00:00 2001
From: Rafael Garcia <bladecoder@gmail.com>
Date: Thu, 27 Feb 2020 00:36:20 +0100
Subject: [PATCH 4/6] v2.0.8

---
 .../src/main/resources/versions.properties    |  2 +-
 .../com/bladecoder/engine/ink/InkManager.java |  3 +
 .../bladecoder/engine/ui/CreditsScreen.java   | 63 +++++++++++--------
 gradle.properties                             |  2 +-
 gradle/wrapper/gradle-wrapper.properties      |  2 +-
 5 files changed, 43 insertions(+), 29 deletions(-)

diff --git a/adventure-editor/src/main/resources/versions.properties b/adventure-editor/src/main/resources/versions.properties
index df5babd19..2233ff71f 100644
--- a/adventure-editor/src/main/resources/versions.properties
+++ b/adventure-editor/src/main/resources/versions.properties
@@ -5,4 +5,4 @@ buildToolsVersion=23.0.3
 libgdxVersion=1.9.9
 roboVMGradlePluginVersion=2.3.5
 roboVMVersion=2.3.5
-version=2.0.7
\ No newline at end of file
+version=2.0.8
\ No newline at end of file
diff --git a/blade-engine/src/com/bladecoder/engine/ink/InkManager.java b/blade-engine/src/com/bladecoder/engine/ink/InkManager.java
index 5e98f455f..4255eddb6 100644
--- a/blade-engine/src/com/bladecoder/engine/ink/InkManager.java
+++ b/blade-engine/src/com/bladecoder/engine/ink/InkManager.java
@@ -32,6 +32,7 @@
 import com.bladecoder.ink.runtime.ListDefinition;
 import com.bladecoder.ink.runtime.Story;
 
+
 public class InkManager implements VerbRunner, Serializable {
 	public final static char NAME_VALUE_TAG_SEPARATOR = ':';
 	public final static char NAME_VALUE_PARAM_SEPARATOR = '=';
@@ -219,6 +220,7 @@ private void continueMaximally() {
 			} else if (cb != null || sCb != null) {
 				if (cb == null) {
 					cb = ActionCallbackSerialization.find(sCb);
+					sCb = null;
 				}
 
 				ActionCallbackQueue.add(cb);
@@ -374,6 +376,7 @@ synchronized public void runPath(String path, ActionCallback cb) throws Exceptio
 		}
 
 		this.cb = cb;
+		sCb = null;
 
 		story.choosePathString(path);
 		continueMaximally();
diff --git a/blade-engine/src/com/bladecoder/engine/ui/CreditsScreen.java b/blade-engine/src/com/bladecoder/engine/ui/CreditsScreen.java
index bd80e0cf8..626ff0cbc 100644
--- a/blade-engine/src/com/bladecoder/engine/ui/CreditsScreen.java
+++ b/blade-engine/src/com/bladecoder/engine/ui/CreditsScreen.java
@@ -70,8 +70,7 @@ public class CreditsScreen extends ScreenAdapter implements BladeScreen {
 	private final InputProcessor inputProcessor = new InputAdapter() {
 		@Override
 		public boolean keyUp(int keycode) {
-			if (keycode == Input.Keys.ESCAPE
-					|| keycode == Input.Keys.BACK)
+			if (keycode == Input.Keys.ESCAPE || keycode == Input.Keys.BACK)
 				ui.setCurrentScreen(Screens.MENU_SCREEN);
 
 			return true;
@@ -110,7 +109,8 @@ public void render(float delta) {
 		for (int i = stringHead; i < credits.size(); i++) {
 			String s = credits.get(i);
 
-			char type = 'c'; // types are 'c' -> credit, 't' -> title, 'i' -> image, 's' -> space, 'm' -> music
+			char type = 'c'; // types are 'c' -> credit, 't' -> title, 'i' -> image, 's' -> space, 'm' ->
+								// music
 
 			if (s.indexOf('#') != -1) {
 				type = s.charAt(0);
@@ -118,23 +118,23 @@ public void render(float delta) {
 			}
 
 			switch (type) {
-				case 't':
-					y = processCreditTitle(batch, width, height, y, i, s);
-					break;
-				case 'i':
-					y = processCreditImage(batch, width, height, y, i, s);
-					break;
-				case 's':
-					y = processCreditSpace(height, y, i, s);
-					break;
-				case 'm':
-					processCreditMusic(s);
-					credits.remove(i);
-					i--;
-					break;
-				default:
-					y = processCreditDefault(batch, width, height, y, i, s);
-					break;
+			case 't':
+				y = processCreditTitle(batch, width, height, y, i, s);
+				break;
+			case 'i':
+				y = processCreditImage(batch, width, height, y, i, s);
+				break;
+			case 's':
+				y = processCreditSpace(height, y, i, s);
+				break;
+			case 'm':
+				processCreditMusic(s);
+				credits.remove(i);
+				i--;
+				break;
+			default:
+				y = processCreditDefault(batch, width, height, y, i, s);
+				break;
 			}
 
 			if (y < 0) {
@@ -188,22 +188,33 @@ private float processCreditSpace(int height, float y, int i, String s) {
 	private void processCreditMusic(final String s) {
 		if (music != null)
 			music.dispose();
-		
+
 		final String sound = EngineAssetManager.getInstance().checkIOSSoundName("music/" + s);
 
 		new Thread() {
 			@Override
 			public void run() {
 				music = Gdx.audio.newMusic(EngineAssetManager.getInstance().getAsset(sound));
-				
+
 				try {
 					music.play();
-				} catch(Exception e) {
-					// sometimes the play method fails on desktop.
+				} catch (Exception e) {
+
+					// DEAL WITH OPENAL BUG
+					if (e.getMessage() != null && e.getMessage().contains("40963")) {
+						EngineLogger.debug("!!!!!!!!!!!!!!!!!!!!!!!ERROR playing music trying again...!!!!!!!!!!!!!!!");
+
+						music = Gdx.audio.newMusic(EngineAssetManager.getInstance().getAsset(sound));
+						music.play();
+						music.setVolume(0.5f);
+
+						return;
+					}
+
 					EngineLogger.error("Error Playing music: " + s, e);
 				}
 			}
-		}.start();	
+		}.start();
 	}
 
 	private float processCreditDefault(SpriteBatch batch, int width, int height, float y, int i, String s) {
@@ -307,7 +318,7 @@ public void drawCenteredScreenX(SpriteBatch batch, BitmapFont font, CharSequence
 
 		layout.setText(font, str, Color.WHITE, viewportWidth, Align.center, true);
 
-		//x = (viewportWidth - layout.width)/2;
+		// x = (viewportWidth - layout.width)/2;
 
 		font.draw(batch, layout, x, y);
 	}
diff --git a/gradle.properties b/gradle.properties
index 3c3d4a86c..8b7c452fa 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
-version=2.0.7
+version=2.0.8
 libgdxVersion=1.9.9
 roboVMVersion=2.3.5
 roboVMGradlePluginVersion=2.3.5
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 1d5a72ac0..c2b954d40 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-4.0.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.0.2-bin.zip

From 9e1d2dd34b6cfc7691dec92e0e6c3752d293b52a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20Garc=C3=ADa?= <bladecoder@gmail.com>
Date: Thu, 27 Feb 2020 09:29:19 +0100
Subject: [PATCH 5/6] Fix travis. oraclejdk -> openjdk

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index d6e5d91c5..a4e1d6e18 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,5 @@
 language: Java
 
 jdk:
-  - oraclejdk8
+  - openjdk8
 

From 215ad67f4d26eab9a616a5f7916eeb9a3cfcf6c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20Garc=C3=ADa?= <bladecoder@gmail.com>
Date: Fri, 31 Dec 2021 19:40:21 +0100
Subject: [PATCH 6/6] Added back button support for Android.

---
 adventure-editor/src/main/resources/versions.properties   | 2 +-
 .../src/com/bladecoder/engine/ui/LoadSaveScreen.java      | 2 ++
 blade-engine/src/com/bladecoder/engine/ui/MenuScreen.java | 8 ++++++--
 blade-engine/src/com/bladecoder/engine/ui/UI.java         | 2 ++
 gradle.properties                                         | 2 +-
 5 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/adventure-editor/src/main/resources/versions.properties b/adventure-editor/src/main/resources/versions.properties
index 2233ff71f..360f98c04 100644
--- a/adventure-editor/src/main/resources/versions.properties
+++ b/adventure-editor/src/main/resources/versions.properties
@@ -5,4 +5,4 @@ buildToolsVersion=23.0.3
 libgdxVersion=1.9.9
 roboVMGradlePluginVersion=2.3.5
 roboVMVersion=2.3.5
-version=2.0.8
\ No newline at end of file
+version=2.0.9
\ No newline at end of file
diff --git a/blade-engine/src/com/bladecoder/engine/ui/LoadSaveScreen.java b/blade-engine/src/com/bladecoder/engine/ui/LoadSaveScreen.java
index e6291856f..111fa695b 100644
--- a/blade-engine/src/com/bladecoder/engine/ui/LoadSaveScreen.java
+++ b/blade-engine/src/com/bladecoder/engine/ui/LoadSaveScreen.java
@@ -169,6 +169,8 @@ public boolean keyUp(InputEvent event, int keycode) {
 				if (keycode == Input.Keys.ESCAPE || keycode == Input.Keys.BACK)
 					if (world.getCurrentScene() != null)
 						ui.setCurrentScreen(Screens.SCENE_SCREEN);
+					else
+						ui.setCurrentScreen(Screens.MENU_SCREEN);
 
 				return true;
 			}
diff --git a/blade-engine/src/com/bladecoder/engine/ui/MenuScreen.java b/blade-engine/src/com/bladecoder/engine/ui/MenuScreen.java
index 962eb9a4a..389795a9f 100644
--- a/blade-engine/src/com/bladecoder/engine/ui/MenuScreen.java
+++ b/blade-engine/src/com/bladecoder/engine/ui/MenuScreen.java
@@ -152,9 +152,13 @@ public void show() {
 		menuButtonTable.addListener(new InputListener() {
 			@Override
 			public boolean keyUp(InputEvent event, int keycode) {
-				if (keycode == Input.Keys.ESCAPE || keycode == Input.Keys.BACK)
-					if (world.getCurrentScene() != null)
+				if (keycode == Input.Keys.ESCAPE) {
+					if (world.getCurrentScene() != null) {
 						ui.setCurrentScreen(Screens.SCENE_SCREEN);
+					}
+				} else if (keycode == Input.Keys.BACK) {
+						Gdx.app.exit();
+				}
 
 				return true;
 			}
diff --git a/blade-engine/src/com/bladecoder/engine/ui/UI.java b/blade-engine/src/com/bladecoder/engine/ui/UI.java
index ba7d74fb6..ed48acc08 100644
--- a/blade-engine/src/com/bladecoder/engine/ui/UI.java
+++ b/blade-engine/src/com/bladecoder/engine/ui/UI.java
@@ -17,6 +17,7 @@
 
 import com.badlogic.gdx.Application.ApplicationType;
 import com.badlogic.gdx.Gdx;
+import com.badlogic.gdx.Input;
 import com.badlogic.gdx.files.FileHandle;
 import com.badlogic.gdx.graphics.g2d.SpriteBatch;
 import com.badlogic.gdx.graphics.g2d.TextureAtlas;
@@ -56,6 +57,7 @@ public UI() {
 		
 		screens = new BladeScreen[Screens.values().length];
 
+		Gdx.input.setCatchBackKey(true);
 		Gdx.input.setCatchMenuKey(true);
 
 		loadAssets();
diff --git a/gradle.properties b/gradle.properties
index 8b7c452fa..98b6b213f 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
-version=2.0.8
+version=2.0.9
 libgdxVersion=1.9.9
 roboVMVersion=2.3.5
 roboVMGradlePluginVersion=2.3.5

<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Transitional//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd'>
<html xmlns='http://www.w3.org/1999/xhtml'>
<head>
<title>pFad - Phonifier reborn</title>
<meta http-equiv='Content-Type' content='text/html; charset=utf-8' />
</head>
<body>
<h1>Pfad - The Proxy pFad of &#169; 2024 Garber Painting. All rights reserved.</h1>


<!-- Disclaimer -->
<p>Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.</p>
<br>
<p>Alternative Proxies:</p><p><a href="http://rainy.clevelandohioweatherforecast.com/php-proxy/index.php?q=https://github.com/bladecoder/bladecoder-adventure-engine/compare/master...v2.0.patch" target="_blank">Alternative Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/index.php?u=https://github.com/bladecoder/bladecoder-adventure-engine/compare/master...v2.0.patch" target="_blank">pFad Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/v3index.php?u=https://github.com/bladecoder/bladecoder-adventure-engine/compare/master...v2.0.patch" target="_blank">pFad v3 Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/v4index.php?u=https://github.com/bladecoder/bladecoder-adventure-engine/compare/master...v2.0.patch" target="_blank">pFad v4 Proxy</a></p></body>
</html>