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

875 Commits

Author SHA1 Message Date
James Chen 31188710a0 Updates Bindings-generator. 2013-12-26 22:14:48 +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
James Chen df690e8f8b Updates bindings config files. 2013-12-26 12:50:37 +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
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
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
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
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