905 Commits

Author SHA1 Message Date
jpoag
ff07eb02d8 * Allow memory tracking inside spine 2014-05-08 10:49:46 -04:00
Nathan Sweet
39a5229a7f Merge pull request #216 from smaren/master
Fixed instances of AttachmentType.boundingbox to be lowercase everywhere
2014-05-08 12:40:08 +02:00
smaren
2a8327d6b1 Merge remote-tracking branch 'upstream/master' 2014-05-08 12:27:48 +02:00
NathanSweet
f597ad5d6a timeScale can't be negative. 2014-05-08 12:13:51 +02:00
smaren
4865f288f3 attachment type bounding box should be lower case
Fixed all occurences of spine.AttachmentType.boundingBox to be
lowercase.
2014-05-08 12:13:25 +02:00
NathanSweet
9c403565e0 Fixed timeScale bug. Added timeScale to inspector. 2014-05-08 12:11:26 +02:00
smaren
564025d955 Revert "fixed boundingbox typo"
This reverts commit 2715e2409fd2db16ffa1e05e57cf0fdb48c1c0a7.
2014-05-08 12:10:01 +02:00
NathanSweet
cc89e1a3a6 Fixed Skeleton#setAttachment.
closes #215
2014-05-08 12:02:34 +02:00
smaren
2715e2409f fixed boundingbox typo
BoundingBox was boundingbox and boundingBox different places, now it is
boundingBox everywhere
2014-05-08 11:20:11 +02:00
smaren
9e2c588734 fixed skeletons setAttachment using getAttachment
getAttachment does not exist, now uses getAttachmentBySlotIndex
2014-05-08 11:19:05 +02:00
NathanSweet
0a275f0ac7 Added includes to spine.h.
closes #214
2014-05-07 15:03:10 +02:00
NathanSweet
0295b0c169 Read new atlas format that has width and height for each page. 2014-05-06 19:15:48 +02:00
NathanSweet
3729bc1c88 Read new atlas format that has width and height for each page. 2014-05-06 18:48:52 +02:00
NathanSweet
21eade668b Fixed intersectsSegment that takes a polygon.
closes #213
2014-05-06 14:09:32 +02:00
NathanSweet
f6cbff942f ANSI C is fun! 2014-05-05 21:31:59 +02:00
NathanSweet
4346db1f31 Fixed atlas rendererObject not being set. 2014-05-05 21:23:52 +02:00
NathanSweet
bdc78db207 Removed updateOffset from setRegion.
People can call updateOffset if they change the region or other RegionAttachment properties.
2014-05-05 19:20:14 +02:00
NathanSweet
d1b87c04a8 setToSetupPose and setSlotsToSetupPose should revert the draw order. 2014-05-05 15:14:27 +02:00
NathanSweet
83be769cc5 Read new atlas format that has width and height for each page. 2014-05-05 15:07:53 +02:00
NathanSweet
d4e9923385 Open .atlas.txt files. 2014-05-05 15:07:40 +02:00
NathanSweet
79c11424f4 Pre-increment for consistency. 2014-05-05 15:07:28 +02:00
NathanSweet
22c58fd8dc Fixed reading FFD. 2014-05-05 15:06:34 +02:00
NathanSweet
cc472d134f Renamed spAtlas constructor methods to match others. Added void* to spAtlas constructors.
Inside _spAtlasPage_createTexture you can use `self->atlas->rendererObject` to get the void* specified at atlas creation.
2014-05-02 17:55:54 +02:00
NathanSweet
3910298c91 SFML requires images without premultiplied alpha. 2014-05-02 10:21:40 +02:00
NathanSweet
b7a788bc1e Fixed memory errors. 2014-05-02 10:21:16 +02:00
NathanSweet
99a8de4bb4 FFD for spine-c and spine-sfml. 2014-04-29 20:28:27 +02:00
NathanSweet
6432e43ea2 Clean up. 2014-04-29 20:27:31 +02:00
NathanSweet
17c03bf44a Skinning for spine-sfml. 2014-04-29 00:48:23 +02:00
NathanSweet
23d4d0558c Fixed bug loading skinned meshes. 2014-04-29 00:48:12 +02:00
NathanSweet
82ea243dbb Meshes for spine-sfml.
No FFD or skinning yet.
2014-04-29 00:32:19 +02:00
NathanSweet
e782b6effa Cleaning up. 2014-04-29 00:31:24 +02:00
NathanSweet
03c957f55e Fixed additive blending for meshes. 2014-04-28 23:08:57 +02:00
NathanSweet
3ff8661670 Updated example. 2014-04-28 17:57:52 +02:00
NathanSweet
b1f851a246 Meshes, FFD and skinning for spine-c.
Untested since rendering hasn't yet been done for a runtime that extends spine-c.
2014-04-28 17:52:01 +02:00
NathanSweet
5623631026 Clean up. 2014-04-28 17:51:17 +02:00
NathanSweet
04c0fec844 Fixed NPE. 2014-04-28 17:51:07 +02:00
NathanSweet
c1c12677ba API improvements.
Before I get too many damned runtimes done. ;)
2014-04-28 16:49:20 +02:00
NathanSweet
efff26ebc9 Open .txt as JSON. 2014-04-28 16:08:28 +02:00
NathanSweet
df971f7c70 Fixed skinned meshes with FFD. 2014-04-28 16:08:17 +02:00
NathanSweet
03291be259 Updated examples. 2014-04-28 13:30:56 +02:00
NathanSweet
a76c396528 Separated updateRegions() from setMesh() to facilitate lazy loading atlas regions.
Moved setting path into SkeletonJson.
2014-04-28 13:29:06 +02:00
NathanSweet
fc60d4d6de Added back mesh.RecalculateBounds().
Because who really knows what is going on, anyway.
http://esotericsoftware.com/forum/viewtopic.php?p=12481#p12481
2014-04-27 23:58:10 +02:00
NathanSweet
a180398975 Added SP_ prefix to enums.
Super fun. Don't forget you can use SPINE_SHORT_NAMES.
2014-04-27 23:23:13 +02:00
NathanSweet
b44bca68d9 Fixing things up. 2014-04-27 22:18:31 +02:00
NathanSweet
ca9274539e setSkin should attach setup pose attachments if there was no old skin. 2014-04-27 22:02:51 +02:00
NathanSweet
cf9a3a4109 Per attachment color. 2014-04-27 22:02:44 +02:00
NathanSweet
55c98fc7f1 Fix AnimationState to use previous.timeScale when mixing. 2014-04-27 22:02:17 +02:00
NathanSweet
afe0817811 Fix color timeline mixing when animation is after the last frame. 2014-04-27 22:02:08 +02:00
NathanSweet
1306384a8c Immutable triangles optimization, better inspectors. 2014-04-27 13:21:17 +02:00
NathanSweet
10fb67a79c Fixed skeletons being flipped when using the same atlas. 2014-04-27 11:10:22 +02:00