218 Commits

Author	SHA1	Message	Date
Ricardo Quesada	4a49668940	plist are not executable files	2014-05-09 20:11:36 -07:00
Huabing.Xu	168ff78e18	add test case for y flipped coord	2014-05-09 11:49:51 -07:00
Ricardo Quesada	087378926f	Merge remote-tracking branch 'cocos2d/v3' into improved_glprogram ... Conflicts: build/cocos2d_libs.xcodeproj/project.pbxproj	2014-05-08 10:16:09 -07:00
Dhilan007	972f9447dd	issue #4876:Add test case to play video	2014-05-08 18:14:32 +08:00
James Chen	88b0eb3baa	Adds missing 'fps_images.png', our test case needs them	2014-05-08 15:09:02 +08:00
yangxiao	5190fb27c8	use proposed vertex attribute api	2014-05-07 09:27:44 -07:00
Trace	69fd841b30	fix the include error	2014-05-06 11:19:51 -07:00
James Chen	399f5cf721	Adds submodule for CocoStudio resources (70MB)	2014-05-05 15:11:35 +08:00
James Chen	e16d6fa63f	Re-adds resources in cpp-tests and lua-tests, but removes some large ... files. We need to reuse some resources when doing some tests.	2014-05-05 13:27:47 +08:00
James Chen	3b3c1c4dbb	issue #4674: Removed large files and updated .gitignore	2014-05-04 14:36:16 +08:00
andyque	10cca8674a	closed #4783. remove unused comments in shader file	2014-04-14 12:06:42 +08:00
andyque	2c1f5da69c	issue #4783, add outline shader files	2014-04-14 11:52:17 +08:00
koowolf	ce78b6369a	add background.wav to wp8 to play	2014-03-31 11:46:39 +08:00
boyu0	f23db68151	build lua.a for arm64bit and iOS simulator 64 bit architectures, change .ma3 files to .caf files.	2014-03-15 01:19:06 +08:00
CaiWenzhi	b8ce59962a	Fixed bug of ScrollView	2014-03-13 10:11:41 +08:00
andyque	d806274f98	change gui to ui	2014-03-12 10:12:02 +08:00
andyque	469bee1e87	delete samples	2014-03-12 10:10:14 +08:00
James Chen	b88de91a15	Renames 'samples' folder to 'tests', ouch....	2014-03-11 19:10:34 +08:00