merging 1.7.5 source: windows changes

This commit is contained in:
Evan Debenham
2015-02-06 01:07:22 -05:00
parent 7cc5192839
commit 68406db6fe
18 changed files with 188 additions and 134 deletions
@@ -109,7 +109,7 @@ public class WndStory extends Window {
super.update();
if (delay > 0 && (delay -= Game.elapsed) <= 0) {
chrome.visible = tf.visible = true;
shadow.visible = chrome.visible = tf.visible = true;
}
}
@@ -123,7 +123,7 @@ public class WndStory extends Window {
if (text != null) {
WndStory wnd = new WndStory( text );
if ((wnd.delay = 0.6f) > 0) {
wnd.chrome.visible = wnd.tf.visible = false;
wnd.shadow.visible = wnd.chrome.visible = wnd.tf.visible = false;
}
Game.scene().add( wnd );