axmol

Commit Graph

Author	SHA1	Message	Date
andyque	54e93f6c41	fix ObjectFactory refactor issue	2014-06-04 14:56:34 +08:00
minggo	cb10fb560a	not treat warnings as error	2014-06-04 09:44:34 +08:00
minggo	4b979d67db	issue #5429 : treat warning as error on Mac	2014-05-30 16:46:01 +08:00
minggo	70f3510a27	issue #5429 : treat warning as eror on iOS	2014-05-30 16:21:31 +08:00
minggo	d7cca2a044	closed #4819 : remove KeyboardTest	2014-05-28 18:31:00 +08:00
minggo	0acc4cd961	issue #4819 : remove KeyPadTest	2014-05-28 18:17:22 +08:00
minggo	0ad0f9c405	issue #4819 : remove AccelerometerTest	2014-05-28 18:10:37 +08:00
andyque	769300d25e	rename UILayout Executant.h to UILayoutManager.h	2014-05-28 10:17:34 +08:00
minggo	866a1cb9aa	Merge pull request #6820 from newnon/v3_android_improvements Android project improvements	2014-05-27 10:17:03 +08:00
andyque	634fea7c45	Merge remote-tracking branch 'upstream/v3' into refactor5183	2014-05-26 09:18:32 +08:00
Ricardo Quesada	5601048829	Fixes compiler warnings for mac and ios	2014-05-22 16:34:16 -03:00
samuele3hu	a6efd4f650	Move `setSearchPat` operation from cpp to script	2014-05-22 14:00:39 +08:00
samuele3hu	6c8e38871c	issue #5255:Remove Sprite3D effect test	2014-05-22 10:22:10 +08:00
Dale Stammen	3971666426	updated pch file for wp8	2014-05-20 10:06:24 -07:00
Sergey	49f26f3fbf	lua template & android-build.py updated	2014-05-20 13:49:02 +04:00
andyque	b6373b5303	Merge branch 'v3' into refactorLayout	2014-05-20 09:30:23 +08:00
andyque	a03a565863	issue #5138 , add Groups in Xcode	2014-05-19 14:11:39 +08:00
andyque	5ddfc41414	Merge branch 'v3' into refactorLayout Conflicts: build/cocos2d_libs.xcodeproj/project.pbxproj	2014-05-19 13:54:16 +08:00
Mazyad Alabduljaleel	9bf7ec3c20	Cleanup project file. [REM]: old library references. New libraries are under prebuilt.	2014-05-19 09:08:35 +04:00
Ricardo Quesada	6461e26c9f	Squashed commit of the following: commit 64722e414c6cacc108fa6015d6af84bd9a4d79ec Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Sun May 18 14:03:53 2014 -0700 More WP8 fixes commit 7934be32741cddee6d04cd4f32c7e9718ba83b4c Merge: c2b1619 fea335f Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Sun May 18 12:19:41 2014 -0700 Merge branch 'mesh3d' of github.com:ricardoquesada/cocos2d-x into mesh3d commit c2b1619005b5a62ef77afe727429584d6a57010e Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Sun May 18 12:19:19 2014 -0700 Adds missing resources for Windows Phone 8 commit fea335f573f975d9d2f6eafeb3ad4d3ea8095ee5 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Sun May 18 11:54:15 2014 -0700 Updates CHANGELOG commit b8b93da914de97662c9df55cfc351ad8b74ea779 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Sun May 18 11:48:59 2014 -0700 Adds Sprite3d files and tests commit 059c842938e19068427bb2276d52f3e0ea1cc51f Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Sun May 18 11:16:13 2014 -0700 fixes compiler warnings for windows commit d3299f4cf443c9603f9120e431dbcb6ce8b8e26f Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Sun May 18 10:53:34 2014 -0700 fixes for Sprite3D Adds copyright header removes compilation warnings cleans code a bit commit 1377787a4bcebdf349f9de0a05c329066c6eb626 Merge: f89725f 9a3c2d0 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 20:46:26 2014 -0700 Merge pull request #34 from dumganhar/pull/6731 fix compilation error of missing bind Mesh for luabindings. commit f89725f65ca604efb9abbcfe336c9d50135016b2 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 20:45:12 2014 -0700 use const & and changed typo commit 9a3c2d0df9abcd76292cc1f71b6615931aa807d5 Author: James Chen <jianhua.chen@cocos2d-x.org> Date: Sat May 17 11:43:10 2014 +0800 fix compilation error of missing bind Mesh for luabindings. commit 59524b3850b27342f3cb4c390751bdf97362a794 Merge: `ee4ec94` 5c5a6b9 Author: James Chen <jianhua.chen@cocos2d-x.org> Date: Sat May 17 11:33:01 2014 +0800 Merge commit 'refs/pull/6731/head' of git://github.com/cocos2d/cocos2d-x into pull/6731 commit 5c5a6b9bde410027db948b539bc3111dc243cf0b Merge: d4285e3 5f41732 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 20:23:58 2014 -0700 Merge branch 'mesh3d' into mesh3d_work commit d4285e336808699f828b82c6b90a83b1b0c0978c Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 20:22:49 2014 -0700 remove empty lines commit 5f4173271101e2411ffb6cbf600066e204df98d3 Merge: e272583 ac8cf25 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 20:15:44 2014 -0700 Merge pull request #33 from dabingnn/mesh3d_work Mesh3d work commit ac8cf2571d92b03c9632d0415078d08526322289 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 20:14:01 2014 -0700 added mesh3d file to template commit e272583cb8a7f41d8d74dbf7d7db71584187a779 Merge: 6a1b847 5d3a955 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 19:10:45 2014 -0700 Merge pull request #32 from dabingnn/mesh3d_work Mesh3d work commit 5d3a95543f66f7ec90bf06e6e1761722b8a33cca Merge: 4feae11 `97cae73` Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 18:18:13 2014 -0700 Merge branch 'v3' into mesh3d_work commit 6a1b847065a1b9d369892ab011478c47e80c9195 Merge: 4feae11 4ece4b3 Author: Trace0429 <yangtuo0429@gmail.com> Date: Fri May 16 17:15:39 2014 -0700 Merge pull request #31 from Trace0429/mesh3d_work windows work now commit 4ece4b3255d84f2749298fdbdecc5ad0302c36a3 Author: Trace0429 <yangtuo@chukong-inc.com> Date: Sat May 17 08:12:46 2014 +0800 windows work now commit 4feae11577f64c3aff943af51adc37dcb987bdc1 Merge: 510fc0c fdf82d3 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 16:32:58 2014 -0700 Merge pull request #30 from dabingnn/mesh3d_work Mesh3d work commit fdf82d36d97ab68fdb7bab54241fdd94f18a53eb Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 16:32:00 2014 -0700 fix compile error after merge (MAC can work) commit 4bef832c3f4d5e5f3c19ca36f13ceba9e4ff1dbe Merge: 510fc0c `d19de29` Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 16:24:11 2014 -0700 Merge branch 'v3' into mesh3d_work Conflicts: build/cocos2d_libs.xcodeproj/project.pbxproj cocos/2d/cocos2d.vcxproj cocos/2d/cocos2d.vcxproj.filters cocos/Android.mk cocos/CMakeLists.txt cocos/renderer/CMakeLists.txt commit 510fc0cea76bdedfae858bb930d98715ce54f7e9 Merge: e098ed7 7fea347 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 16:11:39 2014 -0700 Merge pull request #29 from dabingnn/mesh3d_work Mesh3d work commit 7fea34782f30ef0498a7a993016f45fcb786b771 Merge: a8a409a e098ed7 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 16:08:01 2014 -0700 Merge branch 'mesh3d' into mesh3d_work commit a8a409a7d5280b1075eb6258ee556611a5cba7b3 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 16:05:37 2014 -0700 bind ARRAY_BUFFER and ELEMENT_ARRAY_BUFFER to 0 after draw commit e098ed7a5c187256be8313ec5d66294d3554c914 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 16:02:27 2014 -0700 bind buffer to 0 when finish draw commit d13f637a3777e81085e0285faf00105c58229d7c Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 14:00:38 2014 -0700 fix outline width commit 8a79c98b163ad862a2e09cbcc19a939f06556358 Merge: e208712 a0cf4ef Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 13:47:17 2014 -0700 Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d commit e20871233915f8b6010e59595c38793ec3d6956e Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 13:47:12 2014 -0700 make some member protected commit a0cf4efc48af801636a55d1c330fb6841896d33b Merge: c0b8902 8b723e8 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 13:06:17 2014 -0700 Merge branch 'mesh3d' of github.com:super626/cocos2d-x into mesh3d commit c0b89021cbbdb13db00b8844aac1f4ff9c90e968 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 13:04:27 2014 -0700 linux work now commit 8b723e82d81cbffd78e7378cab6d11df30baa044 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 12:48:34 2014 -0700 inc drawcall commit 5d0b6304b3e5c9bcb2354c3245511706438dc23c Merge: 1e7032b e783da9 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 12:31:44 2014 -0700 Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d commit e783da91fe6c14c8594d3da865e965256376dd10 Merge: 5da20fd 8f7a19a Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 12:31:31 2014 -0700 Merge pull request #28 from dabingnn/mesh3d_work Mesh3d work commit 1e7032b448bc79d76a445258f2b0c5bd6dba5fea Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 12:30:01 2014 -0700 optimize code commit 8f7a19a7b643ac63cbcd776095d6e8a2adb7ca64 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 12:29:37 2014 -0700 adjust code style commit 5da20fd2e75001451ec790f775fc4fe9cb87aa1b Merge: 659fbd6 553acfb Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 12:06:53 2014 -0700 Merge pull request #27 from dabingnn/mesh3d_work Mesh3d work commit 553acfb3ee685f5461a6d2a68779200abcca8670 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 12:06:02 2014 -0700 fix visual error for outline commit 659fbd652aa7f4c2d3629fe446051c3dd0377510 Merge: 056c3e1 c617bb7 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 11:54:54 2014 -0700 Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d commit 056c3e1394b9c1588395ac8a7f70db1e63c88c31 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 11:54:47 2014 -0700 fix shader, add multiple sprite to Sprite3DEffectTest commit c617bb74b6bc1e691ee488fd9ca43fa618710bfa Merge: 94d7896 7b19c56 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 11:33:31 2014 -0700 Merge pull request #26 from dabingnn/mesh3d_work Mesh3d work commit 7b19c564e4053ad883617873b11043df1fb98a45 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 11:30:34 2014 -0700 share the same glprogram in effect3DOutline commit 377d3bccd85dc566554c4fe7b529a9d0e82199e7 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 11:19:56 2014 -0700 add class static variable for EffectOutline commit d4913bf735dbc74a21bd8327af0b74325bbf9d1d Merge: 213bbb0 `6837cea` Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 11:07:04 2014 -0700 Merge branch 'v3' into mesh3d_work commit 213bbb0c289e579895e92620153b95a8cf374521 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 10:55:28 2014 -0700 add mesh.h in cocos2d.h commit 94d789610c9d4426b14e655a73197c652afc74f6 Merge: fa69e09 9af9da5 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 10:41:24 2014 -0700 Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d commit fa69e09ce0265b1fe3f4e76fa4dbc952abf17812 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 10:41:05 2014 -0700 remove namespace commit 9af9da50a91804d11537cffe0750e486cf95c8a5 Merge: ff15926 8a38a38 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 10:30:23 2014 -0700 Merge pull request #25 from dabingnn/mesh3d_work Mesh3d work commit 8a38a384742ba130946de8ad1759b61ed2f70495 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 10:27:28 2014 -0700 remove redundant uniform CC_Texture0 commit db80bf7c7597fd20a1ca5e4ca89ad067b527f034 Merge: ff15926 `511295e` Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 10:20:01 2014 -0700 Merge branch 'v3' into mesh3d_work commit ff15926f47edfbb1250440b060c1d887cfecd033 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 09:11:36 2014 -0700 warning more than one texture commit 5debbf8d6de4563361974b67aa52e572f7df9dd6 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 08:45:03 2014 -0700 remove redundant line commit ed357e7484a63bc3eb208d589943f802b7832e4d Merge: a1e2306 25dd07e Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Thu May 15 22:53:10 2014 -0700 Merge pull request #24 from dabingnn/mesh3d_work Mesh3d work commit 25dd07edb7005f593003e90120d6e6439686e5f6 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 22:52:33 2014 -0700 fix memory leak commit 945ae3444fc2d5eb7c6293960e9c11dfbc5b7cb3 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 22:49:04 2014 -0700 remove unused member variable commit a1e23064140328f4c9bbe434383ca6f25fcb7548 Merge: bac54fc 712e816 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Thu May 15 22:37:16 2014 -0700 Merge pull request #23 from dabingnn/mesh3d_work Mesh3d work commit 712e81606f2782ac41276c1e8a87d32217ac9d28 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 22:35:48 2014 -0700 fix memory leak commit bac54fce097edd4040b0a7cd522d15644e6b482a Merge: 8ed28c4 54538e8 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Thu May 15 20:01:49 2014 -0700 Merge pull request #22 from dabingnn/mesh3d_work Mesh3d work commit 54538e89a2bf33ad6936130d1cbb3ef153db01a5 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 20:01:29 2014 -0700 android work now commit a6cc0f77875e045d169758adf0cde87360f41475 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 19:53:39 2014 -0700 remove sprite3dEffect include commit d8482fda09d414de76d1dc1a28c0d0b8bcc5aa32 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 19:50:17 2014 -0700 remove unused Sprite3dEffect commit c5e2d5579daca64b0e9394a2b07613352847eca8 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 19:48:12 2014 -0700 remove unused outline shader files commit 09a100cf388d80aa1389d96994ae189cbb0652b2 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 19:43:17 2014 -0700 fix error on IOS commit 8ed28c4854d0b51ed0251f09c27a5ce328599ad5 Merge: d23ffe3 c0e8ea2 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Thu May 15 18:47:37 2014 -0700 Merge pull request #21 from dabingnn/mesh3d_work Mesh3d work commit c0e8ea26ff29fc6a3cd04e7f9e122d4ea0a67e2c Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 18:46:54 2014 -0700 adjust indent, and line to the end of the file commit 661ceb72831d6eccfa522a09cedf994541af6f88 Merge: 8e764e7 d23ffe3 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 18:35:18 2014 -0700 Merge branch 'mesh3d' into mesh3d_work Conflicts: cocos/3d/CCSprite3D.cpp cocos/3d/CCSprite3D.h tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.cpp commit 8e764e74dd019852a0ef35b257895a7e79cd9a14 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 18:31:06 2014 -0700 add testCase for outline commit c2ced288851892299fd7258e51f32303959b374d Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 18:03:34 2014 -0700 extract base class Effect3D commit d23ffe3167476d10740df321e579bf647a3698d0 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 18:02:45 2014 -0700 RendeMeshData member rename commit fb8f25553cd317a277c1b924da2c11b9f3188666 Merge: 73cb4b4 819db70 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 17:57:29 2014 -0700 Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d commit 819db702d5ffa9461fc9d1d232cea7d373536664 Merge: 2676911 b408f43 Author: Trace0429 <yangtuo0429@gmail.com> Date: Thu May 15 17:54:24 2014 -0700 Merge pull request #20 from Trace0429/mesh3d_work Mesh3d work commit 73cb4b444b222d34e135b0d09b426b9c73c1b790 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 17:54:03 2014 -0700 android meshcommand commit b408f4343e47766416b19a583bc6bb5167439693 Author: Trace0429 <yangtuo@chukong-inc.com> Date: Fri May 16 08:50:38 2014 +0800 windows work now commit afbde9c25cfcdc4a6600a9e7607bc9489ea6b6f9 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 17:38:41 2014 -0700 raw EffectSprite commit 2676911bb71ef92b3d9cf198021169d9e4466525 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 16:37:20 2014 -0700 remove SpriteEffect from Sprite3D commit 83dc4cfc3609d14024c3966e49ee34bf36bbd77f Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 16:34:36 2014 -0700 raw effectSpriteTest commit 39e372ef2037090317c9c4a2287b06cadf83c9c5 Merge: 734633e 6d27912 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 16:14:57 2014 -0700 use meshcommand commit 734633ec1ffc66e590b2ad2da94f6477d78146f2 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 15:38:30 2014 -0700 use meshcommand commit 4ec56afaa9a660e8eaad6afe18ffded8ca858eb1 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 15:31:43 2014 -0700 comment out effect framework commit 6d27912f148e03acc07da3e3b4d0c565af8afefa Merge: d6f6f63 61a9011 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Thu May 15 15:11:25 2014 -0700 Merge pull request #19 from dabingnn/mesh3d_work Mesh3d work commit 61a9011d6c78ea6918664bb608dc51344e0236e5 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 14:55:06 2014 -0700 fix compile error in testcases commit 5f2f585bb8584590ecd3ebcefbb49de45b8f4bed Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 14:52:43 2014 -0700 fix compile error after merge with v3 commit 1a0de47740be51e586cc5615bc28e44ec8a1fc47 Merge: d6f6f63 `760ee57` Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 14:48:19 2014 -0700 Merge branch 'v3' into mesh3d_work commit d6f6f633927eb00df984ec4239555f9ce2c7e44d Merge: c6fbd6e 76d2523 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Thu May 15 14:26:40 2014 -0700 Merge pull request #18 from dabingnn/mesh3d_work Mesh3d work commit 76d2523ae735384533a1e37f06e370cb3481b0f2 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 14:25:40 2014 -0700 move 3d shaders to shader cache commit 9b68032c809dc6667ffd5c1af37b7ad4d84fe2de Merge: 2c9a573 c6fbd6e Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 13:56:00 2014 -0700 Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d commit 2c9a5738c2d24c33d4994e8e44e32fcc8d9ceece Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 13:55:49 2014 -0700 meshcommand commit 0631a51c5d9c0aae55447105b962a888e1158cd3 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 13:21:36 2014 -0700 add mesh rebuild when come to foreground in android commit 8695016869ab56f3a046f488485f9fdfb6532417 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 13:13:59 2014 -0700 android work now commit c6fbd6e67d29b2fdfeed74f96de0ff5a6cdae1f5 Merge: cd7b235 0466a38 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Thu May 15 12:21:40 2014 -0700 Merge pull request #17 from dabingnn/mesh3d_work Mesh3d work commit 0466a38e77ca1bc6be09bf18b42a6290db8dace8 Merge: e349e4e cd7b235 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 12:19:24 2014 -0700 Merge branch 'mesh3d' into mesh3d_work commit e349e4e0a7047ed49c2bfa9b2e3e5cae5cbc8f67 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 12:18:49 2014 -0700 commit the changed IOS/MAC project file commit a7c9a65d5603622b1d40cc009dfceee60c376f50 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 12:17:57 2014 -0700 remove MeshPart commit cd7b235b5ec5b3ce21bc856888d383e6224fd047 Merge: e666045 3b7b406 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Thu May 15 11:03:54 2014 -0700 Merge pull request #16 from dabingnn/mesh3d_work Mesh3d work commit 3b7b406caff0b6f79fe044612a32e909f778d1e3 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 10:59:10 2014 -0700 raw version of single Mesh commit e666045aa4768199c530f494f0a1fb402f2ce922 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 10:44:04 2014 -0700 fix outline commit 5d4f304c5f9e5b35dbb1d1176232ab5189c98c0e Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 10:09:45 2014 -0700 without normal no outline effect commit 3f6bd0ffbca804dd9ca6776c8cc2b37643911d63 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 22:39:03 2014 -0700 android listenBackToForeground commit 6bec670319ea154474c32c941c250bc3909a7e2e Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 21:58:09 2014 -0700 add boss1 with normal commit 35c1b8d5fcec188cbef92457e24721ae53820328 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 21:54:20 2014 -0700 change cache commit 076166fba142d5432bbadaf3e75d6c35bcb6905a Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 21:35:59 2014 -0700 depress no .mtl crash commit 498c9693a7e7009615382c5769b7493c3ff6be68 Merge: 8a63b49 d4fd946 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 15:58:50 2014 -0700 Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d commit 8a63b4959cbb5e2b749d7f63f5b4ebe2bc5a6970 Merge: b4a8fee f395cc5 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 15:58:36 2014 -0700 merge dabingnn commit d4fd946fc8afdc95741f6a170e489d3dca9e2519 Merge: f395cc5 a17f074 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Wed May 14 15:53:58 2014 -0700 Merge pull request #15 from dabingnn/mesh3d_work Mesh3d work commit a17f074302d10ff03881cba7e634e094d31feb0a Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 15:52:58 2014 -0700 android can work now commit b4a8fee4b9735e16331a5656055572db9e551367 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 15:33:07 2014 -0700 refactoring render code commit f395cc50cdd8f2f15204ad9a126338d5c2fa72d2 Merge: f129e02 a2c12df Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Wed May 14 15:27:21 2014 -0700 Merge pull request #14 from dabingnn/mesh3d_work Mesh3d work commit a2c12df8d8908abe4dcb1a0c91711a28d9f05cac Merge: 1932e22 f129e02 Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 15:26:19 2014 -0700 Merge branch 'mesh3d' of github.com:super626/cocos2d-x into mesh3d_work commit 1932e22962a79530adf583f24070efcee32251d3 Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 15:25:55 2014 -0700 android can compile now(can not work) commit f129e02ef21a0d44b8517c53d8c6bed0aaf85def Merge: ae2aa0d c0d9097 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Wed May 14 14:21:09 2014 -0700 Merge pull request #13 from dabingnn/mesh3d_work Mesh3d work commit c0d90973c2b87582e99966256c74dcdf23712d6a Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 14:15:16 2014 -0700 include Sprite3DEffect in the cocos2d header commit ae2aa0dd705bf1a961164f9059eec4e5c2281bb5 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 12:51:09 2014 -0700 outline sprite commit e7a542d9c95c145241314fc63fbe12ba0b80ec6a Merge: 1c76d4c 48e9f39 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 10:48:55 2014 -0700 meshvertexattrib work commit 1c76d4ca319c15dadd7243ce4230fa35dfb7a1bb Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 10:40:55 2014 -0700 use meshvertexattribute commit 48e9f3991dd7aafc90e99e1721d04f28d01f94e6 Merge: b70bf52 e0d87a9 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Wed May 14 09:41:57 2014 -0700 Merge pull request #12 from dabingnn/mesh3d_work Mesh3d work commit e0d87a99f42f808429917c8b586509ca75e8a5e2 Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 09:40:14 2014 -0700 remove compile error commit c445e07c895fc2352f1220459d91f41f77690cd8 Merge: b70bf52 `86fb75a` Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 09:31:14 2014 -0700 Merge branch 'v3' into mesh3d_work commit b70bf522ef139da670cf41791a3d0ddad3dfa1cc Merge: da24c48 5a2127d Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 00:25:47 2014 -0700 vertex attrib commit da24c48c981029493900bcd2143495e546faa75e Author: yangxiao <yangxiao@cocos2d-x.org> Date: Tue May 13 23:49:09 2014 -0700 mesh vertex attribute commit 5a2127d718e6a9cb9f2ca3e1ac353ce1e5c0ebfd Merge: d98adb7 5148f76 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Tue May 13 19:06:38 2014 -0700 Merge pull request #11 from dabingnn/mesh3d_work Mesh3d work commit 5148f76c43bf1e3dc5a49ad6bf112d166d6b1c93 Merge: 02deb39 d98adb7 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 19:05:40 2014 -0700 Merge branch 'mesh3d' into mesh3d_work commit 02deb399314f01ec1222d78f2383a65614e33a34 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 19:04:15 2014 -0700 fix texcoord y flipped commit d98adb7d9d906f8376e45a2ba57bffc4e17e1775 Merge: 300eb4e 946283b Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Tue May 13 18:35:08 2014 -0700 Merge pull request #10 from dabingnn/mesh3d_work Mesh3d work commit 946283b83218de893c727dc9780291fe1683a4f9 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 18:22:16 2014 -0700 added blendFunc commit 300eb4e31783452cf16b77f85c3ef6f9dba19fc6 Merge: da7d6a0 ccc0baf Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Tue May 13 16:03:01 2014 -0700 Merge pull request #9 from dabingnn/mesh3d_work Mesh3d work commit ccc0bafd32b3375c2fe2163e0eb32714d06f8525 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 16:01:59 2014 -0700 fix compile error after merge commit 5bfc30b2b930131d23058d99a6862061c2217f38 Merge: da7d6a0 `0171e27` Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 15:56:46 2014 -0700 Merge branch 'v3' into mesh3d_work commit da7d6a087f22f4a11827ff3410fbcd2561f155fc Merge: 0caad32 f413b4e Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Tue May 13 14:19:24 2014 -0700 Merge pull request #8 from dabingnn/mesh3d_work Mesh3d work commit f413b4e55764d27863ae6978f1dbb2a0a3ca35e0 Merge: f47cfc6 0caad32 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 14:17:01 2014 -0700 Merge branch 'mesh3d' into mesh3d_work commit f47cfc67041ed4655a916623a6731876758a5182 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 14:15:06 2014 -0700 add new interface for createSprite3D commit 0caad32f2aa40c45e42d5d61c83419ee06e65a97 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Tue May 13 13:58:35 2014 -0700 default GLProgram to object commit 901ccef93593e2c39cca190784b4fc9684dfa9d0 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 13:13:24 2014 -0700 remove compile warning commit a6f9cdfcdd001d4486eb8206c3bd9d85e9fc9bc8 Merge: 68bdd0b 3eef54c Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 13:01:20 2014 -0700 Merge branch 'mesh3d' into mesh3d_work commit 68bdd0be68e3a11bb7bc5312e61ba5fb628c439b Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 12:59:59 2014 -0700 rename init->initWithFile in Sprite3D commit 3eef54ca06c83f72e248ce91fe639a8446ef1be5 Merge: f719f45 1c8773c Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Tue May 13 12:58:23 2014 -0700 Merge pull request #7 from super626/mesh3d_tmp Mesh3d commit 1c8773c53ff0bb87cb249d6392a900cd572dac1e Merge: 23e8786 f719f45 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Tue May 13 12:56:06 2014 -0700 Merge branch 'mesh3d_tmp' into mesh3d commit f719f45aba37791ffdfe107569350a1af94cbeb0 Merge: 6bd3f28 1b76467 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Tue May 13 11:59:46 2014 -0700 Merge pull request #6 from dabingnn/mesh3d_work Mesh3d work commit 1b7646759d9efcdf0942a42c0c22964a99309853 Merge: 6bd3f28 87adf9d Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 11:53:17 2014 -0700 Merge branch 'mesh3d' into mesh3d_work commit 87adf9df61e76f765f78a2bae4ec980ffb73ce57 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 11:52:41 2014 -0700 adjust line indent and header file define commit 23e8786892b89e25d1add091a7c3bc618990e579 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Tue May 13 11:44:22 2014 -0700 using vbo commit 6bd3f28440eca3530379b4610d6f87cc88eb54c5 Merge: 56fc0f4 a239a7e Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Tue May 13 11:42:10 2014 -0700 Merge pull request #5 from dabingnn/mesh3d_work Mesh3d work commit a239a7e35a82f497c337d96a025125b92c8daefd Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 11:39:06 2014 -0700 add CCSprite3d include into cocos2d.h commit 8d580c28a084c1dab2a5ce925871f3361e6b970a Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 11:33:18 2014 -0700 remove cocos2d.h include in Sprite3DTest.h commit 56fc0f4cbccb07cda972efda302ff6689b958ab2 Merge: ab16a26 8bb75e3 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Tue May 13 11:28:47 2014 -0700 Merge pull request #4 from dabingnn/mesh3d Mesh3d commit 8bb75e3dd96131da1c2dd9bc622d7bdbb2ad0514 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 11:26:40 2014 -0700 fix compile error after rename commit 230a73132c09c66b449efbacbc417974616694c6 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 11:07:30 2014 -0700 rename FileXXX to CCFileXXX commit ab16a26376f7deddf1a82f3085668e3fd9f09a12 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Tue May 13 10:52:36 2014 -0700 rename _model to _mesh commit 92ac7f75d06ad081282bbddcad5920a1f7584264 Merge: 6b911b5 df147d1 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Mon May 12 22:23:59 2014 -0700 Merge pull request #3 from dabingnn/mesh3d Mesh3d commit df147d14ddb8e61d907a44c6f03f404c8a68103f Author: Huabing.Xu <dabingnn@gmail.com> Date: Mon May 12 22:21:22 2014 -0700 fix retain/release in sprite3D commit 0b38939fd79168699ab737a8dc8e97c9417cf4ce Author: Huabing.Xu <dabingnn@gmail.com> Date: Mon May 12 20:04:16 2014 -0700 remove compile warnings commit 090f81b8198d18bc0b31bbba28c3e2e6d73e9f92 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Mon May 12 19:16:25 2014 -0700 using glprogramstate work ok commit 0b4f36a964c28f5f4b3224522f27402e0efbe123 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Mon May 12 18:38:52 2014 -0700 add obj commit e8917d7427f3ff0e7c3d874b908e0058adecf2f7 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Mon May 12 18:33:23 2014 -0700 use glprogramstate commit 6b911b52c86cd79e1fd3efc0536a5ca7ab04ab7a Author: yangxiao <yangxiao@cocos2d-x.org> Date: Mon May 12 13:01:56 2014 -0700 sprite3d commit 2a490c344f2db27d467506cf28c910410bb892e6 Merge: 23a5232 01b015d Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Mon May 12 10:52:17 2014 -0700 Merge pull request #1 from dabingnn/newcode Newcode commit 01b015d1238c89b6837ea276a95ce359cf0da5a7 Merge: 23a5232 `5d24b3d` Author: Huabing.Xu <dabingnn@gmail.com> Date: Mon May 12 10:50:14 2014 -0700 Merge branch 'v3' into newcode commit 23a5232fe5bb4c0b0bc821d1945426486dafe253 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Mon May 12 09:44:41 2014 -0700 3d mesh initial code	2014-05-18 14:49:16 -07:00
Ricardo Quesada	a1243ca9ed	Squashed commit of the following: commit 8342086a358287a77d6f6bf8dd6e2ae0a488aef7 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 17:37:58 2014 -0700 little fixes in project commit 832397c96cc63523a2ad0490ac9d8ad3e3bf7d5d Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 17:33:11 2014 -0700 CopyTemplates working commit 8c1555cb0369bf123f84733839ef30c30f70f4ff Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 17:22:05 2014 -0700 Re-adds CopyTemplate to VS solution commit fef2ad65596fd0ff60846e3a0b09dfea82c692a4 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 16:40:22 2014 -0700 Updated shaders and project fixes	2014-05-16 17:38:52 -07:00
Ricardo Quesada	0f67247325	Squashed commit of the following: commit a794d107ad85667e3d754f0b6251fc864dfbf288 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 14:33:49 2014 -0700 Yeah... everything compiles on win32 and wp8 commit 4740be6e4a0d16f742c27996e7ab2c100adc76af Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 13:58:38 2014 -0700 CCIME moved to base and compiles on Android commit ff3e1bf1eb27a01019f4e1b56d1aebbe2d385f72 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 13:02:57 2014 -0700 compiles Ok for Windows Phone 8 commit 8160a4eb2ecdc61b5bd1cf56b90d2da6f11e3ebd Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 12:25:31 2014 -0700 fixes for Windows Phone 8 commit 418197649efc93032aee0adc205e502101cdb53d Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 11:15:13 2014 -0700 Compiles on Win32 commit 08813ed7cf8ac1079ffadeb1ce78ea9e833e1a33 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 10:08:31 2014 -0700 Compiles on linux! commit 118896521e5b335a5257090b6863f1fb2a2002fe Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 09:30:42 2014 -0700 moves cocos/2d/platform -> cocos/platform commit 4fe9319d7717b0c1bccb2db0156eeb86255a89e0 Merge: bd68ec2 `511295e` Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 08:24:41 2014 -0700 Merge remote-tracking branch 'cocos2d/v3' into files commit bd68ec2f0e3a826d8b2f4b60564ba65ce766bc56 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Thu May 15 19:36:23 2014 -0700 files in the correct directory	2014-05-16 14:36:00 -07:00
andyque	967c071c68	issue #5183 , refator LayoutExecutant	2014-05-14 18:24:23 +08:00
andyque	8c8f9611f7	issue #5183 , add CCLayoutExecutant file	2014-05-14 18:03:44 +08:00
samuele3hu	ee4e5e4800	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_fix	2014-05-14 14:45:15 +08:00
samuele3hu	534ad2aafb	fix the compile error in Xcode 4.6 for mac platform which trigger by the Architectures’ value	2014-05-14 14:43:10 +08:00
Nite Luo	fca0ec696f	Undo project file changes	2014-05-12 23:32:19 -07:00
Nite Luo	7d8cfc4cca	set parent transform dirty when addChild	2014-05-12 23:28:20 -07:00
Nite Luo	e1f82c174b	add TestCase for reparentChildren bug	2014-05-12 22:50:31 -07:00
Dale Stammen	5c5b0184ab	updated winrt shader compiler app to latest version	2014-05-12 09:23:48 -07:00
minggo	9ab2dae212	Merge pull request #6635 from dumganhar/iss4660-unicode issue #4660: ccUTF8 uses utf8-utf16 conversion in llvm3.4	2014-05-12 17:57:25 +08:00
andyque	9a8c87601c	Merge branch 'v3' into refactor5057	2014-05-12 15:52:47 +08:00
James Chen	a61b1097db	issue #4660 : Adds ConvertUTFWrapper.cpp, using llvm::ConvertUTF8toWide and llvm:: convertUTF16ToUTF8String	2014-05-10 19:24:03 +08:00
James Chen	e84ccc8914	issue #4660 : Updates Xcode project	2014-05-10 19:24:03 +08:00
Ricardo Quesada	77c03fcf11	ShaderCache -> GLProgramCache	2014-05-09 18:39:25 -07:00
Ricardo Quesada	fec1b82c0a	Shader files use STRINGIFY	2014-05-09 16:45:42 -07:00
Trace	0b8aed3536	Merge branch 'improved_glprogram' of https://github.com/super626/cocos2d-x into improved_glprogram	2014-05-09 11:51:00 -07:00
Trace	88f1d8ac4e	Add ShaderTest sample and shader code	2014-05-09 11:48:11 -07:00
Ricardo Quesada	6727c6d19c	Adds missing files to xcode	2014-05-09 11:45:12 -07:00
Ricardo Quesada	78dd92a7ef	Merge remote-tracking branch 'cocos2d/v3' into improved_glprogram Conflicts: build/cocos2d_libs.xcodeproj/project.pbxproj	2014-05-09 11:40:13 -07:00
andyque	d12a71f738	issue #5057 , refactor UILayoutDefine	2014-05-09 17:16:11 +08:00
andyque	c5a505ec4c	issue #5057 , Merge branch 'v3' into refactor5057 Conflicts: cocos/ui/CocosGUI.h	2014-05-09 15:39:02 +08:00
yangxiao	95e036dd1b	GLProgramStateCache	2014-05-08 21:54:49 -07:00
Dhilan007	c904fff9eb	update XCode project.pbxproj	2014-05-09 11:37:14 +08:00
Ricardo Quesada	62d9c24518	moves shaders files from 2d/ to renderer/	2014-05-08 18:01:48 -07:00
Ricardo Quesada	51f498fc94	fixed deprecation warnings	2014-05-08 16:42:36 -07:00
Ricardo Quesada	453b670ad2	Removes CCVertexAttribBind	2014-05-08 14:01:26 -07:00
Ricardo Quesada	087378926f	Merge remote-tracking branch 'cocos2d/v3' into improved_glprogram Conflicts: build/cocos2d_libs.xcodeproj/project.pbxproj	2014-05-08 10:16:09 -07:00
Dhilan007	52d7d804f7	Update XCode project.pbxproj for add files related to VideoWidget.	2014-05-08 18:28:28 +08:00
andyque	0c2fd977ea	issue #5057 . add UIDeprecated.h and refactor FocusDirection to inner class of Widget and also simplify the enum value	2014-05-08 18:10:21 +08:00
minggo	9f0e25d808	Merge pull request #6628 from andyque/refactor5056 refactor 5056. pull gui tests from ExtensionTest to UITest	2014-05-08 17:00:38 +08:00
James Chen	bea98a1416	Lua xcode project fix	2014-05-08 15:09:02 +08:00
andyque	898a66131a	issue #5056 . move gui test from ExtensionsTest to the outside	2014-05-08 14:35:45 +08:00
Ricardo Quesada	b401f6adc1	Lots of new code Adds GLProgramState	2014-05-07 20:20:19 -07:00
yangxiao	bbd4533c5e	Improves GLProgram Adds vetex attrib bind class	2014-05-06 11:03:24 -07:00
andyque	cb5b2a4f85	issue #4861 , Merge branch 'v3' into focus3861 Conflicts: build/cocos2d_tests.xcodeproj/project.pbxproj	2014-05-05 17:40:28 +08:00
James Chen	67b2fbf14b	Updates xcode project, add ccs-res folder to Resources folder	2014-05-05 15:24:33 +08:00
James Chen	d82e03b048	Xcode project fix	2014-05-05 13:31:38 +08:00
andyque	a7fbd590dc	issue #4861 . add a horizontal focus test	2014-05-05 11:37:39 +08:00
andyque	47acbc24e0	issue #4861 , add CCEventFocus and CCEventListener	2014-05-05 11:37:38 +08:00
James Chen	530efbca7e	Reverts files for winrt project	2014-05-05 01:33:22 +08:00
James Chen	8cbcf17163	issue #4674 : Re-added deleted source files.	2014-05-04 14:37:55 +08:00
James Chen	3b3c1c4dbb	issue #4674 : Removed large files and updated .gitignore	2014-05-04 14:36:16 +08:00
Ricardo Quesada	8bb8416c26	Improved directory structure	2014-04-29 17:37:36 -07:00
Ricardo Quesada	81c2d92355	yeah... love in includes <3	2014-04-26 10:35:57 -07:00
Ricardo Quesada	9b118e5e96	Squashed commit of the following: commit 519fcd7f68e3586c376fd5e8d4a0ee220a48d225 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Sat Apr 26 10:10:06 2014 -0700 Updates templates files commit 2b07843ebe592f56b2abc544ccf66d441bb19fc5 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Sat Apr 26 10:08:19 2014 -0700 compiles on Windows commit b175522ef7205eaab3bd3f26c27c5d6514cbe2a4 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Sat Apr 26 09:55:30 2014 -0700 adds cocos2d.h commit 4c3d14f929bac017b93ca843b4f149d352264a30 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Sat Apr 26 09:54:24 2014 -0700 re-adds missing files commit f729181728959260d14c4152555534f5beec8e05 Merge: 148da79 2adac67 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Sat Apr 26 09:51:12 2014 -0700 Merge branch 'includes_fixes' of github.com:ricardoquesada/cocos2d-x into includes_fixes commit 148da79010c5dffeab885933624cffaf3d588852 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Sat Apr 26 09:49:12 2014 -0700 Adds SimpleAudioEngine commit 2adac67019180ec82b7bd03f0b67c12f62e29e77 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Sat Apr 26 09:47:45 2014 -0700 Compiles for Android commit 4a300d1b9225fa5708f25a69a50bb531f0ac1a32 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Sat Apr 26 09:13:35 2014 -0700 Fixes the includes	2014-04-26 10:11:22 -07:00
Huabing.Xu	feec24e3ef	Merge branch 'v3' into develop_migrate_math_lib_merge Conflicts: build/cocos2d_libs.xcodeproj/project.pbxproj cocos/2d/CCNode.cpp cocos/2d/CCRenderTexture.cpp cocos/2d/platform/wp8/CCGLView.h cocos/physics/CCPhysicsBody.cpp extensions/physics-nodes/CCPhysicsSprite.cpp extensions/physics-nodes/CCPhysicsSprite.h tests/cpp-tests/Classes/PhysicsTest/PhysicsTest.cpp	2014-04-25 16:20:24 +08:00
James Chen	037c57ef96	Merge branch 'develop' into perf-callback Conflicts: build/cocos2d_tests.xcodeproj/project.pbxproj	2014-04-25 12:07:48 +08:00
James Chen	477fc9f0e0	Merge commit 'refs/pull/6012/head' of git://github.com/cocos2d/cocos2d-x into pull/6012 Conflicts: build/cocos2d_libs.xcodeproj/project.pbxproj	2014-04-25 10:59:11 +08:00
James Chen	7beb8b78fe	Merge pull request #6325 from MSOpenTech/wp8-3.0-update Wp8 3.0 update： Background texture is now correctly oriented in Transition Effects Accelerometer now works for WP8. Refactor of InputEvents was required to support adding Accelerometer event to rendering queue. Console support for WP8. Fixed cpp template for WP8. Added missing projects. Fixed property sheets. Updates precompiled shaders	2014-04-25 10:41:58 +08:00
Huabing.Xu	7a38050e09	Merge branch 'develop' into develop_migrate_math_lib_merge	2014-04-21 17:47:34 +08:00
Huabing.Xu	68e058b12d	IOS/Mac OK: remove kazMath Make code compatible with old tests	2014-04-21 17:37:52 +08:00
andyque	a6b81ec772	issue #3333 , fix project unused link	2014-04-21 17:13:43 +08:00
Dale Stammen	f71178bac5	added missing files	2014-04-19 10:11:18 -07:00
Dale Stammen	1a56f435fe	added missing files	2014-04-19 09:32:12 -07:00
James Chen	ec40dda7f3	Adds performance test for callbacks: 1) std::function, 2) (target->*selector)(), 3) simulate new api of Scheduler	2014-04-16 10:35:58 +08:00
Huabing.Xu	c3bf78494a	remove CCFrustum.cpp, we will use new instead	2014-04-14 14:18:32 +08:00
Huabing.Xu	1670e07300	Merge branch 'develop' into develop_migrate_math_lib_merge Conflicts: build/cocos2d_libs.xcodeproj/project.pbxproj build/cocos2d_tests.xcodeproj/project.pbxproj	2014-04-11 11:18:13 +08:00
James Chen	0af6057996	issue #4729 : [ios/mac] Updates cocos2d_libs.xcodeproj	2014-04-10 00:36:42 +08:00
James Chen	2fc6c0150c	issue #4729 : iOS/Mac works fine	2014-04-10 00:36:41 +08:00
Darragh Coy	f147ef723a	Merge the alternate RefPtr<T> implementation Merge in the version at: https://github.com/DarraghCoy/cocos2d-x/blob/add_refptr_class_alt_impl/cocos/base/CCRefPtr.h This version sacrifices the ability to use forward references in some places in return for added type safety and ensures we can never assign a non cocos2d::Ref derived object to the pointer.	2014-04-07 16:04:00 -07:00
Huabing.Xu	f9405e0ea9	Merge branch 'develop' into develop_migrate_math_lib_merge	2014-04-03 17:47:16 +08:00
Huabing.Xu	1a454590e7	changed project file	2014-04-02 15:06:42 +08:00
James Chen	48839b9d4d	closed #4635 : ControlSwitch's marksprite is shown at a wrong place	2014-04-02 11:26:39 +08:00
James Chen	8ae82e2eb5	Fixed copying resource fails in empty-lua-test.	2014-04-01 20:06:43 +08:00
samuele3hu	6c92c10a67	update android-build.py for copying files about lua	2014-04-01 18:09:49 +08:00
minggo	7fb5e1f13a	Merge pull request #6066 from minggo/quadcommand-optimize use xxhash to generate material id	2014-04-01 11:27:51 +08:00
minggo	504eea0269	use xxhash to generate material id	2014-03-31 13:47:07 +08:00
minggo	6cc51a2cfc	Merge pull request #6057 from samuele3hu/develop_socket Add the omitted socket script for lua-tests	2014-03-31 10:15:38 +08:00
samuele3hu	219a91a641	Add the omitted socket script for lua-tests	2014-03-29 14:58:23 +08:00
Dale Stammen	039e746745	updated project dependencies	2014-03-28 16:12:00 -07:00
Dale Stammen	ffbaac5fa5	fixed project refs	2014-03-28 16:03:37 -07:00
Dale Stammen	7b25ffeb4e	added wp8 build files	2014-03-28 11:33:09 -07:00
Darragh Coy	036dc5542c	Add cocos2d::RefPtr<T> This class which acts a smart pointer type class for cocos2d::Ref objects. Can be used to help automate memory management and remove manual retain/release calls from code, resulting in less code and less chance of errors. Also useful to implement the RAII idiom in certain scenarios, ensuring that an object gets released upon exiting a scope.	2014-03-26 15:30:15 -07:00
CaiWenzhi	243b7e5822	Modify layout and add Boxes	2014-03-25 17:15:54 +08:00
CaiWenzhi	2dffcb9808	Add ProtectedNode and remove "addNode"	2014-03-25 14:28:58 +08:00
James Chen	f6b94d8c3e	Updates iOS/Mac project configuration, CCTweenFunc.h/.cpp was included to wrong target.	2014-03-24 10:23:21 +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
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	91d972ba87	rollback the scheme mode of projects	2014-03-20 17:01:21 +08:00
andyque	dd790ce54d	add id return value to LuaObjectCBridge	2014-03-20 16:59:18 +08:00
andyque	7ab639ec0f	fix lots compile warnings	2014-03-20 16:24:55 +08:00
andyque	2dcc600fa1	remove unused accelerometer	2014-03-20 14:29:05 +08:00
andyque	7ae77c9335	fix cocos2dx engine internal warnings	2014-03-20 10:58:04 +08:00
andyque	23c3fabeb2	fix box2d ios & mac library warnings	2014-03-20 10:18:56 +08:00
andyque	d7b3737605	fix cocos2d tests and lu-bdinings and cocos2d_libs project config warnings	2014-03-20 10:14:25 +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
boyu0	a54bfb223e	fix typo, add release condition link arguments.	2014-03-14 14:33:33 +08:00
boyu0	fddffae611	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into support_for_xcode_iphone_64bit_simulator	2014-03-14 14:21:52 +08:00
boyu0	38a1b13415	extract arm64 architectures form .a file, add condition link arguments.	2014-03-14 14:18:13 +08:00
James Chen	b893ca3378	Some fixes for android-build.py.	2014-03-14 12:52:43 +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
Ricardo Quesada	372c26b5ba	only active arch for DEBUG RELEAES compiles all valid archs	2014-03-12 08:40:04 -07:00
James Chen	611cccd3e7	[win32] HelloCpp -> cpp-empty-test, HelloLua -> lua-empty-test.	2014-03-12 15:59:48 +08:00
James Chen	dd87df1cbc	rename TestCpp to cpp-tests, TestLua to lua-tests in VS projects.	2014-03-12 15:30:21 +08:00
andyque	2c2a5ee38e	rename gui to ui	2014-03-12 10:46:49 +08:00
andyque	d806274f98	change gui to ui	2014-03-12 10:12:02 +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
Ricardo Quesada	8f7fd3e13c	Deployment iOS >= 5.1.1 (needed for ARM64) Adds also Valid signature = iOS Developer	2014-03-11 10:18:38 -07:00
James Chen	8feccc45ee	Updates win32 project.	2014-03-11 21:52:03 +08:00
James Chen	8c56b11819	Updates Xcode project and adds scheme for xcbuild.	2014-03-11 19:27:55 +08:00
James Chen	431e800dd6	All tests could run on Android.	2014-03-11 19:10:36 +08:00
James Chen	3d5c3001bd	cpp-empty-test works ok for Android.	2014-03-11 19:10:36 +08:00
James Chen	91a3ba61da	lua-empty-test, cpp-empty-test work for iOS/Mac	2014-03-11 19:10:36 +08:00
James Chen	fda8cfa740	plist rename.	2014-03-11 19:10:35 +08:00
James Chen	36e9f55c98	Renames cocos2d_samples to cocos2d_tests, what could i say?	2014-03-11 19:10:09 +08:00
James Chen	69fc09d715	Removes xcscheme for test project.	2014-03-11 19:10:09 +08:00
James Chen	f23bb8c9c1	Adds lua-hello samples, it works on iOS / Mac .	2014-03-11 19:10:09 +08:00
James Chen	c156a1df04	Removes unused configuration for Xcode.	2014-03-11 19:10:09 +08:00
andyque	b95bba56d8	update vs2012 project dependency	2014-03-11 18:48:28 +08:00
andyque	032ca5f309	rename cocosgui resource to cocosui	2014-03-11 18:48:27 +08:00
andyque	cbcc1bbbcf	let ios project compile correct	2014-03-11 18:48:26 +08:00
James Chen	fd44277e7c	lua-tests works again for Win32.	2014-03-10 17:05:35 +08:00
James Chen	6deadf34b8	lua-tests works again for Android.	2014-03-10 16:04:46 +08:00
James Chen	705ab115b8	Reuse the resources in cpp-tests.	2014-03-10 15:40:48 +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
James Chen	2e473027c1	Re-add xcode 'scheme' files.	2014-03-10 11:58:33 +08:00
James Chen	ab1b10169e	Compilation error fixes for Linux and Android.	2014-03-10 11:54:26 +08:00
James Chen	218dc822e1	Updates win32 project configuration.	2014-03-10 11:23:35 +08:00
James Chen	11dc78a57b	cocos2d_tests -> cocos2d_samples	2014-03-10 10:46:44 +08:00
James Chen	f9ecaa3274	Deletes xcode xcschemes temporarily.	2014-03-10 10:30:48 +08:00
James Chen	4475209277	Renames 'cocos2d_tests.xcodeproj' to 'cocos2d_samples.xcodeproj'	2014-03-10 10:27:16 +08:00
CaiWenzhi	62dfe630c7	Add custom widget	2014-03-07 15:36:45 +08:00
CaiWenzhi	8b7a5c3141	Add RichText sample	2014-03-06 20:52:29 +08:00
CaiWenzhi	5e84c15812	Add RichText	2014-03-05 23:03:49 +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	db4d163806	update android build script since it only has testcpp now	2014-03-05 20:36:37 +08:00
CaiWenzhi	7a4ba91f29	Modify project file	2014-03-05 17:08:59 +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
Ricardo Quesada	4fe3b16287	Updates to latest version of kazmath	2014-03-04 16:33:00 -08:00
CaiWenzhi	4a2dc4a607	Add custom widget and reader	2014-03-04 16:51:35 +08:00
James Chen	b2cebebbaf	issue #4129 : Remove unused references in Xcode project.	2014-02-28 15:40:03 +08:00
James Chen	801e981286	issue #4116 : Updates iOS / Mac projects.	2014-02-26 22:27:38 +08:00
James Chen	e4837e7f94	issue #4116 : Removes script-bindings codes.	2014-02-26 21:34:06 +08:00
samuele3hu	a765178a5f	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developDynamic	2014-02-24 09:38:08 +08:00
James Chen	c5bf3950bc	closed #4107 : Director::setAnimationInterval could not work on Mac platform. Also removed unused files (CCDirectorCaller.h/.mm).	2014-02-21 11:55:37 +08:00
samuele3hu	555ef20202	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developDynamic Conflicts: cocos/scripting/lua/bindings/LuaBasicConversions.h cocos/scripting/lua/bindings/lua_cocos2dx_physics_manual.cpp	2014-02-21 10:10:20 +08:00
samuele3hu	3532665520	issue #3956:Change tolua_fix.c to tolua_fix.cpp and modify the toluafix_pushusertype_ccobject function to get real type of object	2014-02-21 09:45:33 +08:00
James Chen	450d30b164	Merge pull request #5040 from martell/mingwclang closed #3809: Added clang support for Windows	2014-02-20 20:24:36 +08:00
James Chen	0d8846d876	closed #4097 : Adds a macro to disable inserting script binding relevant codes.	2014-02-20 16:40:46 +08:00
James Chen	5e6130c92c	issue #4058 : Get rid of Object ,rename it to Ref.	2014-02-20 10:53:49 +08:00
Dhilan007	dfc6522f5c	update XCode project for add miss file on Mac and IOS.	2014-02-19 17:11:28 +08:00
andyque	f16b0022a3	move CCActionEaseEx content to CCActionEase	2014-02-18 14:22:13 +08:00
andyque	895b2a0055	move CCActionEaseEx and CCTweenFunction to core engine	2014-02-18 14:22:12 +08:00
James Chen	297fe597e1	Updates mac / iOS project.	2014-02-18 11:08:27 +08:00
James Chen	78163e604e	Merge pull request #5358 from dumganhar/merge5343 closed #4037:Exposed the missing data structures of Spine to JS	2014-02-14 11:17:38 +08:00
James Chen	a5aa547c7b	Merge pull request #5316 from natural-law/ScenarioTest closed #3738: Add performance test case on game scenario.	2014-02-14 11:12:01 +08:00
James Chen	9d764718f9	issue #4037 : Removes unused files from Xcode setting.	2014-02-14 10:26:27 +08:00
James Chen	acefa4e237	Merge commit 'refs/pull/5343/head' of git://github.com/cocos2d/cocos2d-x into merge5343	2014-02-14 09:33:42 +08:00
James Chen	fb4699359d	Merge pull request #5326 from Dhilan007/develop_label issue #3821: Moving platform-dependent codes of LabelTTF from cocos2d::Image to cocos2d::Device.	2014-02-14 09:24:11 +08:00
James Chen	c8ec90781c	Merge pull request #5351 from heliclei/xcode-scheme share xcode build schemes to support xcodebuild command line build	2014-02-14 09:09:07 +08:00
Dhilan007	0d5c702708	move labelttf's platform-dependent code from CCImage to CCDevice	2014-02-13 21:08:43 +08:00
heliclei	1154c28516	share xcode build schemes to support xcodebuild command line build	2014-02-13 18:11:24 +08:00
ucchen	2c961bdfbf	add spine manual binding;	2014-02-13 11:01:54 +08:00
James Chen	a255478127	[Linux] Installs libssl-dev package.	2014-02-13 10:08:03 +08:00
Éloi Rivard	79e3c05ef1	Minor debugging messages and guards. Dependencies installation is skipped on linux distributions that does not use .deb package format.	2014-02-13 01:25:23 +01:00
Éloi Rivard	3fb2b61591	Linux local storage support. Depends on libsqlite3-dev	2014-02-13 00:53:51 +01:00
Ricardo Quesada	1836375468	schemes are no longer shared	2014-02-12 08:26:22 +08:00
zhangbin	89cc82c332	Merge branch 'develop' into ScenarioTest	2014-02-10 14:26:31 +08:00
zhangbin	926f84d385	issue #3738 , Add game scenario performance test case.	2014-02-10 11:42:15 +08:00
Ricardo Quesada	24f655f9b1	Better 'vertices drawn'	2014-02-09 19:31:45 -08:00
Ricardo Quesada	ceba63db8b	Merge branch 'develop' into fast_tmx	2014-02-08 09:08:33 -08:00
Ricardo Quesada	616feadda1	More fixes and "tiles" is an uint32 (GID)	2014-02-07 18:11:17 -08:00
heliclei	e081ea2dc4	add xcode shared schemes	2014-02-07 14:46:36 +08:00
Ricardo Quesada	9a53f5a9f5	Testing a new TMX renderer faster	2014-02-04 17:59:21 -08:00
James Chen	bed6777673	issue #3828 : Don't package Test_info.plist for `TestJavascript Mac` target.	2014-02-01 12:20:38 +08:00
James Chen	a4e7d2b658	issue #3828 : Icon resources should be packaged. Only XXX_info.plist should not be packaged. If it was packaged, it would cause problem of running on simulator.	2014-02-01 12:18:22 +08:00
James Chen	d0a44cd57e	issue #3828 : Don't copy resources in test-xxx/proj.ios(mac)/xxx.png(.plist) in project configuration. This will fix the issue that application installed to iOS simulator can't be launched.	2014-02-01 11:55:46 +08:00
Ricardo Quesada	e77d22a58f	samples -> tests	2014-01-31 14:09:28 -08:00
Ricardo Quesada	5fde81d1e2	cocos2d-samples -> cocos2d-tests	2014-01-31 11:13:48 -08:00
Ricardo Quesada	5691829b72	Linux with #ifdef	2014-01-30 17:10:18 -08:00
Ricardo Quesada	7da8c84a75	Renames EGLView -> GLView	2014-01-30 16:51:43 -08:00
Ricardo Quesada	862500f99a	Renames EGLView -> GLView	2014-01-30 15:40:56 -08:00
Ricardo Quesada	4ed2e0d9d2	Merge branch 'develop' into glview_improvements Conflicts: CHANGELOG cocos/2d/platform/linux/CCApplication.cpp samples/Cpp/AssetsManagerTest/Classes/AppDelegate.cpp samples/Cpp/HelloCpp/Classes/AppDelegate.cpp samples/Cpp/HelloCpp/Classes/AppMacros.h samples/Cpp/HelloCpp/proj.ios/AppController.mm samples/Cpp/HelloCpp/proj.mac/main.cpp samples/Cpp/SimpleGame/Classes/AppDelegate.cpp samples/Cpp/SimpleGame/proj.ios/AppController.mm samples/Cpp/SimpleGame/proj.mac/main.cpp samples/Cpp/TestCpp/Classes/AppDelegate.h samples/Javascript/CocosDragonJS/Classes/AppDelegate.cpp samples/Javascript/CocosDragonJS/proj.ios/AppController.mm samples/Javascript/CocosDragonJS/proj.mac/main.cpp samples/Javascript/CrystalCraze/Classes/AppDelegate.cpp samples/Javascript/CrystalCraze/proj.ios/AppController.mm samples/Javascript/CrystalCraze/proj.mac/main.cpp samples/Javascript/MoonWarriors/Classes/AppDelegate.cpp samples/Javascript/MoonWarriors/proj.ios/AppController.mm samples/Javascript/MoonWarriors/proj.mac/main.cpp samples/Javascript/WatermelonWithMe/Classes/AppDelegate.cpp samples/Javascript/WatermelonWithMe/proj.ios/AppController.mm samples/Javascript/WatermelonWithMe/proj.mac/main.cpp samples/Lua/HelloLua/Classes/AppDelegate.cpp samples/Lua/HelloLua/proj.ios/AppController.mm samples/Lua/HelloLua/proj.mac/main.cpp	2014-01-28 11:32:25 -08:00
James Chen	6988d48d08	issue #3828 : Updates win32 projects.	2014-01-28 15:49:23 +08:00
James Chen	ffd8970996	issue #3828 : Updates android build.	2014-01-28 15:33:23 +08:00
James Chen	ebe22aaeec	issue #3828 : Fix a mistake in android-build.py.	2014-01-28 15:17:34 +08:00
James Chen	5d67d53393	issue #3828 : Updates android build.	2014-01-28 15:14:27 +08:00
James Chen	d1d447b52e	issue #3828 : Updates iOS & Mac projects. And update JS-Tests.	2014-01-28 12:55:06 +08:00
Ricardo Quesada	b96c4f1ad0	Only compile iOS files on iOS	2014-01-27 16:44:10 -08:00
Ricardo Quesada	efaec7b7ec	Merge branch 'develop' into glview_improvements Conflicts: samples/Lua/HelloLua/Classes/AppDelegate.cpp template/multi-platform-lua/Classes/AppDelegate.cpp	2014-01-27 10:52:35 -08:00
James Chen	6a302735d8	Removes unused files.	2014-01-26 17:54:13 +08:00
andyque	96af336780	issue #3859 . update description of android-build.py	2014-01-26 16:22:09 +08:00
andyque	7f3a0216c2	issue #3859 . improve the prompt of android-build scripts	2014-01-26 16:10:51 +08:00
samuele3hu	cf684bc3f4	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developBug	2014-01-26 15:16:02 +08:00
minggo	b7d5d430a4	Merge pull request #5225 from dumganhar/iss3853-jsb-crash-debug-mode closed #3853: Some JSB projects(TestJavascript, WatermelonWithMe) crash in DEBUG mode on iOS platform.	2014-01-25 20:37:31 -08:00
samuele3hu	9b514927f5	issue #3837:Make `HelloLua` support to debug by the ZeroBrane Studio	2014-01-26 11:55:02 +08:00
James Chen	5b9f1697d3	closed #3853 : Some JSB projects(TestJavascript, WatermelonWithMe) crash in DEBUG mode on iOS platform. Don’t define `DEBUG` macro in our projects since all third party libraries(e.g. Spidermonkey) were built in RELEASE mode.	2014-01-26 11:16:25 +08:00
James Chen	7069a5afa9	Merge pull request #5218 from Dhilan007/develop_crash fix get_num_of_cpu on win32.	2014-01-24 21:26:32 -08:00
Dhilan007	3a09cdfe2e	fix get_num_of_cpu on win32.	2014-01-24 18:34:02 +08:00
samuele3hu	58eab72d26	issue:Add luasocket's support for lua	2014-01-24 17:24:10 +08:00
Ricardo Quesada	8ecaf49f93	GLView improvements it is not longer a singleton it is possible to specify the size	2014-01-23 15:36:55 -08:00
Ricardo Quesada	6b8781241c	code is cleaner	2014-01-22 13:51:01 -08:00
Ricardo Quesada	83f16e25e3	merge from develop	2014-01-22 11:44:48 -08:00
Ricardo Quesada	1b6dfcda40	Merge branch 'develop' into cceglview_in_desktop Conflicts: build/cocos2d_libs.xcodeproj/project.pbxproj	2014-01-22 11:21:16 -08:00
Dhilan007	4095ab36b6	update xcode project.	2014-01-22 15:22:46 +08:00
James Chen	32572e257e	issue #3677 : File rename. PerformanceEventDispatcher.h/.cpp -> PerformanceEventDispatcherTest.h/.cpp.	2014-01-22 14:10:42 +08:00
James Chen	cecb20f824	issue #3677 : Adds EventDispatcher performance test.	2014-01-22 13:33:40 +08:00
James Chen	0ab5ec742a	closed #3808 : Removes unused files for MAC platform after using glfw3 to create opengl context	2014-01-22 10:16:34 +08:00
Ricardo Quesada	1113587f47	mac/CCEGLView moved to desktop/	2014-01-21 17:52:30 -08:00
Ricardo Quesada	06be466f29	Removed unused code and files. Making the mac platform easier to mantain	2014-01-21 16:25:29 -08:00
Ricardo Quesada	98d23d30a6	First step in simplifying the mac platform	2014-01-21 15:44:01 -08:00
minggo	4833810c6e	Merge pull request #5132 from minggo/iss3713-replace_CCObject remove Object::_autoReleaseCount	2014-01-21 02:26:40 -08:00
minggo	6378d10d5d	issue #3713:add test case for autorelease pool	2014-01-21 17:47:59 +08:00
James Chen	ccecaeb94f	Merge pull request #5125 from Dhilan007/develop_label close #3765:Simplify label.Remove FontAtlasFactory,FontDefinition and TextImage.	2014-01-21 00:58:21 -08:00
minggo	a6ec66c340	Merge pull request #5126 from liang8305/use_multiple_build_process get number of cpu, using multiple concurrent job processes;	2014-01-19 19:50:48 -08:00
Dhilan007	9f9e289f8c	update xcode project.	2014-01-20 11:30:35 +08:00
liang8305	bf99e10c10	get number of cpu, using multiple concurrent job processes;	2014-01-20 10:37:01 +08:00
Ricardo Quesada	5fcbf42356	GlobalZOrder is used for render priority... ...and not vertexZ Node::setGlobalZOrder() is used to change that. Node::setZOrder() -> Node::setLocalZOrder();	2014-01-18 11:38:06 -08:00
James Chen	d309ae76d0	issue #3628 : Adds missing files for iOS and Mac.	2014-01-17 11:13:40 +08:00
James Chen	4302f3886d	issue #2789 : Adds performance test for Vector and CCArray.	2014-01-17 10:02:12 +08:00
Huabing.Xu	21d586d4ca	Merge branch 'develop' into develop_renderer_tileMapTest * develop: (24 commits) Update CHANGELOG [ci skip] Update AUTHORS [ci skip] Update CHANGELOG [ci skip] More renderer optimizations [AUTO] : updating submodule reference to latest autogenerated bindings Update CHANGELOG [ci skip] Sprite: removed _hasChildren Compilation fix: Updates cocos_files.json and removes unused in template. use data.isNull() instead of !data.getBytes() Update VS project file. Updates CHANGELOG SpriteBatchCommand and ParticleBatchCommand use the BatchCommand Updates Xcode, Android and Linux project fixes #3720 Renderer performance fixes Console::log(format, va_args) is private fix compiling error Relieve inherit from LabelProtocol closed #3688, Solve the bug : LabelAtlas set a shorter string than before, the effect will be wrong. add check data valid in getStringFromFile ...	2014-01-16 12:47:32 +08:00
Ricardo Quesada	65602a4574	Updates Xcode, Android and Linux project with new BatchCommand	2014-01-15 16:06:47 -08:00
Huabing.Xu	19705fcf37	issue #3640 : add performance test->renderer LargeTileMap test	2014-01-15 11:27:57 +08:00
martell	66caa13550	Added clang support for Mingw64	2014-01-11 13:26:04 +00:00
James Chen	f5ae2bbacc	Merge pull request #4932 from boyu0/iss3401_physical_lua_binding issue #3401: physical lua binding	2014-01-06 23:48:47 -08:00
boyu0	cf146b32cf	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss3401_physical_lua_binding Conflicts: build/cocos2d_libs.xcodeproj/project.pbxproj cocos/scripting/lua/bindings/CCLuaStack.cpp cocos/scripting/lua/script/Cocos2d.lua cocos/scripting/lua/script/Cocos2dConstants.lua	2014-01-07 10:16:44 +08:00
Ricardo Quesada	d15768d630	Removes RELASE_NOTES	2014-01-06 16:28:24 -08:00
chengstory	b4118a7ccc	fixed #3582 1. add #include "cocostudio/CCComBase.h" into CocoStudio.h	2014-01-05 03:55:10 +08:00
chengstory	aae6d27c74	fixed #3582 1. revert ComRender::create(cocos2d::Node node, const char comName).	2014-01-05 03:11:32 +08:00
chengstory	bac600ab9f	fixed #3582 1. create Component By component Factory.	2014-01-05 02:22:32 +08:00
James Chen	052f24cceb	[ci skip] Updates TestLua project for iOS and Mac.	2014-01-04 17:33:21 +08:00
James Chen	4c3fa3da49	Merge pull request #4865 from dumganhar/testjs-bugfix Some fixes for TestJavascript	2014-01-03 23:34:08 -08:00
James Chen	046384ca1f	Uses blue folder for iOS & Mac resources to prevent adding new resources.	2014-01-04 14:22:57 +08:00
James Chen	9bb558ad46	Removes wrong resource in TestJavascript project.	2014-01-04 13:54:25 +08:00
James Chen	e65c6b8e53	Merge pull request #4841 from dumganhar/template-container-unit-test Template container unit test	2014-01-03 20:01:25 -08:00
James Chen	5072e63f89	issue #3577 : Updates project file for mac and ios.	2014-01-04 11:41:06 +08:00
chengstory	7f8224b621	Merge branch 'develop' into #3480 Conflicts: build/cocos2d_samples.xcodeproj/project.pbxproj	2014-01-03 19:36:22 +08:00
Dhilan007	8e2c51d31e	update vs project for split spine binding.	2014-01-03 15:29:50 +08:00
samuele3hu	07a3efb585	Update the lua test cases about the GUI	2014-01-03 10:39:19 +08:00
chengstory	77dca5958f	issue #3480 upload Samples resources.	2014-01-03 02:03:05 +08:00
samuele3hu	d802518413	Rename Cocos2dStudio.lua to CocoStudio.lua	2014-01-02 15:51:25 +08:00
samuele3hu	a2b706c87c	Rename some common script files to keep consistent	2014-01-02 15:18:32 +08:00
samuele3hu	b8d4010ae5	Develop branch adds lua trigger for CocoStudio	2014-01-02 12:00:37 +08:00
boyu0	0a06d93328	issue #3401 : physical lua banding script and auto script	2014-01-02 11:45:11 +08:00
CaiWenzhi	81bdfac795	Modify class name Label LabelBMFont LabelAtlas	2013-12-31 16:36:33 +08:00
heliclei	7696a5f2cc	move ghprb.py to tools/jenkins-scripts/	2013-12-30 21:40:28 +08:00
jiusheng	0cf0ad26d2	add github pull request builder for Jenkins	2013-12-30 21:11:32 +08:00
chengstory	8ae7ecff33	Merge branch 'develop' into #3457 Conflicts: build/cocos2d_samples.xcodeproj/project.pbxproj cocos/editor-support/cocostudio/CCSGUIReader.cpp cocos/editor-support/cocostudio/CCSGUIReader.h	2013-12-26 12:55:52 +08:00
James Chen	444389e92d	[GUI] Updates Mac project.	2013-12-26 10:44:41 +08:00
chengstory	8afdf88d25	Test triiger 3.0	2013-12-26 01:17:04 +08:00
CaiWenzhi	96279c12dc	Merge branch 'develop' into develop_nutty_modify_framework_newrender	2013-12-25 18:32:15 +08:00
yinkaile	d72c9d94d7	upload trigger code.	2013-12-25 17:40:54 +08:00
samuele3hu	45cfe00ec4	Modify iOS project set and some manual lua binding	2013-12-25 13:47:22 +08:00
CaiWenzhi	2ae8576e0f	Merge branch 'develop' into develop_nutty_modify_framework_newrender	2013-12-25 10:40:05 +08:00
chengstory	e4e22b52cb	Merge branch 'develop' into #3456 Conflicts: build/cocos2d_libs.xcodeproj/project.pbxproj cocos/editor-support/cocostudio/CCDataReaderHelper.cpp cocos/editor-support/cocostudio/CCSGUIReader.cpp cocos/editor-support/cocostudio/CCSSceneReader.cpp	2013-12-24 22:05:13 +08:00
chengstory	64f0987fea	issue #3456 ios test rapidjson.	2013-12-24 21:23:24 +08:00
James Chen	0305ff15db	Merge pull request #4625 from dabingnn/develop_NewClippingNode Develop new clipping node	2013-12-23 23:20:38 -08:00
James Chen	451d76f6b0	Merge pull request #4611 from dumganhar/spine-test Merge PR #4572, Spine JS test support.	2013-12-23 22:55:58 -08:00
Huabing.Xu	e7facf9f85	remove NewClippingNode feature function into ClippingNode	2013-12-24 14:08:57 +08:00
Huabing.Xu	24ac743a3c	remove class NewSpriteBatchNode	2013-12-24 11:03:59 +08:00
CaiWenzhi	6dd55921aa	Merge branch 'develop' into develop_nutty_modify_framework_newrender	2013-12-24 10:44:57 +08:00
Huabing.Xu	8d58e43ad2	remove Class NewSprite	2013-12-24 09:40:00 +08:00
James Chen	05f6a5b09b	Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into spine-test	2013-12-23 22:05:20 +08:00
James Chen	8c0f6ba80e	Adds `SpineTest` to iOS, Mac projects.	2013-12-23 21:13:23 +08:00
James Chen	cafebe7295	Merge commit 'refs/pull/4572/head' of git://github.com/cocos2d/cocos2d-x into spine-test Conflicts: build/cocos2d_libs.xcodeproj/project.pbxproj	2013-12-23 20:28:51 +08:00
Huabing.Xu	1dd2c1c20c	remove NewTextureAtlas	2013-12-23 20:11:50 +08:00
Huabing.Xu	487e0b21af	update Xcode project file& android.mk	2013-12-23 18:03:08 +08:00
CaiWenzhi	a19000b49f	Add samples	2013-12-23 15:35:35 +08:00
CaiWenzhi	9aa85d2bd6	Remove NodeRGBA inherit	2013-12-23 15:02:52 +08:00
Dhilan007	d1972b3d17	support generate APK by script in template project and unify help message for usage.	2013-12-22 17:48:35 +08:00
Ricardo Quesada	fd8c7e9a5d	Removes CCCamera Not needed anymore.	2013-12-20 19:24:56 -08:00
James Chen	0db2067f97	Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into new-spine	2013-12-20 20:11:41 +08:00
byeonggee.seo	d5ea2d22a5	undo my mistake	2013-12-20 19:45:50 +09:00
byeonggee.seo	ef1709bc3d	Add SpineTest to TestJavascript 1	2013-12-20 19:20:13 +09:00
byeonggee.seo	0a30a9a604	spine simple JS binding supported	2013-12-20 16:10:15 +09:00
Huabing.Xu	d51ad36613	Merge branch 'develop' into develop_gridNode * develop: (67 commits) Adds const in ShaderTest2.h Skew works again! [AUTO] : updating submodule reference to latest autogenerated bindings [AUTO] : updating submodule reference to latest autogenerated bindings Reverts submodule. Updates submodule of bindings-generator. Adds `std::for_each` test in invocation Reverts bindings-generator. fixed not render iterator in Sprite fixes update vs project for removes unneeded files getNodeToParentTransform fixes Node cleanup [AUTO] : updating submodule reference to latest autogenerated bindings Improves SpriteTest [AUTO] : updating submodule reference to latest autogenerated bindings Android and Linux fixes removes `using namespace std` from header file Removes unneeded files change play arguments ... Conflicts: cocos/2d/CCNode.cpp samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.cpp	2013-12-19 17:20:22 +08:00
byeonggee.seo	e673bd80bb	new spine runtime applied	2013-12-19 10:50:37 +09:00
Ricardo Quesada	903844c7bd	Removes unneeded files New functionality is merged into the 'official' classes	2013-12-18 11:44:45 -08:00
Ricardo Quesada	33c4f891a0	Adds 'CC' to renderer files	2013-12-17 18:41:09 -08:00
Huabing.Xu	25fc3d3c2a	Merge branch 'develop' into develop_gridNode * develop: (105 commits) update armature to new render iOS & Mac project fix. [AUTO] : updating submodule reference to latest autogenerated bindings use size_t replace unsigned int for record redeque::size returned value. issue #2171: Updates CMakeLists.txt. issue #2171: Binds New renderer classes, ignores NewTextureAtlas. issue #2171: Adds header files of renderer in cocos2d.h. issue #2171: Reorder renderer files for iOS & mac project. issue #2171: small fix in ccTypes.h issue #2171: Don’t ‘using namespace std;’ in header file. [AUTO] : updating submodule reference to latest autogenerated bindings issue #2171: Ignores Director::getFrustum. issue #2171: Fixing compilation errors for Linux port. issue #2171: NULL —> nullptr for Android warning of CCBAnimationManager.cpp. issue #2171: [New Renderer] Fixing compilation errors for Android. [Win32] fix argument type. - argument of interface is ssize_t. Update AUTHORS [ci skip] Update CHANGELOG [ci skip] Add mouse scrolling support for extension test issue #3341:fix Incorrect at TextureCache::addImageAsync for repeatedly execute for the same image ... Conflicts: cocos/2d/CCNode.cpp cocos/2d/cocos2d.vcxproj.filters samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.cpp	2013-12-17 18:16:05 +08:00
James Chen	d3a4dbab08	iOS & Mac project fix.	2013-12-17 16:34:05 +08:00
James Chen	5d248ef77a	issue #2171 : Reorder renderer files for iOS & mac project.	2013-12-17 15:40:17 +08:00
Huabing.Xu	6aa2908c13	rename： 1. class: GridNode->NodeGrid 2. function: setNodeGrid->setGrid getNodeGrid->getGrid setGridTarget->setTarget 3. file: CCGridNode.h&cpp->CCNodeGrid.h&cpp	2013-12-16 14:21:05 +08:00
Huabing.Xu	2be1a640fa	update Xcode project file	2013-12-13 10:58:31 +08:00
Ricardo Quesada	3b66d09bf5	Merge branch 'develop' into newRenderer	2013-12-10 11:10:55 -08:00
Ricardo Quesada	aa00137fde	Merge branch 'develop' into newRenderer	2013-12-09 11:10:00 -08:00
James Chen	8b69994d5c	issue #2790 : Removes CCBValue.	2013-12-09 17:55:56 +08:00
James Chen	d8061477c1	issue #2790 : Removes CCSort.h/.cpp from projects.	2013-12-07 14:21:01 +08:00
Ricardo Quesada	97fb43b8d7	Merge remote-tracking branch 'darkdukey/newRenderer' into newRenderer Conflicts: build/cocos2d_libs.xcodeproj/project.pbxproj	2013-12-06 11:19:12 -08:00
Ricardo Quesada	73b1e3bb9e	Merge branch 'develop' into newRenderer Conflicts: cocos/2d/CCLabelAtlas.cpp cocos/2d/CCSprite.cpp	2013-12-06 09:37:08 -08:00
Ricardo Quesada	dcf4eacd92	update project	2013-12-05 22:24:51 -08:00
minggo	19c86c0e4f	Merge pull request #4434 from martell/msys2 Msys2 and Mingw added fixed x64 cocos/audio on Windows for MSVC and MinGW	2013-12-05 22:23:45 -08:00
Ricardo Quesada	e699a3b765	Uses MV in Quad Command	2013-12-05 19:04:01 -08:00
Nite Luo	42de943662	Fix Bug for Sprite performance test	2013-12-05 14:25:45 -08:00
Ricardo Quesada	f68dcd9969	Merge branch 'develop' into newRenderer Conflicts: build/cocos2d_libs.xcodeproj/project.pbxproj samples/Cpp/TestCpp/Classes/tests.h	2013-12-05 11:47:46 -08:00
James Chen	b0af2667f8	Merge commit 'refs/pull/4433/head' of git://github.com/cocos2d/cocos2d-x into ccconsole Conflicts: cocos/scripting/auto-generated	2013-12-05 12:48:32 +08:00
minggo	ba62c88682	Merge pull request #4420 from dumganhar/iss2790-template-container [ci skip]issue #2790: (ONLY FOR REVIEW NOW)Template Containers for Reference counted classes, Value for Pure Data	2013-12-04 20:06:24 -08:00
martell	e5ada6f377	added support for msys2 mingwtoolchains and fix x64 cocos/audio on windows platform for MSVC and Mingw. Also fixed a few very bad type casts very important for future Arm64 bit processors	2013-12-05 03:37:27 +00:00
Ricardo Quesada	f42aef0af8	Moves CCConsole.* to base/	2013-12-04 18:09:23 -08:00
James Chen	3649530f97	issue #2790 : Moves CCValue.h/.cpp to base folder.	2013-12-04 16:02:54 +08:00
James Chen	3136ffc3dd	issue #2790 : Adds CCValue.h/.cpp.	2013-12-04 16:02:51 +08:00
James Chen	d2bddee11e	issue #2790 : Adds CCMap.h.	2013-12-04 16:01:56 +08:00
James Chen	80004548c8	issue #2790 : Adds CCVector.h to Xcode project. int —> long	2013-12-04 15:56:08 +08:00
boyu0	98779b0a9f	issue #2771 : move CC_USE_PHYSICS from project definition to ccConfig.h	2013-12-04 14:36:32 +08:00
Ricardo Quesada	a34352cef7	Console is working!	2013-12-03 18:46:54 -08:00
Nite Luo	6862d59bb2	Add NewRenderTexture to convert RenderTexture to use new renderer	2013-12-02 17:23:52 -08:00
Nite Luo	fbadb3329a	Merge branch 'develop' into newRenderer Conflicts: build/cocos2d_libs.xcodeproj/project.pbxproj	2013-12-02 10:55:31 -08:00
Ricardo Quesada	dbcae0af1e	Merge branch 'develop' into console	2013-12-02 09:57:53 -08:00
martell	1a94e393af	Setup for testing for every windows user	2013-11-30 09:36:22 +00:00
boyu0	cfe522283c	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into upgrade_box2d_to_2.3.0	2013-11-28 12:19:07 +08:00
boyu0	1c55c207bf	update project setting	2013-11-28 11:55:18 +08:00
boyu0	72f2d68edd	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2771_physical	2013-11-27 17:47:37 +08:00
boyu0	2b43e72e7c	issue #2771 : fix vs compile errors, change project setting	2013-11-27 17:33:33 +08:00
Huabing.Xu	ea46e1c658	change test case	2013-11-27 14:30:38 +08:00
Ricardo Quesada	534fd9600e	Adds CCConsole. it doesn't work... just the skeleton	2013-11-26 18:58:36 -08:00
Huabing.Xu	3da196ea43	add Frustum culling to new Sprite	2013-11-27 10:35:12 +08:00
Nite Luo	92b57c79ba	Merge branch 'develop' into newRenderer Conflicts: cocos/2d/CCClippingNode.h cocos/2d/CCLayer.h	2013-11-26 11:56:03 -08:00
minggo	6c7cb0bf23	Merge pull request #4359 from Dhilan007/androdi_build [ci skip]add proceed java compilation and generate apk.	2013-11-26 01:47:14 -08:00
boyu0	99d904363a	issue #2771 : delete all the box2d implementation in physics parts.	2013-11-26 13:47:42 +08:00
Dhilan007	881d43fe3b	add proceed java compilation and generate apk.	2013-11-26 11:58:01 +08:00
Nite Luo	19b8ba89e2	Merge branch 'develop' into newRenderer	2013-11-25 10:21:02 -08:00
boyu0	e55c81c9b6	upgrade box2d from 2.2.1 to 2.3.0	2013-11-25 14:50:11 +08:00
boyu0	f2dabe77ec	issue #2771 : add some method implements with box2d in PhysicsWorld	2013-11-25 10:08:52 +08:00
Nite Luo	b67ec6618f	Finish converting LayerColor start working on particle system	2013-11-22 17:14:24 -08:00
samuele3	3a69ee301b	issue #3228 : Resolve TestLua and HelloLua test samples compile error on the Xcode 4.6.2 when choose Mac platform	2013-11-22 14:06:48 +08:00
Nite Luo	f438e83104	Merge branch 'develop' into newRenderer	2013-11-20 11:14:28 -08:00
Ricardo Quesada	0d750cdbaf	Adds virtual destructors on Interfaces Classes with at least one virtual function needs a virtual destructor. This patch adds virtual destructors to Interface classes And also enables 'warn on missing virtual destructors'	2013-11-19 16:57:23 -08:00
Nite Luo	e5ebcb2845	Merge branch 'develop' into newRenderer	2013-11-18 10:22:16 -08:00
Dhilan007	8b14575d7e	bind gui and studio.	2013-11-18 16:54:52 +08:00
Nite Luo	c5f9434331	Merge branch 'develop' into newRenderer	2013-11-15 11:33:38 -08:00
Nite Luo	566767da60	Add NewDrawNode	2013-11-15 11:29:11 -08:00
samuele3	ec9bc0069f	Modify template of lua ios_mac config and some bugs	2013-11-15 13:48:34 +08:00
Nite Luo	a70cad8c97	Merge branch 'develop' into newRenderer	2013-11-14 10:36:43 -08:00
Nite Luo	4f1858fa8a	Crate NewClipping Node	2013-11-14 10:35:28 -08:00
Nite Luo	f17af1f319	Add group command	2013-11-13 17:31:12 -08:00
samuele3	26c3266711	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCCS	2013-11-13 10:15:24 +08:00
Nite Luo	37d3601fd0	Merge branch 'develop' into newRenderer	2013-11-12 11:56:17 -08:00
Nite Luo	ab8b61aaec	Create NewSpriteBatchNode to use NewRender	2013-11-12 11:18:49 -08:00
Dhilan007	d43bc3f75d	remove unnecessary print	2013-11-12 17:53:23 +08:00
Dhilan007	e182328d51	fix incomplete copy resource	2013-11-12 16:25:39 +08:00
samuele3	cfb1cfdf65	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCCS Conflicts: cocos/editor-support/cocostudio/CCSGUIReader.h	2013-11-12 15:30:36 +08:00
Ricardo Quesada	a5eeff4f4f	fixes for android create improves the message. fixes some grammar errors	2013-11-11 16:09:32 -08:00
Nite Luo	a28f3f6f03	Merge branch 'develop' into newRenderer	2013-11-11 12:04:28 -08:00
minggo	b868c3f1dc	Merge pull request #4173 from minggo/remove-makefile [ci skip]remove makefiles	2013-11-11 02:19:16 -08:00
minggo	1e15071dc7	remove makefiles	2013-11-11 17:29:48 +08:00
samuele3	7cfe890d5d	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCCS	2013-11-11 17:04:37 +08:00
samuele3	06c7d3e96d	issue #2868:Add ccd lua test samples	2013-11-11 17:03:43 +08:00
James Chen	20b350a58b	Removing cocosjs_manual_conversions.h(.cpp). Put all jsval <-> native value conversion codes to js_manual_conversions.h(.cpp).	2013-11-11 16:45:44 +08:00
James Chen	4fba832fb1	Return non-zero if ndk build fails.	2013-11-09 21:05:17 +08:00
Nite Luo	fa9d8fe077	Add CustomCommand	2013-11-08 12:06:39 -08:00
Nite Luo	be71eb8626	Merge branch 'develop' into newRenderer Conflicts: .gitignore build/cocos2d_libs.xcodeproj/project.pbxproj build/cocos2d_samples.xcodeproj/project.pbxproj cocos/2d/CCDirector.cpp	2013-11-07 17:24:57 -08:00
samuele3	16d572c04f	issue #2868:Add manual lua binding files	2013-11-07 23:22:11 +08:00
Nite Luo	3108d499e5	use placeholder logic to generate material id	2013-11-06 14:24:56 -08:00
CaiWenzhi	7a207431cd	Merge branch 'develop' into develop_nutty_Mergemasterbranchtodevelopbranch Conflicts: cocos/gui/UIHelper.h	2013-11-06 16:13:10 +08:00
CaiWenzhi	e0aa82da13	Merge master branch to develop branch	2013-11-06 16:04:06 +08:00
James Chen	c364c4f083	issue #3113 : Updating CMakeLists.txt, Improve Copying files.	2013-11-06 10:57:36 +08:00
samuele3	b9e5d4bc91	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCCS	2013-11-05 17:37:54 +08:00
samuele3	61d8f9673c	issue #2868:Move armature related lua binding from namespace 'cc' to namespace 'ccd'	2013-11-05 17:34:25 +08:00
samuele3	b76865c692	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCCS	2013-11-05 15:11:05 +08:00
samuele3	b445f0824a	issue #2868:Bind UI and Scene parser to lua by bindings-generator and add releated test samples	2013-11-05 15:09:51 +08:00
Ricardo Quesada	2f0a19c7a3	Enables more warnings in Xcode project	2013-11-04 16:30:00 -08:00
Ricardo Quesada	ab6d620b3d	Disables arm64 for the moment	2013-11-04 15:11:20 -08:00
Ricardo Quesada	8fb5fad20d	Merge branch 'develop' into arm64	2013-11-04 15:02:35 -08:00
Ricardo Quesada	0350ac7021	arm64 support	2013-11-04 11:53:40 -08:00
Nite Luo	e4ffd250cb	Simple implementation of RenderCommand and RenderQueue	2013-11-04 09:14:22 -08:00
James Chen	bc251bcc95	[cmake] Update make-all-linux-projects.sh.	2013-11-04 21:03:09 +08:00
James Chen	733197fa65	[cmake] copy resources works.	2013-11-04 21:03:08 +08:00
James Chen	e560de6e4e	HelloCpp works.	2013-11-04 21:03:07 +08:00
minggo	b5838b800d	use python script to build template android projects	2013-11-04 16:48:17 +08:00
minggo	25b0ffe853	Merge pull request #4022 from boyu0/iss2771_physical issue #2771: physical	2013-11-03 18:40:14 -08:00
James Chen	6b8b1fb3c9	Update android-build.py Fixing wrong capital letter, `samples/JavaScript` --> `samples/Javascript`	2013-11-03 14:01:02 +08:00
boyu0	04c8e9f34e	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2771_physical	2013-11-02 00:12:14 +08:00
minggo	60b0b3c26e	Merge pull request #4061 from minggo/iss2905-adjust_folder better log	2013-11-01 03:26:01 -07:00
minggo	32c5755869	better log	2013-11-01 18:24:34 +08:00
minggo	d4210c77bb	Merge pull request #4058 from samuele3hu/developAssetsManager issue #3037:Add assetsmananger lua binding and a releated test sample	2013-11-01 02:50:47 -07:00
boyu0	6d37aa8cd5	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2771_physical	2013-11-01 17:39:09 +08:00
James Chen	c754e1b64f	Merge pull request #4035 from darkdukey/mousewheel_mac issue #3099: Adding MouseEvent and MouseListener, Adding Mouse Support For Desktop Platform.	2013-11-01 02:33:28 -07:00
samuele3	80f3a7d57a	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developAssetsManager Conflicts: build/cocos2d_samples.xcodeproj/project.pbxproj cocos/scripting/lua/bindings/LuaScriptHandlerMgr.h cocos/scripting/lua/script/Cocos2dConstants.lua	2013-11-01 17:17:21 +08:00
minggo	81c16d9a0e	fix a bug when building AssetsManagerTest	2013-11-01 17:03:15 +08:00
minggo	0a59d9eb3e	fix assetsmansger path	2013-11-01 16:44:04 +08:00
James Chen	9177f78e5e	Merge pull request #4046 from dumganhar/ios-mac-project-fix iOS and Mac project fix[ci skip]	2013-11-01 00:24:08 -07:00
James Chen	ed10b92a60	Fix of including wrong include files.	2013-11-01 15:19:10 +08:00
samuelhu	e93bcca13e	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developHttp	2013-11-01 14:44:21 +08:00
samuelhu	8580b16638	Modify let the libluajit.a of mac only support 64bit	2013-11-01 14:40:35 +08:00
samuelhu	b0fdb66d2d	Modify the all luajit build scripts and let libluajit.a of mac only support 64bit	2013-11-01 14:38:14 +08:00
minggo	be1afb502b	Merge pull request #4041 from minggo/iss2905-adjust_folder can run build-android.python in any path	2013-10-31 23:28:23 -07:00
minggo	d98c6f8de6	can run build-android.python in any path	2013-11-01 14:27:29 +08:00
samuelhu	f3ff7955a8	issue #3037:Modify platform build config	2013-11-01 11:18:02 +08:00
samuelhu	de4aaeda2d	issue #3049:Add XMLHttpRequest lua binding and corresponding test sample	2013-10-31 22:06:34 +08:00
samuelhu	4031556398	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developHttp Conflicts: build/cocos2d_samples.xcodeproj/project.pbxproj samples/Lua/TestLua/Resources/luaScript/mainMenu.lua	2013-10-31 21:57:24 +08:00
samuelhu	5891f00967	issue #3037:Add assetsmananger lua binding and a releated test sample	2013-10-31 21:52:28 +08:00
boyu0	dec749a692	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2771_physical	2013-10-31 18:20:32 +08:00
boyu0	2efef34144	issue #2771 : fix vs compile errors	2013-10-31 18:18:02 +08:00
samuelhu	faf3b30e9b	issue #3069:Add LuaObjectCBridge and related test sample	2013-10-31 15:20:53 +08:00
Nite Luo	fe04448c8d	Merge folder changes from develop	2013-10-30 23:19:36 -07:00
minggo	9e5420c954	Merge pull request #4029 from minggo/iss2905-adjust_folder use build/android-build to build android samples, and update readme	2013-10-30 03:30:03 -07:00
minggo	da9f7c912b	use build/android-build to build android samples, and update readme	2013-10-30 18:27:56 +08:00
minggo	93cde4d814	Merge pull request #4027 from minggo/iss2905-adjust_folder add script to build android samples	2013-10-29 23:22:26 -07:00
minggo	4d9b05a67d	add script to build android samples	2013-10-30 14:19:07 +08:00
samuelhu	70082ddc29	issue #3409:Add XMLHttpRequest lua binding and corresponding test sample	2013-10-29 17:54:35 +08:00
samuelhu	3508213615	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developHttp Conflicts: build/cocos2d_libs.xcodeproj/project.pbxproj	2013-10-29 11:45:19 +08:00
samuelhu	a4d028e905	issue #3409:Add XMLHttpRequest lua binding and corresponding test sample	2013-10-29 11:40:41 +08:00
James Chen	b4eb970589	[JSB] Fixing compilation errors for iOS and Mac projects.	2013-10-25 10:50:03 +08:00
samuelhu	d7689073e0	issue #3049:Add XMLHttpRequest lua binding and corresponding test sample	2013-10-24 11:12:21 +08:00
minggo	abcf8f268d	fix conflicts	2013-10-22 18:36:13 +08:00
minggo	6a664d480a	issue #2905:samples build ok on linux	2013-10-22 18:01:56 +08:00
Dhilan007	f11dba586a	issue #2905:modification vs-project for folder structure change	2013-10-21 22:09:21 +08:00
Dhilan007	9a0fa3c181	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop	2013-10-21 16:27:49 +08:00
samuelhu	0cffe51219	fix libluajia.a search path bug	2013-10-18 18:08:05 +08:00
samuelhu	4ccb13f5d0	fix libluajia.a search path bug	2013-10-18 17:37:04 +08:00
Dhilan007	6ce34288e0	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop	2013-10-18 15:53:26 +08:00
minggo	5f65cdc3c0	fix xcode compiling error and simplify android.mk	2013-10-18 15:39:09 +08:00
Dhilan007	6f39f903e3	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop	2013-10-17 16:23:19 +08:00
James Chen	34fe2ba02c	Added missing icons for some iOS and Mac samples.	2013-10-17 14:12:43 +08:00
Dhilan007	546bc3aa32	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop	2013-10-17 11:33:10 +08:00
minggo	8f9756f030	issue #2905:TestJavascript build ok on Android	2013-10-17 11:28:57 +08:00
Dhilan007	d82c2ca060	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop	2013-10-17 09:39:48 +08:00
Ricardo Quesada	28de91d965	more Xcode fixes	2013-10-16 11:45:58 -07:00
Dhilan007	a91621ae5a	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop	2013-10-16 17:51:02 +08:00
Dhilan007	c6344875de	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop	2013-10-16 17:30:51 +08:00
James Chen	b5233fc18d	issue #2905 : [iOS Mac] Updating project configurations.	2013-10-16 17:27:30 +08:00
James Chen	225738ecc5	issue #2905 : [iOS Mac] HelloLua and TestLua work now.	2013-10-16 17:19:02 +08:00
James Chen	00ee416006	issue #2905 : [iOS Mac] All js games work now.	2013-10-16 16:21:55 +08:00
Dhilan007	3d1f734326	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop	2013-10-16 15:44:43 +08:00
James Chen	6fba0dd5db	issue #2905 : [iOS Mac] TestJavascript works now.	2013-10-16 15:43:59 +08:00
James Chen	039a2c93e1	issue #2905 : [iOS Mac]Removing 'include' folder in 'external' group. Otherwise, it will find wrong included file.	2013-10-16 11:30:56 +08:00
James Chen	65f33461bc	issue #2905 : [iOS, Mac] Updating project configuration, TestCpp works now.	2013-10-16 11:19:42 +08:00
Dhilan007	5116e91c4b	Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into di2905	2013-10-16 11:00:22 +08:00
Ricardo Quesada	8cad67a3e1	small fixes for the Xcode projects	2013-10-15 13:36:03 -07:00
Dhilan007	2865ad798b	issues #2905:Updating project configuration for folder change.	2013-10-15 10:18:37 +08:00
James Chen	9f89879e5e	issue #2905 : [iOS, Mac] Always search user path.	2013-10-14 17:43:59 +08:00
James Chen	16c88363f5	issue #2905 : Updating project configuration for SimpleGame.	2013-10-14 17:16:39 +08:00
James Chen	438fe70287	issue #2905 : [iOS, Mac] HelloCpp works now.	2013-10-14 15:53:14 +08:00
minggo	ad6325b0dd	fix conflicts	2013-10-12 11:31:32 +08:00
minggo	4313c46e93	issue #2905:adjust folder structure	2013-10-12 11:22:05 +08:00

... 7 8 9 10 11 ...

849 Commits