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/cocosbuilder
History
pandamicro 8692ee176c Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3 
Conflicts:
	cocos/network/HttpAsynConnection-apple.m
	cocos/network/HttpClient-android.cpp
	cocos/network/HttpClient.cpp
	cocos/network/HttpCookie.h
	cocos/network/HttpRequest.h
	cocos/network/HttpResponse.h
	cocos/network/SocketIO.cpp
	cocos/network/WebSocket.h
 		2016-05-25 19:19:27 +08:00
..
Android.mk Fix android compilation issue with thumb mode 2016-05-25 18:35:38 +08:00
CCBAnimationManager.cpp Fixes 1605 include path in 541 files 2016-03-20 21:53:44 +08:00
CCBAnimationManager.h Fixes 1605 include path in 541 files 2016-03-20 21:53:44 +08:00
CCBFileLoader.cpp Fixes 1605 include path in 541 files 2016-03-20 21:53:44 +08:00
CCBFileLoader.h Fixes 1605 include path in 541 files 2016-03-20 21:53:44 +08:00
CCBKeyframe.cpp Fixes 1605 include path in 541 files 2016-03-20 21:53:44 +08:00
CCBKeyframe.h Adjust libcocos2d and libluacocos2d on the win32 platform and adjust related test cases. 2014-08-27 10:18:44 +08:00
CCBMemberVariableAssigner.h Adjust libcocos2d and libluacocos2d on the win32 platform and adjust related test cases. 2014-08-27 10:18:44 +08:00
CCBReader.cpp Renamed ignoreAnchorPointForPosition() 2016-04-22 21:36:02 +09:00
CCBReader.h Fixes 1605 include path in 541 files 2016-03-20 21:53:44 +08:00
CCBSelectorResolver.h scheduler and macro fixes 2014-10-03 09:38:36 -07:00
CCBSequence.cpp Fixes 1605 include path in 541 files 2016-03-20 21:53:44 +08:00
CCBSequence.h Fixes 1605 include path in 541 files 2016-03-20 21:53:44 +08:00
CCBSequenceProperty.cpp Fixes 1605 include path in 541 files 2016-03-20 21:53:44 +08:00
CCBSequenceProperty.h Fixes 1605 include path in 541 files 2016-03-20 21:53:44 +08:00
CCControlButtonLoader.cpp Fixes 1605 include path in 541 files 2016-03-20 21:53:44 +08:00
CCControlButtonLoader.h Fixes 1605 include path in 541 files 2016-03-20 21:53:44 +08:00
CCControlLoader.cpp Fixes 1605 include path in 541 files 2016-03-20 21:53:44 +08:00
CCControlLoader.h Fixes 1605 include path in 541 files 2016-03-20 21:53:44 +08:00
CCLabelBMFontLoader.cpp Fixes 1605 include path in 541 files 2016-03-20 21:53:44 +08:00
CCLabelBMFontLoader.h Fixes 1605 include path in 541 files 2016-03-20 21:53:44 +08:00
CCLabelTTFLoader.cpp Fixes 1605 include path in 541 files 2016-03-20 21:53:44 +08:00
CCLabelTTFLoader.h Fixes 1605 include path in 541 files 2016-03-20 21:53:44 +08:00
CCLayerColorLoader.cpp Fixes 1605 include path in 541 files 2016-03-20 21:53:44 +08:00
CCLayerColorLoader.h Fixes 1605 include path in 541 files 2016-03-20 21:53:44 +08:00
CCLayerGradientLoader.cpp Fixes 1605 include path in 541 files 2016-03-20 21:53:44 +08:00
CCLayerGradientLoader.h Fixes 1605 include path in 541 files 2016-03-20 21:53:44 +08:00
CCLayerLoader.cpp Fixes 1605 include path in 541 files 2016-03-20 21:53:44 +08:00
CCLayerLoader.h Fixes 1605 include path in 541 files 2016-03-20 21:53:44 +08:00
CCMenuItemImageLoader.cpp Fixes 1605 include path in 541 files 2016-03-20 21:53:44 +08:00
CCMenuItemImageLoader.h Fixes 1605 include path in 541 files 2016-03-20 21:53:44 +08:00
CCMenuItemLoader.cpp Fixes 1605 include path in 541 files 2016-03-20 21:53:44 +08:00
CCMenuItemLoader.h Fixes 1605 include path in 541 files 2016-03-20 21:53:44 +08:00
CCMenuLoader.h Fixes 1605 include path in 541 files 2016-03-20 21:53:44 +08:00
CCNode+CCBRelativePositioning.cpp Fixes 1605 include path in 541 files 2016-03-20 21:53:44 +08:00
CCNode+CCBRelativePositioning.h Fixes 1605 include path in 541 files 2016-03-20 21:53:44 +08:00
CCNodeLoader.cpp Renamed ignoreAnchorPointForPosition() 2016-04-22 21:36:02 +09:00
CCNodeLoader.h Fixes 1605 include path in 541 files 2016-03-20 21:53:44 +08:00
CCNodeLoaderLibrary.cpp Fixes 1605 include path in 541 files 2016-03-20 21:53:44 +08:00
CCNodeLoaderLibrary.h Fixes 1605 include path in 541 files 2016-03-20 21:53:44 +08:00
CCNodeLoaderListener.h Adjust libcocos2d and libluacocos2d on the win32 platform and adjust related test cases. 2014-08-27 10:18:44 +08:00
CCParticleSystemQuadLoader.cpp Fixes 1605 include path in 541 files 2016-03-20 21:53:44 +08:00
CCParticleSystemQuadLoader.h Fixes 1605 include path in 541 files 2016-03-20 21:53:44 +08:00
CCScale9SpriteLoader.cpp Fixes 1605 include path in 541 files 2016-03-20 21:53:44 +08:00
CCScale9SpriteLoader.h Fixes 1605 include path in 541 files 2016-03-20 21:53:44 +08:00
CCScrollViewLoader.cpp Fixes 1605 include path in 541 files 2016-03-20 21:53:44 +08:00
CCScrollViewLoader.h Fixes 1605 include path in 541 files 2016-03-20 21:53:44 +08:00
CCSpriteLoader.cpp Fixes 1605 include path in 541 files 2016-03-20 21:53:44 +08:00
CCSpriteLoader.h Fixes 1605 include path in 541 files 2016-03-20 21:53:44 +08:00
CMakeLists.txt Removed unnecessary search paths. 2016-03-22 16:04:12 +08:00
CocosBuilder.h Fixes 1605 include path in 541 files 2016-03-20 21:53:44 +08:00