5 Commits

Author	SHA1	Message	Date
Huabing.Xu	f65973d9f0	Merge branch 'develop' into develop_migrate_math_lib_merge ... Conflicts: cocos/2d/CCActionInterval.cpp cocos/2d/CCLabelAtlas.cpp cocos/2d/CCLabelBMFont.cpp tests/cpp-tests/Classes/ClippingNodeTest/ClippingNodeTest.cpp	2014-04-23 14:46:14 +08:00
Huabing.Xu	560d24545a	3.0hotfix: Node: Clipping->RawStencilTest4-6	2014-04-22 10:58:42 +08:00
Huabing.Xu	7f61639541	replace Point with Vector2 in tests, extension folder	2014-04-15 18:23:40 +08:00
Huabing.Xu	3837c23ebe	draw() using Matrix instead of kmMat4	2014-04-08 22:07:35 +08:00
James Chen	b88de91a15	Renames 'samples' folder to 'tests', ouch....	2014-03-11 19:10:34 +08:00