7 Commits

Author	SHA1	Message	Date
yangxiao	4452d9579a	merge cocos2d, fix lua	2014-08-04 12:07:27 +08:00
huangshiwu	575c9787c0	Merge branch 'v3' into v3_pr ... Conflicts: cocos/2d/libcocos2d.vcxproj.filters	2014-08-01 15:11:34 +08:00
yangxiao	e03d284e26	merge cocos2d	2014-07-31 18:55:41 +08:00
samuele3hu	ee4e479ce1	Remove CCProtectedNode.h/.cpp from ui/base to 2d and modify the related project setting	2014-07-31 16:38:55 +08:00
songmiao	58c32e52c7	windows works	2014-07-31 14:08:05 +08:00
huangshiwu	ef69faf3ba	GLView Hook	2014-07-31 00:53:04 +08:00
Huabing.Xu	4a4f05c827	change cocos2d to libcocos2d for windows	2014-07-28 20:55:58 +08:00