167 Commits

Author	SHA1	Message	Date
minggo	f2f8035724	Merge pull request #7708 from super626/obb ... AABB, OBB	2014-08-15 15:32:14 +08:00
minggo	aa052eb1c1	add CCModuleManager into vs project	2014-08-15 14:39:15 +08:00
songchengjiang	7ed40a8051	Added Light	2014-08-15 10:32:07 +08:00
yangxiao	ab783d2702	merge cocos2d	2014-08-14 17:12:39 +08:00
Huabing.Xu	6aff707eab	windows work now for renderPrimitive	2014-08-11 14:18:07 +08:00
yangxiao	ceb6549ec8	merge cocos2d	2014-08-08 16:25:52 +08:00
yangxiao1	61eaa082a2	fix windows	2014-08-08 15:33:30 +08:00
lvlong	fe58c43b2d	add abb and obb to vc2012-project	2014-08-08 14:06:54 +08:00
yangxiao	3c9483899e	camera, cameratest, drawNode3D squash	2014-08-07 15:23:31 +08:00
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	ea802580a2	add script to copy sqllite3.dll to output dir on windows	2014-07-29 15:02:34 +08:00
Huabing.Xu	4a4f05c827	change cocos2d to libcocos2d for windows	2014-07-28 20:55:58 +08:00