andyque ef5d4ddf86 Merge remote-tracking branch 'upstream/v3' into v3 ... # Conflicts: # tests/cpp-tests/proj.win8.1-universal/cpp-tests.Shared/cpp-tests.Shared.vcxitems.filters		2015-07-14 11:24:38 +08:00
..
ActionTimeline	Update parse animation easing	2015-04-10 17:05:55 +08:00
Images	add js resource for web tests	2015-05-25 16:50:27 +08:00
Manifests	Update the related manifests files for assetsmanager tests	2014-10-17 14:35:52 +08:00
Materials	samplers are treated as uniforms	2015-06-05 14:55:33 -07:00
Misc	Re-adds resources in cpp-tests and lua-tests, but removes some large	2014-05-05 13:27:47 +08:00
NavMesh	add 3d navigation	2015-05-29 16:45:33 +08:00
Particle3D	add physics3d support	2015-05-08 15:49:33 +08:00
Particles	Add test case for issue12310.	2015-06-12 15:39:57 +08:00
Presentation	fix the bug: shader in jsb can not run correctly.	2015-05-25 17:48:34 +08:00
Shaders	rename shader file name	2015-05-26 17:21:35 +08:00
Shaders3D	samplers are treated as uniforms	2015-06-05 14:55:33 -07:00
Sprite3DTest	Migrate test case from #10692 @babcca	2015-07-12 11:33:22 +08:00
TerrainTest	add physics3d support	2015-05-08 15:49:33 +08:00
TileMaps	add js resource for web tests	2015-05-25 16:50:27 +08:00
animations	add js resource for web tests	2015-05-25 16:50:27 +08:00
audio	Added MP3 support	2015-05-23 19:13:12 -07:00
ccb	add js resource for web tests	2015-05-25 16:50:27 +08:00
ccs-res@37b53805de	Add bug test for PageView layout & CCNodeDraw::onDrawGLLine	2015-07-07 09:54:42 +08:00
components	Re-adds resources in cpp-tests and lua-tests, but removes some large	2014-05-05 13:27:47 +08:00
configs	modify some about animate3D quality!	2015-04-24 11:49:28 +08:00
extensions	Re-adds resources in cpp-tests and lua-tests, but removes some large	2014-05-05 13:27:47 +08:00
fonts	Add test case for issue 12775	2015-07-13 15:38:33 +08:00
hd	[ci skip]Fixed resources.	2015-06-19 16:26:03 +08:00
spine	add spine test case	2015-04-14 16:14:51 +08:00
zwoptex	Re-adds resources in cpp-tests and lua-tests, but removes some large	2014-05-05 13:27:47 +08:00
.gitignore	Re-adds resources in cpp-tests and lua-tests, but removes some large	2014-05-05 13:27:47 +08:00
CocosBuilderExample.ccbproj	Re-adds resources in cpp-tests and lua-tests, but removes some large	2014-05-05 13:27:47 +08:00
CocosBuilderExample.ccbresourcelog	Mac fonts tests	2014-07-24 12:27:17 +04:00
Hello.png	Re-adds resources in cpp-tests and lua-tests, but removes some large	2014-05-05 13:27:47 +08:00
Test.html	finish WebView Tests	2014-08-26 22:03:55 +08:00
background-music-aac.mp3	add js-test resources	2015-05-21 15:38:41 +08:00
background-music-aac.wav	add js-test resources	2015-05-21 15:38:41 +08:00
background.caf	Re-adds resources in cpp-tests and lua-tests, but removes some large	2014-05-05 13:27:47 +08:00
background.mp3	Re-adds resources in cpp-tests and lua-tests, but removes some large	2014-05-05 13:27:47 +08:00
background.ogg	Re-adds resources in cpp-tests and lua-tests, but removes some large	2014-05-05 13:27:47 +08:00
background.wav	Re-adds resources in cpp-tests and lua-tests, but removes some large	2014-05-05 13:27:47 +08:00
cocosvideo.mp4	Encoded into AVC	2015-06-25 19:01:55 +08:00
effect1.raw	Re-adds resources in cpp-tests and lua-tests, but removes some large	2014-05-05 13:27:47 +08:00
effect1.wav	Re-adds resources in cpp-tests and lua-tests, but removes some large	2014-05-05 13:27:47 +08:00
effect2.mp3	add js resource for web tests	2015-05-25 16:50:27 +08:00
effect2.ogg	Re-adds resources in cpp-tests and lua-tests, but removes some large	2014-05-05 13:27:47 +08:00
fileLookup.plist	Re-adds resources in cpp-tests and lua-tests, but removes some large	2014-05-05 13:27:47 +08:00
fps_images.png	Adds missing 'fps_images.png', our test case needs them	2014-05-08 15:09:02 +08:00
music.mid	Re-adds resources in cpp-tests and lua-tests, but removes some large	2014-05-05 13:27:47 +08:00
pew-pew-lei.wav	Re-adds resources in cpp-tests and lua-tests, but removes some large	2014-05-05 13:27:47 +08:00