axmol/cocos/editor-support/spine
boyu0 ef54ed3c15 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into HEAD
Conflicts:
	cocos/2d/CCLabel.cpp
	cocos/2d/CCLabel.h
	cocos/2d/CCLabelBMFont.cpp
	cocos/2d/CCLabelBMFont.h
	cocos/2d/CCLayer.cpp
	cocos/2d/CCLayer.h
	cocos/2d/CCNode.cpp
	extensions/GUI/CCControlExtension/CCControl.cpp
	extensions/GUI/CCControlExtension/CCControlButton.cpp
	extensions/GUI/CCControlExtension/CCScale9Sprite.cpp
	tools/tojs/cocos2dx.ini
2013-12-19 17:05:59 +08:00
..
proj.win32 perfect vs-project configuration 2013-10-31 10:51:38 +08:00
Android.mk issue #2905: testcpp bild ok on Android 2013-10-15 18:00:03 +08:00
Animation.cpp issue #2770: fix some warning 2013-11-11 12:49:38 +08:00
Animation.h issue #2905: testcpp bild ok on Android 2013-10-15 18:00:03 +08:00
AnimationState.cpp issue #2905: testcpp bild ok on Android 2013-10-15 18:00:03 +08:00
AnimationState.h issue #2905: testcpp bild ok on Android 2013-10-15 18:00:03 +08:00
AnimationStateData.cpp issue #2905: testcpp bild ok on Android 2013-10-15 18:00:03 +08:00
AnimationStateData.h issue #2905: testcpp bild ok on Android 2013-10-15 18:00:03 +08:00
Atlas.cpp fix some warnings 2013-12-06 16:32:06 +08:00
Atlas.h issue #2905: testcpp bild ok on Android 2013-10-15 18:00:03 +08:00
AtlasAttachmentLoader.cpp issue #2905: testcpp bild ok on Android 2013-10-15 18:00:03 +08:00
AtlasAttachmentLoader.h issue #2905: testcpp bild ok on Android 2013-10-15 18:00:03 +08:00
Attachment.cpp issue #2905: testcpp bild ok on Android 2013-10-15 18:00:03 +08:00
Attachment.h issue #2905: testcpp bild ok on Android 2013-10-15 18:00:03 +08:00
AttachmentLoader.cpp issue #2905: testcpp bild ok on Android 2013-10-15 18:00:03 +08:00
AttachmentLoader.h issue #2905: testcpp bild ok on Android 2013-10-15 18:00:03 +08:00
Bone.cpp issue #2905: testcpp bild ok on Android 2013-10-15 18:00:03 +08:00
Bone.h issue #2905: testcpp bild ok on Android 2013-10-15 18:00:03 +08:00
BoneData.cpp issue #2905: testcpp bild ok on Android 2013-10-15 18:00:03 +08:00
BoneData.h issue #2905: testcpp bild ok on Android 2013-10-15 18:00:03 +08:00
CCSkeleton.cpp HotFix: change tab to space 2013-11-19 10:42:37 +08:00
CCSkeleton.h issue #3162: Merge Node and NodeRGBA, fix bug: Child's opacity will not be changed when its parent's setCascadeOpacityEnabled was set to true and opacity was changed. 2013-12-06 18:07:16 +08:00
CCSkeletonAnimation.cpp issue #2905: testcpp bild ok on Android 2013-10-15 18:00:03 +08:00
CCSkeletonAnimation.h issue #2905: testcpp bild ok on Android 2013-10-15 18:00:03 +08:00
CMakeLists.txt [cmake] output lib to root/lib 2013-11-04 21:03:08 +08:00
Json.cpp issue #2905: testcpp bild ok on Android 2013-10-15 18:00:03 +08:00
Json.h issue #2905: testcpp bild ok on Android 2013-10-15 18:00:03 +08:00
RegionAttachment.cpp issue #2905: testcpp bild ok on Android 2013-10-15 18:00:03 +08:00
RegionAttachment.h issue #2905: testcpp bild ok on Android 2013-10-15 18:00:03 +08:00
Skeleton.cpp issue #2905: testcpp bild ok on Android 2013-10-15 18:00:03 +08:00
Skeleton.h issue #2905: testcpp bild ok on Android 2013-10-15 18:00:03 +08:00
SkeletonData.cpp issue #2905: testcpp bild ok on Android 2013-10-15 18:00:03 +08:00
SkeletonData.h issue #2905: testcpp bild ok on Android 2013-10-15 18:00:03 +08:00
SkeletonJson.cpp fixes warning compiler 2013-12-17 11:16:30 -08:00
SkeletonJson.h issue #2905: testcpp bild ok on Android 2013-10-15 18:00:03 +08:00
Skin.cpp issue #2905: testcpp bild ok on Android 2013-10-15 18:00:03 +08:00
Skin.h issue #2905: testcpp bild ok on Android 2013-10-15 18:00:03 +08:00
Slot.cpp issue #2905: testcpp bild ok on Android 2013-10-15 18:00:03 +08:00
Slot.h issue #2905: testcpp bild ok on Android 2013-10-15 18:00:03 +08:00
SlotData.cpp issue #2905: testcpp bild ok on Android 2013-10-15 18:00:03 +08:00
SlotData.h issue #2905: testcpp bild ok on Android 2013-10-15 18:00:03 +08:00
extension.cpp use ssize_t for index and capacity 2013-12-12 14:48:26 +08:00
extension.h use ssize_t for index and capacity 2013-12-12 14:48:26 +08:00
spine-cocos2dx.cpp replace long with int or ssize_t 2013-12-05 17:22:22 +08:00
spine-cocos2dx.h issue #2905: testcpp bild ok on Android 2013-10-15 18:00:03 +08:00
spine.h issue #2905:adjust folder structure 2013-10-12 11:22:05 +08:00