63 Commits

Author	SHA1	Message	Date
Huabing.Xu	2aa65ceee5	Fix compile warnings after merging	2014-04-23 15:13:50 +08:00
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	1670e07300	Merge branch 'develop' into develop_migrate_math_lib_merge ... Conflicts: build/cocos2d_libs.xcodeproj/project.pbxproj build/cocos2d_tests.xcodeproj/project.pbxproj	2014-04-11 11:18:13 +08:00
Dhilan007	05b8123803	Label:Makes the create functions of Label just do one thing.	2014-04-09 23:31:05 +08:00
Dhilan007	67652357e1	1.Makes the create functions of Label clear.	2014-04-09 21:35:08 +08:00
Huabing.Xu	3837c23ebe	draw() using Matrix instead of kmMat4	2014-04-08 22:07:35 +08:00
Huabing.Xu	5e76c6713d	migrate cpp-tests to director matrix stack	2014-04-03 15:59:55 +08:00
Dhilan007	93511a878b	Remove the old implementation of LabelTTF in test case.	2014-03-26 23:33:58 +08:00
andyque	57d8f155df	issue #4401. resolve conflicts	2014-03-26 14:54:50 +08:00
Dale Stammen	44e6efea64	#pragma mark for ios and mac only	2014-03-22 06:08:05 -07:00
James Chen	b88de91a15	Renames 'samples' folder to 'tests', ouch....	2014-03-11 19:10:34 +08:00