5600 Commits

Author	SHA1	Message	Date
Ricardo Quesada	47f6f8871f	compiles on windows	2014-05-09 14:43:20 -07:00
Trace	4c4a974287	use STRINGGIFY(A) instead R""	2014-05-09 12:03:09 -07:00
Trace	4bcdccd302	Merge branch 'improved_glprogram' of https://github.com/super626/cocos2d-x into improved_glprogram	2014-05-09 12:01:18 -07:00
Huabing.Xu	e72633c066	Merge branch 'improved_glprogram' of github.com:super626/cocos2d-x into tony_improved_glprogram	2014-05-09 11:53:22 -07:00
Trace	0b8aed3536	Merge branch 'improved_glprogram' of https://github.com/super626/cocos2d-x into improved_glprogram	2014-05-09 11:51:00 -07:00
Huabing.Xu	168ff78e18	add test case for y flipped coord	2014-05-09 11:49:51 -07:00
Trace	88f1d8ac4e	Add ShaderTest sample and shader code	2014-05-09 11:48:11 -07:00
Ricardo Quesada	78dd92a7ef	Merge remote-tracking branch 'cocos2d/v3' into improved_glprogram ... Conflicts: build/cocos2d_libs.xcodeproj/project.pbxproj	2014-05-09 11:40:13 -07:00
andyque	e1fe26543d	issue #5057, refactor & remove deprecated warnings	2014-05-09 18:37:22 +08:00
andyque	264769f814	issue #5057, refactor LinearGravity	2014-05-09 17:54:25 +08:00
andyque	09a53e7b03	issue #5057, refactor BackGroundColorType	2014-05-09 17:05:36 +08:00
andyque	e8e0d007bd	issue #5057, refactor LayoutType	2014-05-09 16:49:00 +08:00
andyque	451b7a1b6b	issue #5057, refactor UICheckBox event callback	2014-05-09 16:04:55 +08:00
andyque	c5a505ec4c	issue #5057, Merge branch 'v3' into refactor5057 ... Conflicts: cocos/ui/CocosGUI.h	2014-05-09 15:39:02 +08:00
andyque	57ce0ee2cf	issue #5057, refactor addTouchEventListener to std::function<>	2014-05-09 14:30:39 +08:00
andyque	7d1cb7af47	issue #5057, refactor UILoadingBarTest	2014-05-09 11:52:51 +08:00
Dhilan007	06f264e87d	rename VideoWidget to VideoPlayer.	2014-05-09 11:30:07 +08:00
Ricardo Quesada	62d9c24518	moves shaders files from 2d/ to renderer/	2014-05-08 18:01:48 -07:00
Ricardo Quesada	51f498fc94	fixed deprecation warnings	2014-05-08 16:42:36 -07:00
Ricardo Quesada	2e669c1d28	GLProgram::create() returns a linked GLProgram	2014-05-08 16:04:59 -07:00
Ricardo Quesada	580ebf939f	working Ok with new API	2014-05-08 15:43:12 -07:00
Ricardo Quesada	8f2ba467ff	Yeahhhhhh ... it is working	2014-05-08 12:34:26 -07:00
Ricardo Quesada	087378926f	Merge remote-tracking branch 'cocos2d/v3' into improved_glprogram ... Conflicts: build/cocos2d_libs.xcodeproj/project.pbxproj	2014-05-08 10:16:09 -07:00
Dale Stammen	eea1ba6946	added missing files to projects	2014-05-08 10:11:42 -07:00
James Chen	59e1fc39b3	Merge pull request #6638 from Dhilan007/v3_video ... fixed compilation fails on android.	2014-05-08 21:43:21 +08:00
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
ucchen	6e742077c2	add spine setAnimationListener test;	2014-02-13 11:58:54 +08:00
heliclei	9befe56a7e	update unit test	2014-02-13 11:10:23 +08:00
James Chen	5da57e4c7d	closed #3990: Adds test case for issue 3990.	2014-02-13 11:03:35 +08:00
ucchen	2c961bdfbf	add spine manual binding;	2014-02-13 11:01:54 +08:00
Éloi Rivard	8adca38efa	Linux javascript bindings support. ... - Adds Linux javascript test. - Adds Linux javascript template. - Adds Travis CI test.	2014-02-13 01:42:14 +01:00
samuele3hu	3d0fabe08c	issue #3708:Performance Test: data structure conversion in lua binding	2014-02-12 18:19:06 +08:00
boyu0	e7c077bb16	closed #3988: fix indent.	2014-02-12 16:21:26 +08:00
zhangbin	bfce75f534	Merge branch 'develop' into ScenarioTest	2014-02-12 16:17:03 +08:00
zhangbin	d99af40c32	issue #3738, Improve the performance test of game scenario.	2014-02-12 16:14:04 +08:00
boyu0	4fda8a2635	closed #3988: add bug test	2014-02-12 15:57:02 +08:00
zhangbin	89cc82c332	Merge branch 'develop' into ScenarioTest	2014-02-10 14:26:31 +08:00
James Chen	51ba0cbb17	Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into merge5268	2014-02-10 14:09:57 +08:00
zhangbin	11dbb37414	issue #3738, Add move actions for the tile map in PerformanceScenarioTest.	2014-02-10 14:04:21 +08:00
Dhilan007	6a662a6330	Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into develop	2014-02-10 11:47:05 +08:00
zhangbin	926f84d385	issue #3738, Add game scenario performance test case.	2014-02-10 11:42:15 +08:00
James Chen	99c20c4e30	Merge commit 'refs/pull/5268/head' of git://github.com/cocos2d/cocos2d-x into merge5268 ... Conflicts: tests/test-javascript/tests	2014-02-10 11:38:56 +08:00
Ricardo Quesada	907446d8d0	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into gl_vertices	2014-02-09 19:32:35 -08:00
Ricardo Quesada	24f655f9b1	Better 'vertices drawn'	2014-02-09 19:31:45 -08:00
Dhilan007	e12c1f57ac	Label::reduce unnecessary calculation amount.	2014-02-10 11:21:54 +08:00
James Chen	eda4c9a420	Merge pull request #5302 from Pisces000221/improve-label-chinese ... closed #3933 :A string which only contains CJK characters can't make a line-break when it's needed	2014-02-10 11:03:03 +08:00
Dhilan007	a8387a12f0	Merge branch 'improve-label-chinese' of https://github.com/Pisces000221/cocos2d-x into develop	2014-02-10 10:09:56 +08:00
Ricardo Quesada	9d5393631c	Merge branch 'develop' into fast_tmx ... Conflicts: tests/test-cpp/Classes/ConsoleTest/ConsoleTest.cpp tests/test-cpp/Classes/VisibleRect.cpp	2014-02-08 12:49:56 -08:00
Ricardo Quesada	560abe77c8	better Console support ... * Arguments are passed as std::string * Adds `resolution` and `projection` command * `texture` and `fileutils` supports the `flush` argument	2014-02-08 12:46:44 -08:00
Ricardo Quesada	13aa3ad2b5	Adds new commands to Console ... * resolution * projection	2014-02-08 12:35:11 -08:00
Ricardo Quesada	c7a999335c	Console. Less error prone, easier to use, more documentation	2014-02-08 10:20:12 -08:00
Ricardo Quesada	ceba63db8b	Merge branch 'develop' into fast_tmx	2014-02-08 09:08:33 -08:00
Pisces000221	03be459376	Update LabelTestNew.lua	2014-02-08 17:17:35 +08:00
Pisces000221	cef84f05af	Add LabelTTFCJKWrappingTest	2014-02-08 17:16:59 +08:00
Pisces000221	49163bb774	Add LabelTTFCJKWrappingTest	2014-02-08 17:15:57 +08:00
Pisces000221	1170943cf8	Add LabelTTFCJKWrappingTest	2014-02-08 17:14:38 +08:00
Ricardo Quesada	82700339c0	Adds a way to print the renderer vertices	2014-02-07 19:37:44 -08:00
Ricardo Quesada	616feadda1	More fixes and "tiles" is an uint32 (GID)	2014-02-07 18:11:17 -08:00
James Chen	c25787e575	issue #3900: Removes the definition of DEBUG. Windows uses _DEBUG .	2014-02-07 16:01:57 +08:00
James Chen	5714552458	issue #3900: mozjs-27.0.lib -> mozjs-27.lib for windows.	2014-02-07 15:29:44 +08:00
James Chen	4c2da5d286	issue #3900: mozjs-25 -> mozjs-27 for windows.	2014-02-07 15:16:14 +08:00
Ricardo Quesada	e33baac396	iso almost working	2014-02-06 22:20:28 -08:00
Ricardo Quesada	ad7b54eb0e	iso almost working 100% ok	2014-02-06 18:47:45 -08:00
Ricardo Quesada	cf08d0b3f9	isometric kind of working	2014-02-06 16:19:46 -08:00
Ricardo Quesada	3560227d09	sort of working	2014-02-05 19:51:24 -08:00
Ricardo Quesada	9a53f5a9f5	Testing a new TMX renderer ... faster	2014-02-04 17:59:21 -08:00
Ricardo Quesada	6ce6806544	new modules	2014-01-31 16:07:09 -08:00
Ricardo Quesada	e77d22a58f	samples -> tests	2014-01-31 14:09:28 -08:00
minggo	f9c40f7372	issue #1399: work ok on iOS after adjusting directory structure	2012-07-19 17:22:36 +08:00
James Chen	20eec32ff0	Updated proj.android/project.properties. target=android-10 --> 8	2012-06-28 18:26:28 +08:00
James Chen	26a02804d9	Added some resources. Updated Texture2dTest.cpp.	2012-06-28 17:34:50 +08:00
James Chen	aba33b5bda	Reverted build_native.sh.	2012-06-28 16:58:32 +08:00
minggo	5b08a5996c	add product name for iOS	2012-06-28 13:52:10 +08:00
minggo	e3771a8ad4	modify code sign	2012-06-28 13:41:05 +08:00
minggo	3c43dfb6fe	disable retina	2012-06-28 11:50:11 +08:00
minggo	7348fa12c3	update CHANGELOG and delete some unneeded files	2012-06-28 11:47:54 +08:00
James Chen	86942aedb4	fixed #1368: Implement EffectsAdvancedTest (Effect4). Added some comments.	2012-06-27 20:50:47 +08:00
James Chen	33e32e987c	Implement EffectsAdvancedTest (Effect4).	2012-06-27 18:44:25 +08:00
James Chen	13793a9d75	fixed #1367: Updated ShaderTest.cpp, TileMapTest.cpp.	2012-06-27 17:08:50 +08:00
James Chen	a901b0bb12	fixed #1367: Refactor "createWith***" to "create".	2012-06-27 14:21:29 +08:00
James Chen	f6026d2ba3	Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20	2012-06-26 12:09:48 +08:00
James Chen	95a2696b6b	fixed #1365: Some files of Resources folder which is copied by build_native.sh will lost authority in cygwin.	2012-06-26 12:09:23 +08:00
minggo	765da0c80a	enable depth test when running test case:Bug-1159	2012-06-26 11:09:37 +08:00
minggo	5cc1f7d230	fixed #1338:stop animation when entering background and start animation when comming to foreground	2012-06-21 11:42:49 +08:00
James Chen	2af75ecd65	fixed #1336: HelloCocosBuilder/HelloCocosBuilderLayer.cpp	2012-06-20 12:08:34 +08:00
James Chen	b818c0afa6	fixed #1336: Used CC_DEPRECATED_ATTRIBUTE macro to mark deprecated interfaces.	2012-06-20 11:48:31 +08:00
James Chen	07b9db8e91	Merge branch 'gles20' into gles20-ccbi	2012-06-19 17:28:31 +08:00
James Chen	c4056b1bb0	fixed #1269: Updated include search paths for win32 and android.	2012-06-19 17:22:55 +08:00
James Chen	591566b43a	fixed #1335: Memory leaks in cocos2dx and CCBReader.	2012-06-19 16:31:26 +08:00
minggo	90448ec7d0	issue #1269:fix some compiling error because of including error header files	2012-06-19 16:20:46 +08:00
minggo	2666df9472	issue #1269:mrege latest code and fix conflict	2012-06-19 13:57:33 +08:00
minggo	9ec29d715a	issue #1269:make tests HelloWorld HelloLua and testjs refer subproject cocos2dx	2012-06-19 13:50:11 +08:00
James Chen	9fa74721a7	fixed #1334: Add ScrollViewTest to CocosBuilderTest.	2012-06-19 10:34:15 +08:00
Nicolas Gramlich	6f26ea7a56	Added actual implementation of CCScrollViewLoader. Added ScrollViewTest to CococsBuilderTest.	2012-06-18 13:59:45 -07:00
Nicolas Gramlich	227683bfa4	Cleaned up CCNodeLoaders by using the Marco instead of having a boilerplate createCCNode method in all the cpp files.	2012-06-18 13:33:19 -07:00
minggo	6d0608d0f1	fixed #1333: add CCScrollView for iOS	2012-06-18 19:24:47 +08:00
James Chen	3cf0f3555c	issue #1330: Removed virtual for callback functions.	2012-06-16 15:22:23 +08:00
James Chen	73c9707d5d	CCBIReader fixes + building and running flawless on iOS and Android. ... Made it works on win32.	2012-06-16 12:48:20 +08:00
Nicolas Gramlich	13bcf2180c	Merge with gles20.	2012-06-15 16:26:10 -07:00
Nicolas Gramlich	c38bfd0a24	Updated xcode project file.	2012-06-15 16:16:08 -07:00
Nicolas Gramlich	d175884f79	Added ParticleSystemTest.	2012-06-15 14:48:36 -07:00
James Chen	cc572ab8e7	fixed #1329: Moved all java files part of engine into a certain directory, then all projects refer to them.	2012-06-15 18:15:43 +08:00
James Chen	24cc0796b6	Merge branch 'cocos2dxandroidlibrary' of https://github.com/folecr/cocos2d-x into folecr_android	2012-06-15 17:47:04 +08:00
minggo	899022d107	fixed #1292:fix some bugs that caused by modify function name	2012-06-15 17:39:13 +08:00
James Chen	595a402c83	fixed #1292:make some function names more readable.	2012-06-15 16:47:30 +08:00
James Chen	0afdfe33da	Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20	2012-06-15 15:25:37 +08:00
James Chen	c17091ac70	fixed #1310: Updated vs2010 project configuration after synchronizing to rc2.	2012-06-15 15:24:22 +08:00
minggo	266a5e5e66	Merge pull request #1028 from minggo/iss1292_moidify_function_name ... issue #1292:make some function names more readable	2012-06-15 00:14:13 -07:00
minggo	d0f905992a	issue #1292:make some function names more readable	2012-06-15 15:10:40 +08:00
James Chen	159b91b6cd	Fixed a logic error in ActionScaleTest.	2012-06-15 13:56:27 +08:00
James Chen	bc150ea5a9	fixed #1327: Exported 'create' method for lua bindings.	2012-06-15 11:46:51 +08:00
folecr	6fc2dc5ed9	Use Java code instead of XML to define layout ... * Android layout for cocos apps are very simple (full screen) * Avoids creation of R.java for loading the layout * Can package entire library in jar * Remove unused layout resource	2012-06-14 19:52:45 -07:00
minggo	c965c8d770	fixed 1181: synchronize latest codes	2012-06-15 10:27:52 +08:00
folecr	d651da6f0d	Tests : Ant build project files	2012-06-14 19:21:03 -07:00
folecr	d86e088e9f	Tests : Use cocos2dandroid library ... * Remove code and resources that are now in a library * Add library as a dependency for HelloWorld * Use cocos2dx_default_ resources	2012-06-14 19:21:03 -07:00
Nicolas Gramlich	8d7dce0999	Added glue macros to reduce boilerplate code when implementing CCBSelectorResolver and CCBMemberVariableAssigner. Added LabelTest, MenuTest and SpriteTest.	2012-06-14 18:16:54 -07:00
Nicolas Gramlich	a7ad34864f	CocosBuilderTest: Simplified the 'XYZLoader' classes to be header only, with nice and short macros to do the boilderplate stuff.	2012-06-14 14:23:53 -07:00
minggo	221be759c6	issue #1324: merge James Chen's codes	2012-06-14 18:54:05 +08:00
minggo	9d9e2579e3	issue #1181: save render texture when comming to background	2012-06-14 18:37:57 +08:00
James Chen	052d8ea931	fixed #1324: Added some create methods. Compiling successfully on win32 by vs2008.	2012-06-14 18:32:44 +08:00
James Chen	3a410c14a1	Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1324_create ... Conflicts: cocos2dx/extensions/CCBReader/CCBReader_v2.cpp cocos2dx/extensions/CCControlExtension/CCScale9Sprite.cpp cocos2dx/label_nodes/CCLabelBMFont.cpp cocos2dx/menu_nodes/CCMenuItem.cpp cocos2dx/menu_nodes/CCMenuItem.h cocos2dx/misc_nodes/CCRenderTexture.h cocos2dx/tileMap_parallax_nodes/CCTileMapAtlas.cpp tests/tests/ExtensionsTest/CocosBuilderTest/HelloCocosBuilder.cpp tests/tests/LabelTest/LabelTest.cpp	2012-06-14 17:36:31 +08:00
Nicolas Gramlich	cc5eabeb28	ButtonTestLayer: Now showing the CCControlEvent information on screen. Fixed CCLOG -> CCLog (because CCLOG doesn't show up on Android.).	2012-06-14 01:32:52 -07:00
James Chen	23574172ff	issue #1324: Added create() for static member functions that new an autorelease object, updated cocoa folder.	2012-06-14 16:05:58 +08:00
James Chen	3f7b44fc23	issue #1324: Added create() for static member functions that new an autorelease object	2012-06-14 15:13:16 +08:00
Nicolas Gramlich	cdd1fb50ac	Moved from std::string to CCString *. Since the std::string utility methods in CCBReader were buggy on Android (for unknown reasons). Made string utility methods in CCBReader static. Android build now working equivalent to iOS build. *YAY*	2012-06-14 00:01:01 -07:00
Nicolas Gramlich	5550d9f2b0	Merge with gles20.	2012-06-13 15:56:52 -07:00
Nicolas Gramlich	3e61e1f014	Updated Android build files to new CCBReader. Fixed a bunch of compiler errors/warnings when building for Android.	2012-06-13 15:25:59 -07:00
Nicolas Gramlich	29b22adccc	Batch converted manual 'using namespace cocos2d(::extension);' to USING_NS_CC(_EXT);. CocosBuilderExample: Made HelloCococsBuilderLayer selectors work. Made ButtonTestLayer work.	2012-06-13 14:19:13 -07:00
minggo	9321a8d025	fixed #1322: vertical alignment works ok on android	2012-06-13 18:33:44 +08:00
minggo	f80fd0c232	Merge pull request #1015 from minggo/gles20 ... issue #1310:synchronize some codes	2012-06-12 19:46:45 -07:00
minggo	b282d52a65	issue #1310:synchronize some codes	2012-06-13 10:41:04 +08:00
Nicolas Gramlich	895604f42e	Unified Header Guards. Added CCNodeLoaderListener, simulating the didLoadFromCCB selector.	2012-06-12 11:59:49 -07:00
James Chen	d2a16c2b76	issue #1310: Updated MotionStreakTest.	2012-06-12 18:27:36 +08:00
James Chen	e943dbf2fd	issue #1310: Updated TileMapTest, TransitionsTest, ZwoptexTest.	2012-06-12 18:22:48 +08:00
James Chen	2be8ba120c	issue #1310: Updated vs2008 project setting.	2012-06-12 18:15:25 +08:00
James Chen	6d4b80a826	Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20	2012-06-12 18:13:02 +08:00
James Chen	dab90107b9	issue #1310: Updated SchedulerTest.	2012-06-12 18:12:45 +08:00
James Chen	92f0364dca	Merge pull request #1008 from dumganhar/gles20 ... issue #1310: Reverted floatr to CCTimer.	2012-06-12 02:09:10 -07:00
James Chen	08fc714a7f	issue #1310: Reverted floatr to CCTimer.	2012-06-12 17:07:54 +08:00
minggo	1d77d53af3	Merge pull request #1007 from minggo/gles20 ... issue #1310: synchronize some codes	2012-06-12 01:57:24 -07:00
minggo	9fbe1fef96	issue #1310: synchronize some codes	2012-06-12 16:56:34 +08:00
James Chen	c8b5ad0440	issue #1310: Updated RotateWorldTest and SceneTest.	2012-06-12 16:22:25 +08:00
James Chen	23519ef85c	issue #1310: Updated ParallaxTest and RenderTextureTest.	2012-06-12 15:55:23 +08:00
James Chen	1c0f391e03	issue #1310: Updated ParticleTest.	2012-06-12 15:40:31 +08:00
James Chen	ae1ea76ca1	issue #1310: Updated NodeTest.	2012-06-12 15:22:42 +08:00
James Chen	f5b2a5d33d	issue #1310: Updated LayerTest.	2012-06-12 15:14:01 +08:00
James Chen	b770010c41	issue #1310: Updated LabelTest. Added init method for CCLabelBMFont. Fixed a bug in CCLabelAtlas::initWithString. ... In CCSpriteBatchNode::initWithTexture, when capacity is equal to 0, set it to default value.	2012-06-12 14:33:53 +08:00
James Chen	ef8ec1a941	issue #1310: Added some resources for tests project.	2012-06-12 14:32:57 +08:00
James Chen	9185f771f1	issue #1310: Added some resources for tests project.	2012-06-12 14:29:15 +08:00
minggo	916b276607	issue #1310: synchronize CCTexturePVR	2012-06-12 12:02:15 +08:00
James Chen	974f0d714d	issue #1310: Updated FontTest. And fixed a compilation error in FontTest.	2012-06-12 11:16:31 +08:00
Nicolas Gramlich	1f2652a8d7	Made CCBIReaderTest finally work completely. =) Also added support for having a root path when loading a ccb-file (i.e. when you have the two directories, one for the ccb files, one for the spritesheets. <- With a common ancestor.)	2012-06-11 18:31:11 -07:00
Nicolas Gramlich	4c8351f304	Removed Zombie files.	2012-06-11 15:00:11 -07:00
Nicolas Gramlich	342c65e293	Added CCBIReaderTest, which doesn't work since XCode sucks big time, not finding a simple file.	2012-06-11 14:57:30 -07:00
Nicolas Gramlich	58b53be708	Merge with gles20.	2012-06-11 11:50:32 -07:00
Nicolas Gramlich	4378731418	Merge with gles20.	2012-06-11 10:43:07 -07:00
minggo	ccbfd24c21	issue #1310: synchronize ActionManagerTest ActionEaseTest ActionsProgressTest ActionsTest	2012-06-11 18:25:57 +08:00
James Chen	2ce7c86c50	fixed #1315: TileMapTest can't be shown correctly in retina mode.	2012-06-11 14:44:32 +08:00
James Chen	33ea7905a5	Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 ... Conflicts: cocos2dx/platform/ios/CCFileUtils.mm	2012-06-11 11:01:36 +08:00
James Chen	c95cbb1774	issue #1310: Used CCLabelAtlas instead of CCLabelBMFont to display FPS,SPF status. ... Updated CCFileUtils, added some method, such as sharedFileUtils/purgeFileUtils/purgeCachedEntries. Fixed a bug in CCDirector, made retina mode work correctly.	2012-06-11 10:59:57 +08:00
minggo	94235d3602	issue #1310: make tests and HelloWorld work ok	2012-06-11 10:41:52 +08:00
James Chen	c9dc60b0f7	issue #1310: fixed a bug in CCSpriteFrameCache.cpp. Disable retina mode for tests project.	2012-06-08 17:58:21 +08:00
James Chen	371b3f9938	issue #1310: Tests project updated!.	2012-06-08 17:34:15 +08:00
minggo	cc16320445	issue #1310: syncronize actions	2012-06-08 13:55:28 +08:00
minggo	6cf8ea283d	Merge pull request #973 from minggo/iss1278_effect_android ... fixed #1278: stop effect when unloading effect	2012-06-06 00:41:26 -07:00
minggo	1ff04700b5	fixed #1278: stop effect when unloading effect	2012-06-06 15:38:25 +08:00
James Chen	37aa196c73	Removed some unused codes.	2012-06-06 14:31:49 +08:00
James Chen	6bb2941ec9	fixed #1300: Typo: CC_ENABLE_CACHE_TEXTTURE_DATA -> CC_ENABLE_CACHE_TEXTURE_DATA	2012-06-06 10:06:51 +08:00
minggo	dc24094b5f	fixed #1290:use Shaders folder in correct way	2012-06-04 11:41:03 +08:00
James Chen	cfbf29ccfc	Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1282_ati	2012-06-01 13:47:23 +08:00
James Chen	ebcc78497f	fixed #1282: Can not run samples on windows if the display card is ATI. Use opengl directly. Reverted all project configurations to Unicode characterset to avoid textinput error.	2012-06-01 13:44:28 +08:00
minggo	93b5fc37c7	typo fix	2012-06-01 12:04:04 +08:00
James Chen	9be586e4ec	Updated main.cpp for each project of android.	2012-05-31 10:13:05 +08:00
minggo	5ad2bec3d8	Merge pull request #946 from minggo/gles20 ... fix some bug	2012-05-30 03:33:19 -07:00
minggo	a698f9bf69	fix some bug	2012-05-30 18:31:20 +08:00
James Chen	922f7544ad	Updated TouchesTest.	2012-05-30 16:55:46 +08:00
James Chen	bd248b5ac0	Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20	2012-05-30 16:09:52 +08:00
James Chen	7115a7f3c9	issue #1275: Memory leaks in CCBReader and ActionsTest.	2012-05-30 16:09:19 +08:00
minggo	8203cf00ba	use fonts/fps_images.png	2012-05-30 13:37:36 +08:00
James Chen	ff0dde984c	fixed #1240: Updated vs2008 project setting (release target).	2012-05-29 18:29:56 +08:00
James Chen	b4fad0bb2b	fixed #1240: Updated vs2010 project setting (release target).	2012-05-29 18:06:52 +08:00
James Chen	1ddb5d51b5	Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20	2012-05-29 17:13:21 +08:00
minggo	a09bbbd0ba	fixed #1177: modify project setting, because CCStd.h is moved into platform/ios	2012-05-29 16:23:57 +08:00
James Chen	19c96632b5	fixed #1176: Changed linebreak symbol to UNIX format ('\n'),replaced 'tab' with four spaces.	2012-05-29 16:21:23 +08:00
James Chen	a00db6e072	fixed #1240: Updated ios project configuration.	2012-05-25 17:00:33 +08:00
James Chen	c902e884f4	fixed #1240: Moved particle files to Particle folder. Fixed a bug in tiff decoding. Refactored CCTextureCache::adddImage.	2012-05-25 16:52:47 +08:00
James Chen	6477a02022	Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1240_tiff	2012-05-25 11:00:20 +08:00
James Chen	0b8a75e982	fixed #1240: Used dynamic libtiff library for win32. Fixed some warnings. Added tiff test in Texture2dTest.	2012-05-25 10:58:28 +08:00
minggo	138de3171f	Merge pull request #912 from minggo/merge_nicolasgramlich ... Merge pull request by nicolasgramlich	2012-05-23 19:56:05 -07:00
minggo	0ba62c3854	issue #1246:use CCLabelBMFont instead of CCLabelTTF in CCDirector.cpp	2012-05-24 10:48:39 +08:00
James Chen	a5b63d8f6c	fixed #1251: Added CocosBuilderTest to the test project for VS2008.	2012-05-23 11:41:42 +08:00
Nicolas Gramlich	a62e017977	Made MenuTest use a differently names labelatlas to avoid collision with fps_images.fnt/png.	2012-05-22 13:26:20 -07:00
Walzer	7dadd8128c	rename tests/Resource/CocosBuilder to CocosBuilder_v1	2012-05-11 21:22:50 +08:00
Walzer	dc18dc0942	test ccb v2 format, add relative-position support	2012-05-11 20:53:30 +08:00
Walzer	ae12434128	fixed #1205, rename CCCustomClass to CCCustomClassProtocol, add windows support.	2012-05-08 11:30:08 +08:00
Walzer	f10b94fd15	issue #1205, CCBReader works on both iOS & Android now; public APIs of CCBReader are reduced; ccb files in subfolder is supported.	2012-05-07 22:52:58 +08:00
Walzer	1a73064055	issue #1205, refactor the tricky cpp reflection to easier approach, add cocos2d::extension namespace for CCBReader, add doxygen comments. Todo: CCB support on android	2012-05-07 18:14:15 +08:00
Walzer	c76e3c0936	remove CppReflection, add CCBCustomClass and CCBCustomClassFactory to implement reflection, leave some jobs to class HelloCocosBuilder: public CCBCustomClass. The approach is not so tricky, much easier to understand now.	2012-05-07 17:05:17 +08:00
Walzer	07276c3bba	Merge commit '184b31efa3aaa340621f5aa736d3b16e6ad97327' into gles20	2012-05-05 15:49:11 +08:00
Walzer	6b374881f0	Merge branch 'gles20' of http://github.com/cocos2d/cocos2d-x into gles20	2012-05-05 10:07:21 +08:00
Walzer	f70855e959	fixed #1229, reduce the requirement of gles20 branch from NDK android-10 to android-8 level (official android 2.2 image, the lowest version which supports OpenGL ES 2.0), remove EGL dependency.	2012-05-05 10:06:41 +08:00
Walzer	be2fa353a7	Merge commit '1afd7f2701b5e9fec0d2a4fd514d1d4e069b3830' into gles20	2012-05-05 09:55:06 +08:00
minggo	1afd7f2701	Merge pull request #893 from minggo/iss1217_EaseAction_reverse ... Iss1217 ease action reverse	2012-05-04 01:26:56 -07:00
minggo	14b923409a	fixed #1217: implement reverse() for all subclass of CCEaseAction that missing it	2012-05-04 16:22:50 +08:00
James Chen	bf0da624b4	issue #1191: Updated win32 templates, tested by vs2008 and vs2010. Updated win32 project configurations for VS2O10.	2012-05-04 11:16:57 +08:00
Walzer	ebaf1da460	issue 1205, CCBReader. Not perfect yet, I will use CCNotificationCenter to improve SET macro/assign var to parent.	2012-05-03 15:29:27 +08:00
Walzer	2fc1322cc8	update copyright and license declaration of CCCBReader relative files	2012-05-03 14:43:27 +08:00
Walzer	5faaab0d16	add CocosBuilderTest into extension test. fix a bug in CCLayerGradient::updateColor	2012-05-03 12:17:28 +08:00
Walzer	160b0aba88	Merge commit 'b7b21f3dc2e2c541a06fdd381b6b43d213a90093' into gles20	2012-05-03 12:02:13 +08:00
Walzer	9e62412ce9	issue #1205, add CCBReader, CppReflection, CocosBuilderTestCase	2012-05-03 11:58:53 +08:00
James Chen	82439733c5	fixed #1204: Made CCEGLView::Create(on win32) as a private function. Updated ExtensionsTest. ... And updated the format of source files(changed linebreak symbol to UNIX format ('\n'),replaced 'tab' with four spaces).	2012-05-03 10:12:00 +08:00
James Chen	136866bc12	issue #1204: Updated tests/proj.win32/main.cpp	2012-05-02 18:56:03 +08:00
James Chen	395dbc90aa	Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1204_initInstance ... Conflicts: lua/cocos2dx_support/LuaCocos2d.cpp	2012-05-02 18:23:16 +08:00
James Chen	5fc72581cb	issue #1204: Removed CCApplication::initInstance.	2012-05-02 17:50:26 +08:00
minggo	c048fe77c6	Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1201_android_build	2012-05-02 14:41:49 +08:00
James Chen	77d9b811be	issue #1194: Updated ChipmunkAccelTouchTest.	2012-05-02 14:06:40 +08:00
James Chen	abdc94ae3c	Merge branch 'iss1194_tex_wat' of https://github.com/dumganhar/cocos2d-x into iss1194_tex_wat	2012-05-02 12:05:39 +08:00
James Chen	a998062c57	issue #1194: Updated project configuration for android. Null pointer checking in CCNode::removeFromParentAndCleanup.	2012-05-02 12:04:27 +08:00
minggo	f37d3dd5d3	issue #1201: simplify writing of Android.mk	2012-05-02 12:00:39 +08:00
James Chen	63a8bbf0d9	issue #1194: Updated ios project configurations after adding CCTextureWatcher.	2012-05-02 10:39:39 +08:00
James Chen	de35aaa101	Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1194_tex_wat	2012-05-02 09:49:12 +08:00
James Chen	c5f7f15090	issue #1194: Added extension namespace, all extension classes are in cocos2d::extension namespace, added CCTextureWatcher and CCListView.	2012-04-27 18:47:49 +08:00
minggo	a4e8c9ad17	fixed #931: refactor CCImage and CCTexture2D	2012-04-27 18:37:11 +08:00
minggo	a1570e931f	issue #931:make convert to rgb565 and A8 correct	2012-04-27 15:53:29 +08:00
James Chen	1d94ba05a0	fixed #1189: updated linebreak and tab(4 space) for all source files.	2012-04-25 18:17:04 +08:00
James Chen	568bdce6c1	fixed #1188: Removed some unused files.	2012-04-25 17:46:29 +08:00
James Chen	8e5668472f	issue #1188: Updated project configuration for ios platform.	2012-04-25 17:33:28 +08:00
James Chen	0f36a89c7e	issue #1188: Refactor directory. Compile successfully on android and win32(vs2008 debug).	2012-04-25 16:18:04 +08:00
James Chen	c1bc4fd65a	fixed #1177: Updated ios project configuration.	2012-04-24 17:42:06 +08:00
James Chen	26763c200b	Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1177_platform ... Conflicts: tests/proj.ios/test.xcodeproj/project.pbxproj	2012-04-24 15:44:53 +08:00
minggo	1e20f2b6db	fixed #1185: reload image data and recreate buffer of object when backing to foreground	2012-04-24 15:02:18 +08:00
James Chen	af86a52f27	issue #1177:Updated some files for ios port.	2012-04-23 15:40:46 +08:00
James Chen	521155e9e2	issue #1177: Added some common methods for CCPoint,CCSize,CCRect. Added MutiTouchTest demo.	2012-04-23 14:30:38 +08:00
James Chen	0c6d21c0f9	Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1177_platform	2012-04-20 17:34:47 +08:00
James Chen	909a759ff6	issue #1177: Updated android project configuration.	2012-04-20 17:33:28 +08:00
minggo	f3d97bd9b6	fixed #1180: synchronize CCConfiguration	2012-04-20 11:39:12 +08:00
minggo	cbfca9d763	add execution permission	2012-04-20 10:54:58 +08:00
James Chen	dbeb7423ad	Merge branch 'iss1176_refactor' of https://github.com/dumganhar/cocos2d-x into iss1176_refactor	2012-04-19 17:53:15 +08:00
James Chen	f619c3e006	Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1176_refactor ... Conflicts: cocos2dx/misc_nodes/CCRenderTexture.cpp	2012-04-19 17:51:58 +08:00
minggo	4e4a26a2db	Merge pull request #855 from minggo/iss1150_rendertexture_crash ... use texture format kCCTexture2DPixelFormat_RGBA8888 to save image	2012-04-19 02:05:04 -07:00
minggo	92043b4db3	fixed #1150: use texture format kCCTexture2DPixelFormat_RGBA8888 to save image	2012-04-19 17:01:24 +08:00
James Chen	e28c77b574	issue #1176: Updated ios project configuration.	2012-04-19 15:26:24 +08:00
James Chen	5b50baffd4	issue #1176: Updated ios project.	2012-04-19 15:03:41 +08:00
James Chen	230b8a386b	issue #1176: Changed linebreak symbol to UNIX format ('\n'),replaced 'tab' ... with four spaces. Also, 1. Used macro NS_CC_BEGIN instead of namespace cocos2d {, NS_CC_END instead of }. 2. Removed some unused files. 3. Renamed the name of some folders, for example, "test.android"-->"proj.android" .	2012-04-19 14:35:52 +08:00
James Chen	4068be84e9	Refactored project folders.	2012-04-19 11:46:08 +08:00
James Chen	32b53623c7	Removed some unused folders regard to WOPHONE.	2012-04-19 10:52:53 +08:00
James Chen	783b2fe79b	Removed some unused codes regard to WOPHONE.	2012-04-19 10:46:37 +08:00
James Chen	42007ea71c	deleted some unused codes.	2012-04-18 14:15:11 +08:00
James Chen	e673bfae90	fixed #1114: Updated SchedulerTest and ShaderTest. Used CCControlSlider instead of UISlider. Added some resources.	2012-04-18 13:58:24 +08:00
James Chen	c501255a7a	Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1114_CCControlExt	2012-04-18 09:40:08 +08:00
James Chen	f8dfe1fca0	issue #1114: Updated ShaderTest.Added ShaderBlur.	2012-04-17 18:31:31 +08:00
minggo	cfdc5edf87	Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1139_screen_black	2012-04-17 17:55:59 +08:00
minggo	04c0d794af	fixed #1139: fix the bug that screen becomes black when backing to foreground on Android	2012-04-17 17:55:26 +08:00
James Chen	14c10a470a	Updated project configuration for android platform.	2012-04-17 16:41:07 +08:00
James Chen	92e44f1c78	Updated ios project configuration.	2012-04-17 16:14:32 +08:00
James Chen	413bc3c343	Finished CCControlSwitch.Added CCActionTween.	2012-04-17 16:00:18 +08:00
James Chen	d4f1dcfc44	finished CControlColourPickerTest. ... moved extension resources to 'extensions' folder.	2012-04-17 11:12:05 +08:00
James Chen	044729dab9	Updated CCControlExtension	2012-04-16 23:16:03 +08:00
James Chen	959acd556f	first commit CCControlExtension.	2012-04-16 18:58:43 +08:00
James Chen	be129913a8	issue #1166: Updated the project configuration for VS2010, android, ios port.	2012-04-16 13:02:44 +08:00
James Chen	a71e5be0d8	Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20_optimize_data ... Conflicts: cocos2dx/shaders/CCGLProgram.cpp	2012-04-16 12:45:47 +08:00
James Chen	9ace0d2fdc	Fixed memory leaks in CCString and CCDictionary, Updated CCFileUtils_ios.mm.Remove inline prefix for some member function of CCString, so that make it compiled successfully on android and ios.	2012-04-16 10:57:37 +08:00
Phenix Yu	e623cd6357	Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 ... Conflicts: cocos2dx/include/CCTexture2D.h cocos2dx/include/ccMacros.h cocos2dx/textures/CCTexture2D.cpp lua/cocos2dx_support/LuaCocos2d.cpp	2012-04-15 15:46:01 +08:00
James Chen	d01f1277af	optimize data struct.	2012-04-14 19:11:57 +08:00
minggo	34c805590f	Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1156_director	2012-04-13 14:11:58 +08:00
minggo	b43d5aa654	fixed #1156 syn CCDirector	2012-04-13 14:11:35 +08:00
James Chen	e9e6256815	Merge pull request #839 from dumganhar/gles20 ... fixed #1160: Renamed 'CGFloat' to 'CCFloat'.	2012-04-12 23:10:57 -07:00
James Chen	94e056d964	fixed #1160: Renamed 'CGFloat' to 'CCFloat'.	2012-04-13 14:09:02 +08:00
James Chen	91b4d52c31	Merge pull request #838 from dumganhar/gles20 ... fixed #1159: Updated "CallFuncND + auto remove" test demo.	2012-04-12 20:56:05 -07:00
James Chen	47af0886d3	fixed #1159: Updated "CallFuncND + auto remove" test demo.	2012-04-13 11:54:29 +08:00
minggo	028cf7874e	issue #1156: remove unneeded macros and functions	2012-04-13 11:22:17 +08:00
minggo	7cf16dbb32	Merge pull request #836 from minggo/touch_case ... fix TouchesTest crashed on Android and iOS	2012-04-12 18:47:41 -07:00
minggo	3fbfeeb7e8	fixed #1142: fix TouchesTest crashed on Android and iOS	2012-04-13 09:45:31 +08:00
James Chen	2b5af66974	updated win32 projects configuration release version.	2012-04-10 23:09:58 +08:00
James Chen	ba37e0e42f	Merge pull request #834 from dumganhar/gles20 ... fixed #1138: Fixed a memory leak in CCTextureCache::addPVRImage.	2012-04-10 03:45:27 -07:00
James Chen	b6cc0658f3	invalid pointer check in void TexturePVRRGB888::onEnter().	2012-04-10 18:43:00 +08:00
James Chen	429e0bcb46	Merge pull request #832 from dumganhar/gles20 ... fixed #1136: Fixed some bugs as follows: 1. Using std::string parameter as the key of CCDictionary 2. Deep copy for CCDictionary and CCArray, the classes of elements's type must implement copyWithZone. 3. Added toBool() function to CCString. 4. Retina support for all platforms. 5. Include "CCString.h" and "cocoa/CCNS.h" in cocos2d.h. 6. Added a new constructor(CCArray::CCArray(unsigned int capacity)) for CCArray. And fixed a bug in CCArray. 7. Fixed a memory leak in CCLabelBMFont.cpp. 8. Fixed an error in strings.xml.	2012-04-10 02:46:38 -07:00
James Chen	675f2b5dd0	Updated strings.xml	2012-04-10 16:21:23 +08:00
minggo	c9b1943559	create folder for shader	2012-04-10 15:30:11 +08:00
James Chen	6cd69523c8	Merge pull request #829 from dumganhar/iss1094_gles20_particlebat ... issue #1094: Make ParticleBatchNode works on win32 and fixed some issues as follows: 1. renamed CCPoolManager::getInstance() to CCPoolManager::sharedPoolManager(), and added CCPoolManager::purgePoolManager() method. Using pointer rather than global variable to make a singleton. 2.fixed a memory leak in CCParticleSystem. 3.init CCSprite::m_pobBatchNode at the beginning of CCSprite::initWithTexture. 4.Add CCAssert in ccArrayRemoveObjectAtIndex. 5.Use new method to allocate CCDirector.	2012-04-08 19:45:38 -07:00
James Chen	b4d74700e4	Merge branch 'iss1094_gles20_particlebat' of https://github.com/dumganhar/cocos2d-x into new_ipad ... Conflicts: tests/tests/ParticleTest/ParticleTest.cpp	2012-04-09 10:28:21 +08:00
James Chen	3d601048c6	Merge pull request #831 from dumganhar/new_ipad ... fixed #1095: IOS screen resolution(iphone, iphone-retina, ipad, ipad-retina) support.	2012-04-08 19:02:16 -07:00
Phenix Yu	a05757f741	update for msvc2010	2012-04-09 00:10:12 +08:00
minggo	355e27dada	merge commit 928a28e37d3469fcd41aff14cb136b1415f2fc86	2012-04-08 14:16:29 +08:00
Walzer	203f40a00d	add shader files correctly in test.xcodeproj, fix a warning in CCLabelBMFont.cpp,	2012-04-06 23:33:42 +08:00
James Chen	931c42a621	Updated some files.	2012-04-04 21:58:04 +08:00
James Chen	c759f29d76	Merge branch 'gles20' of https://github.com/dumganhar/cocos2d-x into gles20	2012-03-29 10:11:42 +08:00
James Chen	c6457dfed8	issue #1056: Updated ios project configuration.	2012-03-29 10:09:41 +08:00
James Chen	bb7485621e	issue #1056: Updated ParticleTest, CCParticleSystem, CCParticleSystemQuad.	2012-03-28 21:44:28 +08:00
James Chen	0f1ab7ab37	issue #1056: Updated SpriteTest, reverted the last parameter of glDrawElement in CCTextureAtlas.cpp and CCParticleSystemQuad.cpp.	2012-03-27 10:55:13 +08:00
James Chen	d36933d542	issue #1056: Update ios project.	2012-03-26 20:29:50 +08:00
James Chen	d67ea955f2	Delete some shader files.	2012-03-26 20:03:54 +08:00
James Chen	85c13998ee	issue #1056: Added CCTransitionProgress class, Updated Texture2dTest, TileMapTest, TransitionsTest.	2012-03-26 16:46:23 +08:00
James Chen	6f5603cfe6	issue #1056: Updated CCTexture2dTest. Added CCTextureAsyncTest.	2012-03-23 18:16:47 +08:00
James Chen	9c9230a43f	#issue #1056: Updated SpriteTest.	2012-03-23 17:31:28 +08:00
James Chen	2a459e23a6	Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20	2012-03-23 10:27:35 +08:00
James Chen	0ef65d1ed5	issue #1056: Renamed CC_COCOSNODE_RENDER_SUBPIXEL to CC_NODE_RENDER_SUBPIXEL in CCNode.cpp	2012-03-23 10:26:36 +08:00
minggo	728835c77b	Merge pull request #806 from minggo/SpriteTest ... Sprite test	2012-03-22 19:25:24 -07:00
minggo	ad8d7cdeff	SpriteTest	2012-03-23 10:23:02 +08:00
James Chen	900de7328a	Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20	2012-03-22 18:29:26 +08:00
James Chen	c5d0b1ca6f	issue #1056: Updated ParticleTest.	2012-03-22 18:29:07 +08:00
minggo	a8eaf85cfb	Merge pull request #804 from minggo/RenderTextureTest ... Rendertexturetest	2012-03-22 01:37:58 -07:00
minggo	39ba6b4618	issue #1506: RenderTextureTest	2012-03-22 16:36:03 +08:00
minggo	56f27c495b	Merge pull request #803 from minggo/MotionStreak ... issue #1506: MotionStreakTest	2012-03-21 23:33:03 -07:00
minggo	6b7716770e	issue #1506: MotionStreakTest	2012-03-22 14:32:32 +08:00
James Chen	3a50022399	Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20	2012-03-22 14:24:08 +08:00
James Chen	b1f293e089	issue #1056: Updated MenuTest. Added CCArray::arrayWithObject function.	2012-03-22 14:22:06 +08:00
minggo	2aa61bf798	issue #1506: LyaerTest	2012-03-22 13:59:47 +08:00
minggo	85de198511	Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into test_sync	2012-03-22 11:49:04 +08:00
minggo	3d10006d6f	issue #1506: implement CCLabelTest	2012-03-22 11:48:37 +08:00
James Chen	925fee4820	issue #1056: Added kazmath license file. Used CCCallFuncN instead of CCCallBlock and updated ActionsTest.	2012-03-22 11:26:39 +08:00
James Chen	3a287db954	issue #1056: Update ActionsTest.	2012-03-22 10:27:28 +08:00
minggo	b1607b2106	Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into test_sync	2012-03-22 09:41:03 +08:00
minggo	e8b7bc7c7e	issue #1056: LabelTest	2012-03-22 09:40:32 +08:00
James Chen	2e8bae8ebf	issue #1056: Update Android.mk. Make tests project being compiled successfully.	2012-03-21 22:49:58 +08:00
James Chen	6f4a01f454	Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20	2012-03-21 17:35:39 +08:00
James Chen	f529bcd659	issue #1056: Move some singletons to CCDirector. It is easily managed by CCDirector.	2012-03-21 17:35:20 +08:00
minggo	e75e35b23f	issue #1506: add ShaderTest source code	2012-03-21 17:27:13 +08:00
minggo	6242656049	issue #1506: fix a confict	2012-03-21 17:23:33 +08:00
minggo	92c30a328e	issue #1506: implement ShaderTest	2012-03-21 17:02:52 +08:00
James Chen	159b677dc0	Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20	2012-03-21 16:09:26 +08:00
James Chen	8ad598241f	issue #1056: Update Tests project for ios platform.	2012-03-21 16:05:24 +08:00
James Chen	9b4a42c494	issue #1056: Update Box2dTest and ChipmunkAccelTouchTest.	2012-03-21 15:54:48 +08:00
James Chen	2ac2da9c97	issue #1056: 1. Removed ChipmunkTest, added ChipmunkAccelTouchTest. ... 2. Added Box2DTest and Box2DTestBed. Tested on win32.	2012-03-21 15:43:35 +08:00
minggo	bb908f5a5e	Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into ActionsEaseTest	2012-03-21 13:36:51 +08:00
minggo	f6c113993a	issue #1506: rename CocosNodeTest to NodeTest and SC	2012-03-21 13:36:24 +08:00
James Chen	8ef5e4ae3b	issue #1056: Update the configuration of ios project.Sort the the project folder.	2012-03-21 11:07:31 +08:00
James Chen	321771a7ea	issue #1056: Added gles2.0 support for ios platform.	2012-03-21 10:05:23 +08:00
minggo	a3441a39e7	issue #1056: rename EaseTatinosTest to ActionsEaseTest and SC	2012-03-20 18:07:42 +08:00
minggo	7ccb38556e	Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into android_gles20	2012-03-20 16:10:53 +08:00
minggo	74aaf4c6ca	issue #1056:gles20 runs ok on android	2012-03-20 16:10:12 +08:00
James Chen	ae2b3307fa	Merge pull request #779 from dumganhar/iss1056_CCDict ... issue #1056: Removed CCMutableArray and CCMutableDictionary template, offered CCDictionary to improve the performance of dictionary by 60%, it means that CCDictionary can save about 2/3 time cost.	2012-03-20 00:07:58 -07:00
James Chen	6ce06bd906	issue #1056: Remove CCMutableArray and CCMutableDictionary template, offer CCDictionary to improve the performance of dictionary by 60%, it means that CCDictionary can save about 2/3 time cost.	2012-03-20 15:04:53 +08:00
minggo	39738e4270	issue #1056: implement ActionsProgressTest and run ok on win32	2012-03-19 18:20:32 +08:00
minggo	68809fd5ed	Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20	2012-03-19 13:54:34 +08:00
James Chen	e021ae9821	#1056: issue #1056: synchronise cocos2d-iphone-2.0-rc0a, update some files.	2012-03-16 17:56:19 +08:00
James Chen	275891dfb0	issue #1056: synchronise cocos2d-iphone-2.0-rc0a	2012-03-16 13:42:53 +08:00
minggo	41fad74017	Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20	2012-03-15 10:05:42 +08:00
James Chen	8aa3f7f9ae	issue #1056: TestCases works ok except Box2dTest and ChipmunkTest.	2012-03-14 18:11:25 +08:00
folecr	6336df4024	Fix test to match newer API	2012-03-13 23:07:42 -07:00
Wartortle	7321d33aaf	Added support files for Accelerometer Simulation for iPhone Simulator and ... Unimotion Ref: http://code.google.com/p/accelerometer-simulator/wiki/Home Ref: https://github.com/gmarik/unimotion	2012-03-08 11:23:47 +00:00
minggo	645d561276	fixed #737: remove view id	2012-03-08 12:40:27 +08:00
minggo	7890333505	fixed #721: cocosdenshion can play local file on android	2012-03-06 16:56:30 +08:00
James Chen	d3dedd19f2	fixed #995: Modify project configure for marmalade port after adding extension support and refactor resource folder.	2012-03-01 17:38:31 +08:00
James Chen	dfd5adb3bd	fixed #994: add support for bbndk2.0 on blackberry platform.	2012-03-01 16:52:17 +08:00
James Chen	7daeb5cd86	fixed #984: Use static library for cocos2dx project on platforms(bada and qnx) that use gcc compiler. Because dynamic_cast may fail if you use a gcc compiler.	2012-02-28 14:59:46 +08:00
James Chen	6d97e3e381	fixed #972: update ios project configures.	2012-02-16 11:48:09 +08:00
James Chen	2c599d31b5	Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into iss972_CCNotificationCenter	2012-02-15 17:02:47 +08:00
James Chen	ac98d22367	update ios project configures for ios, and modify xcode4's template	2012-02-15 16:59:47 +08:00
James Chen	e1413dff5e	update linux project configure	2012-02-15 15:57:09 +08:00
James Chen	a2a5af3348	update bada and qnx project settings	2012-02-15 13:52:41 +08:00
James Chen	3422696145	1.modify some project setting for bada ... 2.rename some files	2012-02-14 22:35:51 +08:00
James Chen	abefe50ef7	modify marmalade project setting	2012-02-14 18:25:20 +08:00
James Chen	f8ff388e8d	rename Resource(in HelloLua and HelloWorld project) and Res(in tests project) to Resources. ... test ok on win32 and android	2012-02-14 18:04:56 +08:00
minggo	e75dbf2bd9	Merge pull request #724 from minggo/iss957_text_input ... fixed #957: avoid to go to background when inputting test	2012-02-14 00:07:51 -08:00
minggo	fd9f73f43e	fixed #957: avoid to go to background when inputting test	2012-02-14 16:02:41 +08:00
James Chen	c3d23a7923	issue #972: Modify project setting for all platforms. Use new icons for ios template.	2012-02-14 15:13:54 +08:00
James Chen	65b1b20c8d	Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into iss972_CCNotificationCenter ... Conflicts: cocos2dx/proj.win32/cocos2d-win32.vcxproj.filters tests/test.win32/test.win32.vcxproj.filters	2012-02-14 11:43:04 +08:00
James Chen	4b9ee55145	issue #972: modify project settings for linux and marmalade.	2012-02-10 13:39:39 +08:00
minggo	8b855a917f	issue #973: refactor lua support	2012-02-10 12:02:46 +08:00
James Chen	81ec2c8586	issue #972: add support for CCNotificationCenter, and add the test demo for it. ... modify the project setting for VS2008 and VS2010	2012-02-10 11:48:33 +08:00
minggo	3c41164b23	Merge pull request #716 from minggo/iss971_rtti ... build cocos2dx as static lib and remove some unneeded codes	2012-02-09 18:35:28 -08:00
minggo	6ae40fc12f	fixed #971: build cocos2dx as static lib	2012-02-10 10:31:56 +08:00
minggo	481f1c2532	fix a typo error	2012-02-09 18:17:25 +08:00
minggo	357c825fa5	issue #971: set JavaVM at JNI_Onload()	2012-02-09 16:27:15 +08:00
minggo	153d2b8192	issue #971: build cocos2dx as static lib and remove some unneeded codes	2012-02-09 15:49:14 +08:00
minggo	ee08c4629e	Merge pull request #714 from minggo/ndk_module ... fixed #970: use modules in the android ndk build	2012-02-07 19:16:01 -08:00
minggo	52de292e20	fixed #970: use modules in the android ndk build	2012-02-08 11:14:47 +08:00
minggo	29c18c67ca	Merge pull request #712 from minggo/ndk_module ... Use modules in the Android NDK build	2012-02-06 22:36:45 -08:00
minggo	9249328afb	fixed #970: use modules in the Android NDK build	2012-02-07 14:34:30 +08:00
dumganhar	ee2139023a	Merge pull request #708 from Wartortle/master ... fixed #969: Addition of Accelerometer Simulation for Win32.	2012-02-06 18:57:41 -08:00
minggo	a7c96b5371	fixed #954: correct accelerometer data when set orientation to portrait in tablet	2012-02-07 10:19:40 +08:00
Wartortle	aa06de2fb3	Second half of commit for adding Accelerometer simulation to Win32.	2012-02-06 11:38:53 +00:00
minggo	591b7d0619	fixed #933: profile CCUserDefault	2012-02-02 14:18:13 +08:00
minggo	1ae8f001b8	Merge pull request #702 from minggo/iss947_closed_loop ... fixed #947: fixed a closed loop	2012-02-01 02:22:02 -08:00
minggo	5e39489c71	fixed #947: fixed a closed loop	2012-02-01 18:18:31 +08:00
minggo	56677be235	Merge pull request #701 from minggo/iss964_label ... fixed #964: compute correct height of a charactor	2012-02-01 02:05:50 -08:00
minggo	7b67c04f2f	fixed #964: compute correct height of a charactor	2012-02-01 18:04:12 +08:00
dumganhar	64c892de79	Merge pull request #697 from dducharme/dalebranch ... fixed #962: Updating the following: CocosDenshion - now using OpenAL exclusively for audio, added ogg/vorbis support there Accelerometer - fixing the accelerometer for different initial orientations of the device Application - paying attention to the locale of the device and setting the current language accordingly CCEGLView - paying attention to navigator events (menu, application go to background, application enters foreground), fixed up orientation code, fixed up screen event pointer code	2012-01-31 18:44:09 -08:00
minggo	a2efab73a0	fixed #959: make touch id correct on android	2012-01-31 14:49:02 +08:00
Dale Ducharme	32e4cc1af2	Updating the following: ... CocosDenshion - now using OpenAL exclusively for audio, added ogg/vorbis support there Accelerometer - fixing the accelerometer for different initial orientations of the device Application - paying attention to the locale of the device and setting the current language accordingly CCEGLView - paying attention to navigator events (menu, application go to background, application enters foreground), fixed up orientation code, fixed up screen event pointer code	2012-01-30 20:27:58 -05:00
minggo	6c2277757a	fixed #958: delete SelectorProtocol and implement it in CCObject	2012-01-30 17:47:47 +08:00
gzito	fe79a2c5d2	Merge branch 'master' of git://github.com/cocos2d/cocos2d-x	2012-01-28 10:54:31 +01:00
dumganhar	a23893507d	fixed 952: make CCLabelBMFont support other language, such as chinese, korean, japanese.	2012-01-18 18:43:41 +08:00
gzito	9e180e9c01	Added true type fonts file for Marmalade version	2012-01-17 10:53:47 +01:00
gzito	c87881ff94	Added Marmalade support to TextInputTest and HelloLua samples	2012-01-15 15:57:10 +01:00
dumganhar	3f7ab5a58f	Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into modify_linux_port	2012-01-12 19:17:31 +08:00
dumganhar	ef753afb6b	modify eclipse project setting for linux port	2012-01-12 19:15:23 +08:00
minggo	df668c9785	Merge pull request #675 from minggo/test ... fixed #930: linux supports jpg format file	2012-01-12 01:51:16 -08:00
minggo	0e03c8ca21	fixed #930: linux supports jpg format file	2012-01-12 17:46:53 +08:00
minggo	3905e5a47b	Merge pull request #670 from minggo/test ... fixed #941: limit background music volume in [0, 1.0]	2012-01-11 01:57:27 -08:00
minggo	40b1798f41	fixed #941: limit background music volume in [0, 1.0]	2012-01-11 17:56:11 +08:00
dumganhar	4848dc9c46	fix a bug in SimpleAudioEngine.cpp on bada platform ... use float value to change volume	2012-01-11 17:24:46 +08:00
minggo	86997d6709	fixed #940: replace icons and background pictures	2012-01-10 16:45:49 +08:00
dumganhar	317f23f498	fixed #939: Add create_qnx_project.vbs and add project references	2012-01-09 19:06:49 +08:00
minggo	1bd3601b11	fixed #937: use gnustl_static instead of stlport_static to resolve compiling error on android x86 platform	2012-01-04 18:02:32 +08:00
minggo	08e0be754b	fixed #926: retain/release in Paddle	2011-12-28 15:13:02 +08:00
minggo	d82471478d	add run permition	2011-12-23 11:17:20 +08:00
minggo	edbbe25a98	issue #888: remove the setting for android building	2011-12-23 10:40:02 +08:00
minggo	b7fbd4fc13	issue #919: supporting global variable	2011-12-20 16:50:39 +08:00
minggo	857ce1d505	fixed #921: fix a bug that accelerometer axes inverted in android tablet	2011-12-19 16:29:26 +08:00
dumganhar	af221f8710	fixed #918: modify filter of airplay to marmalade.	2011-12-16 11:08:37 +08:00
dumganhar	8298e0b6ff	Merge branch 'master' of https://github.com/styck/cocos2d-x into pullrequest#611 ... Conflicts: tests/test.marmalade/test.mkb	2011-12-15 13:03:07 +08:00
dumganhar	265558d9c7	Merge branch 'dev' of https://github.com/guavagames/cocos2d-x into pullrequest#619	2011-12-15 11:36:42 +08:00
Didiet Noor	0f8da500c2	Restored Accidentally removed marmalade line from CocosDenshion Test	2011-12-15 02:05:25 +08:00
Didiet Noor	8c69c70fc3	Fixed Path Issues on QNX, CocosDenshion Test back to original	2011-12-15 00:31:17 +08:00
Didiet Noor	f5d41d21b2	Added CDT Project and Modifying CocosDenshion for QNX	2011-12-14 21:26:47 +08:00
Walzer	7d01aa0c74	HelloWorld, Test and HelloLua can succefully compiled by xcodebuild commenline with -sdk iphonesimulator4.3 now. The key is GCC_VERSION="", you can not skip this null value, otherwise the commendline will use GCC4.2 as default, can generate tons of errors.	2011-12-13 22:25:51 +08:00
dumganhar	4b9cbb85ff	#issue 908: Merge marmalade to latest cocos2d-x source ... Merge branch 'master' of https://github.com/gzito/cocos2d-x into marmalade Conflicts: cocos2dx/platform/CCFileUtils.cpp cocos2dx/platform/CCPlatformConfig.h cocos2dx/support/zip_support/ioapi.cpp	2011-12-12 17:46:21 +08:00
dumganhar	baf3755142	remove some '__QNX__' macros	2011-12-12 16:14:12 +08:00
dumganhar	dea2713f51	fixed #907: add blackberry port ... Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into blackberry Conflicts: cocos2dx/platform/CCSAXParser.h	2011-12-12 11:49:49 +08:00
minggo	95b43ac563	Merge pull request #614 from minggo/issue892_RTTI ... Use RTTI to simplify codes	2011-12-11 19:40:34 -08:00
minggo	8c5c3300aa	Merge pull request #612 from dumganhar/issue904 ... Issue904	2011-12-11 19:33:07 -08:00
styck	b1cdb6543d	Updated ccLanguageType CCApplication::getCurrentLanguage() to return the current language ... Added tests for Marmalade and enabled language and font testing	2011-12-11 17:18:01 -08:00
gzito	47e108a8c5	Added marmalade support, removed airplay	2011-12-11 10:19:41 +01:00
styck	bcf63d0e96	Merged from gitbub.gom/gzito, marmalade support, remove airplay	2011-12-10 20:59:48 -08:00
gzito	f27f9180ff	Merge remote-tracking branch 'remotes/styck/master'	2011-12-10 11:10:59 +01:00
Giovanni Zito	287f480c97	Added initWithString (TTF) and jpeg support	2011-12-09 22:05:12 +01:00
dumganhar	1c9ecabd89	modify all projects config	2011-12-09 17:03:11 +08:00
dumganhar	5dea9b8205	fix a crash bug in SimpleAudioEngine.cpp ... update helloworld and tests main.cpp and AppDelegate.cpp files	2011-12-09 15:54:35 +08:00
styck	34759f4411	Enabled the CCUserDefault for Marmalade - works now that libxml2 is being used.	2011-12-08 20:47:42 -08:00
styck	7350fa9bb5	Updated based on G.Zito feedback	2011-12-08 19:51:19 -08:00
dumganhar	b398d75e21	modify tests 'Res' link to 'Resource', remove the coupling between CocosDenshion and Cocos2dx	2011-12-09 10:32:00 +08:00
Giovanni Zito	c5b0a76742	Added support to play more than one sound fx at once	2011-12-08 19:27:20 +01:00
Giovanni Zito	0a7a000c2d	Changed symbols from "airplay" to "marmalade", added files and folders for marmalade	2011-12-08 12:21:48 +01:00
dumganhar	b11bcacea8	modify Device-Debug project setting, finished running on device!	2011-12-08 18:22:06 +08:00
Giovanni Zito	1eb8ba656e	Added marmalade folder	2011-12-08 11:15:20 +01:00
dumganhar	fa07d16f73	switch to WVGA	2011-12-08 11:07:17 +08:00
dumganhar	de7754697f	fixed #904: use relative path for bada 2.0 projects	2011-12-07 18:26:38 +08:00
minggo	a3986a9e21	issue 892: add cpp flag to support rtti on android	2011-12-07 16:51:54 +08:00
styck	96d400d918	Replace expat with libxml2, added libxml2 libraries and header files. Library built from: https://github.com/marmalade/marmalade-libxml2 ... Refactored Accelerometer to match other platforms Updated SimpleAudioEngine.cpp with new functions. (NOT tested). Updated app.icf for latest Marmalade Update deprecated function calls. Removed CCSAXParser_aiplay.cpp - not used, uses default in platform.	2011-12-06 18:32:36 -08:00
dumganhar	520e3365c1	modify some project settings	2011-12-06 16:17:49 +08:00
dumganhar	dfbf2c0cdb	add tests project for blackberry	2011-12-06 15:03:14 +08:00
minggo	2f6fb5b189	Merge pull request #602 from minggo/master ... change file structure in xcode view	2011-12-01 00:28:17 -08:00
minggo	d92bdcc40d	change file structure in xcode view	2011-12-01 16:27:11 +08:00
dumganhar	6973525319	Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into master_base	2011-12-01 14:19:07 +08:00
dumganhar	ef8e34f9a1	fix a bug in ZwoptexTest. ... step: click ZwoptexTest, back to mainmenu, enter SpriteTest, next to 'SpriteFrame Alias Name' will cause assert.	2011-12-01 14:15:10 +08:00
minggo	ec70d1d240	Merge pull request #600 from dumganhar/master_base ... fix a bug in IntervalTest	2011-11-30 22:05:07 -08:00
dumganhar	f02ce4b15a	fix a bug in IntervalTest	2011-12-01 13:56:20 +08:00
minggo	34d10fb3db	Merge pull request #598 from dumganhar/master_base ... DemoModernArt test crash on bada	2011-11-30 20:45:36 -08:00
minggo	cddaa3fea2	fixed #885: make SimpleAudioEngine::setEffectVolume() take effect immediately on android	2011-12-01 12:12:14 +08:00
dumganhar	bdddc188aa	fix a bug that DemoModernArt crash on bada	2011-12-01 12:04:43 +08:00
dumganhar	0ae54cc0fd	comment setIsAccelerometerEnabled( true ); in Box2dView.cpp, Box2dTestBed do not use Accelerometer.	2011-11-30 17:37:09 +08:00
dumganhar	262d5969c3	fixed #883: fix a bug in SpriteTest.	2011-11-30 17:29:16 +08:00
minggo	adfec68577	fixed #850: update Box2d for linux	2011-11-29 17:12:21 +08:00
minggo	c99d254c01	issue #850: update box2d for iOS and android	2011-11-29 15:16:16 +08:00
dumganhar	5a984bcc29	Merge branch 'master_base' into box2d2.2.1	2011-11-28 18:32:38 +08:00
dumganhar	3442d17dbe	fixed #880: implement preLoadBackgroundMusic on bada, fix the bug that playEffect repeatly can't work. Modify CC_ASSERT macro define.	2011-11-28 18:05:38 +08:00
dumganhar	cad4ff05f3	Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into master_base ... Conflicts: cocos2dx/textures/CCTextureCache.cpp	2011-11-28 15:43:13 +08:00
Walzer	ab7db20809	Fix a typo, CCSprite::get/setHornorParnetTransform to get/setHonorParnetTransform	2011-11-26 17:20:12 +08:00
dumganhar	10f5082a83	update box2d to version2.2.1	2011-11-25 18:30:27 +08:00
minggo	bd595516b8	issue #781: add new functions for sound	2011-11-25 09:56:06 +08:00
dumganhar	e87b00db67	add pthread support for bada 1.0	2011-11-24 17:26:04 +08:00
dumganhar	07da67f253	Merge branch 'master' into master_base ... Conflicts: cocos2dx/menu_nodes/CCMenu.cpp	2011-11-24 11:52:16 +08:00
dumganhar	2bd49545fa	add bada1.0 pthread support	2011-11-24 00:07:50 +08:00
dumganhar	035d7326db	Merge branch 'master' of https://github.com/cocos2d/cocos2d-x	2011-11-23 21:43:40 +08:00
minggo	6aedc258b4	fixed #838: tests and HelloLua support x86	2011-11-23 15:51:30 +08:00
minggo	8b20639d75	issue #838: HelloWorld support x86	2011-11-23 11:02:18 +08:00
minggo	bc60ed7856	issue #854: optimize CCTextureCache::addImageAsync()	2011-11-22 16:47:24 +08:00
minggo	efa9275d7f	save the codes for testing	2011-11-21 12:04:21 +08:00
minggo	d48da20b0f	synchrolize to master	2011-11-18 18:53:53 +08:00
U-zhangxm-PC\zhangxm	d84b6c25be	issue #223: merge bada branch and fix some error	2011-11-18 18:45:05 +08:00
minggo	775c7ff847	Merge pull request #573 from minggo/iss854_pthread ... support pthread	2011-11-17 18:40:30 -08:00
minggo	0676714436	issue #854: add TextureCacheTest into makefile	2011-11-17 18:32:52 -08:00
minggo	522386a6b7	issue #854: pthread work ok on iOS	2011-11-18 09:55:47 +08:00
minggo	81b8fc0ce8	fixed #854: fix a bug of CCTextureCache	2011-11-17 14:34:41 +08:00
minggo	cb75465913	issue #854: add test case for CCTextureCache	2011-11-17 10:10:13 +08:00
minggo	dd8a2deeaf	fixed #758: fix the bug that TTF fonts cause low memory on android	2011-11-16 11:40:24 +08:00
dumganhar	0d6ea61b76	fixed some bug:1.setDeviceOrientation, chipmunkDemo glOrthof	2011-11-07 18:18:10 +08:00
dumganhar	e9a2818d0d	use wvga setting, add SYSTEM_SERVICE	2011-11-02 01:11:06 +08:00
dumganhar	012052b089	modify project configure	2011-10-25 14:32:26 +08:00
dumganhar	4b653c89d1	modify project configure	2011-10-25 14:12:42 +08:00
dumganhar	146d3e1536	modify project config	2011-10-24 14:22:09 +08:00
dumganhar	2c87e5e17e	use default manifest.xml	2011-10-24 11:01:39 +08:00
dumganhar	3aef823bd5	rename sdk1.2 to sdk1.0	2011-10-24 11:00:11 +08:00
dumganhar	59a14973ef	change splash and icon to cocos2d	2011-10-24 10:54:08 +08:00
dumganhar	eb901be664	project config change	2011-10-21 09:49:57 +08:00
dumganhar	da794c1613	Merge branch 'master' into bada	2011-10-21 09:28:29 +08:00
dumganhar	fdbb989ce5	make sdk1.2 to sdk1.0	2011-10-20 18:31:10 +08:00
Walzer	67bbbb2800	1. relative to bug #754, FontTest should use "fonts/abc.ttf" as external ttf name ... 2. fixed a tiny bug, FontTest can show font name on the top correctly	2011-10-20 14:56:39 +08:00
Walzer	707e22a2c8	fixed bug #754, particle test crashes on ios 4.3.3 & 5.0. Adding "fonts' into Resoures as "group" instead of "folder" cause this bug, but it can work on 4.3 and lower version.	2011-10-19 22:20:13 +08:00
Walzer	e3c39fe835	fixed #753, visual orientation is wrong on ios5 simulator	2011-10-19 21:43:25 +08:00
minggo	8aa014d3cd	Merge pull request #558 from minggo/iss755 ... fixed #743	2011-10-19 05:05:23 -07:00
minggo	2490388f28	remove unneeded packages	2011-10-19 20:03:18 +08:00
minggo	68d03de677	fixed #743: let nativeInit() get correct screensize when running on device with software android buttons	2011-10-19 19:55:23 +08:00
minggo	7e8e7c7e87	Merge pull request #557 from minggo/iss755 ... fixed #755	2011-10-19 02:03:19 -07:00
minggo	2d3bfd4a1a	fixed #755: get x y coordinate from existing array to avoid crashing on sunsumg devices	2011-10-19 17:01:35 +08:00
minggo	e9c133351d	Merge pull request #554 from minggo/master ... make script more strongable	2011-10-18 23:27:56 -07:00
minggo	cc1c29c0ca	Merge branch 'master' of https://github.com/minggo/cocos2d-x	2011-10-18 23:21:53 -07:00
minggo	3a17163897	make script more strongable	2011-10-18 23:21:39 -07:00
Walzer	ae411f9503	fix some warnings detected by xcode4.2, fix a stupid typo in RayCasts.h	2011-10-18 17:41:19 +08:00
dumganhar	3c4c4e515a	modify project settings	2011-10-18 11:11:09 +08:00
minggo	43d64360cf	Merge branch 'master' of https://github.com/minggo/cocos2d-x	2011-10-17 14:22:53 +08:00
minggo	1ccfcc1e94	change effect file	2011-10-17 14:22:10 +08:00
minggo	9a834585bb	modify the path to relative path in project setting	2011-10-16 20:53:48 -07:00
minggo	80cd3266df	make HelloWorld and tests work ok on linux with eclipse	2011-10-16 02:21:17 -07:00
dumganhar	ee53c29e5c	switch to 2.0 WVGA	2011-10-16 13:23:48 +08:00
minggo	a56145d613	change include path of HelloWorld vs2010 configuration, add CurrentLanguageTest into tests of vs2010 configuration	2011-10-16 12:00:44 +08:00
minggo	be1f4e3042	fixed #749: fix the crash of SpriteNilTexture, a test case of SpriteTest.	2011-10-11 15:36:18 +08:00
dumganhar	f8617bc372	update project	2011-10-10 14:33:29 +08:00
dumganhar	6a878daa89	change params of glOrthof	2011-10-10 14:33:18 +08:00
dumganhar	eb9cb31ca4	use shared lib for cocos2dx project	2011-10-09 18:15:31 +08:00
dumganhar	2f00b8ff1c	update to sdk2.0.2	2011-10-09 01:11:33 +08:00
dumganhar	fdea17b4f9	don't use DeviceOrientation, save orientation before running DirectorTest	2011-10-08 18:17:01 +08:00
dumganhar	f97de356e7	add release version	2011-10-08 11:47:32 +08:00
dumganhar	beaa489406	add scale support	2011-09-30 17:19:16 +08:00
dumganhar	78a06652e3	modify cocosDenshionTest resouce path	2011-09-30 09:43:23 +08:00
dumganhar	a7b8610c62	delete gbk_uni_tb.dat	2011-09-30 09:39:45 +08:00
dumganhar	9ff00c7c83	use utf-8 for displaying chinese ... remove Gbk_Unicode.c Gbk_Unicode.h	2011-09-29 17:29:38 +08:00
dumganhar	db4d51496e	Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into bada ... Conflicts: cocos2dx/platform/CCAccelerometer_platform.h cocos2dx/platform/CCApplication_platform.h cocos2dx/platform/CCArchOptimalParticleSystem.h cocos2dx/platform/CCEGLView_platform.h cocos2dx/platform/CCPlatformConfig.h cocos2dx/platform/CCSAXParser.h cocos2dx/platform/CCStdC.h tests/AppDelegate.cpp tests/tests/Box2DTestBed/Tests/EdgeShapes.h	2011-09-29 16:03:37 +08:00
dumganhar	bd2266fe4c	use timer as gameloop, can change FPS by using setAnimationInterval ... modify some project setting	2011-09-29 15:52:16 +08:00
dumganhar	c681889e05	add test.bada 1.2 project	2011-09-29 10:25:24 +08:00
dumganhar	cda492593c	modify gameloop method ... modify some project setting	2011-09-29 02:32:01 +08:00
dumganhar	de545096de	modify bada project setting	2011-09-28 18:21:17 +08:00
minggo	8c63344c16	merge cocos2d-x master	2011-09-28 15:32:30 +08:00
minggo	3912be7f9d	not get value of ok button from xml file	2011-09-28 15:27:31 +08:00
minggo	446bd86fce	make HelloWorld and tests runs ok on linux	2011-09-27 22:56:06 -07:00
minggo	4b02dc3e45	Merge branch 'master' of https://github.com/cocos2d/cocos2d-x	2011-09-27 20:37:58 -07:00
minggo	4ad422defd	make tests run ok on linux android	2011-09-27 20:36:21 -07:00
dumganhar	7cc86e741d	delete old cocosDenshion and tests project	2011-09-28 09:47:58 +08:00
dumganhar	d31859d8d3	add test.bada/sdk2.0	2011-09-28 09:41:58 +08:00
dumganhar	9f97e9473d	add lib folder for Target-Release	2011-09-28 09:40:16 +08:00
dumganhar	223e32f17c	add lib folder for Target-Debug and Target-Release	2011-09-28 09:39:46 +08:00
dumganhar	260c2fc920	move old 1.2 project to sdk1.2 folder ... add sdk2.0 project	2011-09-28 09:36:18 +08:00
minggo	7b423eb708	remove unneened link	2011-09-27 17:51:13 +08:00
dumganhar	f0f780a84f	add empty lib folder for test project	2011-09-27 17:32:51 +08:00
minggo	d4283b1f11	Merge branch 'linux_port'	2011-09-27 17:01:51 +08:00
minggo	6e08502e9d	fixed #736: remove android:installLocation in AndroidManifest.xml	2011-09-27 16:56:45 +08:00
minggo	13e17ab80e	make tests build ok on linux android	2011-09-27 01:51:29 -07:00
minggo	c7f75fc570	make box2d build ok on linux	2011-09-26 23:30:40 -07:00
dumganhar	5a4ad2f11e	modify test project setting for bada	2011-09-26 17:52:32 +08:00
laschweinski	88905c4a16	add box2d and chipmunk eclipse project ... do the similar modification in project configuration in test.	2011-09-23 12:07:09 +08:00
dumganhar	eeb0956fb8	add linux makefiles	2011-09-20 14:38:12 +08:00
dumganhar	c93be8b828	modify <cstdio> to <stdio.h> ... delete old project files	2011-09-20 12:39:44 +08:00
dumganhar	8cb568f7fa	add some files for bada test project	2011-09-20 12:38:05 +08:00
dumganhar	cac08c8f1e	add tests project for bada	2011-09-20 10:29:07 +08:00
minggo	5ff9bd0c9e	remame BitMapTotalHeight to bitmapTotalHeight	2011-09-19 18:15:47 +08:00
dumganhar	c94adc58b9	changed bada projects directory, add bada macro	2011-09-19 17:53:45 +08:00
seanlin	6d8225b7bd	fixed #724, different results of CCLabelTTF on android & win32	2011-09-19 16:47:39 +08:00
dumganhar	3c795073e0	Merge branch 'master' into bada ... Conflicts: HelloWorld/iphone/HelloWorld.xcodeproj/project.pbxproj cocos2dx/CCamera.cpp cocos2dx/cocoa/NSData.cpp cocos2dx/label_nodes/CCBitmapFontAtlas.cpp cocos2dx/platform/CCFileUtils_platform.h cocos2dx/platform/CCXApplication_platform.h cocos2dx/platform/CCXCocos2dDefine_platform.h cocos2dx/platform/CCXEGLView_platform.h cocos2dx/platform/CCXMath.h cocos2dx/platform/CCXUIAccelerometer_platform.h cocos2dx/platform/CCXUIImage_platform.h cocos2dx/platform/ccxCommon_platform.h cocos2dx/platform/config_platform.h cocos2dx/platform/platform.h cocos2dx/support/base64.cpp cocos2dx/tileMap_parallax_nodes/CCTMXXMLParser.cpp tests/AppDelegate.cpp tests/test.iphone/test.iphone.xcodeproj/project.pbxproj	2011-09-19 13:42:08 +08:00
dumganhar	eadaba8930	modify CCRect::CCRectMake to CCRectMake in CCTMXLayer.cpp ... modify HelloWorld project setting, use relative path remove lib/linux/Debug/*.so and lib/linux/Release/*.so remove some temp files	2011-09-19 10:51:05 +08:00
minggo	c24d1d3fd6	Merge branch 'LinuxPort' of https://github.com/laschweinski/cocos2d-x into linux_port	2011-09-16 13:53:18 +08:00
laschweinski	a4bfa976b3	change the base resource path	2011-09-16 10:23:57 +08:00
laschweinski	b9ce266ee3	the same as the last one	2011-09-15 18:25:06 +08:00
minggo	ae403153c7	fixed #719: update java code to HelloLua & tests	2011-09-15 16:18:50 +08:00
minggo	194f47bc54	fixed #718: get button value from string.xml & add copyright for java codes	2011-09-15 14:17:07 +08:00
Macarse	208bce312e	Replaced LinearLayout with FrameLayout	2011-09-13 20:25:07 -03:00
Macarse	afd1a7a6d9	External storage	2011-09-13 05:42:34 -03:00
RongHong	53227073a7	fixed #696 to modify some end() usilization	2011-09-06 11:43:09 +08:00
laschweinski	91f8ed7eb4	CCParticleSystemPoint now derive from CCParticleSystemQuade in linux	2011-09-05 11:57:10 +08:00
laschweinski	1fc09448a4	Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into LinuxPort ... Conflicts: cocos2dx/actions/CCActionInstant.cpp cocos2dx/include/CCActionInstant.h	2011-09-04 14:38:53 +08:00
liswei	ab2a6cb2bb	fixed #702 tests crashs at the start on wophone device	2011-08-30 15:59:06 +08:00
laschweinski	b0660dd578	update eclipse project file	2011-08-29 10:28:00 +08:00
laschweinski	f86cba983f	test debug and release	2011-08-28 17:09:40 +08:00
laschweinski	1ac3fdebca	deleted: Box2D/Box2DConfig.cmake ... deleted: Box2D/CMakeLists.txt new file: CocosDenshion/.cproject new file: CocosDenshion/.project deleted: HelloCocos2dx/AndroidDebug/Classes/AppDelegate.d deleted: HelloCocos2dx/AndroidDebug/Classes/AppDelegate.o deleted: HelloCocos2dx/AndroidDebug/Classes/HelloWorldScene.d deleted: HelloCocos2dx/AndroidDebug/Classes/HelloWorldScene.o deleted: HelloCocos2dx/AndroidDebug/Classes/subdir.mk deleted: HelloCocos2dx/AndroidDebug/android/jni/helloworld/main.d deleted: HelloCocos2dx/AndroidDebug/android/jni/helloworld/main.o deleted: HelloCocos2dx/AndroidDebug/android/jni/helloworld/subdir.mk deleted: HelloCocos2dx/AndroidDebug/libHelloCocos2dx.so deleted: HelloCocos2dx/AndroidDebug/makefile deleted: HelloCocos2dx/AndroidDebug/objects.mk deleted: HelloCocos2dx/AndroidDebug/sources.mk deleted: HelloCocos2dx/AndroidRelease/Classes/AppDelegate.d deleted: HelloCocos2dx/AndroidRelease/Classes/AppDelegate.o deleted: HelloCocos2dx/AndroidRelease/Classes/HelloWorldScene.d deleted: HelloCocos2dx/AndroidRelease/Classes/HelloWorldScene.o deleted: HelloCocos2dx/AndroidRelease/Classes/subdir.mk deleted: HelloCocos2dx/AndroidRelease/android/jni/helloworld/main.d deleted: HelloCocos2dx/AndroidRelease/android/jni/helloworld/main.o deleted: HelloCocos2dx/AndroidRelease/android/jni/helloworld/subdir.mk deleted: HelloCocos2dx/AndroidRelease/libHelloCocos2dx.so deleted: HelloCocos2dx/AndroidRelease/makefile deleted: HelloCocos2dx/AndroidRelease/objects.mk deleted: HelloCocos2dx/AndroidRelease/sources.mk deleted: HelloCocos2dx/Classes/AppDelegate.cpp deleted: HelloCocos2dx/Classes/AppDelegate.h deleted: HelloCocos2dx/Classes/HelloWorldScene.cpp deleted: HelloCocos2dx/Classes/HelloWorldScene.h deleted: HelloCocos2dx/Linux/main.cpp deleted: HelloCocos2dx/Linux/main.h deleted: HelloCocos2dx/Resource/CloseNormal.png deleted: HelloCocos2dx/Resource/CloseSelected.png deleted: HelloCocos2dx/Resource/HelloWorld.png deleted: HelloCocos2dx/Resource/Icon.png deleted: HelloCocos2dx/Resource/app.config.txt deleted: HelloCocos2dx/android/AndroidManifest.xml deleted: HelloCocos2dx/android/build.properties deleted: HelloCocos2dx/android/build.xml deleted: HelloCocos2dx/android/build_native.sh deleted: HelloCocos2dx/android/default.properties deleted: HelloCocos2dx/android/gen/org/cocos2dx/application/R.java deleted: HelloCocos2dx/android/jni/helloworld/main.cpp deleted: HelloCocos2dx/android/local.properties deleted: HelloCocos2dx/android/proguard.cfg deleted: HelloCocos2dx/android/res/drawable-hdpi/icon.png deleted: HelloCocos2dx/android/res/drawable-ldpi/icon.png deleted: HelloCocos2dx/android/res/drawable-mdpi/icon.png deleted: HelloCocos2dx/android/res/layout/game_demo.xml deleted: HelloCocos2dx/android/res/layout/helloworld_demo.xml deleted: HelloCocos2dx/android/res/values/strings.xml deleted: HelloCocos2dx/android/src/org/cocos2dx/application/ApplicationDemo.java deleted: HelloCocos2dx/android/src/org/cocos2dx/lib/Cocos2dxAccelerometer.java deleted: HelloCocos2dx/android/src/org/cocos2dx/lib/Cocos2dxActivity.java deleted: HelloCocos2dx/android/src/org/cocos2dx/lib/Cocos2dxBitmap.java deleted: HelloCocos2dx/android/src/org/cocos2dx/lib/Cocos2dxGLSurfaceView.java deleted: HelloCocos2dx/android/src/org/cocos2dx/lib/Cocos2dxMusic.java deleted: HelloCocos2dx/android/src/org/cocos2dx/lib/Cocos2dxRenderer.java deleted: HelloCocos2dx/android/src/org/cocos2dx/lib/Cocos2dxSound.java modified: HelloWorld/Classes/AppDelegate.cpp deleted: HelloWorld/Linux/CloseNormal.png deleted: HelloWorld/Linux/CloseSelected.png deleted: HelloWorld/Linux/HelloWorld.png deleted: HelloWorld/Linux/Icon.png deleted: HelloWorld/Linux/Materhorn.ttf deleted: HelloWorld/Linux/app.config.txt deleted: HelloWorld/Linux/cocos2dx-hello deleted: HelloWorld/Linux/libcocos2dx.so modified: cocos2dx/.cproject modified: lib/linux/Debug/libcocos2d.so modified: lib/linux/Release/libcocos2d.so modified: template/android/mycopy_files.sh new file: tests/test.linux/.cproject new file: tests/test.linux/.project modified: tests/tests/ChipmunkTest/cocos2dChipmunkDemo.cpp modified: tests/tests/controller.cpp modified: tests/tests/tests.h	2011-08-28 14:33:04 +08:00
laschweinski	606c8803bc	modified: CocosDenshion/Linux/FmodAudioPlayer.cpp ... modified: CocosDenshion/Linux/FmodAudioPlayer.h deleted: HelloWorld/AppDelegate.cpp deleted: HelloWorld/AppDelegate.h deleted: HelloWorld/HelloWorldScene.cpp deleted: HelloWorld/HelloWorldScene.h modified: cocos2dx/.cproject modified: cocos2dx/actions/CCActionInstant.cpp modified: cocos2dx/include/CCActionInstant.h modified: lib/android/Debug/libcocos2d.so modified: lib/android/Release/libcocos2d.so modified: lib/linux/Debug/libcocos2d.so modified: lib/linux/Debug/libcocosdenshion.so modified: lib/linux/Release/libcocos2d.so modified: lib/linux/Release/libcocosdenshion.so HelloWorld/AndroidDebug/ HelloWorld/AndroidRelease/ HelloWorld/Classes/ HelloWorld/android/assets HelloWorld/postCompiled.sh cocos2dx/platform/third_party/linux/ installLinuxLib.sh tests/Res/gui_close.WAV	2011-08-25 19:04:29 +08:00
root	11679d9723	Merge branch 'master' into LinuxPort	2011-08-23 11:49:46 +08:00
root	d57d9ca6f6	modified: cocos2dx/.cproject ... modified: cocos2dx/CCConfiguration.cpp modified: cocos2dx/CCConfiguration.h modified: cocos2dx/actions/CCActionGrid3D.cpp modified: cocos2dx/platform/Linux/CCAplication_linux.cpp modified: cocos2dx/platform/Linux/CCAplication_linux.h modified: cocos2dx/platform/Linux/CCImage_Linux.cpp modified: mycreate-android-project.sh new file: post.sh modified: template/android/mycopy_files.sh modified: tests/AppDelegate.cpp new file: tests/test.linux/Res deleted: tests/test.linux/Res/Hello.png deleted: tests/test.linux/Res/Images/BoilingFoam.plist deleted: tests/test.linux/Res/Images/BurstPipe.plist deleted: tests/test.linux/Res/Images/Comet.plist deleted: tests/test.linux/Res/Images/Comet.png deleted: tests/test.linux/Res/Images/ExplodingRing.plist deleted: tests/test.linux/Res/Images/Flower.plist deleted: tests/test.linux/Res/Images/Fog.png deleted: tests/test.linux/Res/Images/Galaxy.plist deleted: tests/test.linux/Res/Images/HelloWorld.png deleted: tests/test.linux/Res/Images/Icon.png deleted: tests/test.linux/Res/Images/LavaFlow.plist deleted: tests/test.linux/Res/Images/Pea.png deleted: tests/test.linux/Res/Images/Phoenix.plist deleted: tests/test.linux/Res/Images/PlanetCute-1024x1024.png deleted: tests/test.linux/Res/Images/SendScoreButton.png deleted: tests/test.linux/Res/Images/SendScoreButtonPressed.png deleted: tests/test.linux/Res/Images/SpinningPeas.plist deleted: tests/test.linux/Res/Images/SpinningPeas.png deleted: tests/test.linux/Res/Images/Spiral.plist deleted: tests/test.linux/Res/Images/SpookyPeas.plist deleted: tests/test.linux/Res/Images/SpookyPeas.png deleted: tests/test.linux/Res/Images/Upsidedown.plist deleted: tests/test.linux/Res/Images/atlastest.png deleted: tests/test.linux/Res/Images/b1-hd.png deleted: tests/test.linux/Res/Images/b1.png deleted: tests/test.linux/Res/Images/b2-hd.png deleted: tests/test.linux/Res/Images/b2.png deleted: tests/test.linux/Res/Images/background.png deleted: tests/test.linux/Res/Images/background1-hd.png deleted: tests/test.linux/Res/Images/background1.png deleted: tests/test.linux/Res/Images/background2-hd.png deleted: tests/test.linux/Res/Images/background2.png deleted: tests/test.linux/Res/Images/background3-hd.png deleted: tests/test.linux/Res/Images/background3.png deleted: tests/test.linux/Res/Images/ball-hd.png deleted: tests/test.linux/Res/Images/ball.png deleted: tests/test.linux/Res/Images/bitmapFontTest3.fnt deleted: tests/test.linux/Res/Images/bitmapFontTest3.png deleted: tests/test.linux/Res/Images/blocks-hd.png deleted: tests/test.linux/Res/Images/blocks.png deleted: tests/test.linux/Res/Images/btn-about-normal.png deleted: tests/test.linux/Res/Images/btn-about-selected.png deleted: tests/test.linux/Res/Images/btn-highscores-normal.png deleted: tests/test.linux/Res/Images/btn-highscores-selected.png deleted: tests/test.linux/Res/Images/btn-play-normal.png deleted: tests/test.linux/Res/Images/btn-play-selected.png deleted: tests/test.linux/Res/Images/bugs/RetinaDisplay.jpg deleted: tests/test.linux/Res/Images/bugs/bug886.jpg deleted: tests/test.linux/Res/Images/bugs/bug886.png deleted: tests/test.linux/Res/Images/bugs/circle-hd.plist deleted: tests/test.linux/Res/Images/bugs/circle-hd.png deleted: tests/test.linux/Res/Images/bugs/circle.plist deleted: tests/test.linux/Res/Images/bugs/circle.png deleted: tests/test.linux/Res/Images/bugs/corner.png deleted: tests/test.linux/Res/Images/bugs/edge.png deleted: tests/test.linux/Res/Images/bugs/fill.png deleted: tests/test.linux/Res/Images/bugs/picture-hd.png deleted: tests/test.linux/Res/Images/bugs/picture.png deleted: tests/test.linux/Res/Images/close-hd.png deleted: tests/test.linux/Res/Images/close.png deleted: tests/test.linux/Res/Images/debian.plist deleted: tests/test.linux/Res/Images/f1-hd.png deleted: tests/test.linux/Res/Images/f1.png deleted: tests/test.linux/Res/Images/f2-hd.png deleted: tests/test.linux/Res/Images/f2.png deleted: tests/test.linux/Res/Images/fire-grayscale.png deleted: tests/test.linux/Res/Images/fire.png deleted: tests/test.linux/Res/Images/fps_images.png deleted: tests/test.linux/Res/Images/grossini-hd.png deleted: tests/test.linux/Res/Images/grossini.png deleted: tests/test.linux/Res/Images/grossini_128x256_mipmap.pvr deleted: tests/test.linux/Res/Images/grossini_dance_01.png deleted: tests/test.linux/Res/Images/grossini_dance_02.png deleted: tests/test.linux/Res/Images/grossini_dance_03.png deleted: tests/test.linux/Res/Images/grossini_dance_04.png deleted: tests/test.linux/Res/Images/grossini_dance_05.png deleted: tests/test.linux/Res/Images/grossini_dance_06.png deleted: tests/test.linux/Res/Images/grossini_dance_07.png deleted: tests/test.linux/Res/Images/grossini_dance_08.png deleted: tests/test.linux/Res/Images/grossini_dance_09.png deleted: tests/test.linux/Res/Images/grossini_dance_10.png deleted: tests/test.linux/Res/Images/grossini_dance_11.png deleted: tests/test.linux/Res/Images/grossini_dance_12.png deleted: tests/test.linux/Res/Images/grossini_dance_13.png deleted: tests/test.linux/Res/Images/grossini_dance_14.png deleted: tests/test.linux/Res/Images/grossini_dance_atlas-hd.png deleted: tests/test.linux/Res/Images/grossini_dance_atlas-mono.png deleted: tests/test.linux/Res/Images/grossini_dance_atlas.png deleted: tests/test.linux/Res/Images/grossini_dance_atlas_nomipmap.png deleted: tests/test.linux/Res/Images/grossini_pvr_rgba4444.pvr deleted: tests/test.linux/Res/Images/grossini_pvr_rgba8888.pvr deleted: tests/test.linux/Res/Images/grossinis_sister1-hd.png deleted: tests/test.linux/Res/Images/grossinis_sister1-testalpha.png deleted: tests/test.linux/Res/Images/grossinis_sister1-testalpha.ppng deleted: tests/test.linux/Res/Images/grossinis_sister1.png deleted: tests/test.linux/Res/Images/grossinis_sister2-hd.png deleted: tests/test.linux/Res/Images/grossinis_sister2.png deleted: tests/test.linux/Res/Images/landscape-1024x1024.png deleted: tests/test.linux/Res/Images/logo-mipmap.pvr deleted: tests/test.linux/Res/Images/logo-nomipmap.pvr deleted: tests/test.linux/Res/Images/menuitemsprite.png deleted: tests/test.linux/Res/Images/paddle-hd.png deleted: tests/test.linux/Res/Images/paddle.png deleted: tests/test.linux/Res/Images/particles-hd.png deleted: tests/test.linux/Res/Images/particles.png deleted: tests/test.linux/Res/Images/pattern1.png deleted: tests/test.linux/Res/Images/piece.png deleted: tests/test.linux/Res/Images/powered.png deleted: tests/test.linux/Res/Images/r1-hd.png deleted: tests/test.linux/Res/Images/r1.png deleted: tests/test.linux/Res/Images/r2-hd.png deleted: tests/test.linux/Res/Images/r2.png deleted: tests/test.linux/Res/Images/snow.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-0-0.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-0-1.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-0-2.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-0-3.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-0-4.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-0-5.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-0-6.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-0-7.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-1-0.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-1-1.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-1-2.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-1-3.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-1-4.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-1-5.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-1-6.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-1-7.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-2-0.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-2-1.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-2-2.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-2-3.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-2-4.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-2-5.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-2-6.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-2-7.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-3-0.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-3-1.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-3-2.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-3-3.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-3-4.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-3-5.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-3-6.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-3-7.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-4-0.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-4-1.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-4-2.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-4-3.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-4-4.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-4-5.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-4-6.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-4-7.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-5-0.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-5-1.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-5-2.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-5-3.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-5-4.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-5-5.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-5-6.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-5-7.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-6-0.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-6-1.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-6-2.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-6-3.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-6-4.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-6-5.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-6-6.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-6-7.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-7-0.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-7-1.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-7-2.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-7-3.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-7-4.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-7-5.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-7-6.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-7-7.png deleted: tests/test.linux/Res/Images/spritesheet1.png deleted: tests/test.linux/Res/Images/stars-grayscale.png deleted: tests/test.linux/Res/Images/stars.png deleted: tests/test.linux/Res/Images/stars2-grayscale.png deleted: tests/test.linux/Res/Images/stars2.png deleted: tests/test.linux/Res/Images/streak.png deleted: tests/test.linux/Res/Images/test-rgba1.png deleted: tests/test.linux/Res/Images/test_blend.png deleted: tests/test.linux/Res/Images/test_image-bad_encoding.pvr deleted: tests/test.linux/Res/Images/test_image.jpeg deleted: tests/test.linux/Res/Images/test_image.png deleted: tests/test.linux/Res/Images/test_image.pvr deleted: tests/test.linux/Res/Images/test_image.pvrraw deleted: tests/test.linux/Res/Images/test_image_a8.pvr deleted: tests/test.linux/Res/Images/test_image_ai88.pvr deleted: tests/test.linux/Res/Images/test_image_bgra8888.pvr deleted: tests/test.linux/Res/Images/test_image_i8.pvr deleted: tests/test.linux/Res/Images/test_image_pvrtc2bpp.pvr deleted: tests/test.linux/Res/Images/test_image_pvrtc4bpp.pvr deleted: tests/test.linux/Res/Images/test_image_rgb565.pvr deleted: tests/test.linux/Res/Images/test_image_rgba4444.pvr deleted: tests/test.linux/Res/Images/test_image_rgba4444.pvr.ccz deleted: tests/test.linux/Res/Images/test_image_rgba4444.pvr.gz deleted: tests/test.linux/Res/Images/test_image_rgba4444_mipmap.pvr deleted: tests/test.linux/Res/Images/test_image_rgba5551.pvr deleted: tests/test.linux/Res/Images/test_image_rgba8888.pvr deleted: tests/test.linux/Res/Images/texture1024x1024.png deleted: tests/test.linux/Res/Images/texture2048x2048.png deleted: tests/test.linux/Res/Images/texture512x512.png deleted: tests/test.linux/Res/TileMaps/fixed-ortho-test2.png deleted: tests/test.linux/Res/TileMaps/hexa-test.tmx deleted: tests/test.linux/Res/TileMaps/hexa-tiles.png deleted: tests/test.linux/Res/TileMaps/iso-test-bug787.tmx deleted: tests/test.linux/Res/TileMaps/iso-test-movelayer.tmx deleted: tests/test.linux/Res/TileMaps/iso-test-objectgroup.tmx deleted: tests/test.linux/Res/TileMaps/iso-test-vertexz.tmx deleted: tests/test.linux/Res/TileMaps/iso-test-zorder.tmx deleted: tests/test.linux/Res/TileMaps/iso-test.png deleted: tests/test.linux/Res/TileMaps/iso-test.tmx deleted: tests/test.linux/Res/TileMaps/iso-test1.tmx deleted: tests/test.linux/Res/TileMaps/iso-test2-uncompressed.tmx deleted: tests/test.linux/Res/TileMaps/iso-test2.png deleted: tests/test.linux/Res/TileMaps/iso-test2.tmx deleted: tests/test.linux/Res/TileMaps/iso.png deleted: tests/test.linux/Res/TileMaps/levelmap.tga deleted: tests/test.linux/Res/TileMaps/ortho-objects.tmx deleted: tests/test.linux/Res/TileMaps/ortho-test1.png deleted: tests/test.linux/Res/TileMaps/ortho-test1_bw.png deleted: tests/test.linux/Res/TileMaps/ortho-test2.png deleted: tests/test.linux/Res/TileMaps/orthogonal-test-movelayer.tmx deleted: tests/test.linux/Res/TileMaps/orthogonal-test-vertexz.tmx deleted: tests/test.linux/Res/TileMaps/orthogonal-test-zorder.tmx deleted: tests/test.linux/Res/TileMaps/orthogonal-test1.tmx deleted: tests/test.linux/Res/TileMaps/orthogonal-test1.tsx deleted: tests/test.linux/Res/TileMaps/orthogonal-test2.tmx deleted: tests/test.linux/Res/TileMaps/orthogonal-test3.tmx deleted: tests/test.linux/Res/TileMaps/orthogonal-test4-hd.tmx deleted: tests/test.linux/Res/TileMaps/orthogonal-test4.tmx deleted: tests/test.linux/Res/TileMaps/orthogonal-test5.tmx deleted: tests/test.linux/Res/TileMaps/orthogonal-test6-hd.tmx deleted: tests/test.linux/Res/TileMaps/orthogonal-test6.tmx deleted: tests/test.linux/Res/TileMaps/test-object-layer.tmx deleted: tests/test.linux/Res/TileMaps/tiles-hd.png deleted: tests/test.linux/Res/TileMaps/tiles.png deleted: tests/test.linux/Res/TileMaps/tmw_desert_spacing-hd.png deleted: tests/test.linux/Res/TileMaps/tmw_desert_spacing.png deleted: tests/test.linux/Res/animations/dragon_animation-hd.png deleted: tests/test.linux/Res/animations/dragon_animation.png deleted: tests/test.linux/Res/animations/ghosts.plist deleted: tests/test.linux/Res/animations/ghosts.png deleted: tests/test.linux/Res/animations/grossini-aliases.plist deleted: tests/test.linux/Res/animations/grossini-aliases.png deleted: tests/test.linux/Res/animations/grossini.plist deleted: tests/test.linux/Res/animations/grossini.plist.xml deleted: tests/test.linux/Res/animations/grossini.png deleted: tests/test.linux/Res/animations/grossini.ztp deleted: tests/test.linux/Res/animations/grossini_blue.plist deleted: tests/test.linux/Res/animations/grossini_blue.png deleted: tests/test.linux/Res/animations/grossini_family.plist deleted: tests/test.linux/Res/animations/grossini_family.png deleted: tests/test.linux/Res/animations/grossini_gray.plist deleted: tests/test.linux/Res/animations/grossini_gray.png deleted: tests/test.linux/Res/app.config.txt deleted: tests/test.linux/Res/background.mp3 deleted: tests/test.linux/Res/effect1.wav deleted: tests/test.linux/Res/effect2.ogg deleted: tests/test.linux/Res/fonts/A Damn Mess.ttf deleted: tests/test.linux/Res/fonts/Abberancy.ttf deleted: tests/test.linux/Res/fonts/Abduction.ttf deleted: tests/test.linux/Res/fonts/Paint Boy.ttf deleted: tests/test.linux/Res/fonts/Schwarzwald Regular.ttf deleted: tests/test.linux/Res/fonts/Scissor Cuts.ttf deleted: tests/test.linux/Res/fonts/arial16.fnt deleted: tests/test.linux/Res/fonts/arial16.png deleted: tests/test.linux/Res/fonts/bitmapFontTest.fnt deleted: tests/test.linux/Res/fonts/bitmapFontTest.png deleted: tests/test.linux/Res/fonts/bitmapFontTest2.fnt deleted: tests/test.linux/Res/fonts/bitmapFontTest2.png deleted: tests/test.linux/Res/fonts/bitmapFontTest3.fnt deleted: tests/test.linux/Res/fonts/bitmapFontTest3.png deleted: tests/test.linux/Res/fonts/bitmapFontTest4.fnt deleted: tests/test.linux/Res/fonts/bitmapFontTest4.png deleted: tests/test.linux/Res/fonts/bitmapFontTest5.fnt deleted: tests/test.linux/Res/fonts/bitmapFontTest5.png deleted: tests/test.linux/Res/fonts/fps_images-hd.png deleted: tests/test.linux/Res/fonts/fps_images.png deleted: tests/test.linux/Res/fonts/futura-48.fnt deleted: tests/test.linux/Res/fonts/futura-48.png deleted: tests/test.linux/Res/fonts/konqa32-hd.fnt deleted: tests/test.linux/Res/fonts/konqa32-hd.png deleted: tests/test.linux/Res/fonts/konqa32.fnt deleted: tests/test.linux/Res/fonts/konqa32.png deleted: tests/test.linux/Res/fonts/larabie-16-hd.png deleted: tests/test.linux/Res/fonts/larabie-16.png deleted: tests/test.linux/Res/fonts/tuffy_bold_italic-charmap-hd.png deleted: tests/test.linux/Res/fonts/tuffy_bold_italic-charmap.png deleted: tests/test.linux/Res/music.mid deleted: tests/test.linux/Res/zwoptex/grossini-generic.plist deleted: tests/test.linux/Res/zwoptex/grossini-generic.png deleted: tests/test.linux/Res/zwoptex/grossini.plist deleted: tests/test.linux/Res/zwoptex/grossini.png CocosDenshion/AndroidDebug/ CocosDenshion/AndroidRelease/ HelloCocos2dx/AndroidDebug/2 HelloCocos2dx/android/assets HelloCocos2dx/postCompiled.sh installLinuxLib.sh	2011-08-23 11:28:04 +08:00
minggo	ae21fcaf48	[android] fixed #670: pause & resume effect when app enter background & foreground	2011-08-22 16:58:54 +08:00
laschweinski	ff5222fff8	some files missiong(eclipse with git is too hard to play)	2011-08-21 19:00:26 +08:00
laschweinski	abc856ac6d	add box2d test	2011-08-19 15:37:57 +08:00
laschweinski	60e794fcc8	add files include test and cocosDenshion	2011-08-19 14:43:19 +08:00
minggo	0a9f6c1f09	Merge pull request #478 from minggo/iss684 ... add test for displaying current language	2011-08-18 23:19:00 -07:00
laschweinski	871abb4a32	Merge branch 'master' into LinuxPort	2011-08-19 13:20:23 +08:00
laschweinski	ad305648c0	modified: cocos2dx/misc_nodes/CCRenderTexture.cpp ... modified: cocos2dx/platform/CCGL.h modified: cocos2dx/platform/CCImage.cpp CocosDenshion/Linux/ CocosDenshion/third_party/ HelloWorld/Linux/ cocos2dx/.settings/ cocos2dx/platform/Linux/ tests/test.linux/	2011-08-19 13:07:50 +08:00
minggo	11e9acb7c8	fixed #684: add test for displaying current language	2011-08-19 11:32:30 +08:00
minggo	733e582d12	fixed #684: add test for displaying current language	2011-08-19 11:26:14 +08:00
laschweinski	e3ea2bd136	modified: tests/tests/CocosDenshionTest/CocosDenshionTest.cpp ... modified: tests/tests/controller.cpp modified: tests/tests/tests.h CocosDenshion/Linux/ CocosDenshion/third_party/ HelloWorld/Linux/ cocos2dx/.settings/ cocos2dx/platform/Linux/ tests/test.linux/	2011-08-18 22:11:19 +08:00
minggo	edb8b4639d	fixed #685: add label test for displaying Chinese characters	2011-08-18 18:40:24 +08:00
minggo	ab781654d7	all tests works ok on vs2010 & fix a bug that HelloLua may crashed on win32 when it eixt	2011-08-17 18:24:36 +08:00
laschweinski	dbf3a94200	modified: HelloWorld/HelloWorldScene.cpp ... modified: tests/AppDelegate.cpp HelloWorld/Linux/ cocos2dx/.settings/ cocos2dx/platform/Linux/ tests/test.linux/	2011-08-17 18:09:51 +08:00
laschweinski	5d20ebe24b	modified: HelloWorld/AppDelegate.cpp ... modified: HelloWorld/HelloWorldScene.cpp modified: cocos2dx/cocoa/CCNS.cpp modified: cocos2dx/include/CCActionInstant.h modified: cocos2dx/misc_nodes/CCRenderTexture.cpp modified: cocos2dx/particle_nodes/CCParticleSystemQuad.cpp modified: cocos2dx/platform/CCAccelerometer_platform.h modified: cocos2dx/platform/CCApplication_platform.h modified: cocos2dx/platform/CCArchOptimalParticleSystem.h modified: cocos2dx/platform/CCCommon.cpp modified: cocos2dx/platform/CCEGLView_platform.h modified: cocos2dx/platform/CCGL.cpp modified: cocos2dx/platform/CCGL.h modified: cocos2dx/platform/CCImage.cpp modified: cocos2dx/platform/CCPlatformConfig.h modified: cocos2dx/platform/CCPlatformMacros.h modified: cocos2dx/platform/CCSAXParser.h modified: cocos2dx/platform/CCStdC.h modified: cocos2dx/support/CCUserDefault.cpp modified: cocos2dx/support/data_support/ccCArray.h modified: tests/AppDelegate.cpp deleted: tests/Res/music.mid modified: tests/tests/controller.cpp modified: tests/tests/tests.h HelloWorld/Linux/ cocos2dx/.settings/ cocos2dx/platform/Linux/ tests/test.linux/	2011-08-17 11:36:54 +08:00
Walzer	0881668cc2	fixed #661. Thanks to GMTDev's previous resolvtion. And I fix the compilation error in the his patch: add float m_fContentScaleFactor declaration into CCTMXLayer.h, fix tile->setPositionIn to tile->setPosition. I just run TiledMapTest in retina mode, it works well	2011-08-15 12:10:11 +08:00
minggo	9a884ffda6	[iOS] fixed #668: CCLabelBMFont looks ok in retina mode	2011-08-10 15:07:34 +08:00
minggo	d386116255	[iOS]fixed #667: call AppDelegate::applicationDidEnterBackground() & AppDeleaget::applicationWillEnterForeground() when application enter background & enter foreground	2011-08-10 10:24:06 +08:00
minggo	5e5151b41e	Merge pull request #459 from minggo/iss643 ... [android] swap axes according to the orientation	2011-08-09 00:55:34 -07:00
minggo	ada4c2af80	[android] fixed #643: swap axes according to the orientation	2011-08-09 15:50:42 +08:00
minggo	08797014e9	fix a bug that cause error when loading libtest.so on android	2011-08-09 13:56:09 +08:00
Walzer	945e5fde00	issue #633, add test case for play effect repeatly, force the volume of effect&bgm between 0.0~1.0 in SimpleAudioEngine.mm.	2011-08-08 21:40:33 +08:00
minggo	2b5635898a	fixed #665: add test of RenderTextureSave	2011-08-08 14:06:03 +08:00
minggo	7a0e8b4a0a	Merge pull request #457 from minggo/iss642 ... fixed #642: CCRenderTexture::saveBuffer() works ok on iOS	2011-08-07 20:08:16 -07:00
minggo	41ea2e98a1	fixed #642: CCRenderTexture::saveBuffer() works ok on iOS	2011-08-08 11:01:47 +08:00
RongHong	5f08bb24fe	Merge branch 'master' into 608	2011-08-05 10:59:40 +08:00
minggo	76da5f2e84	fixed #656: remove unneeded methods & android can let user set resource path	2011-08-04 17:19:58 +08:00
minggo	ee0c6e56d7	Merge pull request #447 from minggo/master ... [android] fixed #655: fix a bug that CCLabelTTF lost the last characters	2011-08-03 21:13:12 -07:00
minggo	7fc0dae3d9	[android] fixed #655: fix a bug that CCLabelTTF lost the last characters	2011-08-04 12:08:12 +08:00
liswei	897dd54b12	fixed #347 add ttf support in win32	2011-08-04 11:23:59 +08:00
minggo	90f403d8a2	Merge pull request #441 from liswei/issue347 ... issue #347 add ttf support in wophone	2011-08-02 03:16:06 -07:00
liswei	79cf8167dc	Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into issue347	2011-08-02 18:04:23 +08:00
liswei	188b168d30	issue #347 add ttf support in wophone	2011-08-02 18:02:27 +08:00
minggo	906e6ba519	issue #645: fix a bug of animation test	2011-08-02 15:57:04 +08:00
minggo	09dc164fff	issue #645: update to v1.0.1	2011-08-02 15:45:27 +08:00
minggo	a3b4043755	issue #347: add tests for FontTest & it works ok on android	2011-07-29 15:57:27 +08:00
RongHong	c1fdf9afb5	issue #608 rendertexture disappears after going to background	2011-07-28 17:32:09 +08:00
minggo	648117ebb5	issue #347: android can use ttf file	2011-07-28 17:20:37 +08:00
RongHong	8afa3a9be1	fixed #619 CCFadeTo may crashed on android	2011-07-27 16:21:00 +08:00
minggo	657fe9a17d	[android] fixed #625: remove gz file in assets & use uncompressed pvr file instead	2011-07-27 11:51:19 +08:00
minggo	d446702f14	issue #633: revert CocosDenshionTest	2011-07-26 16:16:34 +08:00
minggo	1bb9e8139a	issue 33: iOS & Android support looping playing effect	2011-07-26 15:52:41 +08:00
minggo	b308effdc5	[android] fixed #631: Send \n to engine when user input nothing	2011-07-26 11:41:28 +08:00
minggo	13a1629299	fixed #624: insert white space in front of \n	2011-07-22 12:10:41 +08:00
minggo	eb2cf3afd0	[win32] add Texture2DTest to vs2010	2011-07-20 16:00:21 +08:00
natural-law	32e7ee6e2f	Merge branch 'master' of https://github.com/cocos2d/cocos2d-x	2011-07-20 15:35:52 +08:00
natural-law	6a8b563feb	fixed #621, Add Texture2dTest in tests project.	2011-07-20 15:35:20 +08:00
minggo	0c495628ea	Merge pull request #405 from minggo/iss618 ... invoke java code(System.exit()) to finish programe	2011-07-19 02:20:36 -07:00
minggo	640d811809	[android] fixed #618: invoke java code(System.exit()) to finish programe	2011-07-19 16:01:22 +08:00
Walzer	bc44855091	issue #536, integrate the CCTexturePVR to project, update from 0.99.5 to 1.0.0, compile successfully on ios & android. Haven't test on other platforms yet.	2011-07-19 15:14:59 +08:00
minggo	dd42936bb3	[android] fixed #610: remove the support of ndk-r4	2011-07-14 10:37:40 +08:00
Walzer	679f4afe06	fixed #604. When I modify the sdk from "iphonesimulator4.1" to "Lastest iOS", the summary & info come out. How magic... It case waste me 4 hours!!!	2011-07-13 18:04:53 +08:00
minggo	1a25dd83a5	Merge pull request #398 from natural-law/master ... fixed #599	2011-07-13 01:35:41 -07:00
natural-law	8ad7236ca2	fixed #599, Resolve the wrong orientation when exit the TouchesTest.	2011-07-13 16:17:50 +08:00
Walzer	62b52b37be	Merge remote branch 'origin/master'	2011-07-13 16:13:20 +08:00
Walzer	1b1fd7446c	[maramalade] add new test cases (bugs, DirectorTests) into test.mkb. Both HelloWorld & Tests are tested on marmalade	2011-07-13 16:00:22 +08:00
minggo	692d8450c2	Merge pull request #397 from minggo/master ... fix a bug of orientation	2011-07-13 00:36:52 -07:00
minggo	a26fb13604	fix a bug of orientation	2011-07-13 15:32:03 +08:00
natural-law	9755ff59aa	When click the "BACK" button in test case Bug-899. The button "MainMenu" is not visible if the device support retina.	2011-07-13 14:37:06 +08:00
minggo	d5850224e4	[win32] modify configuration of vs2101 release version	2011-07-13 12:05:02 +08:00
minggo	fcb2006fdc	Merge pull request #392 from natural-law/master ... fixed #599	2011-07-12 03:10:27 -07:00
minggo	faa1c8ee16	Merge pull request #393 from minggo/master ... [win32] modify for vs2010	2011-07-12 03:09:44 -07:00
minggo	760ec3201e	[win32] modify for vs2010	2011-07-12 18:05:44 +08:00
natural-law	7b10874d5e	The menu of BugsTest position is wrong when exit one bug test.	2011-07-12 18:02:40 +08:00
natural-law	d4e575c4b2	Merge branch 'master' of https://github.com/cocos2d/cocos2d-x	2011-07-12 17:47:24 +08:00
natural-law	e6bc8d7c98	fixed #599, Resolve the wrong orientation when exit the TouchesTest.	2011-07-12 17:46:57 +08:00
liswei	21ce679992	resolve the effect of PageTransitionForward&PageTransitionBackward ,via to add setDepthTest.	2011-07-12 17:35:15 +08:00
natural-law	e8ac968b3b	Add the resource files to the ios project which used by BugsTest. And clean a warning in TileMapTest.cpp.	2011-07-12 15:56:42 +08:00
natural-law	8b5282a0cf	fixed #603, The test case TMXGIDObjectsTest in TileMapTest not crash any more.	2011-07-12 14:21:29 +08:00
minggo	d48c3fdfb1	upgrade to 1.0.0-final 07-11	2011-07-12 11:20:41 +08:00
natural-law	58733417e0	Merge branch 'master' of https://github.com/cocos2d/cocos2d-x	2011-07-11 15:17:24 +08:00
natural-law	fcbe0443be	Resolve a bug in ZipUtils.cpp. And modify the Makefile of tests on wophone.	2011-07-11 15:16:29 +08:00
minggo	21b1af5f1c	Merge pull request #377 from minggo/master ... [Android] break string & wrap word	2011-07-11 00:09:43 -07:00
minggo	fb436a6339	[Android] break string & wrap word	2011-07-11 15:02:41 +08:00
Walzer	28bf48f665	issue #569 #601, fix ChipmunkTest/Sensors crash after update to Chipmunk v5.3.5	2011-07-11 11:21:11 +08:00
Walzer	aa12ea838e	Merge remote branch 'origin/master'	2011-07-11 10:34:47 +08:00
Walzer	63ffc574d7	fixed #601, update Chipmunk from 5.3.4 to 5.3.5. Only tested on iOS now.	2011-07-11 10:34:03 +08:00
natural-law	7bc3983f04	Merge branch 'master' of https://github.com/cocos2d/cocos2d-x	2011-07-11 10:12:07 +08:00
natural-law	36474b2131	Add DirectorTest and BugsTest on wophone.	2011-07-11 10:11:40 +08:00
Walzer	4e12ba3015	Merge pull request #374 from axmx/master ... [airplay] fix - it solves the problems related to incorrect memory allocation..	2011-07-10 00:44:30 -07:00
Max Aksenov	7f07574630	[airplay] fix - if you do not use this "MemFlags0 = USE_STACK_ALLOCATOR" then it solves the problems related to incorrect memory allocation ... I tested it on Marmalade Mac Simulator and IPad device. Not tested on Maramlade Windows Simulator....	2011-07-09 13:05:22 -07:00
minggo	2066cebd08	Merge pull request #371 from natural-law/master ... Add DirectorTest and BugsTest on android.	2011-07-08 03:49:30 -07:00
minggo	487ba5c02d	merge confict	2011-07-08 18:29:03 +08:00
minggo	87adeb6f92	upgrade xcode3 template	2011-07-08 18:24:58 +08:00
natural-law	1ffa7fbc19	Add DirectorTest and BugsTest on android.	2011-07-08 18:13:03 +08:00
Walzer	e39fca389f	Merge remote branch 'origin/master'	2011-07-08 18:01:52 +08:00
Walzer	944b03df5c	issue #599 orientation is wrong in ios tests. Most test cases are ok now, but it still have problem when TouchesTest back to MainMenu.	2011-07-08 18:01:28 +08:00
natural-law	1bdce00740	Merge branch 'master' of https://github.com/cocos2d/cocos2d-x ... Conflicts: cocos2dx/include/ccConfig.h	2011-07-08 17:08:57 +08:00
minggo	6c37f42414	Merge pull request #368 from minggo/master ... fixed #586	2011-07-08 01:46:54 -07:00
minggo	4e5306a46b	fixed #596	2011-07-08 16:27:13 +08:00
natural-law	cba538d5d0	Merge branch 'master' of https://github.com/cocos2d/cocos2d-x	2011-07-08 15:58:14 +08:00
natural-law	602c5f1894	fixed #595	2011-07-08 15:57:46 +08:00
Walzer	5c8b04bc25	fixed #585	2011-07-08 14:48:25 +08:00
Walzer	08b26402d5	fixed #594, but find a new bug #597	2011-07-08 14:27:37 +08:00
natural-law	0cb3b0ce06	Merge branch 'master' of https://github.com/cocos2d/cocos2d-x	2011-07-08 11:23:03 +08:00
natural-law	ca4281904a	fixed #574, Add bugs test case.	2011-07-08 11:22:35 +08:00
minggo	b08788d810	change the return value of CCSkewBy::reverse() & CCScaleBy::reverse() to CCActionInterval*	2011-07-07 15:41:42 +08:00
minggo	8ca8f4d9bc	fixed #569: change the free sequence to avoid bug	2011-07-07 15:20:13 +08:00
natural-law	26513d6b7e	issue #574, Add DirectorTest for win32.	2011-07-07 14:55:11 +08:00
minggo	211878dc44	add animation	2011-07-07 10:24:01 +08:00
minggo	ff50997eb0	issue #574	2011-07-06 14:56:05 +08:00
Walzer	80c819d8b6	Merge remote branch 'origin/master'	2011-07-04 16:25:29 +08:00
Walzer	d325f1991e	[ios] 1. debug builds can run on device (add “Valid Architectures") 2. add correct header search paths for HelloLua release build	2011-07-04 16:25:11 +08:00
natural-law	7d7f3a9241	fixed #562, Upgrade folder sprite_nodes to rc3.	2011-07-01 16:11:31 +08:00
natural-law	4d5dab4a40	fixed #558, Upgrade folder layers_scenes_transitions_nodes to rc3.	2011-07-01 11:26:26 +08:00
minggo	25b3b15151	Merge pull request #339 from minggo/iss549 ... [Android] fixed #549: Add comments for playEffect()	2011-06-30 18:28:08 -07:00
minggo	67b85322ed	[Android] fixed #549: Add comments for playEffect()	2011-07-01 09:24:40 +08:00
minggo	12f816687d	Merge pull request #336 from liswei/master ... update wophone setup project (such as helloworld,tests)	2011-06-29 20:08:01 -07:00
minggo	2a39fe0aa4	Merge pull request #335 from minggo/iss547 ... [Android] fixed #547: line wrap OK on Android	2011-06-29 19:46:25 -07:00
liswei	39fb944297	update wophone setup project (such as helloworld,tests)	2011-06-30 09:36:51 +08:00
minggo	6c47f53b13	[Android] fixed #547: line wrap OK on Android	2011-06-29 15:45:30 +08:00
liswei	b23409a942	fixed #545 [Wophone] The effect of ChipmunkTest is wrong. ... reset glOrthof param value in wophone	2011-06-29 15:24:04 +08:00
minggo	e8853583df	Merge pull request #329 from minggo/master ... Fix some bug	2011-06-27 18:23:26 -07:00
minggo	7099b24ccb	Merge pull request #326 from liswei/issue521 ... issue #521 set depthtest value for true ,then set depthtest value for false	2011-06-27 18:20:10 -07:00
yangws	3b6265aa58	Compile ok on vs2010	2011-06-27 17:02:58 +08:00
minggo	5e15545dbd	[Android] fix an error when string is	2011-06-27 16:01:25 +08:00
liswei	bb59728543	issue #521 set depthtest value for true ,then set depthtest value for false	2011-06-27 15:34:26 +08:00
minggo	686b9ae179	fix the test title	2011-06-27 15:22:55 +08:00
natural-law	72f17ecbdf	fixed #542, Record the volume user specified though the background music is not playing.	2011-06-27 11:43:27 +08:00
Walzer	688131c958	[android] in main.cpp, change view->create(320,480) to (480,320) to fit the lastest modification, in both HelloWorld, HelloLua, Tests	2011-06-25 12:11:40 +08:00
Walzer	00568c229a	[android] back to shared library link	2011-06-25 11:21:16 +08:00
minggo	8440d6a267	[android] fixed #364: show string correct & line break ok	2011-06-24 13:55:00 +08:00
minggo	10cdd7f798	[android] fixed #364: line break ok on Android	2011-06-23 14:44:20 +08:00
minggo	71c13b34bf	Merge https://github.com/cocos2d/cocos2d-x into iss535	2011-06-22 17:00:11 +08:00
minggo	1122a7c7d0	[android] use Android widget Bitmap other than skia to drawstring	2011-06-22 16:58:50 +08:00
Walzer	96996d4d52	Merge pull request #311 from yangws/master ... Sync java code in Helloworld and tests and Add icon for Helloworld and tests on Android..	2011-06-22 01:11:49 -07:00
Walzer	1485a35338	update tests.xcodeproject to add lua support in cocos2dx lib. I finished it in xcode4 but don't know if this xcodeproject file will work on xcode4	2011-06-22 15:36:53 +08:00
yangws	01f277674e	Add icon for Helloworld and tests on Android.	2011-06-22 13:59:31 +08:00
yangws	4d8596169e	Sync java code in Helloworld and tests.	2011-06-22 11:37:42 +08:00
minggo	022e2b9998	issue #528: refactor ok on win32	2011-06-20 17:31:38 +08:00
minggo	25de09e34b	lua support ok on win32	2011-06-15 15:50:16 +08:00
minggo	8003de7468	update to latest code and merge	2011-06-14 11:01:38 +08:00
Walzer	f600846d4b	Merge http://github.com/flyingpacer/cocos2d-x, resolve conflicts in cocos2dx/CCScheduler.cpp	2011-06-08 11:08:29 +08:00
RongHong	67eb87abfe	To fix the crash when the gles version is too low	2011-06-08 10:02:07 +08:00
RongHong	a13e8ae859	1.修正gles版本过低时会崩溃的问题 ... 2.修正unscheduleAllSelectors（）中遍历哈希表导致崩溃的问题	2011-06-03 15:22:50 +08:00
liswei	49410a2a07	Merge branch 'XXX'	2011-06-03 10:52:19 +08:00
liswei	54780b8cb7	fixed #521, Fix the effect of PageTurn3D.	2011-06-03 10:51:21 +08:00
minggo	83e1e0ebd1	tests run ok when it don't enable lua	2011-06-01 20:29:05 +08:00
minggo	a8b6b850de	use precompile macro to cantrol if enable lua support	2011-06-01 17:51:08 +08:00
yangws	7e2d1d5c48	fixed #490 Text input on android use a different way, TextInputTest OK now.	2011-05-30 16:36:12 +08:00
Walzer	58a63f7ec0	[airplay] following MaxAksenov's suggestion, I set HelloWorld & Tests to landscape as default. Users had to rotate the simulator in airplay's surface configuration.	2011-05-30 14:14:19 +08:00
Walzer	11c401e3ea	[ios] setDepthTest(false) for EffectsTest	2011-05-26 21:01:16 +08:00
Walzer	bf95e4e7a5	Merge pull request #286 from natural-law/master ... [android] fixed #510	2011-05-26 01:39:11 -07:00
natural-law	7e716f9d80	[android] fixed #510, Delete the onDestroy method override in TestsDemo.java	2011-05-26 16:34:10 +08:00
yangws	476d86283f	Remove unnecessary code for digit in Cocos2dxGLSurfaceView.java.	2011-05-26 14:35:44 +08:00
minggo	dfbb0096e8	Merge pull request #283 from natural-law/master ... Compile tests OK on wophone.	2011-05-24 18:45:18 -07:00
natural-law	8ab7057fe6	Resolve the memory leak of tests.	2011-05-24 18:00:59 +08:00
natural-law	f89a93fcf8	Compile tests OK on wophone.	2011-05-24 17:52:24 +08:00
yangws	c757dd4aeb	fixed #503 new chipmunk code compiled ok on vs2010.	2011-05-24 16:18:47 +08:00
yangws	d93a2f046e	android can input number form soft keyboard.	2011-05-23 16:30:45 +08:00
yangws	ec23d7ed55	fixed #508 Dynamic switch retina display support.	2011-05-23 16:21:31 +08:00
yangws	533949a736	Merge branch 'master' of https://github.com/cocos2d/cocos2d-x	2011-05-23 10:11:13 +08:00
Walzer	6b24b6fb8d	issue #503, i forget to add chipmunk_private.h into xcodeproj	2011-05-21 21:35:05 +08:00
Walzer	e8835ee4c2	issue #503, add chipmunk new files into win32 vcproj	2011-05-21 17:10:29 +08:00
Walzer	335d02a556	issue #503, android version build & run ok.	2011-05-21 16:45:55 +08:00
Walzer	a9027574eb	issue #503, ChipmunkTest & ios xcodeproject upgraded, run on ios simulator ok	2011-05-21 16:19:01 +08:00
yangws	c9f66665ec	temp commit.	2011-05-20 17:47:06 +08:00
unknown	b940676cab	Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into 489	2011-05-19 20:55:39 +08:00
minggo	ff1017d86f	Merge pull request #276 from minggo/iss496 ... [android] fixed #496 fixed #497	2011-05-18 23:18:37 -07:00
minggo	073260e0a9	[android] fixed #496 fixed #497: tests and HelloWorld work ok on Android3.0	2011-05-19 11:26:57 +08:00
Walzer	2dd11490ad	Merge pull request #274 from yangws/master ... Fixed some bugs on wophone and modify CClog output utf-8 string on win32 and wophone emulator.	2011-05-18 18:51:38 -07:00
yangws	5173738f37	Merge branch 'master' of https://github.com/cocos2d/cocos2d-x	2011-05-18 11:08:44 +08:00
yangws	7a6a891242	fixed bugs: the image stoped when switch app fore/background several times. The background music not stoped when app enter background some time.	2011-05-18 11:08:18 +08:00
minggo	6cf0a9d4f4	[android] fixed #494: fix a wrong function name	2011-05-18 10:54:52 +08:00
yangws	aba77f4cae	issue #489 modified for vs2008.	2011-05-13 14:13:30 +08:00
Walzer	c7fb183dcb	[airplay] After exclude CurlTest & CCUserDefault, UserDefaultTest, HelloWorld & Tests can be compiled successfully now.	2011-05-12 21:58:11 +08:00
Walzer	4da5a0eb71	[android] move the TextField position to visable while soft keyboard popup	2011-05-12 21:32:57 +08:00
Walzer	f17a8f6226	Merge pull request #271 from minggo/iss488 ... [Android] CCUserDefault works ok on android2.2	2011-05-12 05:40:15 -07:00
minggo	d8f3b0c25b	[android] CCUserDefault works ok on android2.2	2011-05-12 18:32:13 +08:00
Walzer	bf04194877	Merge pull request #269 from yangws/master ... center CCTextField in TextInputTest	2011-05-12 01:59:39 -07:00
Walzer	7874ec5305	Merge pull request #270 from yangws/vs2010 ... compile ok in vs2010	2011-05-12 01:59:24 -07:00
yangws	c73c1a9ab6	compile ok in vs2010	2011-05-12 16:15:10 +08:00
yangws	01c5048203	set TextInputTest CCTextField to center.	2011-05-12 14:45:44 +08:00
natural-law	2855a9cefb	Fix the bug discovered by wophone test: ... 1. Can't play music & effect on wophone device. 2. UserDefaultTest is in the wrong path in test.wophone.vcproj.	2011-05-12 14:19:58 +08:00
minggo	a50fe1b95b	Merge pull request #267 from natural-law/master ... Modify the TextInputTest code to clean the memory leak.	2011-05-11 20:01:23 -07:00
natural-law	cc6367a835	Modify the TextInputTest code to clean the memory leak.	2011-05-12 10:54:33 +08:00
Walzer	7f0c35b158	Merge remote branch 'origin/master'	2011-05-12 10:52:33 +08:00
Walzer	10d94fb170	fixed #486, setDepthTest(true) in TileMapTest, while setDepthTest(false) in TransitionsTest. TransitionFlip will not flickers any more :)	2011-05-12 10:52:10 +08:00
natural-law	a7db186d06	Modify the test code for the right device orientation.	2011-05-12 10:11:58 +08:00
Walzer	58e9876124	change the position of TextField in TextInputTest	2011-05-11 22:15:51 +08:00
Walzer	074e127756	Merge pull request #265 from yangws/master ... fixed a bug: TextInputTestWithAction crash.	2011-05-11 05:22:38 -07:00
yangws	7dad88c556	fixed a bug: TextInputTestWithAction crash.	2011-05-11 18:45:53 +08:00
Walzer	d0ff1f274e	Merge pull request #264 from yangws/master ... fixed a bug: TextInputTextWithAction can't stop CCTextFieldTTF's action when click enter button.	2011-05-11 03:28:16 -07:00
Walzer	60f1468f57	Merge pull request #263 from yangws/input_android ... fixed a bug: delete twice when delete button click once.	2011-05-11 03:27:45 -07:00
yangws	b8a9db98dc	fixed a bug: TextInputTextWithAction can't stop CCTextFieldTTF's action when click enter button.	2011-05-11 18:22:55 +08:00
yangws	e436e177de	fixed a bug: delete twice when delete button click once.	2011-05-11 17:33:59 +08:00
yangws	21c8628e68	Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into input2 ... Conflicts: cocos2dx/platform/wophone/CCApplication_wophone.h tests/tests/tests.h	2011-05-10 16:09:26 +08:00
yangws	3f8293dffb	Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into input ... Conflicts: HelloWorld/wophone/HelloWorld.wophone.vcproj tests/test.wophone/copy_res.bat	2011-05-06 17:45:39 +08:00
minggo	6c69107f33	fixed #455: CCUserDefault works ok on iOS	2011-05-06 17:01:41 +08:00
yangws	ced029257f	temp commit	2011-05-06 16:38:09 +08:00
minggo	7e40957e04	Merge https://github.com/cocos2d/cocos2d-x into iss455	2011-05-06 16:29:44 +08:00
minggo	80f739942d	issue #455 : compile CCUserDefault on iOS	2011-05-06 16:29:35 +08:00
minggo	33648a9e9b	issue #455: add compile CCUserDefault to WoPhone, but not test, because the path will change later	2011-05-06 16:14:07 +08:00
minggo	2c0bd49513	issue #455: CCUserDefault ok on win32 & Android	2011-05-06 15:31:51 +08:00
yangws	b95ef2f242	chipmunk test ok.	2011-05-06 12:30:52 +08:00
natural-law	846b529e49	[wophone] fixed #482, Modify the resource data path for the new WoPhone-SDK.	2011-05-06 10:13:12 +08:00
yangws	0fe61642f6	issue #478 text input ok.	2011-05-05 18:17:50 +08:00
Walzer	dcdad9a81a	Merge pull request #250 from yangws/481 ... fixed #481 DisableKeyLock and DisableBackLightAutoTurnOff when BackLightTurnOn.	2011-05-05 00:53:10 -07:00
Walzer	c7e25d305a	Merge pull request #248 from yangws/input ... Split TextInputTest to Default test and Action test. Compile ok on vs2010	2011-05-05 00:50:48 -07:00
yangws	7c5a6d779c	fixed #481 DisableKeyLock and DisableBackLightAutoTurnOff when BackLightTurnOn.	2011-05-05 11:51:13 +08:00
Carlos Sessa	9d08f9582c	Added the possibility of extending Cocos2dxGLSurfaceView and providing a initView() method	2011-05-04 11:18:26 -03:00
yangws	a5da2bd226	Split TextInputTest to Default test and Action test. Compile ok on vs2010.	2011-05-04 14:13:15 +08:00
Walzer	5dc7ef2ffc	sort the TestCases alphabetically in project.pbxproj	2011-05-03 14:48:25 +08:00
Walzer	2b8799d3ac	Merge pull request #246 from yangws/input. ... Modify tests doesn't change orientation every test scene.	2011-05-02 23:00:35 -07:00
yangws	e723a424d8	Modify tests doesn't change orientation every test scene.	2011-05-03 11:37:30 +08:00
minggo	0db248e1f1	Merge pull request #245 from yangws/input. ... TextInputTest on on ios.	2011-05-02 18:48:48 -07:00
yangws	2b94d7d9ce	TextInputTest on on ios.	2011-04-29 18:09:54 +08:00
yangws	170933b4c5	CCTextFieldTTF test code ok on win32.	2011-04-29 16:46:29 +08:00
minggo	b00c54dc64	Merged pull request #243 from minggo/iss477. ... [android] fixed #477: set default ndk version to ndk-r5	2011-04-28 19:29:15 -07:00
minggo	bb4fc1c446	[android] fixed #477: set default ndk version to ndk-r5	2011-04-29 09:59:05 +08:00
Walzer	031a750f95	[ios] issue #456, add curl into header search path for Release build.	2011-04-29 09:39:35 +08:00
yangws	d73699aabb	[ios] tests add RootViewController for rotate with ui object.	2011-04-28 14:19:12 +08:00
yangws	323c065934	make test can compile on wophone and airplay.	2011-04-28 10:31:51 +08:00
yangws	f8dc140840	change CCLabelTTF accept string from gb2312 to utf8.	2011-04-27 18:19:47 +08:00
yangws	73a3f776f0	android lanscope keyboard ok.	2011-04-27 17:01:27 +08:00
yangws	e895d9d073	TextInputTest compile ok on android and merge last master code. ... Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into input Conflicts: HelloWorld/android/src/org/cocos2dx/lib/Cocos2dxGLSurfaceView.java HelloWorld/android/src/org/cocos2dx/lib/Cocos2dxRenderer.java HelloWorld/ios/HelloWorld.xcodeproj/project.pbxproj cocos2dx/platform/android/Cocos2dJni.cpp tests/test.android/src/org/cocos2dx/lib/Cocos2dxGLSurfaceView.java tests/test.android/src/org/cocos2dx/lib/Cocos2dxRenderer.java tests/test.ios/test.xcodeproj/project.pbxproj tests/test.win32/test.win32.vcproj	2011-04-26 18:04:07 +08:00
yangws	a73ccaf0e3	Cocos2dxGLSurfaceView little modify.	2011-04-26 16:40:49 +08:00
yangws	9b08f4add6	keyboard notification message on ios and TextFieldTTF test code OK.	2011-04-26 16:33:20 +08:00
minggo	1c248b9955	Merge branch 'iss462' of https://github.com/minggo/cocos2d-x	2011-04-25 16:07:16 +08:00
minggo	f11acc5e31	[android] pause/resume gl render thread when the activity is paused or remused	2011-04-25 15:53:08 +08:00
minggo	99733c602d	[android] fixed #462: call applicationDidEnterBackground and applicationWillEnterBackground on android	2011-04-25 15:13:24 +08:00
Walzer	6a11f73999	Merge branch 'iss468' of https://github.com/natural-law/cocos2d-x	2011-04-25 14:44:21 +08:00
natural-law	7231120b16	fixed #468, Implement CCProfiler & CCProfilingTimer. And use them in PerformanceNodeChildrenTest.	2011-04-25 14:30:30 +08:00
moadib	85afa22195	[android] fixed typo in CCEGLView method name	2011-04-24 18:52:21 +04:00
yangws	252f3efe1a	CCIMEDispatcher works on android.	2011-04-22 16:33:41 +08:00
natural-law	df00c32d5b	fixed #466. [wophone] Modify the template and the Makefile.ARM file for wophone.	2011-04-22 11:49:14 +08:00
natural-law	e2ce006db2	fixed #466. [wophone] Refactor the CCFileUtils for the new packing approach.	2011-04-22 10:57:46 +08:00
natural-law	acb4bb5a16	Merge branch 'master' into iss428 ... Conflicts: template/xcode3/cocos2d-x_chipmunk_app/___PROJECTNAME___.xcodeproj/project.pbxproj	2011-04-21 14:58:58 +08:00
natural-law	5d2ac1fc0c	fixed #428, Use CCArray instead of CCMutableArray as the parameter type of CCNode::m_pChildren.	2011-04-21 14:46:15 +08:00
minggo	e5441a4fc2	fixed #450: can set default pixel format other than RGBA8888	2011-04-20 15:34:33 +08:00
minggo	4ffe24fc8e	Merge branch 'iss374' of https://github.com/natural-law/cocos2d-x into natural-law-iss374	2011-04-19 13:45:56 +08:00
minggo	c38af3c28d	fixed #456: integrate libcurl into cocos2dx	2011-04-19 10:57:44 +08:00
minggo	a4e9f1c18d	libcurl works ok on ios	2011-04-18 14:12:41 +08:00
minggo	37e7fad0d3	issue #456: add curl test & libcurl.so works ok on android	2011-04-15 17:15:05 +08:00
minggo	a165663b4c	[andorid] merge Macarse-inflateViews into master and sychrolize it to HelloWorld	2011-04-12 15:37:44 +08:00
minggo	8e85f56f97	Merge branch 'inflateViews' of https://github.com/Macarse/cocos2d-x into Macarse-inflateViews	2011-04-12 15:12:48 +08:00
minggo	d8115cacea	[android] fixed #453: cocosdenshion can replace the background music	2011-04-12 14:43:21 +08:00
minggo	0b7ca9c865	fixed #449: remove the code that suppots mac platform	2011-04-11 17:04:45 +08:00
Macarse	0203141aaf	Now the size depends on the GLView size	2011-04-11 00:28:12 -03:00
Macarse	da78032542	Added the possibility of inflating Cocos2dxGLSurfaceView from an xml	2011-04-10 17:57:17 -03:00
walzer	0173d0c3b7	Merge branch 'master' of https://github.com/minggo/cocos2d-x	2011-04-07 16:57:58 +08:00
minggo	1f6bbacb0a	[android] fix a bug of cocosdenshion::rewindBackgroundMusic()	2011-04-07 15:59:01 +08:00
walzer	63f323456c	Merge branch '0.8.2_vc10' of https://github.com/yangws/cocos2d-x	2011-04-07 15:16:30 +08:00
natural-law	b72b5306d2	Fix problems discovered when test: ... 1. Add include file in ccConfig.h 2. Resolve the memory leak in PerformanceSpriteTest. 3. Delete the 2048 * 2048 texture test case in PerformanceTextureTest.	2011-04-07 14:30:35 +08:00
yangws	455ec071b3	VC2010 compile ok.	2011-04-07 14:20:04 +08:00
natural-law	1af4aa1138	[android] fixed #374,Modify the approach of cache the textures when EGL rendering context lost.	2011-04-06 16:29:58 +08:00
Max Aksenov	290367c867	[airplay] fix screen orientation bugs (pointer not properly worked) on devices ( checked on IOS IPad/IPhone), when orientation was changed.	2011-04-04 01:54:34 -07:00
walzer	cb65469103	[airplay] move .mkf to proj.airplay folder, improve SimpleAudioEngine implementation, integrate chipmunk	2011-04-04 00:40:39 +08:00
walzer	3a16b76d00	remove duplicate frameworks in test.xcodeproj	2011-04-03 10:13:06 +08:00
walzer	28fbfb04dc	Merge branch 'iss349' of https://github.com/natural-law/cocos2d-x into natural-law-iss349	2011-04-03 09:30:26 +08:00
natural-law	72f11cb421	[ios]fixed #349,Modify the method of parse *.plist files in order to deal with *.plist files in binary format.	2011-04-02 11:32:15 +08:00
minggo	8fbfc2773a	Merge branch 'issue_440' of https://github.com/minggo/cocos2d-x into minggo-issue_440	2011-04-01 17:19:30 +08:00
Marat Yakupov	ac84278dae	[android] #443 implemented CCKeypadDelegate on android	2011-04-01 11:27:06 +04:00
minggo	2c539a1df5	[android] fixed #440: CCMessage works ok on android	2011-04-01 11:35:26 +08:00
walzer	79229c82e8	Merge remote branch 'origin/master'	2011-03-31 17:56:21 +08:00
walzer	6c2f66792f	issue #422, add CocosDenshion implementation on airplay port. But it doesn't work correctly.	2011-03-31 17:53:35 +08:00
yangws	16254a2de1	fixed #440 CCMessageBox works on ios.	2011-03-31 11:08:46 +08:00
minggo	768c356343	merge natural-law-iss411 into master	2011-03-31 10:48:00 +08:00
natural-law	c8b0d391cd	fixed #411,Add ZwoptexTest on ios, wophone, android and airplay.Fix the bug in ios templates which generated by merge.	2011-03-30 15:21:18 +08:00
walzer	2b12ef4f56	issue #411, add Zwoptex.cpp/.h & test resource into tests.xcodeproj	2011-03-30 14:54:42 +08:00
walzer	35d94eb3a5	Merge branch 'iss411' of https://github.com/natural-law/cocos2d-x into natural-law-iss411	2011-03-30 10:44:34 +08:00
walzer	6d30c123d7	Merge branch 'issue_367' of https://github.com/minggo/cocos2d-x into minggo-issue_367	2011-03-29 15:53:11 +08:00
walzer	5811fb7c76	Merge branch 'issue_422' of https://github.com/minggo/cocos2d-x into minggo-issue_422	2011-03-29 15:50:28 +08:00
minggo	27d5a670b5	[android] fixed #367: make the compiling sequece of HelloWorld and tests don't depend on alphabet order	2011-03-29 15:26:50 +08:00
natural-law	987da86c01	Merge branch 'master' into iss411 ... Conflicts: tests/test.win32/test.win32.vcproj tests/tests/controller.cpp tests/tests/tests.h	2011-03-29 14:26:31 +08:00
minggo	c686047f83	[android] fixed #422: multitouch for android	2011-03-29 14:20:05 +08:00
natural-law	5f7357bf09	fixed #391,CCSpriteFrameCache support *.plist files with format value is not 0.	2011-03-29 11:56:14 +08:00
natural-law	1991a65b0b	Merge branch 'master' into iss391 ... Conflicts: HelloWorld/ios/HelloWorld.xcodeproj/project.pbxproj cocos2dx/proj.win32/cocos2d-win32.vcproj cocos2dx/proj.wophone/Makefile.ARM cocos2dx/proj.wophone/cocos2d-wophone.vcproj template/xcode3/cocos2d-x_app/___PROJECTNAME___.xcodeproj/project.pbxproj template/xcode3/cocos2d-x_box2d_app/___PROJECTNAME___.xcodeproj/project.pbxproj template/xcode3/cocos2d-x_chipmunk_app/___PROJECTNAME___.xcodeproj/project.pbxproj tests/test.ios/test.xcodeproj/project.pbxproj	2011-03-29 10:20:57 +08:00
natural-law	e38d3a2277	Merge branch 'master' into iss434 ... Conflicts: cocos2dx/platform/airplay/CCFileUtils_airplay.h template/xcode3/cocos2d-x_app/___PROJECTNAME___.xcodeproj/project.pbxproj template/xcode3/cocos2d-x_box2d_app/___PROJECTNAME___.xcodeproj/project.pbxproj template/xcode3/cocos2d-x_chipmunk_app/___PROJECTNAME___.xcodeproj/project.pbxproj	2011-03-28 17:06:32 +08:00
walzer	2f573a784e	fixed #435, CocosDenshion crashes at foreground/background switching	2011-03-27 22:17:18 +08:00
natural-law	cee82fe9fa	issue #434,refactor class CCFileUtils on android and ios.	2011-03-26 17:24:37 +08:00
yangws	cd6352adec	add new files to vc2010 project.	2011-03-25 17:41:54 +08:00
walzer	2bd28bd2dd	issue #390, add PerformanceTest into airplay port. But, oops, I cannot see anything in these test except "back to mainmenu".	2011-03-25 16:46:36 +08:00
walzer	9c1d462275	Merge branch '430' of https://github.com/yangws/cocos2d-x into yangws-430	2011-03-25 14:23:05 +08:00
walzer	a205df20a4	issue #390, manually merge from Bin's work.	2011-03-25 13:59:08 +08:00
yangws	be966dbddb	fixed #430 Solved bug by replacing glColor4ub with glColor4f.	2011-03-25 13:50:57 +08:00
walzer	db4fb7cc9c	issue #427, refactor ios port ok.	2011-03-24 17:51:29 +08:00
walzer	b9c56f1728	issue #427, try to add CCSAXParser.h	2011-03-24 16:16:49 +08:00
natural-law	55143e3b9e	issue #391,implement functions:CCRectFromString, CCPointFromString and CCSizeFromString.	2011-03-24 10:38:08 +08:00
walzer	ef7fe5afd1	[airplay] issue #379, fix search header paths with cause compilation error on release build	2011-03-24 10:19:52 +08:00
walzer	ed492bbd1e	[airplay] first commit of airplay port. Thanks for Аксёнов Максим's contribution!	2011-03-23 22:16:20 +08:00
natural-law	96d7cedadb	issue #411,implement the zwoptex test.	2011-03-22 14:59:10 +08:00
walzer	594dab24fc	Merge branch 'iss419' of https://github.com/natural-law/cocos2d-x into natural-law-iss419	2011-03-21 17:29:09 +08:00
natural-law	09be3e8fe5	[ios]fix #419,Enable the depth test when EAGLView is created.	2011-03-21 17:15:20 +08:00
walzer	9854370db3	fixed #410, recheck the search header paths & libraries paths in xcode3 templates	2011-03-21 12:00:48 +08:00
walzer	ffeb116542	Merge branch 'issue_400' of https://github.com/minggo/cocos2d-x into minggo-issue_400	2011-03-18 16:32:20 +08:00
minggo	7b71a565ed	fixed #400: change project.pbxproj of HelloWorld and test to include CCCamera.cpp	2011-03-18 16:09:21 +08:00
walzer	d8c28d3754	Merge branch 'issue_409' of https://github.com/minggo/cocos2d-x into minggo-issue_409	2011-03-18 15:59:01 +08:00
minggo	47173778cc	fixed #409: rename NSArray UIAlignment	2011-03-18 14:31:29 +08:00
walzer	e62ff6c815	Merge branch 'issue_405' of https://github.com/minggo/cocos2d-x into minggo-issue_405	2011-03-18 14:08:52 +08:00
walzer	c15c1719ba	fixed #410, recheck the header search path & library search path in HelloWorld, Tests, and all xcode3 templates	2011-03-18 14:06:04 +08:00
minggo	617d484257	[android] fixed #405: pause BMG music when tap HOME and resume it when it is active	2011-03-18 11:12:06 +08:00
walzer	724ac1d0a9	Merge branch 'issue_403' of https://github.com/minggo/cocos2d-x into minggo-issue_403	2011-03-18 10:08:43 +08:00
minggo	7c52a521fa	fixed #403: change UIEvent to CCEvent	2011-03-18 09:39:34 +08:00
yangws	12254f95f0	fixed #395 Add initInstance code for all platform in msvc templates.	2011-03-17 11:27:51 +08:00
yangws	61e2f56439	Add Retina display resource for tests. ... Modify CCDrawingPrimitives.cpp for retina display support.	2011-03-15 15:12:50 +08:00
minggo	7571e1a51c	Merge branch 'dev' of https://github.com/natural-law/cocos2d-x into natural-law-dev	2011-03-15 09:29:47 +08:00
walzer	db1f54ee45	[ios] HelloWorld.jpg ->.png, xcode project from iOS4.1 to 4.2 "Lastest iOS"	2011-03-14 18:31:16 +08:00
natural-law	6d028007c2	Fix the bug of CCAnimationCache and CCSpriteFrame.Run SpriteTest successful.	2011-03-11 17:00:10 +08:00
minggo	723dd89fb7	Merge branch 'dev' of https://github.com/minggo/cocos2d-x into dev	2011-03-11 12:03:53 +08:00
minggo	69dcaddb51	Merge branch 'dev' of https://github.com/yangws/cocos2d-x into yangws-dev	2011-03-11 12:01:58 +08:00
minggo	9fa282c65c	[android] fix some bug and remove unneeded files	2011-03-11 11:56:33 +08:00
yangws	f0661a2679	fix 4 bugs: ... 1 call CCTextureCache::purgeSharedTextureCache() to release cached texture when enableRetinaDisplay is called. 2 enableRetinaDisplay performence correctly. 3 Modify libcocos2d project pre-link event performence corretly when the source in the path which contain white blacks. 4 Modify HiResTest, that can switch resouce dynamicly now.	2011-03-11 11:04:22 +08:00
unknown	8e429c422d	Build-win32.bat OK on win7	2011-03-10 21:11:14 +08:00
unknown	795f1b985f	Add VC2010 project files on win32	2011-03-10 19:50:17 +08:00
minggo	9a67fa6df1	Merge branch 'dev' of https://github.com/yangws/cocos2d-x into yangws-dev	2011-03-10 17:16:15 +08:00
natural-law	93aebbc469	[wophone]fixed #386,Resolve the compile conflict on wophone sdk.Modify the makefiles for wophone.	2011-03-10 14:24:13 +08:00
yangws	3fc701f1d2	fixed #300 Cocos2d-win32 application wizard for vs ok.	2011-03-10 12:00:29 +08:00
minggo	cb24e03466	Merge branch 'iss377' of https://github.com/natural-law/cocos2d-x into natural-law-iss377	2011-03-10 09:37:26 +08:00
natural-law	7c6147421b	[wophone]fixed #377,Replace the word "uphone" with "wophone".	2011-03-09 17:28:35 +08:00
minggo	12981fac89	fixed #375	2011-03-09 16:19:20 +08:00
minggo	75e2ecc16d	issue #387: move platform_support into cocos2dx/platform	2011-03-09 14:40:05 +08:00
minggo	63d283d3e8	delete ccxString.h	2011-03-09 12:00:04 +08:00
minggo	f1d13ca2e1	issue #375: android compiled ok	2011-03-08 13:49:58 +08:00
minggo	7a331e1e14	issue #375: wophone compiled ok	2011-03-07 18:20:48 +08:00
minggo	b5a99f90df	issue #375: rename file names and object names	2011-03-07 17:11:57 +08:00
minggo	aaf898cb72	merge master into dev	2011-03-07 09:52:45 +08:00
minggo	69edcb16af	fix a mergeing bug	2011-03-04 17:17:53 +08:00
minggo	661bae2797	merge natural-law-iss370	2011-03-04 16:32:54 +08:00
minggo	8e2f9c96b8	remove unneeded files	2011-03-04 16:22:53 +08:00
natural-law	aef83b2660	[uphone]Move Application from Application code to Cocos2dx/platform/ccxApplication.	2011-03-02 17:45:04 +08:00
yangws	395a0b3d47	AtlasTest rename to LabelTEst on win32.	2011-03-02 17:34:26 +08:00
minggo	4379a1c96f	Move ccxApplication to cocos2dx/platform on ios.	2011-03-02 17:05:22 +08:00
minggo	f58d2f8b32	[andriod] fixed #247: support multitouch on android	2011-03-02 10:40:02 +08:00
minggo	0a5ec4c12b	[android] move MultiTouchController.java to cocos2dx/lib/touch	2011-03-02 10:34:49 +08:00
minggo	f7b401163b	Merge branch 'multitouchController' of https://github.com/Macarse/cocos2d-x into Macarse-multitouchController	2011-03-02 09:38:23 +08:00
minggo	e00222104f	merge yangws-issue360 into dev	2011-03-02 09:31:47 +08:00
minggo	89b4d07ed8	[android] fixed #368: move Application code to cocos2dx/platform/ccxApplication	2011-03-01 19:53:39 +08:00
yangws	b54de8a3ef	fixed #360 Modify CCXAppWiz for win32， add initInstance function in class AppDelegate	2011-03-01 14:28:39 +08:00
minggo	b65d84551b	resolve confict when merging branch yangws-issue366	2011-03-01 14:08:18 +08:00
yangws	7bc7d32001	fixed #366 [win32] Move Application from Application code to Cocos2dx/platform/ccxApplication	2011-03-01 12:41:57 +08:00
minggo	1b6602f582	Merge branch 'WVGA_scale_android' of https://github.com/minggo/cocos2d-x into minggo-WVGA_scale_android	2011-02-28 10:00:55 +08:00
minggo	f504211e56	merge natural-law-iss332 to dev	2011-02-28 09:48:14 +08:00
minggo	498e0072e1	[android] fixed #358: autoscale HVGA resource to WVGA	2011-02-26 15:52:57 +08:00
minggo	1428480c7f	[android] fixed #338:refactor platform_support	2011-02-25 13:35:27 +08:00
natural-law	6c54eb0a86	Update the tests from 0.99.4 to 0.99.5.	2011-02-25 11:31:49 +08:00
yangws	63cedd1317	Merge code of Platform_support for IOS.	2011-02-23 18:22:05 +08:00
natural-law	949c1000a8	update tests to 0.99.5.	2011-02-23 16:47:25 +08:00
Macarse	b52eed0782	blah	2011-02-22 22:32:24 -03:00
yangws	4d47babf9e	add ; after NS_CC_BEGIN	2011-02-19 18:16:45 +08:00
natural-law	4362a5f381	[uphone]issue #316,Resolution auto adjustment.	2011-02-19 17:44:43 +08:00
natural-law	60e9ae873c	Merge branch 'dev-retina' of https://github.com/yangws/cocos2d-x into iss316 ... Conflicts: HelloWorld/AppDelegate.cpp tests/AppDelegate.cpp	2011-02-19 10:19:14 +08:00
yangws	85b9c9ae21	Retina display support and scale with keep w/h rate ok on win32.	2011-02-18 18:30:22 +08:00
natural-law	245155e66a	[uphone]issue #340,Refactor platform_support on uphone,and run tests successful on both simulator and device.	2011-02-18 10:44:49 +08:00
Macarse	c6f4eab602	typo	2011-02-17 23:44:14 -03:00
Macarse	43a437a978	fixed small error	2011-02-17 23:28:17 -03:00
Macarse	4267593bf9	Used an array approach	2011-02-17 23:23:36 -03:00
natural-law	0a2ceee2c5	Merge branch 'dev' of https://github.com/cocos2d/cocos2d-x into dev	2011-02-12 17:24:41 +08:00
minggo	043d771f1a	Merge branch 'dev' of https://github.com/natural-law/cocos2d-x into natural-law-dev	2011-02-12 17:23:50 +08:00
natural-law	20409e7a58	delete the code for debug in cocos2d-android.	2011-02-12 17:20:13 +08:00
natural-law	8fcb9d017c	delete the code for debug in cocos2d-android.	2011-02-12 17:18:25 +08:00
yangws	8458476597	Merge branch 'dev' of https://github.com/cocos2d/cocos2d-x into upto-0.99.5 ... Conflicts: .gitignore	2011-02-12 16:42:47 +08:00
Macarse	24c4a477e3	Fixed issue for tests	2011-02-11 00:48:46 -03:00
Macarse	e1dfb21dd4	Added logic for POINTER_UP and POINTER_DOWN	2011-02-06 19:02:03 -03:00
Macarse	8d5995d5a6	First approach	2011-02-06 17:05:56 -03:00
Macarse	ab44dafc6c	Use SENSOR_DELAY_GAME for the SensorManager	2011-02-06 09:11:24 -03:00
Macarse	66038230eb	Added logic to disable sensors from the c++ code	2011-02-05 20:17:24 -03:00
Macarse	284c330569	Added code from walzer's comment	2011-02-01 00:11:42 -03:00
Macarse	fce540989d	First approach	2011-01-30 20:05:30 -03:00
yangws	34a6ca5208	Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into upto-0.99.5 ... Conflicts: cocos2dx/platform/win32/CCXUIImage_win32.cpp cocos2dx/platform/win32/CCXUIImage_win32.h tests/test.win32/test.win32.vcproj	2011-01-28 14:33:47 +08:00
yangws	76ea63da7f	Change prefix CCX to ccx.	2011-01-27 17:07:36 +08:00
minggo	d68d33b029	Merge branch 'master' of https://github.com/minggo/cocos2d-x into minggo-master	2011-01-27 09:56:45 +08:00
minggo	31f9969674	fixed #333: fix compiling issue under linux	2011-01-27 09:49:06 +08:00
Macarse	89f012023e	Fix display issue with Samsung Galaxy Tab	2011-01-26 19:03:14 -03:00
minggo	046668c3f1	Merge branch 'master' of https://github.com/minggo/cocos2d-x into minggo-master	2011-01-26 10:02:26 +08:00
minggo	052e8634dc	[android]fix a bug of SimpleAudioEngine::playEffect()	2011-01-26 09:46:34 +08:00
minggo	9e2587c26c	Merge branch 'master' of https://github.com/minggo/cocos2d-x into minggo-master	2011-01-25 17:09:11 +08:00
minggo	acb6b67bd9	Merge branch 'master' of https://github.com/natural-law/cocos2d-x into natural-law-master	2011-01-25 17:08:04 +08:00
walzer	5d051a14fa	[iphone] fix the build error in SchedulerTest.cpp, use CCLOG instead of CCXLog	2011-01-25 16:56:46 +08:00
minggo	4fae086e8b	[android]: fps controller	2011-01-25 15:26:16 +08:00
natural-law	6a1b8d64aa	Merge branch 'master' of https://github.com/cocos2d/cocos2d-x	2011-01-25 15:09:34 +08:00
natural-law	d56575dd5a	[uphone]change the parameter order of function setResource.And add default value of the parameter pszResPath.	2011-01-25 14:26:26 +08:00
walzer	04aab22145	Merge branch 'natural-law-master'	2011-01-25 11:43:57 +08:00
minggo	59edc619a8	[android] to prevent preload effect many times	2011-01-25 11:30:25 +08:00
minggo	38b7e054bd	[android]fix the error of preloadEffect()	2011-01-25 11:29:15 +08:00
natural-law	800033d98b	fixed #329,use std::string to implement function CCBMFontConfiguration::parseConfigFile.	2011-01-24 15:53:52 +08:00
yangws	09748e88a1	SchedulerTest can output log now.	2011-01-24 14:52:16 +08:00
yangws	1a17f3ea55	Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into upto-0.99.5 ... Conflicts: cocos2dx/platform/win32/CCXApplication_win32.cpp tests/test.win32/test.win32.vcproj	2011-01-22 17:52:06 +08:00
yangws	6ad3ec6bf0	HelloWorld and tests can run after move ccxApplication.	2011-01-22 17:30:00 +08:00
minggo	e23c1eb2f6	Merge branch 'master' of https://github.com/minggo/cocos2d-x into minggo-master	2011-01-22 16:45:26 +08:00
natural-law	5cf0ee5d90	[uphone]Modify the param of function get/set volume in SimpleAudioEngine from int to float.The Max/Min value changed to 1.0/0.0	2011-01-22 16:22:26 +08:00
minggo	4a4c0d3485	[android] fixed #321: Frame control of android. It is not so accuracy.	2011-01-22 15:10:18 +08:00
minggo	882b473291	[iphone]: font support	2011-01-21 18:15:12 +08:00
minggo	b3fe7f5b6c	fixed #307:merge TestAudioEngine into tests	2011-01-21 16:26:51 +08:00
minggo	01a3e37db8	[android] fix bug of build_native.sh	2011-01-21 15:45:55 +08:00
minggo	cffc61d426	issue #307: add music resource	2011-01-21 15:17:23 +08:00
minggo	e92970ec69	[android] fixed #311: implement cocosdenshin on android	2011-01-21 15:15:09 +08:00
minggo	f9d0db48e1	issue #307: merge TestAudioEngine into tests	2011-01-21 15:11:15 +08:00
yangws	333f0b5574	Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into upto-0.99.5 ... Conflicts: HelloWorld/AppDelegate.cpp cocos2dx/particle_nodes/CCParticleSystem.cpp cocos2dx/proj.win32/cocos2d-win32.vcproj tests/AppDelegate.cpp	2011-01-20 11:18:35 +08:00
minggo	14fa024e48	Merge https://github.com/cocos2d/cocos2d-x into merger	2011-01-20 09:22:29 +08:00
walzer	9041d03d3b	[uphone] issue #307, config test.vcproj uphone for TestAudioEngine merger.	2011-01-19 18:02:35 +08:00
minggo	d64ac9fdb8	issue #311: cocosdenshion for android	2011-01-19 16:00:19 +08:00
yangws	804dc4ef7c	Merge branch 'upto-0.99.5' of https://github.com/cocos2d/cocos2d-x into upto-0.99.5 ... Conflicts: cocos2dx/platform/CCArchOptimalParticleSystem.h cocos2dx/platform/win32/CCXBitmapDC.cpp cocos2dx/proj.win32/cocos2d-win32.vcproj	2011-01-19 15:29:08 +08:00
yangws	79b711a758	move CCXBitmapDC from cocos2d/platform to platform_support.	2011-01-19 14:23:26 +08:00
natural-law	ec7c24ad8d	Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into merge	2011-01-19 10:03:39 +08:00
natural-law	f992838f96	[uphone]fixed #293,Modify the absolute path method in CCFileUtils.	2011-01-18 18:21:06 +08:00
walzer	a58acc79f3	[iphone] fixed #301, add info.plist for HelloWorld & tests	2011-01-18 12:02:27 +08:00
natural-law	c682dd7084	Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into merge	2011-01-18 10:16:35 +08:00
natural-law	acb4a6a369	[uphone]fixed #293,modify the absolute path method in CCFileUtils.	2011-01-18 10:14:44 +08:00
walzer	04c685b95a	issue #289, fix some warnings	2011-01-17 21:16:25 +08:00
walzer	b60e1e1ff8	Merge branch 'master' of https://github.com/yangws/cocos2d-x into yangws-master	2011-01-17 20:37:23 +08:00
yangws	d2a116b001	fixed bug: Post build error on win32 when compiled project which the project's path string has space.	2011-01-17 18:01:20 +08:00
walzer	ad5ee3c9f6	Merge remote branch 'remotes/origin/upto-0.99.5' Fix some conflicts manually.	2011-01-17 16:21:11 +08:00
yangws	67c0ad6332	add platform support project on win32. ... Move macros, CCXUIImage, ccxCommon, CCXCocos2dDefine, 3rd party libraries, glu, NSLock, ccxConfig from platform/win32 to platform_support.	2011-01-15 18:05:35 +08:00
natural-law	9ccbb62f6e	fixed #313,Modify the main menu of tests project from page-turning to scroll.	2011-01-12 18:00:11 +08:00
natural-law	237042f7dd	fixed #309,App will not crash any more when surface re-created.	2011-01-10 17:54:44 +08:00
minggo	78a7329054	Merge branch 'upto-0.99.5' of https://github.com/natural-law/cocos2d-x into natural-law-upto-0.99.5	2011-01-08 09:27:58 +08:00
natural-law	c02a9a4dd5	Setting apk file path at runtime in cocos2d-android.	2011-01-07 16:29:06 +08:00
minggo	321c8098f3	make tests runs ok on iphone	2011-01-07 11:49:17 +08:00
natural-law	ec7fbd0e69	Fix bugs. ... 1. Run tests and HelloWorld in cocos2d-android. 2. Modify the makefile of cocos2d-uphone.	2011-01-07 11:30:19 +08:00
natural-law	0d2d746aec	Fix bugs.Run tests in cocos2d-uphone successful.	2011-01-05 17:01:08 +08:00
natural-law	25e9721678	fix bugs.	2011-01-04 17:46:23 +08:00
Walzer	4a6989b6ff	[uphone] add keyMenuBack to CCKeypadDelegate	2010-12-31 18:15:30 +08:00
natural-law	3dfd530b38	Merge branch 'iss295' into upto-0.99.5	2010-12-31 09:48:48 +08:00
natural-law	34f45c8faa	Implement CCEventDispatcher.	2010-12-31 09:36:53 +08:00
yangws	706f97114b	issue #281 CCParticleSystemQuad upto-0.99.5	2010-12-28 11:55:34 +08:00
yangws	5e377f9368	issue #281 CCParticleSystemPoint.h upto-0.99.5	2010-12-28 11:09:40 +08:00
natural-law	01cd90f2cc	update layers_scenes_transition_nodes to 0.99.5.	2010-12-27 09:40:45 +08:00
natural-law	4a64f899fe	update label_nodes to 0.99.5.	2010-12-24 17:07:31 +08:00
minggo	e3b49d7504	merge from minggo and natual-raw	2010-12-23 17:40:23 +08:00
minggo	6d98bc7b5d	Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into merge	2010-12-23 16:22:37 +08:00
minggo	30f4c94bfb	make a little change to upto-0.99.5	2010-12-23 10:35:09 +08:00
natural-law	eeb4e99804	rename the action classes.	2010-12-22 15:43:54 +08:00
natural-law	4a765d33a3	rename the CCXXXAction files to CCActionXXX.	2010-12-22 15:15:04 +08:00
Walzer	5c9aea9ee7	Merge branch 'minggo-master'	2010-12-20 15:03:32 +08:00
Walzer	13865e7331	Merge branch 'master' of https://github.com/minggo/cocos2d-x into minggo-master	2010-12-20 15:03:12 +08:00
minggo	3d85f8f8d3	correct the error for checking the existance of resources	2010-12-20 14:44:38 +08:00
minggo	dc980de055	copy resources correctly	2010-12-20 14:35:02 +08:00
minggo	32307cc3e0	copy resources from top directory	2010-12-20 14:21:33 +08:00
minggo	4c14ff2c2f	copy resources from top directory	2010-12-20 14:17:51 +08:00
Walzer	156e667849	merge tests/proj.uphone & framework.uphone, merge tests/proj.win32 & framework.win32	2010-12-20 12:47:56 +08:00
natural-law	9a4f0c0283	fixed #267 Fix the bug of test case "ParallaxParticle" in ParticleTest.	2010-12-18 15:20:45 +08:00
Walzer	5c858b182c	issue #243, fix warnings	2010-12-18 12:02:57 +08:00
Walzer	edc742d41b	Merge branch 'master' of https://github.com/leon-li/cocos2d-x into leon-li-master	2010-12-18 10:26:22 +08:00
Walzer	b12f20c834	[iphone-cpp] SDKROOT = "iphoneos" instead of "iphoneos4.1"	2010-12-18 10:15:07 +08:00
Leon	96f4f5c9fd	fix some compiling warning for iOS	2010-12-17 23:44:19 +08:00
Walzer	5a4c721f0c	modify build_natvie.sh to use unix line feed character	2010-12-17 15:43:36 +08:00
Walzer	063f595e9a	Merge branch 'master' of https://github.com/natural-law/cocos2d-x into natural-law-master	2010-12-16 12:03:25 +08:00
natural-law	95e697d316	fixed #262 Add namespace for the project CocosDenshion.	2010-12-15 18:28:18 +08:00
minggo	53753b65b5	merge bada platform	2010-12-15 18:05:02 +08:00
impact	7434748d4a	Capitalization changes for building on linux (case-sensitive filesystem)	2010-12-15 01:00:35 -05:00
natural-law	2576bbe5b4	Merge branch 'master' into iss258	2010-12-14 13:53:25 +08:00
unknown	acc30e35b1	Merge branch 'master' of https://github.com/natural-law/cocos2d-x into natural-law-master	2010-12-14 11:10:46 +08:00
unknown	57770086e6	Merge branch 'master' of https://github.com/minggo/cocos2d-x into minggo-master	2010-12-14 11:09:36 +08:00
natural-law	2c84b167e0	fixed #258 Move FileUtils.h from path "support/file_support" to path "include".	2010-12-14 10:45:23 +08:00
natural-law	341e7efb27	fixed #251 add a test case for CCKeypadDelegate	2010-12-14 10:23:20 +08:00
minggo	a33823706d	fixed #259	2010-12-14 09:42:39 +08:00
natural-law	8cb331994d	Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into merge	2010-12-13 17:55:02 +08:00
unknown	7cc2498756	Merge branch 'master' of https://github.com/minggo/cocos2d-x into minggo-master	2010-12-13 16:53:16 +08:00
natural-law	2706e3a003	fixed #251 CCKeypadDelegate implement	2010-12-13 14:10:39 +08:00
minggo	4e0d856151	fixed #256	2010-12-13 11:36:35 +08:00
minggo	faa3063ad0	Merge branch 'master' of https://github.com/minggo/cocos2d-x into minggo-master	2010-12-11 17:41:33 +08:00
minggo	2f0f89abb1	fixed #255	2010-12-11 17:34:07 +08:00
minggo	817af55e1e	Merge branch 'master' of https://github.com/minggo/cocos2d-x into minggo-master	2010-12-11 13:26:26 +08:00
minggo	b7e78d82ab	fixed #254	2010-12-11 13:18:33 +08:00
Walzer	dec419be71	Merge branch 'master' of https://github.com/minggo/cocos2d-x into minggo-master	2010-12-10 10:34:41 +08:00
minggo	6b37bc97d4	fixed #220: run tests on android	2010-12-09 10:50:02 +08:00
unknown	4d22e3b263	Merge branch 'master' of https://github.com/yangws/cocos2d-x into yangws-master	2010-12-08 18:03:35 +08:00
minggo	a6855993f6	issue #220: android does not support glColor4ub, so use glColor4f instead	2010-12-06 11:15:16 +08:00
minggo	534a55eaa1	issue #220: All tests run on android emulator, but the effect of some tests are wrong	2010-12-06 09:51:21 +08:00
yangws	96115bc26e	fixed #233 now don't call preMainLoop when application enter background, test ok on uphone device. ... fixed a CCXAppWiz.uphone bug, create a empty file named xxxxx_str_str.h when build. Signed-off-by: yangws <yangws@cocos2d-x.org>	2010-12-03 15:27:55 +08:00
minggo	ad344d69fb	fixed #238, checked in xcodeproj file for HelloWorld & tests	2010-12-03 14:39:07 +08:00
yangws	687fb199fc	issue #233 stop main loop when application enter background. test ok on emulator	2010-12-02 18:44:13 +08:00
minggo	d88b26c4d2	commit AppDelegate.cpp after merging	2010-11-29 15:57:53 +08:00
minggo	7fa8d72076	commit before merging the code from https://walzer@github.com/cocos2d/cocos2d-x.git	2010-11-29 15:54:32 +08:00
minggo	9a2ff2407a	commit the change before merging master of cocos2d-x	2010-11-29 15:08:21 +08:00
natural-law	4d98faabc5	fixed #226 add support read resource file from zip file in cocos2d-uphone	2010-11-29 10:49:43 +08:00
Walzer	b4152fa700	fixed #222 merge different HelloWorld to one directory just like "tests", except HelloWorld.android	2010-11-27 18:25:31 +08:00
Walzer	8854ec5b10	Merge branch 'master' of https://github.com/minggo/cocos2d-x into minggo-master	2010-11-26 11:59:56 +08:00
minggo	aa826970eb	fixed #224	2010-11-26 11:38:10 +08:00
walzer	29191a385e	Merge branch 'master' of https://github.com/minggo/cocos2d-x into minggo-master	2010-11-24 10:38:01 +08:00
yangws	852c57d2c6	add CCLOG support on win32 and uphone	2010-11-23 18:20:46 +08:00
minggo	8be8a02e73	fixed #210: support accelemeter	2010-11-22 11:11:20 +08:00
yangws	9346275604	show fps	2010-11-19 03:14:19 +00:00
Walzer	3f8c167882	issue #211, add batch build for uphone	2010-11-19 02:59:27 +00:00
yangws	d96599e787		2010-11-19 02:48:08 +00:00
Walzer	0ad77b779a	issue #211 don't checkout	2010-11-18 15:55:00 +00:00
Walzer	26bfa32ca6	issue #211 don't check out	2010-11-18 14:56:54 +00:00
Walzer	5a44e5f1fe	issue #211 don't checkout	2010-11-18 13:51:33 +00:00
Ming	202ed580d6		2010-11-18 08:32:32 +00:00
Ming	99b7ae73e9		2010-11-18 08:24:19 +00:00
Ming	04aa648c1b		2010-11-18 08:23:49 +00:00
Ming	dc2f5f604f	fixed #208	2010-11-18 07:38:47 +00:00
Ming	31809a3774	issue #208	2010-11-18 06:50:28 +00:00
yangws	4a432f3125	change win32 porject name after test ok.	2010-11-17 03:13:37 +00:00
yangws	b181701039	change win32 porject name	2010-11-17 02:46:43 +00:00
yangws	0618af9711	change win32 project name	2010-11-17 02:16:21 +00:00
natural-law	10c6cd29f1	issue #189 ... add support of Accelerometer sensor	2010-11-16 09:09:12 +00:00
Walzer	fb25984f12	rename getShared methods to shared	2010-11-16 07:12:09 +00:00
yangws	2587114512	issue #186 add template/CCXAppWiz.vs to cocos2dx.	2010-11-16 03:25:33 +00:00
yangws	2e6f7c0623	issue #205 vs2008 run tests win32 OK.	2010-11-15 02:57:15 +00:00
Walzer	9a431a434e	fixed #198 reuse "tests" game logic between uphone & win32 platform! ohye~~	2010-11-13 06:35:37 +00:00
Walzer	aaf6a7f1ee	makefile for test_uphone arm	2010-11-13 01:47:25 +00:00
Walzer	ed7d1ca159	issue #198 now test_uphone & test_win32 directories are remove. "test" stands for them	2010-11-12 09:24:12 +00:00