diff --git a/.gitignore b/.gitignore
index 8eb72c03e..88ea53d75 100644
--- a/.gitignore
+++ b/.gitignore
@@ -42,9 +42,11 @@ spine-csharp/src/*.cs.meta
spine-monogame/xamarinstudio-ios/src/bin
spine-monogame/xamarinstudio-ios/src/obj
+spine-monogame/xamarinstudio-ios/src/packages
spine-monogame/xamarinstudio-ios/example/bin
spine-monogame/xamarinstudio-ios/example/obj
+spine-monogame/xamarinstudio-ios/example/packages
spine-monogame/windows8-store/src/bin
spine-monogame/windows8-store/src/obj
diff --git a/spine-monogame/xamarinstudio-ios/example/AppDelegate.cs b/spine-monogame/xamarinstudio-ios/example/AppDelegate.cs
index 21c5dd4f6..69b0874da 100644
--- a/spine-monogame/xamarinstudio-ios/example/AppDelegate.cs
+++ b/spine-monogame/xamarinstudio-ios/example/AppDelegate.cs
@@ -1,11 +1,11 @@
-using System;
+using System;
using System.Collections.Generic;
using System.Linq;
using Spine;
-using MonoTouch.Foundation;
-using MonoTouch.UIKit;
+using Foundation;
+using UIKit;
namespace spinemonogameexample
{
diff --git a/spine-monogame/xamarinstudio-ios/example/Main.cs b/spine-monogame/xamarinstudio-ios/example/Main.cs
index 4c9782a3a..41d4f407c 100644
--- a/spine-monogame/xamarinstudio-ios/example/Main.cs
+++ b/spine-monogame/xamarinstudio-ios/example/Main.cs
@@ -1,9 +1,9 @@
-using System;
+using System;
using System.Collections.Generic;
using System.Linq;
-using MonoTouch.Foundation;
-using MonoTouch.UIKit;
+using Foundation;
+using UIKit;
namespace spinemonogameexample
{
diff --git a/spine-monogame/xamarinstudio-ios/example/packages.config b/spine-monogame/xamarinstudio-ios/example/packages.config
new file mode 100644
index 000000000..fcc0c927a
--- /dev/null
+++ b/spine-monogame/xamarinstudio-ios/example/packages.config
@@ -0,0 +1,4 @@
+
+
+
+
\ No newline at end of file
diff --git a/spine-monogame/xamarinstudio-ios/example/spine-monogame-example.csproj b/spine-monogame/xamarinstudio-ios/example/spine-monogame-example.csproj
index cb6a04c2e..881b20537 100644
--- a/spine-monogame/xamarinstudio-ios/example/spine-monogame-example.csproj
+++ b/spine-monogame/xamarinstudio-ios/example/spine-monogame-example.csproj
@@ -3,12 +3,14 @@
Debug
iPhoneSimulator
- {6BC8ED88-2882-458C-8E55-DFD12B67127B};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
+ {FEACFBD2-3405-455C-9665-78FE426C6842};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
{1B40F8C5-B8CA-4F5C-8B48-61D1E8981CA9}
Exe
spinemonogameexample
Resources
spinemonogameexample
+ Xamarin.iOS
+ v1.0
true
@@ -45,6 +47,7 @@
Entitlements.plist
true
iPhone Developer
+ ARMv7
full
@@ -55,6 +58,7 @@
Entitlements.plist
false
iPhone Developer
+ ARMv7, ARM64
full
@@ -67,6 +71,7 @@
true
Automatic:AdHoc
iPhone Distribution
+ ARMv7, ARM64
full
@@ -78,12 +83,16 @@
Entitlements.plist
false
Automatic:AppStore
+ ARMv7, ARM64
-
+
+
+ packages\MonoGame.Framework.iOS.3.5.0.1678\lib\XamariniOS\MonoGame.Framework.dll
+
@@ -92,6 +101,7 @@
+
@@ -100,12 +110,7 @@
ExampleGame.cs
-
-
- {DB8508BB-9849-4CC2-BC0F-8EB5DACB3C47}
- MonoGame.Framework.iOS
-
{08DC311B-1F38-4CBD-B7B6-B734984A8CB3}
spine-monogame-xamarinstudio-ios
@@ -139,5 +144,9 @@
data\goblins-mesh.atlas
+
+ data\raptor.skel
+
+
\ No newline at end of file
diff --git a/spine-monogame/xamarinstudio-ios/example/spine-monogame-example.sln b/spine-monogame/xamarinstudio-ios/example/spine-monogame-example.sln
index 6c69c3843..be410a895 100644
--- a/spine-monogame/xamarinstudio-ios/example/spine-monogame-example.sln
+++ b/spine-monogame/xamarinstudio-ios/example/spine-monogame-example.sln
@@ -3,10 +3,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2012
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "spine-monogame-example", "spine-monogame-example.csproj", "{1B40F8C5-B8CA-4F5C-8B48-61D1E8981CA9}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lidgren.Network.iOS", "..\..\..\..\MonoGame\ThirdParty\Lidgren.Network\Lidgren.Network.iOS.csproj", "{734EAA48-F1CA-481A-B391-0285BC0E8B40}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoGame.Framework.iOS", "..\..\..\..\MonoGame\MonoGame.Framework\MonoGame.Framework.iOS.csproj", "{DB8508BB-9849-4CC2-BC0F-8EB5DACB3C47}"
-EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "spine-monogame-xamarinstudio-ios", "..\src\spine-monogame-xamarinstudio-ios.csproj", "{08DC311B-1F38-4CBD-B7B6-B734984A8CB3}"
EndProject
Global
@@ -43,30 +39,6 @@ Global
{1B40F8C5-B8CA-4F5C-8B48-61D1E8981CA9}.Release|iPhone.Build.0 = Release|iPhone
{1B40F8C5-B8CA-4F5C-8B48-61D1E8981CA9}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator
{1B40F8C5-B8CA-4F5C-8B48-61D1E8981CA9}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
- {734EAA48-F1CA-481A-B391-0285BC0E8B40}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
- {734EAA48-F1CA-481A-B391-0285BC0E8B40}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
- {734EAA48-F1CA-481A-B391-0285BC0E8B40}.AppStore|iPhone.ActiveCfg = Release|Any CPU
- {734EAA48-F1CA-481A-B391-0285BC0E8B40}.AppStore|iPhone.Build.0 = Release|Any CPU
- {734EAA48-F1CA-481A-B391-0285BC0E8B40}.Debug|iPhone.ActiveCfg = Debug|Any CPU
- {734EAA48-F1CA-481A-B391-0285BC0E8B40}.Debug|iPhone.Build.0 = Debug|Any CPU
- {734EAA48-F1CA-481A-B391-0285BC0E8B40}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
- {734EAA48-F1CA-481A-B391-0285BC0E8B40}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
- {734EAA48-F1CA-481A-B391-0285BC0E8B40}.Release|iPhone.ActiveCfg = Release|Any CPU
- {734EAA48-F1CA-481A-B391-0285BC0E8B40}.Release|iPhone.Build.0 = Release|Any CPU
- {734EAA48-F1CA-481A-B391-0285BC0E8B40}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
- {734EAA48-F1CA-481A-B391-0285BC0E8B40}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
- {DB8508BB-9849-4CC2-BC0F-8EB5DACB3C47}.Ad-Hoc|iPhone.ActiveCfg = Release|iPhone
- {DB8508BB-9849-4CC2-BC0F-8EB5DACB3C47}.Ad-Hoc|iPhone.Build.0 = Release|iPhone
- {DB8508BB-9849-4CC2-BC0F-8EB5DACB3C47}.AppStore|iPhone.ActiveCfg = Release|iPhone
- {DB8508BB-9849-4CC2-BC0F-8EB5DACB3C47}.AppStore|iPhone.Build.0 = Release|iPhone
- {DB8508BB-9849-4CC2-BC0F-8EB5DACB3C47}.Debug|iPhone.ActiveCfg = Debug|iPhone
- {DB8508BB-9849-4CC2-BC0F-8EB5DACB3C47}.Debug|iPhone.Build.0 = Debug|iPhone
- {DB8508BB-9849-4CC2-BC0F-8EB5DACB3C47}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator
- {DB8508BB-9849-4CC2-BC0F-8EB5DACB3C47}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator
- {DB8508BB-9849-4CC2-BC0F-8EB5DACB3C47}.Release|iPhone.ActiveCfg = Release|iPhone
- {DB8508BB-9849-4CC2-BC0F-8EB5DACB3C47}.Release|iPhone.Build.0 = Release|iPhone
- {DB8508BB-9849-4CC2-BC0F-8EB5DACB3C47}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator
- {DB8508BB-9849-4CC2-BC0F-8EB5DACB3C47}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
EndGlobalSection
GlobalSection(MonoDevelopProperties) = preSolution
StartupItem = spine-monogame-example.csproj
diff --git a/spine-monogame/xamarinstudio-ios/src/packages.config b/spine-monogame/xamarinstudio-ios/src/packages.config
new file mode 100644
index 000000000..fcc0c927a
--- /dev/null
+++ b/spine-monogame/xamarinstudio-ios/src/packages.config
@@ -0,0 +1,4 @@
+
+
+
+
\ No newline at end of file
diff --git a/spine-monogame/xamarinstudio-ios/src/spine-monogame-xamarinstudio-ios.csproj b/spine-monogame/xamarinstudio-ios/src/spine-monogame-xamarinstudio-ios.csproj
index 69dd3597c..be57d09a3 100644
--- a/spine-monogame/xamarinstudio-ios/src/spine-monogame-xamarinstudio-ios.csproj
+++ b/spine-monogame/xamarinstudio-ios/src/spine-monogame-xamarinstudio-ios.csproj
@@ -4,11 +4,13 @@
Debug
AnyCPU
{08DC311B-1F38-4CBD-B7B6-B734984A8CB3}
- {6BC8ED88-2882-458C-8E55-DFD12B67127B};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
+ {FEACFBD2-3405-455C-9665-78FE426C6842};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
Library
spinecsharpxamarinios
Resources
spine-monogame-xamarinstudio-ios
+ Xamarin.iOS
+ v1.0
true
@@ -33,21 +35,16 @@
-
+
+
+ ..\example\packages\MonoGame.Framework.iOS.3.5.0.1678\lib\XamariniOS\MonoGame.Framework.dll
+
-
-
-
-
- {DB8508BB-9849-4CC2-BC0F-8EB5DACB3C47}
- MonoGame.Framework.iOS
-
-
spine-csharp\Attachments\AtlasAttachmentLoader.cs
@@ -139,14 +136,36 @@
spine-csharp\Attachments\MeshAttachment.cs
-
- spine-csharp\Attachments\SkinnedMeshAttachment.cs
-
spine-csharp\IkConstraint.cs
spine-csharp\IkConstraintData.cs
+
+ spine-csharp\BlendMode.cs
+
+
+ spine-csharp\SkeletonBinary.cs
+
+
+ spine-csharp\Attachments\WeightedMeshAttachment.cs
+
+
+ spine-csharp\IUpdatable.cs
+
+
+ spine-csharp\MathUtils.cs
+
+
+ spine-csharp\TransformConstraint.cs
+
+
+ spine-csharp\TransformConstraintData.cs
+
+
+
+
+
diff --git a/spine-monogame/xamarinstudio-ios/src/spine-monogame-xamarinstudio-ios.sln b/spine-monogame/xamarinstudio-ios/src/spine-monogame-xamarinstudio-ios.sln
new file mode 100644
index 000000000..9d6063bdf
--- /dev/null
+++ b/spine-monogame/xamarinstudio-ios/src/spine-monogame-xamarinstudio-ios.sln
@@ -0,0 +1,17 @@
+
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "spine-monogame-xamarinstudio-ios", "spine-monogame-xamarinstudio-ios.csproj", "{08DC311B-1F38-4CBD-B7B6-B734984A8CB3}"
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Any CPU = Debug|Any CPU
+ Release|Any CPU = Release|Any CPU
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {08DC311B-1F38-4CBD-B7B6-B734984A8CB3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {08DC311B-1F38-4CBD-B7B6-B734984A8CB3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {08DC311B-1F38-4CBD-B7B6-B734984A8CB3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {08DC311B-1F38-4CBD-B7B6-B734984A8CB3}.Release|Any CPU.Build.0 = Release|Any CPU
+ EndGlobalSection
+EndGlobal
diff --git a/spine-xna/example/src/ExampleGame.cs b/spine-xna/example/src/ExampleGame.cs
index 419badd54..bf1200c37 100644
--- a/spine-xna/example/src/ExampleGame.cs
+++ b/spine-xna/example/src/ExampleGame.cs
@@ -125,7 +125,7 @@ namespace Spine {
}
skeleton.X = 400;
- skeleton.Y = 590;
+ skeleton.Y = 690;
skeleton.UpdateWorldTransform();
headSlot = skeleton.FindSlot("head");
@@ -136,11 +136,6 @@ 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);