pandamicro 3c2e66e425 Merge branch 'v3.7.1' of https://github.com/cocos2d/cocos2d-x into v3 ... # Conflicts: # .travis.yml # build/cocos2d_js_tests.xcodeproj/project.pbxproj # build/cocos2d_tests.xcodeproj/project.pbxproj # cocos/2d/CCFont.h # cocos/2d/CCFontAtlas.cpp # cocos/2d/CCFontAtlas.h # cocos/2d/CCFontFreeType.cpp # cocos/2d/CCFontFreeType.h # cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Windows/libcocos2d_8_1.Windows.vcxproj # cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.WindowsPhone/libcocos2d_8_1.WindowsPhone.vcxproj # cocos/2d/libcocos2d_win10/libcocos2d.vcxproj # cocos/cocos2d.cpp # cocos/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxHelper.cpp # cocos/scripting/js-bindings/auto/jsb_cocos2dx_studio_auto.cpp # templates/cpp-template-default/proj.ios_mac/HelloCpp.xcodeproj/project.pbxproj # templates/js-template-default/frameworks/runtime-src/proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj # templates/js-template-runtime/frameworks/runtime-src/proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj # templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/HelloLua.xcodeproj/project.pbxproj # tests/cpp-tests/Classes/LabelTest/LabelTestNew.cpp # tests/cpp-tests/Classes/LabelTest/LabelTestNew.h # tools/bindings-generator # tools/simulator/frameworks/runtime-src/proj.ios_mac/simulator.xcodeproj/project.pbxproj # tools/travis-scripts/generate-bindings.sh # tools/travis-scripts/generate-cocosfiles.sh # tools/travis-scripts/travis_mac.yml		2015-08-02 22:28:27 +08:00
..
CCActionTimeline.cpp	Optimization of Custom Data.	2015-07-23 16:30:23 +08:00
CCActionTimeline.h	GBKToUTF8	2015-06-17 13:16:06 +08:00
CCActionTimelineCache.cpp	Fix issue https://github.com/cocos2d/cocos2d-x/issues/12968	2015-07-27 11:55:18 +08:00
CCActionTimelineCache.h	Fix issue https://github.com/cocos2d/cocos2d-x/issues/12968	2015-07-27 11:55:18 +08:00
CCActionTimelineNode.cpp	change file name	2014-12-04 18:51:32 +08:00
CCActionTimelineNode.h	GBKToUTF8	2015-06-17 13:16:06 +08:00
CCBoneNode.cpp	fix comment by pandamicro	2015-07-30 19:28:00 +08:00
CCBoneNode.h	some doxygen comments and copyright	2015-07-24 01:30:34 +08:00
CCFrame.cpp	Merge pull request #11785 from geron-cn/fixbug	2015-05-27 16:28:13 +08:00
CCFrame.h	Fix : remove using namespace cocos2d from header file	2015-07-31 00:02:57 +09:00
CCSkeletonNode.cpp	add SkeletonNode Nest test case	2015-07-28 23:49:25 +08:00
CCSkeletonNode.h	fix bug:use wrong _modelviewTransform in director to draw bone	2015-07-24 19:48:05 +08:00
CCSkinNode.cpp	some doxygen comments and copyright	2015-07-24 01:30:34 +08:00
CCSkinNode.h	some doxygen comments and copyright	2015-07-24 01:30:34 +08:00
CCTimeLine.cpp	Fixes some warnings and a related bug in CCSprite.	2015-07-07 23:01:24 +08:00
CCTimeLine.h	Fixes some warnings and a related bug in CCSprite.	2015-07-07 23:01:24 +08:00
CCTimelineMacro.h	GBKToUTF8	2015-06-17 13:16:06 +08:00
CSLoader.cpp	Merge branch 'v3.7.1' of https://github.com/cocos2d/cocos2d-x into v3	2015-08-02 22:28:27 +08:00
CSLoader.h	Normalization function names	2015-07-28 14:05:56 +08:00