Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/cocos/editor-support/spine
History
Huabing.Xu bc55d3246b Merge branch 'develop' into free_instead_of_delete 
# By minggo (12) and others
# Via minggo (18) and others
* develop: (78 commits)
  [AUTO] : updating submodule reference to latest autogenerated bindings
  Update CHANGELOG[ci skip]
  Update AUTHORS [ci skip]
  fix bug: cccolor to jsval function has error in jsb
  [ci skip]
  [ci skip]
  [ci skip]
  [ci skip]
  [ci skip]
  C++11: NULL -> nullptr
  [ci skip]
  Fix: UserDefault::createXMLFile with correct XML definition.
  [ci skip]
  [ci skip]
  [ci skip]
  Fix bug: rename const with under line seperator
  [AUTO] : updating submodule reference to latest autogenerated bindings
  Fix bug: Z fighting on TransitionScenePageTurn
  Fixed bugs
  Modify reader and fixed bugs
  ...

Conflicts:
	cocos/editor-support/cocostudio/CCSGUIReader.cpp
 		2013-11-14 14:47:01 +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 replaces `delete[]` with `free()` in C-based API 2013-11-11 18:09:47 -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 issue #2770: fix some warning 2013-11-11 14:11:06 +08:00
CCSkeleton.h issue #2905: testcpp bild ok on Android 2013-10-15 18:00:03 +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 replaces `delete[]` with `free()` in C-based API 2013-11-11 18:09:47 -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 issue #2905: testcpp bild ok on Android 2013-10-15 18:00:03 +08:00
extension.h issue #2905: testcpp bild ok on Android 2013-10-15 18:00:03 +08:00
spine-cocos2dx.cpp issue #3025: replace TextureCache::getInstance() by Director::getInstance()->getTextureCache() in cocos folder 2013-11-07 19:11:09 +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