beb6f7359c
Update the reference of submodule "cocos2d-console".
2014-03-25 14:19:46 +08:00
e521632b55
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into cocos-console-test
2014-03-21 17:51:06 +08:00
c55910c2c0
add-close app in console-test.py.
2014-03-21 17:50:38 +08:00
1527fe1159
[jenkins-watchdog]add the time of single job
2014-03-21 17:36:27 +08:00
4b726f55cd
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
2014-03-21 17:07:10 +08:00
352e656305
[jenkins-watchdog]add the time of single job
2014-03-21 17:02:18 +08:00
87cfbc9773
Merge pull request #5849 from shujunqiao/autotest
...
[jenkins] updates autotest.py
2014-03-21 16:52:58 +08:00
a66a2a9bba
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into cocos-console-test
2014-03-21 14:36:28 +08:00
d18ee12678
for test close project in cocos-console-test.py.
2014-03-21 14:15:59 +08:00
9598c151ed
[Jenkins] Clean workspace after build finish
2014-03-21 13:57:38 +08:00
686ed5dfa1
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into cocos-console-test
2014-03-21 10:42:23 +08:00
fdb87cc69d
ignore [] in command [console run].
2014-03-20 17:40:41 +08:00
3db3a12318
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into add-master-build
2014-03-20 16:20:02 +08:00
3f09fbdade
[Jenkins] Add master build in pull-request-builder.py
2014-03-20 16:19:35 +08:00
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
64f90e5f04
Update the reference of submodule "cocos2d-console".
2014-03-20 14:12:58 +08:00
6b042d26da
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into cocos-console-test
2014-03-20 10:43:31 +08:00
abc88ecc6a
delete not need variable in cocos-console-test.py.
2014-03-20 10:41:19 +08:00
7ea6185bbb
"modify console_cmd to console_param in cocos-console-test.py."
2014-03-20 10:32:04 +08:00
4bd7a60ca9
modify args of [console].
2014-03-20 10:24:10 +08:00
3b2a5274ea
Update `bindings-generator` submodule
2014-03-20 10:12:04 +08:00
2f5e9ed654
modify job-comment-trigger to support [console].
2014-03-19 17:57:19 +08:00
863272b1c8
Merge pull request #5855 from lmskater/fix-android-build
...
[Jenkins] build all samples on android
2014-03-19 12:01:37 +08:00
05db740d2f
Merge pull request #5837 from linchaogithub/develop
...
[jenkins-watchdog] update
2014-03-19 12:01:13 +08:00
426b006bfb
[Jenkins] build all samples on android
2014-03-18 17:27:57 +08:00
ee0e43fcc2
modify android-job in autotest.py.
2014-03-18 16:21:41 +08:00
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
716f480eb4
[Jenkins] make build fail when submodule update fail
2014-03-18 14:37:23 +08:00
8c25fd5e8f
modify android-build-autotest in autotest.py.
2014-03-18 14:30:01 +08:00
a4bba6d03a
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into autotest
2014-03-18 14:07:24 +08:00
761456d480
test android part of autotest.py.
2014-03-18 14:06:33 +08:00
402b6f0f28
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_3_fix
2014-03-18 10:40:12 +08:00
309422f791
update `bindings-generator` submodule
2014-03-18 10:36:37 +08:00
36cfd17e7b
Merge pull request #5834 from shujunqiao/autotest
...
modify autotest.py for use mac app.
2014-03-17 17:59:36 +08:00
88232d86bd
[jenkins-watchdog] ['JENKINS_ADMIN']replace['username'],['JENKINS_ADMIN_PW']replace['password']
2014-03-17 16:10:26 +08:00
bf68f180b4
Update the reference of submodule "cocos2d-console".
2014-03-17 15:25:07 +08:00
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
7fd3017b5f
modify autotest.py for use mac app.
2014-03-17 11:49:18 +08:00
da7b6d565c
update submodule
2014-03-15 12:20:22 +08:00
c0416fe554
update submodule
2014-03-15 00:37:00 +08:00
c36bae6c07
update submodule
2014-03-14 23:48:20 +08:00
aa6029ca7d
Merge pull request #5811 from dumganhar/develop
...
Updates bindings-generator.
2014-03-14 23:05:13 +08:00
7cff033b55
Updates bindings-generator.
2014-03-14 23:04:05 +08:00
f7a1d1f095
update submodule
2014-03-14 22:56:40 +08:00
99221ffcf1
update submodule
2014-03-14 22:17:47 +08:00
b62d2e8ec0
update submodule
2014-03-14 21:29:36 +08:00
2ea565018c
update submodule
2014-03-14 19:41:51 +08:00
2089dd9ccd
update Lua binding for label.
2014-03-14 16:21:56 +08:00
28a71ff14e
update submodule
2014-03-13 22:11:38 +08:00
3ce647268d
update submodule
2014-03-13 19:35:55 +08:00
b37bd73861
Merge pull request #5751 from linchaogithub/develop
...
[Jenkins-watchdog] check & kill dead buid
2014-03-13 17:50:53 +08:00
3013bf2d6d
modify cocos-console-test.py.
2014-03-13 17:05:10 +08:00
17ba28de2a
add cocos-console-test.py to tools/jenkins-scripts/
2014-03-13 16:29:47 +08:00
a30ce6cfc5
Update `bindings-generator` submodule
2014-03-13 14:47:00 +08:00
108928e1a7
Update `bindings-generator` submodule and add auto-binding for the `RichText`
2014-03-13 14:31:07 +08:00
347dd55f3d
[jenkins-job-watchdog-threshold]replace[duration]
2014-03-13 14:12:29 +08:00
ab4841e774
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
2014-03-13 11:17:50 +08:00
9dcca7641c
[Jenkins] watchdog
2014-03-13 11:16:21 +08:00
2b657e71c4
Merge pull request #5727 from natural-law/develop
...
Update the reference of submodule "cocos2d-console".
2014-03-12 20:36:44 +08:00
be51779c4e
Update the reference of submodule "cocos2d-console".
2014-03-12 20:35:05 +08:00
04038a912f
[travis ci] Sort file list in generate-template-files.py.
2014-03-12 20:34:49 +08:00
c4752b260b
Updates tools/travis-scripts/generate-template-files.py.
2014-03-12 20:18:55 +08:00
884229e898
modify generate-template-files
2014-03-12 17:20:15 +08:00
d1a84cd7e8
[Jenkins] watchdog
2014-03-12 17:18:16 +08:00
db68e1feed
[jenkins] watchdog
2014-03-12 16:28:23 +08:00
d7aa1312ba
[Jenkins] watchdog
2014-03-12 15:36:09 +08:00
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
2c2a5ee38e
rename gui to ui
2014-03-12 10:46:49 +08:00
90938429d0
reset cocos-console commit
2014-03-12 10:37:33 +08:00
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
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
fbcf1e7193
Updates pull-request-builder.py, do 'git clean -fdx -f' after checkout a new branch.
2014-03-11 22:05:50 +08:00
1e8990744e
update submodule
2014-03-11 22:02:47 +08:00
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
3adc62679f
Updates Jenkins ci.
2014-03-11 20:47:02 +08:00
448b101578
fix linux compile error
2014-03-11 20:46:11 +08:00
4444e3872e
[jenkins ci] Build only cpp-empty-test, cpp-tests.
2014-03-11 19:39:20 +08:00
cbd9cbaf71
travis builds all tests projects for Android.
2014-03-11 19:10:36 +08:00
026ef95b07
add lua ui binding
2014-03-11 18:48:27 +08:00
dcc98ef79f
rename cocos2dx_gui to cocos2dx_ui
2014-03-11 18:48:27 +08:00
1c533a7746
update console submodule
2014-03-11 17:43:35 +08:00
0202a678be
Merge pull request #5675 from minggo/develop
...
update console to latest version
2014-03-11 16:56:28 +08:00
9d1a70d569
update console to latest version
2014-03-11 16:47:16 +08:00
41c8b6064e
re-open generate binding glue codes.
2014-03-11 15:30:48 +08:00
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
e9b13772e8
Merge pull request #5660 from minggo/develop
...
update console to latest codes
2014-03-10 20:03:32 +08:00
376ae24c10
update console to latest codes
2014-03-10 20:01:22 +08:00
38160ff7d7
Corrects a mistake in generate-bindings.sh
2014-03-10 19:18:55 +08:00
7d3a6c999d
Updates before-install.sh.
2014-03-10 18:24:28 +08:00
9c18c804f5
Typo fix.
2014-03-10 18:20:51 +08:00
124b18f53a
Re-add CocosRobot send bindings glue codes to cocos2d-x repo.
2014-03-10 18:13:39 +08:00
0f9ff45778
Re-add bindings-generator submodule.
2014-03-10 17:46:30 +08:00
bdd66ee0fd
[Jenkins] fix the crash in comment trigger
2014-03-10 16:35:55 +08:00
7841bceb2b
[jenkins ci] Updates jenkins script
2014-03-10 13:50:14 +08:00
a5f668a0bf
[travis ci] Build testcpp only.
2014-03-10 12:06:33 +08:00
286ebb349f
[jenkins] Don't gen jsb bindings.
2014-03-10 12:02:29 +08:00
d96c7b4424
update submodule
2014-03-07 14:14:13 +08:00
e01319a701
[Jenkins] add linux build
2014-03-07 11:25:35 +08:00
3d2bf5cc1a
Merge pull request #5608 from lmskater/fix-android-build
...
[Jenkins] fix android build
2014-03-07 11:02:47 +08:00
c49dc0a044
[Jenkins] fix android build
2014-03-07 10:51:17 +08:00
f44773b5df
modify autotest.py
2014-03-06 16:52:34 +08:00
c2cd349da5
Uses 'generate-tempate-files.py' to generate cocos2dx_files.json
2014-03-06 14:56:46 +08:00
58553d67f5
Merge pull request #5583 from dumganhar/develop
...
[travis ci] Updates generate-cocosfiles.sh.
2014-03-06 14:16:21 +08:00
5ca25d854f
[travis ci] Updates generate-cocosfiles.sh.
2014-03-06 14:10:50 +08:00
e6e9c5abfb
Merge pull request #5581 from dumganhar/develop
...
[travis ci] Uncomments '.generate-cocosfiles.sh'.
2014-03-06 14:02:52 +08:00
738a4f5deb
Uncomments '.generate-cocosfiles.sh'.
2014-03-06 14:00:48 +08:00
43d85dc0d7
Merge pull request #5580 from lihex/develop
...
rename template config file
2014-03-06 13:58:39 +08:00
c206384edd
rename template config file
2014-03-06 13:56:18 +08:00
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
389811d9e5
update submodule
2014-03-05 16:14:56 +08:00
76961b799a
Merge pull request #5538 from minggo/develop
...
update console to latest version
2014-03-04 16:48:33 +08:00
e044cbb12b
update console to latest version
2014-03-04 16:47:56 +08:00
a3c2f4336f
Merge pull request #5537 from minggo/develop
...
update console to latest version
2014-03-04 16:45:39 +08:00
224b3220eb
update console to latest version
2014-03-04 16:45:02 +08:00
16d872f2e3
[Jenkins] remove unused code
2014-03-04 12:12:04 +08:00
e208e1918f
[Jenkins] fix the url of repos
2014-03-04 11:50:46 +08:00
e0a9020de7
[Jenkins] User regex pattern to parse comment body
2014-03-03 18:36:32 +08:00
2fe329199b
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
2014-03-03 18:29:51 +08:00
f2e9ae97e2
modify autotest.py in tools/jenkins-scripts
2014-03-03 17:47:55 +08:00
7650cbc8c1
[jenkins]Add [ci rebuild] command via pr comments
2014-03-03 17:32:29 +08:00
7e9a120e25
Fix travis build fails.
2014-02-27 16:23:38 +08:00
8eea655ae3
remove unneeded tools
2014-02-27 15:29:12 +08:00
4ff894e9e0
[AUTO][ci skip] : updating tools/project-creator/module/cocos_files.json
2014-02-27 02:29:12 +00:00
e49b7572e3
issue #4116 : Updates jenkins scripts.
2014-02-26 21:47:23 +08:00
e4837e7f94
issue #4116 : Removes script-bindings codes.
2014-02-26 21:34:06 +08:00
c2acfea633
issue #4116 : Delete non-scripting files.
2014-02-26 21:17:17 +08:00
f92301a872
fix jsb munaul bindings error
2014-02-25 10:18:45 +08:00
6b6f71b043
change script bindings code
2014-02-25 10:18:45 +08:00
5c0f0ebef6
[AUTO][ci skip] : updating tools/project-creator/module/cocos_files.json
2014-02-24 07:30:47 +00:00
6ab2547028
[AUTO][ci skip] : updating tools/project-creator/module/cocos_files.json
2014-02-21 04:08:27 +00:00
b88ade5534
[AUTO][ci skip] : updating tools/project-creator/module/cocos_files.json
2014-02-20 12:33:34 +00:00
d70f9f2e7e
[AUTO][ci skip] : updating tools/project-creator/module/cocos_files.json
2014-02-20 10:21:26 +00:00
50bdbe09b9
Merge pull request #5409 from lmskater/fix_trigger_url
...
[Jenkins] fix pending url
2014-02-20 17:29:45 +08:00
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
98566d193f
[Jenkins] fix pending url
2014-02-20 17:08:53 +08:00
3e86d74a02
[AUTO][ci skip] : updating tools/project-creator/module/cocos_files.json
2014-02-20 08:50:05 +00:00
dd65379066
Merge pull request #5406 from minggo/develop
...
update cocos2d-console to latest code
2014-02-20 16:46:30 +08:00
db8ff41dbb
update cocos2d-console to latest code
2014-02-20 15:50:57 +08:00
2c9a9c0df7
[AUTO][ci skip] : updating tools/project-creator/module/cocos_files.json
2014-02-20 07:34:52 +00:00
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
514112921f
close #4094:Add deprected support for EGLView and EGLViewProtocol on the lua binding
2014-02-20 15:10:34 +08:00
8fcf172235
issue #4058 : Reverts cocos2dx.ini.
2014-02-20 11:13:05 +08:00
5164f2bb19
issue #4058 : Removes cpp_namespace section in cocos2dx.ini.
2014-02-20 11:09:40 +08:00
0ea27d8543
issue #4058 : CCObject.cpp -> CCRef.cpp for all platform projects.
2014-02-20 10:56:25 +08:00
5e6130c92c
issue #4058 : Get rid of Object ,rename it to Ref.
2014-02-20 10:53:49 +08:00
ce1656fa8d
fix: The lua binding of getPropertiesForGID would lead to compile error
2014-02-19 15:47:45 +08:00
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
d35f7626a6
[AUTO][ci skip] : updating tools/project-creator/module/cocos_files.json
2014-02-18 08:00:39 +00:00
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
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
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
e5ff9e1290
[AUTO][ci skip] : updating tools/project-creator/module/cocos_files.json
2014-02-14 03:19:46 +00:00
acefa4e237
Merge commit 'refs/pull/5343/head' of git://github.com/cocos2d/cocos2d-x into merge5343
2014-02-14 09:33:42 +08:00
15dbef99d3
[AUTO][ci skip] : updating tools/project-creator/module/cocos_files.json
2014-02-14 01:26:06 +00:00
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
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
37b372d21e
fix build scheme name
2014-02-13 22:42:59 +08:00
1cd5ad3626
Updates COMMITTAG
...
Skips to build the Pull Request of updating cocos_files.json.
2014-02-13 13:58:55 +08:00
14adb36002
[AUTO] : updating tools/project-creator/module/cocos_files.json
2014-02-13 05:48:38 +00:00
3ac6f01742
issue #4020 : Sorts the elements in cocos_files.
2014-02-13 13:45:50 +08:00
8b0ed16205
[AUTO] : updating tools/project-creator/module/cocos_files.json
2014-02-13 03:56:58 +00:00
b5710e04ba
issue #4020 : Adds execute permission for generate-cocosfile.sh.
2014-02-13 11:52:16 +08:00
2fef642300
issue #4020 : Typo fix, elif -> if.
2014-02-13 11:42:23 +08:00
772cdf5739
issue #4020 : Updates before-install.sh. and comment fix in generate-cocosfiles.sh.
2014-02-13 11:38:28 +08:00
a56b7e4f3f
closed #4020 : cocos_files.json should be auto-generated by CocosRobot.
2014-02-13 11:33:11 +08:00
2c961bdfbf
add spine manual binding;
2014-02-13 11:01:54 +08:00
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
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
fa2481bb24
Linux Spidermonkey 27 support.
2014-02-13 01:25:18 +01:00
4272d4fa61
Linux websockets support.
2014-02-13 00:53:51 +01:00
3fb2b61591
Linux local storage support. Depends on libsqlite3-dev
2014-02-13 00:53:51 +01:00
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
3cc9235681
[Jenkins] fix build path
2014-02-12 12:49:30 +08:00
d5aee5eb04
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into jsruntime
2014-02-11 18:08:14 +08:00
d779aaa967
Defines NDK_ROOT and PYTHON_BIN in top level.
2014-02-11 14:12:13 +08:00
d8f89b8045
Exports PYTHON_BIN variable.
2014-02-11 14:02:34 +08:00
69bc32a21d
Fix path on use 32bit windows ndk
2014-02-11 10:02:59 +08:00
d844f4f251
[Jenkins] use python script instead for auto generating binding
2014-02-10 19:18:27 +08:00
c97b6cb197
Uses genbindings.py instead of genbindings.sh and genbindings.bat.
2014-02-10 18:30:22 +08:00
e9dd3d828a
issue #3498 : commit jsruntime
2014-02-10 18:15:30 +08:00
67a48c2a85
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developDynamic
2014-02-10 17:41:06 +08:00
7bf7637f76
issue #3956:update the submodule
2014-02-10 15:20:34 +08:00
b06d54f706
issue #3781 , use custom python executeable if PYTHON_BIN defined
2014-02-10 12:50:23 +08:00
1fbde6d8d5
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into issue#3781
2014-02-10 10:43:16 +08:00
4be97c1ed8
issue #3781 , use python script instead.
2014-02-10 10:36:37 +08:00
af7a591483
Merge pull request #5304 from heliclei/develop
...
fix job trigger url
2014-02-08 16:10:45 +08:00
4c6dea3548
fix job trigger url
2014-02-08 16:08:50 +08:00
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
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
a75004398d
issue #3900 : Updates cocos2d-console to support spidermonkey v27.
2014-02-08 13:48:38 +08:00
e7bc7c10e1
issue #3900 : Updates bindings-generator.
2014-02-08 10:54:18 +08:00
c5542d782f
fix build path
2014-02-07 21:25:34 +08:00
78419adc81
xctool fails to init, use xcodebuild instead
2014-02-07 21:24:48 +08:00
e0e37424f0
[Travis-CI] Removes openmw ppa since we’re using glfw3 rather than sdl2.
2014-02-07 21:11:30 +08:00
5714552458
issue #3900 : mozjs-27.0.lib -> mozjs-27.lib for windows.
2014-02-07 15:29:44 +08:00
4c2da5d286
issue #3900 : mozjs-25 -> mozjs-27 for windows.
2014-02-07 15:16:14 +08:00
5a3aeee66f
trim payload size to fix xcodebuild stack overflow
2014-02-07 14:57:07 +08:00
71c53ef0fd
ios template compiles OK
2014-02-03 11:32:00 -08:00
5d10310d39
Update README.md
2014-02-03 23:26:40 +08:00
667cd04ee6
Update run-script.sh, samples -> tests.
2014-02-01 12:33:15 +08:00
5fc190b6ed
new config file
2014-01-30 19:24:06 -08:00
3f8f36df68
issue #3828 : Updates travis script.
2014-01-28 16:23:16 +08:00
6d491e66cf
issue #3828 : Updates travis-scripts/run-script.sh
2014-01-28 16:11:54 +08:00
e83ddec7b8
Merge pull request #5258 from lmskater/create-module-project
...
[Jenkins] add create-template-project.py
2014-01-27 01:42:07 -08:00
f6e4f4b44b
[Jenkins] rename language to languages
2014-01-27 17:22:24 +08:00
607a060256
[Jenkins] rename module to template
2014-01-27 17:09:14 +08:00
1fa2f24bf2
fix:Add the lua binding for ‘Component’
2014-01-27 17:04:37 +08:00
8356afdd0e
[Jenkins] add create-module-project.py
2014-01-27 16:46:35 +08:00
2f64c99fe7
[Jenkins] only develop branch build is supported for win7
2014-01-26 18:27:27 +08:00
a4a010465c
Merge commit 'refs/pull/5071/head' of git://github.com/cocos2d/cocos2d-x into merge5071
2014-01-26 16:41:35 +08:00
25c7c68cd2
Updates bindings-generator.
2014-01-26 16:20:10 +08:00
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
952cd1d836
ComController needs to be `extend`ed. Updates cocos2dx_studio.ini.
2014-01-26 14:42:17 +08:00
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
ace3ecb48a
update template for add socket files[lua]
2014-01-26 11:28:57 +08:00
f0b395da3c
Merge pull request #5205 from dumganhar/develop
...
[JSB] cc.Node.setLocalZOrder -> cc.Node.setZOrder.
2014-01-23 23:04:00 -08:00
f1ffb0b753
[JSB] cc.Node.setLocalZOrder -> cc.Node.setZOrder.
2014-01-24 15:02:14 +08:00
232194646d
[Jenkins] add win32 build in pull-request-builder.py
2014-01-24 14:40:15 +08:00
7807405138
[Jenkins] fix the url of build description
2014-01-24 12:05:31 +08:00
490c85a388
[Jenkins] add missing double quotes in pull-request-builder.py
2014-01-24 09:50:40 +08:00
646dd2f8c5
Merge pull request #5191 from heliclei/develop
...
[jenkins]add ios build script
2014-01-23 08:10:46 -08:00
8861a50e65
fix project path
2014-01-23 23:40:08 +08:00
a28da90c9d
add ios build script
2014-01-23 23:30:54 +08:00
c82566435a
[Jenkins] fix the path in pull-request-builder.py
2014-01-23 19:05:49 +08:00
76066c81d8
[Jenkins] fix the path in gen_jsb_win32.bat
2014-01-23 19:02:19 +08:00
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
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
87980456a9
Merge pull request #5180 from lihex/issue#3781
...
Should check ndk architechture.
2014-01-23 00:13:23 -08:00
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
f364e64e3c
[Jenkins] add auto generate bindings for win7
2014-01-23 15:38:26 +08:00
2dc9958475
issue #3781 , Should check ndk architechture.
2014-01-23 15:27:00 +08:00
f43f3c770b
Merge pull request #5179 from lihex/issue#3781
...
Update docs for bindings-generator.
2014-01-22 22:35:40 -08:00
f9b2ead623
Update docs.
2014-01-23 14:14:07 +08:00
9bb3444e04
Merge pull request #5176 from heliclei/develop
...
[Jenkins]fix jenkins api, get correct build result
2014-01-22 21:08:20 -08:00
9642766c7e
correct format
2014-01-23 12:57:18 +08:00
67d5ab72d0
fix jenkins api, get correct build result
2014-01-23 12:54:35 +08:00
91511840a1
Merge pull request #5175 from lihex/issue#3781
...
Fix the path.
2014-01-22 20:20:08 -08:00
b9331a06f9
issue #3781 , Fix the path.
2014-01-23 12:08:27 +08:00
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
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
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
bb650729c3
Updates cocos_files.json.
2014-01-23 11:08:10 +08:00
ecdd64a889
issue #3781 , Don't set a default PYTHON_ROOT & NDK_ROOT for user on Windows.
2014-01-23 10:48:03 +08:00
3829a1aa46
Merge pull request #5166 from heliclei/develop
...
[jenkins]add post build script
2014-01-22 18:47:43 -08:00
ae09cce83f
updated template for Linux
2014-01-22 14:32:40 -08:00
04ee67481a
set pr status at post build stage
2014-01-23 00:21:58 +08:00
913360e526
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
2014-01-22 22:32:44 +08:00
d6df71cc11
Fixed #3806 : Change parameters to const &
2014-01-22 22:31:26 +08:00
e12e80298d
update github api url and jenkins job trigger url
2014-01-22 15:23:29 +08:00
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
d7f1dfbe14
do not mix github access token with jenkins job trigger token
2014-01-22 11:35:25 +08:00
3b9d4c7a39
issue #3781 , Update travis-scripts, llvm-installing parts no need now.
2014-01-22 11:28:53 +08:00
b2a1cd90eb
issue #3781 , Minor fix & update submodule.
2014-01-22 10:58:02 +08:00
40f5c31a50
issue #3781 , Undefine the __MINGW32__ macro to fix the script error on windows
2014-01-21 18:32:27 +08:00
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
a467fe3244
Fixed #3806 : SAXParser supported with manual binding in JSB
2014-01-21 18:12:12 +08:00
56654c0ffb
issue #3781 , js not generate cocos2dx physics now.
2014-01-21 18:09:21 +08:00
1a6b36184d
issue #3781 , Add windows bat script.
2014-01-21 17:48:49 +08:00
a392a709cd
issue #3781 : Fix the variable name.
2014-01-21 17:40:20 +08:00
0109ebd707
issue #3781 , Update genbinding script to fit new bindings-generator.
2014-01-21 16:53:07 +08:00
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
38e7f01ee8
decode 'payload' to utf-8 and ignore invalid bytes
2014-01-17 17:13:33 +08:00
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
508d786fa7
issue #3626:Update the submodule
2014-01-17 10:19:58 +08:00
d086f7a259
issue #3626:Add the deprecated support for the tolua.cast
2014-01-17 10:19:57 +08:00
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
53be67c653
update project file.
2014-01-16 18:12:53 +08:00
925a4f0f30
add reopen support
2014-01-16 16:22:04 +08:00
9de4c4fa70
[jenkins]add job trigger,to update github pull request status instantly
2014-01-16 15:16:12 +08:00
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
f62c041886
Compilation fix: Updates cocos_files.json and removes unused in template.
2014-01-16 10:27:35 +08:00
21c4b2c893
fixes #3720
2014-01-15 19:44:57 -03:00
b3f306e742
Ignore getFullPathCache() in FileUtils
2014-01-14 18:30:51 -08:00
de30a9cfea
issue #3401 : add lua physics slide test, add more banding code, and fix some bugs.
2014-01-14 15:48:44 +08:00
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
37522c61c3
Make the ui look a bit better
2014-01-13 11:54:33 -08:00
2e127f819b
Add Polish the labels for project creator ui
2014-01-13 11:37:44 -08:00
fd481d64a0
1.update lua binding configuration for label.
...
2.recover old method[createWithTTF]
2014-01-13 16:32:35 +08:00
5dedd085c8
Merge pull request #5032 from heliclei/develop
...
rename ghprb.py to pull-request-builder.py
2014-01-12 17:43:40 -08:00
09f23c1bcb
Corrected a few mistakes in project-creator README
2014-01-12 14:38:09 +08:00
b2038d14d6
update lua binding configuration for label.
2014-01-11 22:55:23 +08:00
69c004108b
issue#3630:Adjust some method for more easily create and change type.
2014-01-11 22:33:07 +08:00
b4a4b70e22
rename ghprb.py to pull-request-builder.py
2014-01-10 17:45:28 +08:00
b454bf01e3
Merge pull request #5002 from heliclei/develop
...
support [ci skip] in commit message
2014-01-08 20:53:19 -08:00
007a64e50e
support [ci skip] command
2014-01-09 12:47:46 +08:00
2b7aa26308
fix create job state
2014-01-09 10:56:33 +08:00
2de06a9655
Merge pull request #4993 from heliclei/develop
...
add auto generate bindings
2014-01-08 01:55:10 -08:00
6cbf69306c
remove unnessesary chmod and ls command
2014-01-08 16:51:37 +08:00
13fab57ce2
remove debug print
2014-01-08 16:27:08 +08:00
f7a0e7da1a
add auto generate bindings
2014-01-08 16:21:11 +08:00
b07acb6c12
[JSB] Supports cc.ScrollView.extend, cc.TableView.extend, cc.TableViewCell.
2014-01-07 22:17:22 +08:00
e25c4b5f4d
[JSB] Armature should be able to be extended in JS.
2014-01-07 20:55:07 +08:00
849b522924
Merge pull request #4962 from Dhilan007/develop_crash
...
update bindings-generator submodule
2014-01-07 01:41:47 -08:00
3cab3e5df3
update bindings-generator submodule
2014-01-07 17:19:29 +08:00
b19bda1588
Fix:Update cocos_files.json file
2014-01-07 16:49:51 +08:00
da17c6b05b
Merge pull request #4954 from heliclei/develop
...
[Jenkins]fix symbol link create error
2014-01-07 00:35:16 -08:00
05f6fedd1e
fix windows symbol link path error
2014-01-07 16:27:23 +08:00
f5ae2bbacc
Merge pull request #4932 from boyu0/iss3401_physical_lua_binding
...
issue #3401 : physical lua binding
2014-01-06 23:48:47 -08:00
5dadbce813
fix symbol link create error
2014-01-07 15:41:18 +08:00
37b6ef99e3
Wrong dir fix for travis ci.
2014-01-06 20:04:30 -08:00
2f7c41bd28
[travis] builds linux template now.
2014-01-06 19:42:51 -08:00
cf146b32cf
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss3401_physical_lua_binding
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
cocos/scripting/lua/bindings/CCLuaStack.cpp
cocos/scripting/lua/script/Cocos2d.lua
cocos/scripting/lua/script/Cocos2dConstants.lua
2014-01-07 10:16:44 +08:00
4c2fe530f9
fix post data format
2014-01-06 22:24:47 +08:00
eaa3041a97
issue #3401 : physical lua banding script, add testlua->physics test
2014-01-06 22:19:40 +08:00
bc5303f6f2
build all android targets
2014-01-06 20:58:00 +08:00
2949ab754f
Fix:Regeneration cocos_files.json
2014-01-06 20:11:44 +08:00
ac46932c06
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developNewUI
...
Conflicts:
tools/project-creator/module/cocos_files.json
2014-01-06 20:07:39 +08:00
f36d4a9236
Fix:Resolve the lua android template errors
2014-01-06 19:59:31 +08:00
16bff3da1c
add 755
2014-01-06 01:31:36 -05:00
07e51e2c86
test template lua
2014-01-06 14:24:33 +08:00
465aba951c
Fix:Remove the ScollView and TableView of extension gui lua binding
2014-01-04 18:36:33 +08:00
7a53ec12ee
Merge pull request #4870 from heliclei/develop
...
use print_exc() instead of format_exc()
2014-01-04 00:50:13 -08:00
6e1c508960
use print_exc() instead of format_exc()
2014-01-04 16:25:31 +08:00
556a6436bd
modify 644 —>755
2014-01-04 15:27:39 +08:00
5ffc3d9726
modify create_project.py suffix
2014-01-04 14:04:39 +08:00
accdf5635f
modify print message
2014-01-04 13:54:17 +08:00
51a6e4fc35
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
2014-01-04 13:25:34 +08:00
322cf0d233
Fixing CocoStudio bindings error.
2014-01-04 12:11:10 +08:00
b6e676caa4
fix warn and compiling error in jsb_cocos2dx_studio_manual.cpp.
2014-01-03 23:03:48 +08:00
b4d392dc38
update js binding for studio change.
2014-01-03 21:33:48 +08:00
c22cc77c66
add cocos files list configure script
2014-01-03 19:09:13 +08:00
ac6b72450f
Merge pull request #4816 from samuele3hu/developNewUI
...
Update the lua test cases about the GUI
2014-01-02 20:53:19 -08:00
0b3a4c3ce5
Merge pull request #4817 from heliclei/develop
...
[Jenkins]fetch pull request and checkout to a local branch
2014-01-02 19:08:54 -08:00
4549760f2c
fetch pull request and checkout to a local branch
2014-01-03 10:59:37 +08:00
c4588722dd
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developNewUI
2014-01-03 10:41:03 +08:00
07a3efb585
Update the lua test cases about the GUI
2014-01-03 10:39:19 +08:00
d345139a08
fix compiling errors
2014-01-02 21:53:18 +08:00
d8186a1d3c
Merge pull request #4769 from heliclei/develop
...
update exception catch clause
2014-01-02 05:35:07 -08:00
e43ca98a94
get the correct branch
2014-01-02 19:08:22 +08:00
48579fe3ac
remove debug code
2014-01-02 17:25:29 +08:00
8eeb32c98c
remove debug code
2014-01-02 17:22:23 +08:00
b1714d74e5
refining exception handling
2014-01-02 17:09:49 +08:00
3e044cf90e
Updates tools/tojs/cocos2dx_gui.ini. target_namespace from ccs to ccii.
2014-01-02 14:22:00 +08:00
0a06d93328
issue #3401 : physical lua banding script and auto script
2014-01-02 11:45:11 +08:00
e944dae338
update exception catch clause
2014-01-02 10:19:48 +08:00
e5389ddb31
Merge pull request #4765 from heliclei/develop
...
Add exception handling
2014-01-01 06:00:50 -08:00
591740253d
[GUI] Updates scripting binding configure file.
2014-01-01 21:32:54 +08:00
1c0fc7859b
1.Add exception handling
...
2.Correct pull request action name
3.Enlarge description text
2013-12-31 18:29:32 +08:00
7f2dc5197e
Updates travis-script, don't build template proj.
...
Since we are supporting create project anywhere, to test template projects, projects should be created firstly.Therefore, disable building template for travis-ci.
2013-12-31 16:37:05 +08:00
75d28a3114
Adds execute permission for create_project.pyw
2013-12-31 16:10:55 +08:00
2579573b7e
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
2013-12-31 14:58:37 +08:00
2b54e5e296
Merge pull request #3864 from dumganhar/iss2865-deprecate-ccnotification
...
closed #2865:Deprecates NotificationCenter, uses new EventDispatcher instead.
2013-12-30 19:31:34 -08:00
cf006df9ff
closed #2865 : Deprecates CCNotificationCenter, uses EventDispatcher instead.
2013-12-31 10:54:37 +08:00
62a0828f5b
remove other non-functional jenkins scripts
2013-12-30 22:03:22 +08:00
7696a5f2cc
move ghprb.py to tools/jenkins-scripts/
2013-12-30 21:40:28 +08:00
437c6545da
fix linux error not Tkinter
2013-12-30 18:35:08 +08:00
991db80198
reset
2013-12-30 15:21:25 +08:00
623e205256
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
...
Conflicts:
cocos/scripting/auto-generated
samples/Cpp/TestCpp/Classes/Box2DTestBed/Box2dView.cpp
samples/Cpp/TestCpp/Classes/Box2DTestBed/Box2dView.h
samples/Cpp/TestCpp/Classes/ClippingNodeTest/ClippingNodeTest.cpp
samples/Cpp/TestCpp/Classes/ClippingNodeTest/ClippingNodeTest.h
samples/Cpp/TestCpp/Classes/LabelTest/LabelTestNew.cpp
samples/Cpp/TestCpp/Classes/LabelTest/LabelTestNew.h
tools/bindings-generator
tools/tolua/cocos2dx_studio.ini
reset modify
2013-12-30 14:51:51 +08:00
cfbbb7889b
Merge branch 'develop' into #3457
...
Conflicts:
cocos/editor-support/cocostudio/CCSGUIReader.cpp
2013-12-26 23:01:34 +08:00
bd8f32e1a6
fixed #3457 fixes failed to build android.
2013-12-27 06:33:42 +08:00
31188710a0
Updates Bindings-generator.
2013-12-26 22:14:48 +08:00
d9ba53f9a9
o my god.
2013-12-26 17:55:46 +08:00
bd46681867
fixed #3457 continue to fixes failed to build.
2013-12-26 17:37:02 +08:00
5dfb7f321a
Compilation fixes after merge PR #4669 https://github.com/cocos2d/cocos2d-x/pull/4669
2013-12-26 16:03:30 +08:00
911c7eae10
modify license time
2013-12-26 14:49:06 +08:00
df690e8f8b
Updates bindings config files.
2013-12-26 12:50:37 +08:00
0343f55dc7
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
2013-12-26 10:23:00 +08:00
23192a883c
modify linux tempalte
2013-12-25 18:32:23 +08:00
02e139f1da
Reverts bindings-generator reference.
2013-12-25 18:16:59 +08:00
6e871e8803
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
...
Conflicts:
template/multi-platform-js/Classes/AppDelegate.cpp
2013-12-25 18:12:16 +08:00
9cf45a292b
Delete some annotated statement about spine and add some reserve manual lua binding functions
2013-12-25 16:42:40 +08:00
017fb550b7
add README.md
2013-12-25 16:34:23 +08:00
c53537e7c2
modify create_project
2013-12-25 15:53:47 +08:00
9fd64df099
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into Spine
2013-12-25 13:48:10 +08:00
45cfe00ec4
Modify iOS project set and some manual lua binding
2013-12-25 13:47:22 +08:00
538da31773
Removes CC prefix for CCSkeleton and CCSkeletonAnimation. Adds namespace `sp` for JSBindings.
2013-12-25 11:18:14 +08:00
94420563b3
ingore .git
2013-12-25 11:12:06 +08:00
2989e9b46d
adapt ui
2013-12-25 10:24:46 +08:00
d33b2c41c7
Merge branch 'develop' into data-refactor
...
Conflicts:
tools/tolua/cocos2dx.ini
2013-12-24 16:24:17 +08:00
e497f823ea
Merge branch 'lua_spine_dev' of https://github.com/edwardzhou/cocos2d-x into Spine
2013-12-24 16:14:10 +08:00
1ce75bb444
modify ui
2013-12-24 15:07:51 +08:00
451d76f6b0
Merge pull request #4611 from dumganhar/spine-test
...
Merge PR #4572 , Spine JS test support.
2013-12-23 22:55:58 -08:00
98e4e802f4
Support pass by value for setPosition\setAnchorPoint\setContentSize for lua binding
2013-12-24 13:42:32 +08:00
4082c86070
1. add Spine LUA binding with testcase; 2. CCSkeleton inherites from Node since NodeRGBA is deprecated.
2013-12-24 11:55:53 +08:00
2308e94c2f
modify template
2013-12-24 09:42:37 +08:00
05f6a5b09b
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into spine-test
2013-12-23 22:05:20 +08:00
44f9009a5d
Merge pull request #4610 from dumganhar/lastest-js-test
...
Updates JS-test to the latest version and some binding fixes
2013-12-23 06:04:49 -08:00
d6850c363a
Updates Bindings-generator.
2013-12-23 22:00:11 +08:00
3327614a99
Binds Node::setAnchorPoint manually.
2013-12-23 21:54:02 +08:00
6b73fa570e
Merge pull request #4601 from samuele3hu/toluaerror
...
issue #3353 Lua gc mechanism will make the extended attributes of lua userdata disapper
2013-12-23 05:40:15 -08:00
cafebe7295
Merge commit 'refs/pull/4572/head' of git://github.com/cocos2d/cocos2d-x into spine-test
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
2013-12-23 20:28:51 +08:00
b3cc7d7e68
Bindings-generator skips Node::setContentSize. Binds it manually.
2013-12-23 20:25:11 +08:00
4399adc869
issue #3353:Add the DisplayLinkDirector lua binding
2013-12-23 17:31:57 +08:00
46cc91be3b
Updates bindings-generator, skips to bind override functions.
2013-12-23 16:41:17 +08:00
2fec81fcae
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into data-refactor
...
Conflicts:
tools/tolua/cocos2dx.ini
2013-12-23 13:52:15 +08:00
366c4ca9fb
Updates tools/tojs(tolua)/cocos2dx.ini.
2013-12-23 11:48:22 +08:00
50bcdee725
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into NewEventDispatcher
2013-12-22 22:11:17 +08:00
97f26176e8
issue #3403:Add the EventDispatcher lua binding and the releated test cases
2013-12-22 22:10:21 +08:00
55ff96df3a
closed #3463 : Potential hash collision by using typeid(T).hash_code() in JSB and LuaBinding.
...
Instead of using std::unordered_map<long, T>(long is the hash_code generated by typeid(T).hash_code()),
We needs to use std::unordered_map<std::string, T> to avoid collision since unordered_map internally processes collisions.
2013-12-20 17:13:09 +08:00
0a30a9a604
spine simple JS binding supported
2013-12-20 16:10:15 +09:00
755d29b0e1
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into more_container_bind
2013-12-19 20:17:54 +08:00
f73e939b57
Supports to bind more container: std::vector<std::string>, std::vector<int>, cocos2d::Map<std::string, T>.
2013-12-19 20:17:44 +08:00
6aa8b779f0
Updates submodule reference of Bindings-generator, it supports to bind std::vector<std::string> ,std::vector<int>, cocos2d::Map<std::string, T> now.
2013-12-19 20:16:18 +08:00
ef54ed3c15
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into HEAD
...
Conflicts:
cocos/2d/CCLabel.cpp
cocos/2d/CCLabel.h
cocos/2d/CCLabelBMFont.cpp
cocos/2d/CCLabelBMFont.h
cocos/2d/CCLayer.cpp
cocos/2d/CCLayer.h
cocos/2d/CCNode.cpp
extensions/GUI/CCControlExtension/CCControl.cpp
extensions/GUI/CCControlExtension/CCControlButton.cpp
extensions/GUI/CCControlExtension/CCScale9Sprite.cpp
tools/tojs/cocos2dx.ini
2013-12-19 17:05:59 +08:00
c14754b720
Updates submodule of bindings-generator.
2013-12-19 11:50:45 +08:00
55830c3023
Add support for unsigned short
2013-12-18 13:47:59 +08:00
8d086f9d02
[scripting] Ignores Director::getRenderer for bindings.
2013-12-18 10:15:42 +08:00
37f408f2b9
Merge pull request #4506 from Dhilan007/ushort_jsb
...
add API for transform unsigned short
2013-12-17 02:20:56 -08:00
0414926b52
add API for transform unsigned short
2013-12-17 18:17:04 +08:00
8ab4537f73
issue #2171 : Binds New renderer classes, ignores NewTextureAtlas.
2013-12-17 15:41:26 +08:00
a3cf2d8f7f
issue #2171 : Ignores Director::getFrustum.
2013-12-17 15:02:08 +08:00
ce96725f83
Removes FileUtils::getFileData binding.
2013-12-16 14:14:12 +08:00
464054d251
Updates Bindings-generator.
2013-12-16 13:01:20 +08:00
e32979592a
Skips Texture2D::getPixelFormatInfoMap
2013-12-16 13:01:20 +08:00
23af9dfd8d
issue #3162 : reset submodule
2013-12-13 18:15:59 +08:00
b5bf9fb448
issue #3162 : change js/cocos2dx.ini
2013-12-13 14:44:44 +08:00
c8c0e2270e
issue #3162 : deprecated RGBAProtocol, NodeRGBA and LayerRGBA
2013-12-13 10:10:49 +08:00
d7106d49be
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into bug3162_opacity_incorrect
2013-12-12 17:04:21 +08:00
cc2323b636
issue #2790:Open travis support
2013-12-10 18:26:10 +08:00
a71394b122
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into bug3162_opacity_incorrect
2013-12-10 18:03:41 +08:00
89c079009b
issue #2790:Resolve some errors of basical conversion functions
2013-12-10 18:01:40 +08:00
883ecaa03f
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developConversion
2013-12-10 16:07:58 +08:00
1ed8d108f7
issue #2790:Update binding-generator
2013-12-10 15:21:21 +08:00
55270cecb4
Merge pull request #4457 from dumganhar/iss2790-deprecate-ccarray
...
issue #2790 : Don't use CCDictionary, CCArray for CCBReader, use std::unordered_map, Vector<T>, Map<K, V> instead.
2013-12-09 23:15:43 -08:00
c2e7299d8f
Issue #2790:Add more conversion functions to support templates containers
2013-12-10 11:21:30 +08:00
ad5daeb962
issue #2790 : Don’t bind CCBAnimationManager::addNode.
2013-12-09 17:55:56 +08:00
45cb79c5f4
issue #2790 : Updates bindings-generator. Fixes issue at https://github.com/cocos2d/bindings-generator/pull/53 .Matches typedef name firstly in conversion.yaml.
2013-12-08 22:10:14 +08:00
c916377970
issue #2790 : Comments building template for android.
2013-12-06 17:23:31 +08:00
7aff958063
issue #2790 : A typo fix.
2013-12-06 17:09:36 +08:00
ed7c3f717a
issue #2790 : Travis-ci builds JSB projects again.
2013-12-06 16:49:17 +08:00
b5978eeee6
issue #2790 : Bindings-generator supports binding Vector<T> and some bug fixes.
2013-12-06 16:46:19 +08:00
68e376db2f
issue #2790 : Disables build lua projects for linux
2013-12-05 11:51:09 +08:00
856a82d4b8
issue #2790 : Don’t build script bindings projects for travis.
2013-12-05 11:03:22 +08:00
c1a226686f
issue #3309:Modify some deprecated cpp files and lua files
2013-12-04 15:15:55 +08:00
a8c1bba464
issue #3309:Add some deprecated functions and classes to support master cocostudio lua bindings
2013-12-03 15:40:59 +08:00
216f8743b0
closed #3288 : Updates bindings-generator.
2013-11-27 14:04:53 +08:00
6c7cb0bf23
Merge pull request #4359 from Dhilan007/androdi_build
...
[ci skip]add proceed java compilation and generate apk.
2013-11-26 01:47:14 -08:00
03005173b1
issue #3258 : Updates bindings-generator.
2013-11-26 15:45:09 +08:00
6f67447b5e
issue #3258 : Updates cocos2dx.ini. Adding some classes to ‘classes_need_extend’ section.
2013-11-26 15:43:39 +08:00
881d43fe3b
add proceed java compilation and generate apk.
2013-11-26 11:58:01 +08:00
c09f50e3f8
issue #3261:add miss binding
2013-11-24 22:47:29 +08:00
43e8a4912d
Update tools/tolua/cocos2dx.ini, ignore onTouchXXX, onKeyXXX, onAccXXX callback functions to be bound to LUA.
2013-11-20 12:09:27 +08:00
ce0a6d5b57
fix miss bind setGrid\getGrid for JS.
2013-11-19 10:33:11 +08:00
593c0f8946
Merge pull request #4304 from Dhilan007/di3223
...
[ci skip]issue #3223:bind gui and studio
2013-11-18 02:28:53 -08:00
c7e87b7f60
Merge pull request #4285 from dumganhar/iss3215-cpp-formatter
...
[ci skip]issue #3215 : Adding tools of best c++ practice for upgrading game codes from v2.x to v3.x
2013-11-18 02:25:38 -08:00
6217641105
add miss bind
2013-11-18 18:00:42 +08:00
8b14575d7e
bind gui and studio.
2013-11-18 16:54:52 +08:00
102703703b
issue #3215 : Updating comments for this tool.
2013-11-16 23:09:45 +08:00
fd72836e20
issue #3215 : Comments add_namespace type in “all” mode.
2013-11-16 23:02:33 +08:00
dcf413765b
[First commit]Adding tools of best c++ practice for upgrading game codes from v2.x to v3.x
2013-11-16 22:58:01 +08:00
8d24960bb2
fix path for windows
2013-11-15 18:05:24 +08:00
0f3cb95f58
Merge pull request #4028 from lite3/develop
...
[ci skip]add options for android_mk_generator
2013-11-13 19:21:58 -08:00
17f74eeb17
issue #2868:Modify armature test samples and add more armature test samples
2013-11-13 18:18:29 +08:00
062fb85943
issue #2868:Modify cocos2dx_studio.ini to add more auto-binding class
2013-11-13 10:12:44 +08:00
f429c4c632
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCCS
2013-11-12 17:51:33 +08:00
cb51df7d65
Update bindings-generator
2013-11-12 17:31:24 +08:00
ae6597dbaa
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCheck
...
Conflicts:
tools/bindings-generator
2013-11-12 17:23:41 +08:00
18bc96096c
Resolve some warning and modify uint32_t to long
2013-11-12 17:18:51 +08:00
c1d256c159
issue #2868:modify ccs lua test samples
2013-11-12 16:52:03 +08:00
cfb1cfdf65
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCCS
...
Conflicts:
cocos/editor-support/cocostudio/CCSGUIReader.h
2013-11-12 15:30:36 +08:00
482ee5d47f
issue #2868:Add more ccs lua test samples
2013-11-12 15:25:47 +08:00
df214acb6f
[develop] Updating bindings-generator, fixing forward declare that generates binding glue codes which is an empty class.
2013-11-11 18:42:39 +08:00
7cfe890d5d
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCCS
2013-11-11 17:04:37 +08:00
06c7d3e96d
issue #2868:Add ccd lua test samples
2013-11-11 17:03:43 +08:00
22584ca9c2
Updating submodule of bindings-generator.
2013-11-11 16:50:07 +08:00
272afaa7d9
Updating Bindings-generator.
2013-11-11 15:57:15 +08:00
8f8d0f86d7
Updating Bindings-generator.
2013-11-11 14:38:12 +08:00
90df6fc763
fixed typos
2013-11-10 08:25:01 -03:00
fa1a5c3735
Add conversion config for long type
2013-11-10 11:03:27 +08:00
d4dbc7a442
Add conversion config for long type
2013-11-10 09:21:33 +08:00
e26fe04deb
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCCS
2013-11-09 23:04:11 +08:00
286393d28e
issue #2868:Add more manual lua binding functions
2013-11-09 22:58:40 +08:00
a3797e2ebc
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
2013-11-08 21:00:31 +08:00
74497e18ec
[CMake template] Fix compilation errors.
2013-11-08 18:25:58 +08:00
eeedab78b2
[LINUX] Adding template CMake files for linux.
2013-11-08 18:13:24 +08:00
6a1a774303
issue #2868:Config cocoStudio GUI lua binding files and add a few script files
2013-11-07 10:16:02 +08:00
61d8f9673c
issue #2868:Move armature related lua binding from namespace 'cc' to namespace 'ccd'
2013-11-05 17:34:25 +08:00
b76865c692
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCCS
2013-11-05 15:11:05 +08:00
b445f0824a
issue #2868:Bind UI and Scene parser to lua by bindings-generator and add releated test samples
2013-11-05 15:09:51 +08:00
a3a2b0274e
Updating submodule of bindings-generator.
2013-11-05 14:23:48 +08:00
f968169da4
Update run-script.sh
2013-11-04 21:59:03 +08:00
6a351711ae
[cmake] update run-script.sh
2013-11-04 21:05:29 +08:00
b1a9843091
[cmake] update run-script.sh
2013-11-04 21:03:09 +08:00
cde79a9724
use -j10 to build android samples
2013-11-04 18:01:42 +08:00
a823e66f8e
Update run-script.sh
...
Adding soft-link for `samples/Cpp/SimpleGame/proj.android/obj`.
2013-11-03 14:36:22 +08:00
d4210c77bb
Merge pull request #4058 from samuele3hu/developAssetsManager
...
issue #3037:Add assetsmananger lua binding and a releated test sample
2013-11-01 02:50:47 -07:00
80f3a7d57a
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developAssetsManager
...
Conflicts:
build/cocos2d_samples.xcodeproj/project.pbxproj
cocos/scripting/lua/bindings/LuaScriptHandlerMgr.h
cocos/scripting/lua/script/Cocos2dConstants.lua
2013-11-01 17:17:21 +08:00
915d75ea7c
build release version of android samples
2013-11-01 16:44:35 +08:00
8e7ed129c5
Update before-install.sh
2013-11-01 15:39:46 +08:00
daf4e22819
[Bindings] Skip Label::getLettersInfo
2013-11-01 15:34:08 +08:00
e93bcca13e
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developHttp
2013-11-01 14:44:21 +08:00
b0fdb66d2d
Modify the all luajit build scripts and let libluajit.a of mac only support 64bit
2013-11-01 14:38:14 +08:00
72d6f8650b
Regular expression fix for generate-jsbindings.sh.
2013-11-01 11:50:43 +08:00
1d932ae95f
Updating travic-ci scripts.
2013-11-01 11:46:02 +08:00
0298c338a6
issue #2826 : Updating cocos2d-console submodule.
2013-11-01 10:46:06 +08:00
7c45ddafe2
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developAssetsManager
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
2013-10-31 17:22:14 +08:00
d1b88b0a78
[sp v25] Updating auto-generated and bindings-generated submodules.
2013-10-31 11:15:17 +08:00
1f07a659a6
issue #3069:Modify layer lua register and add some compatible lua binding functions
2013-10-31 09:49:04 +08:00
21d7dcaf3a
add some options
...
Usage: android_mk_generator.py [options]
Options:
-h, --help show this help message and exit
-c CONFIG, --config=CONFIG
config file path.
-r ROOTPATH, --rootpath=ROOTPATH
class root path for mkfile, pathes, exclude.
2013-10-30 16:44:21 +08:00
51f30a01d5
replace os.path.samefile
...
os.path.samefile not work at windows.
2013-10-30 16:43:19 +08:00
2e3b3be125
config android_mk_generator
2013-10-29 22:53:01 +08:00
3305dd1de3
issues #2905:add miss file
2013-10-23 17:05:27 +08:00
5f769b2313
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developAssetsManager
2013-10-22 16:52:44 +08:00
be1f17ca0f
issue #3037:Add assetsmananger lua binding and a releated test sample
2013-10-22 16:14:49 +08:00
f11dba586a
issue #2905:modification vs-project for folder structure change
2013-10-21 22:09:21 +08:00
d6be31f74a
Merge commit 'refs/pull/3943/head' of git://github.com/cocos2d/cocos2d-x into create-project-fix
2013-10-18 10:40:12 +08:00
5c5f2d84e2
issue #2905 : Updating tolua settings.
2013-10-16 16:27:45 +08:00
6fba0dd5db
issue #2905 : [iOS Mac] TestJavascript works now.
2013-10-16 15:43:59 +08:00
de9e831e35
Fix definition of platform for ios and mac.
...
Remove unnecessary files
2013-10-14 20:42:45 +09:00
613bb89120
Make "rename" setting usable.
2013-10-14 20:19:21 +09:00
95acb1b9e3
issue #2905 : helloworld build ok on android
2013-10-14 14:01:00 +08:00
4313c46e93
issue #2905:adjust folder structure
2013-10-12 11:22:05 +08:00
9cf7d48d62
include correct path in cocos2dx.ini to generate audio lua binding
2013-10-10 17:04:36 +08:00
7b7aabf2de
include correct path in cocos2dx.ini to generate audio binding
2013-10-10 16:54:05 +08:00
531e454eae
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into Armature
...
Conflicts:
samples/samples.xcodeproj/project.pbxproj
2013-10-10 11:47:36 +08:00
20971b0ad2
issues #2895:Synchronize JSB from master to developer
2013-10-08 15:57:34 +08:00
508654738a
issue #2768:Modify armature test sample and skip some functions to lua
2013-10-08 15:45:13 +08:00
4c1bd825af
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into Armature
2013-10-08 10:17:58 +08:00
5673af2b3e
Updating Bindings-generator.
2013-09-22 10:23:48 +08:00
bcb171e3c9
fix line end in windows
2013-09-20 22:23:13 +08:00
4f07dbaece
Restores .py file to its original layout
2013-09-19 18:32:47 -07:00
51834e5291
Xcode template projects fixes
...
Updats the xcode project with recommended fixes from Xcode 5.0
2013-09-19 18:27:11 -07:00
7ecb9778a3
Product Name is the project name
2013-09-19 18:12:02 -07:00
b91b350f2b
Merge pull request #3666 from Dhilan007/develop
...
android platform:fix EditBox not show input box and crash.
2013-09-17 18:33:43 -07:00
fce3aa756d
Merge pull request #3667 from dabingnn/release30_bug_hot_fix
...
check glfw has been installed when installing glfw
2013-09-17 08:41:00 -07:00
e521d881b2
check glfw has been installed when installing glfw
2013-09-17 23:26:54 +08:00
d488796896
Merge branch 'iss2771_physical' of https://github.com/boyu0/cocos2d-x into merge-physics
2013-09-17 18:14:12 +08:00
a39e0d8521
Merge branch 'develop' of github.com:cocos2d/cocos2d-x into develop
2013-09-17 18:06:48 +08:00
068d0140d9
Manual bind the getDescendants function of the SpriteBatchNode class
2013-09-17 17:41:53 +08:00
a454e373c7
issue #2771 : move include chipmunk and box2d to cpp
2013-09-17 17:39:08 +08:00
18cea20634
Merge branch 'develop' of github.com:cocos2d/cocos2d-x into develop
2013-09-17 17:14:20 +08:00
b5b6406976
issue #2771 : edit compile setting.
2013-09-17 17:09:07 +08:00
5d8ea9f1e5
JSB:manually bind SpriteBatchNode::getDescendants in "cocos2d_specifics.cpp".
2013-09-17 17:03:45 +08:00
89ec5edf78
issue #2771 : edit compile setting.
2013-09-17 16:42:24 +08:00
3809a6feed
Repair some lua test samples bug and del tool/tolua++ folders
2013-09-17 13:59:48 +08:00
e4f8929898
Merge pull request #3606 from dabingnn/issue_2808_glfw_bug_enhancement
...
Issue 2808 glfw bug enhancement
2013-09-15 20:18:02 -07:00
20fde2bcde
issue #2808:glfw linux scripts
2013-09-16 10:11:46 +08:00
aa4c90e97a
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into Armature
...
Conflicts:
extensions/cocos-ext.h
2013-09-14 19:29:36 +08:00
dd7bfd7b60
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into new-event-dispatcher-rebase
...
Conflicts:
cocos2dx/CCDirector.h
cocos2dx/keyboard_dispatcher/CCKeyboardDispatcher.h
cocos2dx/keypad_dispatcher/CCKeypadDelegate.h
cocos2dx/keypad_dispatcher/CCKeypadDispatcher.h
cocos2dx/layers_scenes_transitions_nodes/CCLayer.h
cocos2dx/menu_nodes/CCMenu.h
cocos2dx/platform/CCAccelerometerDelegate.h
cocos2dx/platform/android/CCAccelerometer.h
cocos2dx/platform/ios/CCAccelerometer.h
cocos2dx/platform/mac/CCAccelerometer.h
cocos2dx/platform/win32/CCAccelerometer.h
cocos2dx/script_support/CCScriptSupport.h
cocos2dx/touch_dispatcher/CCTouchDelegateProtocol.h
cocos2dx/touch_dispatcher/CCTouchDispatcher.h
cocos2dx/touch_dispatcher/CCTouchHandler.h
extensions/CocoStudio/Components/CCInputDelegate.h
2013-09-13 19:06:09 +08:00
ff24eac21a
[dispatcher] Adding new EventDispatcher Test to Makefile and project.
2013-09-13 18:08:00 +08:00
3a334b7478
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into doxygen
2013-09-13 11:42:04 +08:00
a34ec99014
issue #2784:Add js-binding and lua-binding document
2013-09-13 11:41:20 +08:00
24c8438fa6
[Dispatcher] Updating Android.mk, and some refractor.
2013-09-12 17:31:37 +08:00
ce52997fc2
[Dispatcher] Updating tools/tojs/.ini
2013-09-12 15:34:14 +08:00
2603e4acf4
Merge pull request #3540 from samuele3hu/TableView
...
issue #2764:Modify ScriptHandlerMgr's enum to enum class and modify some related functions
2013-09-11 02:52:38 -07:00
bf4eaa7e7c
merged
2013-09-09 18:20:16 +09:00
357466bab2
issue #2768:Add Armature lua binding and releated test samples
2013-09-09 10:20:32 +08:00
249b4d79a3
Merge pull request #3503 from dabingnn/Iss2460-glfw-refractor
...
Iss2460 glfw refractor
2013-09-05 18:28:31 -07:00
4f9a9bfe85
issue #2433:Modify ScriptHandlerMgr's enum to enum class and modify some related functions
2013-09-04 22:17:26 +08:00
5ee2a7e58e
issue #2433:Rename pointSize function name as setPointSize and Modify bindings-nerator
2013-08-30 17:15:16 +08:00
8f338cc209
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2433-lua-bindings-generator-new
...
Conflicts:
tools/tolua/cocos2dx.ini
2013-08-30 15:21:59 +08:00
ef7f51d875
issue #2460 : script compile error
2013-08-30 10:29:59 +08:00
0136a2cb0f
issue #2460 : script compile error
2013-08-30 09:37:48 +08:00
850b5514cf
issue #2460 : travis scripts
2013-08-29 18:10:12 +08:00
f9872e396c
closed #2747 : Don't skip cc.Sprite.getDisplayFrame.
2013-08-28 18:17:52 +08:00
1dabab2ca5
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2433-lua-bindings-generator
...
Conflicts:
scripting/lua/cocos2dx_support/generated/lua_cocos2dx_auto.cpp
scripting/lua/cocos2dx_support/generated/lua_cocos2dx_auto.hpp
scripting/lua/cocos2dx_support/generated/lua_cocos2dx_auto_api.js
2013-08-28 15:35:33 +08:00
9e071afe09
issue #2433:Add more deprecated function and modify some test
2013-08-28 15:11:19 +08:00
e41eaf7355
Merge pull request #3495 from shinriyo/shinriyo
...
Python2.x 3.x runnable
2013-08-27 21:06:33 -07:00
498d8d9e6d
Python2.x 3.x runnable
...
For Python2.x 3.x runnable, I used print()
2013-08-28 11:53:18 +09:00
f3e0775cef
issue #2732 : [travis ci] install llvm for linux.
2013-08-27 22:04:08 +08:00
384bf00070
issue #2732 : Updating travis script. Linux port needs to generate luabinding codes.
2013-08-27 21:52:06 +08:00
08cd81ff43
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into move-auto-generated
...
Conflicts:
scripting/auto-generated
2013-08-27 16:59:59 +08:00
7552a72577
issue #2732 : [iOS] Updating the reference of auto-generated binding glue codes.
2013-08-27 16:05:48 +08:00
c2099f5d3e
issue #2732 : Moving 'scripting/javascript/bindings/generated' to 'scripting/auto-generated'.
2013-08-27 14:50:53 +08:00
43a0225267
issue #2732 : Deleting tolua/userconf.ini
2013-08-27 14:45:19 +08:00
faa94fd074
Merge pull request #3482 from minggo/release_unneeded_codes
...
Remove unneeded codes
2013-08-26 23:23:41 -07:00
213b7aea21
Merge pull request #3453 from samuele3hu/iss2433-lua-bindings-generator
...
issue #2433 : Add lua bindings generator and modify releated test samples
2013-08-26 23:09:56 -07:00
c7b0b6791f
issue #2433:Update typed function and add some manual binding
2013-08-26 18:09:15 +08:00
61d82924be
update Android.mk to remove deleted cpp files
2013-08-26 18:01:42 +08:00
11ea111aff
closed #2446 : Add a tool to auto export releasing zip file
2013-08-26 16:57:10 +08:00
6ae80bcaf0
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2433-lua-bindings-generator
2013-08-23 16:14:19 +08:00
e557b6b7c2
issue #2433:Add lua deprecated fiel and modify some test samples
2013-08-23 16:12:59 +08:00
699c7d1077
Updating bindings-generator, it supports CCString. Some APIs, for example ControlButton::setTitleForState are using String as argument.
2013-08-23 15:56:38 +08:00
02649a1329
closed #2434 : Use android_mk_generator.py to generate Box2D and chipmunk's Android.mk file
2013-08-22 17:47:49 +08:00
9e34aae075
closed #2434 : Use the origin android.mk files instead use templates
2013-08-22 16:45:40 +08:00
5f6d9815ca
issue #2433:Modify platform config and some test samples
2013-08-22 15:06:34 +08:00
83f7835708
issue #2434 : Delete unused method dirs and find_files in Android.mk template
2013-08-22 14:03:25 +08:00
de68d35f4b
closed #2434 : change name "android_generator" to "android_mk_generator
2013-08-22 13:49:22 +08:00
ad23ec4a0f
#closed #2434 : refactor LocalVarToAuto.py to use the PathUtils and fix some errors
2013-08-22 13:40:57 +08:00
da566a3c16
issue #2434 : add android_generator and generate cocos2dx, extensions and TestCpp's android.mk files
...
add PathUtils.py for python library.
2013-08-22 11:49:34 +08:00
bea62800b4
issue #2433:Modify TestLua samples and add some manual binding code
2013-08-22 10:16:57 +08:00
39686ea503
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2433-lua-bindings-generator
2013-08-20 13:46:26 +08:00
7a9f1d6804
issue #2433:Modify TestLua samples and some .ini files
2013-08-20 13:44:37 +08:00
a188d87142
language option is invalid print mesage
...
If we input invalid mistook language option
2013-08-18 10:13:50 +09:00
0823bb144f
issue #2517 : add the LocalVarToAuto.py script
2013-08-16 15:35:27 +08:00
c8b75a1080
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2433-lua-bindings-generator
2013-08-16 10:13:38 +08:00
871ed24620
issue #2433:Update submodule and project
2013-08-15 16:51:09 +08:00
7f8099ce69
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2433-lua-bindings-generator
...
Conflicts:
cocos2d_libs.xcodeproj/project.pbxproj
tools/bindings-generator
2013-08-15 16:21:32 +08:00
2d5482a0ab
issue #2433:Modify cocos2d.ini
2013-08-15 16:14:14 +08:00
f29525bbc6
issue #2433:Modify Testlua sample and add some manual binding functions
2013-08-15 15:51:22 +08:00
13fd369beb
issue #2433:Modify lua binding generator template and releated action test
2013-08-14 21:35:55 +08:00
7d3edde8f1
issue #2521 : Updating tojs/cocos2dx_extension.ini, bind more CCControls.
2013-08-12 11:23:16 +08:00
980bea8a97
issue #2433:lua binding generator add hello.lua
2013-08-09 10:07:10 +08:00
eda9846e6f
DelegateProtocol is weak-referenced again
2013-08-08 18:36:56 +09:00
7910581654
Merge pull request #3388 from dumganhar/iss2483-sp-v23
...
closed 2483: Upgrading spidermonkey library to v23.
2013-08-07 18:39:40 -07:00
59f5353f89
issue #2483 : Updating cocos2d-console.
2013-08-07 18:06:31 +08:00
910215fa89
Merge pull request #3377 from boyu0/iss2345_refactor_ccimage
...
issue #2345 refactor CCImage and CCTexture2D
2013-08-06 23:29:38 -07:00
c2c1bb45d8
Updating Bindings-generator.
2013-08-07 14:19:36 +08:00
1c91e73a8c
added jsb support for AssetsMAnager
2013-08-07 14:07:01 +09:00
1175f2034a
Merge branch 'iss2433-lua-bindings-generator' of git://github.com/dumganhar/cocos2d-x into iss2433-lua-bindings-generator
2013-08-07 10:39:07 +08:00
200c5de83f
issue #2433:lua binding generator
2013-08-07 10:37:20 +08:00
0c4910ee95
Adding tools/tolua .
2013-08-07 10:12:45 +08:00
f447398211
Merge pull request #3376 from folecr/android_redesign_update_template
...
Update templates to match newer, mostly-NDK Android port
2013-08-06 19:11:00 -07:00
4f740809dd
The target needs to be set to 'spidermonkey' when generating jsbindings since we has added 'lua' target yet.
2013-08-07 10:08:00 +08:00
710b895aaa
Updating bindings-generator to the latest version.
2013-08-07 10:02:20 +08:00
dc6503f7d4
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2345_refactor_ccimage
2013-08-06 13:37:38 +08:00
94f9921d5e
issue #2345 : edit linux command to link the libpng12-dev.lib instead of use ourselves. Move ccTexParams into CCTexture2D
2013-08-06 11:34:48 +08:00
3176dddc83
Update Android JSON config files and project creation script
2013-08-05 19:29:08 -07:00
81fc0069cc
Updating travis-script/run-script.sh, don't build template projects for android.
2013-08-06 09:54:23 +08:00
77a9c91b3d
We has to pass the target to bindings-generator since we have add lua target.
2013-08-05 18:33:13 +08:00
ec49e7568f
Updating bindings-generator, adding lua target. It's not finished.
2013-08-05 18:31:20 +08:00
904f85e0a8
Adding tools/tolua .
2013-08-05 18:30:36 +08:00
9dcb6fb80e
Multi-resolution emscripten html template.
...
Default emscripten html template update.
Minor emscripten warnings.
2013-08-05 09:24:47 +02:00
e08b319726
issue #2170 : [JSB] Label is abstract class now.
2013-08-05 12:49:57 +08:00
85661c976c
Merge pull request #3346 from nakosung/develop
...
closed 2465: Wrong logic when pass an empty std::vector to WebSocket::init.
2013-08-01 19:41:11 -07:00
0883723c71
added cc.RemoveSelf
2013-08-02 10:59:16 +09:00
f61f4e58fd
Merge pull request #3094 from sergey-shambir/linux_sdl
...
closed 2458: Linux: added SDL backend as alternative to GLFW.
2013-07-31 01:55:37 -07:00
0530109a9f
Merge pull request #3178 from boyu0/2345
...
Refactor CCImage and CCTexture2D
2013-07-31 01:21:18 -07:00
7385db5a34
Linux: added SDL2 to travis scripts and install-deps-linux.sh
2013-07-30 23:20:18 +04:00
3499aafd27
issue #2435:Lua template supports mac port
2013-07-30 09:51:15 +08:00
41cac18ae2
edit for lua
2013-07-29 14:04:51 +08:00
304d636deb
Closed #2345 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into 2345
2013-07-29 11:40:18 +08:00
bb3ee262b8
Updating README.mdown for the reason of bindings-generator doesn't support windows.
2013-07-29 08:33:10 +08:00
d4dcf44380
[Win32] Removing bindings-generator support, since the clang3.3 of windows can't work with c++11 well, I don't know why, so disable win32 support temporary.
2013-07-29 08:27:59 +08:00
d9020ae80c
Use absolute path for json config files.
2013-07-28 22:59:37 +08:00
cecfc13bc4
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into 2345
2013-07-27 22:06:30 +08:00
2a65fdf2f4
Merge pull request #3294 from dumganhar/develop
...
Updating bindings-generator reference.Supports the default argument whos...
2013-07-26 21:33:07 -07:00
732c2ee49d
Updating bindings-generator reference.Supports the default argument whose value is a reference, for example:
...
class AAA
{
public:
static const BBBB = 100;
void foo(int arg1 = BBBB); // Support this default argument which is not integer argument like 'int arg1 = 100; '
}
2013-07-27 12:32:08 +08:00
faa0b46f57
issue #2426:Add Drawprimitives and DrawNode lua binding and modify releated test sample
2013-07-27 10:42:22 +08:00
a6e514f3d5
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into DrawNode
2013-07-27 00:36:20 +08:00
016593bd0e
issue #2426:Add Drawprimitives.lua and Drawprimitives lua test sample
2013-07-27 00:28:06 +08:00
19d9c08c79
issue #2430 : Fixing compilation errors for lua and js bindings.
2013-07-26 22:15:30 +08:00
3bc45e665c
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into constants-refactor
...
Conflicts:
scripting/lua/cocos2dx_support/LuaCocos2d.cpp
2013-07-26 19:56:04 +08:00
ad1d8b667d
enum class for LanguageType, Application::Platform
2013-07-26 17:29:06 +08:00
6b9c7d4ade
issue #2404:modify a function name to isSwallowsTouches()
2013-07-26 15:21:19 +08:00
7839f769f2
Merge pull request #3265 from dumganhar/constants_fixes
...
Merge PR https://github.com/cocos2d/cocos2d-x/pull/3261 and updating bindings-generator. It supports 'enum class' type now.
2013-07-25 23:21:29 -07:00
241cf022a4
Fixing Luabinding errors.
2013-07-26 13:50:10 +08:00
cda727843a
Updating bindings-generator. It supports 'enum class' type now.
2013-07-26 11:14:48 +08:00
5479dbe0b9
remove xcode template
2013-07-26 10:54:20 +08:00
c79f4b8595
add creating project script in root
2013-07-26 10:50:37 +08:00
10a8c3f23b
tools/project-creator -> tools/project_creator
2013-07-26 10:46:18 +08:00
456a26d7ab
issue #2404:Modify tab to spaces
2013-07-25 20:03:58 +08:00
11d7c9c653
issue #2404:Add more functions to Deprecated.lua and modify some .pkg files
2013-07-25 19:58:59 +08:00
653c1f7f8f
Merge branch 'releasing' of https://github.com/minggo/cocos2d-x into minggo-releasing
2013-07-25 16:00:45 +08:00
682a1238fa
Use of a single emscripten HTML template file.
2013-07-24 17:59:21 +02:00
a76863dd7f
add execution permission
2013-07-24 17:50:39 +08:00
99949331b1
fix error and compilings error in templates
2013-07-24 17:27:29 +08:00
019246fd51
travis build template too
2013-07-24 17:26:45 +08:00
749e8f96eb
typo; more Pythonic
2013-07-23 13:37:17 +08:00
8660543d77
Merge pull request #3198 from samuele3hu/deprecatedfunc
...
issue #2404:Move deprecated functions in Lua
2013-07-22 00:27:06 -07:00
c154d66bf0
Updating Bindings-generator.
2013-07-22 13:44:30 +08:00
510a5912fd
issue #2404:Add many functions to Deprecated.lua
2013-07-22 13:42:58 +08:00
eed0297c59
Merge branch 'deprecatedfunc' of https://github.com/samuele3hu/cocos2d-x ; branch 'develop' of https://github.com/cocos2d/cocos2d-x into deprecatedfunc
2013-07-22 09:39:57 +08:00
4eb6d7aea4
issue #2404:Modify a comment
2013-07-19 15:38:17 +08:00
18fa6f2fbd
issue #2404:Modify a comment
2013-07-19 15:29:36 +08:00
7c7d21dd03
issue #2407 : more best practices fixes, more getter and const..
2013-07-19 14:57:54 +08:00
90af254fac
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into deprecatedfunc
2013-07-19 14:57:38 +08:00
3b97353e14
issue #2404:Modify Deprecated.lua and set platform config
2013-07-19 14:57:02 +08:00
6ffac07a81
More getter functions: e.g. MenuItemFont::fontSize --> MenuItemFont::getFontSize
2013-07-19 11:08:47 +08:00
236b675e21
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into deprecatedfunc
2013-07-18 23:29:41 +08:00
78cd3e561e
issue #2404:Move deprecated functions to Deprecated.lua
2013-07-18 23:27:07 +08:00
76e05ee802
Merge https://github.com/cocos2d/cocos2d-x into 2345
2013-07-18 17:47:43 +08:00
d58a7fcce2
closed #2414 : Bindings-generator could bind std::function argument now.
2013-07-17 18:09:49 +08:00
a9eea0a887
issue #2407 : Updating jsb_deprecated.js and cocos2dx.ini.
2013-07-17 17:38:03 +08:00
70140bb4cb
refactor CCImage and CCTexture2D
2013-07-17 17:12:04 +08:00
7e4e34d992
[ci skip]Update cocos2dx.ini, don't genergate bindings for DrawNode::listenBackToForeground.
2013-07-17 14:36:10 +08:00
596eb9df3e
issue #2377:Modify tojs/cocos2dx.ini and a function name
2013-07-16 16:45:57 +08:00
1761669832
issue #2377:Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into ScriptHandlerMgr
2013-07-16 12:47:40 +08:00
72d1a074df
Updating travis-script/before-install.sh, install gcc4.7 when build linux port.
2013-07-16 11:58:08 +08:00
de4b231264
closed #2405 : Updating bindings-generator, Bindings-generator should not bind deprecated methods.
2013-07-16 10:04:03 +08:00
ebf382b02f
issue #2405 : Removing deprecated methods in 'skip' section in cocos2dx.ini since bindings-generator will not bind deprecated methods now.
2013-07-16 10:03:25 +08:00
c955a559bf
issue #2377:Del register/unregister function in .cpp and .h files
2013-07-16 09:55:06 +08:00
759831c1d8
issue #2397 : Application::sharedApplication --> Application::getInstance.
2013-07-15 16:24:42 +08:00
80a6811f9f
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into ScriptHandler
2013-07-15 10:39:08 +08:00
51c3ced4ba
issue #2377:Modify the ScripthandlerMgr struct and modify some lua test samples
2013-07-15 10:38:16 +08:00
34b60e99f1
Merge pull request #3140 from minggo/iss2393-mark_deprecated
...
Use Point, Rect and Size member functions instead of global functions
2013-07-12 08:59:27 -07:00
98fffdf7fc
closed #2393:revert some wrong modification when fix conflicts
2013-07-12 23:58:31 +08:00
6abe6fce78
closed #2393 : fix conflicts
2013-07-12 18:04:32 +08:00
dda40ce9ab
Updating cocos2dx.ini, ignore "FileUtils::purgeFileUtils" for JSB.
2013-07-12 16:49:13 +08:00
c6b0882766
issue #2397 : Updating Lua bindings.
2013-07-12 15:42:14 +08:00
33c37f5f9d
issue #2397 : CCTextureCache:sharedTextureCache --> CCTextureCache:getInstance.
2013-07-12 14:44:24 +08:00
4a7e884de8
issue #2397 : UserDefault::sharedUserDefault() --> UserDefault::getInstance(), UserDefault::purgeSharedUserDefault() --> UserDefault::destroyInstance();
2013-07-12 14:34:57 +08:00
f8cd252c5c
issue #2397 : sharedNotificationCenter --> getInstance
2013-07-12 14:17:42 +08:00
6038d69183
issue #2397 : sharedSpriteFrameCache --> getInstance, purgeSharedSpriteFrameCache --> destroyInstance.
2013-07-12 14:12:58 +08:00
f30ae2ef31
issue #2397 : Updating CCAnimationCache.pkg
2013-07-12 13:57:05 +08:00
41957f06c9
issue #2397 : sharedAnimationCache --> getInstance.
2013-07-12 13:54:56 +08:00
853a503d2f
issue #2397 : Updating bindings configuration. [Lua and JS].
2013-07-12 13:48:31 +08:00
2c1b26acf8
issue #2397 : EGLView::sharedOpenGLView() --> EGLView::getInstance()
2013-07-12 13:11:21 +08:00
74339b6d0e
issue #2397 : Updating cocos2d.ini and CCFIleUtils.pkg.
2013-07-12 12:53:20 +08:00
a678d12615
issue #2397 : FileUtils::sharedFileUtils --> FileUtils::getInstance() for all platforms
2013-07-12 12:03:39 +08:00
88a28b041e
issue #2397 : Director::sharedDirector --> Director::getInstance() for all files.
2013-07-12 11:50:36 +08:00
9b126e79d7
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into remove-copywithzone
...
Conflicts:
scripting/lua/cocos2dx_support/LuaCocos2d.cpp
2013-07-08 23:09:48 +08:00
8f900d02b8
issue #2300 : Removing all 'copyWithZone' pattern.
2013-07-08 23:05:47 +08:00
87125e4b2a
issue #2129:use capital words for static const member variables
2013-07-08 18:11:32 +08:00
cf96ec079e
Merge pull request #11 from dumganhar/minggo-iss2129-remove_prefix
...
Bug fixes. Please see the commits for details.
2013-07-08 00:40:23 -07:00
962207a48a
Adding some logs in travis script.
2013-07-08 15:27:49 +08:00
466a64ba05
issue #2129 : Updating bindings-generator.
2013-07-08 15:25:04 +08:00
c07eda8894
issue #2129 : Updating cocos2dx.ini.
2013-07-08 15:19:46 +08:00
b39e7e205f
issue #2129:modify pkg files
2013-07-08 11:34:31 +08:00
e03091f934
Updating tojs/cocos2dx.ini, visit needs to be exposed to JS since it's used for RenderTexture.
2013-07-05 15:18:04 +08:00
9d2152b513
sudo apt-get update before install new packages
2013-07-05 13:45:37 +08:00
a67ac821f7
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2371-add-lua-ios-mac
...
Conflicts:
scripting/lua/cocos2dx_support/LuaCocos2d.cpp
2013-07-04 17:15:09 +08:00
62879c3789
issue #2371 : Updating CCTexture2D.pkg.
2013-07-04 17:09:23 +08:00
22e5d12503
Merge pull request #3071 from keirantai/develop
...
Regenerated xcode4 templates plist files
2013-07-03 23:27:50 -07:00
c327bc7906
issue #2373:add const in pkg files
2013-07-04 12:50:17 +08:00
dde6250159
Regenerated xcode4 templates plist files due to missing few important files and causes compile error
2013-07-04 11:13:15 +08:00
28b3028646
Updating bindings-generator.
2013-07-02 18:24:31 +08:00
d446f90016
close #2285 : Updating tools/tojs/cocos2d-x.ini.
2013-07-02 17:48:06 +08:00
34871d47af
close #2347 : Updating tools/tojs/cocos2dx.ini.
2013-07-01 22:34:57 +08:00
e20356a32d
Merge pull request #3037 from boyu0/refactor_2339
...
change the useage text
2013-06-30 23:37:12 -07:00
c872666650
Merge pull request #3025 from boyu0/refactor_2339
...
closed #2339 : Refactor checkParams() in create_project.py, use OptionParser to parse the params
2013-06-30 23:19:08 -07:00
1156ae4f60
change the useage text
2013-07-01 14:10:14 +08:00
2625847a74
closed #2339 refactor checkParams() in create_project.py, use OptionParser to parse the params
2013-07-01 01:04:01 +08:00
2cccadeaab
closed #2339 refactor checkParams() in create_project.py, use OptionParser to parse the params
2013-06-28 10:12:55 +08:00
5ce150a10c
issue #2340 : Updating submodule of cocos2d-console.
2013-06-27 17:19:22 +08:00
d2940bf4c7
Merge pull request #3008 from minggo/ccx_filesystem
...
remove unneeded codes when using assets manager
2013-06-26 18:53:34 -07:00
7e26a86e2e
issue #2329:not bind CCFileUtils private function
2013-06-26 17:36:31 +08:00
cde809951a
Fixing travis errors for generating JSB glue codes.
2013-06-26 16:57:08 +08:00
14208cfda9
Only skip ^visit$
2013-06-26 16:35:41 +08:00
e1b1eee46d
issue #2313 : Ignores `visit` and exposes ClippingNode to JS. [Not finished]
2013-06-26 16:29:45 +08:00
f9ae701a4b
Fix emscripten build on linux
...
Remove the dependacy of the emscripten build on /Library/Fonts
(a darwin-only folder). On non-darwin platforms we use the
ariel.tff that is part of TestCpp.
2013-06-25 11:47:52 -07:00
cb2f42d0c6
Share top level Makefile between emscripten, linux and nacl.
...
Remove the custom top level Makefile.emscripten and instead
add build-emscripten.sh which can be used like build-linux.sh
and build-nacl.sh.
Also, use the top level lib folder to store emscripten libs.
This brings it in line with the other make-based builds.
2013-06-25 11:45:01 -07:00
58c3faf209
Cleanup travis build scripts.
...
before-install.sh and run-script.sh now both given an error if
no PLATFORM was not specified correctly.
Environment variables are now set as part of run-script.sh. This
makes the travis output simpler and makes it possible to run
run-script.sh outside of travis.
javascript binding generation will not exit early if GH_USER
etc are not set. This allows the travis scripts to be run in
cloned repos which were otherwise erroring out trying to go
the JS bindings commit.
When generating javascript bindgings, don't username and email
with '--global'. It should be sufficient to set this only for
the binding repo.
2013-06-24 22:55:15 -07:00
e96c807087
clang+llvm-3.1 --> clang+llvm-3.3
2013-06-21 21:49:23 +08:00
e69838ff27
[Travis CI] Removing space for before-install.sh.
2013-06-21 21:40:21 +08:00
3cf482bebd
Updating bindings-generator.
2013-06-21 21:27:59 +08:00
992ea78f53
Using llvm 3.3 and android cxx-stl 4.7.
2013-06-21 21:27:45 +08:00
9a7bb8fa84
Removing unused files [tools/lua_project_generator]. [ci skip].
2013-06-21 11:17:14 +08:00
40766006bd
[NaCl] Fix NaCl build which had been disabled.
...
Since switching to C++11 the NaCL build was disabled.
This re-enables the ARM configuration which uses a
more recent version of gcc. This means that that NaCl
code paths will at least be test until we can find a way
to re-enable the X86 build.
2013-06-20 12:56:12 -07:00
1b66a98390
Bug fixes for the tool to generate luabindings.
2013-06-20 19:00:23 +08:00
b37fbfdcc8
Merge pull request #2939 from growingdever/patch-3
...
Update create_project.py
2013-06-20 01:45:23 -07:00
150394d648
issue #2129 : Compatible with old class name exported to LUA, I mean keeping CC prefix for luabinding.
2013-06-20 15:10:14 +08:00
14b07af56c
issue #2129 : CC_Reader --> _Reader.
2013-06-20 15:08:22 +08:00
da6af26cd8
issue #2129 : Updating cocos2dx.ini.
2013-06-20 14:58:01 +08:00
73c167d1b2
issue #2129 : Updating submodule of bindings-generator.
2013-06-20 14:56:33 +08:00
c7456af00e
issue #2129 : Updating tojs/cocos2d.ini and tojs/cocos2dx_extension.ini.
2013-06-20 14:24:36 +08:00
60c84a50a1
Update create_project.py
...
'Sample 1' way is not okay. If not input language, script doesn't generate project. (Must input language, but 'Sample 1' way said that you don't need to input language.)
2013-06-20 13:14:27 +09:00
fa21674f6c
issue #2301 : Updating travis-scripts for emscripten.
2013-06-19 13:15:29 +08:00
504a9e714e
issue #2300 : copy --> clone for luabinding.
2013-06-19 12:08:26 +08:00
2c0cc603d1
Merge branch 'master' into develop
...
Conflicts:
extensions/cocos-ext.h
2013-06-18 10:46:25 +08:00
ccb67cbcb4
Template fix for iOS Template.
2013-06-17 15:54:12 +08:00
c0d44cb2e4
fixed #2129 : Rename m_iVar to _var, remove CC prefixes.
2013-06-15 14:03:30 +08:00
c7c7189d90
Fix emscripten bugs.
2013-06-15 12:07:19 +08:00
8c671bd0e9
Adding EMCC_DEBUG=1 to debug
2013-06-15 11:52:46 +08:00
cec360df38
Reverting run-script.sh
2013-06-15 11:43:43 +08:00
aeb331d3c4
issue #2284 : Don't use multiple process to build emscripten since it'll generate errors.
2013-06-15 11:28:31 +08:00
82cd7bb01f
Merge branch 'iss2284-merge-master' of https://github.com/minggo/cocos2d-x into minggo-iss2284-merge-master
2013-06-14 15:41:01 +08:00
6e8b390094
Updating submodule of bindings-generator(Don't generate jsbinding glue codes for copy constructor.).
2013-06-14 14:15:04 +08:00
cd5bcb87af
issue #2284 : merge master and fixed some conflicts
2013-06-13 17:54:05 +08:00
0d7b7819c2
[travis-ci] Speed up android build.
2013-06-11 11:31:24 +08:00
15f5538835
Adding travis-ci build for emscripten port.
2013-06-10 21:57:26 +08:00
5d5a5be71c
Don't generate js binding glue code for CCMenuItem.*::initWithCallback.
2013-06-06 16:21:27 +08:00
cda02af1e7
Using CC_DEPRECATED_ATTRIBUTE to mark functions as deprecated. Don't bind CCMenuItem::setCallback automatically.
2013-06-05 17:35:19 +08:00
e4a8cad3c2
Updating cocos2dx_extension.ini
2013-06-05 14:56:06 +08:00
418354df76
Update cocos2dx_extension.ini
2013-06-05 14:53:53 +08:00
d71e07db4e
fixed conflict
2013-06-05 13:48:31 +08:00
6491ff75cf
issue #2257 : make ios template work
2013-06-05 11:21:04 +08:00
13308b492e
Update generate-jsbindings.sh [ci skip], push to an unique branch.
2013-06-04 14:17:28 +08:00
43791a5e2a
Update generate-jsbindings.sh [ci skip], push to an unique branch.
2013-06-04 15:15:50 +09:00
64dec0df56
fixed #2247 : Using functions instead of macros to speeding up building for JSB project.
2013-06-04 13:01:50 +08:00
0587631926
Merge pull request #2725 from dumganhar/iss2247-refactor-jsb-proxy-develop
...
fixed #2247 : Using functions instead of macros to speeding up building for JSB project.
2013-06-03 19:49:31 -07:00
de6a531115
Update cocos2dx.ini, don't genergate bindings for CCCallFunc::initWithFunction
2013-06-04 10:13:27 +08:00
fb566426b9
enable C++11 in tojs
2013-06-03 13:09:49 -07:00
bba2d2bbdc
fixed #2247 : Using functions instead of macros to speeding up building for JSB project.
2013-06-03 22:31:24 +08:00
86af06c909
fixed #2244 : cc.Camera.getEyeXYZ, cc.Camera.getCenterXYZ, cc.Camera.getUpXYZ return bad values.
2013-06-03 15:32:07 +08:00
7cf2f88c3b
fixed #2244 : cc.Camera.getEyeXYZ, cc.Camera.getCenterXYZ, cc.Camera.getUpXYZ return bad values.
2013-06-03 15:22:28 +08:00
c7fd3a3483
Adding submodule of cocos2d-console to 'tools' folder.
2013-06-02 10:53:46 +08:00
89b397f1d1
Delete tools/jsbcc since it was moved to https://github.com/cocos2d/cocos2d-console .
2013-06-02 10:53:34 +08:00
1b455e452e
Adding submodule of cocos2d-console to 'tools' folder.
2013-06-02 10:51:19 +08:00
8b9e198372
Delete tools/jsbcc since it was moved to https://github.com/cocos2d/cocos2d-console .
2013-06-02 10:46:27 +08:00
3f7c506638
Ability to save/retrieve CCData into/from CCUserDefault
2013-05-29 01:06:41 +01:00
74a39d9bf3
Merge pull request #2634 from samuele3hu/issue2103_testlua
...
modify some skip function name to tools/tojs/cocos2dx_extenson.ini
2013-05-24 02:26:15 -07:00
ca050cc084
Update generate-jsbindings.sh [ci skip], send pull request to the branch which is being built.
2013-05-24 16:54:18 +08:00
3bb1fe0cc7
Update generate-jsbindings.sh [ci skip], send pull request to the branch which is being built.
2013-05-24 16:53:42 +08:00
26267aee56
issue #2103 modify some skip function name to tools/tojs/cocos2dx_extension.ini
2013-05-24 16:27:03 +08:00
a1ef0db7b7
issue #2103 add some skip function name to tools/tojs/cocos2dx_extension.ini
2013-05-24 15:40:02 +08:00
0a1c12a2d3
issue #2103 add some overlapping file and delete some comment line
2013-05-24 13:45:06 +08:00
01399f9d5e
issue #2103 add more test lua
2013-05-24 11:46:07 +08:00
338c7c8d67
issue #2103 add more test lua
2013-05-24 11:42:27 +08:00
93dd778e08
issue #2103 add a newline to CCInterger.pkg
2013-05-23 15:49:06 +08:00
24a34e50bf
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into MenuTest
2013-05-23 15:40:48 +08:00
5da5407efe
issue #2103 add menu test lua sample
2013-05-23 15:39:41 +08:00
12ee71545b
Update run-script.sh, adding travis-ci build of TestCpp,AssetsMangerTest and Testlua for android.
2013-05-23 09:48:11 +08:00
ff616a1d29
Updating cocos2dx.ini. CCTMXLayer::positionAt --> getPositionAt
2013-05-21 18:20:49 +08:00
21f435fdd6
[Travis] Adding Real email info for git. [ci skip]
2013-05-21 18:03:17 +08:00
13f50b2072
[Travis CI] Using linux by default. [ci skip]
2013-05-21 17:29:23 +08:00
0891e0bde9
Updating generate-jsbindings.sh, android is built on linux host.
2013-05-21 16:48:49 +08:00
aa49b7555d
Android is built on Ubuntu host.
2013-05-21 16:39:26 +08:00
8d2dcfe4be
Android build uses linux as host. And a fix in generate-jsbindings.sh.
2013-05-21 16:25:54 +08:00
6ac72da487
Updating file mode. +x
2013-05-21 16:17:58 +08:00
19ede723f2
Adding iOS travis support, not finished.
2013-05-21 16:13:47 +08:00
1128f9dfc6
Merge pull request #2564 from folecr/jsdb
...
fixed #2187 : JavaScript debugger improved and bugfixed.
2013-05-21 00:31:51 -07:00
361004d4d3
Update cocos2dx.ini, don't generate binding for CCSet::acceptVisitor.
2013-05-21 14:52:54 +08:00
f3b4182b9e
Update generate-jsbindings.sh
2013-05-21 14:23:34 +08:00
71512ae491
Update generate-jsbindings.sh
2013-05-21 13:45:56 +08:00
b727f36995
Update to latest bindings-generator with updated documentation for using the debugger.
2013-05-20 15:24:55 -07:00
e57fdf87f0
Update generate-jsbindings.sh [ci skip]
2013-05-20 23:27:40 +08:00
78000c70fc
[iOS] Template fix.
2013-05-19 18:12:14 +08:00
315999edad
new "manual" conversion for ccFontDefinition in JS and also updated LabelTest.js using this new way of passing parameters to CCLabelTTF through ccFontDefinition
2013-05-15 16:37:08 -07:00
ef1a123b42
no more bingins for ccTextDefinition
2013-05-15 16:37:08 -07:00
934c8f5115
bindings for CCTextDefinition
2013-05-15 16:35:24 -07:00
1aad7e927d
fixed #2105 : Refactoring travis build script.
2013-05-13 20:43:28 +08:00
f35e96a9f8
fixed #2105 : Adding Travis build support. Moving script to 'tools/travis-script'.
2013-05-13 15:18:18 +08:00
4a25684292
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into cocos2d-master
...
Conflicts:
tools/jsbcc/src/main.cpp
2013-05-08 18:22:18 +08:00
2b3d126b48
Updated README
2013-05-08 17:59:18 +08:00
8850262640
Merge branch 'master' of https://github.com/sunzhuoshi/cocos2d-x
2013-05-08 17:46:19 +08:00
7c4d72239b
Added win32 support
2013-05-08 17:22:58 +08:00
800952a17a
fixed #2106 : Fixing wrong display of non-ascii characters. The compiler needs to setUTF8 for compile option.
2013-05-07 13:07:40 +08:00
a1011cecbc
Fixed issue when non-ascii string used in script
2013-05-07 12:15:22 +08:00
cbb7824941
Modified jsbcc to use "-p" option to turn on pipe mode
2013-05-06 16:20:13 +08:00
de27f1137a
Changed byte code file ext to ".jsc"
...
Modified loading logic to load js file first
2013-05-06 11:32:23 +08:00
29d37ad4ec
Fixed issue when used via pipe
2013-04-30 17:18:23 +08:00
17f16e16fc
Added README
2013-04-30 14:03:54 +08:00
d4832e3f46
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into cocos2d-master
...
Conflicts:
scripting/javascript/bindings/ScriptingCore.cpp
2013-04-30 03:51:07 +08:00
163c19fac2
Added support for javascript byte code
2013-04-30 03:29:56 +08:00
5337234e22
Android also uses executeScript to load lua source file or byte code file. So unused codes need to be deleted.
2013-04-25 21:31:52 +08:00
acaff0a208
Updating bindings-generator.
2013-04-25 21:10:10 +08:00
a9f3ae0e33
Updating tools/tojs/cocos2dx.ini, adding CCReuseGrid and CCStopGrid bindings.
2013-04-25 14:32:52 +08:00
dee0f37983
issue #2071 : Updating cocos2dx.ini, skipping auto-generating cc.TMXLayer.getTiles(), it needs be bound manually .
2013-04-19 17:23:39 +08:00
4d9d9a6cdd
fixed #2064 : Updating the submodule reference of bindings-generator.
2013-04-18 13:55:11 +08:00
5f478e1e0a
issue #2064 : Updating tools/tojs/cocos2dx.ini.
2013-04-18 13:53:43 +08:00
d4c40c7f37
fixed #1847 : Updating template for iOS.
2013-04-17 12:44:55 +08:00
0ecf9da3a6
Adding Box2D and chipmunk dependence for TestLua. Removing the definition of GL_RGB565 in CCTexture2D.pkg.
2013-04-12 14:27:29 +08:00
a2c71f8e89
Exposing CCApplication to js.
2013-04-09 14:42:12 +08:00
6d57d691f5
Updating bindings-generator.
2013-04-09 13:56:45 +08:00
0d5d2e54fd
cxx-generator ~> bindings-generator.
2013-04-09 13:47:12 +08:00
d29ff33df1
Updating genbindings.sh, cxx-generator ~> bindings-generator.
2013-04-09 11:03:39 +08:00
cb4eb733c6
Renaming tools/cxx-generator to tools/bindings-generator.
2013-04-09 10:32:18 +08:00
0bab4609ab
fixed #1592 : Removing some marco definitions in CCTexture2D.pkg.
2013-04-08 14:14:35 +08:00
1a44f776f8
fixed #2005 : Adding CurrentLanguageTest for Testlua.
2013-04-07 16:34:07 +08:00
bf84fb565d
Updating cxx-generator reference.
2013-04-07 11:07:16 +08:00
684c659ba7
Merge pull request #2311 from dumganhar/iss2002-more-luatest
...
fixed #2002 : Adding Texture2dTest, RenderTexture, ZwoptexTest, FontTest, CocosDenshionTest and EffectsAdvancedTest for TestLua
2013-04-06 19:45:28 -07:00
799e36d3a9
improve obfuscate.py to be more reliable.
2013-04-06 22:00:52 +08:00
85b0fd306a
Adding CocosDenshionTest.
2013-04-06 14:32:46 +08:00
e754909c5f
Adding RenderTexture test for TestLua.
2013-04-05 17:13:46 +08:00
2bff6d6480
Adding Texture2dTest. And format some lua codes.
2013-04-05 16:13:04 +08:00
818a570b7f
fixed #1998 : Adding SceneTest.lua for TestLua.
2013-04-03 18:14:03 +08:00
2d9f8ca8de
fixed #1814 : MenuTest for Testlua is ok.
2013-04-03 16:29:16 +08:00
a73395507c
fixed #1942 : LayerTest for TestLua is ok.
2013-04-02 17:52:08 +08:00
5fd2acca47
Updating CCLabelBMFont.pkg, CCLabelTTF.pkg, and updating luabinding.
2013-04-01 17:39:26 +08:00
f945f4efd6
Adding the generator config file. Includes CCGLProgram, CCShaderCache classes
2013-03-27 23:59:30 -07:00
6f41b7c4ea
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into jsb_obfuscate
2013-03-21 17:37:28 +08:00
4a9e426d2d
Renaming function: initWithFile ~> init for CCSprite, CCSpriteBatchNode.
2013-03-20 18:34:28 +08:00
196ff7228d
Updating CCLabelBMFont.pkg.
2013-03-20 16:05:45 +08:00
e3adab15dd
Clearer description of command line options
2013-03-19 16:08:38 -07:00
3c317dce53
update doc
2013-03-19 16:04:47 -07:00
d0f6a618a4
Readme with instructions on running the emulator correctly for developing cocos2d-x
2013-03-19 16:00:07 -07:00
582e35014f
issue #1841 , improve tools/closure-compiler/obfuscate.py to general usage, with input params
2013-03-19 23:53:01 +08:00
0d73934f5c
issue #1841 , TestJavascript-ios is obfuscated successfully
2013-03-19 17:21:01 +08:00
f53b3633be
Updating generator for CCBAnimationManager bindings
2013-03-18 16:06:48 -07:00
f52e56be20
Merge pull request #2184 from dumganhar/iss1837-jsb-schedule
...
fixed #1837 : Refactoring schedule binding codes.
1) We need bind cc.Node.scheduleUpdate and cc.Scheduler.scheduleUpdate manually since schedules need to be associated with _schedFunc_target_ht and _schedObj_target_ht.
2) Bind cc.Scheduler.unscheduleCallbackForTarget.
2013-03-18 00:35:33 -07:00
f57a751a48
fixed #1837 : Refactoring schedule binding codes.
...
* 1) We need bind cc.Node.scheduleUpdate and cc.Scheduler.scheduleUpdate manually since `schedules` need to be associated with _schedFunc_target_ht and _schedObj_target_ht
* 2) Bind cc.Scheduler.unscheduleCallbackForTarget.
2013-03-18 15:29:53 +08:00
19cf6665c4
Merge pull request #2176 from folecr/easierandroidbuild
...
Improvements to android build setup and samples' build scripts
2013-03-17 18:58:11 -07:00
3ffd531648
Fixing bugs of genbindings-win32.bat on windows xp.
2013-03-17 14:48:00 +08:00
77469346cf
fixed #1642 : Renaming `extra_flag` to `extra_flags`.
2013-03-17 14:11:15 +08:00
5c30675455
fixed #1642 : Updating genbindings.sh, adding empty variable `extra_flags`.
2013-03-17 14:10:20 +08:00
6bc5c3b0a8
fixed #1642 : Cxx-generator now works ok on windows, it uses the same config file as unix. For details, please refer to README file.
2013-03-17 14:07:41 +08:00
ef9de9286c
Setup user environment for building Android port.
2013-03-15 16:44:09 -07:00
92d0e1c983
Uncommenting jsb_CCEditBox_prototype, updating the submodule of cxx-generator to the latest one.
2013-03-15 11:53:56 +08:00
d783715c18
Merge pull request #2164 from dumganhar/iss1824-editbox-js
...
fixed #1824 : Exposed cc.EditBox to js and refactored ScriptingCore::executeFunctionWithOwner
2013-03-14 03:19:45 -07:00
ee846c3248
Merge https://github.com/cocos2d/cocos2d-x into iss1803-spritetest-lua
2013-03-14 18:14:57 +08:00
3e33868a63
fixed #1824 : Exposed cc.EditBox to js.
2013-03-14 18:14:16 +08:00
815733e0b7
issue #1803:add SpriteOffsetAnchorRotationalSkewScale
2013-03-14 15:11:55 +08:00
29aa62d923
fixed #1830 : Using JS::CompileOptions::setUTF8(true) to compile script.
2013-03-13 18:10:54 +08:00
3aaf5cabdb
Updating cocos2dx.ini(adding CCScheduler to 'abstract_class' section) and adding ScriptingCore::getGlobalObject method.
2013-03-12 22:03:37 +08:00
69b2b13325
fixed #1748 : Generating jsb_cocos2dx_extension_auto.hpp/.cpp. It was separated from original `cocos2dx.hpp/cpp`.
...
Developer could remove redundant jsbinding codes now.
2013-03-11 16:39:28 +08:00
db943ddb90
Deleting all files in 'scripting/javascript/bindings/generated' except '.git' and 'README'.
2013-03-10 16:10:16 +08:00
fc5f7547a3
fixed #1808 : Adding config section 'script_control_cpp' and set it to 'no'.
2013-03-10 14:00:30 +08:00
1a42e85219
fixed #1808 : Updated the submodule of cxx-generator and fixed some compilation errors after that.
2013-03-10 13:55:29 +08:00
c0b150c859
Cleanup the tolua++ bindings build system.
...
Update basic.lua to do all the required patching of
the output file without helper scripts such as
build.xml or build.php.
Update README file with current instructions.
Re-generate output file using new build system.
Add build.sh and build.bat for building on POSIX and
win32 respectively.
2013-03-08 11:09:10 -08:00
dd8681b18b
Merge pull request #2113 from minggo/refactor-ccuserdefault
...
Refactor ccuserdefault
2013-03-06 23:05:50 -08:00
d5cdba484e
Merge branch 'master' into feature_1802
...
Conflicts:
scripting/lua/cocos2dx_support/LuaCocos2d.cpp
2013-03-07 14:32:31 +08:00
6914c9d902
feature #1802:add touches lua test
2013-03-07 11:55:57 +08:00
3cb4ab8f31
issue #1529:update xcode template
2013-03-07 10:41:45 +08:00
3aaa18f7f4
Merge branch 'master' into iss1425-lua
...
Conflicts:
scripting/lua/cocos2dx_support/LuaCocos2d.cpp
2013-03-06 20:39:01 +08:00
bdbdbc27f5
issue #1425:exist lua test case is ok!
...
1.add some lua test case
2.add ccset.pkg
3.fixed ParticleSystem error in lua test case
2013-03-05 14:46:18 +08:00
dcb591eadb
Add missing ccGLServerState to CCNode.pkg.
...
Without this missing enum the resuling cpp file would generate
an unused function warning.
Also, remove the duplication between build_macosx.xml and build.xml.
They only differed in single property. Instead use build.sh, which
should work on all UNIXs, no just maxosx.
2013-03-02 11:28:04 -08:00
f7802a0794
Merge pull request #2072 from yuezang/iss1425-luatest
...
issue #1425 : exist lua test case is ok.
2013-03-01 01:17:15 -08:00
8867766241
issue #1425 : exist lua test case is ok.
...
1.fixed some bugs in some lua test case;
2.modify touch event and node event type;
3.fixed some bugs in CCParticleSystem.pkg
2013-03-01 17:09:42 +08:00
e4b5ee97b0
Updated cocos2dx.ini.
2013-03-01 10:58:16 +08:00
501a2612cb
tab ~> 4 spaces .
2013-03-01 10:45:07 +08:00
7093807f3f
CCNodeRGA isn't a pure abstract class anymore. Updated tools/tojs/cocos2d.ini.
2013-03-01 10:41:06 +08:00
b4e13af460
issue #1425 :
1.fixed some bugs in .lua file. like this:local b = a:copy():autorelease()
...
2.fixed bug of CCShakyTiles3D's create() in CCActionTilesGrid.pkg
3.delete method copyWithZone in .pkg files
2013-02-28 10:23:30 +08:00
8f58f082f3
Updated the submodule reference of cxx-generator.
2013-02-27 15:17:19 +08:00
32c9e0379a
fixed #1731:change struct to class
2013-02-25 10:22:03 +08:00
634a98d19a
Merge pull request #2030 from giginet/cocos2dx-pull-request
...
fixed #1745 : Fix CCRepeat#create is recieved bad argument on Lua binding.
2013-02-22 18:33:14 -08:00
750918d058
Fix CCRepeat#create argument
2013-02-23 09:03:28 +09:00
79be62a932
issue #1733 , fix a typo in dumping usage.
2013-02-22 22:24:05 +08:00
b534ff16e7
issue #1733 , don't remove projects if it exists.
2013-02-22 16:33:24 +08:00
3dcee98cb8
issue #1733 , use json config files instead of python modules for multi-platforms.
2013-02-22 16:32:12 +08:00
3eab5d509b
issue #1733 , project-creator for lua works.
2013-02-21 17:11:11 +08:00
d736f38fac
issue #1733 , project-creator for cpp project seems ok
2013-02-21 16:51:22 +08:00
c70412d890
Merge pull request #2015 from dumganhar/iss1730-bind-scrollview
...
fixed #1730 : Exposed CCScrollView and CCTableView to js.
2013-02-20 18:23:13 -08:00
cf33a4538d
fixed #1730 : Binds CCScrollView and CCTableView to js.
2013-02-21 10:06:22 +08:00
e81c841ad6
issue #1733 , improve the help description of create_project.py
2013-02-20 23:42:48 +08:00
ef697781a7
issue #1733 , unify package name to org.cocos2dx.hello* lower case on both android & ios.
2013-02-20 23:15:48 +08:00
4f81e704ae
Merge branch 'refs/heads/master' into project-creator
2013-02-20 13:41:53 +08:00
8915b4787d
fixed #1733 , the python script perfectly works, tested on both osx and windows
...
This pull request fixed:
- Handling the difference of line ending between osx and windows
- remove os.popen("rm -rf" + …) usage which can not cross desktop platforms, uses shutil.rmtree instead
2013-02-20 13:26:41 +08:00
24767349b4
Merge pull request #2008 from dumganhar/master
...
fixed a bug of respond touch events in hello.lua. The event type is string now.
2013-02-19 20:07:02 -08:00
ab00de629a
Removed the definition of the touch event type .
2013-02-20 12:06:12 +08:00
72b830ef49
fixed the failure of auto generating js binding.
2013-02-20 11:07:42 +08:00
13ab9c0196
Merge pull request #1999 from walzer/project-creator
...
issue #1733 : python scripts for generating JSB projects.
2013-02-18 22:11:37 -08:00
599f22f1e2
Merge pull request #1997 from minggo/iss1731-lua-declaration
...
issue #1731:change CCSize, CCPoint and CCRect to struct in pkg files
2013-02-18 18:19:00 -08:00
1b743b37c9
issue #1731:change CCSize, CCPoint and CCRect to struct in pkg files
2013-02-19 10:08:25 +08:00
ed49029744
Updated the submodule of cxx-generator.
2013-02-19 09:48:16 +08:00
6ebc9b7410
issue #1725 , project-creator, HelloJavascript on win32 works ok
2013-02-19 00:02:42 +08:00
dc7fe1af25
issue #1725 , improve the project creator on android
2013-02-18 23:34:31 +08:00
0a4700e59b
issue #1725 project creator script works ok for iOS and Android on Mac OSX env
2013-02-18 22:09:42 +08:00
0c5bcb3f7b
issue #1702:fix a typo error
2013-02-06 18:04:40 +08:00
5904512ac6
add CCFileUtils Lua support
2013-02-04 12:41:24 +08:00
23acb3eacd
issue #1687 : Updating iOS template after refactoring CCFileUtils.
2013-02-03 13:56:44 +08:00
3a9346e6ff
issue #1687 : Refactoring CCFileUtils, abstracting the same implementations for all platforms.
2013-02-01 11:20:46 +08:00
c071620951
set build option to -O1 for js xcode project when building with debug option
2013-01-29 20:58:34 +08:00
31681e005e
CCFileUtils::fullPathFromRelativePath -> fullPathForFilename.
2013-01-29 10:40:44 +08:00
2694cb150b
CCFileUtils::s|gSearchPath -> CCFileUtils::s\gSearchPaths.
2013-01-29 09:56:38 +08:00
c80d438110
issue #1683 : Exporting `fullPathForFilename` to Lua.
2013-01-27 20:26:04 +08:00
119115502d
issue #1683 : Making some api of CCFileUtils more c++ friendly by using std::vector rather than CCArray.
2013-01-26 22:31:57 +08:00
294509c4c0
Merge branch 'master' of https://github.com/dumganhar/cocos2d-x into myccfileutils
2013-01-23 19:52:17 +08:00
f2303b854a
Fixed a typo, and regenerated luabinding codes.
2013-01-23 15:59:13 +08:00
219657ee1a
Merge pull request #1872 from moadib/android_manifest_gles20
...
fixed #1673 : Added <uses-feature android:glEsVersion="0x00020000"/> to AndroidManifest.
2013-01-21 23:52:32 -08:00
5a41e1fc86
fixed compilation errors for lua project. Rebuild LuaCocos2d.cpp.
2013-01-22 14:40:54 +08:00
e39829269d
Added <uses-feature android:glEsVersion="0x00020000" /> to AndroidManifest.xml
2013-01-21 13:03:55 +04:00
0a42829428
issue #1667 : Adding file name lookup support for iOS and Android, TBD: Other platform supports.
2013-01-18 18:05:32 +08:00
8a4d7cfe12
fixed #1653 : Updated the configuration files of jsbinding.
2013-01-15 10:17:01 +08:00
121519b7cd
Merge pull request #1831 from dumganhar/iss1653-jsb-int
...
fixed #1653 : Handling correctly when parsing int value in JSB.
2013-01-14 17:49:57 -08:00
a1155f52e6
Merge remote branch 'upstream/gles20' into gles20
2013-01-11 21:48:47 +01:00
1a659bdacb
issue #1653 : Updated the submodule of cxx-generator.
2013-01-11 21:46:45 +08:00
273ffcc571
issue #1653 : Updated the submodule of cxx-generator.
2013-01-11 13:55:36 +08:00
16269d952d
Detect VS2012 Update 1
2013-01-10 11:55:30 +01:00
a4ea453ade
fixed #1645 : Excluded proj.win32.
2013-01-08 15:15:44 +08:00
674bb8e728
Setting PlatformToolSet to v110_xp instead of default v110 in Visual Studio 2012 for Windows XP support, leaving default v100 in Visual Studio 2010.
2013-01-07 11:51:05 +01:00
bf0cc23336
Update tools/tojs/README.mdown
2013-01-06 18:31:35 +08:00
b712a9349a
fixed #1642 : Updated tools/tojs/README.mdown.
2013-01-06 18:24:02 +08:00
b5b1df6a07
Added tools/tojs/README.mdown.
2013-01-06 18:10:43 +08:00
be1be2771b
fixed #1642 : Adding tools for generating jsbinding codes on windows.
2013-01-06 18:01:44 +08:00
0ee9cf027b
Merge pull request #1803 from dumganhar/iss1627-vs2012
...
fixed #1627 : VS version check in project file.
2012-12-28 22:54:04 -08:00
9bd302e35b
fixed #1627 : VS version check in project file.
2012-12-29 13:54:46 +08:00
d1e39a9c00
[luabinding] add CCDirector::setDisplayStats()
2012-12-29 11:16:07 +08:00
f2f3aa55bf
Merge branch 'gles20' of https://github.com/johnangel/cocos2d-x into iss-vs2012
...
Conflicts:
samples/Cpp/HelloCpp/proj.win32/HelloCpp.vcxproj
samples/Cpp/TestCpp/proj.win32/TestCpp.vcxproj
samples/Javascript/CocosDragonJS/proj.win32/CocosDragonJS.vcxproj
samples/Javascript/MoonWarriors/proj.win32/MoonWarriors.vcxproj
samples/Javascript/TestJavascript/proj.win32/TestJavascript.vcxproj
samples/Javascript/WatermelonWithMe/proj.win32/WatermelonWithMe.vcxproj
samples/Lua/HelloLua/proj.win32/HelloLua.vcxproj
samples/Lua/TestLua/proj.win32/TestLua.win32.vcxproj
scripting/javascript/bindings/generated
scripting/lua/proj.win32/liblua.vcxproj
2012-12-29 09:48:22 +08:00
df5c6aae04
Binded more actions to js.
2012-12-27 13:38:48 +08:00
f07987418c
Merge pull request #1794 from dumganhar/sync
...
fixed #1625 : Added stackable action support. Exchanged the order of parameter for 3d actions.
2012-12-26 20:50:32 -08:00
d1c33960b2
issue #1625 : Updated lua pkg files.
2012-12-27 11:47:49 +08:00
c5e62206e0
Merge pull request #1791 from minggo/gles20
...
issue #1603:delete space when setting language
2012-12-25 18:44:08 -08:00
d94e4c30b8
issue #1603:delete space when setting language
2012-12-26 10:42:35 +08:00
8b522c326c
Merge pull request #1790 from minggo/gles20
...
issue #1603:modify android resource path
2012-12-24 22:21:31 -08:00
e7ca426b3d
issue #1603:modify android resource path
2012-12-25 14:20:35 +08:00
c47553ece9
Merge pull request #1789 from minggo/gles20
...
issue #1603:modify windows auto-build script
2012-12-24 21:02:35 -08:00
79530616ea
issue #1603:modify windows auto-build script
2012-12-25 12:57:24 +08:00
fb0a9d9058
Merge pull request #1787 from minggo/gles20
...
issue #1603:modify auto-building script
2012-12-24 19:12:40 -08:00
c3e44f0e26
issue #1603:modify auto-building script
2012-12-25 11:11:44 +08:00
e301b9af1e
Updated cocos2dx.ini. Only skip CCNode::setPosition and CCSprite::setPosition.
2012-12-25 09:52:30 +08:00
08cd9e37fc
Setting PlatformToolSet to v110_xp for Visual Studio 2012 only.
2012-12-24 10:27:56 +01:00
fab196dcbe
issue #1603:modify some auto-building script
2012-12-24 14:26:57 +08:00
380cadebce
issue #1603:modify some path for auto building
2012-12-21 18:06:36 +08:00
b0e752eac3
issue #1603:modify path of cocos2d-x
2012-12-21 17:40:54 +08:00
9beac15305
issue #1603 : modify some pathes
2012-12-21 15:05:22 +08:00
7b81217c3c
issue #1603:modify pathes for auto test
2012-12-21 14:06:20 +08:00
adb68ddbb6
Enable Windows XP support in Visual Studio 2012 Update 1.
...
Not tested with Visual Studio 2010, not sure will it work with PlatformToolset v110_xp.
2012-12-19 19:28:25 +01:00
190e6c1de5
Merge branch 'linux-lua' of https://github.com/dumganhar/cocos2d-x into lua-linux
...
Conflicts:
scripting/lua/cocos2dx_support/LuaCocos2d.cpp
2012-12-10 17:25:23 +08:00
f815cdc423
merge gles20
2012-12-10 17:00:16 +08:00
65d81b0de7
fixed #1608 : Updated tools/tolua++/CCAction.pkg.
2012-12-10 16:50:02 +08:00
268aa45d2c
rename CCNode:scheduleUpdateScriptHandlerWithPriority() to CCNode::scheduleUpdateWhitPriorityLua()
...
remove unused functions
2012-12-10 16:09:23 +08:00
77d4da6e22
[lua] remove va_list
2012-12-10 14:28:26 +08:00
b6e605b9ae
[lua] fix CCSequence export
2012-12-10 14:19:18 +08:00
0662ceac9d
[lua] update export
2012-12-10 14:07:24 +08:00
86f6473270
[lua] fix invalid export
2012-12-10 14:04:56 +08:00
c8753f72ef
[scripting] add CCNode::scheduleUpdateScriptHandlerWithPriority()
2012-12-10 13:48:27 +08:00
d5533fcf15
fix a type information in CCBAnimationManager
2012-12-10 11:30:07 +08:00
48783d2224
Merge pull request #1662 from guanqun/fix-group-type
...
when user specified 'group' parameter, it should be parsed as an 'int'
2012-12-06 18:02:09 -08:00
cf25a8033a
Updated the submodule reference of cxx-generator.
2012-12-06 17:20:08 +08:00
b044a89d6f
Merge branch 'gles20' of https://github.com/ivzave/cocos2d-x into linux-lua
...
Conflicts:
scripting/lua/cocos2dx_support/LuaCocos2d.cpp
2012-12-06 14:55:18 +08:00
320d532e15
add Hungarian language support
2012-12-05 11:31:05 +01:00
a256d35a5b
fix some confilcs
2012-12-05 14:01:05 +08:00
0e65257bc2
[luabinding] remove duplicate ccLanguageType
2012-12-02 16:17:17 +08:00
5bc95780c0
update luabinding
2012-12-02 15:48:15 +08:00
15d02e4db8
Merge branch 'iss1581-fix-jsbinding-bugs' of https://github.com/dumganhar/cocos2d-x into iss1583-js-tests
...
Conflicts:
scripting/javascript/bindings/cocos2d_specifics.cpp
2012-11-30 21:43:44 +08:00
344fc5ca6f
issue #1583 : Updated tools/tojs/cocos2dx.ini.
2012-11-30 21:16:34 +08:00
a814066601
issue #1581 : JSBinding bug fixes.
...
Some fixes of JSBinding codes:
[1] Check whether the proxy was already added in JS_NEW_PROXY
[2] In struct schedFunc_proxy_t, JSScheduleWrapper* --> CCArray*
Reason: One js function may correspond to many targets. To debug this, you could refer to JSScheduleWrapper::dump function. It will prove that i'm right. :)
[3] In ScriptingCore::cleanupSchedulesAndActions function, we must invoke unschedule for all targets and remove the proxy both in _schedFunc_target_ht and _schedTarget_native_ht, otherwise the hash tables will grow bigger and bigger, so I added a new function JSScheduleWrapper::removeAllTargetsForNatiaveNode to make this things easier.
[4] To easily find out the bugs of binding codes, I add JS_SetGCZeal in ScriptingCore::createGlobalContext, it only works in DEBUG mode.
[5] In js_cocos2dx_CCNode_getChildren, we should add the generated array to root to avoid gc happen when invoking JS_SetElement.
[6] The JSCallFuncWrapper isn't needed since an action will be run by a cc.Node and it will be released at the CCNode::cleanup.
[7] Some improvements of JSScheduleWrapper class.
[8] Added a new function JSScheduleWrapper::setTarget, it's for js_CCNode_unschedule to find out which target need to be unscheduled.
[9] Commented JS_SetReservedSlot in js_CCNode_scheduleOnce and js_CCNode_schedule.
Reason:
For js_CCNode_scheduleOnce: Don't add the callback function to the reserved slot of this js object.Since the class of js object may be inherited from cocos class(e.g. cc.Sprite). The subclass will not contain reserved slots. It will crash if invoking this.
For js_CCNode_schedule: Don't add js callback function to the reserved slot of scheduler js object. Since the scheduler is an object always rooted.
So the callback function might not be released when gc comes.I looked inside the implementation of cc.Node.schedule, and it doesn't use JS_SetReservedSlot there.
2012-11-28 22:04:55 +08:00
a37e034e61
added support for Japanese language
2012-11-28 17:53:10 +09:00
95ccf17739
Bind some functions for js:
...
void runAnimationsForSequenceNamedTweenDuration(const char *pName, float fTweenDuration);
void runAnimationsForSequenceNamed(const char *pName);
void runAnimationsForSequenceIdTweenDuration(int nSeqId, float fTweenDuraiton);
2012-11-28 11:49:20 +08:00
f64774ec6c
when user specified 'group' parameter, it should be parsed as an 'int'
...
Otherwise, when we do slicing, it would report type error.
2012-11-27 15:11:43 +08:00
bd025c94c3
use macro CC_TARGET_OS_IPHONE instead of TARGET_OS_IPHONE and make xcode template work ok
2012-11-26 15:08:40 +08:00
a1ebfd9ed8
Don't add CCNode::removeChild to skip field.
2012-11-23 15:12:42 +08:00
36bbd80b68
Adding changes to CCBreader
2012-11-23 15:08:55 +08:00
91b370e0f0
Merge pull request #1639 from minggo/gles20
...
make lua work
2012-11-22 18:38:44 -08:00
542c407346
make lua work
2012-11-23 10:36:26 +08:00
f701248e58
issue #1564 : Updated tools/tojs/cocos2dx.ini.
2012-11-22 17:19:15 +08:00
1a3891970f
Updated tools/tojs/cocos2dx.ini.
2012-11-22 15:35:42 +08:00
b4c1d60e5c
Updated the submodule reference of cocos2d-js-tests and cxx-generator.
2012-11-21 21:26:18 +08:00
635fda446f
Merge pull request #1600 from folecr/jsbindingsfix
...
Don't generate JS bindings for CCTimer::getSelector
2012-11-20 22:25:44 -08:00
33529afc07
Merge pull request #1592 from fape/luaCocos2d
...
fix compile: rename kOrientation to kCCTransitionOrientation
2012-11-19 17:36:25 -08:00
f111602adf
Don't generate JS bindings for CCTimer::getSelector
2012-11-19 15:56:11 -08:00
28ca22bfde
added lua support for linux platform
2012-11-19 14:56:02 +04:00
776567726f
Merge pull request #1578 from thbourlove/patch-1
...
fixed #1566 :Tolua++ will regard the 'cocos2d-2' as package name, but which you want is 'Cocos2d'(input file root name).
2012-11-18 23:00:51 -08:00
f2e0df4de3
issue #1565 : Removed VS2008 support.
2012-11-19 14:42:27 +08:00
355d8df79e
fix compile: rename kOrientation to kCCTransitionOrientation
2012-11-17 19:02:04 +01:00
b95ff53747
Updated cocos2dx.ini.
2012-11-16 16:00:25 +08:00
682faa5870
issue #1530 : Don't export CCUserDefault to js since it has a private constructor. Do it in the future.
2012-11-16 15:58:21 +08:00
bb6df91749
issue #1530 : Exported CCUserDefault to js.
2012-11-16 15:58:18 +08:00
39a4e6a19e
Fixing bindings bug for CCScheduler. Also adding custom bindings for TMXLayer. Also updating ini
2012-11-16 15:56:27 +08:00
5f1476df36
Update tools/tolua++/build.php
...
If you run this:
tolua++ -o LuaCocos2d.cpp /path_to_cocos2d/cocos2d-2.0.3/tools/tolua++/Cocos2d.pkg
tolua++ will regard the 'cocos2d-2' as package name, but which you want is 'Cocos2d'(input file root name).
2012-11-15 19:25:08 +08:00
26af535521
issue #1549 : Updated cocos2dx.ini. Renamed some functions.
2012-11-06 14:19:27 +08:00
0f3e0daeab
Updated the submodule reference of "tools/cxx-generator".
2012-11-06 10:08:48 +08:00
4a6d922ea4
issue #1549 : Updated tools/tojs/cocos2dx.ini.
2012-11-05 18:45:39 +08:00
f88aa5058d
Merge branch 'gles20' of https://github.com/rohankuruvilla/cocos2d-x into rohan-ccb
...
Conflicts:
scripting/javascript/bindings/cocos2d_specifics.cpp
scripting/javascript/bindings/cocos2d_specifics.hpp
tools/tojs/cocos2dx.ini
2012-11-02 18:15:25 +08:00
05b1b7c2c3
Updated cocos2dx.ini. Renamed some methods exported to js.
2012-11-02 15:13:12 +08:00
ea92936c1f
Adding bindings for CCBReader and other improvements.
...
1. Added additional CCBReader bindings, including callback support for animationCompleted
2. Improved design for JS CallbackWrappers
3. Added bindings for pDistance
4. Updating cocos2dx.ini
2012-11-01 00:08:01 -07:00
2fbb748b7c
Adding sections for CCBReader bindings generation as well as renaming other bindings
2012-11-01 00:06:24 -07:00
1538ad4e78
Updated jenkins_scripts/mac/android/generate-js-cxx-bindings.sh.
...
The local repo needs to be updated in Jenkins command before executing this script.
So commented some codes.
2012-10-30 17:54:48 +08:00
8ed7d63309
Updated LuaBindings codes since CCEGLViewProtocol::getSize has been renamed to CCEGLViewProtocol::getDesignResolutionSize.
2012-10-30 10:35:19 +08:00
bf255f6162
Updated jenkins script for auto-gen jsbinding codes.
2012-10-29 18:47:03 +08:00
132d927f18
Updated the submodule of tools/cxx-generator.
2012-10-26 09:57:01 +08:00
ee6e139316
updates cxx-generator
2012-10-18 17:46:10 -07:00
a22c84d3d1
Update examples and documentation
2012-10-15 16:30:03 -07:00
b109c75cef
cd to submodule directory for git operations on submodule
...
* instead of using the --git-dir and --git-worktree options
* cd-ing to the submodule directory seems to behave differently
* ... and more reliably
2012-10-15 16:26:01 -07:00
ae90c09666
Fix order of git operations
2012-10-15 15:58:44 -07:00
689ceec780
Generate pull requests
...
* Commit changes to generated branch of cocos2d-x repo instead of gles20
* Generate pull request from the generated branch to the specified base
2012-10-15 15:58:31 -07:00
93b5667ffe
Exit on error except in the one case where a non-zero return value is expected
2012-10-15 14:27:54 -07:00
5780f0aabd
Diff with origin/master
...
* rather than the default - HEAD
2012-10-15 13:23:44 -07:00
2ded8ea034
Merge pull request #1442 from dumganhar/iss1486-multi-res
...
Multiresolution support
2012-10-15 02:15:21 -07:00
d2ed5567b7
Test for diffs in existing files
...
* before proceeding with committing and pushing changes
* remove "set -e" so that above test makes sense
* verbose git operations where possible
2012-10-14 22:23:31 -07:00
4955c14928
Fix --git-dir parameter for git submodule operations
2012-10-14 22:12:24 -07:00
99a7dcefa4
issue #1486 : Updated lua bindings.
2012-10-12 16:04:26 +08:00
e7ac758b9f
Updating bindings to match cocos2d-html5
2012-10-11 18:45:22 -07:00
57e8c4b304
Updated script behaviour
...
* Auto generated bindings are always pushed to remote repo.
* If a remote repository is not given, exit with failure.
* Updating the submodule reference is not done unless
* ... remote cocos2dx repo is set.
2012-10-10 08:37:54 -07:00
26a5f31f0e
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1469-moonwarriors
2012-10-10 15:25:49 +08:00
bb135e49d1
issue #1469 : Ignored 'getBlendFunc' and 'setBlendFunc' for CCSpriteBatchNode,CCMotionStreak,CCAtlasNode,CCParticleBatchNode,CCLayerColor,CCParticleSystem.
2012-10-10 15:23:13 +08:00
e6622eebd0
Allow partial run of script when cocos2dx remote repository is not set.
...
* Also fix some comments.
2012-10-09 21:36:32 -07:00
e7fea0449f
Merge pull request #1433 from rohankuruvilla/gles20
...
Adding CCSchedule bindings. Also adding CCOrbitCamera bindings and modif...
2012-10-09 18:34:36 -07:00
66d843ce38
Jenkins script for auto-generating and committing JS bindings.
2012-10-09 15:12:15 -07:00
12292afee6
Adding CCSchedule bindings. Also adding CCOrbitCamera bindings and modifying cocos2dx.ini
2012-10-09 15:03:14 -07:00
418fa5301a
add iOS 5.0, 6.0 build targets to jenkins_scripts
2012-09-28 12:00:03 +08:00
d57842bec5
Generate bindings for CocosDenshion's SimpleAudioEngine
...
* Bindings configured to rename SimpleAudioEngine to AudioEngine
2012-09-27 13:39:49 -07:00
c3c1022fb4
Merge pull request #1380 from dualface/gles20
...
[Lua] fix CCActionInterval, CCFiniteTimeAction, CCAction declare
2012-09-25 19:30:04 -07:00
53889c5b3c
Fix comment. No functional changes.
2012-09-25 13:55:06 -07:00
8d104b8244
[Lua] add CCApplication:getTargetPaltform()
2012-09-25 16:43:36 +08:00
a2b468f2b3
[Lua] fix CCActionInterval, CCFiniteTimeAction, CCAction declare
2012-09-25 16:27:54 +08:00
b5cfc3034b
Jenkins script to generate JS bindings
2012-09-24 21:48:12 -07:00
d01b6093d8
gendbings.sh generates userconf.ini
...
* ... and reads userconf.ini from current working directory
* ... also specify that this script is run by /bin/bash
2012-09-24 21:48:12 -07:00
1a6581383c
Spidermonkey headers are not used for generation
2012-09-24 21:48:11 -07:00
74b9e2539b
fix auto building error
2012-09-25 12:13:06 +08:00
5c5544f823
Merge pull request #1363 from walzer/gles20
...
fix ios6 orientation error, which is caused by ios6 api change.
2012-09-23 21:00:30 -07:00
5dfeb46235
move cxx-generator submodule pointer from db61f83 to 40ad793 as Rolando committed.
2012-09-24 11:58:29 +08:00
2ed7b9febe
Merge pull request #1365 from dualface/luafix
...
luabinding bugfix
2012-09-23 20:17:23 -07:00
5b3bb2a087
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
...
Conflicts fixed:
cocos2dx/platform/ios/FontLabel/FontLabel.m
cocos2dx/platform/ios/FontLabel/FontLabelStringDrawing.m
template/xcode4/lib_js.xctemplate/TemplateInfo.plist
2012-09-24 11:03:26 +08:00
8d51c0ed19
fixed #1482 , deal with ios6 orientation in templates/xcode4, with a little refactoring.
...
1. I think you guys haven't tested Xcode templates before 2.0.2 release. The templates are ALL BROKEN because CCHttpClient requires libcurl, which is excluded by xcode4_template_generator/run_generator.sh. It means developers on 2.0.2 would create a new project with compilation error, damn!
2. ios/AppController.*, ios/RootViewController.*, ios/main.m are moved from cocos2dx_*.xctemplate folder to base_ios.xctemplate folder. I don't want to modify tons of RootViewController clones any more.
2012-09-23 22:11:29 +08:00
cbade952f6
Update to latest cxx-generator
2012-09-21 12:07:30 -07:00
5ff4d73688
Use new directives for renaming functions and classes
2012-09-21 11:41:08 -07:00
901146e2ee
Synchronize cocos2dx.ini
2012-09-21 11:41:08 -07:00
bc35e73179
Updating cocos2dx.ini including,
...
1. Adding key "rename_classes"
2. Renaming key "rename" to "rename_functions"
3. Adding CCParticleSystemQuad specific stuff
2012-09-20 18:02:17 -07:00
9e1e64509b
Copying changes previously made into cxx-generator/targets/spidermonkey/common
...
1. Fixed memory leak while removing proxy objects
2. Fixed JS Context restart
3. Added JS conversion for CCArray
4. Updated generated bindings with some more classes
2012-09-20 18:02:17 -07:00
46a8eb5491
[Lua] add ccTexParams, add new luabinding build script, update luabinding
2012-09-20 23:37:23 +08:00
31c6f46b6a
Merge pull request #1329 from dualface/gles20
...
update luabinding for overloaded functions, fix mac CCLuaLog crash ...
2012-09-20 01:11:36 -07:00
93b669b936
Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into gles20
2012-09-20 09:27:45 +08:00
a9305fd4df
Update tools/cxx-generator
2012-09-19 14:00:38 -07:00
92ce4d4783
Update cocos2dx.ini so that the generated bindings and the TestJavascript app compile.
2012-09-19 13:21:26 -07:00
2c1c58eeb9
Update path calculation.
2012-09-18 17:02:21 -07:00
4c1fad1c6c
chmod u+x genbindings.sh
2012-09-18 17:02:21 -07:00
8a688ef424
Script and config file for generating bindings
2012-09-18 17:02:21 -07:00
ded6e3edcf
Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into gles20
2012-09-17 17:55:41 +08:00
eba97a9b1e
[Lua] fix luabinding overloaded functions
2012-09-17 14:40:42 +08:00
c1ab4eab48
fixed #1404 , modify "ant release" to "ant debug" in mac-android-4.x-debug.sh
2012-09-16 16:13:54 +08:00
515ec3c482
ccDrawCircle() add scaleX and scaleY
2012-09-14 18:00:11 +08:00
7c744e785a
fixed #1404 , tweak back to lower case :)
2012-09-14 16:42:44 +08:00
bbb37a4d7c
issue #1404 , case insensitive, oops
2012-09-14 16:41:41 +08:00
6fbeacf750
issue #1404 , add scripts for ci
2012-09-14 16:33:54 +08:00
47f51bf7af
Update tools/jenkins_scripts/mac/ios/build-ios-all.sh
2012-09-13 14:11:09 +08:00
de7969afdf
update jenkins_scripts for build android-ant on windows cygwin
2012-09-13 11:28:12 +08:00
63e279e484
Merge pull request #1308 from walzer/gles20
...
updage tools/jenkins_scripts
2012-09-12 03:29:12 -07:00
ba5f0996ad
update tools/jenkins_scripts/
2012-09-12 18:27:57 +08:00
7d13516056
rename JenkinsScript to more comfortable
2012-09-12 16:00:36 +08:00
a22122d0ed
[Lua] fix: CCCallFunc : public CCActionInstant declare typo error
2012-09-07 19:19:50 +08:00
9d2b0b04f2
[Lua] update luabinding for CCPoint, CCSize, CCRect
2012-09-05 14:49:26 +08:00
dcc8733a53
update tolua++ for mac
2012-09-04 09:56:55 +08:00
c86595ddde
[Lua] remove glLineWidth()
2012-09-02 01:18:28 +08:00
135f2fdabd
remove unused files
2012-09-02 01:13:52 +08:00
6f3833af73
Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into gles20
2012-09-02 00:56:27 +08:00
da79992275
Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into gles20
2012-09-02 00:38:57 +08:00
35f6f937c9
Merge pull request #1271 from mustime/testlua
...
issue #1425 : add NodeTest to TestLua.
2012-09-01 01:52:42 -07:00
382b08a947
fixed #1455 : Adding xcode template for cocos2dx-js. Thank rohankuruvilla .
2012-09-01 10:49:15 +08:00
374232ac88
Adding xcode template for cocos2dx-js
2012-08-31 12:07:58 -07:00
f5506d58e1
issue #1425 : update pkg files and recreate binding
2012-08-31 18:29:44 +08:00
4c3c032ec5
issue #1404 : Updated authority for .sh files. Made them can be executable.
2012-08-31 14:54:10 +08:00
59934dbb6a
issue #1404 : Add ios and mac os test scripts,update python and shell scripts.
2012-08-31 13:37:54 +08:00
748d64ecc0
Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into gles20
2012-08-31 09:47:03 +08:00
e584b94728
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into js
...
Conflicts:
scripting/javascript/bindings/cocos2d_generated.cpp
2012-08-30 20:16:54 +08:00
55a9444186
Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into testlua
2012-08-30 16:45:40 +08:00
5ed3ec14e9
issue #1425 : update pkg and recreate LuaCococs2d.cpp
2012-08-30 15:33:54 +08:00
5b89e8d410
Update cxx-generator to latest version
2012-08-29 14:44:07 -07:00
af79357549
Merge pull request #1258 from John-cdy/gles20
...
issue #1404:Update android script files,and make more notes
2012-08-29 07:49:22 -07:00
56e784701c
issue #1404:Update android script files,and make more notes
2012-08-29 18:23:46 +08:00
64c8ed3398
[Lua] update CCNode:isVisible() and CCNode:setVisible()
2012-08-29 17:51:42 +08:00
66b221dc79
[Lua] update luabinding
2012-08-29 17:32:47 +08:00
c15c96ac28
Merge https://github.com/cocos2d/cocos2d-x into testlua
2012-08-29 17:29:33 +08:00
df25d56cc3
issue #1425 : update pkg for tolua++ binding
2012-08-29 17:10:06 +08:00
8a680c4c06
[Lua] add CCFileUtils:setResourceDirectory()
2012-08-28 18:14:00 +08:00
d7881b7c3a
[Lua] update luabinding
2012-08-28 15:54:19 +08:00
f6a17f69f7
update tolua++ pkg files
...
Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into gles20
2012-08-28 14:53:52 +08:00
f7993b9954
Merge pull request #1250 from mustime/testlua
...
issue #1425 : remove endToLua interface in CCDirector.h, use renaming feature in tolua++ instead.
2012-08-27 23:35:55 -07:00
69679ff545
issue #1425 : remove endToLua interface in CCDirector.h, use renaming
...
feature in tolua++ instead.
2012-08-28 14:28:33 +08:00
76410f4b5b
Merge pull request #1248 from mustime/testlua
...
Testlua
2012-08-27 23:18:22 -07:00
60a64d0eca
issue #1425 : remove the scheduleScriptHandler interface from CCNode
2012-08-28 12:49:43 +08:00
91b9949e4b
issue #1425 : update pkg file
2012-08-28 11:52:22 +08:00
fbf90e2c2c
issue #1425 : fix a error when using ccp in lua
2012-08-28 11:51:45 +08:00
a4f35d4b5c
updates cxx-generator
2012-08-27 08:43:40 -07:00
e98049fd76
adds cxx-generator as a submodule
2012-08-27 08:43:39 -07:00
d1f92b8da4
Merge pull request #1239 from mustime/testlua
...
Testlua
2012-08-27 02:45:29 -07:00
3196b2aa11
issue #1404:Modify monkeyrunner python script.
2012-08-27 15:12:55 +08:00
be116f5352
issue #1425 : update TestLua project
2012-08-27 11:43:47 +08:00
b3b00a5ccd
Merge pull request #1230 from John-cdy/gles20
...
issue #1404:Modify some parameters in script files for windows.
2012-08-26 20:04:51 -07:00
3c9b8cacd4
issue #1404:Modify some parameters in script files for windows.
2012-08-24 10:23:00 +08:00
83606d7691
Merge pull request #1212 from mustime/testlua
...
Testlua
2012-08-23 03:08:25 -07:00
b5483bf6f7
issue #1404 : Add android automated testing scripts for Mac OS and fixed some errors in previous scripts.
2012-08-23 17:21:11 +08:00
ceb5e41ab0
issue #1425 : fixed the problem when using ccBezierConfig to create
...
CCBezierAction
2012-08-23 13:52:12 +08:00
6ed075f09a
issue #1404 : Add android test python script files and modify android compile script files.
2012-08-22 11:08:18 +08:00
d01842a37b
Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into testlua
...
Conflicts:
scripting/lua/cocos2dx_support/LuaCocos2d.cpp
2012-08-22 09:39:21 +08:00
57659d1584
issue #1425 : modifing pkg files for Lua
2012-08-21 18:42:35 +08:00
07ddd43695
issue #1437:make CCApplication::sharedApplication() return pointer
2012-08-21 15:28:43 +08:00
108c7608ec
Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into testlua
2012-08-20 09:33:30 +08:00
920430edf5
issue #1404:Adjust the time of some testcases.
2012-08-17 14:01:13 +08:00
12fb19c2d9
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into testlua
2012-08-17 10:42:52 +08:00
117facdede
issue 1404: Fixed some errors in qtp script.
2012-08-16 18:27:25 +08:00
7bde427b56
issue #1404 Add new object to qtp_ObjectRepository.
2012-08-16 15:23:25 +08:00
a5a4ca9868
issue #1425 : add matrix.pkg
2012-08-16 11:39:47 +08:00
035480c8e0
issue #1404 Now i change the mail recipient to me,and when the test is stable,i will change it back.
2012-08-15 16:25:00 +08:00
6e19e1b592
issue #1404 Modify scripts.mts and build script files.
2012-08-15 15:59:46 +08:00
2dca0d9945
issue #1404 Modify qtp_win32 script.mts.
2012-08-15 15:17:34 +08:00
8ce66142a0
issue #1404 Delete snapshots's files
2012-08-14 16:30:45 +08:00
361b8516c7
issue #1404:Add win32Test project and rename some script files
2012-08-14 15:48:38 +08:00
42208f93aa
issue #1425 : change the interfaces in .pkg files to satisfy the current
...
version
2012-08-10 18:14:04 +08:00
67add089d8
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into testlua
2012-08-10 14:20:21 +08:00
3a758794d7
issue #1425 : reconstruct some interfaces in .pkg files
2012-08-09 12:51:59 +08:00
0f29640310
issue #1425 : reconstruct some interfaces in .pkg files
2012-08-09 12:46:45 +08:00
e6e43029e5
testlua: modified some pkg files
2012-08-06 16:02:49 +08:00
37d84ba6bb
issue #1404:Add new files
2012-08-06 11:59:37 +08:00
3fce97e62e
issue #1404:Modify directory structure
2012-08-06 11:55:05 +08:00
71ada5b0a5
issue 1404:Fixed the problem of rootconfig.sh to modify build_native.sh
2012-08-03 10:42:39 +08:00
f578fc8a90
Issue1404 Modify *.sh files and add xcode4 (debug and release) build scripts,include ios and mac
2012-08-02 14:31:07 +08:00
e8d82c3e77
Modify *.bat files error for android(win32)
2012-07-31 18:01:57 +08:00
935b0bc944
Issue 1404 Modify *.bat files for android(win32)
2012-07-31 17:16:58 +08:00
d831e6feaa
#Issus1404 Modify *.bat scripts for android
2012-07-31 17:13:14 +08:00
24efe50c6e
Issue #1404 Add shell scripts
2012-07-31 13:39:36 +08:00
5dc604ebfc
Issue #1404 Add automatic testing tools
2012-07-26 16:25:54 +08:00
59db9f0c6f
issue #1399:lua building works ok after adjusting directory structure
2012-07-23 17:14:18 +08:00
4eb59cd3d0
issue #1399:xcode template works ok after adjusting directory structure
2012-07-23 17:10:56 +08:00
aba33b5bda
Reverted build_native.sh.
2012-06-28 16:58:32 +08:00
edca0871a6
fixed #1369 : Invoking CCLabelTTF:setPosition(x,y) in lua script causes crash.
2012-06-28 00:05:45 +08:00
a901b0bb12
fixed #1367 : Refactor "createWith***" to "create".
2012-06-27 14:21:29 +08:00
95a2696b6b
fixed #1365 : Some files of Resources folder which is copied by build_native.sh will lost authority in cygwin.
2012-06-26 12:09:23 +08:00
55eca9f516
fixed #1343 : make xcode template work ok
2012-06-22 12:00:27 +08:00
411ae21cee
fixed #1336 : Updated lua bindings.
2012-06-20 11:59:35 +08:00
6d0608d0f1
fixed #1333 : add CCScrollView for iOS
2012-06-18 19:24:47 +08:00
1d0fa4a9aa
fixed #1292 : Updated lua bindings.
2012-06-15 17:26:11 +08:00
bc150ea5a9
fixed #1327 : Exported 'create' method for lua bindings.
2012-06-15 11:46:51 +08:00
4c1ca36aa8
fixed #1326 : The compilation of Hellolua and testjs project was broken after synchronizing to rc2.
2012-06-15 10:51:53 +08:00
37aa196c73
Removed some unused codes.
2012-06-06 14:31:49 +08:00
c596257a6d
Merge pull request #948 from dumganhar/gles20
...
Updated main.cpp for each project of android.
2012-05-30 19:14:41 -07:00
9be586e4ec
Updated main.cpp for each project of android.
2012-05-31 10:13:05 +08:00
a283bfed4f
fixed #1191 : update xcode template
2012-05-31 09:52:39 +08:00
4864640816
fixed #1270 : Re-generated LuaCocos2d.cpp.
2012-05-29 17:25:18 +08:00
19c96632b5
fixed #1176 : Changed linebreak symbol to UNIX format ('\n'),replaced 'tab' with four spaces.
2012-05-29 16:21:23 +08:00
22b2f722b5
fixed #1220 : Using CCString::stringWithContentsOfFile to get string from lua script files.
2012-05-04 14:31:56 +08:00
5fc72581cb
issue #1204 : Removed CCApplication::initInstance.
2012-05-02 17:50:26 +08:00
5c7e7f6563
issue #1194 : Updated ios template.
2012-05-02 12:01:53 +08:00
6f62251bb6
fixed #1190 : Updated some .pkg files.
2012-04-26 14:32:17 +08:00
edfb8c1f9c
issue #1190 : used std::string as key of CCDictionary. Updated CCString.pkg, CCArray.pkg, CCDictionary.pkg.
2012-04-26 11:39:49 +08:00
96a177bd37
issue #1190 : updated some pkg files for lua binding.
2012-04-26 09:34:42 +08:00
230b8a386b
issue #1176 : Changed linebreak symbol to UNIX format ('\n'),replaced 'tab'
...
with four spaces. Also,
1. Used macro NS_CC_BEGIN instead of namespace cocos2d {, NS_CC_END instead
of }.
2. Removed some unused files.
3. Renamed the name of some folders, for example,
"test.android"-->"proj.android" .
2012-04-19 14:35:52 +08:00
783b2fe79b
Removed some unused codes regard to WOPHONE.
2012-04-19 10:46:37 +08:00
e623cd6357
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
...
Conflicts:
cocos2dx/include/CCTexture2D.h
cocos2dx/include/ccMacros.h
cocos2dx/textures/CCTexture2D.cpp
lua/cocos2dx_support/LuaCocos2d.cpp
2012-04-15 15:46:01 +08:00
a05757f741
update for msvc2010
2012-04-09 00:10:12 +08:00
c98dd0cf2d
fixed #948 : remove getIndexOfObject()
2012-02-14 10:49:53 +08:00
bee77a7d9f
issue #973 : add tool for mack
2012-02-10 10:43:36 +08:00
7a96d13fb6
rename all FuncID to Handler
2012-02-07 11:43:29 +08:00
69a7e2a2e3
* change unsigned int CCObject::m_uLuaID -> int CCObject::m_nLuaID, because LUA_INTEGER is int.
2012-02-04 11:34:17 +08:00
6fbf2f1d09
move SelectorProtocol to CCObject
2012-02-03 15:05:29 +08:00
279e915b55
* update tolua++ packages
2012-01-21 01:29:30 +08:00
26ab000906
* tmp
2012-01-21 01:15:05 +08:00
9660bcd165
* merge upstream/master to master
2012-01-20 19:08:21 +08:00
fecd429044
Fixed missing "using namespace cocos2d;" in LuaCocos2d.cpp when using tolua++
...
Added tolua++ for Mac, which was posted on Cocos2d-x forums by Haseeb Yousaf
2012-01-14 11:31:49 +01:00
75216ac9ca
make CCTouchDelegate::touchDelegateRetain() and touchDelegateRelease as pure virtual function
2012-01-11 16:54:14 +08:00
8a05363b05
generate new LuaCocos2d.cpp for new codes
2012-01-04 13:52:58 +08:00
bc52b0dd73
* fix CCAction class
2011-12-25 11:48:37 +08:00
bbad5a4392
* merge upstream/master to master
2011-12-25 11:48:03 +08:00
333342afe2
fixed #892 : update pkg and LuaCocos2d.cpp
2011-12-23 11:10:36 +08:00
318a4c5ba8
merge upstream/master to master
2011-12-17 12:02:24 +08:00
3bf11dba7e
issue #892 : modify pkg for lua
2011-12-07 15:24:03 +08:00
010a386338
* add CCApplication, CCFileUtils to Lua support
2011-12-05 13:57:43 +08:00
442e06e62e
* add CCNode:getPositionLua(), return CCPoint
2011-12-04 11:35:55 +08:00
ffe54c4ce5
* add more Lua property for CCNode, CCSprite
2011-12-04 10:57:20 +08:00
f0e5cd9896
* add Lua property support for CCNode
2011-12-04 10:28:20 +08:00
cf12806558
merge luafix-0.9.2
2011-12-01 22:02:16 +08:00
f860edc744
Merge remote-tracking branch 'refs/remotes/upstream/master'
2011-12-01 22:00:21 +08:00
21af60ee9c
update xcode4 templates
2011-12-01 17:00:30 +08:00
fe7f810096
* make CCEase* working for CCNode:runAction()
2011-12-01 16:55:21 +08:00
2d9e8f065b
* add CCNode:getPositionX(), CCNode:getPositionY(), CCNode:setPositionX(), CCNode:setPositionY()
2011-12-01 14:58:39 +08:00
45fe3b3090
* merge luafix-0.9.2
2011-11-30 21:42:18 +08:00
216ad9b9cb
* merge upstream/master to master
2011-11-30 21:38:20 +08:00
31285fea17
* add Touch & MultiTouches lua support
2011-11-30 21:27:50 +08:00
f693a5a10e
fix type error according the change of CCSprite
2011-11-30 17:49:52 +08:00
ebd381af26
* merge luafix-0.9.2 to master
2011-11-29 19:20:49 +08:00
07a468cec9
* merge LuaSimpleAudioEngine to LuaCocos2d
2011-11-29 17:39:47 +08:00
757f840b47
* update tolua++ .pkg files, add CCScene::registerScriptEventsHandler(), CCScene::unregisterScriptEventsHandler()
2011-11-29 17:12:08 +08:00
c7ee84ccd4
* update tolua++ .pkg files
2011-11-29 15:45:20 +08:00
153774b46d
* merge CCTransitionPageTurn.pkg, CCTransitionRadial.pkg to CCTransition.pkg
2011-11-28 11:27:24 +08:00
7a6253d9aa
* merge cocos2d-1.0.1-x-0.9.2-luafix to master
2011-11-21 16:38:00 +08:00
396568a22e
* merge upstream master -> master
2011-11-21 12:12:13 +08:00
5b696828dc
* update tolua++ .pkg files
2011-11-21 00:30:55 +08:00
ca111e2937
* update tolua++ .pkg files
2011-11-18 20:34:39 +08:00
d48da20b0f
synchrolize to master
2011-11-18 18:53:53 +08:00
zhangbin