UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2026-02-06 07:14:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
NathanSweet 2013-06-24 16:32:18 +02:00
commit 0a4eadaaa5
4 changed files with 50 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.gitignore vendored
View File

@ -27,11 +27,11 @@ forums
spine-csharp/bin
spine-csharp/obj
spine-monogame-xamarinstudio-ios/src/bin
spine-monogame-xamarinstudio-ios/src/obj
spine-monogame/xamarinstudio-ios/src/bin
spine-monogame/xamarinstudio-ios/src/obj
spine-monogame-windows8-store/src/bin
spine-monogame-windows8-store/src/obj
spine-monogame/windows8-store/src/bin
spine-monogame/windows8-store/src/obj
spine-xna/bin
spine-xna/obj

44
spine-monogame/windows8-store/src/SpineMonogameWindows8Store.csproj
View File

@ -126,70 +126,70 @@
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="..\..\..\spine -csharp\src\Animation.cs">
<Compile Include="..\..\..\spine-csharp\src\Animation.cs">
<Link>spine-csharp\Animation.cs</Link>
</Compile>
<Compile Include="..\..\..\spine -csharp\src\AnimationState.cs">
<Compile Include="..\..\..\spine-csharp\src\AnimationState.cs">
<Link>spine-csharp\AnimationState.cs</Link>
</Compile>
<Compile Include="..\..\..\spine -csharp\src\AnimationStateData.cs">
<Compile Include="..\..\..\spine-csharp\src\AnimationStateData.cs">
<Link>spine-csharp\AnimationStateData.cs</Link>
</Compile>
<Compile Include="..\..\..\spine -csharp\src\Atlas.cs">
<Compile Include="..\..\..\spine-csharp\src\Atlas.cs">
<Link>spine-csharp\Atlas.cs</Link>
</Compile>
<Compile Include="..\..\..\spine -csharp\src\Attachments\AtlasAttachmentLoader.cs">
<Compile Include="..\..\..\spine-csharp\src\Attachments\AtlasAttachmentLoader.cs">
<Link>spine-csharp\Attachments\AtlasAttachmentLoader.cs</Link>
</Compile>
<Compile Include="..\..\..\spine -csharp\src\Attachments\Attachment.cs">
<Compile Include="..\..\..\spine-csharp\src\Attachments\Attachment.cs">
<Link>spine-csharp\Attachments\Attachment.cs</Link>
</Compile>
<Compile Include="..\..\..\spine -csharp\src\Attachments\AttachmentLoader.cs">
<Compile Include="..\..\..\spine-csharp\src\Attachments\AttachmentLoader.cs">
<Link>spine-csharp\Attachments\AttachmentLoader.cs</Link>
</Compile>
<Compile Include="..\..\..\spine -csharp\src\Attachments\AttachmentType.cs">
<Compile Include="..\..\..\spine-csharp\src\Attachments\AttachmentType.cs">
<Link>spine-csharp\Attachments\AttachmentType.cs</Link>
</Compile>
<Compile Include="..\..\..\spine -csharp\src\Attachments\RegionAttachment.cs">
<Compile Include="..\..\..\spine-csharp\src\Attachments\RegionAttachment.cs">
<Link>spine-csharp\Attachments\RegionAttachment.cs</Link>
</Compile>
<Compile Include="..\..\..\spine -csharp\src\Bone.cs">
<Compile Include="..\..\..\spine-csharp\src\Bone.cs">
<Link>spine-csharp\Bone.cs</Link>
</Compile>
<Compile Include="..\..\..\spine -csharp\src\BoneData.cs">
<Compile Include="..\..\..\spine-csharp\src\BoneData.cs">
<Link>spine-csharp\BoneData.cs</Link>
</Compile>
<Compile Include="..\..\..\spine -csharp\src\Json.cs">
<Compile Include="..\..\..\spine-csharp\src\Json.cs">
<Link>spine-csharp\Json.cs</Link>
</Compile>
<Compile Include="..\..\..\spine -csharp\src\Skeleton.cs">
<Compile Include="..\..\..\spine-csharp\src\Skeleton.cs">
<Link>spine-csharp\Skeleton.cs</Link>
</Compile>
<Compile Include="..\..\..\spine -csharp\src\SkeletonData.cs">
<Compile Include="..\..\..\spine-csharp\src\SkeletonData.cs">
<Link>spine-csharp\SkeletonData.cs</Link>
</Compile>
<Compile Include="..\..\..\spine -csharp\src\SkeletonJson.cs">
<Compile Include="..\..\..\spine-csharp\src\SkeletonJson.cs">
<Link>spine-csharp\SkeletonJson.cs</Link>
</Compile>
<Compile Include="..\..\..\spine -csharp\src\Skin.cs">
<Compile Include="..\..\..\spine-csharp\src\Skin.cs">
<Link>spine-csharp\Skin.cs</Link>
</Compile>
<Compile Include="..\..\..\spine -csharp\src\Slot.cs">
<Compile Include="..\..\..\spine-csharp\src\Slot.cs">
<Link>spine-csharp\Slot.cs</Link>
</Compile>
<Compile Include="..\..\..\spine -csharp\src\SlotData.cs">
<Compile Include="..\..\..\spine-csharp\src\SlotData.cs">
<Link>spine-csharp\SlotData.cs</Link>
</Compile>
<Compile Include="..\..\..\spine -xna\src\SkeletonRenderer.cs">
<Compile Include="..\..\..\spine-xna\src\SkeletonRenderer.cs">
<Link>spine-xna\SkeletonRenderer.cs</Link>
</Compile>
<Compile Include="..\..\..\spine -xna\src\SpriteBatcher.cs">
<Compile Include="..\..\..\spine-xna\src\SpriteBatcher.cs">
<Link>spine-xna\SpriteBatcher.cs</Link>
</Compile>
<Compile Include="..\..\..\spine -xna\src\Util.cs">
<Compile Include="..\..\..\spine-xna\src\Util.cs">
<Link>spine-xna\Util.cs</Link>
</Compile>
<Compile Include="..\..\..\spine -xna\src\XnaTextureLoader.cs">
<Compile Include="..\..\..\spine-xna\src\XnaTextureLoader.cs">
<Link>spine-xna\XnaTextureLoader.cs</Link>
</Compile>
<Compile Include="Properties\AssemblyInfo.cs" />

44
spine-monogame/xamarinstudio-ios/src/spine-monogame-xamarinstudio-ios.csproj
View File

@ -49,70 +49,70 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Compile Include="..\..\..\spine -csharp\src\Attachments\AtlasAttachmentLoader.cs">
<Compile Include="..\..\..\spine-csharp\src\Attachments\AtlasAttachmentLoader.cs">
<Link>spine-csharp\Attachments\AtlasAttachmentLoader.cs</Link>
</Compile>
<Compile Include="..\..\..\spine -csharp\src\Attachments\Attachment.cs">
<Compile Include="..\..\..\spine-csharp\src\Attachments\Attachment.cs">
<Link>spine-csharp\Attachments\Attachment.cs</Link>
</Compile>
<Compile Include="..\..\..\spine -csharp\src\Attachments\AttachmentLoader.cs">
<Compile Include="..\..\..\spine-csharp\src\Attachments\AttachmentLoader.cs">
<Link>spine-csharp\Attachments\AttachmentLoader.cs</Link>
</Compile>
<Compile Include="..\..\..\spine -csharp\src\Attachments\AttachmentType.cs">
<Compile Include="..\..\..\spine-csharp\src\Attachments\AttachmentType.cs">
<Link>spine-csharp\Attachments\AttachmentType.cs</Link>
</Compile>
<Compile Include="..\..\..\spine -csharp\src\Attachments\RegionAttachment.cs">
<Compile Include="..\..\..\spine-csharp\src\Attachments\RegionAttachment.cs">
<Link>spine-csharp\Attachments\RegionAttachment.cs</Link>
</Compile>
<Compile Include="..\..\..\spine -csharp\src\Animation.cs">
<Compile Include="..\..\..\spine-csharp\src\Animation.cs">
<Link>spine-csharp\Animation.cs</Link>
</Compile>
<Compile Include="..\..\..\spine -csharp\src\AnimationState.cs">
<Compile Include="..\..\..\spine-csharp\src\AnimationState.cs">
<Link>spine-csharp\AnimationState.cs</Link>
</Compile>
<Compile Include="..\..\..\spine -csharp\src\AnimationStateData.cs">
<Compile Include="..\..\..\spine-csharp\src\AnimationStateData.cs">
<Link>spine-csharp\AnimationStateData.cs</Link>
</Compile>
<Compile Include="..\..\..\spine -csharp\src\Atlas.cs">
<Compile Include="..\..\..\spine-csharp\src\Atlas.cs">
<Link>spine-csharp\Atlas.cs</Link>
</Compile>
<Compile Include="..\..\..\spine -csharp\src\Bone.cs">
<Compile Include="..\..\..\spine-csharp\src\Bone.cs">
<Link>spine-csharp\Bone.cs</Link>
</Compile>
<Compile Include="..\..\..\spine -csharp\src\BoneData.cs">
<Compile Include="..\..\..\spine-csharp\src\BoneData.cs">
<Link>spine-csharp\BoneData.cs</Link>
</Compile>
<Compile Include="..\..\..\spine -csharp\src\Json.cs">
<Compile Include="..\..\..\spine-csharp\src\Json.cs">
<Link>spine-csharp\Json.cs</Link>
</Compile>
<Compile Include="..\..\..\spine -csharp\src\Skeleton.cs">
<Compile Include="..\..\..\spine-csharp\src\Skeleton.cs">
<Link>spine-csharp\Skeleton.cs</Link>
</Compile>
<Compile Include="..\..\..\spine -csharp\src\SkeletonData.cs">
<Compile Include="..\..\..\spine-csharp\src\SkeletonData.cs">
<Link>spine-csharp\SkeletonData.cs</Link>
</Compile>
<Compile Include="..\..\..\spine -csharp\src\SkeletonJson.cs">
<Compile Include="..\..\..\spine-csharp\src\SkeletonJson.cs">
<Link>spine-csharp\SkeletonJson.cs</Link>
</Compile>
<Compile Include="..\..\..\spine -csharp\src\Skin.cs">
<Compile Include="..\..\..\spine-csharp\src\Skin.cs">
<Link>spine-csharp\Skin.cs</Link>
</Compile>
<Compile Include="..\..\..\spine -csharp\src\Slot.cs">
<Compile Include="..\..\..\spine-csharp\src\Slot.cs">
<Link>spine-csharp\Slot.cs</Link>
</Compile>
<Compile Include="..\..\..\spine -csharp\src\SlotData.cs">
<Compile Include="..\..\..\spine-csharp\src\SlotData.cs">
<Link>spine-csharp\SlotData.cs</Link>
</Compile>
<Compile Include="..\..\..\spine -xna\src\SkeletonRenderer.cs">
<Compile Include="..\..\..\spine-xna\src\SkeletonRenderer.cs">
<Link>spine-xna\SkeletonRenderer.cs</Link>
</Compile>
<Compile Include="..\..\..\spine -xna\src\SpriteBatcher.cs">
<Compile Include="..\..\..\spine-xna\src\SpriteBatcher.cs">
<Link>spine-xna\SpriteBatcher.cs</Link>
</Compile>
<Compile Include="..\..\..\spine -xna\src\Util.cs">
<Compile Include="..\..\..\spine-xna\src\Util.cs">
<Link>spine-xna\Util.cs</Link>
</Compile>
<Compile Include="..\..\..\spine -xna\src\XnaTextureLoader.cs">
<Compile Include="..\..\..\spine-xna\src\XnaTextureLoader.cs">
<Link>spine-xna\XnaTextureLoader.cs</Link>
</Compile>
</ItemGroup>

4
spine-xna/example/src/ExampleGame.cs
View File

@ -78,8 +78,8 @@ namespace Spine {
state.AddAnimation("jump", false);
state.AddAnimation("walk", true);
skeleton.RootBone.X = 320;
skeleton.RootBone.Y = 440;
skeleton.X = 320;
skeleton.Y = 440;
skeleton.UpdateWorldTransform();
}