Commit Graph

3132 Commits

Author SHA1 Message Date
Dale Stammen 762433e8aa enable CC_ENABLE_CACHE_TEXTURE_DATA for wp8 2014-03-22 06:12:04 -07:00
Dale Stammen a14728f184 added CC_PLATFORM_WINRT and WP8 2014-03-22 06:11:27 -07:00
Dale Stammen 347f91fcb6 Disabled console for wp8/winrt until networking code is added 2014-03-22 06:11:10 -07:00
Dale Stammen 6a4d459c77 Disabled console for wp8/winrt until networking code is added 2014-03-22 06:10:54 -07:00
Dale Stammen aa0dae4d1f added CC_PLATFORM_WINRT and WP8 2014-03-22 06:10:07 -07:00
Dale Stammen 6ee7f5d325 added CC_PLATFORM_WINRT and WP8 2014-03-22 06:09:48 -07:00
Dale Stammen bfaa5882fe fix for RELATIVE reserved word in wp8 compiler 2014-03-22 06:09:16 -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
Dale Stammen 2577fc39d8 #pragma mark for ios and mac only 2014-03-22 05:58:37 -07:00
Dale Stammen fb574697aa added support for precompiled shaders in wp8 2014-03-22 05:58:07 -07:00
Dale Stammen 5e402ee433 fix for generic already defined in wp8 2014-03-22 05:56:49 -07:00
Dale Stammen 294341d0ab fixed texture memory leak and added comments to indicate problem 2014-03-22 05:56:08 -07:00
Dale Stammen 65400bf87b added wp8 device orientation. added purge for FontAtlasCache. Disabled console for wp8/winrt until networking code is added 2014-03-22 05:55:08 -07:00
Dale Stammen f6b57df505 added WP8 and WINRT platforms 2014-03-22 05:53:09 -07:00
Dale Stammen 77ab59ebab #pragma mark for ios and mac only 2014-03-22 05:52:45 -07:00
Dale Stammen 409ad77b6c disabled webp for wp8 and winrt 2014-03-22 05:51:39 -07:00
Dale Stammen e3e4e88bce added WP8 and WINRT platforms 2014-03-22 05:50:55 -07:00
Chris Hannon ba37c07053 [add-socketio-jsb] implement fireEventToScript method to integrate JSB event handling with the original native code
-update static connect method to match JS API, kept original method but marked deprecated

Signed-off-by: Chris Hannon <himynameschris@gmail.com>
2014-03-21 11:45:14 -04:00
James Chen 7e526f1976 Merge pull request #5918 from boyu0/iss4498_refactor_PhysicsDebugDraw
closed #4498: Refactor PhysicsDebugDraw.
2014-03-21 16:50:42 +08:00
James Chen 832ab120aa Merge pull request #5862 from samuele3hu/develop_script_mgr
closed #4452: Adds `addCustomHandler` in the ScriptHandlerMgr for Console auto test.
2014-03-21 16:48:53 +08:00
CocosRobot 3bd000b236 [AUTO]: updating luabinding automatically 2014-03-21 08:38:19 +00:00
James Chen da0c15c982 Merge pull request #5847 from newnon/develop_small_improvements
Adds getCurrentLanguageCode() which returns iso 639-1 language code
2014-03-21 16:33:43 +08:00
boyu0 5edb9b9f86 closed #4499: Read ParticleSystem::_endRadiusVar from "minRadiusVariance" in plist. 2014-03-21 16:25:22 +08:00
boyu0 41f9760f15 closed #4498: Refactor PhysicsDebugDraw. 2014-03-21 15:49:18 +08:00
James Chen c30f466d56 Merge pull request #5915 from boyu0/iss3509_physicsbody_moves_randomly_when_switch_foreground_background
closed #3509: PhysicsBody moves randomly when switch foreground/background
2014-03-21 15:25:52 +08:00
boyu0 bc13956981 closed #3509: PhysicsBody moves randomly when switch foreground/background. 2014-03-21 15:16:55 +08:00
CocosRobot 4721306fef [AUTO]: updating luabinding automatically 2014-03-21 07:01:27 +00:00
James Chen 8f27611539 Merge pull request #5908 from CocosRobot/update_lua_bindings_1395383144
[AUTO]: updating luabinding automatically
2014-03-21 14:53:40 +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
CocosRobot 566c014060 [AUTO]: updating luabinding automatically 2014-03-21 06:26:33 +00:00
Dhilan007 1a08cd9b32 fix typo. 2014-03-21 13:52:12 +08:00
James Chen f51c39c034 closed #3897 : Constructors should be protected, but should be a way to disable them, added CC_CONSTRUCTOR_ACCESS.
Thank @pandamicro.
2014-03-21 13:44:29 +08:00
samuele3hu e2ed17f69c Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_script_mgr 2014-03-21 11:28:39 +08:00
samuele3hu 71f3cb7862 close #4452:Make `addCustomHandler` more distinct 2014-03-21 11:24:24 +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
Dhilan007 6b74794c74 fix typo and mistake in Label::setTextColor. 2014-03-21 09:47:29 +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
James Chen c3ef689724 Merge pull request #5890 from dumganhar/iss4462-ccb
closed #4462: Wrong logic in CCBAnimationManager::moveAnimationsFromNode...
2014-03-20 18:24:54 +08:00
James Chen b3cfc693ca Merge pull request #5887 from andyque/fix_tests_warnings
Fix warnings in cpp-tests.
2014-03-20 18:24:10 +08:00
samuele3hu 21a21c2d3d close #4400: Update the anrroid.mk for lua-bindings 2014-03-20 18:09:52 +08:00
samuele3hu 11bbeb4a30 close #4452:Using better spelling format 2014-03-20 17:56:33 +08:00
James Chen dcd919d9f7 closed #4462: Wrong logic in CCBAnimationManager::moveAnimationsFromNode. 2014-03-20 17:43:44 +08:00
samuele3hu 977ef0092b Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_script_mgr 2014-03-20 17:43:28 +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 cf86fd619f fix lua bindings warnings 2014-03-20 16:48:12 +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
CocosRobot 0f22720da5 [AUTO]: updating luabinding automatically 2014-03-20 07:25:03 +00:00
andyque 8c1bf48357 fixed label font size: from int to float 2014-03-20 15:03:48 +08:00
andyque e6645400a3 fix a paramers miss match 2014-03-20 14:54:09 +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 abf7598b1c remove deprecated classes in CCNodeLoader 2014-03-20 14:17:48 +08:00
andyque 8a409db1b6 change setFontSize from int to float 2014-03-20 14:14:02 +08:00
andyque 957eb9363e fix win32 compile error 2014-03-20 13:42:09 +08:00
andyque ca6851f114 fix warnings of font and RichText 2014-03-20 11:58:36 +08:00
andyque 6c16f16b1d fix CCDirectorCaller warnings 2014-03-20 11:32:43 +08:00
andyque 7ae77c9335 fix cocos2dx engine internal warnings 2014-03-20 10:58:04 +08:00
boyu0 9ba9687fc1 closed #4424: change name _enable->_enabled, _rotationEnable->_rotationEnabled, _gravityEnable->_gravityEnabled 2014-03-20 10:21:59 +08:00
CocosRobot 4b7f729154 [AUTO]: updating luabinding automatically 2014-03-20 02:21:28 +00:00
andyque d7b3737605 fix cocos2d tests and lu-bdinings and cocos2d_libs project config warnings 2014-03-20 10:14:25 +08:00
samuele3hu 0afcf59539 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_script_mgr 2014-03-20 09:56:06 +08:00
samuele3hu 0026fc2b2a close #4452:Add `addCustomHandler` in the ScriptHandlerMgr for Console auto test. 2014-03-20 09:54:38 +08:00
Sergey 13df593ae7 file attributes fixed 2014-03-19 18:58:19 +04:00
CocosRobot 0a57a5be11 [AUTO]: updating luabinding automatically 2014-03-19 10:32:42 +00:00
James Chen bed76d4460 Merge pull request #5870 from dabingnn/fix_scale0Bug
closed #4382: added missed scaleZ feature in ScaleTo and ScaleBy.
2014-03-19 18:28:12 +08:00
James Chen db4dd81030 Merge pull request #5871 from dumganhar/iss4450-missing-slash
closed #4450: FileUtils::addSearchResolutionsOrder doesn't check whether there is a 'slash' at the end of path.
2014-03-19 17:57:40 +08:00
James Chen a84873a67b closed #4450: FileUtils::addSearchResolutionsOrder doesn't check whether there is a 'slash' at the end of path. 2014-03-19 17:56:29 +08:00
samuele3hu a1ca3195ce Rename `addConsoleHandler` to `addCustomHandler` 2014-03-19 17:28:23 +08:00
James Chen 740aa30713 closed #4447: [Desktop] Can't receive touchEnded event when mouse up outside of window 2014-03-19 17:09:10 +08:00
andyque c90ef00668 add bool support for other platform 2014-03-19 16:47:57 +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
CocosRobot f0fdcb22d3 [AUTO]: updating luabinding automatically 2014-03-19 06:14:23 +00:00
James Chen 7061641dd8 Merge pull request #5860 from Dhilan007/develop_label
closed #4434: Label's color is incorrect if it's created by font name
2014-03-19 14:09:32 +08:00
samuele3hu a432f488bd Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_script_mgr 2014-03-19 10:51:42 +08:00
samuele3hu a91994f242 Add `addConsoleHandler` in the ScriptHandlerMgr for Console autotest. 2014-03-19 10:50:11 +08:00
Dhilan007 bb17da8f88 add override for Label::updateDisplayedColor 2014-03-19 10:36:44 +08:00
Dhilan007 f76460aee8 closed issue#4434:fixed display incorrect color of label if create by font name. 2014-03-19 10:10:47 +08:00
CocosRobot 781ff463a2 [AUTO]: updating luabinding automatically 2014-03-19 01:56:50 +00:00
James Chen a5e9630db1 Merge pull request #5843 from Dhilan007/develop_label
closed #4428: fixed display incorrect of multi-line label if invoking 'getLetter'.
2014-03-19 09:52:14 +08:00
boyu0 c4aaaf9231 closed #4424: fix PhysicsBody::setGravity() doesn't work correctly sometimes. 2014-03-18 16:17:43 +08:00
CocosRobot fc5a34e500 [AUTO]: updating luabinding automatically 2014-03-18 07:55:30 +00:00
Dhilan007 a286ed8374 fixed typo. 2014-03-18 13:48:41 +08:00
samuele3hu 76abe8d1c9 make FileUtilsWin32::getWritablePath() return value unified whether release or debug 2014-03-18 10:51:07 +08:00
Sergey f65ef462e5 getCurrentLanguageCode() for all platforms return iso 639-1 language code
iPhone template improvements(for game center support)
2014-03-17 22:34:21 +04:00
heliclei fe1bc368ec refactor upload:encode file with base64, detach upload from main loop 2014-03-18 00:46:17 +08:00
heliclei 4657b28c2d refactor upload:encode file with base64, detach upload from main loop 2014-03-18 00:42:36 +08:00
Dhilan007 46a4c17097 change access specifier of SpriteBatchNode::addSpriteWithoutQuad. 2014-03-17 19:31:58 +08:00
Dhilan007 cc671835f8 closed issue#4428:fixed label display incorrect if invoking getLetter and it's multi-line. 2014-03-17 18:33:15 +08:00
chuanweizhang2013 295bf7f7f2 rename variable 2014-03-17 11:06:50 +08:00
chuanweizhang2013 9167d39959 space 2014-03-15 18:18:56 +08:00
chuanweizhang2013 0a9ec91d6c init Console variable 2014-03-15 18:13:29 +08:00
James Chen 2e13d45848 Merge pull request #5819 from Dhilan007/develop_menu
fixed content size of MenuItem is incorrect when font size or font name ...
2014-03-15 01:27:05 +08:00
Dhilan007 e20676f939 fixed content size of MenuItem is incorrect when font size or font name change. 2014-03-15 01:24:23 +08:00
minggo 1c96c595ac Merge pull request #5817 from dumganhar/develop
Fix potential overflow in Texture::getCachedTextureInfo and where uses MultiByteToWideChar and WideCharToMultiByte
2014-03-15 01:23:00 +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
James Chen a47923e06d Fix potential overflow in Texture::getCachedTextureInfo. 2014-03-15 01:09:22 +08:00
James Chen c033591e6a [win32] Overflow fix when using MultiByteToWideChar and WideCharToMultiByte. 2014-03-15 01:05:04 +08:00
James Chen 306df0537e Reverts changes in CCApplication.cpp/.mm, pollEvent must after main loop, otherwise, potential crash will happen. 2014-03-15 00:10:39 +08:00
Dhilan007 e512235299 Remove the old implementation of LabelTTF 2014-03-14 21:06:40 +08:00
James Chen 9bc48a7ac1 PollEvents before main loop and beautifies codes in CCApplication.cpp/.mm. 2014-03-14 18:40:04 +08:00
James Chen a5775e9e6a Merge pull request #5793 from koowolf/win32_crash
Crash while clicking close button on desktop platforms
2014-03-14 18:26:34 +08:00
James Chen edde48e132 Merge pull request #5798 from Dhilan007/develop_label
closed #4377: LabelAtlas::setColor takes no effect.
2014-03-14 18:07:36 +08:00
Dhilan007 c4d91f512d LabelAtlas:fixed display incorrect color.
MenuItem:using Label to replace LabelTTF.
2014-03-14 17:36:05 +08:00
koowolf ad5f870f7c fix close crash in linux and mac 2014-03-14 17:21:27 +08:00
CocosRobot a090729b6e [AUTO]: updating luabinding automatically 2014-03-14 08:44:57 +00:00
koowolf 90f5d6511e fix win32 crash while click close button. 2014-03-14 16:13:32 +08:00
CocosRobot 189733abac [AUTO]: updating luabinding automatically 2014-03-14 07:56:39 +00:00
James Chen 8c7bc11931 Merge pull request #5790 from dumganhar/warning-fix-and-project-update
Warning fix and update VS project to fix compilation errors when building in Release mode
2014-03-14 15:48:55 +08:00
James Chen 177bf4df9d Some warning fixes. 2014-03-14 15:38:43 +08:00
James Chen a94b82e738 Updates VS project to fix compilation errors when building in Release mode. 2014-03-14 15:30:12 +08:00
Dhilan007 5f6fbc6a33 label:fixed getter for font size and font name. 2014-03-14 15:18:45 +08:00
Dhilan007 971b1dd557 Label:fixed text display incorrect when come to foreground on android. 2014-03-14 14:59:26 +08:00
Dhilan007 36bfd6d2c2 label:fixed incorrect effect of outline. 2014-03-14 09:51:39 +08:00
James Chen 263c83fd88 Merge pull request #5775 from CocosRobot/update_lua_bindings_1394716568
[AUTO]: updating luabinding automatically
2014-03-13 21:19:13 +08:00
CocosRobot c9259bb800 [AUTO]: updating luabinding automatically 2014-03-13 13:17:32 +00:00
James Chen 8743b00d9f Merge pull request #5768 from Dhilan007/develop_label2
Refactor setter of label's font name and font size.
2014-03-13 21:14:36 +08:00
Dhilan007 fe6f485a6b label:rename some API for clearly. 2014-03-13 21:00:36 +08:00
boyu0 b0b1645190 fix some physics bugs. 2014-03-13 20:56:51 +08:00
Dhilan007 62d0fa8564 label:rename some API for clearly. 2014-03-13 20:52:33 +08:00
andyque c4e20dd63a fix ease action error 2014-03-13 19:53:06 +08:00
Dhilan007 bc68c6b629 Refactor setter of label's font name and font size. 2014-03-13 18:46:35 +08:00
CocosRobot b1becd3fae [AUTO]: updating luabinding automatically 2014-03-13 06:51:53 +00:00
CocosRobot 6d8bc4e616 [AUTO]: updating luabinding automatically 2014-03-13 03:45:57 +00: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
James Chen ac0aecb394 Merge pull request #5737 from dumganhar/runtime-fix
Lua Runtime fix
2014-03-12 21:48:35 +08:00
James Chen 77a8476c80 GLView::end needs to release self. 2014-03-12 21:45:57 +08:00
James Chen ac4faeb8c4 Merge pull request #5730 from Dhilan007/develop_label
Label:Fixes the font rendering on Windows and  possible crash when create the label by font name.
2014-03-12 21:25:38 +08:00
Dhilan007 3acaf3ece5 1.Label:Fixes the font rendering on Windows.
2.fixed Label::setColor crash when create the label by font name.
2014-03-12 20:39:13 +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
CocosRobot e93feaa068 [AUTO]: updating luabinding automatically 2014-03-12 11:41:17 +00: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
CaiWenzhi 4d99736e4a Merge branch 'develop' into develop_nutty_modify_framework_for315CrashFixed 2014-03-12 17:06:48 +08:00
James Chen f01ca554aa Merge pull request #5708 from Dhilan007/develop_label
fixed incorrect initial value of label's TextVAlignment.
2014-03-12 16:46:22 +08:00
Dhilan007 c11ef679da fixed incorrect initial value of label's TextVAlignment. 2014-03-12 16:11:12 +08:00
James Chen 9c980dfcfe Merge pull request #5706 from dumganhar/rename-tests
Rename TestCpp to cpp-tests, TestLua to lua-tests in VS projects. And compilation error fix after changing folder name from 'gui' to 'ui'
2014-03-12 15:48:29 +08:00
James Chen eae6880599 Adds 'ui' include path in liblua.vcxproj 2014-03-12 15:44:56 +08:00
CocosRobot 31b304af26 [AUTO]: updating luabinding automatically 2014-03-12 07:43:13 +00:00
James Chen 2ae283d506 Merge pull request #5702 from dumganhar/glview-inherit-order
Changes the order of inheritance for GLView. Reason:
2014-03-12 15:34:53 +08:00
James Chen a974e5e42b Merge pull request #5704 from Dhilan007/develop_label
label: Change default font size from `32` to `12`, it's compatible with old LabelTTF.
2014-03-12 15:33:30 +08:00
Dhilan007 f5daf1af24 label:change default font size 2014-03-12 15:30:14 +08:00
James Chen ca27bc4d6f Merge pull request #5703 from Dhilan007/develop_label
label:fixed crash and incorrect getter.
2014-03-12 15:23:06 +08:00
Dhilan007 2786b40dc3 using string::empty() for judge whether string is empty. 2014-03-12 15:03:22 +08:00
Dhilan007 233b04269b label:
1.fixed crash if create label by font name and text is empty.
2.fixed getter of font name and font size is incorrect.
2014-03-12 14:49:19 +08:00
James Chen 42c724a59d Changes the order of inheritance for GLView. Reason:
```
 	bool ok = true;
 	JSObject *obj = JS_THIS_OBJECT(cx, vp);
 	js_proxy_t *proxy = jsb_get_js_proxy(obj);
	cocos2d::GLViewProtocol* cobj = (cocos2d::GLViewProtocol *)(proxy ? proxy->ptr : NULL);   // This line will cause the 'cobj' to be an invalid object, since the instance is a 'GLView', but we force cast it to 'GLViewProtocol*'.
 	JSB_PRECONDITION2( cobj, cx, false, "js_cocos2dx_GLViewProtocol_setDesignResolutionSize : Invalid Native Object");
 	if (argc == 3) {
 		double arg0;

```
After changing the order, the result could be fixed. But I don't know whether it's the best way to fix it. Anyway, it wouldn't break anything right now.
2014-03-12 14:43:51 +08:00
James Chen 02971082ba Merge pull request #5700 from dumganhar/develop
Some fixes: [lua] Reverts 'removing tolua.cast in test case, I don't know why it was re-added.
Some warning fixes in TriggerMng.cpp and TriggerObj.cpp
Comment some lines in CCEditBoxImplIOS.mm/CCEditBoxImplAndroid.cpp, since after re-implement LabelTTF by Label, '(g|s)etTextureRect' will not work, it's because LabelTTF is inherited from Node rather than Sprite now. We need to fix this as soon as possible.
2014-03-12 14:21:10 +08:00
heliclei d57d2f3059 Merge remote-tracking branch 'upstream/develop' into walk-node-tree 2014-03-12 14:19:55 +08:00
heliclei a907580d0a use lambda callback 2014-03-12 14:15:45 +08:00
James Chen 176a9b5fe6 Some warning fixes in TriggerMng.cpp and TriggerObj.cpp 2014-03-12 14:07:34 +08:00
James Chen 4b4b706066 Merge pull request #5635 from andyque/fix_ease_action
fix wrong display of ease elastic action test.
2014-03-12 12:07:26 +08:00
CocosRobot 41c689c545 [AUTO]: updating luabinding automatically 2014-03-12 03:31:17 +00:00
James Chen 44dd1855e5 Merge pull request #5692 from CocosRobot/update_lua_bindings_1394594250
[AUTO]: updating luabinding automatically
2014-03-12 11:18:58 +08:00
James Chen 0bf58c8096 Merge pull request #5690 from Dhilan007/develop_labelttf
issue #3821: LabelTTF was re-implemented as a wrapper of Label.
2014-03-12 11:18:40 +08:00
CocosRobot e3c821b32b [AUTO]: updating luabinding automatically 2014-03-12 03:18:20 +00: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
Dhilan007 6f165bb592 fixed incorrect initial value of label type. 2014-03-12 11:06:51 +08:00
Dhilan007 aefafdbe77 Add conditions to evaluate for setter of font size and font name. 2014-03-12 10:53:51 +08:00
andyque 2c2a5ee38e rename gui to ui 2014-03-12 10:46:49 +08:00
Dhilan007 bc7e39283f issue #3821:LabelTTF re-implemented as a wrapper of Label. 2014-03-12 10:19:33 +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
CaiWenzhi f2c483876a Fixed bug of guireader 2014-03-12 10:07:55 +08:00
chengstory 59aa17ea05 Change && to || in conditions judge. 2014-03-11 22:02:55 +08:00
andyque 4ed33fa4c8 fix lua bindings 2014-03-11 21:36:00 +08:00
andyque f6a9824df1 fix win32 compile error 2014-03-11 20:59:35 +08:00
andyque 448b101578 fix linux compile error 2014-03-11 20:46:11 +08:00
minggo b2e27947a3 Merge pull request #5654 from dabingnn/develop_RenderTextureImprovement
Develop render texture improvement
2014-03-11 18:50:51 +08:00
andyque 48772fb952 modify android makefile 2014-03-11 18:48:28 +08:00
andyque df7aa27b8b fix mac lua 2014-03-11 18:48:28 +08:00
andyque 026ef95b07 add lua ui binding 2014-03-11 18:48:27 +08:00
andyque dcc98ef79f rename cocos2dx_gui to cocos2dx_ui 2014-03-11 18:48:27 +08:00
andyque cbcc1bbbcf let ios project compile correct 2014-03-11 18:48:26 +08:00
andyque d309286c84 rename gui folder to ui 2014-03-11 18:48:25 +08:00
Dhilan007 df12ca963e issue #4337:label support create by font name,compatible with old labelTTF
1.fixed color and opacity has not yet gone into effect.
2.fixed display is not consistent with old LabelTTF when content scale factor of Director not equal to 1.
2014-03-11 18:06:14 +08:00
samuele3hu 9a30984783 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_new_fix 2014-03-11 17:36:43 +08:00
samuele3hu 5c33155bc9 fix:Remove some warning about lua. 2014-03-11 17:35:09 +08:00
CocosRobot b6ebd84534 [AUTO]: updating luabinding automatically 2014-03-11 08:38:10 +00:00
Dhilan007 b72d009eac Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2014-03-11 16:16:07 +08:00
heliclei 80417f0f35 correct naming convetion 2014-03-11 15:27:28 +08:00
Dhilan007 c2ef7b8796 fix incorrect implementation of Label::getContentSize 2014-03-11 15:03:16 +08:00
Dhilan007 792e182e12 typo fix and coding style improvements. 2014-03-11 14:32:07 +08:00
heliclei 8db680b9ee add EnumChildNodesByName, walk node tree with callback 2014-03-11 13:58:43 +08:00
Geron 09c6d196a2 Merge pull request #1 from 2youyouo2/develop
merge kaile
2014-03-11 12:37:55 +08:00
CaiWenzhi 6efa17cddf Add event type to ListView 2014-03-11 11:53:44 +08:00
CocosRobot 725440fe3f [AUTO]: updating luabinding automatically 2014-03-11 02:52:22 +00:00
geron-cn 9083de94b4 repair bug: changedisplay(armature,i>=0) does not reblind parentbone 2014-03-11 10:21:43 +08:00
boyu0 23f42da548 closed #4324: fix double free bug. move _preContactData to PhysicsContact class, add PhysicsContact::getPreContactData() method. 2014-03-11 05:09:08 +08:00
minggo 5e7f2dee8f Merge pull request #5643 from nutty898/develop_nutty_modify_framework_for315CrashFixed
Develop nutty modify framework for315 crash fixed
2014-03-10 21:49:22 +08:00
minggo 2aa5c7aadd Merge pull request #5649 from dabingnn/develop_fix_clippingNodeShaderBug
closed #4315: fixed clippingNode alphaTest Bug
2014-03-10 21:45:47 +08:00
Dhilan007 11d3acd478 fixed inappropriate usage of inline. 2014-03-10 20:35:36 +08:00
Dhilan007 8bac35ae2a closed #4337:label support create by font name,compatible with old labelTTF. 2014-03-10 19:42:43 +08:00
CocosRobot 8aa11f005b [AUTO]: updating luabinding automatically 2014-03-10 11:27:21 +00:00
James Chen 63292b5ba6 Merge pull request #5544 from heliclei/node-string-tag
CCNode:Add String tag, to support runtime manipulation
2014-03-10 18:26:51 +08:00
heliclei 83c4d5b479 fix comments 2014-03-10 18:21:53 +08:00
Huabing.Xu f0ae3fd4dc Merge branch 'develop' into develop_RenderTextureImprovement 2014-03-10 18:11:55 +08:00
James Chen 2147a711ba Merge pull request #5650 from dumganhar/re-add-lua
Re-add lua bindings support
2014-03-10 17:47:52 +08:00
Huabing.Xu e15d0a9d20 RenderTexture saveToFile will return true 2014-03-10 17:42:27 +08:00
James Chen 479579fadc Update CMakeLists.txt, lua-tests works ok on linux now. 2014-03-10 02:39:54 -07:00
James Chen e39dcd9974 [Linux] Updates CMakeLists.txt to re-add lua scripting support. 2014-03-10 17:10:08 +08:00
James Chen fd44277e7c lua-tests works again for Win32. 2014-03-10 17:05:35 +08:00
CaiWenzhi f2197cea6f Merge branch 'develop' into develop_nutty_modify_framework_for315CrashFixed 2014-03-10 16:19:27 +08:00
James Chen 6deadf34b8 lua-tests works again for Android. 2014-03-10 16:04:46 +08:00
James Chen 69bbda688b lua-tests works ok for iOS / Mac, luabindings has its own project. 2014-03-10 15:32:48 +08:00
Huabing.Xu f8f2373c2a closed #4315: fixed clippingNode alphaTest Bug 2014-03-10 15:12:44 +08:00
CaiWenzhi 26b3013f77 Format codes 2014-03-10 15:08:42 +08:00
boyu0 d5031f950a closed #4324: fix PhysicsContact::generateContactData() memory leak. 2014-03-10 14:51:26 +08:00
James Chen 650a88a8b1 Re-add lua bindings codes. 2014-03-10 14:04:58 +08:00
CaiWenzhi 083872f65c Fixed bug of setting anchor point 2014-03-10 12:02:49 +08:00
CaiWenzhi f78d05c85f Merge branch 'develop' into develop_nutty_modify_framework_for315CrashFixed 2014-03-10 11:49:15 +08:00
James Chen eca0bce1be Merge pull request #5633 from huangml/patch-1
closed #4319: Node::removeAllChildrenWithCleanup() does not remove PhysicsBody.
2014-03-10 10:55:54 +08:00
CaiWenzhi 8d3f33bb30 Merge branch 'develop' into develop_nutty_modify_framework_for315CrashFixed 2014-03-10 09:58:26 +08:00
James Chen 2784955845 Merge pull request #5636 from dumganhar/iss3290-onenter-order
closed #3290: The order of onEnter / onExit  work correctly on JSB and LuaBindings.
2014-03-08 22:35:09 +08:00
James Chen 7aec578b35 closed #3290: The order of onEnter works correctly on JSB and LuaBindings. 2014-03-08 22:07:55 +08:00
andyque 82fcf939d0 fix ease elastic action error 2014-03-08 21:51:17 +08:00
黄梦龙 8b737d8aab Update CCNode.cpp
removeAllChildrenWithCleanup() not remove PhysicsBody
2014-03-08 17:42:35 +08:00
CaiWenzhi 80d97bb107 Modify action 2014-03-07 21:49:24 +08:00
minggo c291cb32a0 Merge pull request #5624 from Dhilan007/develop_label
label:fixed vertical alignment is incorrect.
2014-03-07 21:07:09 +08:00
James Chen 84a76db060 Merge pull request #5622 from pandamicro/MotionStreakFix
closed #4294: Added unimplemented position getter/setter in MotionStreak.
2014-03-07 19:10:02 +08:00
pandamicro 2427314a65 Issue #4294: MotionStreak: Improve position setters 2014-03-07 19:06:51 +08:00
Dhilan007 4905acfa0b label:fixed vertical alignment is incorrect. 2014-03-07 18:31:33 +08:00
pandamicro e94cd2357d Issue #4294: Add override declaration 2014-03-07 18:11:37 +08:00
Huabing.Xu ad9c104cfd migrate saveToFile compatible with new renderer 2014-03-07 17:41:51 +08:00
CaiWenzhi 0c4bca9bb2 Merge branch 'develop' into develop_nutty_modify_framework_for315 2014-03-07 16:42:38 +08:00
pandamicro a005fa1dce Issue #4294: Add unimplemented position getter/setter in MotionStreak 2014-03-07 16:32:00 +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
minggo 4251bcf425 Merge pull request #5469 from natural-law/issue3991
Add method to reload cached texture & update the nodes used the texture.
2014-03-07 15:58:17 +08:00
heliclei 600c661acb remove script support 2014-03-07 15:12:46 +08:00
Dhilan007 c233b636cd closed #4301:Label support vertical alignment and assign dimensions. 2014-03-07 14:58:44 +08:00
CaiWenzhi 5ee35be0ad Merge branch 'develop' into develop_nutty_modify_framework_for315 2014-03-07 14:41:32 +08:00
James Chen 9b0c0ab44e Merge pull request #5616 from dumganhar/glview-refactor
Refactoring GLView for desktop platforms, and adding protected method `updateDesignResolutionSize` for GLViewProtocol class.
2014-03-07 14:15:20 +08:00
James Chen e0e9e1723c Merge pull request #5612 from Dhilan007/develop_label
fixed #4300:fixed Label:draw location and BBOX is incorrect.
2014-03-07 14:09:39 +08:00
James Chen 1cfd14f27d Tab -> 4 spaces, remove unused spaces for CCGLView.h 2014-03-07 14:03:57 +08:00
James Chen ae2f7a4a7d updateDesignResolution -> updateDesignResolutionSize. 2014-03-07 14:01:30 +08:00
James Chen d699f62193 Tab -> 4 spaces, remove unused spaces. 2014-03-07 13:59:56 +08:00
James Chen 49223fe50c Compilation error fixes for linux port (clang compiler). 2014-03-07 13:52:54 +08:00
James Chen 8b359dd90e Refactoring GLView for desktop platforms, and adding protected method `updateDesignResolutionSize` for GLViewProtocol class. 2014-03-07 13:51:12 +08:00
CaiWenzhi 58db7b5c75 Some widgets would be default enabled touch 2014-03-07 12:34:19 +08:00
CaiWenzhi 1606671224 Fixed bug of Text 2014-03-07 12:05:33 +08:00
Dhilan007 f0119ef62f fixed horizontal kerning is incorrect. 2014-03-07 12:03:45 +08:00
CaiWenzhi 51a6eb6d64 Fixed bug of Action Manger Ex 2014-03-07 12:01:51 +08:00
CaiWenzhi b4466fab12 Fixed bug of action manager 2014-03-07 11:58:54 +08:00
CaiWenzhi 0602410958 Merge branch 'develop' into develop_nutty_modify_framework_for315 2014-03-07 11:51:28 +08:00
Dhilan007 063bde51c3 fixed #4300:fixed Label:draw location and BBOX is incorrect. 2014-03-07 11:42:13 +08:00
minggo 69d445efca Merge pull request #5525 from andyque/bug3868
fixed #3868. Add guard check to send method of HttpClient
2014-03-07 11:31:32 +08:00
CaiWenzhi f9ea39bf81 Merge branch 'develop' into develop_nutty_modify_framework_for315 2014-03-07 10:54:38 +08:00
CaiWenzhi 7cdfba088d Modify reader 2014-03-07 10:35:58 +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
Huabing.Xu 5c1be5f2ef Merge branch 'develop' into develop_fix_node_transform_bug
* develop:
  Improved documentation
  better doctrings
  fixes for linux
  small setup.py fixes
  Update CHANGELOG [ci skip]
  closed #4291:open CCEditBox as modal dialog
  Fixes 'schedule test/issue#2268' crashes
  closed #4150:  fix physics position/rotation tag bug.
2014-03-07 10:07:19 +08:00
Huabing.Xu 9fc6177570 fix bug for outdated transform status 2014-03-07 10:03:34 +08:00
Ricardo Quesada 57b6478de7 Improved documentation 2014-03-06 16:14:06 -08:00
Ricardo Quesada 77d19e9bc2 better doctrings
improved documentation for Node
2014-03-06 14:04:19 -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
zhangbin 56a46892fe closed #3991, Remove the method CCTextureCache::updateTexture(). 2014-03-06 17:38:18 +08:00
zhangbin 822ef8d588 Merge branch 'develop' into issue3991 2014-03-06 17:28:20 +08:00
CaiWenzhi 03f5be47da Modify for editor 2014-03-06 17:21:09 +08:00
boyu0 b926e4efad closed #4150: fix physics position/rotation tag bug. 2014-03-06 17:04:54 +08:00
CaiWenzhi b02ed6fb1e Merge branch 'develop' into develop_nutty_modify_framework_for315 2014-03-06 16:17:35 +08:00
CaiWenzhi bd5c11b5ee Modify mk file and solve warnings 2014-03-06 16:15:03 +08:00
CaiWenzhi 2a5ecc2376 Fixed bugs of Flipping 2014-03-06 13:40:46 +08:00
CaiWenzhi 3554dcd749 Merge branch 'develop' into develop_nutty_modify_framework_for315 2014-03-06 11:22:33 +08:00
zhangbin fec04dd6ae Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2014-03-06 11:03:49 +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
Ricardo Quesada 273d0d22f1 little performance improvement in quad command 2014-03-05 18:50:09 -08:00
James Chen 183622c718 'EventDispatcherTest/Issue 4129' crashes on Windows. 2014-03-06 10:45:29 +08:00
heliclei 73a3011b11 fix comments 2014-03-06 10:31:29 +08:00
heliclei 08d0cde490 Merge remote-tracking branch 'upstream/develop' into node-string-tag 2014-03-06 10:02:50 +08:00
zhangbin 6da0afdd03 Solve the crash in CocoStudioComponentsTest. 2014-03-06 09:23:27 +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 5e84c15812 Add RichText 2014-03-05 23:03:49 +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 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 7a4ba91f29 Modify project file 2014-03-05 17:08:59 +08:00
heliclei 55080d713b refactor string tag to name 2014-03-05 17:03:25 +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
Dhilan007 dfdf19daff remove unused shader and also did adjust FontAtlas::getTexture 2014-03-05 16:51:16 +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
James Chen 06cd98076a Merge pull request #5560 from dumganhar/develop
Some warning fixes in cpp-tests.
2014-03-05 15:26:56 +08:00
James Chen 20146c3ecb Merge pull request #5558 from Dhilan007/develop_label
close #4276:fixed crash on CocoStudioGuiTest->LabelBMFontTest.
2014-03-05 15:24:36 +08:00
James Chen 8e28400725 Some warning fixes in cpp-tests. 2014-03-05 15:04:47 +08:00
James Chen 9652da06f8 Merge pull request #5554 from koowolf/#5550_win
closed #4278: Upgrading kazmath to the latest version.
2014-03-05 14:58:24 +08:00
James Chen ec70d067d7 Merge pull request #5556 from boyu0/v3.0_final_test
Fix particle test->AddAndRemove test crash.
2014-03-05 14:53:05 +08:00
Dhilan007 c3c3e12ee6 close #4276:fixed crash on CocoStudioGuiTest->LabelBMFontTest. 2014-03-05 14:41:59 +08:00
boyu0 06faad7020 Fix partical test->add and remove particle system crash. 2014-03-05 14:32:22 +08:00
koowolf 3365280a0a build kazmath on win32 2014-03-05 14:30:55 +08:00
James Chen d1a0218a3b Merge pull request #5542 from pandamicro/myfix
Feature #4236: Refactor is/setFlipX/Y to is/setFlippedX/Y in gui classes
2014-03-05 12:45:41 +08:00
James Chen 02572da9dc Adds EventListenerTouchOneByOne::isSwallowTouches, fixes a typo for Director::EVENT_AFTER_UPDATE. 2014-03-05 11:28:21 +08:00
Ricardo Quesada 0d69617a6c Adds CC_DLL to kazmath for windows compatibility 2014-03-04 18:07:03 -08:00
samuele3 3edeba5001 Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into bug_fix 2014-03-05 09:52:37 +08:00
samuele3 53851151d9 fix:TimerScriptHandler can’t do anything in the `cancel` function 2014-03-05 09:51:57 +08:00
Ricardo Quesada f269ec1f8f Compiles on Linux 2014-03-04 17:24:04 -08:00
Ricardo Quesada c63f210e26 Compiles on Android 2014-03-04 16:59:39 -08:00
Ricardo Quesada 4fe3b16287 Updates to latest version of kazmath 2014-03-04 16:33:00 -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
heliclei cbec0f9a15 CCNode:Add String tag, to support runtime manipulation 2014-03-05 00:15:01 +08:00
heliclei 728d5f34de CCConsole: add script support 2014-03-05 00:07:30 +08:00
CaiWenzhi 5108d276b6 Modify trigger 2014-03-04 23:55:36 +08:00
pandamicro 364317b532 Feature #4236: Refactor is/setFlipX/Y to is/setFlippedX/Y in gui classes 2014-03-04 23:42:58 +08:00
James Chen bb86a9e350 Merge pull request #5517 from bmanGH/feature/fix_timer_cancel_bug
closed #4272: Timer::cancel always call Director::getInstance()->getScheduler() even in another Scheduler
2014-03-04 22:08:55 +08:00
minggo 6cb665b637 Merge pull request #5534 from dabingnn/develop_RenderTextureImprovement
Develop render texture improvement
2014-03-04 18:30:37 +08:00
Huabing.Xu 3d0cd62e12 add comment to make interface clearer 2014-03-04 17:34:48 +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
James Chen 98e1099370 Fixes crash of PerformanceTest/EventDispatcherTest. 2014-03-04 16:43:04 +08:00
Huabing.Xu 99d0ce160a rename setVirtualViewPort->setVirtualViewport 2014-03-04 15:41:36 +08:00
Huabing.Xu ec397611f6 remove blank line,adjust indent 2014-03-04 15:30:05 +08:00
Huabing.Xu 756024e9f1 implement interface setKeepMatrix, setVirtualViewPort 2014-03-04 15:07:28 +08:00
James Chen 5d1113aeea issue #4234: Fixes linking error in UI. 2014-03-04 13:49:54 +08:00
James Chen 387174d633 issue #4234: Acceleration -> const Acceleration& 2014-03-04 13:42:36 +08:00
James Chen 5c70548742 issue #4234: 'Event* event' needs to be in 'TouchScriptData' struct. 2014-03-04 13:42:06 +08:00
Huabing.Xu 68130fb4d0 fix matrix push/pop bug 2014-03-04 11:06:39 +08:00
Huabing.Xu a759d9ae60 calculate viewport based on _fullRect _rtRect and _fullRectViewport 2014-03-04 10:57:57 +08:00
Huabing.Xu 7949cb2cd9 add interface for keep Matrix 2014-03-04 10:41:03 +08:00
andyque 629c6b9a89 fixed #3868. Add guard check to send method of HttpClient 2014-03-04 10:07:49 +08:00
Ricardo Quesada 8bdfce9bbe Merge branch 'develop' into visit_draw_improved 2014-03-03 17:31:29 -08:00
Ricardo Quesada 81f5254e15 Removes setNormalizedPosition
This funciton is useful, but the code is buggy.
In should check the parents' position instead of Director::Size()
Let's do it correctly, and then re-add this function
2014-03-03 16:08:30 -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
CaiWenzhi c09b139fee Fixed bug of loadingbar 2014-03-03 23:46:47 +08:00
CaiWenzhi c615811124 Modify methods of Changing color and opacity. 2014-03-03 23:24:57 +08:00
bmanGH d0f8dbd4be Fix Timer::cancel always call Director::getInstance()->getScheduler() even in another Scheduler; 2014-03-03 19:12:59 +08:00
minggo d207670011 Merge pull request #5501 from nutty898/develop_nutty_modify_framework_for315
Develop nutty modify framework for315
2014-03-03 18:09:32 +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
James Chen bd3efebb26 Merge pull request #5513 from 2youyouo2/develop
fixed CocoStudioTest/ArmatureTest crashes.
2014-03-03 16:15:51 +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
yinkaile 8f1ba73a52 fixed add ParticleSystem display crashed 2014-03-03 14:56:56 +08:00
boyu0 fdcbfa2eca closed #4150: add const to getPosition/RotationOffset method. 2014-03-03 14:35:44 +08:00
CaiWenzhi 23a51c7c84 Merge branch 'develop' into develop_nutty_modify_framework_for315 2014-03-03 13:45:53 +08:00
James Chen 1d2d2df1e9 issue #4165: Adds missing deprecated methods in Scheduler class. 2014-03-03 11:57:36 +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 04663b4a9c closed #4165: Updates comments. 2014-03-03 11:12:04 +08:00
James Chen 09c0bae4a1 closed #4165: Deprecates old methods: Scheduler::(un)scheduleSelector, Scheduler::isScheduleForTarget. 2014-03-03 11:07:48 +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
boyu0 c99b0a0b6a closed #4150: Fix missing "!" 2014-03-03 01:48:56 +08:00
cai wenzhi a6e4a5e5aa Adjust layout 2014-03-02 22:41:47 +08:00
cai wenzhi 683d3c9f14 Merge branch 'develop' into develop_nutty_modify_framework_for315 2014-03-02 19:28:44 +08:00
James Chen dceb047ba6 TimerTargetCallback::initWithLambda -> TimerTargetCallback::initWithCallback. 2014-03-02 18:43:17 +08:00
James Chen f3949e078b [EventDispatcher] Adds 'pauseEventListenersForTarget', 'resumeEventListenersForTarget' and 'removeEventListenersForTarget'. 2014-03-02 17:41:18 +08:00
James Chen 30d7130eb0 closed #4160: Out of range exception in EventDispatcher 2014-03-02 16:16:03 +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
cai wenzhi 4f90676e92 Add method for editor 2014-03-01 22:34:25 +08:00
Ricardo Quesada 219ef6d897 removes CC_TEXTURE_ATLAS_USE_TRIANGLE_STRIP support
It was never used. And it is slower.
2014-02-28 22:09:18 -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 3588041409 removed empty spaces 2014-02-28 16:39:04 -08:00
Ricardo Quesada 9d501479c1 removes unused ivar from ParticleSystemQuad 2014-02-28 16:19:27 -08:00
Ricardo Quesada da8e571862 shaders set in the correct position 2014-02-28 16:14:55 -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 13b60c8759 Applies Wu Hao's patch for 2.5D 2014-02-28 13:48:00 -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
andyque 46c93f07ad fixed #4103. fix crash when websocket close 2014-02-28 17:32:54 +08:00
James Chen b5ca9f21d1 Merge pull request #5482 from andyque/fix3868
fixed #3868: Possible crash on repeat running between HttpClientTest, WebSocketTest, SocketIOTest
2014-02-28 16:57:33 +08:00
James Chen ec4a4466b4 Merge pull request #5461 from Wilhansen/spine_skelFix
closed #4156: spine::Skeleton would not be updated after re-adding to scene.
2014-02-28 16:34:35 +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 5244cb93ed closed #4150: Delete PhysicsBodyInfo::set/getPosition/Rotation method. 2014-02-28 15:50:38 +08:00
boyu0 015180bf62 issue #4150: Add physics position/rotation test 2014-02-28 15:47:49 +08:00
James Chen d33017f27a issue #4129: Adds default argument(nullptr) for dispatchCustomEvent. 2014-02-28 15:40:45 +08:00
boyu0 a934d29c57 issue #4150: Correct body position with the node has a parent. Add set/getPosition/Rotation method. 2014-02-28 15:31:25 +08:00
James Chen 7774bb4c6c closed #4129: Event listeners in engine shouldn't be removed by method removeAllEventListeners(). 2014-02-28 15:09:53 +08:00
James Chen bbc1c385c2 issue #4129: EventTouch::getTouches return const reference. 2014-02-28 15:08:18 +08:00
James Chen 7fcc9f02d7 Merge pull request #5490 from natural-law/issue3684
closed #3684: Set shader program before TextureAtlas is rendered.
2014-02-28 13:55:07 +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
James Chen 658cf72d31 issue #4129: Uses 'const reference' when getting touches by EventTouch::getTouches. 2014-02-28 13:43:28 +08:00
James Chen 8a04fbabf1 issue #4129: EventDispatcher::_listeners -> _listenerMap. 2014-02-28 12:01:47 +08:00
zhangbin ddf5957a9c closed #3684, Set shader program before TextureAtlas is rendered. 2014-02-28 11:43:41 +08:00
Ricardo Quesada 8ebf00fec1 SpineDrawing fixes 2014-02-27 19:40:21 -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 5ff60485a4 issue #4118: set body update after physics step. 2014-02-27 20:23:23 +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
minggo 8d47d5f16a return immediately when no changing 2014-02-27 15:12:57 +08:00
boyu0 b63641c7a5 issue #4118: delete physicsSetPosition/Rotation method and add physics position/rotation tag. 2014-02-27 14:36:09 +08:00
boyu0 f400c1ac68 issue #4118: edit contact test and fix node setPhysicsBody bug 2014-02-27 13:35:37 +08:00
andyque d4b9544365 fixed #3868. when the singleton destoryed, the cocos thread may later than that which will cause the s_responseQueue to be nil. 2014-02-27 11:25:44 +08:00
James Chen dc6eca19c0 Merge pull request #5476 from dumganhar/iss4116-split
closed #4116: Remove script-bindings codes, move it to 'cocos2d/cocos2d-js' and 'cocos2d/cocos2d-lua' repo.
2014-02-27 10:27:48 +08:00
boyu0 75ec508f0a issue #4118: improve performance. add Node and Sprite physicsSetPosition and physicsSetRotation method. 2014-02-27 09:45:35 +08:00
Huabing.Xu cd7b075900 closed #3874: fix bug, blendID should be shifted by 50 bits 2014-02-27 09:27:33 +08:00
heliclei fe574616f3 fix console loop 2014-02-26 23:51:45 +08:00