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

1109 Commits

Author SHA1 Message Date
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