Merge remote-tracking branch 'origin/master'

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

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

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();
}