2075 Commits

Author	SHA1	Message	Date
Dhilan007	24452cada1	fixed compilation fails on android.	2014-05-08 21:39:53 +08:00
James Chen	0ed33cacf4	Adds vcxproj.user, win32 app run by VS2012 needs the 'Debug Path' which ... was set in '.user' file	2014-05-08 21:19:54 +08:00
Dhilan007	972f9447dd	issue #4876:Add test case to play video	2014-05-08 18:14:32 +08:00
andyque	0c2fd977ea	issue #5057. add UIDeprecated.h and refactor FocusDirection to inner class of ... Widget and also simplify the enum value	2014-05-08 18:10:21 +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
andyque	97ee5cb456	closed #5056. fix windows compile error	2014-05-08 16:18:46 +08:00
minggo	a8d728ffc9	Merge pull request #6610 from zawasp/vs2013project ... upgrade win32 projects for Visual Studio 2013	2014-05-08 15:40:02 +08:00
andyque	e48e26cfdc	issue #5056. fix linux & android compile error	2014-05-08 15:20:24 +08:00
James Chen	bea98a1416	Lua xcode project fix	2014-05-08 15:09:02 +08:00
James Chen	88b0eb3baa	Adds missing 'fps_images.png', our test case needs them	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	f6d0135b9b	Merge branch 'v3' into focus3861	2014-05-08 11:27:57 +08:00
andyque	323987beb2	closed #4861, done	2014-05-08 11:26:29 +08:00
Ricardo Quesada	90ec7dd9ec	Merge branch 'improved_glprogram' of https://github.com/super626/cocos2d-x into improved_glprogram	2014-05-07 20:21:03 -07:00
Ricardo Quesada	b401f6adc1	Lots of new code ... Adds GLProgramState	2014-05-07 20:20:19 -07:00
andyque	b5f1f7455b	issue #4861, fix a problem when layout focus loops	2014-05-08 10:46:05 +08:00
samuele3hu	ec45dbb0c9	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_fix	2014-05-08 10:22:52 +08:00
Huabing.Xu	41f48e7fa9	Merge branch 'v3' into tony_improved_glprogram	2014-05-07 15:30:04 -07:00
Ricardo Quesada	98454eeb69	Adds GLProgram::createXXX()	2014-05-07 14:38:41 -07:00
Ricardo Quesada	02405a8efe	Improved samples	2014-05-07 12:41:04 -07:00
Ricardo Quesada	b1ed7178fe	Improved API for Uniforms	2014-05-07 10:44:45 -07:00
yangxiao	5190fb27c8	use proposed vertex attribute api	2014-05-07 09:27:44 -07:00
Mircea Rila	b66b4c6f1d	upgrade win32 projects for Visual Studio 2013 (solves Platform Toolset v100 not found). ... remove C4005 warnings after upgrading projects	2014-05-07 17:41:04 +03:00
andyque	05b7d274c8	issue #4861. fix distance calculation	2014-05-07 18:27:05 +08:00
Dhilan007	72709c30d5	fixed compilation fail on Android.	2014-05-07 18:20:40 +08:00
samuele3hu	8615e13c91	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_fix	2014-05-07 17:16:40 +08:00
James Chen	9862fab58f	Comments fix in CCRenderTexture.h	2014-05-07 16:37:21 +08:00
andyque	1282252c25	closed #4861, refactor	2014-05-07 14:06:44 +08:00
andyque	657720e509	Merge remote-tracking branch 'upstream/v3' into focus3861	2014-05-07 11:42:09 +08:00
andyque	ef44b2687b	closed #4861, finished focus	2014-05-07 11:40:01 +08:00
andyque	ef70c684de	issue #4861, add requestFocus method and the layout current can get focus	2014-05-07 10:23:57 +08:00
andyque	62a66872aa	issue #4861, fixed some boundary conditions	2014-05-07 10:05:20 +08:00
Ricardo Quesada	db759005e0	Improvements for Attributes and Uniform API	2014-05-06 17:58:14 -07:00
Ricardo Quesada	21dd6fef69	Improves code a little bit	2014-05-06 12:46:35 -07:00
Trace	cf9e8ff0bd	Merge branch 'newV3' into improved_glprogram ... Conflicts: cocos/2d/CCGLProgram.cpp cocos/2d/CCGLProgram.h	2014-05-06 12:07:42 -07:00
Trace	69fd841b30	fix the include error	2014-05-06 11:19:51 -07:00
andyque	9d71ae29b9	issue #4861. fixed all widget focus diabled bug	2014-05-06 17:28:12 +08:00
andyque	51a704dcc8	issue #4861, refactor improve nested focus test	2014-05-06 15:11:55 +08:00
andyque	29c57568bf	issue #4861, add nested focus test	2014-05-06 14:38:45 +08:00
andyque	e52370e1c2	issue #4861, refactor UIFocusTest, simplify code	2014-05-06 14:20:01 +08:00
andyque	ad4e1f1e2c	issue #4861, improve UIFocusTest, add click event to ImageView	2014-05-06 14:14:22 +08:00
samuele3hu	3017c776e1	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_fix	2014-05-06 13:59:44 +08:00
samuele3hu	0ce2a38f17	Update bindings-generator and `MAX_SUB_TEST_NUMS` for SpritePerformance Test	2014-05-06 13:59:16 +08:00
andyque	e65b144ee6	issue #3861, fixs windows compile error	2014-05-06 10:17:10 +08:00
andyque	16ebe8d41c	issue #3861, fix linux compile error	2014-05-06 09:40:50 +08:00
Dale Stammen	703c6c2b39	added missing Assets folder	2014-05-05 13:47:43 -07: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	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
andyque	2d0de93baf	issue #4861, fixed a widget bug and add VBox test	2014-05-05 11:37:40 +08:00
andyque	852191a928	issue #4861, improve the horizontal layout test	2014-05-05 11:37:39 +08:00
andyque	0dc224a123	issue #4861. fix android compile error	2014-05-05 11:37:39 +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
James Chen	3b3c1c4dbb	issue #4674: Removed large files and updated .gitignore	2014-05-04 14:36:16 +08:00
Ricardo Quesada	207e67318d	rolling back tests	2014-05-01 16:55:28 -07:00
Ricardo Quesada	32f3fedb37	Moves cocos/2d/Android.mk to cocos/Android.mk ... Easier to find Android.mk	2014-05-01 14:09:26 -07:00
Ricardo Quesada	25213c81f6	linux cmake improvements ... Added cocos/CMakeLists.txt which controls all the rest of the Cmake files	2014-05-01 13:01:51 -07:00
Ricardo Quesada	c590bbe547	target is android-10	2014-04-30 13:18:57 -07:00
Ricardo Quesada	23ece1a91d	restores project.properties to 10	2014-04-30 13:16:50 -07:00
Ricardo Quesada	b5f513ce16	Merge branch 'v3' into improved_directory_structure	2014-04-30 13:15:10 -07:00
Huabing.Xu	16105df503	getNormalize->getNormalized	2014-05-01 01:10:18 +08:00
Huabing.Xu	c722b74e36	Merge branch 'v3' into v3_refactor_normalize	2014-04-30 20:08:37 +08:00
Huabing.Xu	ea4fee2c31	refactor normalize in Vector2	2014-04-30 18:07:05 +08:00
Ricardo Quesada	8bb8416c26	Improved directory structure	2014-04-29 17:37:36 -07:00
Huabing.Xu	bd93a5cb76	fix bug for renderTexture created which is bigger than screen size	2014-04-29 15:08:44 +08:00
samuele3hu	c3f40bdc24	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into dev_compile_error	2014-04-28 14:05:08 +08:00
samuele3hu	d3670644bf	Fix compile error for Lua	2014-04-28 14:04:37 +08:00
Dhilan007	35f83fc40a	fixed compile fail	2014-04-28 11:42:54 +08:00
Ricardo Quesada	81c2d92355	yeah... love in includes ... <3	2014-04-26 10:35:57 -07:00
Ricardo Quesada	9b118e5e96	Squashed commit of the following: ... commit 519fcd7f68e3586c376fd5e8d4a0ee220a48d225 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Sat Apr 26 10:10:06 2014 -0700 Updates templates files commit 2b07843ebe592f56b2abc544ccf66d441bb19fc5 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Sat Apr 26 10:08:19 2014 -0700 compiles on Windows commit b175522ef7205eaab3bd3f26c27c5d6514cbe2a4 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Sat Apr 26 09:55:30 2014 -0700 adds cocos2d.h commit 4c3d14f929bac017b93ca843b4f149d352264a30 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Sat Apr 26 09:54:24 2014 -0700 re-adds missing files commit f729181728959260d14c4152555534f5beec8e05 Merge: 148da79 2adac67 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Sat Apr 26 09:51:12 2014 -0700 Merge branch 'includes_fixes' of github.com:ricardoquesada/cocos2d-x into includes_fixes commit 148da79010c5dffeab885933624cffaf3d588852 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Sat Apr 26 09:49:12 2014 -0700 Adds SimpleAudioEngine commit 2adac67019180ec82b7bd03f0b67c12f62e29e77 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Sat Apr 26 09:47:45 2014 -0700 Compiles for Android commit 4a300d1b9225fa5708f25a69a50bb531f0ac1a32 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Sat Apr 26 09:13:35 2014 -0700 Fixes the includes	2014-04-26 10:11:22 -07:00
Huabing.Xu	feec24e3ef	Merge branch 'v3' into develop_migrate_math_lib_merge ... Conflicts: build/cocos2d_libs.xcodeproj/project.pbxproj cocos/2d/CCNode.cpp cocos/2d/CCRenderTexture.cpp cocos/2d/platform/wp8/CCGLView.h cocos/physics/CCPhysicsBody.cpp extensions/physics-nodes/CCPhysicsSprite.cpp extensions/physics-nodes/CCPhysicsSprite.h tests/cpp-tests/Classes/PhysicsTest/PhysicsTest.cpp	2014-04-25 16:20:24 +08:00
James Chen	828401a23d	Merge pull request #6302 from zifter/FixParticle ... closed #4880: Particle systems loading incorrectly in CocosBuilder	2014-04-25 14:15:44 +08:00
James Chen	06d9187783	Merge pull request #6270 from andyque/feature4783 ... closed #4783, add outline shader files	2014-04-25 13:50:44 +08:00
James Chen	037c57ef96	Merge branch 'develop' into perf-callback ... Conflicts: build/cocos2d_tests.xcodeproj/project.pbxproj	2014-04-25 12:07:48 +08:00
James Chen	cd6fe294b8	Merge pull request #6288 from boyu0/bug4771_move_physicsworld_2_layer ... closed #4771: Move PhysicsWorld to Layer	2014-04-25 11:52:32 +08:00
James Chen	328408d792	Merge pull request #6263 from Mazyod/develop-cpp11-http-client ... closed #4702: Update HTTPClient to use C++11 callbacks	2014-04-25 11:06:06 +08:00
James Chen	477fc9f0e0	Merge commit 'refs/pull/6012/head' of git://github.com/cocos2d/cocos2d-x into pull/6012 ... Conflicts: build/cocos2d_libs.xcodeproj/project.pbxproj	2014-04-25 10:59:11 +08:00
James Chen	7beb8b78fe	Merge pull request #6325 from MSOpenTech/wp8-3.0-update ... Wp8 3.0 update： Background texture is now correctly oriented in Transition Effects Accelerometer now works for WP8. Refactor of InputEvents was required to support adding Accelerometer event to rendering queue. Console support for WP8. Fixed cpp template for WP8. Added missing projects. Fixed property sheets. Updates precompiled shaders	2014-04-25 10:41:58 +08:00
Huabing.Xu	c2da6727be	fix compile warning after merge	2014-04-24 17:00:28 +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
samuele3hu	cd2a8e90d2	Remove the comments for ClippingNodeTest	2014-04-22 13:52:52 +08:00
samuele3hu	6b34239d75	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_fix	2014-04-22 13:48:00 +08:00
samuele3hu	771ce05d95	fix the bugs of SpriteTest that the Sprite created by passing rect display error	2014-04-22 13:41:10 +08:00
Huabing.Xu	560d24545a	3.0hotfix: Node: Clipping->RawStencilTest4-6	2014-04-22 10:58:42 +08:00
samuele3hu	582e961f2a	Replace getContentSize with getVirtualRendererSize related with Button in the CocoStudioGuiTest	2014-04-21 18:28:05 +08:00
Huabing.Xu	7a38050e09	Merge branch 'develop' into develop_migrate_math_lib_merge	2014-04-21 17:47:34 +08:00
samuele3hu	b3ac3b2324	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_fix	2014-04-21 17:13:34 +08:00
samuele3hu	b313b4ce74	Comment the last three test cases	2014-04-21 17:09:44 +08:00
zhangbin	440702aa06	Enable depth test in test case : TilemapTest->TMXOrthoVertexZ.	2014-04-21 15:26:57 +08:00
minggo	0a5b92c56f	Merge pull request #6305 from samuele3hu/developAudio ... fix the bug that exit layer can’t end the SimpleAudioEngine	2014-04-21 14:40:40 +08:00
boyu0	710fe9d940	closed #4771: modify test.	2014-04-21 13:32:47 +08:00
James Chen	a75432ec35	Merge pull request #6262 from Mazyod/develop-editbox-mac-enhancements ... Mac Editbox Text Font and Placeholder features	2014-04-21 11:18:07 +08:00
Dale Stammen	3930beda40	input event refactor. console enabled for wp8	2014-04-19 10:10:44 -07:00
Dale Stammen	467ededeff	enabled console for wp8	2014-04-19 10:08:01 -07:00
Huabing.Xu	3b83d52f95	Merge branch 'develop' into develop_migrate_math_lib_merge ... Conflicts: cocos/ui/UIButton.cpp cocos/ui/UIButton.h cocos/ui/UICheckBox.cpp cocos/ui/UICheckBox.h cocos/ui/UIImageView.cpp cocos/ui/UIImageView.h cocos/ui/UILayout.cpp cocos/ui/UILayout.h cocos/ui/UILoadingBar.cpp cocos/ui/UIRichText.h cocos/ui/UISlider.cpp cocos/ui/UIText.cpp cocos/ui/UIText.h cocos/ui/UITextAtlas.cpp cocos/ui/UITextAtlas.h cocos/ui/UITextBMFont.cpp cocos/ui/UITextBMFont.h cocos/ui/UITextField.cpp cocos/ui/UITextField.h cocos/ui/UIWidget.cpp tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIButtonTest/UIButtonTest.cpp tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIImageViewTest/UIImageViewTest.cpp tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UILayoutTest/UILayoutTest.cpp tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIScrollViewTest/UIScrollViewTest.cpp	2014-04-19 00:30:34 +08:00
minggo	d8d847bd65	Merge pull request #6319 from boyu0/bug4903_build_libcurl_with_openssl ... closed #4903: Build libcurl.a with openssl	2014-04-18 17:10:53 +08:00
boyu0	9756709473	closed #4903: change HttpClientTest get test 3 to https protocol.	2014-04-18 17:03:06 +08:00
samuele3hu	7e81f32016	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into devRichText	2014-04-18 11:55:30 +08:00
samuele3hu	914516a4e0	fix the compile error about luabindings and add the `RichText` test cases.	2014-04-18 11:54:57 +08:00
CaiWenzhi	ed4fcd5d1a	Merge branch 'develop' into develop_nutty_modifylayout_add_Boxes	2014-04-17 14:23:08 +08:00
CaiWenzhi	19f6526ef8	Widget supports contentsize	2014-04-17 14:08:25 +08:00
samuele3hu	1331fff62c	fix the bug that exit layer can’t end SimpleAudioEngine	2014-04-17 10:36:08 +08:00
zifter	08d975268d	Fix for issue http://www.cocos2d-x.org/issues/4880.	2014-04-17 03:15:43 +03:00
Huabing.Xu	718f3b3a57	remove warning message---continue	2014-04-16 10:47:29 +08:00
James Chen	60c1ed28dc	Removes unused enum in PerformaceCallbackTest	2014-04-16 10:41:42 +08:00
James Chen	ec40dda7f3	Adds performance test for callbacks: 1) std::function, ... 2) (target->*selector)(), 3) simulate new api of Scheduler	2014-04-16 10:35:58 +08:00
Huabing.Xu	95cb7721f6	Merge branch 'develop' into develop_migrate_math_lib_merge ... Conflicts: cocos/2d/CCSprite.cpp tests/cpp-tests/Classes/NewRendererTest/NewRendererTest.cpp	2014-04-15 22:21:04 +08:00
Huabing.Xu	7f61639541	replace Point with Vector2 in tests, extension folder	2014-04-15 18:23:40 +08:00
Huabing.Xu	5303f50904	Migrate to Vector2 in DrawPrimitive.h	2014-04-15 17:29:23 +08:00
Huabing.Xu	6686b657a4	Migrate getPostion and correspondent member variable to Vector2	2014-04-15 16:28:59 +08:00
Huabing.Xu	071cbc7565	migrate setPosition to Vector2	2014-04-15 16:16:14 +08:00
boyu0	b53961b78d	issue $4771: fix lua test and fix some bugs	2014-04-15 13:40:44 +08:00
Ricardo Quesada	584ccf65e4	Culling working again	2014-04-14 16:46:19 -07:00
boyu0	c98f50026f	issue $4771: move PhysicsWorld to layer.	2014-04-15 03:21:18 +08:00
Huabing.Xu	a5e900a86b	manually enable depth test in test case TMXIsoVertexZ	2014-04-14 17:06:35 +08:00
minggo	bb15d0ecf9	Merge pull request #6267 from dabingnn/develop_add_culling_enabled_option ... Add interface setCullingEnabled(), culling is disabled by default	2014-04-14 14:50:11 +08:00
Huabing.Xu	ec5398e7c6	Merge branch 'develop' into develop_migrate_math_lib_merge ... Conflicts: tests/cpp-tests/Classes/RenderTextureTest/RenderTextureTest.h	2014-04-14 14:08:19 +08:00
andyque	87b437dd3a	closed #4783. replace deprecated function call	2014-04-14 13:48:17 +08:00
andyque	10cca8674a	closed #4783. remove unused comments in shader file	2014-04-14 12:06:42 +08:00
andyque	00d2bd833f	closed #4783. finish the shading effects	2014-04-14 12:03:37 +08:00
andyque	2c1f5da69c	issue #4783, add outline shader files	2014-04-14 11:52:17 +08:00
Huabing.Xu	d2dd57d412	change indention to space and remove comment code	2014-04-14 11:45:06 +08:00
Huabing.Xu	9935e8ddfb	setCullingEnabled set to public access ... changed renderer->culling test case	2014-04-14 11:33:40 +08:00
Mazyad Alabduljaleel	40e6288ac7	[NEW]: update HTTPClient to use C++11 callbacks ... [NEW]: updated tests to use the new API [DEP]: deprecated old target/selector API	2014-04-13 01:06:04 +04:00
Mazyad Alabduljaleel	8919931a50	small indentation fix	2014-04-13 00:26:38 +04:00
Mazyad Alabduljaleel	b369c24f01	+ [NEW]: setting the font for Editbox text ... + [NEW]: setting the font for Editbox placeholder + [NEW]: setting the color for Editbox placeholder + [NEW]: updated test cases to show the new functionality	2014-04-13 00:19:14 +04:00
James Chen	043f86cd6b	Memory leak fix in SchedulerTest	2014-04-12 12:59:28 +08:00
James Chen	427ca4ecf0	Small fix in Lua test.	2014-04-11 05:45:18 -07:00
James Chen	b71e1c1570	Merge pull request #6250 from natural-law/develop ... fix the error effect of ` FontTest` in lua-tests.	2014-04-11 20:26:30 +08:00
James Chen	350f61c4da	Merge pull request #5921 from koowolf/Branch_cocos2d-x-3.0rc0 ... closed #4497: use /z7 to build without .pdb	2014-04-11 20:20:47 +08:00
zhangbin	99766cdd03	fix the error show of ` FontTest`	2014-04-11 20:17:34 +08:00
zhangbin	d611cfb49f	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop	2014-04-11 20:03:24 +08:00
zhangbin	0eee9bc288	Solve the incorrect effect of some transition test case in lua-tests.	2014-04-11 20:02:11 +08:00
Huabing.Xu	1aa909371d	remove kmMat4 in Cpp-tests	2014-04-11 18:03:07 +08:00
James Chen	b40773f6d0	Merge pull request #6240 from dabingnn/develop_add_rendererAssert ... Trigger an assert if a command is added while render is rendering.	2014-04-11 17:37:02 +08:00
James Chen	bf2450ad54	Merge pull request #6242 from andyque/fix_zfighting ... fix a compile error	2014-04-11 16:49:21 +08:00
andyque	280c2755b3	closed #4761. fix a compile error	2014-04-11 16:47:35 +08:00
James Chen	96ce8cb8cb	Merge pull request #6241 from andyque/fix_zfighting ... closed #4761, fix zfighting between tests	2014-04-11 16:41:39 +08:00
andyque	83664e2322	closed #4761. fix a improve super class function call	2014-04-11 16:34:26 +08:00
andyque	4be149e492	closed #4761, fix zfighting between tests	2014-04-11 16:30:25 +08:00
Huabing.Xu	51289e8a4c	1. add assert condition of rendering when adding command ... 2. fix bug: renderTexture->SpriteRenderTextureBug	2014-04-11 16:05:22 +08:00
boyu0	b69b14382e	Rename lua cc.Label:create to cc.Label:createWithTTF and cc.Label.createWithSystemFont	2014-04-11 15:25:18 +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
samuele3hu	70dec15e76	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_fix	2014-04-10 23:38:57 +08:00
samuele3hu	c687b97c6e	fix the crash invoked by deprecated `create` function of `Label`	2014-04-10 23:36:25 +08:00
heliclei	157fce785c	fix CCConsole linux crash	2014-04-10 18:31:28 +08:00
James Chen	5d882cea23	Merge pull request #6213 from koowolf/wp8_fix ... fix compiler error in wp8	2014-04-10 17:10:08 +08:00
James Chen	9c07ca5722	Merge pull request #6220 from Dhilan007/develop ... Fixed logical error in TestChangeAnimationInternal::onExit.	2014-04-10 16:54:38 +08:00
koowolf	b5433f05c1	replace LabelTTF with Label	2014-04-10 16:51:25 +08:00
Dhilan007	d583dcc0f0	Fixed logical error in TestChangeAnimationInternal::onExit.	2014-04-10 16:48:51 +08:00
James Chen	8fcf687452	Merge pull request #6216 from Dhilan007/develop ... Fixed logical error in CameraCenterTest::onExit.	2014-04-10 16:17:10 +08:00
Dhilan007	fce85e08f9	Fixed logical error in CameraCenterTest::onExit.	2014-04-10 16:13:07 +08:00
James Chen	428cea061c	Merge pull request #6214 from dumganhar/iss4744-set-dirty-for-node ... closed #4744: EventDispatcher::setDirtyForNode doesn't consider node's children	2014-04-10 15:35:29 +08:00
James Chen	8a66f43f30	closed #4744: Adds test for issue4744.	2014-04-10 15:31:53 +08:00
samuele3hu	2800133c99	Add deprecated support for `Label::create` and new lua binding for `Label:createWithTTF`	2014-04-10 14:54:14 +08:00
James Chen	efb443dea0	Merge pull request #6200 from dumganhar/iss4729-deprecated-folder ... issue #4729: Move deprecated stuff to deprecated folder	2014-04-10 11:17:21 +08:00
James Chen	ba1f535201	Merge pull request #6199 from Dhilan007/develop_label ... closed #4743: Label:Makes the create functions of Label clearer.	2014-04-10 11:15:56 +08:00
Huabing.Xu	5475a0fc02	fix compile error after merge	2014-04-10 10:58:43 +08:00
Huabing.Xu	07ac817a7c	Merge branch 'develop' into develop_migrate_math_lib_merge	2014-04-10 10:52:15 +08:00
Huabing.Xu	d865341694	remove kmMat4 interface in cpp-tests	2014-04-10 10:16:16 +08:00
James Chen	890dd64d38	issue #4729: some warning fixes and compilation error fixes on win32.	2014-04-10 01:29:13 +08:00
James Chen	5615717617	issue #4729: NULL -> nullptr in constructor or setXXX(NULL)	2014-04-10 00:36:43 +08:00
minggo	2beed5d398	Merge pull request #6166 from dabingnn/develop_fix_rendererBug ... Develop fix renderer bug	2014-04-10 00:27:33 +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
samuele3hu	b6579aa322	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_new_label	2014-04-09 16:25:44 +08:00
samuele3hu	7de6552f54	Update the NewEventDispatcherTest	2014-04-09 16:22:03 +08:00
samuele3hu	1c124f52ad	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_new_label	2014-04-09 14:29:04 +08:00
samuele3hu	dbd01051d8	close #4721:clone for EventListeners of lua didn't clone the related property	2014-04-09 14:26:05 +08:00
zhangbin	43eaccca09	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into issue4703	2014-04-09 13:47:18 +08:00
Darragh Coy	50be1ca3ad	Fix win32 build	2014-04-08 22:47:08 -07:00
zhangbin	ddffa3b120	closed #4703, Solve the incorrect effect of test case : RenderTexture test issue 937.	2014-04-09 13:40:43 +08:00
Darragh Coy	d64603a856	Attempt to fix the linux build.	2014-04-08 22:29:40 -07:00
James Chen	8e428d7321	Merge pull request #6163 from heliclei/fix-autotest ... fix autotest touch hang:run test scene constructor in cocos thread	2014-04-09 13:28:30 +08:00
Darragh Coy	14b210a082	RefPtr<T> - add move semantics ... Add support for move semantics to the RefPtr<T> class. Implement a move constructor and a move assignment operator.	2014-04-08 11:34:27 -07:00
Darragh Coy	440a0adcde	Whoops... Shouldn't remove the test cpp.	2014-04-08 10:40:32 -07:00
Darragh Coy	a34b952e8d	Revert "Fix Android build for RefPtr addition." ... This reverts commit 586383a05e.	2014-04-08 10:35:55 -07:00
Huabing.Xu	409b696bab	remove kmMat4 interface in class Node	2014-04-08 23:05:33 +08:00
Huabing.Xu	3837c23ebe	draw() using Matrix instead of kmMat4	2014-04-08 22:07:35 +08:00
Huabing.Xu	e8596094a4	Merge branch 'develop' into develop_migrate_math_lib_merge	2014-04-08 16:58:51 +08:00
shujunqiao	fb777b1a1d	[ci skip], delete ShaderFail sample in ShaderTest.cpp.	2014-04-08 14:52:17 +08:00
shujunqiao	fae742c0b8	modify ShaderTest.cpp not crah to autotest.	2014-04-08 14:32:25 +08:00
heliclei	798708f775	fix autotest touch hang:run test scene constructor in cocos thread	2014-04-08 11:29:42 +08:00
Darragh Coy	bb85df66b1	Add an event dispatcher test ... Add an event dispatcher test to help reproduce crashes fixed by the previous commit and to verify that the fix still works.	2014-04-07 16:46:03 -07:00
Huabing.Xu	1b0c55ef15	issue #4629: test case add a spriteInGroup instead of sprite, the sprite can not be seen now	2014-04-07 22:31:24 +08:00
Huabing.Xu	beda294be1	issue #4629: add test case for group command	2014-04-07 22:02:43 +08:00
Ricardo Quesada	f1a2db9006	Merge pull request #6140 from dumganhar/render-clean ... Adds `Renderer::clean`, and fixes crash in `PerformanceTest/Node children Test`.	2014-04-04 13:34:29 -07:00
Huabing.Xu	29c345bd02	Merge branch 'develop' into develop_migrate_math_lib_merge	2014-04-04 18:45:21 +08:00
James Chen	541d4dea0c	Merge pull request #6105 from andyque/feature3636 ... Added create functions with parameters for all ui controls	2014-04-04 18:34:59 +08:00
Huabing.Xu	6b4451482f	remove matrixToKmMat4 function	2014-04-04 18:13:10 +08:00
Huabing.Xu	f1b1678900	Director::getMatrix returns Matrix instead of kmMat4	2014-04-04 17:31:21 +08:00
James Chen	7b4a1308ea	Adds `Renderer::clean`, and fixes crash in `PerformanceTest/Node ... children Test`.	2014-04-04 12:48:16 +08:00
James Chen	1ec3f014e8	Merge pull request #6130 from dumganhar/iss4557-set-enabled-listener ... closed #4557: Adds `EventListener::setEnabled/isEnabled`.	2014-04-03 18:02:44 +08:00
Huabing.Xu	f9405e0ea9	Merge branch 'develop' into develop_migrate_math_lib_merge	2014-04-03 17:47:16 +08:00
andyque	c501aa2dec	issue #4636. replace __String with StringUtils::format	2014-04-03 17:42:04 +08:00
Huabing.Xu	67e62ce73d	readied director::getMatrix again. remove kmGLgetMatrix	2014-04-03 17:26:06 +08:00
samuele3hu	b68f6bf65e	fix the error about `draw` of GLNode and modify the related test cases	2014-04-03 17:02:14 +08:00
andyque	c35c006fbd	Merge branch 'develop' into feature3636	2014-04-03 16:02:00 +08:00
Huabing.Xu	5e76c6713d	migrate cpp-tests to director matrix stack	2014-04-03 15:59:55 +08:00
andyque	0875b4e51f	closed #4636. Done	2014-04-03 15:56:45 +08:00
andyque	8996ab1956	issue #4636, finish refactorying UITextFieldTest	2014-04-03 15:52:42 +08:00
andyque	ed2c38eb98	issue #4636, finish UITextBMFont	2014-04-03 15:45:06 +08:00
andyque	08bf6c27f4	issue #4636. finish UITextAtlasTest	2014-04-03 15:38:52 +08:00
andyque	b59beab61a	issue #4636, finish UISlider	2014-04-03 15:33:57 +08:00
James Chen	f6859a3ca9	closed #4557: Adds `EventListener::setEnabled/isEnabled`.	2014-04-03 15:32:16 +08:00
andyque	a7a1a6b05b	issue #4636, finish UIRichTextTest and UIScrollViewTest	2014-04-03 15:22:23 +08:00
andyque	8b9af0e94c	issue #4636. finish UIPageViewTest	2014-04-03 11:52:35 +08:00
andyque	48429f5738	issue #4636. finish UILoadingBar	2014-04-03 11:34:06 +08:00
andyque	278e2c3e3b	issue #4636. finish UIListViewTest	2014-04-03 11:23:12 +08:00
samuele3hu	bff1d6c2a6	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_new_label	2014-04-03 11:15:59 +08:00
andyque	fe33588038	issue #4636. finish UILayout	2014-04-03 11:14:35 +08:00
samuele3hu	b9ff51782f	Synchronize LabelTest of cpp to lua to fix some bug and add more tests	2014-04-03 11:08:59 +08:00
andyque	1a97ebdcb0	issue #4636. finish UIImageView	2014-04-03 10:42:30 +08:00
andyque	52bdb840ee	issue #4636. finish UICheckBox	2014-04-03 10:34:20 +08:00
andyque	10134ccc65	issue #4636. finish button	2014-04-03 10:31:10 +08:00
andyque	0a6b0a4389	issue #4636. refactor Scale9Sprite	2014-04-03 10:07:47 +08:00
andyque	b27fe6ecc2	issue #4636. add parameter create method to UITextBMFont	2014-04-03 10:07:46 +08:00
andyque	0b5c10a0fb	issue #4636. add parameter create method to UITextAtlas	2014-04-03 10:07:46 +08:00
andyque	a03dc76f7d	issue #4636, add parameter create method for UILoadingBar	2014-04-03 10:07:46 +08:00
andyque	92945715eb	issue #4636. add parameter create function for UIText	2014-04-03 10:07:46 +08:00
andyque	558abf1a6b	issue #4636, add parameter create method to UIImageView	2014-04-03 10:07:46 +08:00
andyque	ba9a605568	issue #4636, add parameter create method to UICheckBox	2014-04-03 10:07:46 +08:00
andyque	1b0583214b	issue #4636, add parameter create method to UIButton	2014-04-03 10:07:46 +08:00
zhangbin	f744ddc860	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop	2014-04-02 17:15:39 +08:00
zhangbin	0e0000e6d5	The projection reset to DEFAULT when a test case onExit().	2014-04-02 17:12:09 +08:00
samuele3hu	0c93c6ae60	fix error that “lua-test/opengltest/shader retro effect” test case have no effect	2014-04-02 15:34:26 +08:00
Huabing.Xu	45b0ba3871	migrate Vertex2f to Vector2(tests)	2014-04-02 15:25:50 +08:00
Huabing.Xu	56aa50617c	migrate Vertex3f to Vector3(Tests)	2014-04-02 15:25:19 +08:00
James Chen	944e752509	fonts/xxx.ttf -> Xxx for old LabelTTF test.	2014-04-01 14:49:02 +08:00
Dhilan007	eadbca8ee7	1.fixed logical error in Label::enableShadow. ... 2.Add test case for shadow and outline take effect at the same time.	2014-04-01 14:15:35 +08:00
minggo	7804fdf0a1	Merge pull request #6078 from boyu0/3.0rc1_test ... 1. Hide CameraTest2. 2. Correct the projection setting, fix camera cente...	2014-04-01 11:23:16 +08:00
boyu0	18b0c041b4	1. Hide CameraTest2. 2. Correct the projection setting, fix camera center test projection.	2014-03-31 18:17:00 +08:00
James Chen	bc5a2ff5db	Merge pull request #6075 from Dhilan007/develop_label ... fixed warnings in LabelTest.	2014-03-31 17:40:30 +08:00
Dhilan007	687b2e9f87	update test case.	2014-03-31 17:38:54 +08:00
Dhilan007	51f3833a7e	fixed warn.	2014-03-31 17:31:04 +08:00
Dhilan007	72811d8869	fixed warn in test case.	2014-03-31 17:21:56 +08:00
James Chen	f4a7da8457	Merge pull request #6069 from Dhilan007/develop_label ... fixed can't type chinese.	2014-03-31 16:46:43 +08:00
Dhilan007	6c99f992dc	fixed can't type chinese.	2014-03-31 16:18:45 +08:00
minggo	98ed579b34	Merge pull request #6052 from pipu/develop_pipu_fixedbugsforeditor_1301 ... Fixed bugs for Editor	2014-03-31 15:37:45 +08:00
minggo	7840a246b7	Merge pull request #6063 from koowolf/add_bg_wav ... add background.wav to wp8 to play	2014-03-31 15:20:26 +08:00
James Chen	313108af82	Merge pull request #6065 from boyu0/3.0rc1_test ... fix box2dbed dynamic tree test draw.	2014-03-31 14:38:00 +08:00
boyu0	48854f4649	delete Time of Impact test which can not shown	2014-03-31 13:41:48 +08:00
boyu0	9b75fc5595	add box2dbed test keyboard event.	2014-03-31 12:07:21 +08:00
koowolf	ce78b6369a	add background.wav to wp8 to play	2014-03-31 11:46:39 +08:00
boyu0	4fa8d24561	fix some box2d test position	2014-03-31 11:26:11 +08:00
zhangbin	8aa187d8dc	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop	2014-03-31 10:47:04 +08:00
zhangbin	95ab15195c	Optimize the performance of BlurSpriteTest in Shader Sprite.	2014-03-31 10:44:48 +08:00
boyu0	530354ca67	fix box2d dynamic tree draws	2014-03-31 10:21:54 +08:00
minggo	6cc51a2cfc	Merge pull request #6057 from samuele3hu/develop_socket ... Add the omitted socket script for lua-tests	2014-03-31 10:15:38 +08:00
minggo	f80bdfff76	Merge pull request #6055 from MSOpenTech/wp8-3.0 ... Cocos2d-x 3.0 Windows Phone 8 support	2014-03-29 23:21:34 +08:00
minggo	a874ecf8b0	Merge pull request #6053 from natural-law/develop ... Solve the error effect of BlurSpriteTest in Shader Sprite.	2014-03-29 21:42:54 +08:00
samuele3hu	056303ea35	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_socket	2014-03-29 14:58:45 +08:00
samuele3hu	219a91a641	Add the omitted socket script for lua-tests	2014-03-29 14:58:23 +08:00
samuele3hu	7127cb560e	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_test	2014-03-29 10:36:15 +08:00
samuele3hu	403e96b943	Use the New Label in the Extension test case	2014-03-29 10:34:52 +08:00
Dale Stammen	c739956582	added wp8 support files and projects	2014-03-28 15:54:36 -07:00
Dale Stammen	8d1f4188eb	added wp8 support files and projects	2014-03-28 15:53:55 -07:00
Dale Stammen	8bd5497ac6	use ResolutionPolicy::SHOW_ALL on WP8	2014-03-28 11:28:48 -07:00
Dale Stammen	210f95c2d3	can't close app on WP8	2014-03-28 11:27:43 -07:00
samuele3hu	a387f60f80	Update the font size for new label test display	2014-03-28 23:32:11 +08:00
zhangbin	77e0694883	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop	2014-03-28 20:55:12 +08:00
zhangbin	6a1974a78a	Solve the error effect of BlurSpriteTest in Shader Sprite.	2014-03-28 20:53:14 +08:00
pipu	733b364b51	Fixed bugs for Editor	2014-03-28 18:54:06 +08:00
James Chen	581ef454eb	Merge pull request #6047 from samuele3hu/develop_test ... Replace `LabelTTF` and `LabelBMFont` with `Label` for cocosbuild proxy and fix the error that ControlSwitch:create raised.	2014-03-28 18:04:12 +08:00
zhangbin	338fd43beb	Solve the error effect of clipping in cpp-tests & lua-tests.	2014-03-28 17:45:28 +08:00
samuele3hu	7ca207f993	Replace `LabelTTF` and `LabelBMFont` with `Label` for cocosbuild proxy and fix the error that ControlSwitch:create raised.	2014-03-28 17:18:41 +08:00
James Chen	fd9ab5c4d1	Merge pull request #6039 from Dhilan007/develop_label ... LabelTTF and LabelBMFont tagged as deprecated	2014-03-28 14:31:11 +08:00
Dhilan007	898e2136b1	LabelTTF and LabelBMFont tagged as deprecated	2014-03-28 14:18:01 +08:00
James Chen	5c77b4d4b1	Merge pull request #6011 from DarraghCoy/event_listener_crash_fixes ... closed #4586: Fix crashes in event dispatch other related safety checks/fixes	2014-03-28 11:28:41 +08:00
minggo	b607172e57	Merge pull request #6035 from Dhilan007/develop_label ... Remove the old implementation of LabelBMFont.	2014-03-28 10:32:04 +08:00
Dhilan007	fd5a4acddb	Remove the old implementation of LabelBMFont.	2014-03-28 10:28:44 +08:00
Darragh Coy	8ca3cf8a93	Update the test for dangling node pointers in the events system. ... Should be run when the debug event listener verification for nodes is switched on.	2014-03-27 16:38:06 -07:00
Darragh Coy	ba450f786c	Fix the new test added to the event dispatcher tests	2014-03-27 16:16:27 -07:00
Darragh Coy	2b7116060d	Add a test for events being sent to destroyed nodes.	2014-03-27 16:00:21 -07:00
boyu0	9fbb45136a	closed #4573: add ParticleVisibleTest.	2014-03-27 17:06:26 +08:00
samuele3hu	6fbf1b4cdf	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_test	2014-03-27 11:21:20 +08:00
samuele3hu	06f4cb31b2	Replace NativeActivity with Cocos2dActivity and modify lua android project setting.	2014-03-27 11:18:13 +08:00
James Chen	6f425c96cb	Merge pull request #6007 from Dhilan007/develop_testcase ... Remove the old implementation of LabelTTF in test case.	2014-03-27 11:13:37 +08:00
pandamicro	87384d8ffa	Fixed #4566: Move LayerGradient's init functions into CC_CONSTRUCTOR_ACCESS section	2014-03-27 10:55:41 +08:00
pandamicro	87f9eb3217	Fixed #4566: Remove autorelease for create construct in LayerTest	2014-03-27 10:25:39 +08:00
pandamicro	413e0010f5	Fixed #4566: Fix LayerTest bug	2014-03-27 10:22:04 +08:00
Darragh Coy	586383a05e	Fix Android build for RefPtr addition.	2014-03-26 16:30:04 -07:00
Darragh Coy	036dc5542c	Add cocos2d::RefPtr<T> ... This class which acts a smart pointer type class for cocos2d::Ref objects. Can be used to help automate memory management and remove manual retain/release calls from code, resulting in less code and less chance of errors. Also useful to implement the RAII idiom in certain scenarios, ensuring that an object gets released upon exiting a scope.	2014-03-26 15:30:15 -07:00
Dhilan007	93511a878b	Remove the old implementation of LabelTTF in test case.	2014-03-26 23:33:58 +08:00
James Chen	2c616fc9da	Merge pull request #6005 from flashjay/develop ... remove deprecated code in lua tests & template	2014-03-26 20:12:10 +08:00
faryang-rmbp	491dc202df	remove deprecated code in lua tests & template	2014-03-26 19:42:07 +08:00
James Chen	849d7b9109	Merge pull request #5996 from chengstory/AddNewCreateNodeWay ... Adding support of using CCComRender as parent for attached component	2014-03-26 18:20:34 +08:00
zhangcheng	58a61d94fb	add use CCComRender as parent for attaching component	2014-03-26 16:39:32 +08:00
James Chen	22fdbbb198	Merge pull request #5980 from Dhilan007/develop_label2 ... Refactor implementation of label's shadow and fixed stroke was not 'outside stroke' for Label generated by 'Font name'	2014-03-26 16:32:04 +08:00
andyque	876f643bc4	issue #4401, fix a typo	2014-03-26 16:00:55 +08:00
James Chen	21ba509a35	Merge pull request #5989 from dumganhar/iss4559-ios-64bit ... closed #4559: Wrong behavior of multi-touch on iphone5s/ipadAir (arm64 arch)	2014-03-26 15:27:57 +08:00
James Chen	c1faad7e2c	Warning fixes in SocketIOTest.cpp/ FileUtilsTest.cpp.	2014-03-26 15:04:45 +08:00
andyque	57d8f155df	issue #4401. resolve conflicts	2014-03-26 14:54:50 +08:00
minggo	a374241f65	Merge pull request #5924 from MSOpenTech/wp8-3.0-cocos2d-changes ... Windows Phone 8,0 cocos2d-x 3.0 changes	2014-03-26 13:58:46 +08:00
James Chen	7a8db8271f	Merge pull request #5930 from andyque/Branch_issue4429 ... closed #4429: Boolean value could not be written to specified plist file	2014-03-26 11:46:56 +08:00
Dhilan007	1247760d95	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_label_fixs ... Conflicts: cocos/2d/CCLabel.cpp	2014-03-26 11:15:48 +08:00
Ricardo Quesada	473a6b19ee	Upgrades to Chipmunk 6.2.1	2014-03-25 10:37:35 -07:00
James Chen	f6c6d428ad	Merge pull request #5926 from andyque/fix_tests_warnings ... issue #4401, remove warnings under win32	2014-03-25 18:17:42 +08:00
zhangbin	36892c3a98	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into issue2880	2014-03-25 16:21:41 +08:00
zhangbin	d6ad9274c4	closed #2880, Generate mipmap for the texture has mipmaps when reload textures.	2014-03-25 16:19:34 +08:00
Dhilan007	674dffce21	Merge branch 'develop-label-stroke' of https://github.com/dumganhar/cocos2d-x into develop_label_fixs	2014-03-25 16:10:47 +08:00
James Chen	34245d4bd0	Merge pull request #5953 from dumganhar/merge5934 ... closed #4541: [ui] Removed Widget::addNode, added ProtectedNode.	2014-03-25 15:46:56 +08:00
minggo	3fc15e5e7d	Merge pull request #5896 from splhack/remove_nativeactivity ... Remove NativeActivity	2014-03-25 15:37:12 +08:00
CaiWenzhi	2dffcb9808	Add ProtectedNode and remove "addNode"	2014-03-25 14:28:58 +08:00
James Chen	32f647d38b	Merge pull request #5940 from boyu0/iss4513_particle_readd_bug ... closed #4513: Particle doesn't animate when it was removed and re-added to another node.	2014-03-25 14:05:12 +08:00
James Chen	8d28884c9f	Merge pull request #5806 from Dhilan007/develop_reImplementationWithLabel ... issue #3821: Uses new label instead of LabelTTF in engine.	2014-03-25 13:46:17 +08:00
James Chen	5625c98443	Merge pull request #5942 from Dhilan007/develop_label2 ... label: 1) change default value of anchor point to Middle. 2) Shadow offset and outline size passed to new Label consider 'contentScaleFactor'	2014-03-25 11:39:53 +08:00
boyu0	289e632a40	closed #4513: change 1.0 to 1.0f to avoid the warning.	2014-03-25 11:36:35 +08:00
Dhilan007	a3b83d68b2	update test case.	2014-03-25 11:10:48 +08:00
Dhilan007	b074890b57	update test case	2014-03-25 10:57:44 +08:00
Kazuki Sakamoto	3fba61f384	Remove NativeActivity	2014-03-24 19:57:29 -07:00
Dale Stammen	04b529d328	fixed use of nullptr in variable args for wp8	2014-03-24 15:09:24 -07:00
boyu0	1520f85b32	closed #4513: fix titles.	2014-03-24 18:20:11 +08:00
boyu0	759ec61639	closed #4513: Particle doesn't animate when readd it.	2014-03-24 18:08:55 +08:00
James Chen	a2d00c8f95	Adds another test for stroke.	2014-03-24 17:39:23 +08:00
James Chen	99b65f0a7c	LabelTest , changed stroke color to blue.	2014-03-24 17:05:24 +08:00
andyque	4a974e24df	revert vcxproj files	2014-03-24 10:50:48 +08:00
andyque	f5795c25b6	remove warnings under win32	2014-03-24 10:12:40 +08:00
Dale Stammen	62e45b37f9	disabled console for wp8/winrt. Don't quit app for winrt/wp8	2014-03-22 06:17:34 -07:00
Dale Stammen	912d316ae5	use ResolutionPolicy::SHOW_ALL for winrt/wp8. disabled console for wp8/winrt	2014-03-22 06:16:43 -07:00
Dale Stammen	0d4ae12f1e	disables webp tests for wp8 and winrt	2014-03-22 06:15:45 -07:00
Dale Stammen	2a13bbccc9	disabled network tests for wp8/winrt until networking code is added	2014-03-22 06:15:18 -07:00
Dale Stammen	4c03c526c1	added missing virtual. disabled console for wp8/winrt until networking code is added	2014-03-22 06:14:44 -07:00
Dale Stammen	4df55dc6ee	no mp3 support for wp8. Added define for .wav	2014-03-22 06:14:03 -07:00
Dale Stammen	44e6efea64	#pragma mark for ios and mac only	2014-03-22 06:08:05 -07:00
Dale Stammen	b50a158b62	need to terminate variable args list with NULL. nullptr will not work with wp8 compiler	2014-03-22 06:04:36 -07:00
koowolf	504501896f	closed #4497: use /z7 to build without .pdb, or will face with error c3130.	2014-03-21 16:39:00 +08:00
James Chen	cecc00c650	Merge pull request #5893 from Dhilan007/develop_label ... closed #4489: Label: Refactoring relevant functions of setting text color.	2014-03-21 14:52:55 +08:00
James Chen	6340547fc5	Merge pull request #5900 from heliclei/fix-test-memory-leak ... fix memory leak in CocosDenshionTest.	2014-03-21 11:21:04 +08:00
heliclei	9c00484022	Autorelease custom extended class, fix memory leak	2014-03-21 11:07:28 +08:00
James Chen	d5e8bde89e	Merge pull request #5889 from samuele3hu/develop_socket ... close #4400: Use the latest version of LuaSocket and modify the related project config	2014-03-21 10:52:38 +08:00
James Chen	3cde66dce8	Merge pull request #5854 from boyu0/iss4424_setgravityenable_fix ... closed #4424: fix PhysicsBody::setGravityEnable() doesn't work correctly sometimes	2014-03-21 09:34:33 +08:00
Dhilan007	9dfa099bef	Label:Refactoring related functions of color.	2014-03-20 20:56:10 +08:00
samuele3hu	4b25c9f62e	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_socket	2014-03-20 17:07:33 +08:00
samuele3hu	d3487d2d3c	close #4400: Use the newest version of LuaSocket for lua	2014-03-20 17:04:54 +08:00
andyque	dd790ce54d	add id return value to LuaObjectCBridge	2014-03-20 16:59:18 +08:00
andyque	f26ae8a019	remove unused params warnings	2014-03-20 16:34:42 +08:00
andyque	7ab639ec0f	fix lots compile warnings	2014-03-20 16:24:55 +08:00
andyque	ae3310bffb	Merge branch 'develop' into fix_warnings ... Conflicts: cocos/base/CCConsole.cpp cocos/base/CCConsole.h	2014-03-20 14:50:02 +08:00
andyque	2dcc600fa1	remove unused accelerometer	2014-03-20 14:29:05 +08:00
James Chen	86d013b162	Merge pull request #5844 from heliclei/refactor-console-upload ... refactor upload:encode file with base64, detach upload from main loop	2014-03-20 14:26:59 +08:00
andyque	bab53ef2bd	add test for ios and mac	2014-03-19 16:47:57 +08:00
andyque	cadbfbe9b1	add Bool Integer Float Double support to CCDictionary	2014-03-19 16:47:57 +08:00
andyque	00249328a6	add boolean support for mac and ios	2014-03-19 16:47:57 +08:00
Huabing.Xu	dc9baa7c72	closed #4382: added missed scaleZ feature for scaleZ	2014-03-19 16:23:14 +08:00
boyu0	c4aaaf9231	closed #4424: fix PhysicsBody::setGravity() doesn't work correctly sometimes.	2014-03-18 16:17:43 +08:00
Dhilan007	d59fb25e2a	update test case of issue 4428.	2014-03-18 10:26:45 +08:00
Dhilan007	4d5c7fc634	Add a test case to reproduce issue 4428.	2014-03-18 10:20:25 +08:00
heliclei	4657b28c2d	refactor upload:encode file with base64, detach upload from main loop	2014-03-18 00:42:36 +08:00
minggo	dfb3b6719c	Merge pull request #5818 from boyu0/support_for_xcode_iphone_64bit_simulator ... build lua.a for arm64bit and iOS simulator 64 bit architectures, change ...	2014-03-15 01:22:28 +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
Dhilan007	e512235299	Remove the old implementation of LabelTTF	2014-03-14 21:06:40 +08:00
samuele3hu	a05d6a55e2	fix: Make Close Menu invisible for iOS platform	2014-03-14 17:38:58 +08:00
samuele3hu	4aef65d4b7	fix the error that AssetManager test case can’t find correct resource path	2014-03-14 09:48:48 +08:00
samuele3hu	ca56410427	Rename `testlua` to `lua_tests` for luaTest android project	2014-03-13 17:36:53 +08:00
James Chen	ad316654c2	Merge pull request #5743 from heliclei/remove-node-name ... remove node name related features from v3.0	2014-03-13 11:09:49 +08:00
heliclei	c26b103b23	remove node name related features from v3.0	2014-03-13 10:45:02 +08:00
CaiWenzhi	a4d558adee	Merge branch 'develop' into develop_nutty_modify_framework_for315CrashFixed	2014-03-13 10:25:32 +08:00
CaiWenzhi	b8ce59962a	Fixed bug of ScrollView	2014-03-13 10:11:41 +08:00
minggo	67e3a25582	Merge pull request #5669 from nutty898/develop_nutty_modify_framework_for315CrashFixed ... Develop nutty modify framework for315 crash fixed	2014-03-12 19:45:46 +08:00
samuele3hu	7e48dbc572	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_new_fix	2014-03-12 18:35:06 +08:00
samuele3hu	9713a246ee	Replace cc.LabelBMFont:create with cc.Label:createBMFont	2014-03-12 18:33:28 +08:00
James Chen	f609d57a00	Merge pull request #5671 from heliclei/walk-node-tree ... Add enumerateChildrenByName for walking through node tree with callback	2014-03-12 18:23:43 +08:00
heliclei	2a3cb0847e	refactor api name	2014-03-12 18:10:45 +08:00
samuele3hu	c69d9e75b2	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_new_fix	2014-03-12 17:58:20 +08:00
samuele3hu	1c32c6d96f	Replace cc.LabelTTF:create with cc.Label:create	2014-03-12 17:51:34 +08:00
CaiWenzhi	4d99736e4a	Merge branch 'develop' into develop_nutty_modify_framework_for315CrashFixed	2014-03-12 17:06:48 +08:00
James Chen	27a7dce447	Adds lua-empty-test to VS project.	2014-03-12 16:20:27 +08:00
James Chen	611cccd3e7	[win32] HelloCpp -> cpp-empty-test, HelloLua -> lua-empty-test.	2014-03-12 15:59:48 +08:00
James Chen	dd87df1cbc	rename TestCpp to cpp-tests, TestLua to lua-tests in VS projects.	2014-03-12 15:30:21 +08:00
heliclei	fa40bee023	fix lambda introducer	2014-03-12 14:50:44 +08:00
samuele3hu	d06bb83f19	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_new_fix ... Conflicts: tests/lua-tests/src/CocoStudioTest/CocoStudioArmatureTest/CocoStudioArmatureTest.lua	2014-03-12 14:33:39 +08:00
samuele3hu	9c95c1e456	Replace cc.LabelTTF:create with cc.Label:create	2014-03-12 14:27:52 +08:00
heliclei	d57d2f3059	Merge remote-tracking branch 'upstream/develop' into walk-node-tree	2014-03-12 14:19:55 +08:00
James Chen	4a55e98adf	[lua] Reverts 'removing tolua.cast in test case, I don't know why it was re-added.	2014-03-12 14:06:57 +08:00
James Chen	6baea45db6	Merge pull request #5679 from Dhilan007/develop_label ... issue #4337: Two fixes for new label: 1. Color and opacity can't take effect. 2. The font size passed to new Label didn't consider 'contentScaleFactor'.	2014-03-12 11:17:49 +08:00
andyque	cb4acc6311	fix linux compile error	2014-03-12 11:03:23 +08:00
andyque	2c2a5ee38e	rename gui to ui	2014-03-12 10:46:49 +08:00
andyque	0634a1accd	fix lua resource path	2014-03-12 10:19: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
andyque	8e125734fe	Merge branch 'develop' into fix_gui_to_ui ... Conflicts: build/cocos2d_samples.xcodeproj/project.pbxproj samples/cpp-tests/Resources/cocosgui/100/100.ExportJson samples/cpp-tests/Resources/cocosgui/100/1000.plist samples/cpp-tests/Resources/cocosgui/100/1000.png samples/cpp-tests/Resources/cocosgui/CloseNormal.png samples/cpp-tests/Resources/cocosgui/CloseSelected.png samples/cpp-tests/Resources/cocosgui/CocoGUISample.json samples/cpp-tests/Resources/cocosgui/CocoGUI_PageView_Sample.json samples/cpp-tests/Resources/cocosgui/CustomImageViewTest/NewProject_20.plist samples/cpp-tests/Resources/cocosgui/CustomImageViewTest/NewProject_20.png samples/cpp-tests/Resources/cocosgui/CustomImageViewTest/NewProject_2_1.ExportJson samples/cpp-tests/Resources/cocosgui/Hello.png samples/cpp-tests/Resources/cocosgui/Marker Felt.ttf samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIButton_Editor/UIButton_Editor_1.json samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIButton_Editor/background.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIButton_Editor/buttonBackground.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIButton_Editor/buttonHighlighted.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIButton_Editor/button_n.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIButton_Editor/button_p.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIButton_Editor/ribbon.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UICheckBox_Editor/background.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UICheckBox_Editor/buttonBackground.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UICheckBox_Editor/ribbon.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UICheckBox_Editor/selected01.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UICheckBox_Editor/selected02.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UICheckBox_Editor/ui_checkbox_editor_1.json samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIImageView_Editor/GUI/image.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIImageView_Editor/background.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIImageView_Editor/buttonBackground.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIImageView_Editor/buttonHighlighted.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIImageView_Editor/ribbon.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIImageView_Editor/ui_ImageView_editor_1.json samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILabelAtlas_Editor/GUI/labelatlasimg.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILabelAtlas_Editor/background.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILabelAtlas_Editor/buttonBackground.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILabelAtlas_Editor/ribbon.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILabelAtlas_Editor/ui_labelatlas_editor_1.json samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILabelBMFont_Editor/GUI/missing-font.fnt samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILabelBMFont_Editor/GUI/missing-font.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILabelBMFont_Editor/background.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILabelBMFont_Editor/buttonBackground.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILabelBMFont_Editor/ribbon.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILabelBMFont_Editor/ui_labelbmfont_editor_1.json samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILabel_Editor/A Damn Mess.ttf samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILabel_Editor/background.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILabel_Editor/buttonBackground.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILabel_Editor/ribbon.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILabel_Editor/ui_label_editor_1.json samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/GUI/image.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/Hello.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/background.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/buttonBackground.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/button_n.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/button_p.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/ribbon.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/selected01.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/selected02.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/ui_layout_backgroundimage_editor_1_0_0.json samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Color_Editor/GUI/image.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Color_Editor/background.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Color_Editor/buttonBackground.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Color_Editor/button_n.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Color_Editor/button_p.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Color_Editor/ribbon.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Color_Editor/selected01.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Color_Editor/selected02.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Color_Editor/ui_layout_color_editor_1.json samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Editor/GUI/image.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Editor/background.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Editor/buttonBackground.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Editor/button_n.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Editor/button_p.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Editor/ribbon.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Editor/selected01.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Editor/selected02.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Editor/ui_layout_editor_1.json samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Gradient_Color_Editor/GUI/image.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Gradient_Color_Editor/background.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Gradient_Color_Editor/buttonBackground.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Gradient_Color_Editor/button_n.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Gradient_Color_Editor/button_p.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Gradient_Color_Editor/ribbon.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Gradient_Color_Editor/selected01.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Gradient_Color_Editor/selected02.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Gradient_Color_Editor/ui_layout_gradient_color_editor_1_0.json samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Horizontal_Layout_Editor/GUI/image.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Horizontal_Layout_Editor/background.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Horizontal_Layout_Editor/buttonBackground.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Horizontal_Layout_Editor/button_n.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Horizontal_Layout_Editor/button_p.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Horizontal_Layout_Editor/ribbon.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Horizontal_Layout_Editor/selected01.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Horizontal_Layout_Editor/selected02.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Horizontal_Layout_Editor/ui_layout_linear_horizontal_layout_editor.json samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Vertical_Layout_Editor/GUI/image.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Vertical_Layout_Editor/background.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Vertical_Layout_Editor/buttonBackground.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Vertical_Layout_Editor/button_n.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Vertical_Layout_Editor/button_p.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Vertical_Layout_Editor/ribbon.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Vertical_Layout_Editor/selected01.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Vertical_Layout_Editor/selected02.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Vertical_Layout_Editor/ui_layout_linear_vertical_layout_editor.json samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Location_Editor/GUI/image.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Location_Editor/background.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Location_Editor/buttonBackground.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Location_Editor/button_n.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Location_Editor/button_p.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Location_Editor/ribbon.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Location_Editor/selected01.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Location_Editor/selected02.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Location_Editor/ui_layout_relative_align_location_editor.json samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Parent_Editor/GUI/image.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Parent_Editor/background.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Parent_Editor/buttonBackground.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Parent_Editor/button_n.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Parent_Editor/button_p.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Parent_Editor/ribbon.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Parent_Editor/selected01.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Parent_Editor/selected02.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Parent_Editor/ui_layout_relative_align_parent_editor.json samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Scale9_BackgroundImage_Editor/GUI/image.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Scale9_BackgroundImage_Editor/background.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Scale9_BackgroundImage_Editor/buttonBackground.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Scale9_BackgroundImage_Editor/button_n.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Scale9_BackgroundImage_Editor/button_p.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Scale9_BackgroundImage_Editor/ribbon.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Scale9_BackgroundImage_Editor/selected01.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Scale9_BackgroundImage_Editor/selected02.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Scale9_BackgroundImage_Editor/slider_bar.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Scale9_BackgroundImage_Editor/ui_layout_scale9_backgroundimage_editor.json samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIListView_Editor/UIListView_Horizontal_Editor/GUI/button.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIListView_Editor/UIListView_Horizontal_Editor/GUI/image.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIListView_Editor/UIListView_Horizontal_Editor/background.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIListView_Editor/UIListView_Horizontal_Editor/buttonBackground.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIListView_Editor/UIListView_Horizontal_Editor/button_p.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIListView_Editor/UIListView_Horizontal_Editor/ribbon.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIListView_Editor/UIListView_Horizontal_Editor/ui_listview_horizontal_editor_1.json samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIListView_Editor/UIListView_Vertical_Editor/GUI/button.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIListView_Editor/UIListView_Vertical_Editor/GUI/image.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIListView_Editor/UIListView_Vertical_Editor/background.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIListView_Editor/UIListView_Vertical_Editor/buttonBackground.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIListView_Editor/UIListView_Vertical_Editor/button_p.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIListView_Editor/UIListView_Vertical_Editor/ribbon.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIListView_Editor/UIListView_Vertical_Editor/ui_listview_editor_1.json samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILoadingBar_Editor/GUI/loadingbar.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILoadingBar_Editor/background.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILoadingBar_Editor/buttonBackground.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILoadingBar_Editor/ribbon.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILoadingBar_Editor/ui_loadingbar_editor_1.json samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIPageView_Editor/background.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIPageView_Editor/buttonBackground.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIPageView_Editor/button_n.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIPageView_Editor/ribbon.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIPageView_Editor/ui_pageview_editor_1.json samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Both_Editor/GUI/image.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Both_Editor/background.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Both_Editor/buttonBackground.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Both_Editor/button_n.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Both_Editor/button_p.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Both_Editor/ribbon.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Both_Editor/selected01.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Both_Editor/selected02.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Both_Editor/ui_scrollview_both_editor_1.json samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Horizontal_Editor/GUI/image.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Horizontal_Editor/background.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Horizontal_Editor/buttonBackground.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Horizontal_Editor/button_n.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Horizontal_Editor/button_p.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Horizontal_Editor/ribbon.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Horizontal_Editor/selected01.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Horizontal_Editor/selected02.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Horizontal_Editor/ui_scrollview_horizontal_editor_1.json samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Vertical_Editor/GUI/image.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Vertical_Editor/background.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Vertical_Editor/buttonBackground.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Vertical_Editor/button_n.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Vertical_Editor/button_p.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Vertical_Editor/ribbon.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Vertical_Editor/selected01.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Vertical_Editor/selected02.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Vertical_Editor/ui_scrollview_editor_1.json samples/cpp-tests/Resources/cocosgui/UIEditorTest/UISlider_Editor/2014-1-26 11-42-09.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UISlider_Editor/2014-1-26 11-43-52.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UISlider_Editor/background.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UISlider_Editor/buttonBackground.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UISlider_Editor/ribbon.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UISlider_Editor/silder_progressBar.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UISlider_Editor/slider_bar.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UISlider_Editor/slider_bar_button.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UISlider_Editor/ui_slider_editor_1.json samples/cpp-tests/Resources/cocosgui/UIEditorTest/UITextField_Editor/background.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UITextField_Editor/buttonBackground.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UITextField_Editor/ribbon.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UITextField_Editor/ui_textfield_editor_1.json samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIWidgetAddNode_Editor/background.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIWidgetAddNode_Editor/buttonBackground.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIWidgetAddNode_Editor/ribbon.png samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIWidgetAddNode_Editor/ui_widget_add_node_editor.json samples/cpp-tests/Resources/cocosgui/UITest/UITest.json samples/cpp-tests/Resources/cocosgui/UITest/b1.png samples/cpp-tests/Resources/cocosgui/UITest/b2.png samples/cpp-tests/Resources/cocosgui/UITest/background.png samples/cpp-tests/Resources/cocosgui/UITest/buttonBackground.png samples/cpp-tests/Resources/cocosgui/UITest/f1.png samples/cpp-tests/Resources/cocosgui/UITest/f2.png samples/cpp-tests/Resources/cocosgui/UITest/r1.png samples/cpp-tests/Resources/cocosgui/UITest/r2.png samples/cpp-tests/Resources/cocosgui/UITest/ribbon.png samples/cpp-tests/Resources/cocosgui/animationbuttonnormal.png samples/cpp-tests/Resources/cocosgui/animationbuttonpressed.png samples/cpp-tests/Resources/cocosgui/arrow.png samples/cpp-tests/Resources/cocosgui/b11.png samples/cpp-tests/Resources/cocosgui/backtotopnormal.png samples/cpp-tests/Resources/cocosgui/backtotoppressed.png samples/cpp-tests/Resources/cocosgui/bitmapFontTest2.fnt samples/cpp-tests/Resources/cocosgui/bitmapFontTest2.png samples/cpp-tests/Resources/cocosgui/button.png samples/cpp-tests/Resources/cocosgui/buttonHighlighted.png samples/cpp-tests/Resources/cocosgui/ccicon.png samples/cpp-tests/Resources/cocosgui/check_box_active.png samples/cpp-tests/Resources/cocosgui/check_box_active_disable.png samples/cpp-tests/Resources/cocosgui/check_box_active_press.png samples/cpp-tests/Resources/cocosgui/check_box_normal.png samples/cpp-tests/Resources/cocosgui/check_box_normal_disable.png samples/cpp-tests/Resources/cocosgui/check_box_normal_press.png samples/cpp-tests/Resources/cocosgui/examples/Test/UIResForEditor/Button/button_country_n.png samples/cpp-tests/Resources/cocosgui/examples/Test/UIResForEditor/Button/button_country_p.png samples/cpp-tests/Resources/cocosgui/examples/Test/UIResForEditor/Button/button_country_un.png samples/cpp-tests/Resources/cocosgui/examples/Test/UIResForEditor/Button/symbol_1B.png samples/cpp-tests/Resources/cocosgui/examples/Test/UIResForEditor/Button/symbol_1a.png samples/cpp-tests/Resources/cocosgui/examples/Test/UIResForEditor/Button/symbol_1c.png samples/cpp-tests/Resources/cocosgui/examples/equip/111.png samples/cpp-tests/Resources/cocosgui/examples/equip/12.png samples/cpp-tests/Resources/cocosgui/examples/equip/13.png samples/cpp-tests/Resources/cocosgui/examples/equip/14.png samples/cpp-tests/Resources/cocosgui/examples/equip/15.png samples/cpp-tests/Resources/cocosgui/examples/equip/2.png samples/cpp-tests/Resources/cocosgui/examples/equip/button_end_01.png samples/cpp-tests/Resources/cocosgui/examples/equip/button_end_02.png samples/cpp-tests/Resources/cocosgui/examples/equip/button_green_n2.png samples/cpp-tests/Resources/cocosgui/examples/equip/button_green_p2.png samples/cpp-tests/Resources/cocosgui/examples/equip/button_green_un2.png samples/cpp-tests/Resources/cocosgui/examples/equip/eg/1.png samples/cpp-tests/Resources/cocosgui/examples/equip/eg/10.png samples/cpp-tests/Resources/cocosgui/examples/equip/eg/11.png samples/cpp-tests/Resources/cocosgui/examples/equip/eg/3.png samples/cpp-tests/Resources/cocosgui/examples/equip/eg/4.png samples/cpp-tests/Resources/cocosgui/examples/equip/eg/5.png samples/cpp-tests/Resources/cocosgui/examples/equip/eg/6.png samples/cpp-tests/Resources/cocosgui/examples/equip/eg/7.png samples/cpp-tests/Resources/cocosgui/examples/equip/eg/8.png samples/cpp-tests/Resources/cocosgui/examples/equip/eg/9.png samples/cpp-tests/Resources/cocosgui/examples/equip/eg/crab.png samples/cpp-tests/Resources/cocosgui/examples/equip/eg/research.png samples/cpp-tests/Resources/cocosgui/examples/equip/eg/sell.png samples/cpp-tests/Resources/cocosgui/examples/equip/eg/shop_shield_1.png samples/cpp-tests/Resources/cocosgui/examples/equip/eg/shop_shield_2.png samples/cpp-tests/Resources/cocosgui/examples/equip/eg/shop_shield_3.png samples/cpp-tests/Resources/cocosgui/examples/equip/eg/train.png samples/cpp-tests/Resources/cocosgui/examples/equip/eg/upgrade.png samples/cpp-tests/Resources/cocosgui/examples/examples.json samples/cpp-tests/Resources/cocosgui/examples/weapon_introduce/4.png samples/cpp-tests/Resources/cocosgui/examples/weapon_introduce/5.png samples/cpp-tests/Resources/cocosgui/examples/weapon_introduce/6.png samples/cpp-tests/Resources/cocosgui/examples/weapon_introduce/button_end_01.png samples/cpp-tests/Resources/cocosgui/examples/weapon_introduce/button_end_02.png samples/cpp-tests/Resources/cocosgui/examples/weapon_introduce/weapon_item_1/weapon_item/1.png samples/cpp-tests/Resources/cocosgui/examples/weapon_introduce/weapon_item_1/weapon_item/2.png samples/cpp-tests/Resources/cocosgui/examples/weapon_introduce/weapon_item_1/weapon_item/7.png samples/cpp-tests/Resources/cocosgui/examples/weapon_introduce/weapon_item_1/weapon_item_1.json samples/cpp-tests/Resources/cocosgui/green_edit.png samples/cpp-tests/Resources/cocosgui/grossini-aliases.png samples/cpp-tests/Resources/cocosgui/gui_examples/UIAction_1/CocoStudio_UIEditor.png samples/cpp-tests/Resources/cocosgui/gui_examples/UIAction_1/UIAction_1.json samples/cpp-tests/Resources/cocosgui/gui_examples/buy_1/5.png samples/cpp-tests/Resources/cocosgui/gui_examples/buy_1/7.png samples/cpp-tests/Resources/cocosgui/gui_examples/buy_1/button.png samples/cpp-tests/Resources/cocosgui/gui_examples/buy_1/buttonHighlighted.png samples/cpp-tests/Resources/cocosgui/gui_examples/buy_1/buy_1.json samples/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/111.png samples/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/12.png samples/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/13.png samples/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/14.png samples/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/15.png samples/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/2.png samples/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/button_end_01.png samples/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/button_end_02.png samples/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/button_green_n2.png samples/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/button_green_p2.png samples/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/button_green_un2.png samples/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/eg/1.png samples/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/eg/10.png samples/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/eg/11.png samples/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/eg/3.png samples/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/eg/4.png samples/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/eg/5.png samples/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/eg/6.png samples/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/eg/7.png samples/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/eg/8.png samples/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/eg/9.png samples/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/eg/crab.png samples/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/eg/research.png samples/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/eg/sell.png samples/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/eg/shop_shield_1.png samples/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/eg/shop_shield_2.png samples/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/eg/shop_shield_3.png samples/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/eg/train.png samples/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/eg/upgrade.png samples/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip_1.json samples/cpp-tests/Resources/cocosgui/gui_examples/map_1/image_castle.png samples/cpp-tests/Resources/cocosgui/gui_examples/map_1/map_1.json samples/cpp-tests/Resources/cocosgui/gui_examples/map_1/map_pve.png samples/cpp-tests/Resources/cocosgui/gui_examples/map_alert_1/5.png samples/cpp-tests/Resources/cocosgui/gui_examples/map_alert_1/7.png samples/cpp-tests/Resources/cocosgui/gui_examples/map_alert_1/close_02.png samples/cpp-tests/Resources/cocosgui/gui_examples/map_alert_1/close_03.png samples/cpp-tests/Resources/cocosgui/gui_examples/map_alert_1/close_04.png samples/cpp-tests/Resources/cocosgui/gui_examples/map_alert_1/map_alert_1.json samples/cpp-tests/Resources/cocosgui/gui_examples/page_1/background.png samples/cpp-tests/Resources/cocosgui/gui_examples/page_1/buttonBackground.png samples/cpp-tests/Resources/cocosgui/gui_examples/page_1/page_1.json samples/cpp-tests/Resources/cocosgui/gui_examples/page_1/page_content/CocoStudio_AnimationEditor.png samples/cpp-tests/Resources/cocosgui/gui_examples/page_1/page_content/CocoStudio_DataEditor.png samples/cpp-tests/Resources/cocosgui/gui_examples/page_1/page_content/CocoStudio_SceneEditor.png samples/cpp-tests/Resources/cocosgui/gui_examples/page_1/page_content/CocoStudio_UIEditor.png samples/cpp-tests/Resources/cocosgui/gui_examples/page_1/ribbon.png samples/cpp-tests/Resources/cocosgui/gui_examples/page_1/teehanlax - iOS 6 - iPhone_check.png samples/cpp-tests/Resources/cocosgui/gui_examples/page_1/teehanlax - iOS 6 - iPhone_check01.png samples/cpp-tests/Resources/cocosgui/gui_examples/register_1/128_128.png samples/cpp-tests/Resources/cocosgui/gui_examples/register_1/Rosewood stdloadingH.fnt samples/cpp-tests/Resources/cocosgui/gui_examples/register_1/Rosewood stdloadingH.png samples/cpp-tests/Resources/cocosgui/gui_examples/register_1/button_d.png samples/cpp-tests/Resources/cocosgui/gui_examples/register_1/button_n.png samples/cpp-tests/Resources/cocosgui/gui_examples/register_1/e-mail.png samples/cpp-tests/Resources/cocosgui/gui_examples/register_1/register_1.json samples/cpp-tests/Resources/cocosgui/gui_examples/register_1/ui_shop_005-hd.png samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_introduce/4.png samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_introduce/5.png samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_introduce/6.png samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_introduce/button_end_01.png samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_introduce/button_end_02.png samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_introduce_1.json samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapon_item/1.png samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapon_item/2.png samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapon_item/7.png samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapon_item_1.json samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_1.png samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_10.png samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_11.png samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_12.png samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_13.png samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_14.png samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_15.png samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_16.png samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_17.png samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_18.png samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_19.png samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_2.png samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_20.png samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_21.png samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_22.png samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_23.png samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_24.png samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_25.png samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_26.png samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_27.png samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_28.png samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_29.png samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_3.png samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_30.png samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_31.png samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_4.png samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_5.png samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_6.png samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_7.png samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_8.png samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_9.png samples/cpp-tests/Resources/cocosgui/labelatlas.png samples/cpp-tests/Resources/cocosgui/loadingbar.png samples/cpp-tests/Resources/cocosgui/scrollviewbg.png samples/cpp-tests/Resources/cocosgui/slidbar.png samples/cpp-tests/Resources/cocosgui/sliderProgress.png samples/cpp-tests/Resources/cocosgui/sliderProgress2.png samples/cpp-tests/Resources/cocosgui/sliderThumb.png samples/cpp-tests/Resources/cocosgui/sliderTrack.png samples/cpp-tests/Resources/cocosgui/sliderTrack2.png samples/cpp-tests/Resources/cocosgui/slider_bar_active_9patch.png samples/cpp-tests/Resources/cocosgui/sliderballnormal.png samples/cpp-tests/Resources/cocosgui/sliderballpressed.png samples/cpp-tests/Resources/cocosgui/switch-mask.png samples/cpp-tests/Resources/cocosui/100/100.ExportJson samples/cpp-tests/Resources/cocosui/100/1000.plist samples/cpp-tests/Resources/cocosui/100/1000.png samples/cpp-tests/Resources/cocosui/CloseNormal.png samples/cpp-tests/Resources/cocosui/CloseSelected.png samples/cpp-tests/Resources/cocosui/CocoGUISample.json samples/cpp-tests/Resources/cocosui/CocoGUI_PageView_Sample.json samples/cpp-tests/Resources/cocosui/CustomImageViewTest/NewProject_20.plist samples/cpp-tests/Resources/cocosui/CustomImageViewTest/NewProject_20.png samples/cpp-tests/Resources/cocosui/CustomImageViewTest/NewProject_2_1.ExportJson samples/cpp-tests/Resources/cocosui/Hello.png samples/cpp-tests/Resources/cocosui/Marker Felt.ttf samples/cpp-tests/Resources/cocosui/UIEditorTest/UIButton_Editor/UIButton_Editor_1.json samples/cpp-tests/Resources/cocosui/UIEditorTest/UIButton_Editor/background.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UIButton_Editor/buttonBackground.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UIButton_Editor/buttonHighlighted.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UIButton_Editor/button_n.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UIButton_Editor/button_p.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UIButton_Editor/ribbon.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UICheckBox_Editor/background.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UICheckBox_Editor/buttonBackground.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UICheckBox_Editor/ribbon.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UICheckBox_Editor/selected01.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UICheckBox_Editor/selected02.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UICheckBox_Editor/ui_checkbox_editor_1.json samples/cpp-tests/Resources/cocosui/UIEditorTest/UIImageView_Editor/GUI/image.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UIImageView_Editor/background.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UIImageView_Editor/buttonBackground.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UIImageView_Editor/buttonHighlighted.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UIImageView_Editor/ribbon.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UIImageView_Editor/ui_ImageView_editor_1.json samples/cpp-tests/Resources/cocosui/UIEditorTest/UILabelAtlas_Editor/GUI/labelatlasimg.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UILabelAtlas_Editor/background.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UILabelAtlas_Editor/buttonBackground.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UILabelAtlas_Editor/ribbon.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UILabelAtlas_Editor/ui_labelatlas_editor_1.json samples/cpp-tests/Resources/cocosui/UIEditorTest/UILabelBMFont_Editor/GUI/missing-font.fnt samples/cpp-tests/Resources/cocosui/UIEditorTest/UILabelBMFont_Editor/GUI/missing-font.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UILabelBMFont_Editor/background.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UILabelBMFont_Editor/buttonBackground.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UILabelBMFont_Editor/ribbon.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UILabelBMFont_Editor/ui_labelbmfont_editor_1.json samples/cpp-tests/Resources/cocosui/UIEditorTest/UILabel_Editor/A Damn Mess.ttf samples/cpp-tests/Resources/cocosui/UIEditorTest/UILabel_Editor/background.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UILabel_Editor/buttonBackground.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UILabel_Editor/ribbon.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UILabel_Editor/ui_label_editor_1.json samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/GUI/image.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/Hello.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/background.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/buttonBackground.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/button_n.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/button_p.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/ribbon.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/selected01.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/selected02.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/ui_layout_backgroundimage_editor_1_0_0.json samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Color_Editor/GUI/image.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Color_Editor/background.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Color_Editor/buttonBackground.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Color_Editor/button_n.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Color_Editor/button_p.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Color_Editor/ribbon.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Color_Editor/selected01.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Color_Editor/selected02.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Color_Editor/ui_layout_color_editor_1.json samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Editor/GUI/image.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Editor/background.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Editor/buttonBackground.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Editor/button_n.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Editor/button_p.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Editor/ribbon.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Editor/selected01.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Editor/selected02.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Editor/ui_layout_editor_1.json samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Gradient_Color_Editor/GUI/image.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Gradient_Color_Editor/background.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Gradient_Color_Editor/buttonBackground.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Gradient_Color_Editor/button_n.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Gradient_Color_Editor/button_p.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Gradient_Color_Editor/ribbon.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Gradient_Color_Editor/selected01.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Gradient_Color_Editor/selected02.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Gradient_Color_Editor/ui_layout_gradient_color_editor_1_0.json samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Linear_Horizontal_Layout_Editor/GUI/image.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Linear_Horizontal_Layout_Editor/background.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Linear_Horizontal_Layout_Editor/buttonBackground.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Linear_Horizontal_Layout_Editor/button_n.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Linear_Horizontal_Layout_Editor/button_p.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Linear_Horizontal_Layout_Editor/ribbon.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Linear_Horizontal_Layout_Editor/selected01.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Linear_Horizontal_Layout_Editor/selected02.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Linear_Horizontal_Layout_Editor/ui_layout_linear_horizontal_layout_editor.json samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Linear_Vertical_Layout_Editor/GUI/image.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Linear_Vertical_Layout_Editor/background.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Linear_Vertical_Layout_Editor/buttonBackground.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Linear_Vertical_Layout_Editor/button_n.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Linear_Vertical_Layout_Editor/button_p.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Linear_Vertical_Layout_Editor/ribbon.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Linear_Vertical_Layout_Editor/selected01.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Linear_Vertical_Layout_Editor/selected02.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Linear_Vertical_Layout_Editor/ui_layout_linear_vertical_layout_editor.json samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Location_Editor/GUI/image.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Location_Editor/background.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Location_Editor/buttonBackground.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Location_Editor/button_n.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Location_Editor/button_p.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Location_Editor/ribbon.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Location_Editor/selected01.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Location_Editor/selected02.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Location_Editor/ui_layout_relative_align_location_editor.json samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Parent_Editor/GUI/image.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Parent_Editor/background.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Parent_Editor/buttonBackground.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Parent_Editor/button_n.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Parent_Editor/button_p.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Parent_Editor/ribbon.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Parent_Editor/selected01.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Parent_Editor/selected02.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Parent_Editor/ui_layout_relative_align_parent_editor.json samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Scale9_BackgroundImage_Editor/GUI/image.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Scale9_BackgroundImage_Editor/background.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Scale9_BackgroundImage_Editor/buttonBackground.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Scale9_BackgroundImage_Editor/button_n.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Scale9_BackgroundImage_Editor/button_p.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Scale9_BackgroundImage_Editor/ribbon.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Scale9_BackgroundImage_Editor/selected01.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Scale9_BackgroundImage_Editor/selected02.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Scale9_BackgroundImage_Editor/slider_bar.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Scale9_BackgroundImage_Editor/ui_layout_scale9_backgroundimage_editor.json samples/cpp-tests/Resources/cocosui/UIEditorTest/UIListView_Editor/UIListView_Horizontal_Editor/GUI/button.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UIListView_Editor/UIListView_Horizontal_Editor/GUI/image.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UIListView_Editor/UIListView_Horizontal_Editor/background.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UIListView_Editor/UIListView_Horizontal_Editor/buttonBackground.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UIListView_Editor/UIListView_Horizontal_Editor/button_p.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UIListView_Editor/UIListView_Horizontal_Editor/ribbon.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UIListView_Editor/UIListView_Horizontal_Editor/ui_listview_horizontal_editor_1.json samples/cpp-tests/Resources/cocosui/UIEditorTest/UIListView_Editor/UIListView_Vertical_Editor/GUI/button.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UIListView_Editor/UIListView_Vertical_Editor/GUI/image.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UIListView_Editor/UIListView_Vertical_Editor/background.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UIListView_Editor/UIListView_Vertical_Editor/buttonBackground.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UIListView_Editor/UIListView_Vertical_Editor/button_p.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UIListView_Editor/UIListView_Vertical_Editor/ribbon.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UIListView_Editor/UIListView_Vertical_Editor/ui_listview_editor_1.json samples/cpp-tests/Resources/cocosui/UIEditorTest/UILoadingBar_Editor/GUI/loadingbar.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UILoadingBar_Editor/background.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UILoadingBar_Editor/buttonBackground.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UILoadingBar_Editor/ribbon.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UILoadingBar_Editor/ui_loadingbar_editor_1.json samples/cpp-tests/Resources/cocosui/UIEditorTest/UIPageView_Editor/background.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UIPageView_Editor/buttonBackground.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UIPageView_Editor/button_n.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UIPageView_Editor/ribbon.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UIPageView_Editor/ui_pageview_editor_1.json samples/cpp-tests/Resources/cocosui/UIEditorTest/UIScrollView_Editor/UIScrollView_Both_Editor/GUI/image.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UIScrollView_Editor/UIScrollView_Both_Editor/background.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UIScrollView_Editor/UIScrollView_Both_Editor/buttonBackground.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UIScrollView_Editor/UIScrollView_Both_Editor/button_n.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UIScrollView_Editor/UIScrollView_Both_Editor/button_p.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UIScrollView_Editor/UIScrollView_Both_Editor/ribbon.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UIScrollView_Editor/UIScrollView_Both_Editor/selected01.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UIScrollView_Editor/UIScrollView_Both_Editor/selected02.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UIScrollView_Editor/UIScrollView_Both_Editor/ui_scrollview_both_editor_1.json samples/cpp-tests/Resources/cocosui/UIEditorTest/UIScrollView_Editor/UIScrollView_Horizontal_Editor/GUI/image.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UIScrollView_Editor/UIScrollView_Horizontal_Editor/background.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UIScrollView_Editor/UIScrollView_Horizontal_Editor/buttonBackground.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UIScrollView_Editor/UIScrollView_Horizontal_Editor/button_n.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UIScrollView_Editor/UIScrollView_Horizontal_Editor/button_p.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UIScrollView_Editor/UIScrollView_Horizontal_Editor/ribbon.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UIScrollView_Editor/UIScrollView_Horizontal_Editor/selected01.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UIScrollView_Editor/UIScrollView_Horizontal_Editor/selected02.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UIScrollView_Editor/UIScrollView_Horizontal_Editor/ui_scrollview_horizontal_editor_1.json samples/cpp-tests/Resources/cocosui/UIEditorTest/UIScrollView_Editor/UIScrollView_Vertical_Editor/GUI/image.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UIScrollView_Editor/UIScrollView_Vertical_Editor/background.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UIScrollView_Editor/UIScrollView_Vertical_Editor/buttonBackground.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UIScrollView_Editor/UIScrollView_Vertical_Editor/button_n.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UIScrollView_Editor/UIScrollView_Vertical_Editor/button_p.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UIScrollView_Editor/UIScrollView_Vertical_Editor/ribbon.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UIScrollView_Editor/UIScrollView_Vertical_Editor/selected01.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UIScrollView_Editor/UIScrollView_Vertical_Editor/selected02.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UIScrollView_Editor/UIScrollView_Vertical_Editor/ui_scrollview_editor_1.json samples/cpp-tests/Resources/cocosui/UIEditorTest/UISlider_Editor/2014-1-26 11-42-09.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UISlider_Editor/2014-1-26 11-43-52.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UISlider_Editor/background.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UISlider_Editor/buttonBackground.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UISlider_Editor/ribbon.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UISlider_Editor/silder_progressBar.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UISlider_Editor/slider_bar.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UISlider_Editor/slider_bar_button.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UISlider_Editor/ui_slider_editor_1.json samples/cpp-tests/Resources/cocosui/UIEditorTest/UITextField_Editor/background.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UITextField_Editor/buttonBackground.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UITextField_Editor/ribbon.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UITextField_Editor/ui_textfield_editor_1.json samples/cpp-tests/Resources/cocosui/UIEditorTest/UIWidgetAddNode_Editor/background.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UIWidgetAddNode_Editor/buttonBackground.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UIWidgetAddNode_Editor/ribbon.png samples/cpp-tests/Resources/cocosui/UIEditorTest/UIWidgetAddNode_Editor/ui_widget_add_node_editor.json samples/cpp-tests/Resources/cocosui/UITest/UITest.json samples/cpp-tests/Resources/cocosui/UITest/b1.png samples/cpp-tests/Resources/cocosui/UITest/b2.png samples/cpp-tests/Resources/cocosui/UITest/background.png samples/cpp-tests/Resources/cocosui/UITest/buttonBackground.png samples/cpp-tests/Resources/cocosui/UITest/f1.png samples/cpp-tests/Resources/cocosui/UITest/f2.png samples/cpp-tests/Resources/cocosui/UITest/r1.png samples/cpp-tests/Resources/cocosui/UITest/r2.png samples/cpp-tests/Resources/cocosui/UITest/ribbon.png samples/cpp-tests/Resources/cocosui/animationbuttonnormal.png samples/cpp-tests/Resources/cocosui/animationbuttonpressed.png samples/cpp-tests/Resources/cocosui/arrow.png samples/cpp-tests/Resources/cocosui/b11.png samples/cpp-tests/Resources/cocosui/backtotopnormal.png samples/cpp-tests/Resources/cocosui/backtotoppressed.png samples/cpp-tests/Resources/cocosui/bitmapFontTest2.fnt samples/cpp-tests/Resources/cocosui/bitmapFontTest2.png samples/cpp-tests/Resources/cocosui/button.png samples/cpp-tests/Resources/cocosui/buttonHighlighted.png samples/cpp-tests/Resources/cocosui/ccicon.png samples/cpp-tests/Resources/cocosui/check_box_active.png samples/cpp-tests/Resources/cocosui/check_box_active_disable.png samples/cpp-tests/Resources/cocosui/check_box_active_press.png samples/cpp-tests/Resources/cocosui/check_box_normal.png samples/cpp-tests/Resources/cocosui/check_box_normal_disable.png samples/cpp-tests/Resources/cocosui/check_box_normal_press.png samples/cpp-tests/Resources/cocosui/examples/Test/UIResForEditor/Button/button_country_n.png samples/cpp-tests/Resources/cocosui/examples/Test/UIResForEditor/Button/button_country_p.png samples/cpp-tests/Resources/cocosui/examples/Test/UIResForEditor/Button/button_country_un.png samples/cpp-tests/Resources/cocosui/examples/Test/UIResForEditor/Button/symbol_1B.png samples/cpp-tests/Resources/cocosui/examples/Test/UIResForEditor/Button/symbol_1a.png samples/cpp-tests/Resources/cocosui/examples/Test/UIResForEditor/Button/symbol_1c.png samples/cpp-tests/Resources/cocosui/examples/equip/111.png samples/cpp-tests/Resources/cocosui/examples/equip/12.png samples/cpp-tests/Resources/cocosui/examples/equip/13.png samples/cpp-tests/Resources/cocosui/examples/equip/14.png samples/cpp-tests/Resources/cocosui/examples/equip/15.png samples/cpp-tests/Resources/cocosui/examples/equip/2.png samples/cpp-tests/Resources/cocosui/examples/equip/button_end_01.png samples/cpp-tests/Resources/cocosui/examples/equip/button_end_02.png samples/cpp-tests/Resources/cocosui/examples/equip/button_green_n2.png samples/cpp-tests/Resources/cocosui/examples/equip/button_green_p2.png samples/cpp-tests/Resources/cocosui/examples/equip/button_green_un2.png samples/cpp-tests/Resources/cocosui/examples/equip/eg/1.png samples/cpp-tests/Resources/cocosui/examples/equip/eg/10.png samples/cpp-tests/Resources/cocosui/examples/equip/eg/11.png samples/cpp-tests/Resources/cocosui/examples/equip/eg/3.png samples/cpp-tests/Resources/cocosui/examples/equip/eg/4.png samples/cpp-tests/Resources/cocosui/examples/equip/eg/5.png samples/cpp-tests/Resources/cocosui/examples/equip/eg/6.png samples/cpp-tests/Resources/cocosui/examples/equip/eg/7.png samples/cpp-tests/Resources/cocosui/examples/equip/eg/8.png samples/cpp-tests/Resources/cocosui/examples/equip/eg/9.png samples/cpp-tests/Resources/cocosui/examples/equip/eg/crab.png samples/cpp-tests/Resources/cocosui/examples/equip/eg/research.png samples/cpp-tests/Resources/cocosui/examples/equip/eg/sell.png samples/cpp-tests/Resources/cocosui/examples/equip/eg/shop_shield_1.png samples/cpp-tests/Resources/cocosui/examples/equip/eg/shop_shield_2.png samples/cpp-tests/Resources/cocosui/examples/equip/eg/shop_shield_3.png samples/cpp-tests/Resources/cocosui/examples/equip/eg/train.png samples/cpp-tests/Resources/cocosui/examples/equip/eg/upgrade.png samples/cpp-tests/Resources/cocosui/examples/examples.json samples/cpp-tests/Resources/cocosui/examples/weapon_introduce/4.png samples/cpp-tests/Resources/cocosui/examples/weapon_introduce/5.png samples/cpp-tests/Resources/cocosui/examples/weapon_introduce/6.png samples/cpp-tests/Resources/cocosui/examples/weapon_introduce/button_end_01.png samples/cpp-tests/Resources/cocosui/examples/weapon_introduce/button_end_02.png samples/cpp-tests/Resources/cocosui/examples/weapon_introduce/weapon_item_1/weapon_item/1.png samples/cpp-tests/Resources/cocosui/examples/weapon_introduce/weapon_item_1/weapon_item/2.png samples/cpp-tests/Resources/cocosui/examples/weapon_introduce/weapon_item_1/weapon_item/7.png samples/cpp-tests/Resources/cocosui/examples/weapon_introduce/weapon_item_1/weapon_item_1.json samples/cpp-tests/Resources/cocosui/green_edit.png samples/cpp-tests/Resources/cocosui/grossini-aliases.png samples/cpp-tests/Resources/cocosui/gui_examples/UIAction_1/CocoStudio_UIEditor.png samples/cpp-tests/Resources/cocosui/gui_examples/UIAction_1/UIAction_1.json samples/cpp-tests/Resources/cocosui/gui_examples/buy_1/5.png samples/cpp-tests/Resources/cocosui/gui_examples/buy_1/7.png samples/cpp-tests/Resources/cocosui/gui_examples/buy_1/button.png samples/cpp-tests/Resources/cocosui/gui_examples/buy_1/buttonHighlighted.png samples/cpp-tests/Resources/cocosui/gui_examples/buy_1/buy_1.json samples/cpp-tests/Resources/cocosui/gui_examples/equip_1/equip/111.png samples/cpp-tests/Resources/cocosui/gui_examples/equip_1/equip/12.png samples/cpp-tests/Resources/cocosui/gui_examples/equip_1/equip/13.png samples/cpp-tests/Resources/cocosui/gui_examples/equip_1/equip/14.png samples/cpp-tests/Resources/cocosui/gui_examples/equip_1/equip/15.png samples/cpp-tests/Resources/cocosui/gui_examples/equip_1/equip/2.png samples/cpp-tests/Resources/cocosui/gui_examples/equip_1/equip/button_end_01.png samples/cpp-tests/Resources/cocosui/gui_examples/equip_1/equip/button_end_02.png samples/cpp-tests/Resources/cocosui/gui_examples/equip_1/equip/button_green_n2.png samples/cpp-tests/Resources/cocosui/gui_examples/equip_1/equip/button_green_p2.png samples/cpp-tests/Resources/cocosui/gui_examples/equip_1/equip/button_green_un2.png samples/cpp-tests/Resources/cocosui/gui_examples/equip_1/equip/eg/1.png samples/cpp-tests/Resources/cocosui/gui_examples/equip_1/equip/eg/10.png samples/cpp-tests/Resources/cocosui/gui_examples/equip_1/equip/eg/11.png samples/cpp-tests/Resources/cocosui/gui_examples/equip_1/equip/eg/3.png samples/cpp-tests/Resources/cocosui/gui_examples/equip_1/equip/eg/4.png samples/cpp-tests/Resources/cocosui/gui_examples/equip_1/equip/eg/5.png samples/cpp-tests/Resources/cocosui/gui_examples/equip_1/equip/eg/6.png samples/cpp-tests/Resources/cocosui/gui_examples/equip_1/equip/eg/7.png samples/cpp-tests/Resources/cocosui/gui_examples/equip_1/equip/eg/8.png samples/cpp-tests/Resources/cocosui/gui_examples/equip_1/equip/eg/9.png samples/cpp-tests/Resources/cocosui/gui_examples/equip_1/equip/eg/crab.png samples/cpp-tests/Resources/cocosui/gui_examples/equip_1/equip/eg/research.png samples/cpp-tests/Resources/cocosui/gui_examples/equip_1/equip/eg/sell.png samples/cpp-tests/Resources/cocosui/gui_examples/equip_1/equip/eg/shop_shield_1.png samples/cpp-tests/Resources/cocosui/gui_examples/equip_1/equip/eg/shop_shield_2.png samples/cpp-tests/Resources/cocosui/gui_examples/equip_1/equip/eg/shop_shield_3.png samples/cpp-tests/Resources/cocosui/gui_examples/equip_1/equip/eg/train.png samples/cpp-tests/Resources/cocosui/gui_examples/equip_1/equip/eg/upgrade.png samples/cpp-tests/Resources/cocosui/gui_examples/equip_1/equip_1.json samples/cpp-tests/Resources/cocosui/gui_examples/map_1/image_castle.png samples/cpp-tests/Resources/cocosui/gui_examples/map_1/map_1.json samples/cpp-tests/Resources/cocosui/gui_examples/map_1/map_pve.png samples/cpp-tests/Resources/cocosui/gui_examples/map_alert_1/5.png samples/cpp-tests/Resources/cocosui/gui_examples/map_alert_1/7.png samples/cpp-tests/Resources/cocosui/gui_examples/map_alert_1/close_02.png samples/cpp-tests/Resources/cocosui/gui_examples/map_alert_1/close_03.png samples/cpp-tests/Resources/cocosui/gui_examples/map_alert_1/close_04.png samples/cpp-tests/Resources/cocosui/gui_examples/map_alert_1/map_alert_1.json samples/cpp-tests/Resources/cocosui/gui_examples/page_1/background.png samples/cpp-tests/Resources/cocosui/gui_examples/page_1/buttonBackground.png samples/cpp-tests/Resources/cocosui/gui_examples/page_1/page_1.json samples/cpp-tests/Resources/cocosui/gui_examples/page_1/page_content/CocoStudio_AnimationEditor.png samples/cpp-tests/Resources/cocosui/gui_examples/page_1/page_content/CocoStudio_DataEditor.png samples/cpp-tests/Resources/cocosui/gui_examples/page_1/page_content/CocoStudio_SceneEditor.png samples/cpp-tests/Resources/cocosui/gui_examples/page_1/page_content/CocoStudio_UIEditor.png samples/cpp-tests/Resources/cocosui/gui_examples/page_1/ribbon.png samples/cpp-tests/Resources/cocosui/gui_examples/page_1/teehanlax - iOS 6 - iPhone_check.png samples/cpp-tests/Resources/cocosui/gui_examples/page_1/teehanlax - iOS 6 - iPhone_check01.png samples/cpp-tests/Resources/cocosui/gui_examples/register_1/128_128.png samples/cpp-tests/Resources/cocosui/gui_examples/register_1/Rosewood stdloadingH.fnt samples/cpp-tests/Resources/cocosui/gui_examples/register_1/Rosewood stdloadingH.png samples/cpp-tests/Resources/cocosui/gui_examples/register_1/button_d.png samples/cpp-tests/Resources/cocosui/gui_examples/register_1/button_n.png samples/cpp-tests/Resources/cocosui/gui_examples/register_1/e-mail.png samples/cpp-tests/Resources/cocosui/gui_examples/register_1/register_1.json samples/cpp-tests/Resources/cocosui/gui_examples/register_1/ui_shop_005-hd.png samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_introduce/4.png samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_introduce/5.png samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_introduce/6.png samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_introduce/button_end_01.png samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_introduce/button_end_02.png samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_introduce_1.json samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_item_1/weapon_item/1.png samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_item_1/weapon_item/2.png samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_item_1/weapon_item/7.png samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_item_1/weapon_item_1.json samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_1.png samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_10.png samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_11.png samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_12.png samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_13.png samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_14.png samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_15.png samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_16.png samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_17.png samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_18.png samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_19.png samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_2.png samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_20.png samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_21.png samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_22.png samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_23.png samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_24.png samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_25.png samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_26.png samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_27.png samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_28.png samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_29.png samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_3.png samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_30.png samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_31.png samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_4.png samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_5.png samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_6.png samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_7.png samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_8.png samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_9.png samples/cpp-tests/Resources/cocosui/labelatlas.png samples/cpp-tests/Resources/cocosui/loadingbar.png samples/cpp-tests/Resources/cocosui/scrollviewbg.png samples/cpp-tests/Resources/cocosui/slidbar.png samples/cpp-tests/Resources/cocosui/sliderProgress.png samples/cpp-tests/Resources/cocosui/sliderProgress2.png samples/cpp-tests/Resources/cocosui/sliderThumb.png samples/cpp-tests/Resources/cocosui/sliderTrack.png samples/cpp-tests/Resources/cocosui/sliderTrack2.png samples/cpp-tests/Resources/cocosui/slider_bar_active_9patch.png samples/cpp-tests/Resources/cocosui/sliderballnormal.png samples/cpp-tests/Resources/cocosui/sliderballpressed.png samples/cpp-tests/Resources/cocosui/switch-mask.png templates/lua-template-runtime/res/fonts/Marker Felt.ttf tests/cpp-tests/Resources/cocosgui/100/100.ExportJson tests/cpp-tests/Resources/cocosgui/100/1000.plist tests/cpp-tests/Resources/cocosgui/100/1000.png tests/cpp-tests/Resources/cocosgui/CloseNormal.png tests/cpp-tests/Resources/cocosgui/CloseSelected.png tests/cpp-tests/Resources/cocosgui/CocoGUISample.json tests/cpp-tests/Resources/cocosgui/CocoGUI_PageView_Sample.json tests/cpp-tests/Resources/cocosgui/CustomImageViewTest/NewProject_20.plist tests/cpp-tests/Resources/cocosgui/CustomImageViewTest/NewProject_20.png tests/cpp-tests/Resources/cocosgui/CustomImageViewTest/NewProject_2_1.ExportJson tests/cpp-tests/Resources/cocosgui/Hello.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIButton_Editor/UIButton_Editor_1.json tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIButton_Editor/background.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIButton_Editor/buttonBackground.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIButton_Editor/buttonHighlighted.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIButton_Editor/button_n.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIButton_Editor/button_p.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIButton_Editor/ribbon.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UICheckBox_Editor/background.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UICheckBox_Editor/buttonBackground.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UICheckBox_Editor/ribbon.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UICheckBox_Editor/selected01.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UICheckBox_Editor/selected02.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UICheckBox_Editor/ui_checkbox_editor_1.json tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIImageView_Editor/GUI/image.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIImageView_Editor/background.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIImageView_Editor/buttonBackground.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIImageView_Editor/buttonHighlighted.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIImageView_Editor/ribbon.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIImageView_Editor/ui_ImageView_editor_1.json tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILabelAtlas_Editor/GUI/labelatlasimg.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILabelAtlas_Editor/background.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILabelAtlas_Editor/buttonBackground.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILabelAtlas_Editor/ribbon.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILabelAtlas_Editor/ui_labelatlas_editor_1.json tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILabelBMFont_Editor/GUI/missing-font.fnt tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILabelBMFont_Editor/GUI/missing-font.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILabelBMFont_Editor/background.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILabelBMFont_Editor/buttonBackground.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILabelBMFont_Editor/ribbon.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILabelBMFont_Editor/ui_labelbmfont_editor_1.json tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILabel_Editor/A Damn Mess.ttf tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILabel_Editor/background.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILabel_Editor/buttonBackground.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILabel_Editor/ribbon.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILabel_Editor/ui_label_editor_1.json tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/GUI/image.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/Hello.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/background.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/buttonBackground.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/button_n.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/button_p.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/ribbon.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/selected01.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/selected02.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/ui_layout_backgroundimage_editor_1_0_0.json tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Color_Editor/GUI/image.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Color_Editor/background.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Color_Editor/buttonBackground.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Color_Editor/button_n.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Color_Editor/button_p.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Color_Editor/ribbon.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Color_Editor/selected01.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Color_Editor/selected02.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Color_Editor/ui_layout_color_editor_1.json tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Editor/GUI/image.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Editor/background.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Editor/buttonBackground.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Editor/button_n.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Editor/button_p.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Editor/ribbon.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Editor/selected01.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Editor/selected02.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Editor/ui_layout_editor_1.json tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Gradient_Color_Editor/GUI/image.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Gradient_Color_Editor/background.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Gradient_Color_Editor/buttonBackground.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Gradient_Color_Editor/button_n.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Gradient_Color_Editor/button_p.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Gradient_Color_Editor/ribbon.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Gradient_Color_Editor/selected01.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Gradient_Color_Editor/selected02.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Gradient_Color_Editor/ui_layout_gradient_color_editor_1_0.json tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Horizontal_Layout_Editor/GUI/image.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Horizontal_Layout_Editor/background.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Horizontal_Layout_Editor/buttonBackground.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Horizontal_Layout_Editor/button_n.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Horizontal_Layout_Editor/button_p.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Horizontal_Layout_Editor/ribbon.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Horizontal_Layout_Editor/selected01.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Horizontal_Layout_Editor/selected02.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Horizontal_Layout_Editor/ui_layout_linear_horizontal_layout_editor.json tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Vertical_Layout_Editor/GUI/image.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Vertical_Layout_Editor/background.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Vertical_Layout_Editor/buttonBackground.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Vertical_Layout_Editor/button_n.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Vertical_Layout_Editor/button_p.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Vertical_Layout_Editor/ribbon.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Vertical_Layout_Editor/selected01.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Vertical_Layout_Editor/selected02.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Vertical_Layout_Editor/ui_layout_linear_vertical_layout_editor.json tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Location_Editor/GUI/image.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Location_Editor/background.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Location_Editor/buttonBackground.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Location_Editor/button_n.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Location_Editor/button_p.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Location_Editor/ribbon.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Location_Editor/selected01.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Location_Editor/selected02.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Location_Editor/ui_layout_relative_align_location_editor.json tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Parent_Editor/GUI/image.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Parent_Editor/background.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Parent_Editor/buttonBackground.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Parent_Editor/button_n.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Parent_Editor/button_p.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Parent_Editor/ribbon.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Parent_Editor/selected01.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Parent_Editor/selected02.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Parent_Editor/ui_layout_relative_align_parent_editor.json tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Scale9_BackgroundImage_Editor/GUI/image.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Scale9_BackgroundImage_Editor/background.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Scale9_BackgroundImage_Editor/buttonBackground.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Scale9_BackgroundImage_Editor/button_n.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Scale9_BackgroundImage_Editor/button_p.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Scale9_BackgroundImage_Editor/ribbon.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Scale9_BackgroundImage_Editor/selected01.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Scale9_BackgroundImage_Editor/selected02.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Scale9_BackgroundImage_Editor/slider_bar.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Scale9_BackgroundImage_Editor/ui_layout_scale9_backgroundimage_editor.json tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIListView_Editor/UIListView_Horizontal_Editor/GUI/button.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIListView_Editor/UIListView_Horizontal_Editor/GUI/image.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIListView_Editor/UIListView_Horizontal_Editor/background.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIListView_Editor/UIListView_Horizontal_Editor/buttonBackground.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIListView_Editor/UIListView_Horizontal_Editor/button_p.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIListView_Editor/UIListView_Horizontal_Editor/ribbon.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIListView_Editor/UIListView_Horizontal_Editor/ui_listview_horizontal_editor_1.json tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIListView_Editor/UIListView_Vertical_Editor/GUI/button.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIListView_Editor/UIListView_Vertical_Editor/GUI/image.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIListView_Editor/UIListView_Vertical_Editor/background.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIListView_Editor/UIListView_Vertical_Editor/buttonBackground.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIListView_Editor/UIListView_Vertical_Editor/button_p.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIListView_Editor/UIListView_Vertical_Editor/ribbon.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIListView_Editor/UIListView_Vertical_Editor/ui_listview_editor_1.json tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILoadingBar_Editor/GUI/loadingbar.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILoadingBar_Editor/background.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILoadingBar_Editor/buttonBackground.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILoadingBar_Editor/ribbon.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILoadingBar_Editor/ui_loadingbar_editor_1.json tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIPageView_Editor/background.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIPageView_Editor/buttonBackground.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIPageView_Editor/button_n.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIPageView_Editor/ribbon.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIPageView_Editor/ui_pageview_editor_1.json tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Both_Editor/GUI/image.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Both_Editor/background.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Both_Editor/buttonBackground.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Both_Editor/button_n.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Both_Editor/button_p.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Both_Editor/ribbon.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Both_Editor/selected01.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Both_Editor/selected02.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Both_Editor/ui_scrollview_both_editor_1.json tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Horizontal_Editor/GUI/image.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Horizontal_Editor/background.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Horizontal_Editor/buttonBackground.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Horizontal_Editor/button_n.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Horizontal_Editor/button_p.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Horizontal_Editor/ribbon.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Horizontal_Editor/selected01.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Horizontal_Editor/selected02.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Horizontal_Editor/ui_scrollview_horizontal_editor_1.json tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Vertical_Editor/GUI/image.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Vertical_Editor/background.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Vertical_Editor/buttonBackground.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Vertical_Editor/button_n.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Vertical_Editor/button_p.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Vertical_Editor/ribbon.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Vertical_Editor/selected01.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Vertical_Editor/selected02.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Vertical_Editor/ui_scrollview_editor_1.json tests/cpp-tests/Resources/cocosgui/UIEditorTest/UISlider_Editor/2014-1-26 11-42-09.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UISlider_Editor/2014-1-26 11-43-52.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UISlider_Editor/background.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UISlider_Editor/buttonBackground.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UISlider_Editor/ribbon.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UISlider_Editor/silder_progressBar.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UISlider_Editor/slider_bar.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UISlider_Editor/slider_bar_button.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UISlider_Editor/ui_slider_editor_1.json tests/cpp-tests/Resources/cocosgui/UIEditorTest/UITextField_Editor/background.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UITextField_Editor/buttonBackground.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UITextField_Editor/ribbon.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UITextField_Editor/ui_textfield_editor_1.json tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIWidgetAddNode_Editor/background.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIWidgetAddNode_Editor/buttonBackground.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIWidgetAddNode_Editor/ribbon.png tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIWidgetAddNode_Editor/ui_widget_add_node_editor.json tests/cpp-tests/Resources/cocosgui/UITest/UITest.json tests/cpp-tests/Resources/cocosgui/UITest/b1.png tests/cpp-tests/Resources/cocosgui/UITest/b2.png tests/cpp-tests/Resources/cocosgui/UITest/background.png tests/cpp-tests/Resources/cocosgui/UITest/buttonBackground.png tests/cpp-tests/Resources/cocosgui/UITest/f1.png tests/cpp-tests/Resources/cocosgui/UITest/f2.png tests/cpp-tests/Resources/cocosgui/UITest/r1.png tests/cpp-tests/Resources/cocosgui/UITest/r2.png tests/cpp-tests/Resources/cocosgui/UITest/ribbon.png tests/cpp-tests/Resources/cocosgui/animationbuttonnormal.png tests/cpp-tests/Resources/cocosgui/animationbuttonpressed.png tests/cpp-tests/Resources/cocosgui/arrow.png tests/cpp-tests/Resources/cocosgui/b11.png tests/cpp-tests/Resources/cocosgui/backtotopnormal.png tests/cpp-tests/Resources/cocosgui/backtotoppressed.png tests/cpp-tests/Resources/cocosgui/bitmapFontTest2.fnt tests/cpp-tests/Resources/cocosgui/bitmapFontTest2.png tests/cpp-tests/Resources/cocosgui/button.png tests/cpp-tests/Resources/cocosgui/buttonHighlighted.png tests/cpp-tests/Resources/cocosgui/ccicon.png tests/cpp-tests/Resources/cocosgui/check_box_active.png tests/cpp-tests/Resources/cocosgui/check_box_active_disable.png tests/cpp-tests/Resources/cocosgui/check_box_active_press.png tests/cpp-tests/Resources/cocosgui/check_box_normal.png tests/cpp-tests/Resources/cocosgui/check_box_normal_disable.png tests/cpp-tests/Resources/cocosgui/check_box_normal_press.png tests/cpp-tests/Resources/cocosgui/examples/Test/UIResForEditor/Button/button_country_n.png tests/cpp-tests/Resources/cocosgui/examples/Test/UIResForEditor/Button/button_country_p.png tests/cpp-tests/Resources/cocosgui/examples/Test/UIResForEditor/Button/button_country_un.png tests/cpp-tests/Resources/cocosgui/examples/Test/UIResForEditor/Button/symbol_1B.png tests/cpp-tests/Resources/cocosgui/examples/Test/UIResForEditor/Button/symbol_1a.png tests/cpp-tests/Resources/cocosgui/examples/Test/UIResForEditor/Button/symbol_1c.png tests/cpp-tests/Resources/cocosgui/examples/equip/111.png tests/cpp-tests/Resources/cocosgui/examples/equip/12.png tests/cpp-tests/Resources/cocosgui/examples/equip/13.png tests/cpp-tests/Resources/cocosgui/examples/equip/14.png tests/cpp-tests/Resources/cocosgui/examples/equip/15.png tests/cpp-tests/Resources/cocosgui/examples/equip/2.png tests/cpp-tests/Resources/cocosgui/examples/equip/button_end_01.png tests/cpp-tests/Resources/cocosgui/examples/equip/button_end_02.png tests/cpp-tests/Resources/cocosgui/examples/equip/button_green_n2.png tests/cpp-tests/Resources/cocosgui/examples/equip/button_green_p2.png tests/cpp-tests/Resources/cocosgui/examples/equip/button_green_un2.png tests/cpp-tests/Resources/cocosgui/examples/equip/eg/1.png tests/cpp-tests/Resources/cocosgui/examples/equip/eg/10.png tests/cpp-tests/Resources/cocosgui/examples/equip/eg/11.png tests/cpp-tests/Resources/cocosgui/examples/equip/eg/3.png tests/cpp-tests/Resources/cocosgui/examples/equip/eg/4.png tests/cpp-tests/Resources/cocosgui/examples/equip/eg/5.png tests/cpp-tests/Resources/cocosgui/examples/equip/eg/6.png tests/cpp-tests/Resources/cocosgui/examples/equip/eg/7.png tests/cpp-tests/Resources/cocosgui/examples/equip/eg/8.png tests/cpp-tests/Resources/cocosgui/examples/equip/eg/9.png tests/cpp-tests/Resources/cocosgui/examples/equip/eg/crab.png tests/cpp-tests/Resources/cocosgui/examples/equip/eg/research.png tests/cpp-tests/Resources/cocosgui/examples/equip/eg/sell.png tests/cpp-tests/Resources/cocosgui/examples/equip/eg/shop_shield_1.png tests/cpp-tests/Resources/cocosgui/examples/equip/eg/shop_shield_2.png tests/cpp-tests/Resources/cocosgui/examples/equip/eg/shop_shield_3.png tests/cpp-tests/Resources/cocosgui/examples/equip/eg/train.png tests/cpp-tests/Resources/cocosgui/examples/equip/eg/upgrade.png tests/cpp-tests/Resources/cocosgui/examples/examples.json tests/cpp-tests/Resources/cocosgui/examples/weapon_introduce/4.png tests/cpp-tests/Resources/cocosgui/examples/weapon_introduce/5.png tests/cpp-tests/Resources/cocosgui/examples/weapon_introduce/6.png tests/cpp-tests/Resources/cocosgui/examples/weapon_introduce/button_end_01.png tests/cpp-tests/Resources/cocosgui/examples/weapon_introduce/button_end_02.png tests/cpp-tests/Resources/cocosgui/examples/weapon_introduce/weapon_item_1/weapon_item/1.png tests/cpp-tests/Resources/cocosgui/examples/weapon_introduce/weapon_item_1/weapon_item/2.png tests/cpp-tests/Resources/cocosgui/examples/weapon_introduce/weapon_item_1/weapon_item/7.png tests/cpp-tests/Resources/cocosgui/examples/weapon_introduce/weapon_item_1/weapon_item_1.json tests/cpp-tests/Resources/cocosgui/green_edit.png tests/cpp-tests/Resources/cocosgui/grossini-aliases.png tests/cpp-tests/Resources/cocosgui/gui_examples/UIAction_1/CocoStudio_UIEditor.png tests/cpp-tests/Resources/cocosgui/gui_examples/UIAction_1/UIAction_1.json tests/cpp-tests/Resources/cocosgui/gui_examples/buy_1/5.png tests/cpp-tests/Resources/cocosgui/gui_examples/buy_1/7.png tests/cpp-tests/Resources/cocosgui/gui_examples/buy_1/button.png tests/cpp-tests/Resources/cocosgui/gui_examples/buy_1/buttonHighlighted.png tests/cpp-tests/Resources/cocosgui/gui_examples/buy_1/buy_1.json tests/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/111.png tests/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/12.png tests/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/13.png tests/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/14.png tests/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/15.png tests/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/2.png tests/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/button_end_01.png tests/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/button_end_02.png tests/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/button_green_n2.png tests/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/button_green_p2.png tests/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/button_green_un2.png tests/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/eg/1.png tests/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/eg/10.png tests/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/eg/11.png tests/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/eg/3.png tests/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/eg/4.png tests/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/eg/5.png tests/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/eg/6.png tests/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/eg/7.png tests/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/eg/8.png tests/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/eg/9.png tests/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/eg/crab.png tests/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/eg/research.png tests/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/eg/sell.png tests/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/eg/shop_shield_1.png tests/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/eg/shop_shield_2.png tests/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/eg/shop_shield_3.png tests/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/eg/train.png tests/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/eg/upgrade.png tests/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip_1.json tests/cpp-tests/Resources/cocosgui/gui_examples/map_1/image_castle.png tests/cpp-tests/Resources/cocosgui/gui_examples/map_1/map_1.json tests/cpp-tests/Resources/cocosgui/gui_examples/map_1/map_pve.png tests/cpp-tests/Resources/cocosgui/gui_examples/map_alert_1/5.png tests/cpp-tests/Resources/cocosgui/gui_examples/map_alert_1/7.png tests/cpp-tests/Resources/cocosgui/gui_examples/map_alert_1/close_02.png tests/cpp-tests/Resources/cocosgui/gui_examples/map_alert_1/close_03.png tests/cpp-tests/Resources/cocosgui/gui_examples/map_alert_1/close_04.png tests/cpp-tests/Resources/cocosgui/gui_examples/map_alert_1/map_alert_1.json tests/cpp-tests/Resources/cocosgui/gui_examples/page_1/background.png tests/cpp-tests/Resources/cocosgui/gui_examples/page_1/buttonBackground.png tests/cpp-tests/Resources/cocosgui/gui_examples/page_1/page_1.json tests/cpp-tests/Resources/cocosgui/gui_examples/page_1/page_content/CocoStudio_AnimationEditor.png tests/cpp-tests/Resources/cocosgui/gui_examples/page_1/page_content/CocoStudio_DataEditor.png tests/cpp-tests/Resources/cocosgui/gui_examples/page_1/page_content/CocoStudio_SceneEditor.png tests/cpp-tests/Resources/cocosgui/gui_examples/page_1/page_content/CocoStudio_UIEditor.png tests/cpp-tests/Resources/cocosgui/gui_examples/page_1/ribbon.png tests/cpp-tests/Resources/cocosgui/gui_examples/page_1/teehanlax - iOS 6 - iPhone_check.png tests/cpp-tests/Resources/cocosgui/gui_examples/page_1/teehanlax - iOS 6 - iPhone_check01.png tests/cpp-tests/Resources/cocosgui/gui_examples/register_1/128_128.png tests/cpp-tests/Resources/cocosgui/gui_examples/register_1/Rosewood stdloadingH.fnt tests/cpp-tests/Resources/cocosgui/gui_examples/register_1/Rosewood stdloadingH.png tests/cpp-tests/Resources/cocosgui/gui_examples/register_1/button_d.png tests/cpp-tests/Resources/cocosgui/gui_examples/register_1/button_n.png tests/cpp-tests/Resources/cocosgui/gui_examples/register_1/e-mail.png tests/cpp-tests/Resources/cocosgui/gui_examples/register_1/register_1.json tests/cpp-tests/Resources/cocosgui/gui_examples/register_1/ui_shop_005-hd.png tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_introduce/4.png tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_introduce/5.png tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_introduce/6.png tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_introduce/button_end_01.png tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_introduce/button_end_02.png tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_introduce_1.json tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapon_item/1.png tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapon_item/2.png tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapon_item/7.png tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapon_item_1.json tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_1.png tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_10.png tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_11.png tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_12.png tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_13.png tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_14.png tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_15.png tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_16.png tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_17.png tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_18.png tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_19.png tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_2.png tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_20.png tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_21.png tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_22.png tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_23.png tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_24.png tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_25.png tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_26.png tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_27.png tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_28.png tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_29.png tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_3.png tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_30.png tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_31.png tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_4.png tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_5.png tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_6.png tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_7.png tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_8.png tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_9.png tests/cpp-tests/Resources/cocosgui/labelatlas.png tests/cpp-tests/Resources/cocosgui/loadingbar.png tests/cpp-tests/Resources/cocosgui/scrollviewbg.png tests/cpp-tests/Resources/cocosgui/slidbar.png tests/cpp-tests/Resources/cocosgui/sliderProgress.png tests/cpp-tests/Resources/cocosgui/sliderProgress2.png tests/cpp-tests/Resources/cocosgui/sliderThumb.png tests/cpp-tests/Resources/cocosgui/sliderTrack.png tests/cpp-tests/Resources/cocosgui/sliderTrack2.png tests/cpp-tests/Resources/cocosgui/slider_bar_active_9patch.png tests/cpp-tests/Resources/cocosgui/sliderballnormal.png tests/cpp-tests/Resources/cocosgui/sliderballpressed.png tests/cpp-tests/Resources/cocosgui/switch-mask.png tools/cocos2d-console	2014-03-12 10:09:09 +08:00
Dhilan007	d96cc9ecb9	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop	2014-03-12 10:08:57 +08:00
James Chen	79e979ac71	updates CMakeLists.txt	2014-03-11 19:10:37 +08:00
James Chen	25604d3872	Update CMakeLists.txt	2014-03-11 19:10:37 +08:00
James Chen	58e21884f8	TestsDemo -> CppTests.	2014-03-11 19:10:36 +08:00
James Chen	99ffde24d2	[Android] Prefer to install tests to external storage device.	2014-03-11 19:10:36 +08:00
James Chen	431e800dd6	All tests could run on Android.	2014-03-11 19:10:36 +08:00
James Chen	b635d9abd9	Remove .gitkeep in 'cpp-empty-test', Add proguard-project.txt.	2014-03-11 19:10:36 +08:00
James Chen	3d5c3001bd	cpp-empty-test works ok for Android.	2014-03-11 19:10:36 +08:00
James Chen	91a3ba61da	lua-empty-test, cpp-empty-test work for iOS/Mac	2014-03-11 19:10:36 +08:00
James Chen	fda8cfa740	plist rename.	2014-03-11 19:10:35 +08:00
James Chen	2485f86777	lua-empty-test folder structure refactoring.	2014-03-11 19:10:35 +08:00
James Chen	7504a25d9c	cpp-hello -> cpp-empty-test, lua-hello -> lua-empty-test, ouch....	2014-03-11 19:10:35 +08:00
James Chen	b88de91a15	Renames 'samples' folder to 'tests', ouch....	2014-03-11 19:10:34 +08:00
James Chen	5354980d75	Rename 'tests' folder to 'samples', adds 'cpp-tests' folder.	2014-03-10 10:22:33 +08:00
CaiWenzhi	7b0d249e00	Fixed crash	2014-03-07 20:46:27 +08:00
CaiWenzhi	e38fc52d15	Fixed crash	2014-03-07 18:24:40 +08:00
CaiWenzhi	c81793b076	Modify projects	2014-03-07 16:47:51 +08:00
CaiWenzhi	0c4bca9bb2	Merge branch 'develop' into develop_nutty_modify_framework_for315	2014-03-07 16:42:38 +08:00
minggo	07c0fac44f	Merge pull request #5620 from Dhilan007/develop_label ... closed #4301:Label support vertical alignment and assign dimensions.	2014-03-07 16:12:21 +08:00
Dhilan007	ac944cd42b	fixed incorrect display when the size of label not enough to support display all text.	2014-03-07 15:58:49 +08:00
CaiWenzhi	62dfe630c7	Add custom widget	2014-03-07 15:36:45 +08:00
Dhilan007	c233b636cd	closed #4301:Label support vertical alignment and assign dimensions.	2014-03-07 14:58:44 +08:00
minggo	5999811028	Merge pull request #5547 from nutty898/develop_nutty_modify_framework_for315 ... Fixd bugs for editor	2014-03-07 10:30:55 +08:00
James Chen	91cae278e0	Merge pull request #5595 from dumganhar/schedule-test-crash ... Fix of 'schedule test/issue#2268' crashes	2014-03-06 23:14:35 +08:00
CaiWenzhi	1d867d770b	Modify Windows project	2014-03-06 22:27:57 +08:00
CaiWenzhi	94339312ba	Modify text filed size control	2014-03-06 21:58:45 +08:00
CaiWenzhi	fea75444a7	Merge branch 'develop' into develop_nutty_modify_framework_for315	2014-03-06 21:43:33 +08:00
CaiWenzhi	8b7a5c3141	Add RichText sample	2014-03-06 20:52:29 +08:00
James Chen	d7774c29ca	Fixes 'schedule test/issue#2268' crashes	2014-03-06 17:41:58 +08:00
zhangbin	99b2c5453e	Solve the crash in WebSocketTest when the network in disconnected.	2014-03-06 16:49:51 +08:00
CaiWenzhi	bd5c11b5ee	Modify mk file and solve warnings	2014-03-06 16:15:03 +08:00
CaiWenzhi	3554dcd749	Merge branch 'develop' into develop_nutty_modify_framework_for315	2014-03-06 11:22:33 +08:00
James Chen	87b657b5bb	Merge pull request #5575 from dumganhar/iss4286-event-crash ... closed #4286: 'EventDispatcherTest/Issue 4129' crashes on Windows.	2014-03-06 11:03:34 +08:00
James Chen	183622c718	'EventDispatcherTest/Issue 4129' crashes on Windows.	2014-03-06 10:45:29 +08:00
Ricardo Quesada	a0ab8fcdf3	onDraw() updated ... `onDraw()` receives `const kmMat4 &transform` and `bool transformUpdated`. `CC_NODE_DRAW_SETUP()` is no longer used in our code. `_modelViewTransform` is only used as a cache.	2014-03-05 15:49:08 -08:00
Ricardo Quesada	0cb759cab8	Better names for tests	2014-03-05 11:50:12 -08:00
CaiWenzhi	cb5f9ad6dc	Modify windows project	2014-03-05 22:34:24 +08:00
CaiWenzhi	ad85d2c800	Merge branch 'develop' into develop_nutty_modify_framework_for315	2014-03-05 21:20:26 +08:00
CaiWenzhi	4f9dfdbef8	Fixed build error except Windows	2014-03-05 21:18:51 +08:00
minggo	6d31e4eb15	remove wrong sub-title	2014-03-05 19:58:33 +08:00
James Chen	12206fc1fd	Merge pull request #5561 from boyu0/v3.0_final_test ... Move Box2dTestBed step method to onDraw.	2014-03-05 19:28:42 +08:00
minggo	f1cd89b168	Merge pull request #5557 from dabingnn/develop_fixRetroTest ... fix: shader RetroTest by using new label	2014-03-05 19:25:40 +08:00
minggo	b7df75745e	Merge pull request #5562 from Dhilan007/develop_label ... issue #3629:new label support customize the effects such as Shadow[blur is unsupported], Outline	2014-03-05 17:28:37 +08:00
CaiWenzhi	ab47cafb31	Merge branch 'develop' into develop_nutty_modify_framework_for315 ... Conflicts: build/cocos2d_libs.xcodeproj/project.pbxproj cocos/gui/UIButton.cpp cocos/gui/UIButton.h cocos/gui/UIWidget.h	2014-03-05 16:52:31 +08:00
boyu0	b0414a88ed	Delete Box2DView::tick() method.	2014-03-05 15:55:08 +08:00
Dhilan007	23501b40aa	issue #3629:new label support customize the effects such as Shadow[blur is unsupported], Outline	2014-03-05 15:54:40 +08:00
boyu0	8a4f16fec6	Move Box2dTestBed step method to onDraw	2014-03-05 15:40:16 +08:00
James Chen	8e28400725	Some warning fixes in cpp-tests.	2014-03-05 15:04:47 +08:00
Huabing.Xu	b866a16503	fix: shader RetroTest by using new label	2014-03-05 14:41:13 +08:00
boyu0	e0de7efa8e	Rename ActionManagerTest->RemoveTest to StopActionTest	2014-03-05 14:32:00 +08:00
Ricardo Quesada	0bbc1cf5c3	fixes more warnings	2014-03-04 14:00:32 -08:00
Ricardo Quesada	7ac663e02c	GL Program API fixes	2014-03-04 13:51:43 -08:00
CaiWenzhi	353f6fb42c	Merge branch 'develop' into develop_nutty_modify_framework_for315	2014-03-05 01:09:51 +08:00
CaiWenzhi	7415ecc2b7	Fixed crash of sample	2014-03-04 17:06:12 +08:00
CaiWenzhi	8b9d572961	Merge branch 'develop' into develop_nutty_modify_framework_for315	2014-03-04 16:59:06 +08:00
CaiWenzhi	4a2dc4a607	Add custom widget and reader	2014-03-04 16:51:35 +08:00
Huabing.Xu	99d0ce160a	rename setVirtualViewPort->setVirtualViewport	2014-03-04 15:41:36 +08:00
Huabing.Xu	0d4783dd39	set scaleY to -1 for test case, because renderTexture result is not the same as texture load from file	2014-03-04 15:24:06 +08:00
Huabing.Xu	3e9e33a46b	add new test cases	2014-03-04 15:07:54 +08:00
Ricardo Quesada	c386f88e32	Merge branch 'develop' into visit_draw_improved ... Conflicts: CHANGELOG cocos/gui/UILayout.h	2014-03-03 11:27:42 -08:00
minggo	01dd962cb6	Merge pull request #5495 from Dhilan007/develop_gblur ... fixed incorrect effect of Gaussian Blur.	2014-03-03 18:01:29 +08:00
minggo	594342ea3e	Merge pull request #5505 from dumganhar/event-dispatcher-refactor ... [EventDispatcher] Adds 'pauseEventListenersForTarget', 'resumeEventListenersForTarget' and 'removeEventListenersForTarget'.	2014-03-03 17:56:57 +08:00
minggo	be0ac5dc1c	Merge pull request #5493 from boyu0/bug4150_physics_position_rotation ... closed #4150: fix physics position and rotation bug.	2014-03-03 14:57:33 +08:00
James Chen	1aa9e35fb2	Merge pull request #5500 from dumganhar/scheduler-refactor ... closed #4165: Refactors Scheduler class.	2014-03-03 11:20:06 +08:00
James Chen	757425c54b	issue #4165: Scheduler::scheduleCallback -> Scheduler::schedule, Scheduler::scheduleSelector -> Scheduler::schedule. APIs are clear for c++ developers now.	2014-03-03 11:00:30 +08:00
James Chen	104531c22e	Merge pull request #5499 from heliclei/autotest-run ... add CCConosle [autotest run] command	2014-03-03 10:06:25 +08:00
James Chen	f3949e078b	[EventDispatcher] Adds 'pauseEventListenersForTarget', 'resumeEventListenersForTarget' and 'removeEventListenersForTarget'.	2014-03-02 17:41:18 +08:00
James Chen	23f15ed9b5	closed #4160: Adds test case for issue 4160.	2014-03-02 16:22:57 +08:00
Ricardo Quesada	cdc19eea1c	Nodes: setAdditionalTransform() receives a pointer ... and not a const reference. If the pointer is `NULL`, then it won't use the additionalTransform	2014-03-01 08:26:54 -08:00
James Chen	e6d2c4ec73	Refactors Scheduler class. ... * Timer is an abstract class now. * Adds three new timers ( `TimerTargetSelector`, `TimerTargetCallback`, `TimerScriptHandler`) which are inherited from Timer. * Adds new API 'scheduleCallback` / `unscheduleCallbackForKey', and callback's target could be any classes since we're using `void*` to identify target. * `Scheduler::scheduleCallback` use `std::function`, therefore, it supports passing `lambda`, `member_function` and `global_function`. * The old selector API is still kept since it's very useful when schedule callback is a member function, it doesn't need a `key` to identify the callback function. (+1 squashed commit) * Adds relevant test cases.	2014-03-01 14:09:09 +08:00
Ricardo Quesada	b50a787f6d	Adds new ParticleTest for auto-batching	2014-02-28 22:03:36 -08:00
Ricardo Quesada	d78304599d	Cache working OK. ... Performance increased in 20% for static objects.	2014-02-28 16:10:48 -08:00
Ricardo Quesada	6920bec6ef	transform object returns the MV ... code cleaner. the kmGL code is altogether	2014-02-28 11:20:53 -08:00
Ricardo Quesada	ff79c0d9ad	Merge branch 'develop' into visit_draw_improved	2014-02-28 10:59:07 -08:00
heliclei	02bf79f075	fix windows compile error	2014-02-28 23:41:01 +08:00
heliclei	d50391e5dd	add CCConosle [autotest run] command	2014-02-28 23:02:22 +08:00
James Chen	c2167501cc	Merge pull request #5494 from natural-law/develop ... Modify the depend project path for project "TestCpp".	2014-02-28 17:36:36 +08:00
Dhilan007	0837b73dda	fixed incorrect effect of Gaussian Blur.	2014-02-28 17:34:24 +08:00
zhangbin	7d5ac249fb	Modify the depend project path for project "TestCpp".	2014-02-28 17:29:12 +08:00
James Chen	225b5e0e4f	Merge pull request #5492 from dumganhar/iss4129-remove-all-listener ... closed #4129: Event listeners used in engine shouldn't be removed by method removeAllEventListeners().	2014-02-28 16:09:54 +08:00
boyu0	015180bf62	issue #4150: Add physics position/rotation test	2014-02-28 15:47:49 +08:00
James Chen	7dd75ea2cb	issue #4129: Adds test case for issue 4119.	2014-02-28 15:46:48 +08:00
Ricardo Quesada	eb66ddd931	visit and draw improved. ... `visit()` and `draw()` are improved. they both receive: - `Renderer` - `kmMat4` for transformation - `bool` whether or not the transform changed from the previous frame Although `draw` and `visit` are not using the 3 new parameters, they will start using it in the coming days (or weeks, or months). Those parameters are needed for: - `Renderer` shouldn't be a singleton. There should be one renderer per Director. There could be more than one renderer - we should get rid of `kmGLXXX` functions since nodoby knows what is happening. the `kmMat4` is for that. - whenever possible, we should try to optimize the multiplications. the `dirty` flag is for that. We need those changes, so, it is better to change the API now, and not right after v3.0-final is released.	2014-02-27 21:43:54 -08:00
zhangbin	9a5adc5be5	closed #3684, Optimize the code of TextureAtlas test case.	2014-02-28 11:52:08 +08:00
zhangbin	ddf5957a9c	closed #3684, Set shader program before TextureAtlas is rendered.	2014-02-28 11:43:41 +08:00
James Chen	b363751b1a	Merge pull request #5477 from heliclei/console-upload-file ... CCConsole:support file upload via telnet console	2014-02-27 21:53:57 +08:00
James Chen	4277509966	Merge pull request #5463 from andyque/refactor3877 ... closed #3877. make fadeIn and fadeOut behaviours correct	2014-02-27 21:49:38 +08:00
heliclei	5531cae2ec	Merge remote-tracking branch 'upstream/develop' into console-upload-file	2014-02-27 21:35:53 +08:00
James Chen	a96f44f31d	Adds override for override functions (onEnter, onExit) in cpp-tests.	2014-02-27 21:10:03 +08:00
andyque	32d3bf03bd	fixed #3877. make fadeIn and fadeOut behaviours correct	2014-02-27 21:00:25 +08:00
boyu0	8c536589df	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss4118_physical_performance_improve	2014-02-27 20:04:04 +08:00
zhangbin	03ea69d074	Merge branch 'develop' of https://github.com/natural-law/cocos2d-x; branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop	2014-02-27 15:29:31 +08:00
boyu0	f400c1ac68	issue #4118: edit contact test and fix node setPhysicsBody bug	2014-02-27 13:35:37 +08:00
zhangbin	8afd23a001	closed #3727, In project "TestCpp", not pause/resume background music & effects when it's going to background/foreground.	2014-02-27 10:18:49 +08:00
boyu0	75ec508f0a	issue #4118: improve performance. add Node and Sprite physicsSetPosition and physicsSetRotation method.	2014-02-27 09:45:35 +08:00
heliclei	186259b0b1	fix andriod compile error	2014-02-27 00:25:37 +08:00
heliclei	49b971867b	fix win32 compile error	2014-02-27 00:13:17 +08:00
heliclei	9d6be63171	CCConsole:support file upload via telnet console	2014-02-26 23:41:47 +08:00
James Chen	e4837e7f94	issue #4116: Removes script-bindings codes.	2014-02-26 21:34:06 +08:00
James Chen	c2acfea633	issue #4116: Delete non-scripting files.	2014-02-26 21:17:17 +08:00
James Chen	5e315273f9	Merge pull request #5467 from boyu0/bug4144_node_setphysicsbody ... closed #4144: fix bug: Can not use Node::setPhysicsBody to reset a physics body.	2014-02-26 11:43:19 +08:00
James Chen	2b2979551e	Merge pull request #5460 from boyu0/iss4118_physical_performance_improve ... issue #4118: Physical performance improve.	2014-02-26 11:37:13 +08:00
boyu0	912dad7a71	closed #4144: fix bug: Node::setPhysicsBody doesn't work at the second time.	2014-02-26 10:53:41 +08:00
boyu0	2397aaf24d	issue #4118: add physics contact test.	2014-02-25 15:28:13 +08:00
heliclei	63344a8560	remove unused declare	2014-02-25 11:58:45 +08:00
heliclei	514cd031b3	Merge remote-tracking branch 'upstream/develop' into fix-console-windows-crash	2014-02-25 11:09:58 +08:00
James Chen	2beacc21c9	Merge pull request #5456 from andyque/fixbug3801 ... closed #3801: State is changed to RESUME when game comes back to foreground if pause button was clicked in Interval Test	2014-02-25 10:57:23 +08:00
andyque	f88e4be4ce	rollback gui filename change	2014-02-25 10:18:45 +08:00
andyque	f92301a872	fix jsb munaul bindings error	2014-02-25 10:18:45 +08:00
andyque	bf81591b48	fixed #3829. change namespace gui to ui	2014-02-25 10:18:44 +08:00
andyque	f5b0b77423	fixed #3801. uncomment pasue&resume logic when applicationDidBecomeActive and applicationWillResignActive	2014-02-25 10:16:17 +08:00
andyque	8f8b990c85	uncomment the pause() and resume() method call in test-js	2014-02-25 10:16:17 +08:00
James Chen	21fe4f234b	Merge pull request #5382 from boyu0/iss4039_tilemap_objectgroup_fix ... closed #4039: fix bug: tilemap <object> x, y, width and height value parse incorrect.	2014-02-24 22:23:05 +08:00
boyu0	d15009c510	issue #4039: delete name "converted_x", "converted_y", "converted_width", "converted_height".	2014-02-24 20:14:46 +08:00
heliclei	115d3e4a3b	Merge remote-tracking branch 'upstream/develop' into fix-console-windows-crash	2014-02-24 17:03:28 +08:00
boyu0	2bc91c2ce3	issue #4039: change name “position_x”, “position_y”, “size_width”, “size_height” to "converted_x", "converted_y", "converted_width", "converted_height".	2014-02-24 16:42:07 +08:00
boyu0	1082f3cad4	issue #4039: change name “position_x”, “position_y”, “size_width”, “size_height” to "converted_x", "converted_y", "converted_width", "converted_height".	2014-02-24 16:39:15 +08:00
heliclei	be45047b6b	use send/recv to replace write/read	2014-02-24 12:01:04 +08:00
samuele3hu	a765178a5f	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developDynamic	2014-02-24 09:38:08 +08:00
Ricardo Quesada	fe1160cd8c	changes in API to support 3D	2014-02-22 19:16:42 -08:00
Ricardo Quesada	8ca746af17	Implements AABB culling for sprites	2014-02-22 17:47:56 -08:00
heliclei	92571ebe04	merge upstream/develop	2014-02-22 22:58:24 +08:00
heliclei	5376b6333e	fix CCConsole crashed on windows, windows use send/recv(winsock) instead of read/write in unix to do socket i/o, create socketWrite/socketRead to wrap socket i/o function	2014-02-22 22:37:12 +08:00
samuele3hu	293ea66401	issue #3956:Remove the usage of “tolua.cast”	2014-02-21 16:22:35 +08:00
James Chen	1ce8f0ed82	Merge pull request #5428 from dumganhar/iss4106-vector-eraseObject ... closed #4106: Object which isn't in Vector would also be released when invoking Vector::eraseObject.	2014-02-21 11:37:12 +08:00
James Chen	d92e995f8c	Merge pull request #5361 from Dhilan007/develop_label ... issue #3821: LabelBMFont re-implemented as a wrapper of Label.	2014-02-21 11:36:23 +08:00
James Chen	c6b2b86fe5	closed #4106: Object which isn't in Vector would also be released when invoking Vector::eraseObject. ... Also refactored 'Vector::eraseObject': 1) Removed 'toRelease' parameter, Vector class should manage reference count. 2) Added 'removeAll' parameter to decide wether to remove all elements with the same value or just the first occurrence . 3) Added relevant UnitTest for 'Vector::eraseObject'.	2014-02-21 11:24:37 +08:00
samuele3hu	555ef20202	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developDynamic ... Conflicts: cocos/scripting/lua/bindings/LuaBasicConversions.h cocos/scripting/lua/bindings/lua_cocos2dx_physics_manual.cpp	2014-02-21 10:10:20 +08:00
samuele3hu	3532665520	issue #3956:Change tolua_fix.c to tolua_fix.cpp and modify the toluafix_pushusertype_ccobject function to get real type of object	2014-02-21 09:45:33 +08:00
Dhilan007	54f48b23e6	LabelBMFont re-implemented as a wrapper of Label.	2014-02-20 22:33:52 +08:00
James Chen	97a6ac65d3	Merge pull request #5424 from heliclei/console-autotest ... testcpp autotest:support next, back and restart test via console	2014-02-20 22:22:55 +08:00
heliclei	e64a647563	testcpp autotest:support next, back and restart test via console	2014-02-20 21:49:13 +08:00
boyu0	4410e70ca1	closed #4096: add s3tc bitmap with no mipmaps test case.	2014-02-20 18:27:52 +08:00
James Chen	f16d7652df	Merge pull request #5393 from heliclei/console-autotest ... add console autotest support	2014-02-20 17:58:21 +08:00
heliclei	1a1f92106a	add more console output	2014-02-20 16:29:04 +08:00
James Chen	0af0ce9032	Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into iss4058-ref-step1 ... Conflicts: cocos/scripting/auto-generated	2014-02-20 15:13:40 +08:00
James Chen	633604f79c	issue #4058: Typo fix in ZwoptexTest.lua.	2014-02-20 14:12:14 +08:00
James Chen	e3d14608df	issue #4058: Uses 'void*' instead of 'Ref*' as target of Scheduler. Any class could response scheduler callback now.	2014-02-20 14:11:47 +08:00
heliclei	02af73dd46	add main directive to return main menu	2014-02-20 13:43:28 +08:00
James Chen	5e6130c92c	issue #4058: Get rid of Object ,rename it to Ref.	2014-02-20 10:53:49 +08:00
Dhilan007	ddd02b463c	optimize label: ... 1.remove unnecessary API 2.reduces object-creation and function calls.	2014-02-19 20:26:14 +08:00
heliclei	e7209fbfa4	add autotest help	2014-02-19 17:55:32 +08:00
Dhilan007	f086f39319	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into new_label	2014-02-19 17:00:26 +08:00
heliclei	f9dceb5c2d	use '==' to do string compare	2014-02-19 16:54:42 +08:00
heliclei	0eb957e89c	add console autotest support	2014-02-19 16:34:33 +08:00
boyu0	50cdc67191	issue #4039: set tilemap <object> x and y value to original, and add “position_x”, “position_y”, “size_width” and “size_height” value.	2014-02-18 17:44:05 +08:00
James Chen	58d3311da0	Merge pull request #5342 from heliclei/console-user-command ... closed #4063 :revise CCConsole to support more easily for adding custom command.	2014-02-18 16:54:56 +08:00
James Chen	ee4972ae96	Merge pull request #5371 from andyque/refactorActionEase ... closed #3620: Merge cocostudio/CCActionXxx to CCAction。	2014-02-18 15:58:49 +08:00
Dhilan007	2ad81b0edb	closed #4060:fixed Label wasn't implemented correctly when Label::_fontAtlas contains multiple texture.	2014-02-18 14:30:51 +08:00
andyque	0b932f4f5f	fixed #3620. merge cocostudio/CCActionXXX to CCAction	2014-02-18 14:22:14 +08:00
andyque	e1ca972d3a	add tests of all the new added CCActionEaseEx in CCActionEase	2014-02-18 14:22:14 +08:00
samuele3hu	5acb556c74	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developEventTrigger	2014-02-18 13:46:21 +08:00
samuele3hu	8cb424b535	close #3593:Add more test cases about SceneReader of cocoStudio	2014-02-18 13:44:11 +08:00
James Chen	19205e3db8	Merge pull request #5365 from natural-law/issue3964 ... closed #3964: Solve the bug of Image::saveImageToPNG().	2014-02-18 11:49:09 +08:00
James Chen	2ee1330479	closed #4054: Adds test for removing child from TMXLayer.	2014-02-17 21:16:25 +08:00
samuele3hu	69ec932cd4	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developPerformance	2014-02-17 10:25:24 +08:00
samuele3hu	3f8bc8cc43	issue #3708:Remove the useless test case	2014-02-17 10:24:58 +08:00
zhangbin	e02f488224	Merge branch 'develop' into issue3964	2014-02-16 11:01:07 +08:00
James Chen	78163e604e	Merge pull request #5358 from dumganhar/merge5343 ... closed #4037:Exposed the missing data structures of Spine to JS	2014-02-14 11:17:38 +08:00
James Chen	a5aa547c7b	Merge pull request #5316 from natural-law/ScenarioTest ... closed #3738: Add performance test case on game scenario.	2014-02-14 11:12:01 +08:00
James Chen	f04e604a51	Updates JS-Tests.	2014-02-14 10:27:19 +08:00
James Chen	ea7a27fdf7	Updates JS-Tests.	2014-02-14 09:59:54 +08:00
James Chen	17dab13502	Resets JS-Tests.	2014-02-14 09:36:27 +08:00
James Chen	acefa4e237	Merge commit 'refs/pull/5343/head' of git://github.com/cocos2d/cocos2d-x into merge5343	2014-02-14 09:33:42 +08:00
James Chen	4837b2dd2d	issue #3990: setTotalParticles works as expected. _emissionRate has to be updated in setTotalParticles.	2014-02-13 17:01:38 +08:00
zhangbin	8ae5d2a049	closed #3964, Solve the bug of logic code in method Image::saveImageToPNG().	2014-02-13 16:22:41 +08:00