370 Commits

Author SHA1 Message Date
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
Yonsh
f44e8aad50 Change to pharan's recommendation 2013-06-15 16:53:35 +08:00
Yonsh Lin
804a567582 Merge branch 'patch-2' into patch-1 2013-06-15 12:42:59 +08:00
Yonsh
4603b7eed3 Fix: Unable to select in editor when flipped
http://www.esotericsoftware.com/forum/viewtopic.php?f=3&t=823
2013-06-15 13:21:45 +09:00
Yonsh
c2a79c43ed Fix: Unable to select in editor when flipped
http://www.esotericsoftware.com/forum/viewtopic.php?f=3&t=823
2013-06-15 13:17:12 +09:00
NathanSweet
baa70fa810 Merge remote-tracking branch 'origin/master' 2013-06-13 20:09:30 +02:00
NathanSweet
dcbd87d90a Added defaultMix to AnimationStateData. 2013-06-13 20:00:25 +02:00
Nathan Sweet
c5cce875f6 Merge pull request #64 from moitias/AnimationPerformanceFixes
Animation performance fixes
2013-06-13 06:30:28 -07:00
Matias
96ff408022 more reformatting 2013-06-13 16:13:53 +03:00
Matias
97097943a8 more reformatting and ignoring of old non-fixed stuff.. 2013-06-13 16:12:59 +03:00
Matias
1ea5aa54f0 fix some screwups and formatting, restore find-functions 2013-06-13 16:10:43 +03:00
Matias
3a0ba4a70a if there is no attachment, remove it also.. 2013-06-13 15:39:15 +03:00
Matias
e334e0123c remove useless condition 2013-06-13 14:52:52 +03:00
Matias
2fb6081a17 fix tabs 2013-06-13 14:50:31 +03:00
Matias
64cb985e93 fix tabs 2013-06-13 14:40:40 +03:00
Matias
776cc3958d only update attachments if they change 2013-06-13 14:40:35 +03:00
Matias
d270c5e8da change name of nameIndices to slotNameIndices to reflect the contents better 2013-06-13 14:40:30 +03:00
Matias
c5016f0da0 remove findslotindex from skeletondata and make it into a table, for faster lookups 2013-06-13 14:40:23 +03:00
Matias
d69f514681 remove findslot from skeleton and make it into a table, for faster lookups 2013-06-13 14:40:15 +03:00
NathanSweet
306f394100 Merge remote-tracking branch 'origin/master' 2013-06-13 11:19:57 +02:00
NathanSweet
692f24c6b9 Changed to Color32. Reduced zeroing mesh verts. 2013-06-13 11:15:19 +02:00
Nathan Sweet
dc33e82c35 Merge pull request #63 from BigRedPK/master
XNA RenderTarget2D Fix
2013-06-12 09:01:27 -07:00
BigRedPK
877fc97d21 Update Util.cs
Remove unneeded casts.
2013-06-12 10:46:37 -05:00
BigRedPK
2837adaf9d Update Util.cs
RenderTarget2D is volatile. This means when there is any change to screen resolution, the content will be lost. This is common when changing to full-screen, alt+tab, screensavers, and locking/unlocking the computer. We can counteract this by directly setting the content of Texture2D.
2013-06-12 10:46:05 -05:00
NathanSweet
00803c42a5 Fixed CCSkeletonAnimation.
Oops!
2013-06-12 13:45:09 +02:00
NathanSweet
661c39cca5 Fixed getFrameCount for attachment timelines, issue #62 2013-06-12 02:31:00 +02:00
NathanSweet
bb403132c0 Updated goblins atlas to have rotation. 2013-06-12 01:33:41 +02:00
NathanSweet
7a08bad7c7 Minor updates. 2013-06-11 19:45:05 +02:00
NathanSweet
48cfd1d874 Added mesh.MarkDynamic(). 2013-06-11 18:42:22 +02:00
NathanSweet
d0732921c9 Added getAnimationState. 2013-06-11 18:23:40 +02:00
NathanSweet
fa0267e9e2 Fixed attachAll. 2013-06-11 18:18:42 +02:00
NathanSweet
4a03850829 Some small optimizations. 2013-06-10 17:02:49 +02:00
NathanSweet
c03860383c Fixed AS3 colors. 2013-06-05 12:52:35 +02:00
NathanSweet
af67a799d9 Fixed issue #58 2013-06-04 17:02:59 +02:00
NathanSweet
e69ca50817 Merge remote-tracking branch 'origin/master' 2013-06-03 21:18:55 +02:00
NathanSweet
b096766fe5 Compute scale using sprite collection's target ortho size. Removed scale from skeletondata asset. 2013-06-03 21:18:12 +02:00
Nathan Sweet
5f903865f7 Merge pull request #57 from moitias/luaanimationfixes
Fix a few Lua animation problems
2013-06-03 03:49:25 -07:00
Matias
a92419193f fix typo(?) in colortimelines using color.r instead of slot.r when using alpha 2013-06-03 10:49:29 +03:00
Matias
9963293c88 make sure animation duration is not 0 when figuring out the time 2013-06-03 10:48:44 +03:00
NathanSweet
4ea202a1e6 Fixed cocos2d-x example leaking skeleton animation node. 2013-06-02 15:29:19 +02:00
NathanSweet
adb406a8ac Fixed leaking CCTextureAtlas. 2013-06-02 15:27:56 +02:00
NathanSweet
cf7cc1d0ef Minor updates. 2013-06-02 15:27:33 +02:00
NathanSweet
d11f6b6864 Fixed libgdx examples for recent skeleton x/y and flip changes. 2013-06-02 13:57:39 +02:00
NathanSweet
2e8f66631e Merge remote-tracking branch 'origin/master' 2013-05-31 10:40:50 +02:00
NathanSweet
7444797839 Fixed setSkin. 2013-05-31 10:40:26 +02:00
Nathan Sweet
c0ad20caa6 Merge pull request #55 from paxtonhare/master
Wong timeline being passed to array in spine code
2013-05-30 04:07:19 -07:00
Paxton Hare
bb30f8130e fixing wrong timeline being pushed to array 2013-05-30 05:00:13 -04:00