9571 Commits

Author SHA1 Message Date
NathanSweet
7e66b9e22d spine-unity4-tk2d 2013-07-28 11:01:17 +02:00
NathanSweet
d6f3fd9deb Merge branch 'origin/master' 2013-07-28 01:32:57 +02:00
NathanSweet
1573d47bc6 Use createWithFile instead of releasing. 2013-07-27 13:51:39 +02:00
Nathan Sweet
c0466be20c Merge pull request #89 from ryanmcnz/patch-1
Fixed toColor function returning NaN
2013-07-25 02:59:48 -07:00
Ryan McKay
c4e1b11845 Fixed toColor function returning NaN
Tested the 'toColor' function with 'ffffff00'.
The returned result (in r,g,b,a) was 1,NaN,1,257.
The correct result should obviously be 1,1,1,0.
The hex substring was being done incorrectly.
2013-07-25 20:32:37 +12:00
NathanSweet
6de19dc914 Added AnimationState to spine-lua. 2013-07-24 03:56:18 +02:00
NathanSweet
e42cf6ad19 Changed project files to work with Flash Builder 4.6. 2013-07-24 03:07:11 +02:00
NathanSweet
044e2c2a4c Fixed flipX bug. 2013-07-24 03:06:34 +02:00
Nathan Sweet
5e6fd92f9c Merge pull request #83 from RandolphBurt/AddDefineConstantsToMonoGameReleaseBuild
Add DefineConstants to the MonoGame release build configurations
2013-07-23 14:30:27 -07:00
NathanSweet
4d2e9180f1 Fixed NPE when slot has no attachment. 2013-07-23 18:43:08 +02:00
NathanSweet
0c2fd492de Fixed #86. 2013-07-21 01:29:26 +02:00
NathanSweet
88ceca926e Fixed defaultMix initialization. 2013-07-21 01:27:22 +02:00
NathanSweet
876233c246 Fixed getWorldTransform. 2013-07-21 01:27:13 +02:00
randolphburt
2a10831811 Added platform specific DefineConstants for RELEASE configuration for MonoGame Windows8Store 2013-07-03 21:31:54 +01:00
Randolph Burt
a670b03c72 Added platform specific DefineConstants for RELEASE configuration for MonoGame IOS 2013-07-03 21:27:01 +01:00
NathanSweet
aa07641691 Links are hard.. 2013-06-29 01:21:21 +02:00
NathanSweet
dac8aff14c Added video link. 2013-06-29 01:20:45 +02:00
NathanSweet
95ceb64920 Merge remote-tracking branch 'origin/master' 2013-06-28 10:41:15 +02:00
NathanSweet
c060aec351 Added box2d example. 2013-06-28 10:41:10 +02:00
NathanSweet
2978da1eb2 Fixed issue #80. 2013-06-28 10:41:04 +02:00
NathanSweet
dab2ee8f76 Fixed Bone getWorldTransform. 2013-06-28 10:40:51 +02:00
Nathan Sweet
9f54f48c0a Merge pull request #79 from Yonsh/patch-2
Prevent mesh from temporary disappearing in Unity Editor
2013-06-26 03:10:12 -07:00
Yonsh
0b2a6bd2a5 Prevent mesh from temporary disappearing in Unity Editor 2013-06-26 14:49:02 +09:00
Nathan Sweet
c6645706f9 Merge pull request #78 from aviktorov/master
Spine-tk2d runtime bugfix with shared materials
2013-06-25 03:17:47 -07:00
Andrey Viktorov
d6d0a4b600 Not relying only on first material anymore 2013-06-25 17:15:24 +07:00
NathanSweet
0a4eadaaa5 Merge remote-tracking branch 'origin/master' 2013-06-24 16:32:18 +02:00
NathanSweet
41cbe3bf3d Fixed Skeleton_setAttachment("slotname", 0). 2013-06-24 16:24:50 +02:00
Nathan Sweet
6c2fc9217d Merge pull request #76 from AKnopf/patch-1
Update Example: Positioning of Skeleton
2013-06-21 00:03:04 -07:00
AKnopf
0e17a170b6 Update Example: Positioning of Skeleton
Its better to set X and Y of the skeleton then setting X and Y of the root bone.
2013-06-20 19:09:04 +02:00
Nathan Sweet
ab5b88f73f Merge pull request #73 from RandolphBurt/FixMonogame
Fix monogame
2013-06-19 14:45:21 -07:00
Nathan Sweet
47748e4a6d Merge pull request #74 from RandolphBurt/FixMonoGameWin
Fixed typos in windows Monogame project
2013-06-19 14:45:04 -07:00
randolphburt
e47ff5f4cd Fixed typos in windows Monogame project 2013-06-19 21:49:05 +01:00
Randolph Burt
f4570538b3 Fixed typo's in iOS project file 2013-06-19 21:37:00 +01:00
Randolph Burt
e7177ed56b Updated .gitignore to reflect new MonoGame file structure 2013-06-19 21:36:45 +01:00
NathanSweet
7bfbf42494 Moved monogame folders. 2013-06-19 22:20:37 +02:00
NathanSweet
858aef4c91 Moved monogame folders. 2013-06-19 22:19:54 +02:00
Nathan Sweet
eee31c625c Merge pull request #72 from RandolphBurt/MonoGameXamarinIOS
Project added for building MonoGame apps in Xamarin Studio for iOS
2013-06-19 13:17:05 -07:00
Randolph Burt
0d7abe62d2 Project added for building MonoGame apps in Xamarin Studio for iOS 2013-06-19 21:15:24 +01:00
Nathan Sweet
cb21df8f8d Merge pull request #71 from RandolphBurt/WindowsStore
Project added for building MonoGame apps for the Windows8 Store
2013-06-19 12:41:59 -07:00
randolphburt
43115d2e29 Project added for building MonoGame apps for the Windows8 Store 2013-06-19 20:13:01 +01:00
Nathan Sweet
9986f5c445 Merge pull request #70 from RandolphBurt/MonoGameWin8
Ensured MonoGame compatibility for Windows 8 Store Apps.
2013-06-18 16:17:04 -07:00
Randolph Burt
2760fc3ddd Ensured MonoGame compatibility for Windows 8 Store Apps.
The security is such that you cannot load from a stream in the 'normal .net way' - you must instead use specific Windows.Storage methods.
2013-06-18 23:37:30 +01:00
Nathan Sweet
e112b98717 Merge pull request #69 from RandolphBurt/MonoGameIOS
Ensured compatibility with MonoGame for iOS.
2013-06-18 15:04:49 -07:00
Randolph Burt
021714bf0d Ensured compatibility with MonoGame for iOS.
iOS MonoGame has no implementation for GetData/SetData, however we don't need to worry about the volatility of Textures with regards to screen resolution re-size as this is not an issue on iOS.
2013-06-18 22:55:35 +01:00
NathanSweet
d91caa8eba Better gizmo code. 2013-06-18 20:40:08 +02:00
NathanSweet
a0b29a2719 Merge remote-tracking branch 'origin/master'
Conflicts:
	spine-tk2d/Code/tk2dSpineSkeleton.cs
2013-06-18 20:32:58 +02:00
Nathan Sweet
cbf5013d16 Merge pull request #67 from BoldBigflank/master
Fixed bug when run on an ipad
2013-06-18 01:01:03 -07:00
Alex Swan
554c318675 Removed reference to non-existant 'ipad' and 'ipadhd' directory 2013-06-17 17:13:11 -06:00
Nathan Sweet
d03ec8463c Merge pull request #66 from Yonsh/patch-1
Fix: Unable to select in editor when flipped
2013-06-15 03:29:07 -07:00
Yonsh
8851f3919f Change to pharan's recommendation 2013-06-15 16:57:24 +08:00