Version bump and updated README.

OlivierHokke · Feb 19, 2014 · 70adac4 · 70adac4
1 parent 14ff206
commit 70adac4
Show file tree

Hide file tree

Showing 10 changed files with 29 additions and 20 deletions.
diff --git a/Assembly-CSharp-vs.csproj b/Assembly-CSharp-vs.csproj
@@ -64,10 +64,12 @@
      <Compile Include="Assets\InControl\Library\Unity\ControlSources\UnityKeyCodeSource.cs" />
      <Compile Include="Assets\InControl\Library\Unity\ControlSources\UnityMouseAxisSource.cs" />
      <Compile Include="Assets\InControl\Library\Unity\ControlSources\UnityMouseButtonSource.cs" />
+     <Compile Include="Assets\InControl\Library\Unity\DeviceProfiles\AppleMFiProfile.cs" />
      <Compile Include="Assets\InControl\Library\Unity\DeviceProfiles\ExecutionerXMacProfile.cs" />
      <Compile Include="Assets\InControl\Library\Unity\DeviceProfiles\GameStickProfile.cs" />
      <Compile Include="Assets\InControl\Library\Unity\DeviceProfiles\LogitechDualActionWinProfile.cs" />
      <Compile Include="Assets\InControl\Library\Unity\DeviceProfiles\LogitechRumblePad2MacProfile.cs" />
+     <Compile Include="Assets\InControl\Library\Unity\DeviceProfiles\NVidiaShieldAndroidProfile.cs" />
      <Compile Include="Assets\InControl\Library\Unity\DeviceProfiles\OuyaProfile.cs" />
      <Compile Include="Assets\InControl\Library\Unity\DeviceProfiles\OuyaWinProfile.cs" />
      <Compile Include="Assets\InControl\Library\Unity\DeviceProfiles\Playstation3MacProfile.cs" />

diff --git a/Assembly-CSharp.csproj b/Assembly-CSharp.csproj
@@ -64,10 +64,12 @@
      <Compile Include="Assets\InControl\Library\Unity\ControlSources\UnityKeyCodeSource.cs" />
      <Compile Include="Assets\InControl\Library\Unity\ControlSources\UnityMouseAxisSource.cs" />
      <Compile Include="Assets\InControl\Library\Unity\ControlSources\UnityMouseButtonSource.cs" />
+     <Compile Include="Assets\InControl\Library\Unity\DeviceProfiles\AppleMFiProfile.cs" />
      <Compile Include="Assets\InControl\Library\Unity\DeviceProfiles\ExecutionerXMacProfile.cs" />
      <Compile Include="Assets\InControl\Library\Unity\DeviceProfiles\GameStickProfile.cs" />
      <Compile Include="Assets\InControl\Library\Unity\DeviceProfiles\LogitechDualActionWinProfile.cs" />
      <Compile Include="Assets\InControl\Library\Unity\DeviceProfiles\LogitechRumblePad2MacProfile.cs" />
+     <Compile Include="Assets\InControl\Library\Unity\DeviceProfiles\NVidiaShieldAndroidProfile.cs" />
      <Compile Include="Assets\InControl\Library\Unity\DeviceProfiles\OuyaProfile.cs" />
      <Compile Include="Assets\InControl\Library\Unity\DeviceProfiles\OuyaWinProfile.cs" />
      <Compile Include="Assets\InControl\Library\Unity\DeviceProfiles\Playstation3MacProfile.cs" />

diff --git a/Assets/InControl/Library/VersionInfo.cs b/Assets/InControl/Library/VersionInfo.cs
@@ -8,7 +8,7 @@ public struct VersionInfo
 		public const int Major = 1;
 		public const int Minor = 0;
 		public const int Patch = 1;
-		public const int Build = 1242;
+		public const int Build = 1244;
 
 
 		public override string ToString()

diff --git a/Assets/InControl/README/README.html b/Assets/InControl/README/README.html
@@ -170,6 +170,8 @@ <h2 id="description">Description</h2>
 
 <p>InControl is an input manager for Unity3D that standardizes input mappings across various platforms for common controllers.</p>
 
+<p>A video introduction and overview is available here: <a href="http://www.gallantgames.com/incontrol">http://www.gallantgames.com/incontrol</a></p>
+
 <h2 id="features">Features</h2>
 
 <ul>
@@ -180,17 +182,21 @@ <h2 id="features">Features</h2>
 <li>Events for active device switches.</li>
 </ul>
 
-<h2 id="supportedcontrollers">Supported Controllers</h2>
+<h2 id="supported">Supported</h2>
 
 <ul>
 <li>Xbox 360 controller support for Windows, Mac and OUYA.</li>
 <li>Playstation 3 controller support for Windows, Mac and OUYA.</li>
 <li>Playstation 4 controller support for Windows, Mac and Linux.</li>
+<li>Apple MFi controller support on iOS 7 and above.</li>
 <li>OUYA controller support on OUYA and Windows.</li>
 <li>Logitech F310 support on Windows and Mac.</li>
 <li>Mad Catz FPS Pro support on Mac.</li>
 <li>GameStick support.</li>
+<li>NVIDIA Shield support on Android.</li>
 <li>Keyboard and Mouse support on Windows, Mac and Linux.</li>
+<li>Various other Xbox 360 clones are supported also.</li>
+<li>XInput support on Windows (rumble!)</li>
 </ul>
 
 <p><strong>Note:</strong> New device profiles are dead simple to create. Please feel free to submit profiles for any controller/platform not currently in the list, but do ensure it correctly supports all the standardized inputs (see below).</p>
@@ -322,17 +328,14 @@ <h2 id="gettingstarted">Getting Started</h2>
 <h2 id="to-dolist">To-do List</h2>
 
 <ul>
-<li>XInput.NET support on Windows.</li>
 <li>Allow players to custom bind controls.</li>
-<li>Support Apple MFi controllers on Mac and iOS.</li>
 <li>Support Android controllers like the Moga Pro.</li>
 <li>Support more controllers on Linux.</li>
 </ul>
 
 <h2 id="knownissues">Known Issues</h2>
 
 <ul>
-<li>Weird trigger behavior on Windows with multiple Xbox 360 controllers.</li>
 <li>Not all platforms trigger the <code>DeviceAttached</code> event correctly. If Unity&#8217;s <code>Input.GetJoystickNames()</code> is updated by the platform while the app is running, it will work. Every platform does, however, report all newly connected devices once the app is relaunched.</li>
 <li>Some controller specific buttons (like Start, Select, Back, OUYA, Xbox Guide, PS3, etc.) are not part of the standardized set of supported inputs simply because they do not work on every platform. You should not be using these buttons in a generalized cross-platform capacity.</li>
 </ul>

diff --git a/Assets/InControl/README/README.markdown b/Assets/InControl/README/README.markdown
@@ -2,6 +2,8 @@
 
 InControl is an input manager for Unity3D that standardizes input mappings across various platforms for common controllers.
 
+A video introduction and overview is available here: [http://www.gallantgames.com/incontrol](http://www.gallantgames.com/incontrol)
+
 ## Features
 
 * Standardizes input mappings across various platforms.
@@ -10,18 +12,20 @@ InControl is an input manager for Unity3D that standardizes input mappings acros
 * Events for attached and detached devices.
 * Events for active device switches.
 
-## Supported Controllers
+## Supported
 
-* Xbox 360 controller on Windows, Mac and OUYA.
-* Playstation 3 controller on Windows, Mac and OUYA.
-* Playstation 4 controller on Windows, Mac and Linux.
+* Xbox 360 controller support for Windows, Mac and OUYA.
+* Playstation 3 controller support for Windows, Mac and OUYA.
+* Playstation 4 controller support for Windows, Mac and Linux.
+* Apple MFi controller support on iOS 7 and above.
 * OUYA controller support on OUYA and Windows.
 * Logitech F310 support on Windows and Mac.
 * Mad Catz FPS Pro support on Mac.
-* Logitech Dual Action on Windows.
-* Executioner X Controller on Mac.
 * GameStick support.
+* NVIDIA Shield support on Android.
 * Keyboard and Mouse support on Windows, Mac and Linux.
+* Various other Xbox 360 clones are supported also.
+* XInput support on Windows (rumble!)
 
 **Note:** New device profiles are dead simple to create. Please feel free to submit profiles for any controller/platform not currently in the list, but do ensure it correctly supports all the standardized inputs (see below).
 
@@ -143,15 +147,12 @@ InputManager.OnActiveDeviceChanged += inputDevice => Debug.Log( "Switched: " + i
 
 ## To-do List
 
-* XInput.NET support on Windows.
 * Allow players to custom bind controls.
-* Support Apple MFi controllers on Mac and iOS.
 * Support Android controllers like the Moga Pro.
 * Support more controllers on Linux.
 
 ## Known Issues
 
-* Weird trigger behavior on Windows with multiple Xbox 360 controllers.
 * Not all platforms trigger the `DeviceAttached` event correctly. If Unity's `Input.GetJoystickNames()` is updated by the platform while the app is running, it will work. Every platform does, however, report all newly connected devices once the app is relaunched.
 * Some controller specific buttons (like Start, Select, Back, OUYA, Xbox Guide, PS3, etc.) are not part of the standardized set of supported inputs simply because they do not work on every platform. You should not be using these buttons in a generalized cross-platform capacity.
 

diff --git a/Assets/InControl/README/README.pdf b/Assets/InControl/README/README.pdf
diff --git a/InControl-csharp.sln b/InControl-csharp.sln
@@ -23,7 +23,7 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-																																																																																																																																																															GlobalSection(MonoDevelopProperties) = preSolution
+																																																																																																																																																																									GlobalSection(MonoDevelopProperties) = preSolution
 		StartupItem = Assembly-CSharp.csproj
 		Policies = $0
 		$0.TextStylePolicy = $1

diff --git a/InControl.sln b/InControl.sln
@@ -23,7 +23,7 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-																																																																																																																																																														GlobalSection(MonoDevelopProperties) = preSolution
+																																																																																																																																																																								GlobalSection(MonoDevelopProperties) = preSolution
 		StartupItem = Assembly-CSharp.csproj
 		Policies = $0
 		$0.TextStylePolicy = $1

diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset
diff --git a/README.md b/README.md
@@ -12,16 +12,20 @@ A video introduction and overview is available here: [http://www.gallantgames.co
 * Events for attached and detached devices.
 * Events for active device switches.
 
-## Supported Controllers
+## Supported
 
 * Xbox 360 controller support for Windows, Mac and OUYA.
 * Playstation 3 controller support for Windows, Mac and OUYA.
 * Playstation 4 controller support for Windows, Mac and Linux.
+* Apple MFi controller support on iOS 7 and above.
 * OUYA controller support on OUYA and Windows.
 * Logitech F310 support on Windows and Mac.
 * Mad Catz FPS Pro support on Mac.
 * GameStick support.
+* NVIDIA Shield support on Android.
 * Keyboard and Mouse support on Windows, Mac and Linux.
+* Various other Xbox 360 clones are supported also.
+* XInput support on Windows (rumble!)
 
 **Note:** New device profiles are dead simple to create. Please feel free to submit profiles for any controller/platform not currently in the list, but do ensure it correctly supports all the standardized inputs (see below).
 
@@ -143,15 +147,12 @@ InputManager.OnActiveDeviceChanged += inputDevice => Debug.Log( "Switched: " + i
 
 ## To-do List
 
-* XInput.NET support on Windows.
 * Allow players to custom bind controls.
-* Support Apple MFi controllers on Mac and iOS.
 * Support Android controllers like the Moga Pro.
 * Support more controllers on Linux.
 
 ## Known Issues
 
-* Weird trigger behavior on Windows with multiple Xbox 360 controllers.
 * Not all platforms trigger the `DeviceAttached` event correctly. If Unity's `Input.GetJoystickNames()` is updated by the platform while the app is running, it will work. Every platform does, however, report all newly connected devices once the app is relaunched.
 * Some controller specific buttons (like Start, Select, Back, OUYA, Xbox Guide, PS3, etc.) are not part of the standardized set of supported inputs simply because they do not work on every platform. You should not be using these buttons in a generalized cross-platform capacity.