Merge remote-tracking branch 'origin/master'

spine-monogame/windows8-store/example/spine-monogame-example.csproj

@@ -145,6 +145,9 @@
     <Content Include="..\..\..\spine-xna\example\data\goblins-ffd.json">
       <Link>Assets\goblins-ffd.json</Link>
     </Content>
+    <Content Include="..\..\..\spine-xna\example\data\raptor.png">
+      <Link>Assets\raptor.png</Link>
+    </Content>
     <Content Include="..\..\..\spine-xna\example\data\spineboy.atlas">
       <Link>Assets\spineboy.atlas</Link>
     </Content>
@@ -173,6 +176,14 @@
       <Name>SpineMonogameWindows8Store</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="..\..\..\spine-xna\example\data\raptor.atlas">
+      <Link>Assets\raptor.atlas</Link>
+    </Content>
+    <Content Include="..\..\..\spine-xna\example\data\raptor.json">
+      <Link>Assets\raptor.json</Link>
+    </Content>
+  </ItemGroup>
   <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '11.0' ">
     <VisualStudioVersion>11.0</VisualStudioVersion>
   </PropertyGroup>

spine-monogame/windows8-store/src/SpineMonogameWindows8Store.csproj

@@ -174,6 +174,12 @@
     <Compile Include="..\..\..\spine-csharp\src\EventData.cs">
       <Link>spine-csharp\EventData.cs</Link>
     </Compile>
+    <Compile Include="..\..\..\spine-csharp\src\IkConstraint.cs">
+      <Link>spine-csharp\IkConstraint.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\spine-csharp\src\IkConstraintData.cs">
+      <Link>spine-csharp\IkConstraintData.cs</Link>
+    </Compile>
     <Compile Include="..\..\..\spine-csharp\src\Json.cs">
       <Link>spine-csharp\Json.cs</Link>
     </Compile>

spine-monogame/xamarinstudio-ios/src/spine-monogame-xamarinstudio-ios.csproj

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>10.0.0</ProductVersion>
+    <ProductVersion>8.0.30703</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{08DC311B-1F38-4CBD-B7B6-B734984A8CB3}</ProjectGuid>
     <ProjectTypeGuids>{6BC8ED88-2882-458C-8E55-DFD12B67127B};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
@@ -43,8 +43,9 @@
     <Folder Include="spine-csharp\Attachments\" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.MonoTouch.CSharp.targets" />
   <ItemGroup>
-    <ProjectReference Include="..\..\..\MonoGame\MonoGame.Framework\MonoGame.Framework.iOS.csproj">
+    <ProjectReference Include="..\..\..\..\MonoGame\MonoGame.Framework\MonoGame.Framework.iOS.csproj">
       <Project>{DB8508BB-9849-4CC2-BC0F-8EB5DACB3C47}</Project>
       <Name>MonoGame.Framework.iOS</Name>
     </ProjectReference>
@@ -140,5 +141,11 @@
     <Compile Include="..\..\..\spine-csharp\src\Attachments\SkinnedMeshAttachment.cs">
       <Link>spine-csharp\Attachments\SkinnedMeshAttachment.cs</Link>
     </Compile>
+    <Compile Include="..\..\..\spine-csharp\src\IkConstraint.cs">
+      <Link>spine-csharp\IkConstraint.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\spine-csharp\src\IkConstraintData.cs">
+      <Link>spine-csharp\IkConstraintData.cs</Link>
+    </Compile>
   </ItemGroup>
 </Project>

spine-xna/example/src/ExampleGame.cs

@@ -34,7 +34,6 @@ using System.Collections.Generic;
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Audio;
 using Microsoft.Xna.Framework.Content;
-using Microsoft.Xna.Framework.GamerServices;
 using Microsoft.Xna.Framework.Graphics;
 using Microsoft.Xna.Framework.Input;
 using Microsoft.Xna.Framework.Media;
@@ -124,9 +123,10 @@ namespace Spine {
 
 		protected override void Update (GameTime gameTime) {
 			// Allows the game to exit
+#if !WINDOWS_STOREAPP	
 			if (GamePad.GetState(PlayerIndex.One).Buttons.Back == ButtonState.Pressed)
 				this.Exit();
-
+#endif
 			// TODO: Add your update logic here
 
 			base.Update(gameTime);