Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
12,561 Commits 2 Branches 33 Tags 1.2 GiB
Commit Graph

8 Commits

Author SHA1 Message Date
bmanGH aa324114c1 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-10-17 16:54:56 +08:00
bmanGH 537af014d8 Merge branch 'develop' of https://github.com/bmanGH/cocos2d-x into develop 
Conflicts:
	cocos2dx/CCConfiguration.cpp
	cocos2dx/draw_nodes/CCDrawNode.cpp
	cocos2dx/particle_nodes/CCParticleSystemQuad.cpp
	cocos2dx/platform/android/CCEGLView.cpp
	cocos2dx/textures/CCTextureAtlas.cpp
	cocos2dx/textures/CCTextureAtlas.h
 2013-10-17 15:25:46 +08:00
XiaoLongHan a2de02cc19 Change the class name of textfield to compare, so that you can touch anywhere outside of the virtual keyboard. 2013-10-17 14:21:55 +08:00
bmanGH 2ed045d017 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-10-17 11:21:31 +08:00
James Chen 438fe70287 issue #2905: [iOS, Mac] HelloCpp works now. 2013-10-14 15:53:14 +08:00
minggo 95acb1b9e3 issue #2905: helloworld build ok on android 2013-10-14 14:01:00 +08:00
bmanGH 7491fe22cc Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-10-13 10:17:07 +08:00
minggo 4313c46e93 issue #2905:adjust folder structure 2013-10-12 11:22:05 +08:00