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

955 Commits

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