diff --git a/AndorsTrail/res/drawable-nodpi/ts_background.png b/AndorsTrail/res/drawable-nodpi/ts_background.png index 4b439ec45..520fac5e6 100644 Binary files a/AndorsTrail/res/drawable-nodpi/ts_background.png and b/AndorsTrail/res/drawable-nodpi/ts_background.png differ diff --git a/AndorsTrail/res/drawable-nodpi/ts_foreground.png b/AndorsTrail/res/drawable-nodpi/ts_foreground.png index bce0113aa..e44b7abb8 100644 Binary files a/AndorsTrail/res/drawable-nodpi/ts_foreground.png and b/AndorsTrail/res/drawable-nodpi/ts_foreground.png differ diff --git a/AndorsTrail/res/drawable-nodpi/ts_midground.png b/AndorsTrail/res/drawable-nodpi/ts_midground.png index 52d801528..acd79346a 100644 Binary files a/AndorsTrail/res/drawable-nodpi/ts_midground.png and b/AndorsTrail/res/drawable-nodpi/ts_midground.png differ diff --git a/AndorsTrail/res/drawable/ts_clouds_l_01.png b/AndorsTrail/res/drawable/ts_clouds_l_01.png index f4360fd31..636b3fc43 100644 Binary files a/AndorsTrail/res/drawable/ts_clouds_l_01.png and b/AndorsTrail/res/drawable/ts_clouds_l_01.png differ diff --git a/AndorsTrail/res/drawable/ts_clouds_l_02.png b/AndorsTrail/res/drawable/ts_clouds_l_02.png index f46a4d2dc..dcd5c1c65 100644 Binary files a/AndorsTrail/res/drawable/ts_clouds_l_02.png and b/AndorsTrail/res/drawable/ts_clouds_l_02.png differ diff --git a/AndorsTrail/res/drawable/ts_clouds_l_03.png b/AndorsTrail/res/drawable/ts_clouds_l_03.png index d88482b25..4dad0f679 100644 Binary files a/AndorsTrail/res/drawable/ts_clouds_l_03.png and b/AndorsTrail/res/drawable/ts_clouds_l_03.png differ diff --git a/AndorsTrail/res/drawable/ts_clouds_l_04.png b/AndorsTrail/res/drawable/ts_clouds_l_04.png index 16f000365..c1453ed09 100644 Binary files a/AndorsTrail/res/drawable/ts_clouds_l_04.png and b/AndorsTrail/res/drawable/ts_clouds_l_04.png differ diff --git a/AndorsTrail/res/drawable/ts_clouds_m_01.png b/AndorsTrail/res/drawable/ts_clouds_m_01.png index afb4ead47..3747d5ee4 100644 Binary files a/AndorsTrail/res/drawable/ts_clouds_m_01.png and b/AndorsTrail/res/drawable/ts_clouds_m_01.png differ diff --git a/AndorsTrail/res/drawable/ts_clouds_m_02.png b/AndorsTrail/res/drawable/ts_clouds_m_02.png index dd90592ec..0310f17f8 100644 Binary files a/AndorsTrail/res/drawable/ts_clouds_m_02.png and b/AndorsTrail/res/drawable/ts_clouds_m_02.png differ diff --git a/AndorsTrail/res/drawable/ts_clouds_s_01.png b/AndorsTrail/res/drawable/ts_clouds_s_01.png index cc126d122..59f5eb749 100644 Binary files a/AndorsTrail/res/drawable/ts_clouds_s_01.png and b/AndorsTrail/res/drawable/ts_clouds_s_01.png differ diff --git a/AndorsTrail/res/drawable/ts_clouds_s_02.png b/AndorsTrail/res/drawable/ts_clouds_s_02.png index 8af712018..f05b2fab2 100644 Binary files a/AndorsTrail/res/drawable/ts_clouds_s_02.png and b/AndorsTrail/res/drawable/ts_clouds_s_02.png differ diff --git a/AndorsTrail/res/drawable/ts_clouds_s_03.png b/AndorsTrail/res/drawable/ts_clouds_s_03.png index 17cd63d3d..c61e3f580 100644 Binary files a/AndorsTrail/res/drawable/ts_clouds_s_03.png and b/AndorsTrail/res/drawable/ts_clouds_s_03.png differ diff --git a/AndorsTrail/res/layout-land/title_bg_layout.xml b/AndorsTrail/res/layout-land/title_bg_layout.xml index d2a5be069..f23183a05 100644 --- a/AndorsTrail/res/layout-land/title_bg_layout.xml +++ b/AndorsTrail/res/layout-land/title_bg_layout.xml @@ -15,8 +15,8 @@ - + \ No newline at end of file diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/StartScreenActivity.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/StartScreenActivity.java index 6b0909c38..3e25dfaf4 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/StartScreenActivity.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/StartScreenActivity.java @@ -90,11 +90,11 @@ public final class StartScreenActivity extends FragmentActivity implements OnNew }); } -// if (development_version.getVisibility() == View.VISIBLE) { -// development_version.setText(development_version.getText() + -// "\nMax Heap: " + Runtime.getRuntime().maxMemory() / 1024 + -// "\nTile size: " + (int) (32 * res.getDisplayMetrics().density)); -// } + if (development_version.getVisibility() == View.VISIBLE) { + development_version.setText(development_version.getText() + + "\nMax Heap: " + Runtime.getRuntime().maxMemory() / (1024 * 1024) + "MB"+ + "\nTile size: " + (int) (32 * res.getDisplayMetrics().density)); + } toggleUiVisibility(); diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/CloudsAnimatorView.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/CloudsAnimatorView.java index a53b8663a..bbbb2baf2 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/CloudsAnimatorView.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/CloudsAnimatorView.java @@ -112,8 +112,6 @@ public class CloudsAnimatorView extends FrameLayout { final float x = (float) (((1-ratio) * (iv.getDrawable().getMinimumWidth() + layer.getWidth())) - iv.getDrawable().getMinimumWidth()); final long d = (long)((ratio * duration) / (speedFactor + (Math.random() * SPEED_VARIANCE))); - L.log("Cloud added at "+x+","+y); - prepareAnimation(iv, layer, speedFactor, x, y, d); } @@ -173,7 +171,6 @@ public class CloudsAnimatorView extends FrameLayout { @Override public void onWindowFocusChanged(boolean hasWindowFocus) { super.onWindowFocusChanged(hasWindowFocus); - L.log("Clouds onWindowFocusChanged("+hasWindowFocus+")"); if (hasWindowFocus) { if (!started) { duration = (int) (DEFAULT_DURATION * getWidth() / (1024 * getResources().getDisplayMetrics().density));