Merge branch 'master' of github.com:cgutman/limelight

AndroidManifest.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.limelight"
-    android:versionCode="11"
+    android:versionCode="12"
-    android:versionName="2.1.5" >
+    android:versionName="2.1.6" >
 
     <uses-sdk
         android:minSdkVersion="16"

README.md

@@ -3,10 +3,8 @@
 Limelight is an open source implementation of NVIDIA's GameStream, as used by the NVIDIA Shield.
 We reverse engineered the Shield streaming software, and created a version that can be run on any Android device.
 
-Limelight will allow you to stream your full collection of Steam games from your Windows PC to your Android device on the same network.
+Limelight will allow you to stream your full collection of Steam games from your Windows PC to your Android device,
-
+in your own home, or over the internet.
-Streaming can be done remotely using the [Shield Proxy](http://forum.xda-developers.com/showthread.php?t=2435481)
-application.
 
 [Limelight-pc](https://github.com/limelight-stream/limelight-pc) is also currently in development for Windows, OS X and Linux. Versions for [iOS](https://github.com/limelight-stream/limelight-ios) and [Windows Phone](https://github.com/limelight-stream/limelight-wp) are also in development.
 
@@ -36,9 +34,10 @@ application.
 
 ##Usage
 
-* Ensure your Android device and your PC are on the same network or you're running [Shield Proxy](http://forum.xda-developers.com/showthread.php?t=2435481).
 * Turn on Shield Streaming in the GFE settings
-* In Limelight, enter your PC's IP or Hostname and click "Pair".
+* If you are connecting from outside the same network, turn on internet
+  streaming
+* In Limelight, enter your PC's IP or Hostname and click "Pair"
 * Accept the pairing confirmation on your PC
 * In Limelight, click "Start Streaming"
 * Play games!

src/com/limelight/Connection.java

@@ -177,6 +177,11 @@ public class Connection extends Activity {
 		this.pairButton.setOnClickListener(new OnClickListener() {
 			@Override
 			public void onClick(View arg0) {
+				if (Connection.this.hostText.getText().length() == 0) {
+					Toast.makeText(Connection.this, "Please enter the target PC's IP address in the text box at the top of the screen.", Toast.LENGTH_LONG).show();
+					return;
+				}
+				
 				Toast.makeText(Connection.this, "Pairing...", Toast.LENGTH_LONG).show();
 				new Thread(new Runnable() {
 					@Override

src/com/limelight/binding/input/ControllerHandler.java

@@ -325,6 +325,7 @@ public class ControllerHandler {
 		case KeyEvent.KEYCODE_BUTTON_B:
 			inputMap &= ~ControllerPacket.B_FLAG;
 			break;
+		case KeyEvent.KEYCODE_DPAD_CENTER:
 		case KeyEvent.KEYCODE_BUTTON_A:
 			inputMap &= ~ControllerPacket.A_FLAG;
 			break;
@@ -405,6 +406,7 @@ public class ControllerHandler {
 		case KeyEvent.KEYCODE_BUTTON_B:
 			inputMap |= ControllerPacket.B_FLAG;
 			break;
+		case KeyEvent.KEYCODE_DPAD_CENTER:
 		case KeyEvent.KEYCODE_BUTTON_A:
 			inputMap |= ControllerPacket.A_FLAG;
 			break;