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/cocostudio
History
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
..
ActionTimeline Merge branch 'v3.7.1' of https://github.com/cocos2d/cocos2d-x into v3 2015-08-02 22:28:27 +08:00
WidgetReader Merge branch 'v3.7.1' of https://github.com/cocos2d/cocos2d-x into v3 2015-08-02 22:28:27 +08:00
Android.mk Merge branch 'v3.7.1' of github.com:cocos2d/cocos2d-x into 3.7.1 2015-07-24 11:38:09 +08:00
CCActionFrame.cpp Add new line at the end of a file to *.cpp 2014-06-19 20:45:24 +09:00
CCActionFrame.h GBKToUTF8 2015-06-17 13:16:06 +08:00
CCActionFrameEasing.cpp Platform fixed 2014-09-09 16:50:02 -07:00
CCActionFrameEasing.h GBKToUTF8 2015-06-17 13:16:06 +08:00
CCActionManagerEx.cpp add stopActionByName() 2014-12-11 02:57:13 +08:00
CCActionManagerEx.h GBKToUTF8 2015-06-17 13:16:06 +08:00
CCActionNode.cpp Fix issue 10258 & 10408 2015-06-09 14:38:48 +08:00
CCActionNode.h GBKToUTF8 2015-06-17 13:16:06 +08:00
CCActionObject.cpp Fixing conflict, use of macro function. 2014-10-11 13:06:42 -07:00
CCActionObject.h GBKToUTF8 2015-06-17 13:16:06 +08:00
CCArmature.cpp Use sendNodeEventToJSExtended instead of sendNodeEventToJS in sub classes 2015-07-28 18:24:03 +08:00
CCArmature.h GBKToUTF8 2015-06-17 13:16:06 +08:00
CCArmatureAnimation.cpp Fix ArmatureAnimation crash 2015-05-18 12:08:26 +08:00
CCArmatureAnimation.h GBKToUTF8 2015-06-17 13:16:06 +08:00
CCArmatureDataManager.cpp fix momery leak (partly fix, memory leak still exist). 2014-11-07 11:43:55 +08:00
CCArmatureDataManager.h GBKToUTF8 2015-06-17 13:16:06 +08:00
CCArmatureDefine.cpp
…
CCArmatureDefine.h GBKToUTF8 2015-06-17 13:16:06 +08:00
CCBatchNode.cpp Fixed bug: wrong usage of isVisitableByVisitingCamera, which should only effect draw call. 2015-06-18 10:32:30 +08:00
CCBatchNode.h GBKToUTF8 2015-06-17 13:16:06 +08:00
CCBone.cpp Update CCBone.cpp 2014-11-06 17:51:19 +08:00
CCBone.h GBKToUTF8 2015-06-17 13:16:06 +08:00
CCColliderDetector.cpp Adds `std::nothrow` to `new` 2014-08-27 16:31:57 -07:00
CCColliderDetector.h GBKToUTF8 2015-06-17 13:16:06 +08:00
CCComAttribute.cpp Adds `std::nothrow` to `new` 2014-08-27 16:31:57 -07:00
CCComAttribute.h GBKToUTF8 2015-06-17 13:16:06 +08:00
CCComAudio.cpp 1, Add onAdd and onRemove function to replace onEnter and onCancel used in onAdd and onRemove of ComponentContainer. 2015-06-04 14:06:31 +08:00
CCComAudio.h GBKToUTF8 2015-06-17 13:16:06 +08:00
CCComBase.h GBKToUTF8 2015-06-17 13:16:06 +08:00
CCComController.cpp 1, Add onAdd and onRemove function to replace onEnter and onCancel used in onAdd and onRemove of ComponentContainer. 2015-06-04 14:06:31 +08:00
CCComController.h GBKToUTF8 2015-06-17 13:16:06 +08:00
CCComExtensionData.cpp Optimization of Custom Data. 2015-07-23 16:30:23 +08:00
CCComExtensionData.h Fix indent 2015-07-23 18:00:23 +08:00
CCComRender.cpp fix rapidjson assert error 2015-06-23 13:54:11 +08:00
CCComRender.h GBKToUTF8 2015-06-17 13:16:06 +08:00
CCDataReaderHelper.cpp fix rapidjson assert error 2015-06-23 13:54:11 +08:00
CCDataReaderHelper.h GBKToUTF8 2015-06-17 13:16:06 +08:00
CCDatas.cpp fixed black edge in Armature 2014-07-23 20:07:33 +08:00
CCDatas.h GBKToUTF8 2015-06-17 13:16:06 +08:00
CCDecorativeDisplay.cpp Adds `std::nothrow` to `new` 2014-08-27 16:31:57 -07:00
CCDecorativeDisplay.h GBKToUTF8 2015-06-17 13:16:06 +08:00
CCDisplayFactory.cpp fix sprite frame cache, and remove unnecessary headers dependencies. 2014-11-07 09:13:59 +08:00
CCDisplayFactory.h GBKToUTF8 2015-06-17 13:16:06 +08:00
CCDisplayManager.cpp fix tons of warnings 2015-07-15 12:04:48 +08:00
CCDisplayManager.h GBKToUTF8 2015-06-17 13:16:06 +08:00
CCInputDelegate.cpp remove unneeded codes 2014-08-26 18:19:28 +08:00
CCInputDelegate.h GBKToUTF8 2015-06-17 13:16:06 +08:00
CCProcessBase.cpp
…
CCProcessBase.h GBKToUTF8 2015-06-17 13:16:06 +08:00
CCSGUIReader.cpp fix tons of warnings 2015-07-15 12:04:48 +08:00
CCSGUIReader.h GBKToUTF8 2015-06-17 13:16:06 +08:00
CCSSceneReader.cpp fix tons of warnings 2015-07-15 12:04:48 +08:00
CCSSceneReader.h GBKToUTF8 2015-06-17 13:16:06 +08:00
CCSkin.cpp Optimize Vec3 2015-04-05 13:09:50 +03:00
CCSkin.h GBKToUTF8 2015-06-17 13:16:06 +08:00
CCSpriteFrameCacheHelper.cpp rename functions. 2014-11-19 15:27:55 +08:00
CCSpriteFrameCacheHelper.h GBKToUTF8 2015-06-17 13:16:06 +08:00
CCTransformHelp.cpp Squashed commit of the following: 2014-05-14 10:07:09 -07:00
CCTransformHelp.h GBKToUTF8 2015-06-17 13:16:06 +08:00
CCTween.cpp Adds `std::nothrow` to `new` 2014-08-27 16:31:57 -07:00
CCTween.h GBKToUTF8 2015-06-17 13:16:06 +08:00
CCUtilMath.cpp Optimize Vec2 2015-04-19 20:40:52 +03:00
CCUtilMath.h GBKToUTF8 2015-06-17 13:16:06 +08:00
CMakeLists.txt Merge branch 'v3.7.1' of https://github.com/cocos2d/cocos2d-x into v3 2015-08-02 22:28:27 +08:00
CSParse3DBinary_generated.h update for skybox reader 2015-07-03 17:52:42 +08:00
CSParseBinary_generated.h Update 3d reader for compatible with cocosstudio 3.1.2 version csd file 2015-06-23 11:31:16 +08:00
CocoLoader.cpp Fix indent 2015-06-09 17:40:42 +08:00
CocoLoader.h GBKToUTF8 2015-06-17 13:16:06 +08:00
CocoStudio.cpp Supplement invoke destroyInstance() of some Reader in destroyCocosStudio(). 2015-04-01 14:08:09 +08:00
CocoStudio.h add bonenode to CocoStudio.h 2015-07-23 13:34:11 +08:00
CocosStudioExport.h Update 3d reader for compatible with cocosstudio 3.1.2 version csd file 2015-06-23 11:31:16 +08:00
DictionaryHelper.cpp fix assert failure of NinePatchImageParser and rapidjson 2015-05-26 17:20:10 +08:00
DictionaryHelper.h GBKToUTF8 2015-06-17 13:16:06 +08:00
FlatBuffersSerialize.cpp Fix parser compatible for layer project file 2015-07-28 18:11:07 +08:00
FlatBuffersSerialize.h GBKToUTF8 2015-06-17 13:16:06 +08:00
TriggerBase.cpp
…
TriggerBase.h GBKToUTF8 2015-06-17 13:16:06 +08:00
TriggerMng.cpp upgrade rapidjson to 1.0.2 2015-05-25 11:43:03 +08:00
TriggerMng.h GBKToUTF8 2015-06-17 13:16:06 +08:00
TriggerObj.cpp add more descriptive message to ASSET macro. 2015-07-14 15:28:36 +08:00
TriggerObj.h GBKToUTF8 2015-06-17 13:16:06 +08:00
WidgetCallBackHandlerProtocol.cpp Add callback framework using flat buffers 2014-11-27 16:49:19 +08:00
WidgetCallBackHandlerProtocol.h GBKToUTF8 2015-06-17 13:16:06 +08:00