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

1297 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