Skip to content

Commit

Permalink
Merge pull request #37 from dozingcat/version_1.7.1
Browse files Browse the repository at this point in the history
Bump version to 1.7.1
  • Loading branch information
dozingcat authored Feb 9, 2020
2 parents 7484f8b + 784296c commit 13e668a
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 3 deletions.
4 changes: 2 additions & 2 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.dozingcatsoftware.bouncy"
android:installLocation="auto"
android:versionCode="24"
android:versionName="1.7.0" >
android:versionCode="25"
android:versionName="1.7.1" >

<application
android:allowBackup="true"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import android.util.DisplayMetrics;
import android.view.Window;
import android.widget.TextView;

Expand Down Expand Up @@ -31,6 +32,10 @@ public class AboutActivity extends Activity {

TextView tv = (TextView) findViewById(R.id.aboutTextView);
tv.setText(displayText);
// Padding based on screen
DisplayMetrics metrics = getResources().getDisplayMetrics();
int padding = Math.min(metrics.widthPixels, metrics.heightPixels) / 25;
tv.setPadding(padding, padding, padding, padding);
}

public static Intent startForLevel(Context context, int level) {
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<string name="zoom_pref_title">Zoom Playfield</string>
<string name="use_opengl_pref_title">OpenGL Rendering</string>

<string name="about_text" translatable="false">Vector Pinball 1.7.0\n© 2010-2020 Brian Nenninger\nComments and bug reports: [email protected]\n\nTouch the screen to start a new game, launch a ball if one is not in play, and activate the flippers. Touch the score area to pause the game.\n\n[TABLE_RULES]\n\nSelecting the Preferences button or menu item allows you to change the following settings:\n- Sound: Enables and disables sound effects\n- Background Music: Enables and disabled background music\n- Independent Flippers: When unchecked, any touch activates both flippers. When checked, you must touch the left side of the screen for the left flipper, and the right side for the right flipper.\n- Zoom: When checked, the view will be zoomed on the ball\'s location during game play.\n- OpenGL Rendering: Uses OpenGL to draw graphics. This improves performance on many devices, but slows down some.\n- Show FPS: When checked, shows frames drawn per second in the upper left.\n\nVector Pinball is open source; the code is at https://github.com/dozingcat/Vector-Pinball\n\nThanks to Mario at www.badlogicgames.com for code improvements and libgdx.\n\nsound, music, &amp; audio code, by pdx\nTwittering Machine\nhttps://www.twittering.com</string>
<string name="about_text" translatable="false">Vector Pinball 1.7.1\n© 2010-2020 Brian Nenninger\nComments and bug reports: [email protected]\n\nTouch the screen to start a new game, launch a ball if one is not in play, and activate the flippers. Touch the score area to pause the game.\n\n[TABLE_RULES]\n\nSelecting the Preferences button or menu item allows you to change the following settings:\n- Sound: Enables and disables sound effects\n- Background Music: Enables and disabled background music\n- Independent Flippers: When unchecked, any touch activates both flippers. When checked, you must touch the left side of the screen for the left flipper, and the right side for the right flipper.\n- Zoom: When checked, the view will be zoomed on the ball\'s location during game play.\n- OpenGL Rendering: Uses OpenGL to draw graphics. This improves performance on many devices, but slows down some.\n- Show FPS: When checked, shows frames drawn per second in the upper left.\n\nVector Pinball is open source; the code is at https://github.com/dozingcat/Vector-Pinball\n\nThanks to Mario at www.badlogicgames.com for code improvements and libgdx.\n\nsound, music, &amp; audio code, by pdx\nTwittering Machine\nhttps://www.twittering.com</string>

<string name="table1_rules" translatable="false">Table Rules:\n- Light all the cyan rollovers in the top or bottom lanes to advance the score multiplier. All points you earn will be multiplied by this amount. Shooting the left ramp will also advance the multiplier.\n- The game starts with ball savers in the left and right outlanes, which disappear when used. Hit all drop targets on the left or right side to restore them.\n- Hitting any group of drop targets will activate the next light in the center of the field. When the large white central light is activated, shoot the left ramp to start multiball.</string>
<string name="table2_rules" translatable="false">Table Rules:\n- Light all the cyan rollovers in the bottom lanes to advance the score multiplier. All points you earn will be multiplied by this amount. \n- The game starts with ball savers in the left and right outlanes, which disappear when used. Hit all drop targets on the left or right side to restore them.\n- The circles in the middle of the field keep track of how many times you\'ve hit all the left, upper, and right drop targets. When all of them have been hit at least 3 times, shoot the red bumper in the upper right to start multiball.</string>
Expand Down

0 comments on commit 13e668a

Please sign in to comment.