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

7 Commits

Author SHA1 Message Date
bmanGH 9989426d8a Merge remote-tracking branch 'upstream/develop' into develop 2013-11-11 23:29:45 +08:00
Ricardo Quesada ba7ed6e578 Fixes some compiler warnings 
The warnings are related to:

* 64-to-32-bit conversion
* shadow variables
 2013-11-04 16:31:36 -08:00
Ricardo Quesada 0350ac7021 arm64 support 2013-11-04 11:53:40 -08:00
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
minggo 4313c46e93 issue #2905:adjust folder structure 2013-10-12 11:22:05 +08:00