Merge pull request #34 from dozingcat/version-1.7.0

Version 1.7.0 release

app/app.iml

@@ -87,7 +87,7 @@
       <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build" />
     </content>
-    <orderEntry type="jdk" jdkName="Android API 28 Platform" jdkType="Android SDK" />
+    <orderEntry type="jdk" jdkName="Android API 29 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="Gradle: __local_aars__:/home/brian/programs/Vector-Pinball/app/libs/gdx-box2d-1.9.9.jar:unspecified@jar" level="project" />
     <orderEntry type="library" name="Gradle: __local_aars__:/home/brian/programs/Vector-Pinball/app/libs/gdx-1.9.9.jar:unspecified@jar" level="project" />

app/build.gradle

@@ -1,12 +1,12 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 29
 
     defaultConfig {
         applicationId "com.dozingcatsoftware.bouncy"
         minSdkVersion 4
-        targetSdkVersion 28
+        targetSdkVersion 29
     }
 
     buildTypes {

app/src/main/AndroidManifest.xml

@@ -2,8 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.dozingcatsoftware.bouncy"
     android:installLocation="auto"
-    android:versionCode="23"
-    android:versionName="1.6.1" >
+    android:versionCode="24"
+    android:versionName="1.7.0" >
 
     <application
         android:allowBackup="true"

app/src/main/res/values/strings.xml

@@ -7,7 +7,6 @@
     <string name="independent_flippers_pref_summary_off">Any touch activates all flippers</string>
 
     <string name="line_width_pref_title">Line Width</string>
-    <string name="line_width_pref_summary">Width of lines in pixels (0 for default)</string>
     <string name="line_width_pref_dialog_message">Enter the line width in pixels, or 0 to use a default width based on the screen resolution.</string>
 
     <string name="sound_pref_title">Sound</string>
@@ -16,13 +15,14 @@
     <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.6.1\n© 2010-2019 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.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="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>
     <string name="table3_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- Shooting either ramp with turn the bumpers red, and they will change back to blue over several seconds. Hit them during this time for extra points.\n- Turn the middle rings red by hitting the bumpers, and the middle sets of drop targets. When all the rings are red, shoot either ramp to start multiball.</string>
     <string name="table4_rules" translatable="false">Table Rules:\n- Each bumper increases the score multiplier by 0.01x. Shooting the top drop targets or lighting all the lane rollovers will increase this amount.\n- Shoot all six bumpers to light the center indicators. When all indicators for a row are lit, shoot the right hole to lock the ball for multiball.\n- Multiball starts when you lock three balls. During multiball, the center indicators will light up when a ball crosses over them. Light them all to score a jackpot.\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.</string>
     <string name="table5_rules" translatable="false">Table Rules:\n- The central circle has twelve points around it, 3 each of 4 colors. Shooting a top ramp will change the color of the ball and allow it to activate the points with matching color.\n- When all 12 points around the circle are activated, hitting the edges of the rotating triangle will remove them. Shoot the target in the middle of the triangle to start multiball.\n- During multiball, light the 12 circle points again to score a jackpot, which increases in value each time.\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.</string>
+    <string name="table6_rules" translatable="false">Table Rules:\n- In the center of the table, five planets orbit a sun. When the ball rolls over one of the planets, it changes to the planet\'s color and the planet starts flashing.\n- Shoot the corresponding target to &quot;activate&quot; the planet and make it solid. For the inner orange planet, hit the targets in the upper left. For the second blue planet, activate the rollovers in the upper right. For the remaining planets, shoot the ramp of the matching color.\n- Activate all five planets to start multiball. In multiball, activate all the planets again for a jackpot.\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 sun and planets have gravity and will attract balls when they get close.</string>
 
     <string name="change_table_button_label">Change Table</string>
     <string name="help_button_label">Help</string>

app/src/main/res/xml/preferences.xml

@@ -21,7 +21,6 @@
 
 		<EditTextPreference android:key="lineWidth" android:enabled="true"
 			android:title="@string/line_width_pref_title"
-			android:summary="@string/line_width_pref_summary"
 			android:dialogMessage="@string/line_width_pref_dialog_message"
 			android:inputType="number" />
 

app/src/main/res/xml/preferences_nomultitouch.xml

@@ -12,7 +12,6 @@
 
 		<EditTextPreference android:key="lineWidth" android:enabled="true"
 			android:title="@string/line_width_pref_title"
-			android:summary="@string/line_width_pref_summary"
 			android:dialogMessage="@string/line_width_pref_dialog_message"
 			android:inputType="number" />