Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
39,945 Commits 2 Branches 31 Tags 1.1 GiB
Commit Graph

1722 Commits

Author SHA1 Message Date
cocoscodeide 58ed156cec Merge pull request #27 from chuanweizhang2013/v3luaruntime 
move runtime res path
 2014-05-23 13:38:47 +08:00
cocoscodeide 5e198aaae2 Merge pull request #26 from cocos2d/v3 
update cocos2d-x
 2014-05-23 12:46:42 +08:00
chuanweizhang2013 1b3af4be19 move runtime res path 2014-05-22 22:08:04 +08:00
Dale Stammen f3eb0d7722 updated cpp template file 2014-05-22 06:58:05 -07:00
chuanweizhang2013 111840f37b add play ui 2014-05-22 11:52:49 +08:00
CocosRobot a07b2dae75 [AUTO][ci skip]: updating cocos2dx_files.json 2014-05-21 07:25:16 +00:00
CocosRobot 5fe36c55c7 [AUTO][ci skip]: updating cocos2dx_files.json 2014-05-20 11:49:30 +00:00
Sergey 49f26f3fbf lua template & android-build.py updated 2014-05-20 13:49:02 +04:00
Sergey 1ff2a03d16 debug mode by default 
configuration switched to -b debug/release
 2014-05-20 13:00:21 +04:00
minggo 47482f8a3a Merge pull request #6825 from cocoscodeide/v3 
[ci skip] update template project lua
 2014-05-20 15:45:03 +08:00
cw 1aa92bdef0 add java nativeIsDebug 2014-05-20 13:53:52 +08:00
cw 84d66219c8 fixed android degbug 2014-05-20 11:44:46 +08:00
zhangbin 2b3f236792 Support generate release apk with prebuilt libs. 2014-05-20 10:47:27 +08:00
Sergey a489c19535 Android project improvements 
(release/debug builds)
native debug support
 2014-05-19 17:47:17 +04:00
cocoscodeide a2be97380b Merge pull request #14 from bofeng-song/v3 
show uploading file in play scene
 2014-05-19 13:35:31 +08:00
samuele3hu e2a0029c4e Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_fix 2014-05-19 10:50:15 +08:00
samuele3hu 6dc7f5a2b5 fix compile error for lua template 2014-05-19 10:38:59 +08:00
Huabing.Xu b69efe00a7 fix cpp template linux 2014-05-18 18:34:53 -07:00
Huabing.Xu 94228df977 fix cpp_template 2014-05-18 18:04:12 -07:00
CocosRobot 794ba83495 [AUTO][ci skip]: updating cocos2dx_files.json 2014-05-18 22:25:49 +00:00
CocosRobot cb67b0533c [AUTO][ci skip]: updating cocos2dx_files.json 2014-05-18 21:51:37 +00: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
cw defd10da72 modiy size 2014-05-17 22:46:09 +08:00
cw 859242c29b fixed portrait 2014-05-17 22:24:56 +08:00
cocoscodeide 231cf5f99a Merge pull request #20 from chuanweizhang2013/v3luaruntime 
fixed mac relaunch bug
 2014-05-17 19:40:45 +08:00
cw c7591511f7 fixed version num 2014-05-17 19:38:15 +08:00
cw 150125f411 fixed mac relaunch bug 2014-05-17 19:11:12 +08:00
cocoscodeide d38ee1bd0f Merge pull request #19 from chuanweizhang2013/v3luaruntime 
fixed head search path
 2014-05-17 14:42:36 +08:00
cw 8db2882431 fixed head search path 2014-05-17 14:41:03 +08:00
James Chen 95149a45e0 Merge pull request #6789 from cocoscodeide/v3 
update template project vect
 2014-05-17 11:44:02 +08:00
cw 84e9cd3a77 modify vec2 2014-05-17 11:35:57 +08:00
bofeng-song 6a8712482c fix build error 2014-05-17 11:30:07 +08:00
CocosRobot 45d923e259 [AUTO][ci skip]: updating cocos2dx_files.json 2014-05-17 01:18:27 +00:00
CocosRobot b36d503812 [AUTO][ci skip]: updating cocos2dx_files.json 2014-05-16 21:39:50 +00: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
Jon Segador 64fa90ff0f Vector2 replaced by Vec2 2014-05-16 16:21:36 +02:00
minggo bf2250a67a Merge pull request #6738 from cocoscodeide/v3 
update template project lua
 2014-05-16 18:10:10 +08:00
bofeng-song 6dd7f2d630 Merge branch 'v3' of https://github.com/cocoscodeide/cocos2d-x into v3 2014-05-16 17:19:36 +08:00
cw aa2aa4bcdf fixed repo 2014-05-16 17:08:33 +08:00
bofeng-song 662d8454f7 remove inner function from header file 2014-05-16 16:46:35 +08:00
CocosRobot c2ace4c56e [AUTO][ci skip]: updating cocos2dx_files.json 2014-05-16 08:43:41 +00:00
bofeng-song 5cf961912b fix potential problem 2014-05-16 16:24:26 +08:00
bofeng-song 8a407cd0ba show uploading file in play scene 2014-05-16 15:59:09 +08:00
Jason Xu 67a558c83d for 93562d6aa6 
update Cocos2dxHelper and AndroidManifest.xml template.
 2014-05-16 15:55:00 +08:00
cw ceeba9a081 mofiy size 2014-05-16 12:02:59 +08:00
cw 48e437801f add prebuiltruntime 2014-05-16 11:57:03 +08:00
AlexV 0bec438be8 Merge branch 'v3' of github.com:asmodehn/cocos2d-x into asmo_newv3_cmake_win32 2014-05-15 22:24:33 +09:00
CocosRobot b9562e5dbf [AUTO][ci skip]: updating cocos2dx_files.json 2014-05-15 10:30:59 +00:00
cocoscodeide bad30e4b66 Merge pull request #12 from bofeng-song/v3 
add support for reverse orientation for android
 2014-05-15 18:07:14 +08:00
bofeng-song c0297c6e5f add support for reverse orientation for android 2014-05-15 17:58:23 +08:00
cocoscodeide eb00d7816c Merge pull request #11 from chuanweizhang2013/v3luaruntime 
set macox deployment target
 2014-05-15 17:13:13 +08:00
cw 82f08513b0 set macox deployment target 2014-05-15 17:07:14 +08:00
cocoscodeide 53a7521c36 Merge pull request #10 from chuanweizhang2013/v3luaruntime 
fixed warnging
 2014-05-15 11:49:28 +08:00
cw a7c0a44792 fixed warnging 2014-05-15 11:34:17 +08:00
minggo 354566d782 use RGBA8 as default pixel format 2014-05-15 09:56:26 +08:00
cocoscodeide 772d22b6fc Merge pull request #9 from chuanweizhang2013/v3luaruntime 
V3luaruntime
 2014-05-14 18:06:19 +08:00
cw b42eb08bad fixed error 2014-05-14 18:01:38 +08:00
bofeng-song d0d20e7272 fix build err 2014-05-14 15:52:58 +08:00
cw 7c8e237ee2 Merge branch 'v3' of https://github.com/cocoscodeide/cocos2d-x into v3luaruntime 2014-05-14 15:11:59 +08:00
cw 501762f3b5 remove post-new.py 2014-05-14 15:03:32 +08:00
bofeng-song 668ed34512 Merge branch 'v3' of https://github.com/cocoscodeide/cocos2d-x into v3 2014-05-14 15:03:07 +08:00
bofeng-song 20346d8ef6 lua runtime, support custom orientation 2014-05-14 15:02:24 +08:00
cw e0fe2cb2e2 modify android orientation 2014-05-14 14:58:36 +08:00
cw cc5ba9b2b1 modify android orientation 2014-05-14 14:40:27 +08:00
cw d9543e9371 fixed mistake 2014-05-13 18:15:25 +08:00
cw 3207d841a3 Merge branch 'v3' of https://github.com/cocoscodeide/cocos2d-x into v3luaruntime 2014-05-13 18:01:38 +08:00
cocoscodeide 0b301d6602 Merge pull request #5 from cocos2d/v3 
update cocos2d-x
 2014-05-13 17:59:18 +08:00
chuanweizhang2013 21483b1a47 add start search config.json 2014-05-13 17:44:35 +08:00
chuanweizhang2013 c8d871a60b modify read config time 2014-05-13 15:56:39 +08:00
zhangbin b0adc6fe51 Modify the lua runtime template for the implementation of downloading runtime files. 2014-05-13 15:06:56 +08:00
minggo 4356727465 Merge pull request #6619 from myourys/v3 
update cpp-default-template for android *Eclipse*
 2014-05-13 13:52:28 +08:00
CocosRobot 79b679a3b0 [AUTO][ci skip]: updating cocos2dx_files.json 2014-05-12 11:05:12 +00:00
James Chen eb9fbea7be Merge pull request #6686 from dumganhar/download-runtime 
Updates download-deps.py to support  to download several zip files. (external and lua-runtime-bin)
 2014-05-12 19:00:15 +08:00
CocosRobot e9cf6060be [AUTO][ci skip]: updating cocos2dx_files.json 2014-05-12 09:59:17 +00:00
James Chen 8115b09d29 Adds config.json for runtime 2014-05-12 17:55:57 +08:00
James Chen 5dc69026ac Updates download-deps.py to support download several files. 2014-05-12 17:53:51 +08:00
CocosRobot 18e8f1bdae [AUTO][ci skip]: updating cocos2dx_files.json 2014-05-12 08:11:46 +00:00
cocoscodeide 64b630912d Merge pull request #3 from chuanweizhang2013/v3luaruntime 
fixed project name
 2014-05-12 13:44:31 +08:00
CocosRobot 4ce297458f [AUTO][ci skip]: updating cocos2dx_files.json 2014-05-10 03:58:12 +00:00
Ricardo Quesada 63c7c6a05c Updates template files 2014-05-09 18:41:12 -07:00
AlexV 722a4d264e basic fixes for win32 builds 2014-05-10 10:07:29 +09:00
Ricardo Quesada fec1b82c0a Shader files use STRINGIFY 2014-05-09 16:45:42 -07:00
Ricardo Quesada 808561705a new files for template 2014-05-09 15:40:48 -07:00
chuanweizhang2013 d502e41af4 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into codeidev3 
Conflicts:
	templates/lua-template-runtime/frameworks/runtime-src/Classes/AppDelegate.cpp
 2014-05-09 14:28:14 +08:00
chuanweizhang2013 c973dba4f1 add entry file support 2014-05-09 14:06:20 +08:00
CocosRobot 224b0910c9 [AUTO][ci skip]: updating cocos2dx_files.json 2014-05-09 05:42:30 +00:00
cocoscodeide 6efaa2fe8f Merge pull request #2 from chuanweizhang2013/v3luaruntime 
modify luadebug and adjust code file
 2014-05-08 22:09:06 +08:00
chuanweizhang2013 48566b70e0 add ignore .gz 2014-05-08 20:59:24 +08:00
CocosRobot 7ef529b1c4 [AUTO][ci skip]: updating cocos2dx_files.json 2014-05-08 10:35:12 +00:00
minggo 56f749f273 Merge pull request #6575 from twhittock/lua-main-error-no-launch 
Lua template should fail to launch on lua error
 2014-05-08 17:58:48 +08:00
chuanweizhang2013 8f7cb74dd1 fixed debug 2014-05-08 16:02:55 +08:00
CocosRobot fb0094e0b7 [AUTO][ci skip]: updating cocos2dx_files.json 2014-05-08 07:30:48 +00:00
CocosRobot 9e45b4be3a [AUTO][ci skip]: updating cocos2dx_files.json 2014-05-08 06:00:35 +00:00
minggo 8dba4e3b13 Merge pull request #6570 from gin0606/buildNativeVariableArguments 
Upgrade build_native.py to take variable number of arguments
 2014-05-08 13:59:16 +08:00
chuanweizhang2013 ee4b6ba2bc add visibleRect 2014-05-08 13:57:34 +08:00
cw b9d5ef5eda add visible 2014-05-08 13:47:41 +08:00
Hector 420439cdea update cpp-default-template for android *Eclipse* 2014-05-08 11:20:25 +08:00
chuanweizhang2013 784761828b modify post-new.py 2014-05-08 09:26:59 +08:00
cw 919a780e2a add suport ios screen orientation set 2014-05-07 20:50:29 +08:00
CocosRobot 7fb79c2a52 [AUTO][ci skip]: updating cocos2dx_files.json 2014-05-07 09:43:30 +00:00
minggo 21aa7058e3 := -> += 2014-05-07 14:35:43 +08:00
minggo 976ef3e2a4 add some comment for dependences module in Android.mk to make it simple to use other module 2014-05-07 14:31:05 +08:00
cocoscodeide 04600227ae Merge pull request #1 from chuanweizhang2013/v3luaruntime 
V3luaruntime
 2014-05-07 11:34:35 +08:00
cw c9a7c44537 rename mac simulator app's file simulatorconfig class 2014-05-07 11:10:46 +08:00
CocosRobot 12ba2b178e [AUTO][ci skip]: updating cocos2dx_files.json 2014-05-06 11:20:46 +00:00
chuanweizhang2013 c3d7465cc7 move win menu bar to sysmenu 2014-05-06 17:03:40 +08:00
Dale Stammen 12daf49900 added missing Assets folder 2014-05-05 13:48:31 -07:00
chuanweizhang2013 cd7ea468e8 modify lua_debugger.c 2014-05-05 21:18:33 +08:00
chuanweizhang2013 5164a66e10 add config parser 2014-05-05 21:04:04 +08:00
Tom Whittock a587da13fc Lua template should fail to launch on lua error 
Without this change, the app continues to run, attempts to access the
badly-initialised scene and issues more error messages. This causes
further errors every frame, covering up the original error in the output
 2014-05-05 13:12:42 +01:00
CocosRobot 897b3c61ce [AUTO][ci skip]: updating cocos2dx_files.json 2014-05-05 05:40:36 +00:00
gin0606 dd8d932c0a Upgrade build_native.py to take variable number of arguments 2014-05-05 12:48:51 +09:00
CocosRobot e32647ec88 [AUTO][ci skip]: updating cocos2dx_files.json 2014-05-04 17:37:16 +00: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 db68b9ca31 Lua and C++ compiles for linux 2014-05-01 15:23:20 -07:00
CocosRobot 74d377eb70 [AUTO][ci skip]: updating cocos2dx_files.json 2014-05-01 21:14:53 +00:00
Ricardo Quesada 32f3fedb37 Moves cocos/2d/Android.mk to cocos/Android.mk 
Easier to find Android.mk
 2014-05-01 14:09:26 -07:00
CocosRobot 2247086111 [AUTO][ci skip]: updating cocos2dx_files.json 2014-05-01 00:55:27 +00:00
Ricardo Quesada 8bb8416c26 Improved directory structure 2014-04-29 17:37:36 -07:00
James Chen 9b3f456f80 Merge pull request #6393 from Dhilan007/v3 
template work on wp8 now
 2014-04-28 14:08:06 +08:00
Dhilan007 698657a6ab template work on wp8 now 2014-04-28 14:04:52 +08:00
Huabing.Xu e6f7854225 clean for kazmath in project file 2014-04-28 13:14:22 +08:00
Huabing.Xu 62fbf3ff7c template for linux cpp 2014-04-28 11:24:58 +08:00
Huabing.Xu aa3859eddb template work on IOS/Mac now 2014-04-28 11:10:55 +08: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
CocosRobot 679f8c7750 [AUTO][ci skip]: updating cocos2dx_files.json 2014-04-25 03:05:26 +00:00
CocosRobot 617ccbb4fa [AUTO][ci skip]: updating cocos2dx_files.json 2014-04-25 02:43:56 +00: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 f65973d9f0 Merge branch 'develop' into develop_migrate_math_lib_merge 
Conflicts:
	cocos/2d/CCActionInterval.cpp
	cocos/2d/CCLabelAtlas.cpp
	cocos/2d/CCLabelBMFont.cpp
	tests/cpp-tests/Classes/ClippingNodeTest/ClippingNodeTest.cpp
 2014-04-23 14:46:14 +08:00
袁全伟 56f9def298 Update AppDelegate.cpp 
use getInstance replace :)
 2014-04-22 13:20:07 +08:00
Huabing.Xu 7a38050e09 Merge branch 'develop' into develop_migrate_math_lib_merge 2014-04-21 17:47:34 +08:00
minggo 65ffb5bb65 Merge pull request #6324 from kicktheken/develop 
Fix lua project template crash on iOS5.1 device
 2014-04-21 11:07:59 +08:00
Dale Stammen 617982cbe5 added missing projects. Fixed property sheets 2014-04-19 10:09:53 -07:00
Kenneth Chan a2fa6ef2d5 Fix lua project template crash on iOS5.1 device 2014-04-18 18:02:40 -07:00
Huabing.Xu 3b83d52f95 Merge branch 'develop' into develop_migrate_math_lib_merge 
Conflicts:
	cocos/ui/UIButton.cpp
	cocos/ui/UIButton.h
	cocos/ui/UICheckBox.cpp
	cocos/ui/UICheckBox.h
	cocos/ui/UIImageView.cpp
	cocos/ui/UIImageView.h
	cocos/ui/UILayout.cpp
	cocos/ui/UILayout.h
	cocos/ui/UILoadingBar.cpp
	cocos/ui/UIRichText.h
	cocos/ui/UISlider.cpp
	cocos/ui/UIText.cpp
	cocos/ui/UIText.h
	cocos/ui/UITextAtlas.cpp
	cocos/ui/UITextAtlas.h
	cocos/ui/UITextBMFont.cpp
	cocos/ui/UITextBMFont.h
	cocos/ui/UITextField.cpp
	cocos/ui/UITextField.h
	cocos/ui/UIWidget.cpp
	tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIButtonTest/UIButtonTest.cpp
	tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIImageViewTest/UIImageViewTest.cpp
	tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UILayoutTest/UILayoutTest.cpp
	tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIScrollViewTest/UIScrollViewTest.cpp
 2014-04-19 00:30:34 +08:00
cw 0f61481c40 add android runtime 2014-04-18 14:12:34 +08:00
chuanweizhang2013 2a9c99ff66 Merge pull request #25 from cocos2d/develop 
update cocos2d-x
 2014-04-18 11:45:53 +08:00
cw a9e697523e amend comment 2014-04-18 11:40:51 +08:00
cw 2914f60fcf fixed xiaomi show ip error 2014-04-17 16:50:11 +08:00
Huabing.Xu 95cb7721f6 Merge branch 'develop' into develop_migrate_math_lib_merge 
Conflicts:
	cocos/2d/CCSprite.cpp
	tests/cpp-tests/Classes/NewRendererTest/NewRendererTest.cpp
 2014-04-15 22:21:04 +08:00
Huabing.Xu 7f61639541 replace Point with Vector2 in tests, extension folder 2014-04-15 18:23:40 +08:00
James Chen cb807e61c2 closed #4607: Fixed project created by template crashes on iOS5.1 device. 2014-04-15 11:56:50 +08:00
chuanweizhang2013 1fadba7de1 add static to variable 2014-04-11 10:41:35 +08:00
chuanweizhang2013 337bc2f2e8 Merge pull request #22 from cocos2d/develop 
update cocos2d-x
 2014-04-11 09:33:04 +08:00
cw 06b727d184 remove comment code and rename function 2014-04-10 18:15:07 +08:00
CocosRobot d27a3c9642 [AUTO][ci skip]: updating cocos2dx_files.json 2014-04-10 08:40:58 +00:00
chuanweizhang2013 b8ed365b7f tab to 4 space 2014-04-10 15:53:42 +08:00
chuanweizhang2013 eb6ef4d067 tab to 4 space 2014-04-10 15:51:25 +08:00
chuanweizhang2013 d5940243e1 mofiy wrong indention 2014-04-10 15:37:59 +08:00
cw 69865382c0 add prebuilt 2014-04-10 14:38:31 +08:00
CocosRobot 1e37906965 [AUTO][ci skip]: updating cocos2dx_files.json 2014-04-10 03:30:39 +00:00
chuanweizhang2013 18d5317c64 Merge branch 'luaruntime' of https://github.com/chuanweizhang2013/cocos2d-x into luaruntime 2014-04-10 10:36:46 +08:00
chuanweizhang2013 c6ec729bf8 modify 2014-04-10 10:35:53 +08:00
chuanweizhang2013 91e42a17f5 Merge pull request #21 from cocos2d/develop 
update cocos2d-x
 2014-04-10 10:28:12 +08:00
James Chen 43d6e1176a issue #4729: Compilation error fixes for linux 2014-04-10 00:36:42 +08:00
chuanweizhang2013 d4e2b72f12 add platform symbol 2014-04-09 19:17:13 +08:00
chuanweizhang2013 b077ed40e8 Merge branch 'luaruntime' of https://github.com/chuanweizhang2013/cocos2d-x into luaruntime 2014-04-09 17:55:58 +08:00
chuanweizhang2013 e97552c2d3 add reload 2014-04-09 17:54:10 +08:00
cw d34fddb06e rename lua folder 2014-04-09 17:03:38 +08:00
CocosRobot e272c66932 [AUTO][ci skip]: updating cocos2dx_files.json 2014-04-09 08:09:22 +00:00
cw c0fe791aae Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into luaruntime 
Conflicts:
	templates/lua-template-runtime/src/main.lua
 2014-04-04 18:17:54 +08:00
CocosRobot 25b24a62cb [AUTO][ci skip]: updating cocos2dx_files.json 2014-04-03 09:42:36 +00:00
CocosRobot 9b9c3f9b07 [AUTO][ci skip]: updating cocos2dx_files.json 2014-04-02 07:40:55 +00:00
chuanweizhang2013 a6cd18d05d cmd to request 2014-04-02 13:47:09 +08:00
James Chen 96e7bad7e3 Updates templates for linux platform 2014-04-01 01:49:24 -07:00
CocosRobot d93ebe0b37 [AUTO][ci skip]: updating cocos2dx_files.json 2014-04-01 03:30:24 +00:00
samuele3hu 3ce597bc0e Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_socket 2014-03-31 23:12:18 +08:00
samuele3hu 0a1d23753b fix the lua template error that would lead to crash when do rotate 2014-03-31 23:11:26 +08:00
CocosRobot 9801dc6f50 [AUTO][ci skip]: updating cocos2dx_files.json 2014-03-31 09:52:30 +00:00
chuanweizhang2013 d74fd796eb add resouce reload 2014-03-31 16:49:12 +08:00
chuanweizhang2013 189136ccb8 fixed mistake 2014-03-31 11:39:49 +08:00
chuanweizhang2013 32402b109e add memset 2014-03-31 11:26:30 +08:00
chuanweizhang2013 93c424071e update runtime 2014-03-31 11:18:41 +08:00
CocosRobot 12af1b4982 [AUTO][ci skip]: updating cocos2dx_files.json 2014-03-29 15:23:46 +00:00
Dale Stammen 101818ac62 added wp8 support files and projects 2014-03-28 15:44:15 -07:00
Dale Stammen 210f95c2d3 can't close app on WP8 2014-03-28 11:27:43 -07:00
cw 2649c5b971 add socket 2014-03-28 16:26:56 +08:00
chuanweizhang2013 0d65057116 update runtime 2014-03-28 16:07:29 +08:00
chuanweizhang2013 c016f80f58 fixed no json file bug 2014-03-28 15:45:10 +08:00
chuanweizhang2013 4b691cf7e9 add fileinfo support 2014-03-28 15:06:49 +08:00
chuanweizhang2013 5aa3a5d956 update socket rules 2014-03-28 11:37:17 +08:00
James Chen 10eee24b0f Merge pull request #6029 from natural-law/develop 
Add tools/bindings-generator & tools/tolua into the  lua template.
 2014-03-27 16:47:08 +08:00
zhangbin 0c82a4a3e0 Add tools/bindings-generator & tools/tolua into the lua project template. 2014-03-27 15:38:01 +08:00
CocosRobot b779ef0c27 [AUTO][ci skip]: updating cocos2dx_files.json 2014-03-27 07:04:13 +00:00
James Chen 2c616fc9da Merge pull request #6005 from flashjay/develop 
remove deprecated code in lua tests & template
 2014-03-26 20:12:10 +08:00
faryang-rmbp 491dc202df remove deprecated code in lua tests & template 2014-03-26 19:42:07 +08:00
CocosRobot 41110ec49a [AUTO][ci skip]: updating cocos2dx_files.json 2014-03-26 10:41:17 +00:00
chuanweizhang2013 ed75b09d5e Merge branch 'luaruntime' of https://github.com/chuanweizhang2013/cocos2d-x into luaruntime 2014-03-26 14:49:07 +08:00
chuanweizhang2013 210cee9f08 update socket protocol 2014-03-26 14:48:04 +08:00
cw 749a00e5a9 update sim to support Xcode 5.1 2014-03-26 11:27:50 +08:00
CocosRobot e65315d01e [AUTO][ci skip]: updating cocos2dx_files.json 2014-03-25 08:22:13 +00:00
Dhilan007 c642d4d4c4 update templates for remove native activity 2014-03-25 15:43:42 +08:00
chuanweizhang2013 1254bf8f1e Merge pull request #19 from cocos2d/develop 
update cocos2d-x
 2014-03-24 12:00:30 +08:00
James Chen da0c15c982 Merge pull request #5847 from newnon/develop_small_improvements 
Adds getCurrentLanguageCode() which returns iso 639-1 language code
 2014-03-21 16:33:43 +08:00
cw c0db4e91d1 fixed "/" 2014-03-21 15:59:26 +08:00
chuanweizhang2013 3c575d36d8 / 2014-03-21 15:53:02 +08:00
James Chen d8bbb66864 Merge pull request #5911 from CocosRobot/update_cocosfiles_1395385180 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-03-21 15:16:35 +08:00
James Chen e89b203b13 Remove AccelerometerSimulation.h for cpp template. 2014-03-21 15:08:53 +08:00
CocosRobot 1303985165 [AUTO][ci skip]: updating cocos2dx_files.json 2014-03-21 06:59:41 +00:00
cw 2b458d6f8f update prebuilt runtime pc 2014-03-21 14:13:57 +08:00
cw 8a40fbc159 update pc show msg 2014-03-21 11:56:21 +08:00
CocosRobot 3c9acc938b [AUTO][ci skip]: updating cocos2dx_files.json 2014-03-21 03:22:25 +00:00
CocosRobot 0b7a052fa6 [AUTO][ci skip]: updating cocos2dx_files.json 2014-03-21 02:54:10 +00: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
CocosRobot 789a1496c8 [AUTO][ci skip]: updating cocos2dx_files.json 2014-03-20 07:22:42 +00:00
cw e58270b099 updatewin32 2014-03-20 11:12:03 +08:00
cw b505e06500 update beside win32 2014-03-20 10:38:36 +08:00
chuanweizhang2013 46d58775d7 update search path 2014-03-19 17:23:06 +08:00
chuanweizhang2013 a0b8200b79 forget include 2014-03-19 09:50:06 +08:00
chuanweizhang2013 7af5060896 add pc args 2014-03-18 18:24:58 +08:00
chuanweizhang2013 05a5e93d04 fixed win32 exit 2014-03-18 09:41:14 +08:00
Sergey f65ef462e5 getCurrentLanguageCode() for all platforms return iso 639-1 language code 
iPhone template improvements(for game center support)
 2014-03-17 22:34:21 +04:00
chuanweizhang2013 6b2ce283e4 fixed win32 don't exit 2014-03-17 20:46:49 +08:00
chuanweizhang2013 e89f20a0b3 update win32 prebuilt 2014-03-17 15:00:21 +08:00
chuanweizhang2013 08a04e6408 update release writepath 2014-03-17 14:44:20 +08:00
chuanweizhang2013 6c1e2ee181 add win32 2014-03-16 21:17:19 +08:00
chuanweizhang2013 d0f90401ce Merge branch 'luamerage' of https://github.com/chuanweizhang2013/cocos2d-x into luamerage 2014-03-16 17:36:48 +08:00
chuanweizhang2013 b44b5ce52f add send \n 2014-03-16 17:32:08 +08:00
honghui 441c5cd8d4 update prebuilt 2014-03-16 17:04:22 +08:00
chuanweizhang2013 9e43eb639f Merge branch 'luamerage' of https://github.com/chuanweizhang2013/cocos2d-x into luamerage 2014-03-15 18:34:02 +08:00
chuanweizhang2013 2f62cd2383 modify recv namelen array 2014-03-15 18:30:58 +08:00
chuanweizhang2013 ec6c4ddf64 modify recv namelen array 2014-03-15 18:28:42 +08:00
cw e5331c827d update win32 prebuilt 2014-03-15 11:12:01 +08:00
cw 1e551f8ca4 Merge branch 'luamerage' of https://github.com/chuanweizhang2013/cocos2d-x into luamerage 
Conflicts:
	templates/lua-template-runtime/src/main.lua
 2014-03-15 10:37:26 +08:00
chuanweizhang2013 59011f86a0 Merge pull request #17 from cocos2d/develop 
update coco2d-x
 2014-03-15 10:05:46 +08:00
CocosRobot 8bd3bdf021 [AUTO][ci skip]: updating cocos2dx_files.json 2014-03-14 17:47:32 +00:00
minggo dfb3b6719c Merge pull request #5818 from boyu0/support_for_xcode_iphone_64bit_simulator 
build lua.a for arm64bit and iOS simulator 64 bit architectures, change ...
 2014-03-15 01:22:28 +08:00
boyu0 f23db68151 build lua.a for arm64bit and iOS simulator 64 bit architectures, change .ma3 files to .caf files. 2014-03-15 01:19:06 +08:00
CocosRobot ebe7b37ec2 [AUTO][ci skip]: updating cocos2dx_files.json 2014-03-14 15:38:36 +00:00
cw f76582ae9e update res path 2014-03-14 21:06:45 +08:00
minggo 1aedf01590 copy lua files 2014-03-14 18:01:53 +08:00
minggo 3c96ef9394 add websockets link 2014-03-14 17:46:18 +08:00
minggo 7bddf7f36a lua tempalte support for linux 2014-03-14 16:58:33 +08:00
cw d192619ddf add prebuilt runtime 2014-03-14 16:33:53 +08:00
CocosRobot 28f7603f81 [AUTO][ci skip]: updating cocos2dx_files.json 2014-03-13 07:18:02 +00:00
CocosRobot 2c59743abf [AUTO][ci skip]: updating cocos2dx_files.json 2014-03-13 03:35:40 +00:00
chuanweizhang2013 0dc85e42a7 modify module_path 2014-03-13 09:51:43 +08:00
James Chen ac0aecb394 Merge pull request #5737 from dumganhar/runtime-fix 
Lua Runtime fix
 2014-03-12 21:48:35 +08:00
James Chen cc8738ee94 Simulator fix: After main loop, NSApplication needs to be terminated immediately. 2014-03-12 21:45:15 +08:00
minggo e1afa0ad5c Merge pull request #5735 from minggo/template-java-des 
add description for how to load .so
 2014-03-12 21:31:30 +08:00
minggo 656211a72f add description for how to load .so 2014-03-12 21:28:38 +08:00
CocosRobot 0c68e4b1d5 [AUTO][ci skip]: updating cocos2dx_files.json 2014-03-12 12:39:13 +00:00
CocosRobot 6d867fb294 [AUTO][ci skip]: updating cocos2dx_files.json 2014-03-12 12:24:03 +00:00
CocosRobot 6721b15217 [AUTO][ci skip]: updating cocos2dx_files.json 2014-03-12 11:38:24 +00:00
CocosRobot 2f582dcdb5 [AUTO][ci skip]: updating cocos2dx_files.json 2014-03-12 10:33:14 +00:00
chuanweizhang2013 fafc292d33 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into luamerage 2014-03-12 15:28:07 +08:00
CocosRobot d00be77399 [AUTO][ci skip]: updating cocos2dx_files.json 2014-03-12 04:09:06 +00:00
CocosRobot 33b7be5bea [AUTO][ci skip]: updating cocos2dx_files.json 2014-03-12 03:16:06 +00:00
chuanweizhang2013 4153667249 add runtime template 2014-03-12 11:04:56 +08:00
andyque cb4acc6311 fix linux compile error 2014-03-12 11:03:23 +08:00
andyque 2c2a5ee38e rename gui to ui 2014-03-12 10:46:49 +08:00
andyque 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
CocosRobot d74eece191 [AUTO][ci skip]: updating cocos2dx_files.json 2014-03-11 14:54:20 +00:00
andyque 448b101578 fix linux compile error 2014-03-11 20:46:11 +08:00
cw 133a68f614 add runtime template 2014-03-11 16:52:06 +08:00
James Chen df55fea441 Merge pull request #5659 from dumganhar/re-add-lua 
Re-add lua template.
 2014-03-10 19:51:56 +08:00
James Chen cf5dacb24e Re-add lua template. 2014-03-10 19:33:57 +08:00
CocosRobot 8f18803959 [AUTO][ci skip]: updating cocos2dx_files.json 2014-03-10 09:49:16 +00:00
CocosRobot c8da2c04ce [AUTO][ci skip]: updating cocos2dx_files.json 2014-03-10 06:02:28 +00:00
CocosRobot 5f534016e7 [AUTO][ci skip]: updating cocos2dx_files.json 2014-03-07 02:33:52 +00:00
CocosRobot e95ce5ab3d [AUTO][ci skip]: updating cocos2dx_files.json 2014-03-06 06:59:49 +00:00
CocosRobot 5490e44192 [AUTO][ci skip] : updating tools/project-creator/module/cocos_files.json 2014-03-06 06:09:07 +00:00
chuanweizhang2013 58cdf07a35 add 2014-03-05 18:31:31 +08:00
Ricardo Quesada aa4248ae10 kazmath updates for templates 2014-03-04 17:29:48 -08:00
Ricardo Quesada 4b57d41fd2 updates templates for Linux 2014-03-04 17:27:37 -08:00
lihex a5e0c08583 update cocos2dx_files.json 2014-03-04 16:53:26 +08:00
lihex ce3f527ebf add console support files 2014-03-04 16:27:59 +08:00
James Chen 33a5be526c Removes unused templates. 2014-03-04 09:46:32 +08:00
James Chen 62ffb8e995 Renames 'template' to 'templates' 2014-03-04 09:45:08 +08:00