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

1747 Commits

Author SHA1 Message Date
James Chen 0f9ff45778 Re-add bindings-generator submodule. 2014-03-10 17:46:30 +08:00
lm bdd66ee0fd [Jenkins] fix the crash in comment trigger 2014-03-10 16:35:55 +08:00
James Chen 7841bceb2b [jenkins ci] Updates jenkins script 2014-03-10 13:50:14 +08:00
James Chen a5f668a0bf [travis ci] Build testcpp only. 2014-03-10 12:06:33 +08:00
James Chen 286ebb349f [jenkins] Don't gen jsb bindings. 2014-03-10 12:02:29 +08:00
lihex d96c7b4424 update submodule 2014-03-07 14:14:13 +08:00
lm e01319a701 [Jenkins] add linux build 2014-03-07 11:25:35 +08:00
minggo 3d2bf5cc1a Merge pull request #5608 from lmskater/fix-android-build 
[Jenkins] fix android build
 2014-03-07 11:02:47 +08:00
lm c49dc0a044 [Jenkins] fix android build 2014-03-07 10:51:17 +08:00
qiaofeng00oo f44773b5df modify autotest.py 2014-03-06 16:52:34 +08:00
James Chen c2cd349da5 Uses 'generate-tempate-files.py' to generate cocos2dx_files.json 2014-03-06 14:56:46 +08:00
James Chen 58553d67f5 Merge pull request #5583 from dumganhar/develop 
[travis ci] Updates generate-cocosfiles.sh.
 2014-03-06 14:16:21 +08:00
James Chen 5ca25d854f [travis ci] Updates generate-cocosfiles.sh. 2014-03-06 14:10:50 +08:00
James Chen e6e9c5abfb Merge pull request #5581 from dumganhar/develop 
[travis ci] Uncomments '.generate-cocosfiles.sh'.
 2014-03-06 14:02:52 +08:00
James Chen 738a4f5deb Uncomments '.generate-cocosfiles.sh'. 2014-03-06 14:00:48 +08:00
minggo 43d85dc0d7 Merge pull request #5580 from lihex/develop 
rename template config file
 2014-03-06 13:58:39 +08:00
lihex c206384edd rename template config file 2014-03-06 13:56:18 +08:00
James Chen dfdb6c4158 [travis ci] Adds 'for-each-file-in-dir.sh' for generating file list in cocos2d. CocosRobot will send a PR for that change. 2014-03-06 13:54:24 +08:00
lihex 389811d9e5 update submodule 2014-03-05 16:14:56 +08:00
minggo 76961b799a Merge pull request #5538 from minggo/develop 
update console to latest version
 2014-03-04 16:48:33 +08:00
minggo e044cbb12b update console to latest version 2014-03-04 16:47:56 +08:00
minggo a3c2f4336f Merge pull request #5537 from minggo/develop 
update console to latest version
 2014-03-04 16:45:39 +08:00
minggo 224b3220eb update console to latest version 2014-03-04 16:45:02 +08:00
lm 16d872f2e3 [Jenkins] remove unused code 2014-03-04 12:12:04 +08:00
lm e208e1918f [Jenkins] fix the url of repos 2014-03-04 11:50:46 +08:00
lm e0a9020de7 [Jenkins] User regex pattern to parse comment body 2014-03-03 18:36:32 +08:00
lm 2fe329199b Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2014-03-03 18:29:51 +08:00
qiaofeng00oo f2e9ae97e2 modify autotest.py in tools/jenkins-scripts 2014-03-03 17:47:55 +08:00
lm 7650cbc8c1 [jenkins]Add [ci rebuild] command via pr comments 2014-03-03 17:32:29 +08:00
James Chen 7e9a120e25 Fix travis build fails. 2014-02-27 16:23:38 +08:00
minggo 8eea655ae3 remove unneeded tools 2014-02-27 15:29:12 +08:00
CocosRobot 4ff894e9e0 [AUTO][ci skip] : updating tools/project-creator/module/cocos_files.json 2014-02-27 02:29:12 +00:00
James Chen e49b7572e3 issue #4116: Updates jenkins scripts. 2014-02-26 21:47:23 +08:00
James Chen e4837e7f94 issue #4116: Removes script-bindings codes. 2014-02-26 21:34:06 +08:00
James Chen c2acfea633 issue #4116: Delete non-scripting files. 2014-02-26 21:17:17 +08:00
andyque f92301a872 fix jsb munaul bindings error 2014-02-25 10:18:45 +08:00
andyque 6b6f71b043 change script bindings code 2014-02-25 10:18:45 +08:00
CocosRobot 5c0f0ebef6 [AUTO][ci skip] : updating tools/project-creator/module/cocos_files.json 2014-02-24 07:30:47 +00:00
CocosRobot 6ab2547028 [AUTO][ci skip] : updating tools/project-creator/module/cocos_files.json 2014-02-21 04:08:27 +00:00
CocosRobot b88ade5534 [AUTO][ci skip] : updating tools/project-creator/module/cocos_files.json 2014-02-20 12:33:34 +00:00
CocosRobot d70f9f2e7e [AUTO][ci skip] : updating tools/project-creator/module/cocos_files.json 2014-02-20 10:21:26 +00:00
James Chen 50bdbe09b9 Merge pull request #5409 from lmskater/fix_trigger_url 
[Jenkins] fix pending url
 2014-02-20 17:29:45 +08:00
samuele3hu e2596bce8b Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developEventTrigger 
Conflicts:
	tools/tojs/cocos2dx.ini
	tools/tolua/cocos2dx.ini
 2014-02-20 17:20:51 +08:00
lm 98566d193f [Jenkins] fix pending url 2014-02-20 17:08:53 +08:00
CocosRobot 3e86d74a02 [AUTO][ci skip] : updating tools/project-creator/module/cocos_files.json 2014-02-20 08:50:05 +00:00
minggo dd65379066 Merge pull request #5406 from minggo/develop 
update cocos2d-console to latest code
 2014-02-20 16:46:30 +08:00
minggo db8ff41dbb update cocos2d-console to latest code 2014-02-20 15:50:57 +08:00
CocosRobot 2c9a9c0df7 [AUTO][ci skip] : updating tools/project-creator/module/cocos_files.json 2014-02-20 07:34:52 +00:00
samuele3hu 75e1ccf84c close #4094:Modify EGLViewProtocol —> GLViewProtocol and EGLView—> GLView in the cocos2d.ini for js binding-generator 2014-02-20 15:24:06 +08:00
samuele3hu 514112921f close #4094:Add deprected support for EGLView and EGLViewProtocol on the lua binding 2014-02-20 15:10:34 +08:00
James Chen 8fcf172235 issue #4058: Reverts cocos2dx.ini. 2014-02-20 11:13:05 +08:00
James Chen 5164f2bb19 issue #4058: Removes cpp_namespace section in cocos2dx.ini. 2014-02-20 11:09:40 +08:00
James Chen 0ea27d8543 issue #4058: CCObject.cpp -> CCRef.cpp for all platform projects. 2014-02-20 10:56:25 +08:00
James Chen 5e6130c92c issue #4058: Get rid of Object ,rename it to Ref. 2014-02-20 10:53:49 +08:00
samuele3hu ce1656fa8d fix: The lua binding of getPropertiesForGID would lead to compile error 2014-02-19 15:47:45 +08:00
James Chen e1a256d6f1 Merge pull request #5319 from samuele3hu/developDynamic 
issue #3956:Add the conversional functions which are used in the templates of lua binding-generator
 2014-02-19 13:52:08 +08:00
CocosRobot d35f7626a6 [AUTO][ci skip] : updating tools/project-creator/module/cocos_files.json 2014-02-18 08:00:39 +00:00
andyque 143f5975a6 fix cross-platform comiple error 
details:
remove CCActionEaseEx dependency
fix compile errors on android platform
fix a few inproper decalare
fix linux compile error
fix win32 compile error
 2014-02-18 14:22:15 +08:00
James Chen c7b1ab4525 Merge pull request #5362 from ucchen/develop 
closed #4037: fix copy-paste error, all spxxx_to_jsval use lower case;
 2014-02-14 14:17:33 +08:00
ucchen 185ed86214 fix copy-paste error, all spxxx_to_jsval use lower case and add missing data structs getAttachment; 2014-02-14 13:24:56 +08:00
CocosRobot e5ff9e1290 [AUTO][ci skip] : updating tools/project-creator/module/cocos_files.json 2014-02-14 03:19:46 +00:00
James Chen acefa4e237 Merge commit 'refs/pull/5343/head' of git://github.com/cocos2d/cocos2d-x into merge5343 2014-02-14 09:33:42 +08:00
CocosRobot 15dbef99d3 [AUTO][ci skip] : updating tools/project-creator/module/cocos_files.json 2014-02-14 01:26:06 +00:00
James Chen 24c15b6b21 Updates project-creator/config-create/create_config.py. 
Don't print paths to terminal, it is only useful when debugging.
 2014-02-14 09:13:52 +08:00
James Chen c8ec90781c Merge pull request #5351 from heliclei/xcode-scheme 
share xcode build schemes to support xcodebuild command line build
 2014-02-14 09:09:07 +08:00
heliclei 37b372d21e fix build scheme name 2014-02-13 22:42:59 +08:00
James Chen 1cd5ad3626 Updates COMMITTAG 
Skips to build the Pull Request of updating cocos_files.json.
 2014-02-13 13:58:55 +08:00
CocosRobot 14adb36002 [AUTO] : updating tools/project-creator/module/cocos_files.json 2014-02-13 05:48:38 +00:00
James Chen 3ac6f01742 issue #4020: Sorts the elements in cocos_files. 2014-02-13 13:45:50 +08:00
CocosRobot 8b0ed16205 [AUTO] : updating tools/project-creator/module/cocos_files.json 2014-02-13 03:56:58 +00:00
James Chen b5710e04ba issue #4020: Adds execute permission for generate-cocosfile.sh. 2014-02-13 11:52:16 +08:00
James Chen 2fef642300 issue #4020: Typo fix, elif -> if. 2014-02-13 11:42:23 +08:00
James Chen 772cdf5739 issue #4020: Updates before-install.sh. and comment fix in generate-cocosfiles.sh. 2014-02-13 11:38:28 +08:00
James Chen a56b7e4f3f closed #4020: cocos_files.json should be auto-generated by CocosRobot. 2014-02-13 11:33:11 +08:00
ucchen 2c961bdfbf add spine manual binding; 2014-02-13 11:01:54 +08:00
Éloi Rivard 8adca38efa Linux javascript bindings support. 
- Adds Linux javascript test.
- Adds Linux javascript template.
- Adds Travis CI test.
 2014-02-13 01:42:14 +01:00
Éloi Rivard 79e3c05ef1 Minor debugging messages and guards. 
Dependencies installation is skipped on linux distributions that does not use .deb package format.
 2014-02-13 01:25:23 +01:00
Éloi Rivard fa2481bb24 Linux Spidermonkey 27 support. 2014-02-13 01:25:18 +01:00
Éloi Rivard 4272d4fa61 Linux websockets support. 2014-02-13 00:53:51 +01:00
Éloi Rivard 3fb2b61591 Linux local storage support. Depends on libsqlite3-dev 2014-02-13 00:53:51 +01:00
James Chen cd4478f17c Merge pull request #5327 from chuanweizhang2013/jsruntime 
issue #3984: Adds JS runtime and project-creator supports creating JS runtime.
 2014-02-12 18:51:30 +08:00
lm 3cc9235681 [Jenkins] fix build path 2014-02-12 12:49:30 +08:00
chuanweizhang2013 d5aee5eb04 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into jsruntime 2014-02-11 18:08:14 +08:00
James Chen d779aaa967 Defines NDK_ROOT and PYTHON_BIN in top level. 2014-02-11 14:12:13 +08:00
James Chen d8f89b8045 Exports PYTHON_BIN variable. 2014-02-11 14:02:34 +08:00
lihex 69bc32a21d Fix path on use 32bit windows ndk 2014-02-11 10:02:59 +08:00
lm d844f4f251 [Jenkins] use python script instead for auto generating binding 2014-02-10 19:18:27 +08:00
James Chen c97b6cb197 Uses genbindings.py instead of genbindings.sh and genbindings.bat. 2014-02-10 18:30:22 +08:00
chuanweizhang2013 e9dd3d828a issue #3498: commit jsruntime 2014-02-10 18:15:30 +08:00
samuele3hu 67a48c2a85 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developDynamic 2014-02-10 17:41:06 +08:00
samuele3hu 7bf7637f76 issue #3956:update the submodule 2014-02-10 15:20:34 +08:00
lihex b06d54f706 issue #3781, use custom python executeable if PYTHON_BIN defined 2014-02-10 12:50:23 +08:00
lihex 1fbde6d8d5 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into issue#3781 2014-02-10 10:43:16 +08:00
lihex 4be97c1ed8 issue #3781, use python script instead. 2014-02-10 10:36:37 +08:00
James Chen af7a591483 Merge pull request #5304 from heliclei/develop 
fix job trigger url
 2014-02-08 16:10:45 +08:00
heliclei 4c6dea3548 fix job trigger url 2014-02-08 16:08:50 +08:00
James Chen d1a0dd395c Merge pull request #5300 from dumganhar/iss3900-sp-v27 
closed #3900: Upgrades spidermonkey to Firefox v27.
 2014-02-08 14:04:53 +08:00
James Chen 4d60b17a59 Merge pull request #5298 from heliclei/develop 
[jenkins]To add ios build support:fix xcodebuild stackoverflow, add shared build schemes
 2014-02-08 14:04:28 +08:00
James Chen a75004398d issue #3900: Updates cocos2d-console to support spidermonkey v27. 2014-02-08 13:48:38 +08:00
James Chen e7bc7c10e1 issue #3900: Updates bindings-generator. 2014-02-08 10:54:18 +08:00
heliclei c5542d782f fix build path 2014-02-07 21:25:34 +08:00
heliclei 78419adc81 xctool fails to init, use xcodebuild instead 2014-02-07 21:24:48 +08:00
James Chen e0e37424f0 [Travis-CI] Removes openmw ppa since we’re using glfw3 rather than sdl2. 2014-02-07 21:11:30 +08:00
James Chen 5714552458 issue #3900: mozjs-27.0.lib -> mozjs-27.lib for windows. 2014-02-07 15:29:44 +08:00
James Chen 4c2da5d286 issue #3900: mozjs-25 -> mozjs-27 for windows. 2014-02-07 15:16:14 +08:00
heliclei 5a3aeee66f trim payload size to fix xcodebuild stack overflow 2014-02-07 14:57:07 +08:00
Ricardo Quesada 71c53ef0fd ios template compiles OK 2014-02-03 11:32:00 -08:00
WanderWang 5d10310d39 Update README.md 2014-02-03 23:26:40 +08:00
James Chen 667cd04ee6 Update run-script.sh, samples -> tests. 2014-02-01 12:33:15 +08:00
Ricardo Quesada 5fc190b6ed new config file 2014-01-30 19:24:06 -08:00
James Chen 3f8f36df68 issue #3828: Updates travis script. 2014-01-28 16:23:16 +08:00
James Chen 6d491e66cf issue #3828: Updates travis-scripts/run-script.sh 2014-01-28 16:11:54 +08:00
James Chen e83ddec7b8 Merge pull request #5258 from lmskater/create-module-project 
[Jenkins] add create-template-project.py
 2014-01-27 01:42:07 -08:00
lm f6e4f4b44b [Jenkins] rename language to languages 2014-01-27 17:22:24 +08:00
lm 607a060256 [Jenkins] rename module to template 2014-01-27 17:09:14 +08:00
samuele3hu 1fa2f24bf2 fix:Add the lua binding for ‘Component’ 2014-01-27 17:04:37 +08:00
lm 8356afdd0e [Jenkins] add create-module-project.py 2014-01-27 16:46:35 +08:00
lm 2f64c99fe7 [Jenkins] only develop branch build is supported for win7 2014-01-26 18:27:27 +08:00
James Chen a4a010465c Merge commit 'refs/pull/5071/head' of git://github.com/cocos2d/cocos2d-x into merge5071 2014-01-26 16:41:35 +08:00
James Chen 25c7c68cd2 Updates bindings-generator. 2014-01-26 16:20:10 +08:00
James Chen d2893c1e1e Merge pull request #5229 from dumganhar/iss3858-jsclass-log-fix 
closed #3858: Pure JS class which is inherited from cc.Class will trigger an irrelevant log.
 2014-01-25 22:46:56 -08:00
James Chen 952cd1d836 ComController needs to be `extend`ed. Updates cocos2dx_studio.ini. 2014-01-26 14:42:17 +08:00
James Chen 26125f4e26 closed #3858: Pure JS class which is inherited from cc.Class will trigger an irrelevant log. 
Please refer to http://www.cocos2d-x.org/issues/3858.
 2014-01-26 14:41:27 +08:00
Dhilan007 ace3ecb48a update template for add socket files[lua] 2014-01-26 11:28:57 +08:00
James Chen f0b395da3c Merge pull request #5205 from dumganhar/develop 
[JSB] cc.Node.setLocalZOrder -> cc.Node.setZOrder.
 2014-01-23 23:04:00 -08:00
James Chen f1ffb0b753 [JSB] cc.Node.setLocalZOrder -> cc.Node.setZOrder. 2014-01-24 15:02:14 +08:00
lm 232194646d [Jenkins] add win32 build in pull-request-builder.py 2014-01-24 14:40:15 +08:00
lm 7807405138 [Jenkins] fix the url of build description 2014-01-24 12:05:31 +08:00
lm 490c85a388 [Jenkins] add missing double quotes in pull-request-builder.py 2014-01-24 09:50:40 +08:00
James Chen 646dd2f8c5 Merge pull request #5191 from heliclei/develop 
[jenkins]add ios build script
 2014-01-23 08:10:46 -08:00
heliclei 8861a50e65 fix project path 2014-01-23 23:40:08 +08:00
heliclei a28da90c9d add ios build script 2014-01-23 23:30:54 +08:00
lm c82566435a [Jenkins] fix the path in pull-request-builder.py 2014-01-23 19:05:49 +08:00
lm 76066c81d8 [Jenkins] fix the path in gen_jsb_win32.bat 2014-01-23 19:02:19 +08:00
James Chen 41c63e2f4d Merge pull request #5183 from dumganhar/iss3823-fullscreen-glfw 
closed #3823: Fullscreen support for desktop platforms (windows, linux, mac).
 2014-01-23 01:41:41 -08:00
James Chen d980d33d56 issue #3823: install_glfw.sh will not skip if it was installed. Since it will not be updated if we find a new version of glfw. 
BTW, install script will not be invoked in every build after we switch to cmake.
 2014-01-23 01:07:28 -08:00
James Chen 87980456a9 Merge pull request #5180 from lihex/issue#3781 
Should check ndk architechture.
 2014-01-23 00:13:23 -08:00
James Chen 048298c6a0 issue #3823: Updates travis-ci script to use the latest release of glfw (v3.0.4). 2014-01-23 15:57:10 +08:00
lm f364e64e3c [Jenkins] add auto generate bindings for win7 2014-01-23 15:38:26 +08:00
lihex 2dc9958475 issue #3781, Should check ndk architechture. 2014-01-23 15:27:00 +08:00
James Chen f43f3c770b Merge pull request #5179 from lihex/issue#3781 
Update docs for bindings-generator.
 2014-01-22 22:35:40 -08:00
lihex f9b2ead623 Update docs. 2014-01-23 14:14:07 +08:00
James Chen 9bb3444e04 Merge pull request #5176 from heliclei/develop 
[Jenkins]fix jenkins api, get correct build result
 2014-01-22 21:08:20 -08:00
heliclei 9642766c7e correct format 2014-01-23 12:57:18 +08:00
heliclei 67d5ab72d0 fix jenkins api, get correct build result 2014-01-23 12:54:35 +08:00
James Chen 91511840a1 Merge pull request #5175 from lihex/issue#3781 
Fix the path.
 2014-01-22 20:20:08 -08:00
lihex b9331a06f9 issue #3781, Fix the path. 2014-01-23 12:08:27 +08:00
James Chen 9292d92f63 Merge pull request #5143 from pandamicro/develop 
closed #3806: SAXParser was supported with manual binding in JSB
 2014-01-22 19:50:15 -08:00
James Chen aba15dfc2d Merge pull request #5172 from dumganhar/use-unified-cceglview 
Using unified 'desktop/CCEGLView.h/cpp' for Windows platform too.
 2014-01-22 19:23:44 -08:00
James Chen 8bcdb0ace0 Merge pull request #5173 from lihex/issue#3781 
Don't set a default PYTHON_ROOT & NDK_ROOT for user on Windows
 2014-01-22 19:22:24 -08:00
James Chen bb650729c3 Updates cocos_files.json. 2014-01-23 11:08:10 +08:00
lihex ecdd64a889 issue #3781, Don't set a default PYTHON_ROOT & NDK_ROOT for user on Windows. 2014-01-23 10:48:03 +08:00
James Chen 3829a1aa46 Merge pull request #5166 from heliclei/develop 
[jenkins]add post build script
 2014-01-22 18:47:43 -08:00
Ricardo Quesada ae09cce83f updated template for Linux 2014-01-22 14:32:40 -08:00
heliclei 04ee67481a set pr status at post build stage 2014-01-23 00:21:58 +08:00
pandamicro 913360e526 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2014-01-22 22:32:44 +08:00
pandamicro d6df71cc11 Fixed #3806: Change parameters to const & 2014-01-22 22:31:26 +08:00
heliclei e12e80298d update github api url and jenkins job trigger url 2014-01-22 15:23:29 +08:00
James Chen f3233cba61 Merge pull request #5150 from lihex/issue#3781 
issue #3781: Update script for each platform bindings generating.
 2014-01-21 19:57:19 -08:00
heliclei d7f1dfbe14 do not mix github access token with jenkins job trigger token 2014-01-22 11:35:25 +08:00
lihex 3b9d4c7a39 issue #3781, Update travis-scripts, llvm-installing parts no need now. 2014-01-22 11:28:53 +08:00
lihex b2a1cd90eb issue #3781, Minor fix & update submodule. 2014-01-22 10:58:02 +08:00
lihex 40f5c31a50 issue #3781, Undefine the __MINGW32__ macro to fix the script error on windows 2014-01-21 18:32:27 +08:00
pandamicro 3de7ed93f9 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 
Conflicts:
	cocos/scripting/javascript/bindings/cocos2d_specifics.cpp
 2014-01-21 18:18:32 +08:00
pandamicro a467fe3244 Fixed #3806: SAXParser supported with manual binding in JSB 2014-01-21 18:12:12 +08:00
lihex 56654c0ffb issue #3781, js not generate cocos2dx physics now. 2014-01-21 18:09:21 +08:00
lihex 1a6b36184d issue #3781, Add windows bat script. 2014-01-21 17:48:49 +08:00
lihex a392a709cd issue #3781: Fix the variable name. 2014-01-21 17:40:20 +08:00
lihex 0109ebd707 issue #3781, Update genbinding script to fit new bindings-generator. 2014-01-21 16:53:07 +08:00
James Chen 8eca8e25cb Merge pull request #5099 from samuele3hu/test-rebase 
close #3626:Make lua bindings-generator support the namespace binding
 2014-01-17 06:07:45 -08:00
lm 38e7f01ee8 decode 'payload' to utf-8 and ignore invalid bytes 2014-01-17 17:13:33 +08:00
James Chen 31199183b2 Merge commit 'refs/pull/5086/head' of git://github.com/cocos2d/cocos2d-x into new-label-atlas 2014-01-17 11:10:04 +08:00
samuele3hu 508d786fa7 issue #3626:Update the submodule 2014-01-17 10:19:58 +08:00
samuele3hu d086f7a259 issue #3626:Add the deprecated support for the tolua.cast 2014-01-17 10:19:57 +08:00
samuele3hu de698aaea7 issue #3626:Add lua binding for ScollView and TableView classes in the cocos2d::extension namespace and the related test cases 2014-01-17 10:19:55 +08:00
Dhilan007 53be67c653 update project file. 2014-01-16 18:12:53 +08:00
heliclei 925a4f0f30 add reopen support 2014-01-16 16:22:04 +08:00
heliclei 9de4c4fa70 [jenkins]add job trigger,to update github pull request status instantly 2014-01-16 15:16:12 +08:00
James Chen 2e7516c582 Merge pull request #5041 from Dhilan007/develop_label 
closed #3630:Uses a struct of TTF configuration for Label::createWithTTF  to reduce parameters and make this interface more easily to use.
 2014-01-15 18:37:40 -08:00
James Chen f62c041886 Compilation fix: Updates cocos_files.json and removes unused in template. 2014-01-16 10:27:35 +08:00
Luis Parravicini 21c4b2c893 fixes #3720 2014-01-15 19:44:57 -03:00
Ricardo Quesada b3f306e742 Ignore getFullPathCache() in FileUtils 2014-01-14 18:30:51 -08:00
boyu0 de30a9cfea issue #3401: add lua physics slide test, add more banding code, and fix some bugs. 2014-01-14 15:48:44 +08:00
James Chen 815cea3d7b Merge pull request #5044 from Pisces000221/patch-1 
Corrected a few mistakes in project-creator README
 2014-01-13 22:52:34 -08:00
Nite Luo 37522c61c3 Make the ui look a bit better 2014-01-13 11:54:33 -08:00
Nite Luo 2e127f819b Add Polish the labels for project creator ui 2014-01-13 11:37:44 -08:00
Dhilan007 fd481d64a0 1.update lua binding configuration for label. 
2.recover old method[createWithTTF]
 2014-01-13 16:32:35 +08:00
James Chen 5dedd085c8 Merge pull request #5032 from heliclei/develop 
rename ghprb.py to pull-request-builder.py
 2014-01-12 17:43:40 -08:00
Pisces000221 09f23c1bcb Corrected a few mistakes in project-creator README 2014-01-12 14:38:09 +08:00
Dhilan007 b2038d14d6 update lua binding configuration for label. 2014-01-11 22:55:23 +08:00
Dhilan007 69c004108b issue#3630:Adjust some method for more easily create and change type. 2014-01-11 22:33:07 +08:00
heliclei b4a4b70e22 rename ghprb.py to pull-request-builder.py 2014-01-10 17:45:28 +08:00
James Chen b454bf01e3 Merge pull request #5002 from heliclei/develop 
support [ci skip] in commit message
 2014-01-08 20:53:19 -08:00
heliclei 007a64e50e support [ci skip] command 2014-01-09 12:47:46 +08:00
heliclei 2b7aa26308 fix create job state 2014-01-09 10:56:33 +08:00
James Chen 2de06a9655 Merge pull request #4993 from heliclei/develop 
add auto generate bindings
 2014-01-08 01:55:10 -08:00
heliclei 6cbf69306c remove unnessesary chmod and ls command 2014-01-08 16:51:37 +08:00
heliclei 13fab57ce2 remove debug print 2014-01-08 16:27:08 +08:00
heliclei f7a0e7da1a add auto generate bindings 2014-01-08 16:21:11 +08:00
James Chen b07acb6c12 [JSB] Supports cc.ScrollView.extend, cc.TableView.extend, cc.TableViewCell. 2014-01-07 22:17:22 +08:00
James Chen e25c4b5f4d [JSB] Armature should be able to be extended in JS. 2014-01-07 20:55:07 +08:00
James Chen 849b522924 Merge pull request #4962 from Dhilan007/develop_crash 
update bindings-generator submodule
 2014-01-07 01:41:47 -08:00
Dhilan007 3cab3e5df3 update bindings-generator submodule 2014-01-07 17:19:29 +08:00
samuele3hu b19bda1588 Fix:Update cocos_files.json file 2014-01-07 16:49:51 +08:00
James Chen da17c6b05b Merge pull request #4954 from heliclei/develop 
[Jenkins]fix symbol link create error
 2014-01-07 00:35:16 -08:00
heliclei 05f6fedd1e fix windows symbol link path error 2014-01-07 16:27:23 +08:00
James Chen f5ae2bbacc Merge pull request #4932 from boyu0/iss3401_physical_lua_binding 
issue #3401: physical lua binding
 2014-01-06 23:48:47 -08:00
heliclei 5dadbce813 fix symbol link create error 2014-01-07 15:41:18 +08:00
James Chen 37b6ef99e3 Wrong dir fix for travis ci. 2014-01-06 20:04:30 -08:00
James Chen 2f7c41bd28 [travis] builds linux template now. 2014-01-06 19:42:51 -08:00
boyu0 cf146b32cf Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss3401_physical_lua_binding 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
	cocos/scripting/lua/bindings/CCLuaStack.cpp
	cocos/scripting/lua/script/Cocos2d.lua
	cocos/scripting/lua/script/Cocos2dConstants.lua
 2014-01-07 10:16:44 +08:00
heliclei 4c2fe530f9 fix post data format 2014-01-06 22:24:47 +08:00
boyu0 eaa3041a97 issue #3401: physical lua banding script, add testlua->physics test 2014-01-06 22:19:40 +08:00
heliclei bc5303f6f2 build all android targets 2014-01-06 20:58:00 +08:00
samuele3hu 2949ab754f Fix:Regeneration cocos_files.json 2014-01-06 20:11:44 +08:00
samuele3hu 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
samuele3hu f36d4a9236 Fix:Resolve the lua android template errors 2014-01-06 19:59:31 +08:00
user 16bff3da1c add 755 2014-01-06 01:31:36 -05:00
chuanweizhang 07e51e2c86 test template lua 2014-01-06 14:24:33 +08:00
samuele3hu 465aba951c Fix:Remove the ScollView and TableView of extension gui lua binding 2014-01-04 18:36:33 +08:00
James Chen 7a53ec12ee Merge pull request #4870 from heliclei/develop 
use print_exc() instead of format_exc()
 2014-01-04 00:50:13 -08:00
heliclei 6e1c508960 use print_exc() instead of format_exc() 2014-01-04 16:25:31 +08:00
cw 556a6436bd modify 644 —>755 2014-01-04 15:27:39 +08:00
chuanweizhang 5ffc3d9726 modify create_project.py suffix 2014-01-04 14:04:39 +08:00
chuanweizhang accdf5635f modify print message 2014-01-04 13:54:17 +08:00
chuanweizhang 51a6e4fc35 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2014-01-04 13:25:34 +08:00
James Chen 322cf0d233 Fixing CocoStudio bindings error. 2014-01-04 12:11:10 +08:00
Dhilan007 b6e676caa4 fix warn and compiling error in jsb_cocos2dx_studio_manual.cpp. 2014-01-03 23:03:48 +08:00
Dhilan007 b4d392dc38 update js binding for studio change. 2014-01-03 21:33:48 +08:00
chuanweizhang c22cc77c66 add cocos files list configure script 2014-01-03 19:09:13 +08:00
James Chen ac6b72450f Merge pull request #4816 from samuele3hu/developNewUI 
Update the lua test cases about the GUI
 2014-01-02 20:53:19 -08:00
James Chen 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
heliclei 4549760f2c fetch pull request and checkout to a local branch 2014-01-03 10:59:37 +08:00
samuele3hu c4588722dd Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developNewUI 2014-01-03 10:41:03 +08:00
samuele3hu 07a3efb585 Update the lua test cases about the GUI 2014-01-03 10:39:19 +08:00
minggo d345139a08 fix compiling errors 2014-01-02 21:53:18 +08:00
James Chen d8186a1d3c Merge pull request #4769 from heliclei/develop 
update exception catch clause
 2014-01-02 05:35:07 -08:00
heliclei e43ca98a94 get the correct branch 2014-01-02 19:08:22 +08:00
heliclei 48579fe3ac remove debug code 2014-01-02 17:25:29 +08:00
heliclei 8eeb32c98c remove debug code 2014-01-02 17:22:23 +08:00
heliclei b1714d74e5 refining exception handling 2014-01-02 17:09:49 +08:00
James Chen 3e044cf90e Updates tools/tojs/cocos2dx_gui.ini. target_namespace from ccs to ccii. 2014-01-02 14:22:00 +08:00
boyu0 0a06d93328 issue #3401: physical lua banding script and auto script 2014-01-02 11:45:11 +08:00
heliclei e944dae338 update exception catch clause 2014-01-02 10:19:48 +08:00
James Chen e5389ddb31 Merge pull request #4765 from heliclei/develop 
Add exception handling
 2014-01-01 06:00:50 -08:00
James Chen 591740253d [GUI] Updates scripting binding configure file. 2014-01-01 21:32:54 +08:00
heliclei 1c0fc7859b 1.Add exception handling 
2.Correct pull request action name
3.Enlarge description text
 2013-12-31 18:29:32 +08:00
James Chen 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
James Chen 75d28a3114 Adds execute permission for create_project.pyw 2013-12-31 16:10:55 +08:00
chuanweizhang 2579573b7e Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-12-31 14:58:37 +08:00
minggo 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
James Chen cf006df9ff closed #2865: Deprecates CCNotificationCenter, uses EventDispatcher instead. 2013-12-31 10:54:37 +08:00
heliclei 62a0828f5b remove other non-functional jenkins scripts 2013-12-30 22:03:22 +08:00
heliclei 7696a5f2cc move ghprb.py to tools/jenkins-scripts/ 2013-12-30 21:40:28 +08:00
cw 437c6545da fix linux error not Tkinter 2013-12-30 18:35:08 +08:00
chuanweizhang 991db80198 reset 2013-12-30 15:21:25 +08:00
chuanweizhang 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
chengstory cfbbb7889b Merge branch 'develop' into #3457 
Conflicts:
	cocos/editor-support/cocostudio/CCSGUIReader.cpp
 2013-12-26 23:01:34 +08:00
chengstory bd8f32e1a6 fixed #3457 fixes failed to build android. 2013-12-27 06:33:42 +08:00
James Chen 31188710a0 Updates Bindings-generator. 2013-12-26 22:14:48 +08:00
chengstory d9ba53f9a9 o my god. 2013-12-26 17:55:46 +08:00
chengstory bd46681867 fixed #3457 continue to fixes failed to build. 2013-12-26 17:37:02 +08:00
James Chen 5dfb7f321a Compilation fixes after merge PR #4669 https://github.com/cocos2d/cocos2d-x/pull/4669 2013-12-26 16:03:30 +08:00
chuanweizhang 911c7eae10 modify license time 2013-12-26 14:49:06 +08:00
James Chen df690e8f8b Updates bindings config files. 2013-12-26 12:50:37 +08:00
chuanweizhang 0343f55dc7 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-12-26 10:23:00 +08:00
chuanweizhang 23192a883c modify linux tempalte 2013-12-25 18:32:23 +08:00
chuanweizhang 02e139f1da Reverts bindings-generator reference. 2013-12-25 18:16:59 +08:00
chuanweizhang 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
samuele3hu 9cf45a292b Delete some annotated statement about spine and add some reserve manual lua binding functions 2013-12-25 16:42:40 +08:00
chuanweizhang 017fb550b7 add README.md 2013-12-25 16:34:23 +08:00
chuanweizhang c53537e7c2 modify create_project 2013-12-25 15:53:47 +08:00
samuele3hu 9fd64df099 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into Spine 2013-12-25 13:48:10 +08:00
samuele3hu 45cfe00ec4 Modify iOS project set and some manual lua binding 2013-12-25 13:47:22 +08:00
James Chen 538da31773 Removes CC prefix for CCSkeleton and CCSkeletonAnimation. Adds namespace `sp` for JSBindings. 2013-12-25 11:18:14 +08:00
chuanweizhang 94420563b3 ingore .git 2013-12-25 11:12:06 +08:00
chuanweizhang 2989e9b46d adapt ui 2013-12-25 10:24:46 +08:00
James Chen d33b2c41c7 Merge branch 'develop' into data-refactor 
Conflicts:
	tools/tolua/cocos2dx.ini
 2013-12-24 16:24:17 +08:00
samuele3hu e497f823ea Merge branch 'lua_spine_dev' of https://github.com/edwardzhou/cocos2d-x into Spine 2013-12-24 16:14:10 +08:00
chuanweizhang 1ce75bb444 modify ui 2013-12-24 15:07:51 +08:00
James Chen 451d76f6b0 Merge pull request #4611 from dumganhar/spine-test 
Merge PR #4572, Spine JS test support.
 2013-12-23 22:55:58 -08:00
samuele3hu 98e4e802f4 Support pass by value for setPosition\setAnchorPoint\setContentSize for lua binding 2013-12-24 13:42:32 +08:00
Edward Zhou 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
chuanweizhang 2308e94c2f modify template 2013-12-24 09:42:37 +08:00
James Chen 05f6a5b09b Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into spine-test 2013-12-23 22:05:20 +08:00
James Chen 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
James Chen d6850c363a Updates Bindings-generator. 2013-12-23 22:00:11 +08:00
James Chen 3327614a99 Binds Node::setAnchorPoint manually. 2013-12-23 21:54:02 +08:00
James Chen 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
James Chen cafebe7295 Merge commit 'refs/pull/4572/head' of git://github.com/cocos2d/cocos2d-x into spine-test 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
 2013-12-23 20:28:51 +08:00
James Chen b3cc7d7e68 Bindings-generator skips Node::setContentSize. Binds it manually. 2013-12-23 20:25:11 +08:00
samuele3hu 4399adc869 issue #3353:Add the DisplayLinkDirector lua binding 2013-12-23 17:31:57 +08:00
James Chen 46cc91be3b Updates bindings-generator, skips to bind override functions. 2013-12-23 16:41:17 +08:00
James Chen 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
James Chen 366c4ca9fb Updates tools/tojs(tolua)/cocos2dx.ini. 2013-12-23 11:48:22 +08:00
samuele3hu 50bcdee725 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into NewEventDispatcher 2013-12-22 22:11:17 +08:00
samuele3hu 97f26176e8 issue #3403:Add the EventDispatcher lua binding and the releated test cases 2013-12-22 22:10:21 +08:00
James Chen 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
byeonggee.seo 0a30a9a604 spine simple JS binding supported 2013-12-20 16:10:15 +09:00
James Chen 755d29b0e1 Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into more_container_bind 2013-12-19 20:17:54 +08:00
James Chen 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
James Chen 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
boyu0 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
James Chen c14754b720 Updates submodule of bindings-generator. 2013-12-19 11:50:45 +08:00
samuele3hu 55830c3023 Add support for unsigned short 2013-12-18 13:47:59 +08:00
James Chen 8d086f9d02 [scripting] Ignores Director::getRenderer for bindings. 2013-12-18 10:15:42 +08:00
James Chen 37f408f2b9 Merge pull request #4506 from Dhilan007/ushort_jsb 
add API for transform unsigned short
 2013-12-17 02:20:56 -08:00
Dhilan007 0414926b52 add API for transform unsigned short 2013-12-17 18:17:04 +08:00
James Chen 8ab4537f73 issue #2171: Binds New renderer classes, ignores NewTextureAtlas. 2013-12-17 15:41:26 +08:00
James Chen a3cf2d8f7f issue #2171: Ignores Director::getFrustum. 2013-12-17 15:02:08 +08:00
James Chen ce96725f83 Removes FileUtils::getFileData binding. 2013-12-16 14:14:12 +08:00
James Chen 464054d251 Updates Bindings-generator. 2013-12-16 13:01:20 +08:00
James Chen e32979592a Skips Texture2D::getPixelFormatInfoMap 2013-12-16 13:01:20 +08:00
boyu0 23af9dfd8d issue #3162: reset submodule 2013-12-13 18:15:59 +08:00
boyu0 b5bf9fb448 issue #3162: change js/cocos2dx.ini 2013-12-13 14:44:44 +08:00
boyu0 c8c0e2270e issue #3162: deprecated RGBAProtocol, NodeRGBA and LayerRGBA 2013-12-13 10:10:49 +08:00
boyu0 d7106d49be Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into bug3162_opacity_incorrect 2013-12-12 17:04:21 +08:00
samuele3hu cc2323b636 issue #2790:Open travis support 2013-12-10 18:26:10 +08:00
boyu0 a71394b122 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into bug3162_opacity_incorrect 2013-12-10 18:03:41 +08:00
samuele3hu 89c079009b issue #2790:Resolve some errors of basical conversion functions 2013-12-10 18:01:40 +08:00
samuele3hu 883ecaa03f Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developConversion 2013-12-10 16:07:58 +08:00
samuele3hu 1ed8d108f7 issue #2790:Update binding-generator 2013-12-10 15:21:21 +08:00
minggo 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
samuele3 c2e7299d8f Issue #2790:Add more conversion functions to support templates containers 2013-12-10 11:21:30 +08:00
James Chen ad5daeb962 issue #2790: Don’t bind CCBAnimationManager::addNode. 2013-12-09 17:55:56 +08:00
James Chen 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
James Chen c916377970 issue #2790: Comments building template for android. 2013-12-06 17:23:31 +08:00
James Chen 7aff958063 issue #2790: A typo fix. 2013-12-06 17:09:36 +08:00
James Chen ed7c3f717a issue #2790: Travis-ci builds JSB projects again. 2013-12-06 16:49:17 +08:00
James Chen b5978eeee6 issue #2790: Bindings-generator supports binding Vector<T> and some bug fixes. 2013-12-06 16:46:19 +08:00
James Chen 68e376db2f issue #2790: Disables build lua projects for linux 2013-12-05 11:51:09 +08:00
James Chen 856a82d4b8 issue #2790: Don’t build script bindings projects for travis. 2013-12-05 11:03:22 +08:00
samuele3 c1a226686f issue #3309:Modify some deprecated cpp files and lua files 2013-12-04 15:15:55 +08:00
samuele3 a8c1bba464 issue #3309:Add some deprecated functions and classes to support master cocostudio lua bindings 2013-12-03 15:40:59 +08:00
James Chen 216f8743b0 closed #3288: Updates bindings-generator. 2013-11-27 14:04:53 +08:00
minggo 6c7cb0bf23 Merge pull request #4359 from Dhilan007/androdi_build 
[ci skip]add proceed java compilation and generate apk.
 2013-11-26 01:47:14 -08:00
James Chen 03005173b1 issue #3258: Updates bindings-generator. 2013-11-26 15:45:09 +08:00
James Chen 6f67447b5e issue #3258: Updates cocos2dx.ini. Adding some classes to ‘classes_need_extend’ section. 2013-11-26 15:43:39 +08:00
Dhilan007 881d43fe3b add proceed java compilation and generate apk. 2013-11-26 11:58:01 +08:00
Dhilan007 c09f50e3f8 issue #3261:add miss binding 2013-11-24 22:47:29 +08:00
James Chen 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
Dhilan007 ce0a6d5b57 fix miss bind setGrid\getGrid for JS. 2013-11-19 10:33:11 +08:00
minggo 593c0f8946 Merge pull request #4304 from Dhilan007/di3223 
[ci skip]issue #3223:bind gui and studio
 2013-11-18 02:28:53 -08:00
minggo 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
Dhilan007 6217641105 add miss bind 2013-11-18 18:00:42 +08:00
Dhilan007 8b14575d7e bind gui and studio. 2013-11-18 16:54:52 +08:00
James Chen 102703703b issue #3215: Updating comments for this tool. 2013-11-16 23:09:45 +08:00
James Chen fd72836e20 issue #3215: Comments add_namespace type in “all” mode. 2013-11-16 23:02:33 +08:00
James Chen 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
lite3 8d24960bb2 fix path for windows 2013-11-15 18:05:24 +08:00
minggo 0f3cb95f58 Merge pull request #4028 from lite3/develop 
[ci skip]add options for android_mk_generator
 2013-11-13 19:21:58 -08:00
samuele3 17f74eeb17 issue #2868:Modify armature test samples and add more armature test samples 2013-11-13 18:18:29 +08:00
samuele3 062fb85943 issue #2868:Modify cocos2dx_studio.ini to add more auto-binding class 2013-11-13 10:12:44 +08:00
samuele3 f429c4c632 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCCS 2013-11-12 17:51:33 +08:00
samuele3 cb51df7d65 Update bindings-generator 2013-11-12 17:31:24 +08:00
samuele3 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
samuele3 18bc96096c Resolve some warning and modify uint32_t to long 2013-11-12 17:18:51 +08:00
samuele3 c1d256c159 issue #2868:modify ccs lua test samples 2013-11-12 16:52:03 +08:00
samuele3 cfb1cfdf65 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCCS 
Conflicts:
	cocos/editor-support/cocostudio/CCSGUIReader.h
 2013-11-12 15:30:36 +08:00
samuele3 482ee5d47f issue #2868:Add more ccs lua test samples 2013-11-12 15:25:47 +08:00
James Chen 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
samuele3 7cfe890d5d Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCCS 2013-11-11 17:04:37 +08:00
samuele3 06c7d3e96d issue #2868:Add ccd lua test samples 2013-11-11 17:03:43 +08:00
James Chen 22584ca9c2 Updating submodule of bindings-generator. 2013-11-11 16:50:07 +08:00
James Chen 272afaa7d9 Updating Bindings-generator. 2013-11-11 15:57:15 +08:00
James Chen 8f8d0f86d7 Updating Bindings-generator. 2013-11-11 14:38:12 +08:00
Luis Parravicini 90df6fc763 fixed typos 2013-11-10 08:25:01 -03:00
samuele3 fa1a5c3735 Add conversion config for long type 2013-11-10 11:03:27 +08:00
samuele3 d4dbc7a442 Add conversion config for long type 2013-11-10 09:21:33 +08:00
samuele3 e26fe04deb Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCCS 2013-11-09 23:04:11 +08:00
samuele3 286393d28e issue #2868:Add more manual lua binding functions 2013-11-09 22:58:40 +08:00
lite3 a3797e2ebc Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-11-08 21:00:31 +08:00
James Chen 74497e18ec [CMake template] Fix compilation errors. 2013-11-08 18:25:58 +08:00
James Chen eeedab78b2 [LINUX] Adding template CMake files for linux. 2013-11-08 18:13:24 +08:00
samuele3 6a1a774303 issue #2868:Config cocoStudio GUI lua binding files and add a few script files 2013-11-07 10:16:02 +08:00
samuele3 61d8f9673c issue #2868:Move armature related lua binding from namespace 'cc' to namespace 'ccd' 2013-11-05 17:34:25 +08:00
samuele3 b76865c692 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCCS 2013-11-05 15:11:05 +08:00
samuele3 b445f0824a issue #2868:Bind UI and Scene parser to lua by bindings-generator and add releated test samples 2013-11-05 15:09:51 +08:00
James Chen a3a2b0274e Updating submodule of bindings-generator. 2013-11-05 14:23:48 +08:00
James Chen f968169da4 Update run-script.sh 2013-11-04 21:59:03 +08:00
James Chen 6a351711ae [cmake] update run-script.sh 2013-11-04 21:05:29 +08:00
James Chen b1a9843091 [cmake] update run-script.sh 2013-11-04 21:03:09 +08:00
minggo cde79a9724 use -j10 to build android samples 2013-11-04 18:01:42 +08:00
James Chen a823e66f8e Update run-script.sh 
Adding soft-link for `samples/Cpp/SimpleGame/proj.android/obj`.
 2013-11-03 14:36:22 +08:00
minggo d4210c77bb Merge pull request #4058 from samuele3hu/developAssetsManager 
issue #3037:Add assetsmananger lua binding and a releated test sample
 2013-11-01 02:50:47 -07:00
samuele3 80f3a7d57a Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developAssetsManager 
Conflicts:
	build/cocos2d_samples.xcodeproj/project.pbxproj
	cocos/scripting/lua/bindings/LuaScriptHandlerMgr.h
	cocos/scripting/lua/script/Cocos2dConstants.lua
 2013-11-01 17:17:21 +08:00
minggo 915d75ea7c build release version of android samples 2013-11-01 16:44:35 +08:00
James Chen 8e7ed129c5 Update before-install.sh 2013-11-01 15:39:46 +08:00
James Chen daf4e22819 [Bindings] Skip Label::getLettersInfo 2013-11-01 15:34:08 +08:00
samuelhu e93bcca13e Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developHttp 2013-11-01 14:44:21 +08:00
samuelhu b0fdb66d2d Modify the all luajit build scripts and let libluajit.a of mac only support 64bit 2013-11-01 14:38:14 +08:00
James Chen 72d6f8650b Regular expression fix for generate-jsbindings.sh. 2013-11-01 11:50:43 +08:00
James Chen 1d932ae95f Updating travic-ci scripts. 2013-11-01 11:46:02 +08:00
James Chen 0298c338a6 issue #2826: Updating cocos2d-console submodule. 2013-11-01 10:46:06 +08:00
samuelhu 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
James Chen d1b88b0a78 [sp v25] Updating auto-generated and bindings-generated submodules. 2013-10-31 11:15:17 +08:00
samuelhu 1f07a659a6 issue #3069:Modify layer lua register and add some compatible lua binding functions 2013-10-31 09:49:04 +08:00
lite3 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
lite3 51f30a01d5 replace os.path.samefile 
os.path.samefile not work at windows.
 2013-10-30 16:43:19 +08:00
lite3 2e3b3be125 config android_mk_generator 2013-10-29 22:53:01 +08:00
Dhilan007 3305dd1de3 issues #2905:add miss file 2013-10-23 17:05:27 +08:00
samuelhu 5f769b2313 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developAssetsManager 2013-10-22 16:52:44 +08:00
samuelhu be1f17ca0f issue #3037:Add assetsmananger lua binding and a releated test sample 2013-10-22 16:14:49 +08:00
Dhilan007 f11dba586a issue #2905:modification vs-project for folder structure change 2013-10-21 22:09:21 +08:00
James Chen 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
James Chen 5c5f2d84e2 issue #2905: Updating tolua settings. 2013-10-16 16:27:45 +08:00
James Chen 6fba0dd5db issue #2905: [iOS Mac] TestJavascript works now. 2013-10-16 15:43:59 +08:00
Toru Matsuoka de9e831e35 Fix definition of platform for ios and mac. 
Remove unnecessary files
 2013-10-14 20:42:45 +09:00
Toru Matsuoka 613bb89120 Make "rename" setting usable. 2013-10-14 20:19:21 +09:00
minggo 95acb1b9e3 issue #2905: helloworld build ok on android 2013-10-14 14:01:00 +08:00
minggo 4313c46e93 issue #2905:adjust folder structure 2013-10-12 11:22:05 +08:00
minggo 9cf7d48d62 include correct path in cocos2dx.ini to generate audio lua binding 2013-10-10 17:04:36 +08:00
minggo 7b7aabf2de include correct path in cocos2dx.ini to generate audio binding 2013-10-10 16:54:05 +08:00
samuele3hu 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
Dhilan007 20971b0ad2 issues #2895:Synchronize JSB from master to developer 2013-10-08 15:57:34 +08:00
samuele3hu 508654738a issue #2768:Modify armature test sample and skip some functions to lua 2013-10-08 15:45:13 +08:00
samuele3hu 4c1bd825af Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into Armature 2013-10-08 10:17:58 +08:00
James Chen 5673af2b3e Updating Bindings-generator. 2013-09-22 10:23:48 +08:00
minggo bcb171e3c9 fix line end in windows 2013-09-20 22:23:13 +08:00
Ricardo Quesada 4f07dbaece Restores .py file to its original layout 2013-09-19 18:32:47 -07:00
Ricardo Quesada 51834e5291 Xcode template projects fixes 
Updats the xcode project with recommended fixes from Xcode 5.0
 2013-09-19 18:27:11 -07:00
Ricardo Quesada 7ecb9778a3 Product Name is the project name 2013-09-19 18:12:02 -07:00
minggo 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
minggo 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
Huabing.Xu e521d881b2 check glfw has been installed when installing glfw 2013-09-17 23:26:54 +08:00
minggo d488796896 Merge branch 'iss2771_physical' of https://github.com/boyu0/cocos2d-x into merge-physics 2013-09-17 18:14:12 +08:00
Dhilan007 a39e0d8521 Merge branch 'develop' of github.com:cocos2d/cocos2d-x into develop 2013-09-17 18:06:48 +08:00
samuele3hu 068d0140d9 Manual bind the getDescendants function of the SpriteBatchNode class 2013-09-17 17:41:53 +08:00
boyu0 a454e373c7 issue #2771: move include chipmunk and box2d to cpp 2013-09-17 17:39:08 +08:00
Dhilan007 18cea20634 Merge branch 'develop' of github.com:cocos2d/cocos2d-x into develop 2013-09-17 17:14:20 +08:00
boyu0 b5b6406976 issue #2771: edit compile setting. 2013-09-17 17:09:07 +08:00
Dhilan007 5d8ea9f1e5 JSB:manually bind SpriteBatchNode::getDescendants in "cocos2d_specifics.cpp". 2013-09-17 17:03:45 +08:00
boyu0 89ec5edf78 issue #2771: edit compile setting. 2013-09-17 16:42:24 +08:00
samuele3hu 3809a6feed Repair some lua test samples bug and del tool/tolua++ folders 2013-09-17 13:59:48 +08:00
minggo 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
Huabing.Xu 20fde2bcde issue #2808:glfw linux scripts 2013-09-16 10:11:46 +08:00
samuele3hu 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
James Chen 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
James Chen ff24eac21a [dispatcher] Adding new EventDispatcher Test to Makefile and project. 2013-09-13 18:08:00 +08:00
samuele3hu 3a334b7478 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into doxygen 2013-09-13 11:42:04 +08:00
samuele3hu a34ec99014 issue #2784:Add js-binding and lua-binding document 2013-09-13 11:41:20 +08:00
James Chen 24c8438fa6 [Dispatcher] Updating Android.mk, and some refractor. 2013-09-12 17:31:37 +08:00
James Chen ce52997fc2 [Dispatcher] Updating tools/tojs/.ini 2013-09-12 15:34:14 +08:00
James Chen 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
samuele3hu 357466bab2 issue #2768:Add Armature lua binding and releated test samples 2013-09-09 10:20:32 +08:00
minggo 249b4d79a3 Merge pull request #3503 from dabingnn/Iss2460-glfw-refractor 
Iss2460 glfw refractor
 2013-09-05 18:28:31 -07:00
samuele3hu 4f9a9bfe85 issue #2433:Modify ScriptHandlerMgr's enum to enum class and modify some related functions 2013-09-04 22:17:26 +08:00
samuele3hu 5ee2a7e58e issue #2433:Rename pointSize function name as setPointSize and Modify bindings-nerator 2013-08-30 17:15:16 +08:00
samuele3hu 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
Huabing.Xu ef7f51d875 issue #2460: script compile error 2013-08-30 10:29:59 +08:00
Huabing.Xu 0136a2cb0f issue #2460: script compile error 2013-08-30 09:37:48 +08:00
Huabing.Xu 850b5514cf issue #2460: travis scripts 2013-08-29 18:10:12 +08:00
James Chen f9872e396c closed #2747: Don't skip cc.Sprite.getDisplayFrame. 2013-08-28 18:17:52 +08:00
samuele3hu 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
samuele3hu 9e071afe09 issue #2433:Add more deprecated function and modify some test 2013-08-28 15:11:19 +08:00
minggo e41eaf7355 Merge pull request #3495 from shinriyo/shinriyo 
Python2.x 3.x runnable
 2013-08-27 21:06:33 -07:00
shinriyo 498d8d9e6d Python2.x 3.x runnable 
For Python2.x 3.x runnable, I used print()
 2013-08-28 11:53:18 +09:00
James Chen f3e0775cef issue #2732: [travis ci] install llvm for linux. 2013-08-27 22:04:08 +08:00
James Chen 384bf00070 issue #2732: Updating travis script. Linux port needs to generate luabinding codes. 2013-08-27 21:52:06 +08:00
James Chen 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
James Chen 7552a72577 issue #2732: [iOS] Updating the reference of auto-generated binding glue codes. 2013-08-27 16:05:48 +08:00
James Chen c2099f5d3e issue #2732: Moving 'scripting/javascript/bindings/generated' to 'scripting/auto-generated'. 2013-08-27 14:50:53 +08:00
James Chen 43a0225267 issue #2732: Deleting tolua/userconf.ini 2013-08-27 14:45:19 +08:00
minggo faa94fd074 Merge pull request #3482 from minggo/release_unneeded_codes 
Remove unneeded codes
 2013-08-26 23:23:41 -07:00
James Chen 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
samuele3hu c7b0b6791f issue #2433:Update typed function and add some manual binding 2013-08-26 18:09:15 +08:00
minggo 61d82924be update Android.mk to remove deleted cpp files 2013-08-26 18:01:42 +08:00
James Chen 11ea111aff closed #2446: Add a tool to auto export releasing zip file 2013-08-26 16:57:10 +08:00
samuele3hu 6ae80bcaf0 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2433-lua-bindings-generator 2013-08-23 16:14:19 +08:00
samuele3hu e557b6b7c2 issue #2433:Add lua deprecated fiel and modify some test samples 2013-08-23 16:12:59 +08:00
James Chen 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
boyu0 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
boyu0 9e34aae075 closed #2434: Use the origin android.mk files instead use templates 2013-08-22 16:45:40 +08:00
samuele3hu 5f6d9815ca issue #2433:Modify platform config and some test samples 2013-08-22 15:06:34 +08:00
boyu0 83f7835708 issue #2434: Delete unused method dirs and find_files in Android.mk template 2013-08-22 14:03:25 +08:00
boyu0 de68d35f4b closed #2434: change name "android_generator" to "android_mk_generator 2013-08-22 13:49:22 +08:00
boyu0 ad23ec4a0f #closed #2434: refactor LocalVarToAuto.py to use the PathUtils and fix some errors 2013-08-22 13:40:57 +08:00
boyu0 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
samuele3hu bea62800b4 issue #2433:Modify TestLua samples and add some manual binding code 2013-08-22 10:16:57 +08:00
samuele3hu 39686ea503 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2433-lua-bindings-generator 2013-08-20 13:46:26 +08:00
samuele3hu 7a9f1d6804 issue #2433:Modify TestLua samples and some .ini files 2013-08-20 13:44:37 +08:00
shinriyo a188d87142 language option is invalid print mesage 
If we input invalid mistook language option
 2013-08-18 10:13:50 +09:00
boyu0 0823bb144f issue #2517: add the LocalVarToAuto.py script 2013-08-16 15:35:27 +08:00
samuele3hu c8b75a1080 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2433-lua-bindings-generator 2013-08-16 10:13:38 +08:00
samuele3hu 871ed24620 issue #2433:Update submodule and project 2013-08-15 16:51:09 +08:00
samuele3hu 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
samuele3hu 2d5482a0ab issue #2433:Modify cocos2d.ini 2013-08-15 16:14:14 +08:00
samuele3hu f29525bbc6 issue #2433:Modify Testlua sample and add some manual binding functions 2013-08-15 15:51:22 +08:00
samuele3hu 13fd369beb issue #2433:Modify lua binding generator template and releated action test 2013-08-14 21:35:55 +08:00
James Chen 7d3edde8f1 issue #2521: Updating tojs/cocos2dx_extension.ini, bind more CCControls. 2013-08-12 11:23:16 +08:00
samuele3hu 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
James Chen 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
James Chen 59f5353f89 issue #2483: Updating cocos2d-console. 2013-08-07 18:06:31 +08:00
minggo 910215fa89 Merge pull request #3377 from boyu0/iss2345_refactor_ccimage 
issue #2345 refactor CCImage and CCTexture2D
 2013-08-06 23:29:38 -07:00
James Chen 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
samuele3hu 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
samuele3hu 200c5de83f issue #2433:lua binding generator 2013-08-07 10:37:20 +08:00
James Chen 0c4910ee95 Adding tools/tolua . 2013-08-07 10:12:45 +08:00
minggo 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
James Chen 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
James Chen 710b895aaa Updating bindings-generator to the latest version. 2013-08-07 10:02:20 +08:00
boyu0 dc6503f7d4 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2345_refactor_ccimage 2013-08-06 13:37:38 +08:00
boyu0 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
folecr 3176dddc83 Update Android JSON config files and project creation script 2013-08-05 19:29:08 -07:00
James Chen 81fc0069cc Updating travis-script/run-script.sh, don't build template projects for android. 2013-08-06 09:54:23 +08:00
James Chen 77a9c91b3d We has to pass the target to bindings-generator since we have add lua target. 2013-08-05 18:33:13 +08:00
James Chen ec49e7568f Updating bindings-generator, adding lua target. It's not finished. 2013-08-05 18:31:20 +08:00
James Chen 904f85e0a8 Adding tools/tolua . 2013-08-05 18:30:36 +08:00
Éloi Rivard 9dcb6fb80e Multi-resolution emscripten html template. 
Default emscripten html template update.
Minor emscripten warnings.
 2013-08-05 09:24:47 +02:00
James Chen e08b319726 issue #2170: [JSB] Label is abstract class now. 2013-08-05 12:49:57 +08:00
James Chen 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
James Chen 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
minggo 0530109a9f Merge pull request #3178 from boyu0/2345 
Refactor CCImage and CCTexture2D
 2013-07-31 01:21:18 -07:00
Sergey Shambir 7385db5a34 Linux: added SDL2 to travis scripts and install-deps-linux.sh 2013-07-30 23:20:18 +04:00
samuele3hu 3499aafd27 issue #2435:Lua template supports mac port 2013-07-30 09:51:15 +08:00
boyu0 41cac18ae2 edit for lua 2013-07-29 14:04:51 +08:00
boyu0 304d636deb Closed #2345 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into 2345 2013-07-29 11:40:18 +08:00
James Chen bb3ee262b8 Updating README.mdown for the reason of bindings-generator doesn't support windows. 2013-07-29 08:33:10 +08:00
James Chen 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
Timothy Qiu d9020ae80c Use absolute path for json config files. 2013-07-28 22:59:37 +08:00
boyu0 cecfc13bc4 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into 2345 2013-07-27 22:06:30 +08:00
James Chen 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
James Chen 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
samuele3hu faa0b46f57 issue #2426:Add Drawprimitives and DrawNode lua binding and modify releated test sample 2013-07-27 10:42:22 +08:00
samuele3hu a6e514f3d5 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into DrawNode 2013-07-27 00:36:20 +08:00
samuele3hu 016593bd0e issue #2426:Add Drawprimitives.lua and Drawprimitives lua test sample 2013-07-27 00:28:06 +08:00
James Chen 19d9c08c79 issue #2430: Fixing compilation errors for lua and js bindings. 2013-07-26 22:15:30 +08:00
James Chen 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
James Chen ad1d8b667d enum class for LanguageType, Application::Platform 2013-07-26 17:29:06 +08:00
samuele3hu 6b9c7d4ade issue #2404:modify a function name to isSwallowsTouches() 2013-07-26 15:21:19 +08:00
James Chen 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
James Chen 241cf022a4 Fixing Luabinding errors. 2013-07-26 13:50:10 +08:00
James Chen cda727843a Updating bindings-generator. It supports 'enum class' type now. 2013-07-26 11:14:48 +08:00
minggo 5479dbe0b9 remove xcode template 2013-07-26 10:54:20 +08:00
minggo c79f4b8595 add creating project script in root 2013-07-26 10:50:37 +08:00
minggo 10a8c3f23b tools/project-creator -> tools/project_creator 2013-07-26 10:46:18 +08:00
samuele3hu 456a26d7ab issue #2404:Modify tab to spaces 2013-07-25 20:03:58 +08:00
samuele3hu 11d7c9c653 issue #2404:Add more functions to Deprecated.lua and modify some .pkg files 2013-07-25 19:58:59 +08:00
James Chen 653c1f7f8f Merge branch 'releasing' of https://github.com/minggo/cocos2d-x into minggo-releasing 2013-07-25 16:00:45 +08:00
Éloi Rivard 682a1238fa Use of a single emscripten HTML template file. 2013-07-24 17:59:21 +02:00
minggo a76863dd7f add execution permission 2013-07-24 17:50:39 +08:00
minggo 99949331b1 fix error and compilings error in templates 2013-07-24 17:27:29 +08:00
minggo 019246fd51 travis build template too 2013-07-24 17:26:45 +08:00
Jerry Zhang 749e8f96eb typo; more Pythonic 2013-07-23 13:37:17 +08:00
minggo 8660543d77 Merge pull request #3198 from samuele3hu/deprecatedfunc 
issue #2404:Move deprecated functions in Lua
 2013-07-22 00:27:06 -07:00
James Chen c154d66bf0 Updating Bindings-generator. 2013-07-22 13:44:30 +08:00
samuele3hu 510a5912fd issue #2404:Add many functions to Deprecated.lua 2013-07-22 13:42:58 +08:00
samuele3hu 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
samuele3hu 4eb6d7aea4 issue #2404:Modify a comment 2013-07-19 15:38:17 +08:00
samuele3hu 18fa6f2fbd issue #2404:Modify a comment 2013-07-19 15:29:36 +08:00
James Chen 7c7d21dd03 issue #2407: more best practices fixes, more getter and const.. 2013-07-19 14:57:54 +08:00
samuele3hu 90af254fac Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into deprecatedfunc 2013-07-19 14:57:38 +08:00
samuele3hu 3b97353e14 issue #2404:Modify Deprecated.lua and set platform config 2013-07-19 14:57:02 +08:00
James Chen 6ffac07a81 More getter functions: e.g. MenuItemFont::fontSize --> MenuItemFont::getFontSize 2013-07-19 11:08:47 +08:00
samuele3hu 236b675e21 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into deprecatedfunc 2013-07-18 23:29:41 +08:00
samuele3hu 78cd3e561e issue #2404:Move deprecated functions to Deprecated.lua 2013-07-18 23:27:07 +08:00
boyu0 76e05ee802 Merge https://github.com/cocos2d/cocos2d-x into 2345 2013-07-18 17:47:43 +08:00
James Chen d58a7fcce2 closed #2414: Bindings-generator could bind std::function argument now. 2013-07-17 18:09:49 +08:00
James Chen a9eea0a887 issue #2407: Updating jsb_deprecated.js and cocos2dx.ini. 2013-07-17 17:38:03 +08:00
boyu0 70140bb4cb refactor CCImage and CCTexture2D 2013-07-17 17:12:04 +08:00
James Chen 7e4e34d992 [ci skip]Update cocos2dx.ini, don't genergate bindings for DrawNode::listenBackToForeground. 2013-07-17 14:36:10 +08:00
samuele3hu 596eb9df3e issue #2377:Modify tojs/cocos2dx.ini and a function name 2013-07-16 16:45:57 +08:00
samuele3hu 1761669832 issue #2377:Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into ScriptHandlerMgr 2013-07-16 12:47:40 +08:00
James Chen 72d1a074df Updating travis-script/before-install.sh, install gcc4.7 when build linux port. 2013-07-16 11:58:08 +08:00
James Chen de4b231264 closed #2405: Updating bindings-generator, Bindings-generator should not bind deprecated methods. 2013-07-16 10:04:03 +08:00
James Chen 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
samuele3hu c955a559bf issue #2377:Del register/unregister function in .cpp and .h files 2013-07-16 09:55:06 +08:00
James Chen 759831c1d8 issue #2397: Application::sharedApplication --> Application::getInstance. 2013-07-15 16:24:42 +08:00
samuele3hu 80a6811f9f Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into ScriptHandler 2013-07-15 10:39:08 +08:00
samuele3hu 51c3ced4ba issue #2377:Modify the ScripthandlerMgr struct and modify some lua test samples 2013-07-15 10:38:16 +08:00
minggo 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
minggo 98fffdf7fc closed #2393:revert some wrong modification when fix conflicts 2013-07-12 23:58:31 +08:00
minggo 6abe6fce78 closed #2393: fix conflicts 2013-07-12 18:04:32 +08:00
James Chen dda40ce9ab Updating cocos2dx.ini, ignore "FileUtils::purgeFileUtils" for JSB. 2013-07-12 16:49:13 +08:00
James Chen c6b0882766 issue #2397: Updating Lua bindings. 2013-07-12 15:42:14 +08:00
James Chen 33c37f5f9d issue #2397: CCTextureCache:sharedTextureCache --> CCTextureCache:getInstance. 2013-07-12 14:44:24 +08:00
James Chen 4a7e884de8 issue #2397: UserDefault::sharedUserDefault() --> UserDefault::getInstance(), UserDefault::purgeSharedUserDefault() --> UserDefault::destroyInstance(); 2013-07-12 14:34:57 +08:00
James Chen f8cd252c5c issue #2397: sharedNotificationCenter --> getInstance 2013-07-12 14:17:42 +08:00
James Chen 6038d69183 issue #2397: sharedSpriteFrameCache --> getInstance, purgeSharedSpriteFrameCache --> destroyInstance. 2013-07-12 14:12:58 +08:00
James Chen f30ae2ef31 issue #2397: Updating CCAnimationCache.pkg 2013-07-12 13:57:05 +08:00
James Chen 41957f06c9 issue #2397: sharedAnimationCache --> getInstance. 2013-07-12 13:54:56 +08:00
James Chen 853a503d2f issue #2397: Updating bindings configuration. [Lua and JS]. 2013-07-12 13:48:31 +08:00
James Chen 2c1b26acf8 issue #2397: EGLView::sharedOpenGLView() --> EGLView::getInstance() 2013-07-12 13:11:21 +08:00
James Chen 74339b6d0e issue #2397: Updating cocos2d.ini and CCFIleUtils.pkg. 2013-07-12 12:53:20 +08:00
James Chen a678d12615 issue #2397: FileUtils::sharedFileUtils --> FileUtils::getInstance() for all platforms 2013-07-12 12:03:39 +08:00
James Chen 88a28b041e issue #2397: Director::sharedDirector --> Director::getInstance() for all files. 2013-07-12 11:50:36 +08:00
dumganhar 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
dumganhar 8f900d02b8 issue #2300: Removing all 'copyWithZone' pattern. 2013-07-08 23:05:47 +08:00
minggo 87125e4b2a issue #2129:use capital words for static const member variables 2013-07-08 18:11:32 +08:00
minggo 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
James Chen 962207a48a Adding some logs in travis script. 2013-07-08 15:27:49 +08:00
James Chen 466a64ba05 issue #2129: Updating bindings-generator. 2013-07-08 15:25:04 +08:00
James Chen c07eda8894 issue #2129: Updating cocos2dx.ini. 2013-07-08 15:19:46 +08:00
minggo b39e7e205f issue #2129:modify pkg files 2013-07-08 11:34:31 +08:00
James Chen 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
James Chen 9d2152b513 sudo apt-get update before install new packages 2013-07-05 13:45:37 +08:00
James Chen 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
James Chen 62879c3789 issue #2371: Updating CCTexture2D.pkg. 2013-07-04 17:09:23 +08:00
minggo 22e5d12503 Merge pull request #3071 from keirantai/develop 
Regenerated xcode4 templates plist files
 2013-07-03 23:27:50 -07:00
minggo c327bc7906 issue #2373:add const in pkg files 2013-07-04 12:50:17 +08:00
Keiran Tai dde6250159 Regenerated xcode4 templates plist files due to missing few important files and causes compile error 2013-07-04 11:13:15 +08:00
James Chen 28b3028646 Updating bindings-generator. 2013-07-02 18:24:31 +08:00
James Chen d446f90016 close #2285: Updating tools/tojs/cocos2d-x.ini. 2013-07-02 17:48:06 +08:00
James Chen 34871d47af close #2347: Updating tools/tojs/cocos2dx.ini. 2013-07-01 22:34:57 +08:00
James Chen e20356a32d Merge pull request #3037 from boyu0/refactor_2339 
change the useage text
 2013-06-30 23:37:12 -07:00
James Chen 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
boyu0 1156ae4f60 change the useage text 2013-07-01 14:10:14 +08:00
boyu0 2625847a74 closed #2339 refactor checkParams() in create_project.py, use OptionParser to parse the params 2013-07-01 01:04:01 +08:00
boyu0 2cccadeaab closed #2339 refactor checkParams() in create_project.py, use OptionParser to parse the params 2013-06-28 10:12:55 +08:00
James Chen 5ce150a10c issue #2340: Updating submodule of cocos2d-console. 2013-06-27 17:19:22 +08:00
minggo d2940bf4c7 Merge pull request #3008 from minggo/ccx_filesystem 
remove unneeded codes when using assets manager
 2013-06-26 18:53:34 -07:00
minggo 7e26a86e2e issue #2329:not bind CCFileUtils private function 2013-06-26 17:36:31 +08:00
James Chen cde809951a Fixing travis errors for generating JSB glue codes. 2013-06-26 16:57:08 +08:00
James Chen 14208cfda9 Only skip ^visit$ 2013-06-26 16:35:41 +08:00
James Chen e1b1eee46d issue #2313: Ignores `visit` and exposes ClippingNode to JS. [Not finished] 2013-06-26 16:29:45 +08:00
Sam Clegg 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
Sam Clegg 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
Sam Clegg 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
James Chen e96c807087 clang+llvm-3.1 --> clang+llvm-3.3 2013-06-21 21:49:23 +08:00
James Chen e69838ff27 [Travis CI] Removing space for before-install.sh. 2013-06-21 21:40:21 +08:00
James Chen 3cf482bebd Updating bindings-generator. 2013-06-21 21:27:59 +08:00
James Chen 992ea78f53 Using llvm 3.3 and android cxx-stl 4.7. 2013-06-21 21:27:45 +08:00
James Chen 9a7bb8fa84 Removing unused files [tools/lua_project_generator]. [ci skip]. 2013-06-21 11:17:14 +08:00
Sam Clegg 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
James Chen 1b66a98390 Bug fixes for the tool to generate luabindings. 2013-06-20 19:00:23 +08:00
James Chen b37fbfdcc8 Merge pull request #2939 from growingdever/patch-3 
Update create_project.py
 2013-06-20 01:45:23 -07:00
James Chen 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
James Chen 14b07af56c issue #2129: CC_Reader --> _Reader. 2013-06-20 15:08:22 +08:00
James Chen da6af26cd8 issue #2129: Updating cocos2dx.ini. 2013-06-20 14:58:01 +08:00
James Chen 73c167d1b2 issue #2129: Updating submodule of bindings-generator. 2013-06-20 14:56:33 +08:00
James Chen c7456af00e issue #2129: Updating tojs/cocos2d.ini and tojs/cocos2dx_extension.ini. 2013-06-20 14:24:36 +08:00
growingdever 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
James Chen fa21674f6c issue #2301: Updating travis-scripts for emscripten. 2013-06-19 13:15:29 +08:00
James Chen 504a9e714e issue #2300: copy --> clone for luabinding. 2013-06-19 12:08:26 +08:00
James Chen 2c0cc603d1 Merge branch 'master' into develop 
Conflicts:
	extensions/cocos-ext.h
 2013-06-18 10:46:25 +08:00
James Chen ccb67cbcb4 Template fix for iOS Template. 2013-06-17 15:54:12 +08:00
James Chen c0d44cb2e4 fixed #2129: Rename m_iVar to _var, remove CC prefixes. 2013-06-15 14:03:30 +08:00
James Chen c7c7189d90 Fix emscripten bugs. 2013-06-15 12:07:19 +08:00
James Chen 8c671bd0e9 Adding EMCC_DEBUG=1 to debug 2013-06-15 11:52:46 +08:00
James Chen cec360df38 Reverting run-script.sh 2013-06-15 11:43:43 +08:00
James Chen aeb331d3c4 issue #2284: Don't use multiple process to build emscripten since it'll generate errors. 2013-06-15 11:28:31 +08:00
James Chen 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
James Chen 6e8b390094 Updating submodule of bindings-generator(Don't generate jsbinding glue codes for copy constructor.). 2013-06-14 14:15:04 +08:00
minggo cd5bcb87af issue #2284: merge master and fixed some conflicts 2013-06-13 17:54:05 +08:00
James Chen 0d7b7819c2 [travis-ci] Speed up android build. 2013-06-11 11:31:24 +08:00
James Chen 15f5538835 Adding travis-ci build for emscripten port. 2013-06-10 21:57:26 +08:00