15 Commits

Author	SHA1	Message	Date
Ricardo Quesada	3838268fd0	Merge branch 'develop' into newRenderer	2013-12-14 19:28:01 -08:00
James Chen	bb5ef615dd	Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into pr4479 ... Conflicts: cocos/2d/CCSpriteBatchNode.h	2013-12-13 16:44:22 +08:00
Ricardo Quesada	61cc365d9e	Merge branch 'develop' into newRenderer ... Conflicts: cocos/2d/CCGLProgram.h cocos/2d/CCLabelTTF.h	2013-12-12 14:41:42 -08:00
Ricardo Quesada	f4c68e4eef	More renames of description() to getDescription()	2013-12-12 14:38:12 -08:00
minggo	1e9c763b40	use ssize_t for index and capacity	2013-12-12 14:48:26 +08:00
Ricardo Quesada	81b06f06a9	Merge branch 'develop' into newRenderer ... Conflicts: cocos/2d/CCAtlasNode.h	2013-12-05 22:24:41 -08:00
minggo	b67d567a79	replace long with int or ssize_t	2013-12-05 17:22:22 +08:00
Nite Luo	d5f651deee	Merge branch 'develop' into newRenderer	2013-11-13 10:27:30 -08:00
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
Nite Luo	a28f3f6f03	Merge branch 'develop' into newRenderer	2013-11-11 12:04:28 -08:00
James Chen	0151ac60ba	fix 64bit warning. unsigned int (int) —> long.	2013-11-11 16:45:44 +08:00
Nite Luo	050f3f705e	minor code format fix	2013-11-08 13:57:21 -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
minggo	95acb1b9e3	issue #2905: helloworld build ok on android	2013-10-14 14:01:00 +08:00
minggo	49d7bbd600	issue #2905: remove sub folders except platform	2013-10-12 15:41:45 +08:00