heliclei
|
39ee23795e
|
send email notification if pull request build fail
|
2014-06-23 10:26:36 +08:00 |
minggo
|
bfed48f0ff
|
revert binding-generators to correct commit
|
2014-06-19 17:42:50 +08:00 |
minggo
|
6d80de181a
|
revert binding-generators to correct commit
|
2014-06-19 17:39:14 +08:00 |
minggo
|
a549fdccdc
|
Merge pull request #7134 from samuele3hu/v3_keypad_fix
Update bindings-generator
|
2014-06-19 15:28:43 +08:00 |
zhangbin
|
bd6aed8a7b
|
Update the reference of submodule cocos2d-console.
|
2014-06-19 14:47:16 +08:00 |
samuele3hu
|
477816e883
|
update bindings-generator submodule
|
2014-06-19 14:42:09 +08:00 |
samuele3hu
|
46ce1c917d
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_keypad_fix
|
2014-06-19 14:37:00 +08:00 |
samuele3hu
|
3a350e11ae
|
Add Lua binding for Animation3D and Animate3D ,and add related test case
|
2014-06-19 14:05:38 +08:00 |
samuele3hu
|
98fde94647
|
Skip some functions for Lua bindings
|
2014-06-18 13:43:22 +08:00 |
samuele3hu
|
15d070f7fc
|
Update submodule
|
2014-06-18 11:50:24 +08:00 |
samuele3hu
|
00611f7ec1
|
Update cocos2dx_spine.ini
|
2014-06-18 11:47:43 +08:00 |
samuele3hu
|
9b3b6c0e53
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_keypad_fix
|
2014-06-13 14:39:11 +08:00 |
zhangbin
|
60c08dcb47
|
Update the reference of submodule cocos2d-console.
|
2014-06-13 14:15:17 +08:00 |
heliclei
|
87ac4c660d
|
[ci skip] Set github commit status context & description
|
2014-06-12 11:30:37 +08:00 |
samuele3hu
|
108c0d0da9
|
Modify ini files for bindings-generator to fix the compile warning
|
2014-06-12 10:08:58 +08:00 |
zhangbin
|
07aaa6fabe
|
Update the reference of submodule cocos2d-console.
|
2014-06-09 11:27:01 +08:00 |
samuele3hu
|
52323b27fa
|
Update cocos2d-console submodule
|
2014-06-06 12:09:10 +08:00 |
samuele3hu
|
919524cf89
|
Update controller.lua for lua-tests and bindings-generator submoudle
|
2014-06-05 14:39:09 +08:00 |
samuele3hu
|
404db49538
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_fix
|
2014-06-03 17:17:11 +08:00 |
lm
|
be3f88c4ce
|
[Jenkins][ci skip] Fix proxy address in post-build.py
|
2014-06-03 11:48:52 +08:00 |
samuele3hu
|
5b3f3da428
|
update console submodule
|
2014-06-03 10:13:23 +08:00 |
samuele3hu
|
691e606b34
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_fix
Conflicts:
tools/cocos2d-console
|
2014-06-03 09:58:57 +08:00 |
samuele3hu
|
b91d8255bd
|
Add xxtea encrypt support for lua and update the console submodule
|
2014-06-03 09:55:57 +08:00 |
zhangbin
|
1d95d9a04b
|
Update the reference of submodule cocos2d-console.
|
2014-05-30 15:35:25 +08:00 |
lm
|
3520e7da0b
|
[Jenkins][ci skip] Fix proxy address to jenkins config
|
2014-05-30 12:51:54 +08:00 |
minggo
|
50fcb9a52b
|
Merge pull request #6935 from heliclei/config-proxies
[ci skip][jenkins]move http proxy address to jenkins configuration
|
2014-05-29 17:19:19 +08:00 |
heliclei
|
7d547cf9d2
|
[ci skip][jenkins]move http proxy address to jenkins configuration
|
2014-05-29 16:55:22 +08:00 |
lm
|
f93a40ebde
|
[Jenkins][ci skip] Add rebuild jobs to watchdog.py
|
2014-05-29 15:50:24 +08:00 |
zhangbin
|
db66cd866a
|
Update the reference of submodule cocos2d-console.
|
2014-05-29 13:37:26 +08:00 |
James Chen
|
984d33c055
|
Update README.md in tools/tolua
|
2014-05-28 09:43:48 +08:00 |
samuele3hu
|
b6cc477832
|
Update submodule
|
2014-05-27 14:25:18 +08:00 |
minggo
|
63680946ee
|
Merge pull request #6841 from shujunqiao/reboot
[ci skip], add reboot.py in jenkins-scripts.
|
2014-05-27 14:08:25 +08:00 |
minggo
|
c476e784fa
|
Merge pull request #6816 from shujunqiao/request-build-modify
[ci skip], modify request proxies in post-build.py and so on.
|
2014-05-27 14:04:37 +08:00 |
samuele3hu
|
270ddf0354
|
Update submodule
|
2014-05-26 18:25:23 +08:00 |
lm
|
4328072f7b
|
[Jenkins][ci skip] Remove unavailable parameter in android building
|
2014-05-23 16:06:46 +08:00 |
lm
|
209c1d884a
|
[Jenkins][ci skip] Remove upload apks to another slave, just save it in local
|
2014-05-23 14:02:31 +08:00 |
samuele3hu
|
f76e2a5476
|
Readd the lua binding for `visit` and modify a requirement for IDE
|
2014-05-23 10:00:59 +08:00 |
minggo
|
6e76ca7945
|
Merge pull request #6864 from natural-law/v3
Update the reference of submodule cocos2d-console.
|
2014-05-22 20:32:13 -05:00 |
samuele3hu
|
a6efd4f650
|
Move `setSearchPat` operation from cpp to script
|
2014-05-22 14:00:39 +08:00 |
zhangbin
|
d3d8c94c32
|
Update the reference of submodule cocos2d-console.
|
2014-05-21 17:48:46 +08:00 |
samuele3hu
|
a2ebe428da
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_fix
|
2014-05-20 18:11:28 +08:00 |
samuele3hu
|
2d65f9bc6f
|
issue #5255:Add Sprite3D test cases for Lua
|
2014-05-20 18:09:04 +08:00 |
shujunqiao
|
7232ba9414
|
[ci skip], add reboot.py in jenkins-scripts.
|
2014-05-20 16:34:36 +08:00 |
minggo
|
1ce1b00544
|
Merge pull request #6839 from natural-law/support-prebuilt
Update the reference of submodule cocos2d-console.
|
2014-05-20 15:12:56 +08:00 |
zhangbin
|
ccc85ab210
|
Update the reference of submodule cocos2d-console.
|
2014-05-20 15:03:43 +08:00 |
lm
|
70d1daf8f4
|
[Jenkins][ci skip] Fix the path of android public project
|
2014-05-20 14:31:42 +08:00 |
lm
|
41bc599b12
|
[Jenkins][ci skip] Fix external lib to support ci release
|
2014-05-20 10:58:59 +08:00 |
zhangbin
|
2b3f236792
|
Support generate release apk with prebuilt libs.
|
2014-05-20 10:47:27 +08:00 |
lm
|
aab2bf5371
|
[Jenkins][ci skip] A missing import to ci-release-test.py
|
2014-05-20 10:03:09 +08:00 |
lm
|
1d5748c505
|
[Jenkins][ci skip] Add check slave online status to watchdog
|
2014-05-19 18:03:21 +08:00 |
shujunqiao
|
8c614b795a
|
[ci skip], modify request proxies in post-build.py and so on.
|
2014-05-19 17:41:09 +08:00 |
zhangbin
|
d9e226f886
|
Package the binary files of cocos2d-console in git-achive-all.
|
2014-05-19 13:48:50 +08: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 |
James Chen
|
2344053936
|
Updates the config files for luabindings.
|
2014-05-17 11:15:43 +08:00 |
James Chen
|
81e1e0c23d
|
Merge pull request #6750 from shujunqiao/pull-build-merge
modify /merge to /head in pull-request-build.[ci skip]
|
2014-05-16 10:00:23 +08:00 |
James Chen
|
14639d812e
|
Update config.gitingore
|
2014-05-15 18:29:54 +08:00 |
shujunqiao
|
2a93fdaaa6
|
modify build terminal time in watchdog.py.[ci skip]
|
2014-05-15 17:27:23 +08:00 |
shujunqiao
|
96a9326026
|
[ci skip], modify build-job termination time.
|
2014-05-15 16:50:53 +08:00 |
samuele3hu
|
5a14b1d67b
|
fix compile error and synchronizate the UI change for Lua
|
2014-05-15 15:39:15 +08:00 |
James Chen
|
140560057b
|
Merge pull request #6751 from natural-law/v3
Update the reference of submodule cocos2d-console.
|
2014-05-15 10:40:42 +08:00 |
zhangbin
|
2eafb3c39f
|
Update the reference of submodule cocos2d-console.
|
2014-05-15 10:37:06 +08:00 |
shujunqiao
|
39e5619f3f
|
modify /merge to /head in pull-request-build.
|
2014-05-15 10:36:01 +08:00 |
shujunqiao
|
a1f1b2f3a1
|
[ci skip],for stupid error in equal (backup_files = current_files = range(1))
|
2014-05-14 18:47:58 +08:00 |
minggo
|
9c6e612c1f
|
Merge pull request #6729 from lmskater/add-external-lib-to-ci-release
[Jenkins][ci skip] Add external lib to ci release build
|
2014-05-14 17:41:19 +08:00 |
shujunqiao
|
c58f303a31
|
[ci skip], set v2-branch different variable in pull-request-builder.py.
|
2014-05-14 15:13:43 +08:00 |
lm
|
cf24e327ee
|
[Jenkins][ci skip] Add external lib to ci release build
|
2014-05-14 11:53:27 +08:00 |
shujunqiao
|
1341970b40
|
[ci skip], modify v3!=v2 about config.json.
|
2014-05-14 11:19:30 +08:00 |
James Chen
|
bd82c119b6
|
Updates travis.yml, adds email notification to @Minggo and @James
|
2014-05-13 21:26:25 +08:00 |
lm
|
5cd5a2339b
|
[Jenkins][ci skip] Add error commit status for cancel build in queue
|
2014-05-13 18:16:51 +08:00 |
James Chen
|
45d845f559
|
Adds a comment before making archive file
|
2014-05-13 14:33:53 +08:00 |
James Chen
|
4f886e8ebf
|
[ci skip] The tool of making package supports to insert the content of
another zip file
|
2014-05-13 14:28:29 +08:00 |
James Chen
|
e3ccf41ed9
|
Only build 'merge build'
|
2014-05-12 21:59:32 +08:00 |
James Chen
|
91d684d077
|
Updates travis script to add mac host support
|
2014-05-12 21:55:11 +08:00 |
James Chen
|
36c4a407ee
|
Adds travis_mac.yml
|
2014-05-12 21:54:24 +08:00 |
lm
|
f5a134a86e
|
[Jenkins][ci skip] Add lua-runtime-bin to support pull request build
|
2014-05-12 18:49:52 +08:00 |
Huabing.Xu
|
b80a1e7c3c
|
roll back submodule changes
|
2014-05-09 21:31:15 -07:00 |
Huabing.Xu
|
c3a255e2d0
|
do not generate backupFile if it is not needed for convert particle file yCoordFlipped
|
2014-05-09 20:07:46 -07:00 |
Huabing.Xu
|
c16d072491
|
added conversion script for convert yCoordFlipped
|
2014-05-09 17:28:12 -07:00 |
yangxiao
|
879958855b
|
UniformValue use union array
|
2014-05-09 14:38:36 -07:00 |
zhangbin
|
7d270cd1a1
|
Update the reference of submodule cocos2d-console.
|
2014-05-09 11:48:43 +08:00 |
samuele3hu
|
ec45dbb0c9
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_fix
|
2014-05-08 10:22:52 +08:00 |
lm
|
15c3a0eb8c
|
[Jenkins][ci skip] Fix copy logic of current_3rd_libs
|
2014-05-07 20:34:06 +08:00 |
lm
|
05af9e5bed
|
[Jenkins][ci skip] Check external file to support build
|
2014-05-07 19:01:46 +08:00 |
James Chen
|
3fee1c3f23
|
Merge pull request #6597 from dumganhar/v3
Re-adds download-deps.py, unzip works ok and output more detail informations
|
2014-05-07 17:31:29 +08:00 |
samuele3hu
|
8615e13c91
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_fix
|
2014-05-07 17:16:40 +08:00 |
James Chen
|
a617680cae
|
Updates travis script
|
2014-05-07 15:06:20 +08:00 |
James Chen
|
b76a6a5dda
|
updates travis-script.
|
2014-05-07 13:48:39 +08:00 |
samuele3hu
|
3fb53e39ea
|
Update bindings-generator submodule
|
2014-05-07 11:06:58 +08:00 |
samuele3hu
|
f122f3894c
|
Update the bindings-generator
|
2014-05-07 10:52:49 +08:00 |
samuele3hu
|
a0b60acf24
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_fix
|
2014-05-07 10:33:57 +08:00 |
samuele3hu
|
fb60b9f65a
|
issue #5032:A potential crash bug of Lua binding
|
2014-05-07 10:09:54 +08:00 |
James Chen
|
ac7fd0069b
|
Merge pull request #6559 from shujunqiao/cocos-console-hang
fixed one-hang-bug in cocos-console-test.py. [ci skip]
|
2014-05-06 15:11:07 +08:00 |
samuele3hu
|
0ce2a38f17
|
Update bindings-generator and `MAX_SUB_TEST_NUMS` for SpritePerformance Test
|
2014-05-06 13:59:16 +08:00 |
James Chen
|
6c1791eae6
|
Updates travis-script, removed using download-deps.py now, 'external' is
a submodule module now. please use `git submodule update --init` to
fetch it.
|
2014-05-05 13:14:28 +08:00 |
James Chen
|
53488092a4
|
Updates before-install.sh
|
2014-05-04 19:09:51 +08:00 |
shujunqiao
|
6d2542efb5
|
fixed one-hang-bug in cocos-console-test.py
|
2014-05-04 17:33:00 +08:00 |
James Chen
|
7fca2c05e2
|
Update travis script
|
2014-05-04 15:42:50 +08:00 |
James Chen
|
188d843767
|
Update travis script
|
2014-05-04 15:38:42 +08:00 |
Ricardo Quesada
|
b67f3008a5
|
Lua compiles again
|
2014-05-01 18:07:25 -07:00 |
zhangbin
|
64f30980b4
|
closed #4990, Fix the error in cocos2d-console when rename files on windows.
|
2014-04-30 11:25:47 +08:00 |
zhangbin
|
9ad5acec7c
|
Update the reference of submodule cocos2d-console.
|
2014-04-29 11:56:50 +08:00 |
shujunqiao
|
8ac1545686
|
[ci skip], modify android apk name in cocos-console-test.py.
|
2014-04-28 16:55:21 +08:00 |
James Chen
|
698b52093e
|
Merge pull request #6396 from natural-law/FuzzyMatch
Support fuzzy matching in the create project configuration.
|
2014-04-28 15:47:56 +08:00 |
James Chen
|
55b355009a
|
Merge pull request #6400 from lmskater/check-pr-title
[Jenkins][ci skip] Check pull request title to skip build
|
2014-04-28 15:00:37 +08:00 |
James Chen
|
e96883ec43
|
Merge pull request #6394 from samuele3hu/dev_compile_error
Fix compile error for Lua
|
2014-04-28 14:57:48 +08:00 |
lm
|
b2a414a660
|
[Jenkins][ci skip] Check pull request title to skip build
|
2014-04-28 14:54:29 +08:00 |
lm
|
d2c091edda
|
[Jenkins][ci skip] Catch exception in check_queue_build
|
2014-04-28 14:34:34 +08:00 |
zhangbin
|
0eaf8cc38d
|
Support fuzzy matching in the create project configuration.
|
2014-04-28 14:16:19 +08:00 |
samuele3hu
|
c3f40bdc24
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into dev_compile_error
|
2014-04-28 14:05:08 +08:00 |
samuele3hu
|
d3670644bf
|
Fix compile error for Lua
|
2014-04-28 14:04:37 +08:00 |
James Chen
|
1634ae30c5
|
'develop' -> 'v3' branch for travis ci.
|
2014-04-28 11:28:03 +08:00 |
lm
|
575a7c988b
|
[Jenkins][ci skip] Fix branch to v3 v2
|
2014-04-28 10:45:55 +08:00 |
James Chen
|
cd6fe294b8
|
Merge pull request #6288 from boyu0/bug4771_move_physicsworld_2_layer
closed #4771: Move PhysicsWorld to Layer
|
2014-04-25 11:52:32 +08:00 |
James Chen
|
8d706060a7
|
Merge pull request #6358 from shujunqiao/emptytest-upload
[ci skip], add ssh upload file in emptytest.py.
|
2014-04-25 10:59:58 +08:00 |
lm
|
41615fe56a
|
[Jenkins][ci skip] Change 'payload' to 'tag'
|
2014-04-23 18:10:39 +08:00 |
shujunqiao
|
c1d52f9af1
|
[ci skip], modify address_of_result_html display in emptytest.py.
|
2014-04-23 18:06:30 +08:00 |
shujunqiao
|
8b2d84a9e6
|
[ci skip],modify ssh directory in emptytest.py
|
2014-04-23 17:55:53 +08:00 |
shujunqiao
|
e749ab8ddb
|
[ci skip], add ssh upload file in emptytest.py.
|
2014-04-23 16:32:37 +08:00 |
lm
|
2c55c740ba
|
[Jenkins][ci skip] Git fetch tag
|
2014-04-22 14:31:56 +08:00 |
lm
|
7005d6664d
|
[Jenkins][ci skip] Clean workspace before debug build or release build
|
2014-04-22 12:36:40 +08:00 |
lm
|
9f7021fd6c
|
[Jenkins][ci skip] Add [ci release xxx] command
|
2014-04-22 11:41:14 +08:00 |
zhangbin
|
b7ff312c7c
|
Update the reference of submodule cocos2d-console.
|
2014-04-22 11:21:13 +08:00 |
shujunqiao
|
48d3714bf2
|
[ci skip], delete wake function in emptytest.py.
|
2014-04-22 11:04:17 +08:00 |
shujunqiao
|
79e9c315d8
|
[ci skip], add get android device infomation in emptytest.py.
|
2014-04-21 18:18:48 +08:00 |
minggo
|
0a5b92c56f
|
Merge pull request #6305 from samuele3hu/developAudio
fix the bug that exit layer can’t end the SimpleAudioEngine
|
2014-04-21 14:40:40 +08:00 |
zhangbin
|
00910216b1
|
Update the reference of submodule cocos2d-console.
|
2014-04-21 11:01:39 +08:00 |
minggo
|
541f0b0a19
|
Merge pull request #6315 from natural-law/issue4863
Update the reference of submodule "cocos2d-console".
|
2014-04-18 13:57:52 +08:00 |
lm
|
dfeac8c7d2
|
[Jenkins][ci skip] Fix result comment body of Emptytest
|
2014-04-17 18:08:15 +08:00 |
zhangbin
|
0e14c2ad3f
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into issue4863
|
2014-04-17 17:19:57 +08:00 |
zhangbin
|
33472c7805
|
closed #4863, Zipalign the apk generated with release mode.
|
2014-04-17 17:18:39 +08:00 |
lm
|
c34b3d5324
|
[Jenkins][ci skip] Add android.permission.INTERNET to cpp-empty-test
|
2014-04-17 17:04:28 +08:00 |
heliclei
|
70c20ddfb2
|
add execute permission
|
2014-04-17 15:08:49 +08:00 |
minggo
|
5d90fd73d3
|
Merge pull request #6235 from natural-law/issue4727
Support run sample projects with console.
|
2014-04-17 12:05:50 +08:00 |
samuele3hu
|
11515f6ab3
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developAudio
|
2014-04-17 11:06:20 +08:00 |
samuele3hu
|
1331fff62c
|
fix the bug that exit layer can’t end SimpleAudioEngine
|
2014-04-17 10:36:08 +08:00 |
lm
|
008bdba373
|
[Jenkins][ci skip] Change 'GITHUB_ACCESS_TOKEN' to 'GITHUB_COMMENT_ACCESS_TOKEN'
|
2014-04-17 09:57:55 +08:00 |
lm
|
fb462b90b6
|
[Jenkins][ci skip] Fix 'comments_url' parameter
|
2014-04-16 18:56:17 +08:00 |
lm
|
84b6981e2b
|
[Jenkins][ci skip] Comment result of emptytest
|
2014-04-16 18:36:05 +08:00 |
James Chen
|
ba38268167
|
Merge pull request #6292 from lmskater/add-emptytest-command
[Jenkins][ci skip] Add [ci emptytest] command
|
2014-04-16 17:28:20 +08:00 |
lm
|
3b16a267fb
|
[Jenkins][ci skip] Fix 'localfile' parameter
|
2014-04-16 16:26:50 +08:00 |
lm
|
b78c89d39b
|
[Jenkins][ci skip] Fix ftp home in upload_apk.sh
|
2014-04-16 14:19:13 +08:00 |
lm
|
3cbe02771d
|
[Jenkins][ci skip] Fix ftp home in upload_apk.sh
|
2014-04-16 13:47:40 +08:00 |
James Chen
|
4dadd3537e
|
Merge pull request #6289 from lmskater/create-save-apk
[Jenkins][ci skip] Create and save cpp-empty-test apk for autotest
|
2014-04-16 11:14:50 +08:00 |
James Chen
|
99ff168512
|
Merge pull request #6282 from shujunqiao/empty-test
[ci skip], add emptytest.py
|
2014-04-16 11:13:35 +08:00 |
lm
|
e5cd2adaad
|
[Jenkins][ci skip] Add [ci emptytest] command
|
2014-04-16 11:05:27 +08:00 |
zhangbin
|
4af7e14dc8
|
Update the reference of submodule cocos2d-console.
|
2014-04-16 10:32:43 +08:00 |
shujunqiao
|
17811f00a1
|
[ci skip], modify apk path.
|
2014-04-15 18:28:56 +08:00 |
lm
|
7e495c9619
|
[Jenkins][ci skip] Create and save cpp-empty-test apk for autotest
|
2014-04-15 18:15:31 +08:00 |
shujunqiao
|
fcd72adf9f
|
[ci skip], modify information of print.
|
2014-04-15 17:41:40 +08:00 |
zhangbin
|
dd5c2aacd6
|
Merge branch 'develop' into issue4727
Conflicts:
tools/cocos2d-console
|
2014-04-15 15:18:00 +08:00 |
shujunqiao
|
3b8934f205
|
[ci skip], modify print infomation in emptytest.py
|
2014-04-15 13:43:38 +08:00 |
boyu0
|
b53961b78d
|
issue $4771: fix lua test and fix some bugs
|
2014-04-15 13:40:44 +08:00 |
minggo
|
0ecd8e271e
|
update console submodule
|
2014-04-14 21:02:01 +08:00 |
shujunqiao
|
58f2de8598
|
[ci skip], add emptytest.py
|
2014-04-14 18:43:26 +08:00 |
zhangbin
|
7874cd8045
|
closed #4786, Show tip message when python is not compatible.
|
2014-04-14 17:29:37 +08:00 |
shujunqiao
|
884974f5e4
|
[ci skip], add close app in autotest.py
|
2014-04-14 11:55:11 +08:00 |
lm
|
3088ac88f5
|
[Jenkins][ci skip] Add rebuild when git fail in pull request builder
|
2014-04-11 15:06:14 +08:00 |
zhangbin
|
76972e6304
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into issue4727
|
2014-04-11 11:37:50 +08:00 |
zhangbin
|
29615f7e26
|
closed #4727, Support run sample projects with console.
|
2014-04-11 11:36:23 +08:00 |
shujunqiao
|
c937cad4c9
|
[ci skip], fix android part in cocos-console-test.py.
|
2014-04-10 18:20:53 +08:00 |
samuele3hu
|
249163c32d
|
Update config files for lua bindings-generator and `lua_cocos2dx_manual.cpp` file
|
2014-04-10 15:52:51 +08:00 |
James Chen
|
efb443dea0
|
Merge pull request #6200 from dumganhar/iss4729-deprecated-folder
issue #4729: Move deprecated stuff to deprecated folder
|
2014-04-10 11:17:21 +08:00 |
zhangbin
|
cd6ff8f391
|
Update the reference of submodule cocos2d-console.
|
2014-04-10 09:51:46 +08:00 |
James Chen
|
7cdd041b79
|
issue #4729: Adds missing include path in cocos2dx_physics.ini
|
2014-04-10 00:37:42 +08:00 |
James Chen
|
a2a712bc17
|
issue #4729: Updates tools/tolua/cocos2dx.ini
|
2014-04-10 00:36:42 +08:00 |
shujunqiao
|
71bc948369
|
not excute android autotest now.
|
2014-04-09 16:30:08 +08:00 |
James Chen
|
82333e357e
|
Updates bindings-generator to the latest version.
|
2014-04-09 15:44:07 +08:00 |
shujunqiao
|
11af83dbf6
|
[ci skip], add get package size in cocos-console-test.py.
|
2014-04-08 18:02:12 +08:00 |
James Chen
|
02507ce25f
|
Merge pull request #6173 from lmskater/fix-git-fail-return-value
[Jenkins][ci skip]: Modified the return value when git fails, it's used for `ci rebuild`
|
2014-04-08 17:32:31 +08:00 |
lm
|
ca9b4a3196
|
[Jenkins][ci skip]: Fix return value of git fail
|
2014-04-08 16:35:01 +08:00 |
zhangbin
|
99f7ca5c40
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into issue4666
|
2014-04-08 16:27:18 +08:00 |
zhangbin
|
12fb27b01e
|
closed #4666, Update the build configuration files in template & update the reference of submodule cocos2d-console.
|
2014-04-08 16:23:12 +08:00 |
shujunqiao
|
1d2c91e403
|
add send email in cocos-console-test.py.
|
2014-04-04 17:11:16 +08:00 |
samuele3hu
|
550f4dca29
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_new_label
|
2014-04-03 17:03:09 +08:00 |
samuele3hu
|
b68f6bf65e
|
fix the error about `draw` of GLNode and modify the related test cases
|
2014-04-03 17:02:14 +08:00 |
lm
|
06ba28597c
|
[Jenkins][ci skip]: Fix call method
|
2014-04-03 11:42:34 +08:00 |
lm
|
7f1d694f03
|
[Jenkins][ci skip]: Monitor jenkins queue build
|
2014-04-03 11:24:44 +08:00 |
James Chen
|
18648434ac
|
Merge pull request #6109 from lmskater/add-jenkins-job-configs
[Jenkins][ci skip]: add jenkins job configs
|
2014-04-02 17:14:26 +08:00 |
linchaogithub
|
5da5f5566a
|
[jenkins-watchdog.py]remove extra build_time()
|
2014-04-02 16:26:20 +08:00 |
linchaogithub
|
35b07145dd
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
|
2014-04-02 16:22:45 +08:00 |
lm
|
8bf0ff7897
|
[Jenkins][ci skip]: add jenkins job configs
|
2014-04-02 15:21:44 +08:00 |
heliclei
|
a6dd44e38c
|
[ci skip]fix typo
|
2014-04-01 22:08:32 +08:00 |
heliclei
|
5d37f8960d
|
[ci skip]auto detect android device ip via adb command
|
2014-04-01 22:05:47 +08:00 |
heliclei
|
f04ca0069c
|
fix autotest infinite loop
|
2014-04-01 16:05:28 +08:00 |
shujunqiao
|
27f1ded3cd
|
add android part in cocos-console-test.
|
2014-03-28 17:50:07 +08:00 |
shujunqiao
|
fb780f82da
|
add [director end] command in CCConsole.cpp.
|
2014-03-28 13:40:24 +08:00 |
shujunqiao
|
ba97b6cf8a
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into cocos-console-test
|
2014-03-28 09:25:16 +08:00 |
zhangbin
|
0c82a4a3e0
|
Add tools/bindings-generator & tools/tolua into the lua project template.
|
2014-03-27 15:38:01 +08:00 |
James Chen
|
c80fdaa54f
|
Merge pull request #6020 from samuele3hu/develop_test
Update the cocos2dx.ini for lua binding
|
2014-03-27 14:40:56 +08:00 |
lm
|
edd14e6765
|
[Jenkins] Make build as failed when generating bindings fails
|
2014-03-27 14:28:40 +08:00 |
samuele3hu
|
a64f44d6b2
|
Add lua binding for `getOpenGLView` of `Director`
|
2014-03-27 14:16:20 +08:00 |
samuele3hu
|
8b754c6257
|
Update coco2dx.ini for binding `ProtectedNode` class
|
2014-03-27 14:08:19 +08:00 |
shujunqiao
|
d38f873ecc
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into cocos-console-test
|
2014-03-27 10:56:29 +08:00 |
zhangbin
|
269c63ec69
|
Update the reference of submodule "cocos2d-console".
|
2014-03-27 09:50:16 +08:00 |
lm
|
640a82c2ab
|
[Jenkins] Make build as failed when git fetch is failed
|
2014-03-26 14:29:53 +08:00 |
samuele3hu
|
ac0ad54433
|
Modify the config files for bindings-generator to fix the error about “is_ref_class”
|
2014-03-26 12:58:33 +08:00 |
samuele3hu
|
674bce677d
|
update `bindings-generator` submoudle
|
2014-03-26 12:56:29 +08:00 |
James Chen
|
b8eee8e1a4
|
[ci] Updates travis scripts. only commit relevant folder.
|
2014-03-25 17:07:15 +08:00 |
James Chen
|
bb190fe78a
|
[ci] Updates travis scripts.
|
2014-03-25 16:24:08 +08:00 |
zhangbin
|
beb6f7359c
|
Update the reference of submodule "cocos2d-console".
|
2014-03-25 14:19:46 +08:00 |
shujunqiao
|
e521632b55
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into cocos-console-test
|
2014-03-21 17:51:06 +08:00 |
shujunqiao
|
c55910c2c0
|
add-close app in console-test.py.
|
2014-03-21 17:50:38 +08:00 |
linchaogithub
|
1527fe1159
|
[jenkins-watchdog]add the time of single job
|
2014-03-21 17:36:27 +08:00 |
linchaogithub
|
4b726f55cd
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
|
2014-03-21 17:07:10 +08:00 |
linchaogithub
|
352e656305
|
[jenkins-watchdog]add the time of single job
|
2014-03-21 17:02:18 +08:00 |
James Chen
|
87cfbc9773
|
Merge pull request #5849 from shujunqiao/autotest
[jenkins] updates autotest.py
|
2014-03-21 16:52:58 +08:00 |
shujunqiao
|
a66a2a9bba
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into cocos-console-test
|
2014-03-21 14:36:28 +08:00 |
shujunqiao
|
d18ee12678
|
for test close project in cocos-console-test.py.
|
2014-03-21 14:15:59 +08:00 |
lm
|
9598c151ed
|
[Jenkins] Clean workspace after build finish
|
2014-03-21 13:57:38 +08:00 |
shujunqiao
|
686ed5dfa1
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into cocos-console-test
|
2014-03-21 10:42:23 +08:00 |
shujunqiao
|
fdb87cc69d
|
ignore [] in command [console run].
|
2014-03-20 17:40:41 +08:00 |
lm
|
3db3a12318
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into add-master-build
|
2014-03-20 16:20:02 +08:00 |
lm
|
3f09fbdade
|
[Jenkins] Add master build in pull-request-builder.py
|
2014-03-20 16:19:35 +08:00 |
James Chen
|
3e83dc9b1d
|
Merge pull request #5872 from shujunqiao/cocos-console-test
[jenkins] modify job-comment-trigger to support [console].
|
2014-03-20 15:14:42 +08:00 |
zhangbin
|
64f90e5f04
|
Update the reference of submodule "cocos2d-console".
|
2014-03-20 14:12:58 +08:00 |
andyque
|
6b042d26da
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into cocos-console-test
|
2014-03-20 10:43:31 +08:00 |
andyque
|
abc88ecc6a
|
delete not need variable in cocos-console-test.py.
|
2014-03-20 10:41:19 +08:00 |
andyque
|
7ea6185bbb
|
"modify console_cmd to console_param in cocos-console-test.py."
|
2014-03-20 10:32:04 +08:00 |
andyque
|
4bd7a60ca9
|
modify args of [console].
|
2014-03-20 10:24:10 +08:00 |
samuele3hu
|
3b2a5274ea
|
Update `bindings-generator` submodule
|
2014-03-20 10:12:04 +08:00 |
andyque
|
2f5e9ed654
|
modify job-comment-trigger to support [console].
|
2014-03-19 17:57:19 +08:00 |
James Chen
|
863272b1c8
|
Merge pull request #5855 from lmskater/fix-android-build
[Jenkins] build all samples on android
|
2014-03-19 12:01:37 +08:00 |
James Chen
|
05db740d2f
|
Merge pull request #5837 from linchaogithub/develop
[jenkins-watchdog] update
|
2014-03-19 12:01:13 +08:00 |
lm
|
426b006bfb
|
[Jenkins] build all samples on android
|
2014-03-18 17:27:57 +08:00 |
CocosRobot
|
ee0e43fcc2
|
modify android-job in autotest.py.
|
2014-03-18 16:21:41 +08:00 |
James Chen
|
7a16ffff84
|
Merge pull request #5848 from samuele3hu/develop_3_fix
Update `bindings-generator` submodule and resolve a error about the return value of FileUtilsWin32::getWritablePath()
|
2014-03-18 15:52:07 +08:00 |
lm
|
716f480eb4
|
[Jenkins] make build fail when submodule update fail
|
2014-03-18 14:37:23 +08:00 |
andyque
|
8c25fd5e8f
|
modify android-build-autotest in autotest.py.
|
2014-03-18 14:30:01 +08:00 |
andyque
|
a4bba6d03a
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into autotest
|
2014-03-18 14:07:24 +08:00 |
andyque
|
761456d480
|
test android part of autotest.py.
|
2014-03-18 14:06:33 +08:00 |
samuele3hu
|
402b6f0f28
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_3_fix
|
2014-03-18 10:40:12 +08:00 |
samuele3hu
|
309422f791
|
update `bindings-generator` submodule
|
2014-03-18 10:36:37 +08:00 |
minggo
|
36cfd17e7b
|
Merge pull request #5834 from shujunqiao/autotest
modify autotest.py for use mac app.
|
2014-03-17 17:59:36 +08:00 |
linchaogithub
|
88232d86bd
|
[jenkins-watchdog] ['JENKINS_ADMIN']replace['username'],['JENKINS_ADMIN_PW']replace['password']
|
2014-03-17 16:10:26 +08:00 |
zhangbin
|
bf68f180b4
|
Update the reference of submodule "cocos2d-console".
|
2014-03-17 15:25:07 +08:00 |
linchaogithub
|
bcdf74f4ee
|
[jenkins-watchdog] int(os.environ['jenkins-job-watchdog-threshold'])replace os.environ['jenkins-job-watchdog-threshold']
|
2014-03-17 14:53:03 +08:00 |
CocosRobot
|
7fd3017b5f
|
modify autotest.py for use mac app.
|
2014-03-17 11:49:18 +08:00 |
lihex
|
da7b6d565c
|
update submodule
|
2014-03-15 12:20:22 +08:00 |
lihex
|
c0416fe554
|
update submodule
|
2014-03-15 00:37:00 +08:00 |
lihex
|
c36bae6c07
|
update submodule
|
2014-03-14 23:48:20 +08:00 |
James Chen
|
aa6029ca7d
|
Merge pull request #5811 from dumganhar/develop
Updates bindings-generator.
|
2014-03-14 23:05:13 +08:00 |
James Chen
|
7cff033b55
|
Updates bindings-generator.
|
2014-03-14 23:04:05 +08:00 |
lihex
|
f7a1d1f095
|
update submodule
|
2014-03-14 22:56:40 +08:00 |
lihex
|
99221ffcf1
|
update submodule
|
2014-03-14 22:17:47 +08:00 |
lihex
|
b62d2e8ec0
|
update submodule
|
2014-03-14 21:29:36 +08:00 |
lihex
|
2ea565018c
|
update submodule
|
2014-03-14 19:41:51 +08:00 |
Dhilan007
|
2089dd9ccd
|
update Lua binding for label.
|
2014-03-14 16:21:56 +08:00 |
lihex
|
28a71ff14e
|
update submodule
|
2014-03-13 22:11:38 +08:00 |
lihex
|
3ce647268d
|
update submodule
|
2014-03-13 19:35:55 +08:00 |
James Chen
|
b37bd73861
|
Merge pull request #5751 from linchaogithub/develop
[Jenkins-watchdog] check & kill dead buid
|
2014-03-13 17:50:53 +08:00 |
qiaofeng00oo
|
3013bf2d6d
|
modify cocos-console-test.py.
|
2014-03-13 17:05:10 +08:00 |
qiaofeng00oo
|
17ba28de2a
|
add cocos-console-test.py to tools/jenkins-scripts/
|
2014-03-13 16:29:47 +08:00 |
samuele3hu
|
a30ce6cfc5
|
Update `bindings-generator` submodule
|
2014-03-13 14:47:00 +08:00 |
samuele3hu
|
108928e1a7
|
Update `bindings-generator` submodule and add auto-binding for the `RichText`
|
2014-03-13 14:31:07 +08:00 |
linchaogithub
|
347dd55f3d
|
[jenkins-job-watchdog-threshold]replace[duration]
|
2014-03-13 14:12:29 +08:00 |
linchaogithub
|
ab4841e774
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
|
2014-03-13 11:17:50 +08:00 |
linchaogithub
|
9dcca7641c
|
[Jenkins] watchdog
|
2014-03-13 11:16:21 +08:00 |
James Chen
|
2b657e71c4
|
Merge pull request #5727 from natural-law/develop
Update the reference of submodule "cocos2d-console".
|
2014-03-12 20:36:44 +08:00 |
zhangbin
|
be51779c4e
|
Update the reference of submodule "cocos2d-console".
|
2014-03-12 20:35:05 +08:00 |
James Chen
|
04038a912f
|
[travis ci] Sort file list in generate-template-files.py.
|
2014-03-12 20:34:49 +08:00 |
James Chen
|
c4752b260b
|
Updates tools/travis-scripts/generate-template-files.py.
|
2014-03-12 20:18:55 +08:00 |
chuanweizhang2013
|
884229e898
|
modify generate-template-files
|
2014-03-12 17:20:15 +08:00 |
linchaogithub
|
d1a84cd7e8
|
[Jenkins] watchdog
|
2014-03-12 17:18:16 +08:00 |
linchaogithub
|
db68e1feed
|
[jenkins] watchdog
|
2014-03-12 16:28:23 +08:00 |
linchaogithub
|
d7aa1312ba
|
[Jenkins] watchdog
|
2014-03-12 15:36:09 +08:00 |
lihex
|
00a364e66f
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
Conflicts:
templates/lua-template-default/frameworks/runtime-src/proj.android/build-cfg.json
|
2014-03-12 14:13:20 +08:00 |
andyque
|
2c2a5ee38e
|
rename gui to ui
|
2014-03-12 10:46:49 +08:00 |
andyque
|
90938429d0
|
reset cocos-console commit
|
2014-03-12 10:37:33 +08:00 |
andyque
|
8e125734fe
|
Merge branch 'develop' into fix_gui_to_ui
Conflicts:
build/cocos2d_samples.xcodeproj/project.pbxproj
samples/cpp-tests/Resources/cocosgui/100/100.ExportJson
samples/cpp-tests/Resources/cocosgui/100/1000.plist
samples/cpp-tests/Resources/cocosgui/100/1000.png
samples/cpp-tests/Resources/cocosgui/CloseNormal.png
samples/cpp-tests/Resources/cocosgui/CloseSelected.png
samples/cpp-tests/Resources/cocosgui/CocoGUISample.json
samples/cpp-tests/Resources/cocosgui/CocoGUI_PageView_Sample.json
samples/cpp-tests/Resources/cocosgui/CustomImageViewTest/NewProject_20.plist
samples/cpp-tests/Resources/cocosgui/CustomImageViewTest/NewProject_20.png
samples/cpp-tests/Resources/cocosgui/CustomImageViewTest/NewProject_2_1.ExportJson
samples/cpp-tests/Resources/cocosgui/Hello.png
samples/cpp-tests/Resources/cocosgui/Marker Felt.ttf
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIButton_Editor/UIButton_Editor_1.json
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIButton_Editor/background.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIButton_Editor/buttonBackground.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIButton_Editor/buttonHighlighted.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIButton_Editor/button_n.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIButton_Editor/button_p.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIButton_Editor/ribbon.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UICheckBox_Editor/background.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UICheckBox_Editor/buttonBackground.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UICheckBox_Editor/ribbon.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UICheckBox_Editor/selected01.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UICheckBox_Editor/selected02.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UICheckBox_Editor/ui_checkbox_editor_1.json
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIImageView_Editor/GUI/image.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIImageView_Editor/background.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIImageView_Editor/buttonBackground.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIImageView_Editor/buttonHighlighted.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIImageView_Editor/ribbon.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIImageView_Editor/ui_ImageView_editor_1.json
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILabelAtlas_Editor/GUI/labelatlasimg.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILabelAtlas_Editor/background.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILabelAtlas_Editor/buttonBackground.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILabelAtlas_Editor/ribbon.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILabelAtlas_Editor/ui_labelatlas_editor_1.json
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILabelBMFont_Editor/GUI/missing-font.fnt
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILabelBMFont_Editor/GUI/missing-font.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILabelBMFont_Editor/background.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILabelBMFont_Editor/buttonBackground.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILabelBMFont_Editor/ribbon.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILabelBMFont_Editor/ui_labelbmfont_editor_1.json
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILabel_Editor/A Damn Mess.ttf
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILabel_Editor/background.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILabel_Editor/buttonBackground.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILabel_Editor/ribbon.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILabel_Editor/ui_label_editor_1.json
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/GUI/image.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/Hello.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/background.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/buttonBackground.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/button_n.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/button_p.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/ribbon.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/selected01.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/selected02.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/ui_layout_backgroundimage_editor_1_0_0.json
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Color_Editor/GUI/image.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Color_Editor/background.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Color_Editor/buttonBackground.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Color_Editor/button_n.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Color_Editor/button_p.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Color_Editor/ribbon.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Color_Editor/selected01.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Color_Editor/selected02.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Color_Editor/ui_layout_color_editor_1.json
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Editor/GUI/image.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Editor/background.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Editor/buttonBackground.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Editor/button_n.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Editor/button_p.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Editor/ribbon.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Editor/selected01.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Editor/selected02.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Editor/ui_layout_editor_1.json
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Gradient_Color_Editor/GUI/image.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Gradient_Color_Editor/background.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Gradient_Color_Editor/buttonBackground.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Gradient_Color_Editor/button_n.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Gradient_Color_Editor/button_p.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Gradient_Color_Editor/ribbon.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Gradient_Color_Editor/selected01.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Gradient_Color_Editor/selected02.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Gradient_Color_Editor/ui_layout_gradient_color_editor_1_0.json
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Horizontal_Layout_Editor/GUI/image.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Horizontal_Layout_Editor/background.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Horizontal_Layout_Editor/buttonBackground.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Horizontal_Layout_Editor/button_n.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Horizontal_Layout_Editor/button_p.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Horizontal_Layout_Editor/ribbon.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Horizontal_Layout_Editor/selected01.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Horizontal_Layout_Editor/selected02.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Horizontal_Layout_Editor/ui_layout_linear_horizontal_layout_editor.json
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Vertical_Layout_Editor/GUI/image.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Vertical_Layout_Editor/background.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Vertical_Layout_Editor/buttonBackground.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Vertical_Layout_Editor/button_n.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Vertical_Layout_Editor/button_p.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Vertical_Layout_Editor/ribbon.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Vertical_Layout_Editor/selected01.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Vertical_Layout_Editor/selected02.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Vertical_Layout_Editor/ui_layout_linear_vertical_layout_editor.json
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Location_Editor/GUI/image.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Location_Editor/background.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Location_Editor/buttonBackground.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Location_Editor/button_n.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Location_Editor/button_p.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Location_Editor/ribbon.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Location_Editor/selected01.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Location_Editor/selected02.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Location_Editor/ui_layout_relative_align_location_editor.json
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Parent_Editor/GUI/image.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Parent_Editor/background.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Parent_Editor/buttonBackground.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Parent_Editor/button_n.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Parent_Editor/button_p.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Parent_Editor/ribbon.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Parent_Editor/selected01.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Parent_Editor/selected02.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Parent_Editor/ui_layout_relative_align_parent_editor.json
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Scale9_BackgroundImage_Editor/GUI/image.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Scale9_BackgroundImage_Editor/background.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Scale9_BackgroundImage_Editor/buttonBackground.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Scale9_BackgroundImage_Editor/button_n.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Scale9_BackgroundImage_Editor/button_p.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Scale9_BackgroundImage_Editor/ribbon.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Scale9_BackgroundImage_Editor/selected01.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Scale9_BackgroundImage_Editor/selected02.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Scale9_BackgroundImage_Editor/slider_bar.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Scale9_BackgroundImage_Editor/ui_layout_scale9_backgroundimage_editor.json
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIListView_Editor/UIListView_Horizontal_Editor/GUI/button.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIListView_Editor/UIListView_Horizontal_Editor/GUI/image.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIListView_Editor/UIListView_Horizontal_Editor/background.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIListView_Editor/UIListView_Horizontal_Editor/buttonBackground.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIListView_Editor/UIListView_Horizontal_Editor/button_p.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIListView_Editor/UIListView_Horizontal_Editor/ribbon.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIListView_Editor/UIListView_Horizontal_Editor/ui_listview_horizontal_editor_1.json
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIListView_Editor/UIListView_Vertical_Editor/GUI/button.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIListView_Editor/UIListView_Vertical_Editor/GUI/image.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIListView_Editor/UIListView_Vertical_Editor/background.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIListView_Editor/UIListView_Vertical_Editor/buttonBackground.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIListView_Editor/UIListView_Vertical_Editor/button_p.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIListView_Editor/UIListView_Vertical_Editor/ribbon.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIListView_Editor/UIListView_Vertical_Editor/ui_listview_editor_1.json
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILoadingBar_Editor/GUI/loadingbar.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILoadingBar_Editor/background.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILoadingBar_Editor/buttonBackground.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILoadingBar_Editor/ribbon.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILoadingBar_Editor/ui_loadingbar_editor_1.json
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIPageView_Editor/background.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIPageView_Editor/buttonBackground.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIPageView_Editor/button_n.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIPageView_Editor/ribbon.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIPageView_Editor/ui_pageview_editor_1.json
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Both_Editor/GUI/image.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Both_Editor/background.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Both_Editor/buttonBackground.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Both_Editor/button_n.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Both_Editor/button_p.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Both_Editor/ribbon.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Both_Editor/selected01.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Both_Editor/selected02.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Both_Editor/ui_scrollview_both_editor_1.json
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Horizontal_Editor/GUI/image.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Horizontal_Editor/background.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Horizontal_Editor/buttonBackground.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Horizontal_Editor/button_n.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Horizontal_Editor/button_p.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Horizontal_Editor/ribbon.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Horizontal_Editor/selected01.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Horizontal_Editor/selected02.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Horizontal_Editor/ui_scrollview_horizontal_editor_1.json
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Vertical_Editor/GUI/image.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Vertical_Editor/background.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Vertical_Editor/buttonBackground.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Vertical_Editor/button_n.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Vertical_Editor/button_p.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Vertical_Editor/ribbon.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Vertical_Editor/selected01.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Vertical_Editor/selected02.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Vertical_Editor/ui_scrollview_editor_1.json
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UISlider_Editor/2014-1-26 11-42-09.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UISlider_Editor/2014-1-26 11-43-52.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UISlider_Editor/background.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UISlider_Editor/buttonBackground.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UISlider_Editor/ribbon.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UISlider_Editor/silder_progressBar.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UISlider_Editor/slider_bar.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UISlider_Editor/slider_bar_button.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UISlider_Editor/ui_slider_editor_1.json
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UITextField_Editor/background.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UITextField_Editor/buttonBackground.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UITextField_Editor/ribbon.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UITextField_Editor/ui_textfield_editor_1.json
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIWidgetAddNode_Editor/background.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIWidgetAddNode_Editor/buttonBackground.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIWidgetAddNode_Editor/ribbon.png
samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIWidgetAddNode_Editor/ui_widget_add_node_editor.json
samples/cpp-tests/Resources/cocosgui/UITest/UITest.json
samples/cpp-tests/Resources/cocosgui/UITest/b1.png
samples/cpp-tests/Resources/cocosgui/UITest/b2.png
samples/cpp-tests/Resources/cocosgui/UITest/background.png
samples/cpp-tests/Resources/cocosgui/UITest/buttonBackground.png
samples/cpp-tests/Resources/cocosgui/UITest/f1.png
samples/cpp-tests/Resources/cocosgui/UITest/f2.png
samples/cpp-tests/Resources/cocosgui/UITest/r1.png
samples/cpp-tests/Resources/cocosgui/UITest/r2.png
samples/cpp-tests/Resources/cocosgui/UITest/ribbon.png
samples/cpp-tests/Resources/cocosgui/animationbuttonnormal.png
samples/cpp-tests/Resources/cocosgui/animationbuttonpressed.png
samples/cpp-tests/Resources/cocosgui/arrow.png
samples/cpp-tests/Resources/cocosgui/b11.png
samples/cpp-tests/Resources/cocosgui/backtotopnormal.png
samples/cpp-tests/Resources/cocosgui/backtotoppressed.png
samples/cpp-tests/Resources/cocosgui/bitmapFontTest2.fnt
samples/cpp-tests/Resources/cocosgui/bitmapFontTest2.png
samples/cpp-tests/Resources/cocosgui/button.png
samples/cpp-tests/Resources/cocosgui/buttonHighlighted.png
samples/cpp-tests/Resources/cocosgui/ccicon.png
samples/cpp-tests/Resources/cocosgui/check_box_active.png
samples/cpp-tests/Resources/cocosgui/check_box_active_disable.png
samples/cpp-tests/Resources/cocosgui/check_box_active_press.png
samples/cpp-tests/Resources/cocosgui/check_box_normal.png
samples/cpp-tests/Resources/cocosgui/check_box_normal_disable.png
samples/cpp-tests/Resources/cocosgui/check_box_normal_press.png
samples/cpp-tests/Resources/cocosgui/examples/Test/UIResForEditor/Button/button_country_n.png
samples/cpp-tests/Resources/cocosgui/examples/Test/UIResForEditor/Button/button_country_p.png
samples/cpp-tests/Resources/cocosgui/examples/Test/UIResForEditor/Button/button_country_un.png
samples/cpp-tests/Resources/cocosgui/examples/Test/UIResForEditor/Button/symbol_1B.png
samples/cpp-tests/Resources/cocosgui/examples/Test/UIResForEditor/Button/symbol_1a.png
samples/cpp-tests/Resources/cocosgui/examples/Test/UIResForEditor/Button/symbol_1c.png
samples/cpp-tests/Resources/cocosgui/examples/equip/111.png
samples/cpp-tests/Resources/cocosgui/examples/equip/12.png
samples/cpp-tests/Resources/cocosgui/examples/equip/13.png
samples/cpp-tests/Resources/cocosgui/examples/equip/14.png
samples/cpp-tests/Resources/cocosgui/examples/equip/15.png
samples/cpp-tests/Resources/cocosgui/examples/equip/2.png
samples/cpp-tests/Resources/cocosgui/examples/equip/button_end_01.png
samples/cpp-tests/Resources/cocosgui/examples/equip/button_end_02.png
samples/cpp-tests/Resources/cocosgui/examples/equip/button_green_n2.png
samples/cpp-tests/Resources/cocosgui/examples/equip/button_green_p2.png
samples/cpp-tests/Resources/cocosgui/examples/equip/button_green_un2.png
samples/cpp-tests/Resources/cocosgui/examples/equip/eg/1.png
samples/cpp-tests/Resources/cocosgui/examples/equip/eg/10.png
samples/cpp-tests/Resources/cocosgui/examples/equip/eg/11.png
samples/cpp-tests/Resources/cocosgui/examples/equip/eg/3.png
samples/cpp-tests/Resources/cocosgui/examples/equip/eg/4.png
samples/cpp-tests/Resources/cocosgui/examples/equip/eg/5.png
samples/cpp-tests/Resources/cocosgui/examples/equip/eg/6.png
samples/cpp-tests/Resources/cocosgui/examples/equip/eg/7.png
samples/cpp-tests/Resources/cocosgui/examples/equip/eg/8.png
samples/cpp-tests/Resources/cocosgui/examples/equip/eg/9.png
samples/cpp-tests/Resources/cocosgui/examples/equip/eg/crab.png
samples/cpp-tests/Resources/cocosgui/examples/equip/eg/research.png
samples/cpp-tests/Resources/cocosgui/examples/equip/eg/sell.png
samples/cpp-tests/Resources/cocosgui/examples/equip/eg/shop_shield_1.png
samples/cpp-tests/Resources/cocosgui/examples/equip/eg/shop_shield_2.png
samples/cpp-tests/Resources/cocosgui/examples/equip/eg/shop_shield_3.png
samples/cpp-tests/Resources/cocosgui/examples/equip/eg/train.png
samples/cpp-tests/Resources/cocosgui/examples/equip/eg/upgrade.png
samples/cpp-tests/Resources/cocosgui/examples/examples.json
samples/cpp-tests/Resources/cocosgui/examples/weapon_introduce/4.png
samples/cpp-tests/Resources/cocosgui/examples/weapon_introduce/5.png
samples/cpp-tests/Resources/cocosgui/examples/weapon_introduce/6.png
samples/cpp-tests/Resources/cocosgui/examples/weapon_introduce/button_end_01.png
samples/cpp-tests/Resources/cocosgui/examples/weapon_introduce/button_end_02.png
samples/cpp-tests/Resources/cocosgui/examples/weapon_introduce/weapon_item_1/weapon_item/1.png
samples/cpp-tests/Resources/cocosgui/examples/weapon_introduce/weapon_item_1/weapon_item/2.png
samples/cpp-tests/Resources/cocosgui/examples/weapon_introduce/weapon_item_1/weapon_item/7.png
samples/cpp-tests/Resources/cocosgui/examples/weapon_introduce/weapon_item_1/weapon_item_1.json
samples/cpp-tests/Resources/cocosgui/green_edit.png
samples/cpp-tests/Resources/cocosgui/grossini-aliases.png
samples/cpp-tests/Resources/cocosgui/gui_examples/UIAction_1/CocoStudio_UIEditor.png
samples/cpp-tests/Resources/cocosgui/gui_examples/UIAction_1/UIAction_1.json
samples/cpp-tests/Resources/cocosgui/gui_examples/buy_1/5.png
samples/cpp-tests/Resources/cocosgui/gui_examples/buy_1/7.png
samples/cpp-tests/Resources/cocosgui/gui_examples/buy_1/button.png
samples/cpp-tests/Resources/cocosgui/gui_examples/buy_1/buttonHighlighted.png
samples/cpp-tests/Resources/cocosgui/gui_examples/buy_1/buy_1.json
samples/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/111.png
samples/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/12.png
samples/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/13.png
samples/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/14.png
samples/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/15.png
samples/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/2.png
samples/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/button_end_01.png
samples/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/button_end_02.png
samples/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/button_green_n2.png
samples/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/button_green_p2.png
samples/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/button_green_un2.png
samples/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/eg/1.png
samples/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/eg/10.png
samples/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/eg/11.png
samples/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/eg/3.png
samples/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/eg/4.png
samples/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/eg/5.png
samples/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/eg/6.png
samples/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/eg/7.png
samples/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/eg/8.png
samples/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/eg/9.png
samples/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/eg/crab.png
samples/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/eg/research.png
samples/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/eg/sell.png
samples/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/eg/shop_shield_1.png
samples/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/eg/shop_shield_2.png
samples/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/eg/shop_shield_3.png
samples/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/eg/train.png
samples/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/eg/upgrade.png
samples/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip_1.json
samples/cpp-tests/Resources/cocosgui/gui_examples/map_1/image_castle.png
samples/cpp-tests/Resources/cocosgui/gui_examples/map_1/map_1.json
samples/cpp-tests/Resources/cocosgui/gui_examples/map_1/map_pve.png
samples/cpp-tests/Resources/cocosgui/gui_examples/map_alert_1/5.png
samples/cpp-tests/Resources/cocosgui/gui_examples/map_alert_1/7.png
samples/cpp-tests/Resources/cocosgui/gui_examples/map_alert_1/close_02.png
samples/cpp-tests/Resources/cocosgui/gui_examples/map_alert_1/close_03.png
samples/cpp-tests/Resources/cocosgui/gui_examples/map_alert_1/close_04.png
samples/cpp-tests/Resources/cocosgui/gui_examples/map_alert_1/map_alert_1.json
samples/cpp-tests/Resources/cocosgui/gui_examples/page_1/background.png
samples/cpp-tests/Resources/cocosgui/gui_examples/page_1/buttonBackground.png
samples/cpp-tests/Resources/cocosgui/gui_examples/page_1/page_1.json
samples/cpp-tests/Resources/cocosgui/gui_examples/page_1/page_content/CocoStudio_AnimationEditor.png
samples/cpp-tests/Resources/cocosgui/gui_examples/page_1/page_content/CocoStudio_DataEditor.png
samples/cpp-tests/Resources/cocosgui/gui_examples/page_1/page_content/CocoStudio_SceneEditor.png
samples/cpp-tests/Resources/cocosgui/gui_examples/page_1/page_content/CocoStudio_UIEditor.png
samples/cpp-tests/Resources/cocosgui/gui_examples/page_1/ribbon.png
samples/cpp-tests/Resources/cocosgui/gui_examples/page_1/teehanlax - iOS 6 - iPhone_check.png
samples/cpp-tests/Resources/cocosgui/gui_examples/page_1/teehanlax - iOS 6 - iPhone_check01.png
samples/cpp-tests/Resources/cocosgui/gui_examples/register_1/128_128.png
samples/cpp-tests/Resources/cocosgui/gui_examples/register_1/Rosewood stdloadingH.fnt
samples/cpp-tests/Resources/cocosgui/gui_examples/register_1/Rosewood stdloadingH.png
samples/cpp-tests/Resources/cocosgui/gui_examples/register_1/button_d.png
samples/cpp-tests/Resources/cocosgui/gui_examples/register_1/button_n.png
samples/cpp-tests/Resources/cocosgui/gui_examples/register_1/e-mail.png
samples/cpp-tests/Resources/cocosgui/gui_examples/register_1/register_1.json
samples/cpp-tests/Resources/cocosgui/gui_examples/register_1/ui_shop_005-hd.png
samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_introduce/4.png
samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_introduce/5.png
samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_introduce/6.png
samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_introduce/button_end_01.png
samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_introduce/button_end_02.png
samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_introduce_1.json
samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapon_item/1.png
samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapon_item/2.png
samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapon_item/7.png
samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapon_item_1.json
samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_1.png
samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_10.png
samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_11.png
samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_12.png
samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_13.png
samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_14.png
samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_15.png
samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_16.png
samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_17.png
samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_18.png
samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_19.png
samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_2.png
samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_20.png
samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_21.png
samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_22.png
samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_23.png
samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_24.png
samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_25.png
samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_26.png
samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_27.png
samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_28.png
samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_29.png
samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_3.png
samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_30.png
samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_31.png
samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_4.png
samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_5.png
samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_6.png
samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_7.png
samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_8.png
samples/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_9.png
samples/cpp-tests/Resources/cocosgui/labelatlas.png
samples/cpp-tests/Resources/cocosgui/loadingbar.png
samples/cpp-tests/Resources/cocosgui/scrollviewbg.png
samples/cpp-tests/Resources/cocosgui/slidbar.png
samples/cpp-tests/Resources/cocosgui/sliderProgress.png
samples/cpp-tests/Resources/cocosgui/sliderProgress2.png
samples/cpp-tests/Resources/cocosgui/sliderThumb.png
samples/cpp-tests/Resources/cocosgui/sliderTrack.png
samples/cpp-tests/Resources/cocosgui/sliderTrack2.png
samples/cpp-tests/Resources/cocosgui/slider_bar_active_9patch.png
samples/cpp-tests/Resources/cocosgui/sliderballnormal.png
samples/cpp-tests/Resources/cocosgui/sliderballpressed.png
samples/cpp-tests/Resources/cocosgui/switch-mask.png
samples/cpp-tests/Resources/cocosui/100/100.ExportJson
samples/cpp-tests/Resources/cocosui/100/1000.plist
samples/cpp-tests/Resources/cocosui/100/1000.png
samples/cpp-tests/Resources/cocosui/CloseNormal.png
samples/cpp-tests/Resources/cocosui/CloseSelected.png
samples/cpp-tests/Resources/cocosui/CocoGUISample.json
samples/cpp-tests/Resources/cocosui/CocoGUI_PageView_Sample.json
samples/cpp-tests/Resources/cocosui/CustomImageViewTest/NewProject_20.plist
samples/cpp-tests/Resources/cocosui/CustomImageViewTest/NewProject_20.png
samples/cpp-tests/Resources/cocosui/CustomImageViewTest/NewProject_2_1.ExportJson
samples/cpp-tests/Resources/cocosui/Hello.png
samples/cpp-tests/Resources/cocosui/Marker Felt.ttf
samples/cpp-tests/Resources/cocosui/UIEditorTest/UIButton_Editor/UIButton_Editor_1.json
samples/cpp-tests/Resources/cocosui/UIEditorTest/UIButton_Editor/background.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UIButton_Editor/buttonBackground.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UIButton_Editor/buttonHighlighted.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UIButton_Editor/button_n.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UIButton_Editor/button_p.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UIButton_Editor/ribbon.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UICheckBox_Editor/background.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UICheckBox_Editor/buttonBackground.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UICheckBox_Editor/ribbon.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UICheckBox_Editor/selected01.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UICheckBox_Editor/selected02.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UICheckBox_Editor/ui_checkbox_editor_1.json
samples/cpp-tests/Resources/cocosui/UIEditorTest/UIImageView_Editor/GUI/image.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UIImageView_Editor/background.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UIImageView_Editor/buttonBackground.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UIImageView_Editor/buttonHighlighted.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UIImageView_Editor/ribbon.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UIImageView_Editor/ui_ImageView_editor_1.json
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILabelAtlas_Editor/GUI/labelatlasimg.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILabelAtlas_Editor/background.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILabelAtlas_Editor/buttonBackground.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILabelAtlas_Editor/ribbon.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILabelAtlas_Editor/ui_labelatlas_editor_1.json
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILabelBMFont_Editor/GUI/missing-font.fnt
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILabelBMFont_Editor/GUI/missing-font.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILabelBMFont_Editor/background.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILabelBMFont_Editor/buttonBackground.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILabelBMFont_Editor/ribbon.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILabelBMFont_Editor/ui_labelbmfont_editor_1.json
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILabel_Editor/A Damn Mess.ttf
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILabel_Editor/background.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILabel_Editor/buttonBackground.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILabel_Editor/ribbon.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILabel_Editor/ui_label_editor_1.json
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/GUI/image.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/Hello.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/background.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/buttonBackground.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/button_n.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/button_p.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/ribbon.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/selected01.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/selected02.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/ui_layout_backgroundimage_editor_1_0_0.json
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Color_Editor/GUI/image.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Color_Editor/background.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Color_Editor/buttonBackground.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Color_Editor/button_n.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Color_Editor/button_p.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Color_Editor/ribbon.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Color_Editor/selected01.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Color_Editor/selected02.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Color_Editor/ui_layout_color_editor_1.json
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Editor/GUI/image.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Editor/background.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Editor/buttonBackground.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Editor/button_n.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Editor/button_p.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Editor/ribbon.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Editor/selected01.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Editor/selected02.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Editor/ui_layout_editor_1.json
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Gradient_Color_Editor/GUI/image.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Gradient_Color_Editor/background.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Gradient_Color_Editor/buttonBackground.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Gradient_Color_Editor/button_n.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Gradient_Color_Editor/button_p.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Gradient_Color_Editor/ribbon.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Gradient_Color_Editor/selected01.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Gradient_Color_Editor/selected02.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Gradient_Color_Editor/ui_layout_gradient_color_editor_1_0.json
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Linear_Horizontal_Layout_Editor/GUI/image.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Linear_Horizontal_Layout_Editor/background.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Linear_Horizontal_Layout_Editor/buttonBackground.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Linear_Horizontal_Layout_Editor/button_n.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Linear_Horizontal_Layout_Editor/button_p.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Linear_Horizontal_Layout_Editor/ribbon.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Linear_Horizontal_Layout_Editor/selected01.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Linear_Horizontal_Layout_Editor/selected02.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Linear_Horizontal_Layout_Editor/ui_layout_linear_horizontal_layout_editor.json
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Linear_Vertical_Layout_Editor/GUI/image.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Linear_Vertical_Layout_Editor/background.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Linear_Vertical_Layout_Editor/buttonBackground.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Linear_Vertical_Layout_Editor/button_n.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Linear_Vertical_Layout_Editor/button_p.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Linear_Vertical_Layout_Editor/ribbon.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Linear_Vertical_Layout_Editor/selected01.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Linear_Vertical_Layout_Editor/selected02.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Linear_Vertical_Layout_Editor/ui_layout_linear_vertical_layout_editor.json
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Location_Editor/GUI/image.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Location_Editor/background.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Location_Editor/buttonBackground.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Location_Editor/button_n.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Location_Editor/button_p.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Location_Editor/ribbon.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Location_Editor/selected01.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Location_Editor/selected02.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Location_Editor/ui_layout_relative_align_location_editor.json
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Parent_Editor/GUI/image.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Parent_Editor/background.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Parent_Editor/buttonBackground.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Parent_Editor/button_n.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Parent_Editor/button_p.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Parent_Editor/ribbon.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Parent_Editor/selected01.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Parent_Editor/selected02.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Parent_Editor/ui_layout_relative_align_parent_editor.json
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Scale9_BackgroundImage_Editor/GUI/image.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Scale9_BackgroundImage_Editor/background.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Scale9_BackgroundImage_Editor/buttonBackground.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Scale9_BackgroundImage_Editor/button_n.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Scale9_BackgroundImage_Editor/button_p.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Scale9_BackgroundImage_Editor/ribbon.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Scale9_BackgroundImage_Editor/selected01.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Scale9_BackgroundImage_Editor/selected02.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Scale9_BackgroundImage_Editor/slider_bar.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILayout_Editor/UILayout_Scale9_BackgroundImage_Editor/ui_layout_scale9_backgroundimage_editor.json
samples/cpp-tests/Resources/cocosui/UIEditorTest/UIListView_Editor/UIListView_Horizontal_Editor/GUI/button.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UIListView_Editor/UIListView_Horizontal_Editor/GUI/image.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UIListView_Editor/UIListView_Horizontal_Editor/background.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UIListView_Editor/UIListView_Horizontal_Editor/buttonBackground.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UIListView_Editor/UIListView_Horizontal_Editor/button_p.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UIListView_Editor/UIListView_Horizontal_Editor/ribbon.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UIListView_Editor/UIListView_Horizontal_Editor/ui_listview_horizontal_editor_1.json
samples/cpp-tests/Resources/cocosui/UIEditorTest/UIListView_Editor/UIListView_Vertical_Editor/GUI/button.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UIListView_Editor/UIListView_Vertical_Editor/GUI/image.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UIListView_Editor/UIListView_Vertical_Editor/background.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UIListView_Editor/UIListView_Vertical_Editor/buttonBackground.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UIListView_Editor/UIListView_Vertical_Editor/button_p.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UIListView_Editor/UIListView_Vertical_Editor/ribbon.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UIListView_Editor/UIListView_Vertical_Editor/ui_listview_editor_1.json
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILoadingBar_Editor/GUI/loadingbar.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILoadingBar_Editor/background.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILoadingBar_Editor/buttonBackground.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILoadingBar_Editor/ribbon.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UILoadingBar_Editor/ui_loadingbar_editor_1.json
samples/cpp-tests/Resources/cocosui/UIEditorTest/UIPageView_Editor/background.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UIPageView_Editor/buttonBackground.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UIPageView_Editor/button_n.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UIPageView_Editor/ribbon.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UIPageView_Editor/ui_pageview_editor_1.json
samples/cpp-tests/Resources/cocosui/UIEditorTest/UIScrollView_Editor/UIScrollView_Both_Editor/GUI/image.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UIScrollView_Editor/UIScrollView_Both_Editor/background.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UIScrollView_Editor/UIScrollView_Both_Editor/buttonBackground.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UIScrollView_Editor/UIScrollView_Both_Editor/button_n.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UIScrollView_Editor/UIScrollView_Both_Editor/button_p.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UIScrollView_Editor/UIScrollView_Both_Editor/ribbon.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UIScrollView_Editor/UIScrollView_Both_Editor/selected01.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UIScrollView_Editor/UIScrollView_Both_Editor/selected02.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UIScrollView_Editor/UIScrollView_Both_Editor/ui_scrollview_both_editor_1.json
samples/cpp-tests/Resources/cocosui/UIEditorTest/UIScrollView_Editor/UIScrollView_Horizontal_Editor/GUI/image.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UIScrollView_Editor/UIScrollView_Horizontal_Editor/background.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UIScrollView_Editor/UIScrollView_Horizontal_Editor/buttonBackground.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UIScrollView_Editor/UIScrollView_Horizontal_Editor/button_n.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UIScrollView_Editor/UIScrollView_Horizontal_Editor/button_p.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UIScrollView_Editor/UIScrollView_Horizontal_Editor/ribbon.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UIScrollView_Editor/UIScrollView_Horizontal_Editor/selected01.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UIScrollView_Editor/UIScrollView_Horizontal_Editor/selected02.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UIScrollView_Editor/UIScrollView_Horizontal_Editor/ui_scrollview_horizontal_editor_1.json
samples/cpp-tests/Resources/cocosui/UIEditorTest/UIScrollView_Editor/UIScrollView_Vertical_Editor/GUI/image.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UIScrollView_Editor/UIScrollView_Vertical_Editor/background.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UIScrollView_Editor/UIScrollView_Vertical_Editor/buttonBackground.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UIScrollView_Editor/UIScrollView_Vertical_Editor/button_n.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UIScrollView_Editor/UIScrollView_Vertical_Editor/button_p.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UIScrollView_Editor/UIScrollView_Vertical_Editor/ribbon.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UIScrollView_Editor/UIScrollView_Vertical_Editor/selected01.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UIScrollView_Editor/UIScrollView_Vertical_Editor/selected02.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UIScrollView_Editor/UIScrollView_Vertical_Editor/ui_scrollview_editor_1.json
samples/cpp-tests/Resources/cocosui/UIEditorTest/UISlider_Editor/2014-1-26 11-42-09.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UISlider_Editor/2014-1-26 11-43-52.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UISlider_Editor/background.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UISlider_Editor/buttonBackground.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UISlider_Editor/ribbon.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UISlider_Editor/silder_progressBar.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UISlider_Editor/slider_bar.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UISlider_Editor/slider_bar_button.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UISlider_Editor/ui_slider_editor_1.json
samples/cpp-tests/Resources/cocosui/UIEditorTest/UITextField_Editor/background.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UITextField_Editor/buttonBackground.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UITextField_Editor/ribbon.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UITextField_Editor/ui_textfield_editor_1.json
samples/cpp-tests/Resources/cocosui/UIEditorTest/UIWidgetAddNode_Editor/background.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UIWidgetAddNode_Editor/buttonBackground.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UIWidgetAddNode_Editor/ribbon.png
samples/cpp-tests/Resources/cocosui/UIEditorTest/UIWidgetAddNode_Editor/ui_widget_add_node_editor.json
samples/cpp-tests/Resources/cocosui/UITest/UITest.json
samples/cpp-tests/Resources/cocosui/UITest/b1.png
samples/cpp-tests/Resources/cocosui/UITest/b2.png
samples/cpp-tests/Resources/cocosui/UITest/background.png
samples/cpp-tests/Resources/cocosui/UITest/buttonBackground.png
samples/cpp-tests/Resources/cocosui/UITest/f1.png
samples/cpp-tests/Resources/cocosui/UITest/f2.png
samples/cpp-tests/Resources/cocosui/UITest/r1.png
samples/cpp-tests/Resources/cocosui/UITest/r2.png
samples/cpp-tests/Resources/cocosui/UITest/ribbon.png
samples/cpp-tests/Resources/cocosui/animationbuttonnormal.png
samples/cpp-tests/Resources/cocosui/animationbuttonpressed.png
samples/cpp-tests/Resources/cocosui/arrow.png
samples/cpp-tests/Resources/cocosui/b11.png
samples/cpp-tests/Resources/cocosui/backtotopnormal.png
samples/cpp-tests/Resources/cocosui/backtotoppressed.png
samples/cpp-tests/Resources/cocosui/bitmapFontTest2.fnt
samples/cpp-tests/Resources/cocosui/bitmapFontTest2.png
samples/cpp-tests/Resources/cocosui/button.png
samples/cpp-tests/Resources/cocosui/buttonHighlighted.png
samples/cpp-tests/Resources/cocosui/ccicon.png
samples/cpp-tests/Resources/cocosui/check_box_active.png
samples/cpp-tests/Resources/cocosui/check_box_active_disable.png
samples/cpp-tests/Resources/cocosui/check_box_active_press.png
samples/cpp-tests/Resources/cocosui/check_box_normal.png
samples/cpp-tests/Resources/cocosui/check_box_normal_disable.png
samples/cpp-tests/Resources/cocosui/check_box_normal_press.png
samples/cpp-tests/Resources/cocosui/examples/Test/UIResForEditor/Button/button_country_n.png
samples/cpp-tests/Resources/cocosui/examples/Test/UIResForEditor/Button/button_country_p.png
samples/cpp-tests/Resources/cocosui/examples/Test/UIResForEditor/Button/button_country_un.png
samples/cpp-tests/Resources/cocosui/examples/Test/UIResForEditor/Button/symbol_1B.png
samples/cpp-tests/Resources/cocosui/examples/Test/UIResForEditor/Button/symbol_1a.png
samples/cpp-tests/Resources/cocosui/examples/Test/UIResForEditor/Button/symbol_1c.png
samples/cpp-tests/Resources/cocosui/examples/equip/111.png
samples/cpp-tests/Resources/cocosui/examples/equip/12.png
samples/cpp-tests/Resources/cocosui/examples/equip/13.png
samples/cpp-tests/Resources/cocosui/examples/equip/14.png
samples/cpp-tests/Resources/cocosui/examples/equip/15.png
samples/cpp-tests/Resources/cocosui/examples/equip/2.png
samples/cpp-tests/Resources/cocosui/examples/equip/button_end_01.png
samples/cpp-tests/Resources/cocosui/examples/equip/button_end_02.png
samples/cpp-tests/Resources/cocosui/examples/equip/button_green_n2.png
samples/cpp-tests/Resources/cocosui/examples/equip/button_green_p2.png
samples/cpp-tests/Resources/cocosui/examples/equip/button_green_un2.png
samples/cpp-tests/Resources/cocosui/examples/equip/eg/1.png
samples/cpp-tests/Resources/cocosui/examples/equip/eg/10.png
samples/cpp-tests/Resources/cocosui/examples/equip/eg/11.png
samples/cpp-tests/Resources/cocosui/examples/equip/eg/3.png
samples/cpp-tests/Resources/cocosui/examples/equip/eg/4.png
samples/cpp-tests/Resources/cocosui/examples/equip/eg/5.png
samples/cpp-tests/Resources/cocosui/examples/equip/eg/6.png
samples/cpp-tests/Resources/cocosui/examples/equip/eg/7.png
samples/cpp-tests/Resources/cocosui/examples/equip/eg/8.png
samples/cpp-tests/Resources/cocosui/examples/equip/eg/9.png
samples/cpp-tests/Resources/cocosui/examples/equip/eg/crab.png
samples/cpp-tests/Resources/cocosui/examples/equip/eg/research.png
samples/cpp-tests/Resources/cocosui/examples/equip/eg/sell.png
samples/cpp-tests/Resources/cocosui/examples/equip/eg/shop_shield_1.png
samples/cpp-tests/Resources/cocosui/examples/equip/eg/shop_shield_2.png
samples/cpp-tests/Resources/cocosui/examples/equip/eg/shop_shield_3.png
samples/cpp-tests/Resources/cocosui/examples/equip/eg/train.png
samples/cpp-tests/Resources/cocosui/examples/equip/eg/upgrade.png
samples/cpp-tests/Resources/cocosui/examples/examples.json
samples/cpp-tests/Resources/cocosui/examples/weapon_introduce/4.png
samples/cpp-tests/Resources/cocosui/examples/weapon_introduce/5.png
samples/cpp-tests/Resources/cocosui/examples/weapon_introduce/6.png
samples/cpp-tests/Resources/cocosui/examples/weapon_introduce/button_end_01.png
samples/cpp-tests/Resources/cocosui/examples/weapon_introduce/button_end_02.png
samples/cpp-tests/Resources/cocosui/examples/weapon_introduce/weapon_item_1/weapon_item/1.png
samples/cpp-tests/Resources/cocosui/examples/weapon_introduce/weapon_item_1/weapon_item/2.png
samples/cpp-tests/Resources/cocosui/examples/weapon_introduce/weapon_item_1/weapon_item/7.png
samples/cpp-tests/Resources/cocosui/examples/weapon_introduce/weapon_item_1/weapon_item_1.json
samples/cpp-tests/Resources/cocosui/green_edit.png
samples/cpp-tests/Resources/cocosui/grossini-aliases.png
samples/cpp-tests/Resources/cocosui/gui_examples/UIAction_1/CocoStudio_UIEditor.png
samples/cpp-tests/Resources/cocosui/gui_examples/UIAction_1/UIAction_1.json
samples/cpp-tests/Resources/cocosui/gui_examples/buy_1/5.png
samples/cpp-tests/Resources/cocosui/gui_examples/buy_1/7.png
samples/cpp-tests/Resources/cocosui/gui_examples/buy_1/button.png
samples/cpp-tests/Resources/cocosui/gui_examples/buy_1/buttonHighlighted.png
samples/cpp-tests/Resources/cocosui/gui_examples/buy_1/buy_1.json
samples/cpp-tests/Resources/cocosui/gui_examples/equip_1/equip/111.png
samples/cpp-tests/Resources/cocosui/gui_examples/equip_1/equip/12.png
samples/cpp-tests/Resources/cocosui/gui_examples/equip_1/equip/13.png
samples/cpp-tests/Resources/cocosui/gui_examples/equip_1/equip/14.png
samples/cpp-tests/Resources/cocosui/gui_examples/equip_1/equip/15.png
samples/cpp-tests/Resources/cocosui/gui_examples/equip_1/equip/2.png
samples/cpp-tests/Resources/cocosui/gui_examples/equip_1/equip/button_end_01.png
samples/cpp-tests/Resources/cocosui/gui_examples/equip_1/equip/button_end_02.png
samples/cpp-tests/Resources/cocosui/gui_examples/equip_1/equip/button_green_n2.png
samples/cpp-tests/Resources/cocosui/gui_examples/equip_1/equip/button_green_p2.png
samples/cpp-tests/Resources/cocosui/gui_examples/equip_1/equip/button_green_un2.png
samples/cpp-tests/Resources/cocosui/gui_examples/equip_1/equip/eg/1.png
samples/cpp-tests/Resources/cocosui/gui_examples/equip_1/equip/eg/10.png
samples/cpp-tests/Resources/cocosui/gui_examples/equip_1/equip/eg/11.png
samples/cpp-tests/Resources/cocosui/gui_examples/equip_1/equip/eg/3.png
samples/cpp-tests/Resources/cocosui/gui_examples/equip_1/equip/eg/4.png
samples/cpp-tests/Resources/cocosui/gui_examples/equip_1/equip/eg/5.png
samples/cpp-tests/Resources/cocosui/gui_examples/equip_1/equip/eg/6.png
samples/cpp-tests/Resources/cocosui/gui_examples/equip_1/equip/eg/7.png
samples/cpp-tests/Resources/cocosui/gui_examples/equip_1/equip/eg/8.png
samples/cpp-tests/Resources/cocosui/gui_examples/equip_1/equip/eg/9.png
samples/cpp-tests/Resources/cocosui/gui_examples/equip_1/equip/eg/crab.png
samples/cpp-tests/Resources/cocosui/gui_examples/equip_1/equip/eg/research.png
samples/cpp-tests/Resources/cocosui/gui_examples/equip_1/equip/eg/sell.png
samples/cpp-tests/Resources/cocosui/gui_examples/equip_1/equip/eg/shop_shield_1.png
samples/cpp-tests/Resources/cocosui/gui_examples/equip_1/equip/eg/shop_shield_2.png
samples/cpp-tests/Resources/cocosui/gui_examples/equip_1/equip/eg/shop_shield_3.png
samples/cpp-tests/Resources/cocosui/gui_examples/equip_1/equip/eg/train.png
samples/cpp-tests/Resources/cocosui/gui_examples/equip_1/equip/eg/upgrade.png
samples/cpp-tests/Resources/cocosui/gui_examples/equip_1/equip_1.json
samples/cpp-tests/Resources/cocosui/gui_examples/map_1/image_castle.png
samples/cpp-tests/Resources/cocosui/gui_examples/map_1/map_1.json
samples/cpp-tests/Resources/cocosui/gui_examples/map_1/map_pve.png
samples/cpp-tests/Resources/cocosui/gui_examples/map_alert_1/5.png
samples/cpp-tests/Resources/cocosui/gui_examples/map_alert_1/7.png
samples/cpp-tests/Resources/cocosui/gui_examples/map_alert_1/close_02.png
samples/cpp-tests/Resources/cocosui/gui_examples/map_alert_1/close_03.png
samples/cpp-tests/Resources/cocosui/gui_examples/map_alert_1/close_04.png
samples/cpp-tests/Resources/cocosui/gui_examples/map_alert_1/map_alert_1.json
samples/cpp-tests/Resources/cocosui/gui_examples/page_1/background.png
samples/cpp-tests/Resources/cocosui/gui_examples/page_1/buttonBackground.png
samples/cpp-tests/Resources/cocosui/gui_examples/page_1/page_1.json
samples/cpp-tests/Resources/cocosui/gui_examples/page_1/page_content/CocoStudio_AnimationEditor.png
samples/cpp-tests/Resources/cocosui/gui_examples/page_1/page_content/CocoStudio_DataEditor.png
samples/cpp-tests/Resources/cocosui/gui_examples/page_1/page_content/CocoStudio_SceneEditor.png
samples/cpp-tests/Resources/cocosui/gui_examples/page_1/page_content/CocoStudio_UIEditor.png
samples/cpp-tests/Resources/cocosui/gui_examples/page_1/ribbon.png
samples/cpp-tests/Resources/cocosui/gui_examples/page_1/teehanlax - iOS 6 - iPhone_check.png
samples/cpp-tests/Resources/cocosui/gui_examples/page_1/teehanlax - iOS 6 - iPhone_check01.png
samples/cpp-tests/Resources/cocosui/gui_examples/register_1/128_128.png
samples/cpp-tests/Resources/cocosui/gui_examples/register_1/Rosewood stdloadingH.fnt
samples/cpp-tests/Resources/cocosui/gui_examples/register_1/Rosewood stdloadingH.png
samples/cpp-tests/Resources/cocosui/gui_examples/register_1/button_d.png
samples/cpp-tests/Resources/cocosui/gui_examples/register_1/button_n.png
samples/cpp-tests/Resources/cocosui/gui_examples/register_1/e-mail.png
samples/cpp-tests/Resources/cocosui/gui_examples/register_1/register_1.json
samples/cpp-tests/Resources/cocosui/gui_examples/register_1/ui_shop_005-hd.png
samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_introduce/4.png
samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_introduce/5.png
samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_introduce/6.png
samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_introduce/button_end_01.png
samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_introduce/button_end_02.png
samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_introduce_1.json
samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_item_1/weapon_item/1.png
samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_item_1/weapon_item/2.png
samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_item_1/weapon_item/7.png
samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_item_1/weapon_item_1.json
samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_1.png
samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_10.png
samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_11.png
samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_12.png
samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_13.png
samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_14.png
samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_15.png
samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_16.png
samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_17.png
samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_18.png
samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_19.png
samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_2.png
samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_20.png
samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_21.png
samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_22.png
samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_23.png
samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_24.png
samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_25.png
samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_26.png
samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_27.png
samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_28.png
samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_29.png
samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_3.png
samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_30.png
samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_31.png
samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_4.png
samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_5.png
samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_6.png
samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_7.png
samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_8.png
samples/cpp-tests/Resources/cocosui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_9.png
samples/cpp-tests/Resources/cocosui/labelatlas.png
samples/cpp-tests/Resources/cocosui/loadingbar.png
samples/cpp-tests/Resources/cocosui/scrollviewbg.png
samples/cpp-tests/Resources/cocosui/slidbar.png
samples/cpp-tests/Resources/cocosui/sliderProgress.png
samples/cpp-tests/Resources/cocosui/sliderProgress2.png
samples/cpp-tests/Resources/cocosui/sliderThumb.png
samples/cpp-tests/Resources/cocosui/sliderTrack.png
samples/cpp-tests/Resources/cocosui/sliderTrack2.png
samples/cpp-tests/Resources/cocosui/slider_bar_active_9patch.png
samples/cpp-tests/Resources/cocosui/sliderballnormal.png
samples/cpp-tests/Resources/cocosui/sliderballpressed.png
samples/cpp-tests/Resources/cocosui/switch-mask.png
templates/lua-template-runtime/res/fonts/Marker Felt.ttf
tests/cpp-tests/Resources/cocosgui/100/100.ExportJson
tests/cpp-tests/Resources/cocosgui/100/1000.plist
tests/cpp-tests/Resources/cocosgui/100/1000.png
tests/cpp-tests/Resources/cocosgui/CloseNormal.png
tests/cpp-tests/Resources/cocosgui/CloseSelected.png
tests/cpp-tests/Resources/cocosgui/CocoGUISample.json
tests/cpp-tests/Resources/cocosgui/CocoGUI_PageView_Sample.json
tests/cpp-tests/Resources/cocosgui/CustomImageViewTest/NewProject_20.plist
tests/cpp-tests/Resources/cocosgui/CustomImageViewTest/NewProject_20.png
tests/cpp-tests/Resources/cocosgui/CustomImageViewTest/NewProject_2_1.ExportJson
tests/cpp-tests/Resources/cocosgui/Hello.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIButton_Editor/UIButton_Editor_1.json
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIButton_Editor/background.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIButton_Editor/buttonBackground.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIButton_Editor/buttonHighlighted.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIButton_Editor/button_n.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIButton_Editor/button_p.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIButton_Editor/ribbon.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UICheckBox_Editor/background.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UICheckBox_Editor/buttonBackground.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UICheckBox_Editor/ribbon.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UICheckBox_Editor/selected01.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UICheckBox_Editor/selected02.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UICheckBox_Editor/ui_checkbox_editor_1.json
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIImageView_Editor/GUI/image.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIImageView_Editor/background.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIImageView_Editor/buttonBackground.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIImageView_Editor/buttonHighlighted.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIImageView_Editor/ribbon.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIImageView_Editor/ui_ImageView_editor_1.json
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILabelAtlas_Editor/GUI/labelatlasimg.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILabelAtlas_Editor/background.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILabelAtlas_Editor/buttonBackground.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILabelAtlas_Editor/ribbon.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILabelAtlas_Editor/ui_labelatlas_editor_1.json
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILabelBMFont_Editor/GUI/missing-font.fnt
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILabelBMFont_Editor/GUI/missing-font.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILabelBMFont_Editor/background.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILabelBMFont_Editor/buttonBackground.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILabelBMFont_Editor/ribbon.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILabelBMFont_Editor/ui_labelbmfont_editor_1.json
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILabel_Editor/A Damn Mess.ttf
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILabel_Editor/background.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILabel_Editor/buttonBackground.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILabel_Editor/ribbon.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILabel_Editor/ui_label_editor_1.json
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/GUI/image.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/Hello.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/background.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/buttonBackground.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/button_n.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/button_p.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/ribbon.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/selected01.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/selected02.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/ui_layout_backgroundimage_editor_1_0_0.json
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Color_Editor/GUI/image.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Color_Editor/background.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Color_Editor/buttonBackground.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Color_Editor/button_n.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Color_Editor/button_p.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Color_Editor/ribbon.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Color_Editor/selected01.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Color_Editor/selected02.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Color_Editor/ui_layout_color_editor_1.json
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Editor/GUI/image.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Editor/background.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Editor/buttonBackground.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Editor/button_n.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Editor/button_p.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Editor/ribbon.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Editor/selected01.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Editor/selected02.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Editor/ui_layout_editor_1.json
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Gradient_Color_Editor/GUI/image.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Gradient_Color_Editor/background.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Gradient_Color_Editor/buttonBackground.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Gradient_Color_Editor/button_n.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Gradient_Color_Editor/button_p.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Gradient_Color_Editor/ribbon.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Gradient_Color_Editor/selected01.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Gradient_Color_Editor/selected02.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Gradient_Color_Editor/ui_layout_gradient_color_editor_1_0.json
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Horizontal_Layout_Editor/GUI/image.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Horizontal_Layout_Editor/background.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Horizontal_Layout_Editor/buttonBackground.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Horizontal_Layout_Editor/button_n.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Horizontal_Layout_Editor/button_p.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Horizontal_Layout_Editor/ribbon.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Horizontal_Layout_Editor/selected01.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Horizontal_Layout_Editor/selected02.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Horizontal_Layout_Editor/ui_layout_linear_horizontal_layout_editor.json
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Vertical_Layout_Editor/GUI/image.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Vertical_Layout_Editor/background.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Vertical_Layout_Editor/buttonBackground.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Vertical_Layout_Editor/button_n.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Vertical_Layout_Editor/button_p.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Vertical_Layout_Editor/ribbon.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Vertical_Layout_Editor/selected01.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Vertical_Layout_Editor/selected02.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Vertical_Layout_Editor/ui_layout_linear_vertical_layout_editor.json
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Location_Editor/GUI/image.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Location_Editor/background.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Location_Editor/buttonBackground.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Location_Editor/button_n.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Location_Editor/button_p.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Location_Editor/ribbon.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Location_Editor/selected01.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Location_Editor/selected02.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Location_Editor/ui_layout_relative_align_location_editor.json
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Parent_Editor/GUI/image.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Parent_Editor/background.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Parent_Editor/buttonBackground.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Parent_Editor/button_n.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Parent_Editor/button_p.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Parent_Editor/ribbon.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Parent_Editor/selected01.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Parent_Editor/selected02.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Parent_Editor/ui_layout_relative_align_parent_editor.json
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Scale9_BackgroundImage_Editor/GUI/image.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Scale9_BackgroundImage_Editor/background.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Scale9_BackgroundImage_Editor/buttonBackground.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Scale9_BackgroundImage_Editor/button_n.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Scale9_BackgroundImage_Editor/button_p.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Scale9_BackgroundImage_Editor/ribbon.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Scale9_BackgroundImage_Editor/selected01.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Scale9_BackgroundImage_Editor/selected02.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Scale9_BackgroundImage_Editor/slider_bar.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Scale9_BackgroundImage_Editor/ui_layout_scale9_backgroundimage_editor.json
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIListView_Editor/UIListView_Horizontal_Editor/GUI/button.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIListView_Editor/UIListView_Horizontal_Editor/GUI/image.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIListView_Editor/UIListView_Horizontal_Editor/background.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIListView_Editor/UIListView_Horizontal_Editor/buttonBackground.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIListView_Editor/UIListView_Horizontal_Editor/button_p.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIListView_Editor/UIListView_Horizontal_Editor/ribbon.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIListView_Editor/UIListView_Horizontal_Editor/ui_listview_horizontal_editor_1.json
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIListView_Editor/UIListView_Vertical_Editor/GUI/button.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIListView_Editor/UIListView_Vertical_Editor/GUI/image.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIListView_Editor/UIListView_Vertical_Editor/background.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIListView_Editor/UIListView_Vertical_Editor/buttonBackground.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIListView_Editor/UIListView_Vertical_Editor/button_p.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIListView_Editor/UIListView_Vertical_Editor/ribbon.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIListView_Editor/UIListView_Vertical_Editor/ui_listview_editor_1.json
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILoadingBar_Editor/GUI/loadingbar.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILoadingBar_Editor/background.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILoadingBar_Editor/buttonBackground.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILoadingBar_Editor/ribbon.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILoadingBar_Editor/ui_loadingbar_editor_1.json
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIPageView_Editor/background.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIPageView_Editor/buttonBackground.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIPageView_Editor/button_n.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIPageView_Editor/ribbon.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIPageView_Editor/ui_pageview_editor_1.json
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Both_Editor/GUI/image.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Both_Editor/background.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Both_Editor/buttonBackground.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Both_Editor/button_n.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Both_Editor/button_p.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Both_Editor/ribbon.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Both_Editor/selected01.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Both_Editor/selected02.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Both_Editor/ui_scrollview_both_editor_1.json
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Horizontal_Editor/GUI/image.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Horizontal_Editor/background.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Horizontal_Editor/buttonBackground.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Horizontal_Editor/button_n.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Horizontal_Editor/button_p.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Horizontal_Editor/ribbon.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Horizontal_Editor/selected01.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Horizontal_Editor/selected02.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Horizontal_Editor/ui_scrollview_horizontal_editor_1.json
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Vertical_Editor/GUI/image.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Vertical_Editor/background.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Vertical_Editor/buttonBackground.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Vertical_Editor/button_n.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Vertical_Editor/button_p.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Vertical_Editor/ribbon.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Vertical_Editor/selected01.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Vertical_Editor/selected02.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Vertical_Editor/ui_scrollview_editor_1.json
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UISlider_Editor/2014-1-26 11-42-09.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UISlider_Editor/2014-1-26 11-43-52.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UISlider_Editor/background.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UISlider_Editor/buttonBackground.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UISlider_Editor/ribbon.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UISlider_Editor/silder_progressBar.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UISlider_Editor/slider_bar.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UISlider_Editor/slider_bar_button.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UISlider_Editor/ui_slider_editor_1.json
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UITextField_Editor/background.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UITextField_Editor/buttonBackground.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UITextField_Editor/ribbon.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UITextField_Editor/ui_textfield_editor_1.json
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIWidgetAddNode_Editor/background.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIWidgetAddNode_Editor/buttonBackground.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIWidgetAddNode_Editor/ribbon.png
tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIWidgetAddNode_Editor/ui_widget_add_node_editor.json
tests/cpp-tests/Resources/cocosgui/UITest/UITest.json
tests/cpp-tests/Resources/cocosgui/UITest/b1.png
tests/cpp-tests/Resources/cocosgui/UITest/b2.png
tests/cpp-tests/Resources/cocosgui/UITest/background.png
tests/cpp-tests/Resources/cocosgui/UITest/buttonBackground.png
tests/cpp-tests/Resources/cocosgui/UITest/f1.png
tests/cpp-tests/Resources/cocosgui/UITest/f2.png
tests/cpp-tests/Resources/cocosgui/UITest/r1.png
tests/cpp-tests/Resources/cocosgui/UITest/r2.png
tests/cpp-tests/Resources/cocosgui/UITest/ribbon.png
tests/cpp-tests/Resources/cocosgui/animationbuttonnormal.png
tests/cpp-tests/Resources/cocosgui/animationbuttonpressed.png
tests/cpp-tests/Resources/cocosgui/arrow.png
tests/cpp-tests/Resources/cocosgui/b11.png
tests/cpp-tests/Resources/cocosgui/backtotopnormal.png
tests/cpp-tests/Resources/cocosgui/backtotoppressed.png
tests/cpp-tests/Resources/cocosgui/bitmapFontTest2.fnt
tests/cpp-tests/Resources/cocosgui/bitmapFontTest2.png
tests/cpp-tests/Resources/cocosgui/button.png
tests/cpp-tests/Resources/cocosgui/buttonHighlighted.png
tests/cpp-tests/Resources/cocosgui/ccicon.png
tests/cpp-tests/Resources/cocosgui/check_box_active.png
tests/cpp-tests/Resources/cocosgui/check_box_active_disable.png
tests/cpp-tests/Resources/cocosgui/check_box_active_press.png
tests/cpp-tests/Resources/cocosgui/check_box_normal.png
tests/cpp-tests/Resources/cocosgui/check_box_normal_disable.png
tests/cpp-tests/Resources/cocosgui/check_box_normal_press.png
tests/cpp-tests/Resources/cocosgui/examples/Test/UIResForEditor/Button/button_country_n.png
tests/cpp-tests/Resources/cocosgui/examples/Test/UIResForEditor/Button/button_country_p.png
tests/cpp-tests/Resources/cocosgui/examples/Test/UIResForEditor/Button/button_country_un.png
tests/cpp-tests/Resources/cocosgui/examples/Test/UIResForEditor/Button/symbol_1B.png
tests/cpp-tests/Resources/cocosgui/examples/Test/UIResForEditor/Button/symbol_1a.png
tests/cpp-tests/Resources/cocosgui/examples/Test/UIResForEditor/Button/symbol_1c.png
tests/cpp-tests/Resources/cocosgui/examples/equip/111.png
tests/cpp-tests/Resources/cocosgui/examples/equip/12.png
tests/cpp-tests/Resources/cocosgui/examples/equip/13.png
tests/cpp-tests/Resources/cocosgui/examples/equip/14.png
tests/cpp-tests/Resources/cocosgui/examples/equip/15.png
tests/cpp-tests/Resources/cocosgui/examples/equip/2.png
tests/cpp-tests/Resources/cocosgui/examples/equip/button_end_01.png
tests/cpp-tests/Resources/cocosgui/examples/equip/button_end_02.png
tests/cpp-tests/Resources/cocosgui/examples/equip/button_green_n2.png
tests/cpp-tests/Resources/cocosgui/examples/equip/button_green_p2.png
tests/cpp-tests/Resources/cocosgui/examples/equip/button_green_un2.png
tests/cpp-tests/Resources/cocosgui/examples/equip/eg/1.png
tests/cpp-tests/Resources/cocosgui/examples/equip/eg/10.png
tests/cpp-tests/Resources/cocosgui/examples/equip/eg/11.png
tests/cpp-tests/Resources/cocosgui/examples/equip/eg/3.png
tests/cpp-tests/Resources/cocosgui/examples/equip/eg/4.png
tests/cpp-tests/Resources/cocosgui/examples/equip/eg/5.png
tests/cpp-tests/Resources/cocosgui/examples/equip/eg/6.png
tests/cpp-tests/Resources/cocosgui/examples/equip/eg/7.png
tests/cpp-tests/Resources/cocosgui/examples/equip/eg/8.png
tests/cpp-tests/Resources/cocosgui/examples/equip/eg/9.png
tests/cpp-tests/Resources/cocosgui/examples/equip/eg/crab.png
tests/cpp-tests/Resources/cocosgui/examples/equip/eg/research.png
tests/cpp-tests/Resources/cocosgui/examples/equip/eg/sell.png
tests/cpp-tests/Resources/cocosgui/examples/equip/eg/shop_shield_1.png
tests/cpp-tests/Resources/cocosgui/examples/equip/eg/shop_shield_2.png
tests/cpp-tests/Resources/cocosgui/examples/equip/eg/shop_shield_3.png
tests/cpp-tests/Resources/cocosgui/examples/equip/eg/train.png
tests/cpp-tests/Resources/cocosgui/examples/equip/eg/upgrade.png
tests/cpp-tests/Resources/cocosgui/examples/examples.json
tests/cpp-tests/Resources/cocosgui/examples/weapon_introduce/4.png
tests/cpp-tests/Resources/cocosgui/examples/weapon_introduce/5.png
tests/cpp-tests/Resources/cocosgui/examples/weapon_introduce/6.png
tests/cpp-tests/Resources/cocosgui/examples/weapon_introduce/button_end_01.png
tests/cpp-tests/Resources/cocosgui/examples/weapon_introduce/button_end_02.png
tests/cpp-tests/Resources/cocosgui/examples/weapon_introduce/weapon_item_1/weapon_item/1.png
tests/cpp-tests/Resources/cocosgui/examples/weapon_introduce/weapon_item_1/weapon_item/2.png
tests/cpp-tests/Resources/cocosgui/examples/weapon_introduce/weapon_item_1/weapon_item/7.png
tests/cpp-tests/Resources/cocosgui/examples/weapon_introduce/weapon_item_1/weapon_item_1.json
tests/cpp-tests/Resources/cocosgui/green_edit.png
tests/cpp-tests/Resources/cocosgui/grossini-aliases.png
tests/cpp-tests/Resources/cocosgui/gui_examples/UIAction_1/CocoStudio_UIEditor.png
tests/cpp-tests/Resources/cocosgui/gui_examples/UIAction_1/UIAction_1.json
tests/cpp-tests/Resources/cocosgui/gui_examples/buy_1/5.png
tests/cpp-tests/Resources/cocosgui/gui_examples/buy_1/7.png
tests/cpp-tests/Resources/cocosgui/gui_examples/buy_1/button.png
tests/cpp-tests/Resources/cocosgui/gui_examples/buy_1/buttonHighlighted.png
tests/cpp-tests/Resources/cocosgui/gui_examples/buy_1/buy_1.json
tests/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/111.png
tests/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/12.png
tests/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/13.png
tests/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/14.png
tests/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/15.png
tests/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/2.png
tests/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/button_end_01.png
tests/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/button_end_02.png
tests/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/button_green_n2.png
tests/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/button_green_p2.png
tests/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/button_green_un2.png
tests/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/eg/1.png
tests/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/eg/10.png
tests/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/eg/11.png
tests/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/eg/3.png
tests/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/eg/4.png
tests/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/eg/5.png
tests/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/eg/6.png
tests/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/eg/7.png
tests/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/eg/8.png
tests/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/eg/9.png
tests/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/eg/crab.png
tests/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/eg/research.png
tests/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/eg/sell.png
tests/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/eg/shop_shield_1.png
tests/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/eg/shop_shield_2.png
tests/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/eg/shop_shield_3.png
tests/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/eg/train.png
tests/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip/eg/upgrade.png
tests/cpp-tests/Resources/cocosgui/gui_examples/equip_1/equip_1.json
tests/cpp-tests/Resources/cocosgui/gui_examples/map_1/image_castle.png
tests/cpp-tests/Resources/cocosgui/gui_examples/map_1/map_1.json
tests/cpp-tests/Resources/cocosgui/gui_examples/map_1/map_pve.png
tests/cpp-tests/Resources/cocosgui/gui_examples/map_alert_1/5.png
tests/cpp-tests/Resources/cocosgui/gui_examples/map_alert_1/7.png
tests/cpp-tests/Resources/cocosgui/gui_examples/map_alert_1/close_02.png
tests/cpp-tests/Resources/cocosgui/gui_examples/map_alert_1/close_03.png
tests/cpp-tests/Resources/cocosgui/gui_examples/map_alert_1/close_04.png
tests/cpp-tests/Resources/cocosgui/gui_examples/map_alert_1/map_alert_1.json
tests/cpp-tests/Resources/cocosgui/gui_examples/page_1/background.png
tests/cpp-tests/Resources/cocosgui/gui_examples/page_1/buttonBackground.png
tests/cpp-tests/Resources/cocosgui/gui_examples/page_1/page_1.json
tests/cpp-tests/Resources/cocosgui/gui_examples/page_1/page_content/CocoStudio_AnimationEditor.png
tests/cpp-tests/Resources/cocosgui/gui_examples/page_1/page_content/CocoStudio_DataEditor.png
tests/cpp-tests/Resources/cocosgui/gui_examples/page_1/page_content/CocoStudio_SceneEditor.png
tests/cpp-tests/Resources/cocosgui/gui_examples/page_1/page_content/CocoStudio_UIEditor.png
tests/cpp-tests/Resources/cocosgui/gui_examples/page_1/ribbon.png
tests/cpp-tests/Resources/cocosgui/gui_examples/page_1/teehanlax - iOS 6 - iPhone_check.png
tests/cpp-tests/Resources/cocosgui/gui_examples/page_1/teehanlax - iOS 6 - iPhone_check01.png
tests/cpp-tests/Resources/cocosgui/gui_examples/register_1/128_128.png
tests/cpp-tests/Resources/cocosgui/gui_examples/register_1/Rosewood stdloadingH.fnt
tests/cpp-tests/Resources/cocosgui/gui_examples/register_1/Rosewood stdloadingH.png
tests/cpp-tests/Resources/cocosgui/gui_examples/register_1/button_d.png
tests/cpp-tests/Resources/cocosgui/gui_examples/register_1/button_n.png
tests/cpp-tests/Resources/cocosgui/gui_examples/register_1/e-mail.png
tests/cpp-tests/Resources/cocosgui/gui_examples/register_1/register_1.json
tests/cpp-tests/Resources/cocosgui/gui_examples/register_1/ui_shop_005-hd.png
tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_introduce/4.png
tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_introduce/5.png
tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_introduce/6.png
tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_introduce/button_end_01.png
tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_introduce/button_end_02.png
tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_introduce_1.json
tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapon_item/1.png
tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapon_item/2.png
tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapon_item/7.png
tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapon_item_1.json
tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_1.png
tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_10.png
tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_11.png
tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_12.png
tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_13.png
tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_14.png
tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_15.png
tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_16.png
tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_17.png
tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_18.png
tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_19.png
tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_2.png
tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_20.png
tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_21.png
tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_22.png
tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_23.png
tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_24.png
tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_25.png
tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_26.png
tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_27.png
tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_28.png
tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_29.png
tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_3.png
tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_30.png
tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_31.png
tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_4.png
tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_5.png
tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_6.png
tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_7.png
tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_8.png
tests/cpp-tests/Resources/cocosgui/gui_examples/weapon_introduce_1/weapon_item_1/weapons/weapons_9.png
tests/cpp-tests/Resources/cocosgui/labelatlas.png
tests/cpp-tests/Resources/cocosgui/loadingbar.png
tests/cpp-tests/Resources/cocosgui/scrollviewbg.png
tests/cpp-tests/Resources/cocosgui/slidbar.png
tests/cpp-tests/Resources/cocosgui/sliderProgress.png
tests/cpp-tests/Resources/cocosgui/sliderProgress2.png
tests/cpp-tests/Resources/cocosgui/sliderThumb.png
tests/cpp-tests/Resources/cocosgui/sliderTrack.png
tests/cpp-tests/Resources/cocosgui/sliderTrack2.png
tests/cpp-tests/Resources/cocosgui/slider_bar_active_9patch.png
tests/cpp-tests/Resources/cocosgui/sliderballnormal.png
tests/cpp-tests/Resources/cocosgui/sliderballpressed.png
tests/cpp-tests/Resources/cocosgui/switch-mask.png
tools/cocos2d-console
|
2014-03-12 10:09:09 +08:00 |
James Chen
|
1df6acd10f
|
Merge pull request #5661 from dumganhar/re-add-lua
Adds 'cpp-empty-test', 'lua-empty-test' project
|
2014-03-11 22:50:39 +08:00 |
James Chen
|
fbcf1e7193
|
Updates pull-request-builder.py, do 'git clean -fdx -f' after checkout a new branch.
|
2014-03-11 22:05:50 +08:00 |
lihex
|
1e8990744e
|
update submodule
|
2014-03-11 22:02:47 +08:00 |
James Chen
|
e825324a94
|
[jenkins ci] Updates pull-request-builder.py. Uses 'git clean -fdx -f' to remove all files that are not in current repo.
|
2014-03-11 21:39:31 +08:00 |
James Chen
|
3adc62679f
|
Updates Jenkins ci.
|
2014-03-11 20:47:02 +08:00 |
andyque
|
448b101578
|
fix linux compile error
|
2014-03-11 20:46:11 +08:00 |
James Chen
|
4444e3872e
|
[jenkins ci] Build only cpp-empty-test, cpp-tests.
|
2014-03-11 19:39:20 +08:00 |
James Chen
|
cbd9cbaf71
|
travis builds all tests projects for Android.
|
2014-03-11 19:10:36 +08:00 |
andyque
|
026ef95b07
|
add lua ui binding
|
2014-03-11 18:48:27 +08:00 |
andyque
|
dcc98ef79f
|
rename cocos2dx_gui to cocos2dx_ui
|
2014-03-11 18:48:27 +08:00 |
lihex
|
1c533a7746
|
update console submodule
|
2014-03-11 17:43:35 +08:00 |
minggo
|
0202a678be
|
Merge pull request #5675 from minggo/develop
update console to latest version
|
2014-03-11 16:56:28 +08:00 |
minggo
|
9d1a70d569
|
update console to latest version
|
2014-03-11 16:47:16 +08:00 |
Dhilan007
|
41c8b6064e
|
re-open generate binding glue codes.
|
2014-03-11 15:30:48 +08:00 |
James Chen
|
c22740d96b
|
Merge pull request #5651 from lmskater/fix-comment-trigger
[Jenkins] fix the crash in comment trigger
|
2014-03-11 11:00:10 +08:00 |
minggo
|
e9b13772e8
|
Merge pull request #5660 from minggo/develop
update console to latest codes
|
2014-03-10 20:03:32 +08:00 |
minggo
|
376ae24c10
|
update console to latest codes
|
2014-03-10 20:01:22 +08:00 |
James Chen
|
38160ff7d7
|
Corrects a mistake in generate-bindings.sh
|
2014-03-10 19:18:55 +08:00 |
James Chen
|
7d3a6c999d
|
Updates before-install.sh.
|
2014-03-10 18:24:28 +08:00 |
James Chen
|
9c18c804f5
|
Typo fix.
|
2014-03-10 18:20:51 +08:00 |
James Chen
|
124b18f53a
|
Re-add CocosRobot send bindings glue codes to cocos2d-x repo.
|
2014-03-10 18:13:39 +08:00 |
James Chen
|
0f9ff45778
|
Re-add bindings-generator submodule.
|
2014-03-10 17:46:30 +08:00 |
lm
|
bdd66ee0fd
|
[Jenkins] fix the crash in comment trigger
|
2014-03-10 16:35:55 +08:00 |
James Chen
|
7841bceb2b
|
[jenkins ci] Updates jenkins script
|
2014-03-10 13:50:14 +08:00 |
James Chen
|
a5f668a0bf
|
[travis ci] Build testcpp only.
|
2014-03-10 12:06:33 +08:00 |
James Chen
|
286ebb349f
|
[jenkins] Don't gen jsb bindings.
|
2014-03-10 12:02:29 +08:00 |
lihex
|
d96c7b4424
|
update submodule
|
2014-03-07 14:14:13 +08:00 |
lm
|
e01319a701
|
[Jenkins] add linux build
|
2014-03-07 11:25:35 +08:00 |
minggo
|
3d2bf5cc1a
|
Merge pull request #5608 from lmskater/fix-android-build
[Jenkins] fix android build
|
2014-03-07 11:02:47 +08:00 |
lm
|
c49dc0a044
|
[Jenkins] fix android build
|
2014-03-07 10:51:17 +08:00 |
qiaofeng00oo
|
f44773b5df
|
modify autotest.py
|
2014-03-06 16:52:34 +08:00 |
James Chen
|
c2cd349da5
|
Uses 'generate-tempate-files.py' to generate cocos2dx_files.json
|
2014-03-06 14:56:46 +08:00 |
James Chen
|
58553d67f5
|
Merge pull request #5583 from dumganhar/develop
[travis ci] Updates generate-cocosfiles.sh.
|
2014-03-06 14:16:21 +08:00 |
James Chen
|
5ca25d854f
|
[travis ci] Updates generate-cocosfiles.sh.
|
2014-03-06 14:10:50 +08:00 |
James Chen
|
e6e9c5abfb
|
Merge pull request #5581 from dumganhar/develop
[travis ci] Uncomments '.generate-cocosfiles.sh'.
|
2014-03-06 14:02:52 +08:00 |
James Chen
|
738a4f5deb
|
Uncomments '.generate-cocosfiles.sh'.
|
2014-03-06 14:00:48 +08:00 |
minggo
|
43d85dc0d7
|
Merge pull request #5580 from lihex/develop
rename template config file
|
2014-03-06 13:58:39 +08:00 |
lihex
|
c206384edd
|
rename template config file
|
2014-03-06 13:56:18 +08:00 |
James Chen
|
dfdb6c4158
|
[travis ci] Adds 'for-each-file-in-dir.sh' for generating file list in cocos2d. CocosRobot will send a PR for that change.
|
2014-03-06 13:54:24 +08:00 |
lihex
|
389811d9e5
|
update submodule
|
2014-03-05 16:14:56 +08:00 |
minggo
|
76961b799a
|
Merge pull request #5538 from minggo/develop
update console to latest version
|
2014-03-04 16:48:33 +08:00 |
minggo
|
e044cbb12b
|
update console to latest version
|
2014-03-04 16:47:56 +08:00 |
minggo
|
a3c2f4336f
|
Merge pull request #5537 from minggo/develop
update console to latest version
|
2014-03-04 16:45:39 +08:00 |
minggo
|
224b3220eb
|
update console to latest version
|
2014-03-04 16:45:02 +08:00 |
lm
|
16d872f2e3
|
[Jenkins] remove unused code
|
2014-03-04 12:12:04 +08:00 |
lm
|
e208e1918f
|
[Jenkins] fix the url of repos
|
2014-03-04 11:50:46 +08:00 |
lm
|
e0a9020de7
|
[Jenkins] User regex pattern to parse comment body
|
2014-03-03 18:36:32 +08:00 |
lm
|
2fe329199b
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
|
2014-03-03 18:29:51 +08:00 |
qiaofeng00oo
|
f2e9ae97e2
|
modify autotest.py in tools/jenkins-scripts
|
2014-03-03 17:47:55 +08:00 |
lm
|
7650cbc8c1
|
[jenkins]Add [ci rebuild] command via pr comments
|
2014-03-03 17:32:29 +08:00 |
James Chen
|
7e9a120e25
|
Fix travis build fails.
|
2014-02-27 16:23:38 +08:00 |
minggo
|
8eea655ae3
|
remove unneeded tools
|
2014-02-27 15:29:12 +08:00 |
CocosRobot
|
4ff894e9e0
|
[AUTO][ci skip] : updating tools/project-creator/module/cocos_files.json
|
2014-02-27 02:29:12 +00:00 |
James Chen
|
e49b7572e3
|
issue #4116: Updates jenkins scripts.
|
2014-02-26 21:47:23 +08:00 |
James Chen
|
e4837e7f94
|
issue #4116: Removes script-bindings codes.
|
2014-02-26 21:34:06 +08:00 |
James Chen
|
c2acfea633
|
issue #4116: Delete non-scripting files.
|
2014-02-26 21:17:17 +08:00 |
andyque
|
f92301a872
|
fix jsb munaul bindings error
|
2014-02-25 10:18:45 +08:00 |
andyque
|
6b6f71b043
|
change script bindings code
|
2014-02-25 10:18:45 +08:00 |
CocosRobot
|
5c0f0ebef6
|
[AUTO][ci skip] : updating tools/project-creator/module/cocos_files.json
|
2014-02-24 07:30:47 +00:00 |
CocosRobot
|
6ab2547028
|
[AUTO][ci skip] : updating tools/project-creator/module/cocos_files.json
|
2014-02-21 04:08:27 +00:00 |
CocosRobot
|
b88ade5534
|
[AUTO][ci skip] : updating tools/project-creator/module/cocos_files.json
|
2014-02-20 12:33:34 +00:00 |
CocosRobot
|
d70f9f2e7e
|
[AUTO][ci skip] : updating tools/project-creator/module/cocos_files.json
|
2014-02-20 10:21:26 +00:00 |
James Chen
|
50bdbe09b9
|
Merge pull request #5409 from lmskater/fix_trigger_url
[Jenkins] fix pending url
|
2014-02-20 17:29:45 +08:00 |
samuele3hu
|
e2596bce8b
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developEventTrigger
Conflicts:
tools/tojs/cocos2dx.ini
tools/tolua/cocos2dx.ini
|
2014-02-20 17:20:51 +08:00 |
lm
|
98566d193f
|
[Jenkins] fix pending url
|
2014-02-20 17:08:53 +08:00 |
CocosRobot
|
3e86d74a02
|
[AUTO][ci skip] : updating tools/project-creator/module/cocos_files.json
|
2014-02-20 08:50:05 +00:00 |
minggo
|
dd65379066
|
Merge pull request #5406 from minggo/develop
update cocos2d-console to latest code
|
2014-02-20 16:46:30 +08:00 |
minggo
|
db8ff41dbb
|
update cocos2d-console to latest code
|
2014-02-20 15:50:57 +08:00 |
CocosRobot
|
2c9a9c0df7
|
[AUTO][ci skip] : updating tools/project-creator/module/cocos_files.json
|
2014-02-20 07:34:52 +00:00 |
samuele3hu
|
75e1ccf84c
|
close #4094:Modify EGLViewProtocol —> GLViewProtocol and EGLView—> GLView in the cocos2d.ini for js binding-generator
|
2014-02-20 15:24:06 +08:00 |
samuele3hu
|
514112921f
|
close #4094:Add deprected support for EGLView and EGLViewProtocol on the lua binding
|
2014-02-20 15:10:34 +08:00 |
James Chen
|
8fcf172235
|
issue #4058: Reverts cocos2dx.ini.
|
2014-02-20 11:13:05 +08:00 |
James Chen
|
5164f2bb19
|
issue #4058: Removes cpp_namespace section in cocos2dx.ini.
|
2014-02-20 11:09:40 +08:00 |
James Chen
|
0ea27d8543
|
issue #4058: CCObject.cpp -> CCRef.cpp for all platform projects.
|
2014-02-20 10:56:25 +08:00 |
James Chen
|
5e6130c92c
|
issue #4058: Get rid of Object ,rename it to Ref.
|
2014-02-20 10:53:49 +08:00 |
samuele3hu
|
ce1656fa8d
|
fix: The lua binding of getPropertiesForGID would lead to compile error
|
2014-02-19 15:47:45 +08:00 |
James Chen
|
e1a256d6f1
|
Merge pull request #5319 from samuele3hu/developDynamic
issue #3956:Add the conversional functions which are used in the templates of lua binding-generator
|
2014-02-19 13:52:08 +08:00 |
CocosRobot
|
d35f7626a6
|
[AUTO][ci skip] : updating tools/project-creator/module/cocos_files.json
|
2014-02-18 08:00:39 +00:00 |
andyque
|
143f5975a6
|
fix cross-platform comiple error
details:
remove CCActionEaseEx dependency
fix compile errors on android platform
fix a few inproper decalare
fix linux compile error
fix win32 compile error
|
2014-02-18 14:22:15 +08:00 |
James Chen
|
c7b1ab4525
|
Merge pull request #5362 from ucchen/develop
closed #4037: fix copy-paste error, all spxxx_to_jsval use lower case;
|
2014-02-14 14:17:33 +08:00 |
ucchen
|
185ed86214
|
fix copy-paste error, all spxxx_to_jsval use lower case and add missing data structs getAttachment;
|
2014-02-14 13:24:56 +08:00 |
CocosRobot
|
e5ff9e1290
|
[AUTO][ci skip] : updating tools/project-creator/module/cocos_files.json
|
2014-02-14 03:19:46 +00:00 |
James Chen
|
acefa4e237
|
Merge commit 'refs/pull/5343/head' of git://github.com/cocos2d/cocos2d-x into merge5343
|
2014-02-14 09:33:42 +08:00 |
CocosRobot
|
15dbef99d3
|
[AUTO][ci skip] : updating tools/project-creator/module/cocos_files.json
|
2014-02-14 01:26:06 +00:00 |
James Chen
|
24c15b6b21
|
Updates project-creator/config-create/create_config.py.
Don't print paths to terminal, it is only useful when debugging.
|
2014-02-14 09:13:52 +08:00 |
James Chen
|
c8ec90781c
|
Merge pull request #5351 from heliclei/xcode-scheme
share xcode build schemes to support xcodebuild command line build
|
2014-02-14 09:09:07 +08:00 |
heliclei
|
37b372d21e
|
fix build scheme name
|
2014-02-13 22:42:59 +08:00 |
James Chen
|
1cd5ad3626
|
Updates COMMITTAG
Skips to build the Pull Request of updating cocos_files.json.
|
2014-02-13 13:58:55 +08:00 |
CocosRobot
|
14adb36002
|
[AUTO] : updating tools/project-creator/module/cocos_files.json
|
2014-02-13 05:48:38 +00:00 |
James Chen
|
3ac6f01742
|
issue #4020: Sorts the elements in cocos_files.
|
2014-02-13 13:45:50 +08:00 |
CocosRobot
|
8b0ed16205
|
[AUTO] : updating tools/project-creator/module/cocos_files.json
|
2014-02-13 03:56:58 +00:00 |
James Chen
|
b5710e04ba
|
issue #4020: Adds execute permission for generate-cocosfile.sh.
|
2014-02-13 11:52:16 +08:00 |
James Chen
|
2fef642300
|
issue #4020: Typo fix, elif -> if.
|
2014-02-13 11:42:23 +08:00 |
James Chen
|
772cdf5739
|
issue #4020: Updates before-install.sh. and comment fix in generate-cocosfiles.sh.
|
2014-02-13 11:38:28 +08:00 |
James Chen
|
a56b7e4f3f
|
closed #4020: cocos_files.json should be auto-generated by CocosRobot.
|
2014-02-13 11:33:11 +08:00 |
ucchen
|
2c961bdfbf
|
add spine manual binding;
|
2014-02-13 11:01:54 +08:00 |
Éloi Rivard
|
8adca38efa
|
Linux javascript bindings support.
- Adds Linux javascript test.
- Adds Linux javascript template.
- Adds Travis CI test.
|
2014-02-13 01:42:14 +01:00 |
Éloi Rivard
|
79e3c05ef1
|
Minor debugging messages and guards.
Dependencies installation is skipped on linux distributions that does not use .deb package format.
|
2014-02-13 01:25:23 +01:00 |
Éloi Rivard
|
fa2481bb24
|
Linux Spidermonkey 27 support.
|
2014-02-13 01:25:18 +01:00 |
Éloi Rivard
|
4272d4fa61
|
Linux websockets support.
|
2014-02-13 00:53:51 +01:00 |
Éloi Rivard
|
3fb2b61591
|
Linux local storage support. Depends on libsqlite3-dev
|
2014-02-13 00:53:51 +01:00 |
James Chen
|
cd4478f17c
|
Merge pull request #5327 from chuanweizhang2013/jsruntime
issue #3984: Adds JS runtime and project-creator supports creating JS runtime.
|
2014-02-12 18:51:30 +08:00 |
lm
|
3cc9235681
|
[Jenkins] fix build path
|
2014-02-12 12:49:30 +08:00 |
chuanweizhang2013
|
d5aee5eb04
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into jsruntime
|
2014-02-11 18:08:14 +08:00 |
James Chen
|
d779aaa967
|
Defines NDK_ROOT and PYTHON_BIN in top level.
|
2014-02-11 14:12:13 +08:00 |
James Chen
|
d8f89b8045
|
Exports PYTHON_BIN variable.
|
2014-02-11 14:02:34 +08:00 |
lihex
|
69bc32a21d
|
Fix path on use 32bit windows ndk
|
2014-02-11 10:02:59 +08:00 |
lm
|
d844f4f251
|
[Jenkins] use python script instead for auto generating binding
|
2014-02-10 19:18:27 +08:00 |
James Chen
|
c97b6cb197
|
Uses genbindings.py instead of genbindings.sh and genbindings.bat.
|
2014-02-10 18:30:22 +08:00 |
chuanweizhang2013
|
e9dd3d828a
|
issue #3498: commit jsruntime
|
2014-02-10 18:15:30 +08:00 |
samuele3hu
|
67a48c2a85
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developDynamic
|
2014-02-10 17:41:06 +08:00 |
samuele3hu
|
7bf7637f76
|
issue #3956:update the submodule
|
2014-02-10 15:20:34 +08:00 |
lihex
|
b06d54f706
|
issue #3781, use custom python executeable if PYTHON_BIN defined
|
2014-02-10 12:50:23 +08:00 |
lihex
|
1fbde6d8d5
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into issue#3781
|
2014-02-10 10:43:16 +08:00 |
lihex
|
4be97c1ed8
|
issue #3781, use python script instead.
|
2014-02-10 10:36:37 +08:00 |
James Chen
|
af7a591483
|
Merge pull request #5304 from heliclei/develop
fix job trigger url
|
2014-02-08 16:10:45 +08:00 |
heliclei
|
4c6dea3548
|
fix job trigger url
|
2014-02-08 16:08:50 +08:00 |
James Chen
|
d1a0dd395c
|
Merge pull request #5300 from dumganhar/iss3900-sp-v27
closed #3900: Upgrades spidermonkey to Firefox v27.
|
2014-02-08 14:04:53 +08:00 |
James Chen
|
4d60b17a59
|
Merge pull request #5298 from heliclei/develop
[jenkins]To add ios build support:fix xcodebuild stackoverflow, add shared build schemes
|
2014-02-08 14:04:28 +08:00 |
James Chen
|
a75004398d
|
issue #3900: Updates cocos2d-console to support spidermonkey v27.
|
2014-02-08 13:48:38 +08:00 |
James Chen
|
e7bc7c10e1
|
issue #3900: Updates bindings-generator.
|
2014-02-08 10:54:18 +08:00 |
heliclei
|
c5542d782f
|
fix build path
|
2014-02-07 21:25:34 +08:00 |
heliclei
|
78419adc81
|
xctool fails to init, use xcodebuild instead
|
2014-02-07 21:24:48 +08:00 |
James Chen
|
e0e37424f0
|
[Travis-CI] Removes openmw ppa since we’re using glfw3 rather than sdl2.
|
2014-02-07 21:11:30 +08:00 |
James Chen
|
5714552458
|
issue #3900: mozjs-27.0.lib -> mozjs-27.lib for windows.
|
2014-02-07 15:29:44 +08:00 |
James Chen
|
4c2da5d286
|
issue #3900: mozjs-25 -> mozjs-27 for windows.
|
2014-02-07 15:16:14 +08:00 |
heliclei
|
5a3aeee66f
|
trim payload size to fix xcodebuild stack overflow
|
2014-02-07 14:57:07 +08:00 |
Ricardo Quesada
|
71c53ef0fd
|
ios template compiles OK
|
2014-02-03 11:32:00 -08:00 |
WanderWang
|
5d10310d39
|
Update README.md
|
2014-02-03 23:26:40 +08:00 |
James Chen
|
667cd04ee6
|
Update run-script.sh, samples -> tests.
|
2014-02-01 12:33:15 +08:00 |
Ricardo Quesada
|
5fc190b6ed
|
new config file
|
2014-01-30 19:24:06 -08:00 |
James Chen
|
3f8f36df68
|
issue #3828: Updates travis script.
|
2014-01-28 16:23:16 +08:00 |
James Chen
|
6d491e66cf
|
issue #3828: Updates travis-scripts/run-script.sh
|
2014-01-28 16:11:54 +08:00 |
James Chen
|
e83ddec7b8
|
Merge pull request #5258 from lmskater/create-module-project
[Jenkins] add create-template-project.py
|
2014-01-27 01:42:07 -08:00 |
lm
|
f6e4f4b44b
|
[Jenkins] rename language to languages
|
2014-01-27 17:22:24 +08:00 |
lm
|
607a060256
|
[Jenkins] rename module to template
|
2014-01-27 17:09:14 +08:00 |
samuele3hu
|
1fa2f24bf2
|
fix:Add the lua binding for ‘Component’
|
2014-01-27 17:04:37 +08:00 |
lm
|
8356afdd0e
|
[Jenkins] add create-module-project.py
|
2014-01-27 16:46:35 +08:00 |
lm
|
2f64c99fe7
|
[Jenkins] only develop branch build is supported for win7
|
2014-01-26 18:27:27 +08:00 |
James Chen
|
a4a010465c
|
Merge commit 'refs/pull/5071/head' of git://github.com/cocos2d/cocos2d-x into merge5071
|
2014-01-26 16:41:35 +08:00 |
James Chen
|
25c7c68cd2
|
Updates bindings-generator.
|
2014-01-26 16:20:10 +08:00 |
James Chen
|
d2893c1e1e
|
Merge pull request #5229 from dumganhar/iss3858-jsclass-log-fix
closed #3858: Pure JS class which is inherited from cc.Class will trigger an irrelevant log.
|
2014-01-25 22:46:56 -08:00 |
James Chen
|
952cd1d836
|
ComController needs to be `extend`ed. Updates cocos2dx_studio.ini.
|
2014-01-26 14:42:17 +08:00 |
James Chen
|
26125f4e26
|
closed #3858: Pure JS class which is inherited from cc.Class will trigger an irrelevant log.
Please refer to http://www.cocos2d-x.org/issues/3858.
|
2014-01-26 14:41:27 +08:00 |
Dhilan007
|
ace3ecb48a
|
update template for add socket files[lua]
|
2014-01-26 11:28:57 +08:00 |
James Chen
|
f0b395da3c
|
Merge pull request #5205 from dumganhar/develop
[JSB] cc.Node.setLocalZOrder -> cc.Node.setZOrder.
|
2014-01-23 23:04:00 -08:00 |
James Chen
|
f1ffb0b753
|
[JSB] cc.Node.setLocalZOrder -> cc.Node.setZOrder.
|
2014-01-24 15:02:14 +08:00 |
lm
|
232194646d
|
[Jenkins] add win32 build in pull-request-builder.py
|
2014-01-24 14:40:15 +08:00 |
lm
|
7807405138
|
[Jenkins] fix the url of build description
|
2014-01-24 12:05:31 +08:00 |
lm
|
490c85a388
|
[Jenkins] add missing double quotes in pull-request-builder.py
|
2014-01-24 09:50:40 +08:00 |
James Chen
|
646dd2f8c5
|
Merge pull request #5191 from heliclei/develop
[jenkins]add ios build script
|
2014-01-23 08:10:46 -08:00 |
heliclei
|
8861a50e65
|
fix project path
|
2014-01-23 23:40:08 +08:00 |
heliclei
|
a28da90c9d
|
add ios build script
|
2014-01-23 23:30:54 +08:00 |
lm
|
c82566435a
|
[Jenkins] fix the path in pull-request-builder.py
|
2014-01-23 19:05:49 +08:00 |
lm
|
76066c81d8
|
[Jenkins] fix the path in gen_jsb_win32.bat
|
2014-01-23 19:02:19 +08:00 |
James Chen
|
41c63e2f4d
|
Merge pull request #5183 from dumganhar/iss3823-fullscreen-glfw
closed #3823: Fullscreen support for desktop platforms (windows, linux, mac).
|
2014-01-23 01:41:41 -08:00 |
James Chen
|
d980d33d56
|
issue #3823: install_glfw.sh will not skip if it was installed. Since it will not be updated if we find a new version of glfw.
BTW, install script will not be invoked in every build after we switch to cmake.
|
2014-01-23 01:07:28 -08:00 |
James Chen
|
87980456a9
|
Merge pull request #5180 from lihex/issue#3781
Should check ndk architechture.
|
2014-01-23 00:13:23 -08:00 |
James Chen
|
048298c6a0
|
issue #3823: Updates travis-ci script to use the latest release of glfw (v3.0.4).
|
2014-01-23 15:57:10 +08:00 |
lm
|
f364e64e3c
|
[Jenkins] add auto generate bindings for win7
|
2014-01-23 15:38:26 +08:00 |
lihex
|
2dc9958475
|
issue #3781, Should check ndk architechture.
|
2014-01-23 15:27:00 +08:00 |
James Chen
|
f43f3c770b
|
Merge pull request #5179 from lihex/issue#3781
Update docs for bindings-generator.
|
2014-01-22 22:35:40 -08:00 |
lihex
|
f9b2ead623
|
Update docs.
|
2014-01-23 14:14:07 +08:00 |
James Chen
|
9bb3444e04
|
Merge pull request #5176 from heliclei/develop
[Jenkins]fix jenkins api, get correct build result
|
2014-01-22 21:08:20 -08:00 |
heliclei
|
9642766c7e
|
correct format
|
2014-01-23 12:57:18 +08:00 |
heliclei
|
67d5ab72d0
|
fix jenkins api, get correct build result
|
2014-01-23 12:54:35 +08:00 |
James Chen
|
91511840a1
|
Merge pull request #5175 from lihex/issue#3781
Fix the path.
|
2014-01-22 20:20:08 -08:00 |
lihex
|
b9331a06f9
|
issue #3781, Fix the path.
|
2014-01-23 12:08:27 +08:00 |
James Chen
|
9292d92f63
|
Merge pull request #5143 from pandamicro/develop
closed #3806: SAXParser was supported with manual binding in JSB
|
2014-01-22 19:50:15 -08:00 |
James Chen
|
aba15dfc2d
|
Merge pull request #5172 from dumganhar/use-unified-cceglview
Using unified 'desktop/CCEGLView.h/cpp' for Windows platform too.
|
2014-01-22 19:23:44 -08:00 |
James Chen
|
8bcdb0ace0
|
Merge pull request #5173 from lihex/issue#3781
Don't set a default PYTHON_ROOT & NDK_ROOT for user on Windows
|
2014-01-22 19:22:24 -08:00 |
James Chen
|
bb650729c3
|
Updates cocos_files.json.
|
2014-01-23 11:08:10 +08:00 |
lihex
|
ecdd64a889
|
issue #3781, Don't set a default PYTHON_ROOT & NDK_ROOT for user on Windows.
|
2014-01-23 10:48:03 +08:00 |
James Chen
|
3829a1aa46
|
Merge pull request #5166 from heliclei/develop
[jenkins]add post build script
|
2014-01-22 18:47:43 -08:00 |
Ricardo Quesada
|
ae09cce83f
|
updated template for Linux
|
2014-01-22 14:32:40 -08:00 |
heliclei
|
04ee67481a
|
set pr status at post build stage
|
2014-01-23 00:21:58 +08:00 |
pandamicro
|
913360e526
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
|
2014-01-22 22:32:44 +08:00 |
pandamicro
|
d6df71cc11
|
Fixed #3806: Change parameters to const &
|
2014-01-22 22:31:26 +08:00 |
heliclei
|
e12e80298d
|
update github api url and jenkins job trigger url
|
2014-01-22 15:23:29 +08:00 |
James Chen
|
f3233cba61
|
Merge pull request #5150 from lihex/issue#3781
issue #3781: Update script for each platform bindings generating.
|
2014-01-21 19:57:19 -08:00 |
heliclei
|
d7f1dfbe14
|
do not mix github access token with jenkins job trigger token
|
2014-01-22 11:35:25 +08:00 |
lihex
|
3b9d4c7a39
|
issue #3781, Update travis-scripts, llvm-installing parts no need now.
|
2014-01-22 11:28:53 +08:00 |
lihex
|
b2a1cd90eb
|
issue #3781, Minor fix & update submodule.
|
2014-01-22 10:58:02 +08:00 |
lihex
|
40f5c31a50
|
issue #3781, Undefine the __MINGW32__ macro to fix the script error on windows
|
2014-01-21 18:32:27 +08:00 |
pandamicro
|
3de7ed93f9
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
Conflicts:
cocos/scripting/javascript/bindings/cocos2d_specifics.cpp
|
2014-01-21 18:18:32 +08:00 |
pandamicro
|
a467fe3244
|
Fixed #3806: SAXParser supported with manual binding in JSB
|
2014-01-21 18:12:12 +08:00 |
lihex
|
56654c0ffb
|
issue #3781, js not generate cocos2dx physics now.
|
2014-01-21 18:09:21 +08:00 |
lihex
|
1a6b36184d
|
issue #3781, Add windows bat script.
|
2014-01-21 17:48:49 +08:00 |
lihex
|
a392a709cd
|
issue #3781: Fix the variable name.
|
2014-01-21 17:40:20 +08:00 |
lihex
|
0109ebd707
|
issue #3781, Update genbinding script to fit new bindings-generator.
|
2014-01-21 16:53:07 +08:00 |
James Chen
|
8eca8e25cb
|
Merge pull request #5099 from samuele3hu/test-rebase
close #3626:Make lua bindings-generator support the namespace binding
|
2014-01-17 06:07:45 -08:00 |
lm
|
38e7f01ee8
|
decode 'payload' to utf-8 and ignore invalid bytes
|
2014-01-17 17:13:33 +08:00 |
James Chen
|
31199183b2
|
Merge commit 'refs/pull/5086/head' of git://github.com/cocos2d/cocos2d-x into new-label-atlas
|
2014-01-17 11:10:04 +08:00 |
samuele3hu
|
508d786fa7
|
issue #3626:Update the submodule
|
2014-01-17 10:19:58 +08:00 |
samuele3hu
|
d086f7a259
|
issue #3626:Add the deprecated support for the tolua.cast
|
2014-01-17 10:19:57 +08:00 |
samuele3hu
|
de698aaea7
|
issue #3626:Add lua binding for ScollView and TableView classes in the cocos2d::extension namespace and the related test cases
|
2014-01-17 10:19:55 +08:00 |
Dhilan007
|
53be67c653
|
update project file.
|
2014-01-16 18:12:53 +08:00 |
heliclei
|
925a4f0f30
|
add reopen support
|
2014-01-16 16:22:04 +08:00 |
heliclei
|
9de4c4fa70
|
[jenkins]add job trigger,to update github pull request status instantly
|
2014-01-16 15:16:12 +08:00 |
James Chen
|
2e7516c582
|
Merge pull request #5041 from Dhilan007/develop_label
closed #3630:Uses a struct of TTF configuration for Label::createWithTTF to reduce parameters and make this interface more easily to use.
|
2014-01-15 18:37:40 -08:00 |
James Chen
|
f62c041886
|
Compilation fix: Updates cocos_files.json and removes unused in template.
|
2014-01-16 10:27:35 +08:00 |
Luis Parravicini
|
21c4b2c893
|
fixes #3720
|
2014-01-15 19:44:57 -03:00 |
Ricardo Quesada
|
b3f306e742
|
Ignore getFullPathCache() in FileUtils
|
2014-01-14 18:30:51 -08:00 |
boyu0
|
de30a9cfea
|
issue #3401: add lua physics slide test, add more banding code, and fix some bugs.
|
2014-01-14 15:48:44 +08:00 |
James Chen
|
815cea3d7b
|
Merge pull request #5044 from Pisces000221/patch-1
Corrected a few mistakes in project-creator README
|
2014-01-13 22:52:34 -08:00 |
Nite Luo
|
37522c61c3
|
Make the ui look a bit better
|
2014-01-13 11:54:33 -08:00 |
Nite Luo
|
2e127f819b
|
Add Polish the labels for project creator ui
|
2014-01-13 11:37:44 -08:00 |
Dhilan007
|
fd481d64a0
|
1.update lua binding configuration for label.
2.recover old method[createWithTTF]
|
2014-01-13 16:32:35 +08:00 |
James Chen
|
5dedd085c8
|
Merge pull request #5032 from heliclei/develop
rename ghprb.py to pull-request-builder.py
|
2014-01-12 17:43:40 -08:00 |
Pisces000221
|
09f23c1bcb
|
Corrected a few mistakes in project-creator README
|
2014-01-12 14:38:09 +08:00 |
Dhilan007
|
b2038d14d6
|
update lua binding configuration for label.
|
2014-01-11 22:55:23 +08:00 |
Dhilan007
|
69c004108b
|
issue#3630:Adjust some method for more easily create and change type.
|
2014-01-11 22:33:07 +08:00 |
heliclei
|
b4a4b70e22
|
rename ghprb.py to pull-request-builder.py
|
2014-01-10 17:45:28 +08:00 |
James Chen
|
b454bf01e3
|
Merge pull request #5002 from heliclei/develop
support [ci skip] in commit message
|
2014-01-08 20:53:19 -08:00 |
heliclei
|
007a64e50e
|
support [ci skip] command
|
2014-01-09 12:47:46 +08:00 |
heliclei
|
2b7aa26308
|
fix create job state
|
2014-01-09 10:56:33 +08:00 |
James Chen
|
2de06a9655
|
Merge pull request #4993 from heliclei/develop
add auto generate bindings
|
2014-01-08 01:55:10 -08:00 |
heliclei
|
6cbf69306c
|
remove unnessesary chmod and ls command
|
2014-01-08 16:51:37 +08:00 |
heliclei
|
13fab57ce2
|
remove debug print
|
2014-01-08 16:27:08 +08:00 |
heliclei
|
f7a0e7da1a
|
add auto generate bindings
|
2014-01-08 16:21:11 +08:00 |
James Chen
|
b07acb6c12
|
[JSB] Supports cc.ScrollView.extend, cc.TableView.extend, cc.TableViewCell.
|
2014-01-07 22:17:22 +08:00 |
James Chen
|
e25c4b5f4d
|
[JSB] Armature should be able to be extended in JS.
|
2014-01-07 20:55:07 +08:00 |
James Chen
|
849b522924
|
Merge pull request #4962 from Dhilan007/develop_crash
update bindings-generator submodule
|
2014-01-07 01:41:47 -08:00 |
Dhilan007
|
3cab3e5df3
|
update bindings-generator submodule
|
2014-01-07 17:19:29 +08:00 |
samuele3hu
|
b19bda1588
|
Fix:Update cocos_files.json file
|
2014-01-07 16:49:51 +08:00 |
James Chen
|
da17c6b05b
|
Merge pull request #4954 from heliclei/develop
[Jenkins]fix symbol link create error
|
2014-01-07 00:35:16 -08:00 |
heliclei
|
05f6fedd1e
|
fix windows symbol link path error
|
2014-01-07 16:27:23 +08:00 |
James Chen
|
f5ae2bbacc
|
Merge pull request #4932 from boyu0/iss3401_physical_lua_binding
issue #3401: physical lua binding
|
2014-01-06 23:48:47 -08:00 |
heliclei
|
5dadbce813
|
fix symbol link create error
|
2014-01-07 15:41:18 +08:00 |
James Chen
|
37b6ef99e3
|
Wrong dir fix for travis ci.
|
2014-01-06 20:04:30 -08:00 |
James Chen
|
2f7c41bd28
|
[travis] builds linux template now.
|
2014-01-06 19:42:51 -08:00 |