Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/cocos/2d/platform
History
bmanGH 683ce1692d Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into feature/configuration_VAO_runtime 
Conflicts:
	cocos2dx/CCConfiguration.cpp
	cocos2dx/draw_nodes/CCDrawNode.cpp
	cocos2dx/particle_nodes/CCParticleSystemQuad.cpp
	cocos2dx/platform/android/CCEGLView.cpp
	cocos2dx/platform/ios/EAGLView.mm
	cocos2dx/textures/CCTextureAtlas.cpp
	cocos2dx/textures/CCTextureAtlas.h
 		2013-11-12 20:18:04 +08:00
..
android Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into feature/configuration_VAO_runtime 2013-11-12 20:18:04 +08:00
apple issue #2905: helloworld build ok on android 2013-10-14 14:01:00 +08:00
ios Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into feature/configuration_VAO_runtime 2013-11-12 20:18:04 +08:00
linux Merge pull request #4150 from ledyba/fix_ccdevice 2013-11-11 17:40:32 -08:00
mac removes exe bit from text files 2013-11-08 11:30:50 -08:00
win32 [Win32] fix argument type. 2013-11-09 23:44:15 +09:00
CCApplicationProtocol.h issue #2905:adjust folder structure 2013-10-12 11:22:05 +08:00
CCCommon.h issue #2905:adjust folder structure 2013-10-12 11:22:05 +08:00
CCDevice.h issue #2905:adjust folder structure 2013-10-12 11:22:05 +08:00
CCEGLViewProtocol.cpp Fixes some compiler warnings 2013-11-04 16:31:36 -08:00
CCEGLViewProtocol.h Fixes some compiler warnings 2013-11-04 16:31:36 -08:00
CCFileUtils.cpp Adds more 64-bit fixes 2013-11-05 17:36:44 -08:00
CCFileUtils.h Adds more 64-bit fixes 2013-11-05 17:36:44 -08:00
CCImage.h Adds more 64-bit fixes 2013-11-05 17:36:44 -08:00
CCImageCommon_cpp.h Update CCImageCommon_cpp.h 2013-11-11 02:28:27 +03:00
CCSAXParser.cpp Adds more 64-bit fixes 2013-11-05 17:36:44 -08:00
CCSAXParser.h issue #2905:adjust folder structure 2013-10-12 11:22:05 +08:00
CCThread.cpp issue #2905:adjust folder structure 2013-10-12 11:22:05 +08:00
CCThread.h issue #2905:adjust folder structure 2013-10-12 11:22:05 +08:00