9439 Commits

Author SHA1 Message Date
NathanSweet
b299a4663b Better spine-c example. 2013-03-30 18:26:39 +01:00
NathanSweet
1be279e4e8 Better spine-c example. 2013-03-30 18:25:46 +01:00
NathanSweet
6765ec4235 C runtime works! 2013-03-30 17:52:25 +01:00
NathanSweet
9a0085c36b So close, but alas must sleep :( 5am! 2013-03-30 04:53:47 +01:00
NathanSweet
596b515e66 Refactoring. 2013-03-30 04:14:51 +01:00
NathanSweet
446e18dccd Renamed TextureAtlasAttachmentLoader. Was too damned long and didn't match spine-c. 2013-03-29 22:13:22 +01:00
NathanSweet
103cd30758 Extension stuff seems to be shaping up nicely! 2013-03-29 22:12:57 +01:00
NathanSweet
24538adb1a Got rid of the "key" in "keyframes".
We only deal with keyframes in all the animation stuff, it's cleaner without. Sorry if this breaks anyone! Easy fix at least.
2013-03-29 04:10:28 +01:00
NathanSweet
40835845be Added Animation.
OOP in C is a cold, dark place.
2013-03-29 04:06:43 +01:00
NathanSweet
de53ad3f4f Added Atlas.
Compiles with C89.
Minor refactoring.
2013-03-29 00:26:51 +01:00
NathanSweet
146a456beb Fixed crash. 2013-03-28 04:30:51 +01:00
NathanSweet
3e9385271b Merge remote-tracking branch 'origin/master' 2013-03-28 04:23:06 +01:00
NathanSweet
32a9a09831 WIP C runtime. 2013-03-28 04:22:39 +01:00
Nathan Sweet
5d91966d4a Merge pull request #21 from vinova/master
Fix weird color blending on using CCFadeOut; Add example of using CCAction classes with CCSkeleton
2013-03-27 11:09:55 -07:00
Stefan Nguyen
d8ac89b5df add example use CCAction classes with CCSkeleton 2013-03-27 22:42:40 +07:00
Stefan Nguyen
fc7cc63413 fix weird color blending on using CCFadeOut 2013-03-27 22:29:32 +07:00
NathanSweet
f8dd23fc18 Fixed for cocos2d-2.1rc0-x-2.1.2. 2013-03-27 13:59:28 +01:00
NathanSweet
41b748ef4d Added CCRGBAProtocol and CCBlendProtocol to CCSkeleton. Fixed issue #20. 2013-03-27 12:20:49 +01:00
Nathan Sweet
e4e8089340 Merge pull request #19 from vinova/master
Use ccGLBlendFunc instead of glBlendFunc in CCSkeleton::draw()
2013-03-26 05:59:19 -07:00
Stefan Nguyen
9202308c71 uses ccGLBlendFunc instead of glBlendFunc
so that Cocos2dx automatically preserve and switch back to old OpenGL mode
See ccConfig.h line 50
2013-03-26 18:02:07 +07:00
Stefan Nguyen
d20ada65fb ignore iOS xcuserdata 2013-03-26 09:28:27 +07:00
NathanSweet
d67191d653 Renamed ExampleScene to ExampleLayer. 2013-03-26 00:15:12 +01:00
NathanSweet
6342ed949e Static method to create autoreleased CCSkeleton.
Example shows memory management.
Fixed bug in memory management, texture not retained. :)
2013-03-25 23:51:33 +01:00
NathanSweet
ec8509b511 Source formatting, clean up. 2013-03-25 22:27:00 +01:00
NathanSweet
1f991ac234 Commit VS user file to for correct working dir. 2013-03-25 20:56:56 +01:00
NathanSweet
12245b9912 gitignore 2013-03-25 20:39:44 +01:00
NathanSweet
9d18556f15 Merge branch 'vinova-master' 2013-03-25 20:33:05 +01:00
NathanSweet
f2b6e73df8 Fixed up iOS project. 2013-03-25 20:27:59 +01:00
NathanSweet
554b6592b6 Fixed up Windows stuff. 2013-03-25 19:46:46 +01:00
NathanSweet
ba0227364d Place cocos2dx here 2013-03-25 19:33:10 +01:00
NathanSweet
91244a7b15 Moved cocos2d location. 2013-03-25 19:27:30 +01:00
NathanSweet
4cb9a8b088 Merge branch 'master' of https://github.com/vinova/spine-runtimes into vinova-master
Conflicts:
	spine-cocos2dx/example/Classes/ExampleScene.cpp
2013-03-25 19:20:45 +01:00
Stefan Nguyen
ef6140e4c1 scale SkeletonJson object to 0.5 2013-03-25 22:03:49 +07:00
Stefan Nguyen
ff62c847f2 fix proj.win32 2013-03-25 21:58:37 +07:00
NathanSweet
81a9c60b20 Added debug rendering. Thanks to Stefan Nguyen @ Vinova Pte Ltd! http://www.vinova.sg 2013-03-25 13:34:38 +01:00
NathanSweet
42d072ae8d Simplified Timeline interface. 2013-03-25 12:49:02 +01:00
NathanSweet
75fc36eab6 Simplified all loading methods to take path, stream, or pointers. 2013-03-25 12:33:21 +01:00
NathanSweet
6e7e8c5512 Changed Atlas constructor to take a path. 2013-03-25 12:12:04 +01:00
Stefan Nguyen
510849c609 support multiple-resolutions 2013-03-25 15:58:28 +07:00
Stefan Nguyen
ee25feffbe reorganize structure to match cocos2d-x multi-platform style; create a working iOS example 2013-03-25 14:36:39 +07:00
NathanSweet
6addb86a40 Changed file loading to use cocos2d-x API. 2013-03-24 22:39:29 +01:00
NathanSweet
17394e1851 cocos2d-x runtime! 2013-03-22 16:18:18 +01:00
NathanSweet
3aab744395 Utility methods to read from file and other minor improvements. 2013-03-22 16:18:03 +01:00
NathanSweet
6899b5249c Added AnimationState.
Fixed bug with keeping attachments visisble when setting new skin.
Clean up. Always more clean up can be done, freaking C++...
2013-03-22 14:22:35 +01:00
NathanSweet
b075838c9e Removed sysout 2013-03-22 12:57:23 +01:00
NathanSweet
159d076f79 Names for animation and skeleton. 2013-03-22 12:57:03 +01:00
NathanSweet
d07321c9e7 Javadocs 2013-03-22 12:41:57 +01:00
NathanSweet
6e0e420e0a Javadoc 2013-03-22 12:23:50 +01:00
NathanSweet
a2f6e5006d AnimationStateTest 2013-03-22 12:22:41 +01:00
NathanSweet
d6e7ae7a4a Fixed test files. 2013-03-22 12:20:42 +01:00