217 Commits

Author	SHA1	Message	Date
samuele3hu	ee4e5e4800	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_fix	2014-05-14 14:45:15 +08:00
samuele3hu	534ad2aafb	fix the compile error in Xcode 4.6 for mac platform which trigger by the Architectures’ value	2014-05-14 14:43:10 +08:00
Nite Luo	e1f82c174b	add TestCase for reparentChildren bug	2014-05-12 22:50:31 -07:00
Trace	0b8aed3536	Merge branch 'improved_glprogram' of https://github.com/super626/cocos2d-x into improved_glprogram	2014-05-09 11:51:00 -07:00
Trace	88f1d8ac4e	Add ShaderTest sample and shader code	2014-05-09 11:48:11 -07:00
Ricardo Quesada	78dd92a7ef	Merge remote-tracking branch 'cocos2d/v3' into improved_glprogram ... Conflicts: build/cocos2d_libs.xcodeproj/project.pbxproj	2014-05-09 11:40:13 -07:00
Dhilan007	c904fff9eb	update XCode project.pbxproj	2014-05-09 11:37:14 +08:00
Ricardo Quesada	51f498fc94	fixed deprecation warnings	2014-05-08 16:42:36 -07:00
Dhilan007	52d7d804f7	Update XCode project.pbxproj for add files related to VideoWidget.	2014-05-08 18:28:28 +08:00
minggo	9f0e25d808	Merge pull request #6628 from andyque/refactor5056 ... refactor 5056. pull gui tests from ExtensionTest to UITest	2014-05-08 17:00:38 +08:00
James Chen	bea98a1416	Lua xcode project fix	2014-05-08 15:09:02 +08:00
andyque	898a66131a	issue #5056. move gui test from ExtensionsTest to the outside	2014-05-08 14:35:45 +08:00
andyque	cb5b2a4f85	issue #4861, Merge branch 'v3' into focus3861 ... Conflicts: build/cocos2d_tests.xcodeproj/project.pbxproj	2014-05-05 17:40:28 +08:00
James Chen	67b2fbf14b	Updates xcode project, add ccs-res folder to Resources folder	2014-05-05 15:24:33 +08:00
James Chen	d82e03b048	Xcode project fix	2014-05-05 13:31:38 +08:00
andyque	a7fbd590dc	issue #4861. add a horizontal focus test	2014-05-05 11:37:39 +08:00
James Chen	8cbcf17163	issue #4674: Re-added deleted source files.	2014-05-04 14:37:55 +08:00