11 Commits

Author	SHA1	Message	Date
James Chen	8902359db0	Compilation fix when CC_ENABLE_BOX2D_INTEGRATION is enabled.	2014-01-26 18:32:50 +08:00
James Chen	e8229ad4e3	Don’t define CC_ENABLE_CHIPMUNK_INTEGRATION or CC_ENABLE_BOX2D_INTEGRATION in CCPhysicsSprite.h.	2014-01-26 17:56:14 +08:00
Ricardo Quesada	d0dbf34319	removes "include "cocos2d.h" from cocos2d files	2014-01-16 21:35:58 -08:00
Dhilan007	d7593fd0f0	fix wrong judgments of conditional compilation.	2014-01-13 11:24:49 +08:00
Dhilan007	fd11791389	add a blank line at the file end.	2014-01-13 10:37:31 +08:00
Dhilan007	34a79a02e7	fix compiling error when CC_ENABLE_CHIPMUNK_INTEGRATION and CC_ENABLE_BOX2D_INTEGRATION are zero.	2014-01-13 10:32:34 +08:00
James Chen	2a38d4fe94	issue #2171: Fixing compilation errors for Linux port.	2013-12-17 14:50:40 +08:00
Ricardo Quesada	0222c6544e	Migration to Mat4x4 ... Armature not migrated yet Signed-off-by: Ricardo Quesada <ricardoquesada@gmail.com>	2013-12-09 17:32:51 -08:00
minggo	8f7a489a4d	issue #2905:make cocostudio and gui flat	2013-10-16 16:48:39 +08:00
minggo	6fc2be62f5	issue #2905: testcpp bild ok on Android	2013-10-15 18:00:03 +08:00
minggo	f3f24e3bbd	issue #2905:use - to connect multiple words	2013-10-12 13:54:16 +08:00