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

465 Commits

Author SHA1 Message Date
samuele3hu 564ba84e11 Fix:e Add new test case for GlobalZOrder in the TestLua/NodeTest 2014-01-21 23:08:18 +08:00
samuele3hu 77b5d4c772 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developBugFix 2014-01-21 17:52:13 +08:00
samuele3hu 2338d773dc fix:Add the “setZOrder” and “getZOrder” deprecated functions of the Node class in the lua’s script and update the related test cases 2014-01-21 17:51:49 +08:00
samuele3hu da8e208f47 close #3802: Add some manual lua-binding functions for the Lable and update the related test cases 2014-01-21 16:36:29 +08:00
samuele3hu cf857aade2 issue #3626:Modify some files that skipped some modifications because of merge 2014-01-17 11:22:03 +08:00
samuele3hu 5859d3866a issue #3626:Update the lua test cases which used the “tolua.cast” function to add the module name for the second string param 2014-01-17 10:19:56 +08:00
samuele3hu 35d031ea06 issue #3626:Make the lua binding of the WebSocket and the XMLHttpRequest used in lua in the “cc” module 2014-01-17 10:19:56 +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
samuele3hu 811aa69d39 issue #3626:Add namespace’s support for manual lua binding functions for classes related OpenGL and update the related test cases 2014-01-17 10:19:55 +08:00
samuele3hu fdac224a7b issue #3626:Add namespace’s support for manual lua binding functions for classes in the cocostudio and cocos2d::gui namespace 2014-01-17 10:19:55 +08:00
samuele3hu b72f309076 issue #3626:Add namespace’s support for manual lua binding of classes in the cocos2d::extension and cocosbuilder namespace and update the related test cases 2014-01-17 10:19:54 +08:00
zhangbin 536eaca24d closed #3714, Remove configurations which are not necessary in AndroidManifest.xml of aneroid projects. 2014-01-15 17:27:53 +08:00
samuele3hu de5c86a184 Fix:Replace the “setDisplayFrame” function with the “setSpriteFrame” function 2014-01-07 20:39:46 +08:00
James Chen 49ca35fc3d Merge pull request #4956 from dumganhar/move-temp-obj 
Uses CMAKE_BINARY_DIR instead of CMAKE_SOURCE_DIR, all temporary files will be in 'build'  folder.
 2014-01-06 23:58:42 -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
James Chen 2a3481f20c Moves temp files to CURRENT_BINARY_DIR. 2014-01-06 23:44:36 -08:00
James Chen 23012352ce Deletes unused Makefile for linux. 2014-01-06 19:36:13 -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
boyu0 eaa3041a97 issue #3401: physical lua banding script, add testlua->physics test 2014-01-06 22:19:40 +08:00
Dhilan007 4087afaf4e fix compiling error on vs project. 2014-01-06 19:55:29 +08:00
samuele3hu d5d213aa0a Fix:Update the file spelling 2014-01-06 11:19:40 +08:00
samuele3hu 7e279219ff Fix:Resolve the error that CocoStudioSceneTest load resource in android 2014-01-06 11:12:44 +08:00
samuele3hu 465aba951c Fix:Remove the ScollView and TableView of extension gui lua binding 2014-01-04 18:36:33 +08:00
samuele3hu 70ee13e2e1 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developNewUI 2014-01-04 15:46:27 +08:00
samuele3hu 0550ec33ad Fix:Resolve the bugs that some lua test cases can’t run 2014-01-04 15:46:04 +08:00
Dhilan007 35246b0810 fix compiling error and miss file on vs. 2014-01-04 12:25:12 +08:00
James Chen baeacaddfc closed #3579: Bug fix in setTouchEnabledForLayer for luabindings. 
Also fixed lua module error.
 2014-01-04 10:30:11 +08:00
samuele3hu 2b19da00df Update the lua test cases about the armature 2014-01-03 14:51:36 +08:00
samuele3hu 07a3efb585 Update the lua test cases about the GUI 2014-01-03 10:39:19 +08:00
samuele3hu d802518413 Rename Cocos2dStudio.lua to CocoStudio.lua 2014-01-02 15:51:25 +08:00
samuele3hu a2b706c87c Rename some common script files to keep consistent 2014-01-02 15:18:32 +08:00
samuele3hu cc2e6aef63 Add missis “ccs.” prefix 2014-01-02 14:25:15 +08:00
samuele3hu b8d4010ae5 Develop branch adds lua trigger for CocoStudio 2014-01-02 12:00:37 +08:00
Dhilan007 5cc0297748 update describe for support translucency on android 2013-12-30 18:12:43 +08:00
Dhilan007 a5960c3252 recover java activity on android. 2013-12-30 15:58:04 +08:00
samuele3hu ee7aa0f077 Rename EVENT_KEYBOARD_RELEASED and resolve a possible memory leak bug 2013-12-27 12:05:12 +08:00
samuele3hu 6d9e865f15 Delete some ScriptEventType only used to Lua 、adjust the event callback mechanism and rename cc.HANDLERTYP_ related to avoid overlong 2013-12-27 10:35:44 +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 45cfe00ec4 Modify iOS project set and some manual lua binding 2013-12-25 13:47:22 +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
samuele3hu f0dc7f0b15 issue #3403:Modify the registerScriptHandler functions inputparams and some EventData struct info 2013-12-23 11:19:55 +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
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
samuele3hu 4d4b96ba30 issue #3402:Add the new label lua binding and the releated test cases 2013-12-18 11:39:43 +08:00
boyu0 af5f496861 issue #3162: Merge Node and NodeRGBA, fix bug: Child's opacity will not be changed when its parent's setCascadeOpacityEnabled was set to true and opacity was changed. 2013-12-06 18:07:16 +08:00
Marc Lepage 940b0ffd56 Fix typos 2013-11-29 12:09:38 -05:00
minggo bf07077c52 Merge pull request #4361 from Dhilan007/eclipse_build_fix 
[ci skip]Remove something association of CDT Builder,it make 'miss error' in buil...
 2013-11-25 19:37:03 -08:00
Dhilan007 49a1d0ae62 Remove something association of CDT Builder,it make 'miss error' in builders. 2013-11-22 17:41:03 +08:00
samuele3 192deb7952 issue #3228: Reconstruct the Callfunc create method to support std::function and add callFuncND + auto remove lua test case 2013-11-22 11:51:07 +08:00