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

371 Commits

Author SHA1 Message Date
samuele3hu d3670644bf Fix compile error for Lua 2014-04-28 14:04:37 +08:00
James Chen cd6fe294b8 Merge pull request #6288 from boyu0/bug4771_move_physicsworld_2_layer 
closed #4771: Move PhysicsWorld to Layer
 2014-04-25 11:52:32 +08:00
samuele3hu 1331fff62c fix the bug that exit layer can’t end SimpleAudioEngine 2014-04-17 10:36:08 +08:00
boyu0 b53961b78d issue $4771: fix lua test and fix some bugs 2014-04-15 13:40:44 +08:00
samuele3hu 249163c32d Update config files for lua bindings-generator and `lua_cocos2dx_manual.cpp` file 2014-04-10 15:52:51 +08:00
James Chen 7cdd041b79 issue #4729: Adds missing include path in cocos2dx_physics.ini 2014-04-10 00:37:42 +08:00
James Chen a2a712bc17 issue #4729: Updates tools/tolua/cocos2dx.ini 2014-04-10 00:36:42 +08:00
samuele3hu a64f44d6b2 Add lua binding for `getOpenGLView` of `Director` 2014-03-27 14:16:20 +08:00
samuele3hu 8b754c6257 Update coco2dx.ini for binding `ProtectedNode` class 2014-03-27 14:08:19 +08:00
samuele3hu ac0ad54433 Modify the config files for bindings-generator to fix the error about “is_ref_class” 2014-03-26 12:58:33 +08:00
Dhilan007 2089dd9ccd update Lua binding for label. 2014-03-14 16:21:56 +08:00
samuele3hu 108928e1a7 Update `bindings-generator` submodule and add auto-binding for the `RichText` 2014-03-13 14:31:07 +08:00
andyque 2c2a5ee38e rename gui to ui 2014-03-12 10:46:49 +08:00
andyque 026ef95b07 add lua ui binding 2014-03-11 18:48:27 +08:00
andyque dcc98ef79f rename cocos2dx_gui to cocos2dx_ui 2014-03-11 18:48:27 +08:00
James Chen 124b18f53a Re-add CocosRobot send bindings glue codes to cocos2d-x repo. 2014-03-10 18:13:39 +08:00
James Chen c2acfea633 issue #4116: Delete non-scripting files. 2014-02-26 21:17:17 +08:00
andyque 6b6f71b043 change script bindings code 2014-02-25 10:18: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
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 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
É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
lihex 69bc32a21d Fix path on use 32bit windows ndk 2014-02-11 10:02:59 +08:00
James Chen c97b6cb197 Uses genbindings.py instead of genbindings.sh and genbindings.bat. 2014-02-10 18:30:22 +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
samuele3hu 1fa2f24bf2 fix:Add the lua binding for ‘Component’ 2014-01-27 17:04:37 +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
lihex 2dc9958475 issue #3781, Should check ndk architechture. 2014-01-23 15:27:00 +08:00
lihex f9b2ead623 Update docs. 2014-01-23 14:14:07 +08:00
lihex b9331a06f9 issue #3781, Fix the path. 2014-01-23 12:08:27 +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
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
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
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
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
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
Dhilan007 fd481d64a0 1.update lua binding configuration for label. 
2.recover old method[createWithTTF]
 2014-01-13 16:32:35 +08:00
Dhilan007 b2038d14d6 update lua binding configuration for label. 2014-01-11 22:55:23 +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
samuele3hu 465aba951c Fix:Remove the ScollView and TableView of extension gui lua binding 2014-01-04 18:36:33 +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
boyu0 0a06d93328 issue #3401: physical lua banding script and auto script 2014-01-02 11:45:11 +08:00
James Chen 591740253d [GUI] Updates scripting binding configure file. 2014-01-01 21:32:54 +08:00
James Chen cf006df9ff closed #2865: Deprecates CCNotificationCenter, uses EventDispatcher instead. 2013-12-31 10:54:37 +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
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 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
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
samuele3hu 4399adc869 issue #3353:Add the DisplayLinkDirector lua binding 2013-12-23 17:31:57 +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 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 8d086f9d02 [scripting] Ignores Director::getRenderer for bindings. 2013-12-18 10:15:42 +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 e32979592a Skips Texture2D::getPixelFormatInfoMap 2013-12-16 13:01:20 +08:00
samuele3hu 89c079009b issue #2790:Resolve some errors of basical conversion functions 2013-12-10 18:01:40 +08:00
samuele3 c2e7299d8f Issue #2790:Add more conversion functions to support templates containers 2013-12-10 11:21:30 +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 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
samuele3 17f74eeb17 issue #2868:Modify armature test samples and add more armature test samples 2013-11-13 18:18:29 +08:00
samuele3 062fb85943 issue #2868:Modify cocos2dx_studio.ini to add more auto-binding class 2013-11-13 10:12:44 +08:00
samuele3 c1d256c159 issue #2868:modify ccs lua test samples 2013-11-12 16:52:03 +08:00
samuele3 482ee5d47f issue #2868:Add more ccs lua test samples 2013-11-12 15:25:47 +08:00
samuele3 06c7d3e96d issue #2868:Add ccd lua test samples 2013-11-11 17:03:43 +08:00
samuele3 286393d28e issue #2868:Add more manual lua binding functions 2013-11-09 22:58:40 +08:00
samuele3 6a1a774303 issue #2868:Config cocoStudio GUI lua binding files and add a few script files 2013-11-07 10:16:02 +08:00
samuele3 61d8f9673c issue #2868:Move armature related lua binding from namespace 'cc' to namespace 'ccd' 2013-11-05 17:34:25 +08:00
samuele3 b445f0824a issue #2868:Bind UI and Scene parser to lua by bindings-generator and add releated test samples 2013-11-05 15:09:51 +08:00
samuele3 80f3a7d57a Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developAssetsManager 
Conflicts:
	build/cocos2d_samples.xcodeproj/project.pbxproj
	cocos/scripting/lua/bindings/LuaScriptHandlerMgr.h
	cocos/scripting/lua/script/Cocos2dConstants.lua
 2013-11-01 17:17:21 +08:00
James Chen daf4e22819 [Bindings] Skip Label::getLettersInfo 2013-11-01 15:34:08 +08:00
samuelhu b0fdb66d2d Modify the all luajit build scripts and let libluajit.a of mac only support 64bit 2013-11-01 14:38:14 +08:00
samuelhu 1f07a659a6 issue #3069:Modify layer lua register and add some compatible lua binding functions 2013-10-31 09:49:04 +08:00
samuelhu be1f17ca0f issue #3037:Add assetsmananger lua binding and a releated test sample 2013-10-22 16:14:49 +08:00
James Chen 5c5f2d84e2 issue #2905: Updating tolua settings. 2013-10-16 16:27:45 +08:00
minggo 9cf7d48d62 include correct path in cocos2dx.ini to generate audio lua binding 2013-10-10 17:04:36 +08:00
samuele3hu 508654738a issue #2768:Modify armature test sample and skip some functions to lua 2013-10-08 15:45:13 +08:00
samuele3hu 4c1bd825af Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into Armature 2013-10-08 10:17:58 +08:00
samuele3hu 068d0140d9 Manual bind the getDescendants function of the SpriteBatchNode class 2013-09-17 17:41:53 +08:00
samuele3hu aa4c90e97a Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into Armature 
Conflicts:
	extensions/cocos-ext.h
 2013-09-14 19:29:36 +08:00
samuele3hu a34ec99014 issue #2784:Add js-binding and lua-binding document 2013-09-13 11:41:20 +08:00
samuele3hu 357466bab2 issue #2768:Add Armature lua binding and releated test samples 2013-09-09 10:20:32 +08:00
samuele3hu 8f338cc209 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2433-lua-bindings-generator-new 
Conflicts:
	tools/tolua/cocos2dx.ini
 2013-08-30 15:21:59 +08:00
James Chen f9872e396c closed #2747: Don't skip cc.Sprite.getDisplayFrame. 2013-08-28 18:17:52 +08:00
samuele3hu 1dabab2ca5 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2433-lua-bindings-generator 
Conflicts:
	scripting/lua/cocos2dx_support/generated/lua_cocos2dx_auto.cpp
	scripting/lua/cocos2dx_support/generated/lua_cocos2dx_auto.hpp
	scripting/lua/cocos2dx_support/generated/lua_cocos2dx_auto_api.js
 2013-08-28 15:35:33 +08:00
samuele3hu 9e071afe09 issue #2433:Add more deprecated function and modify some test 2013-08-28 15:11:19 +08:00
James Chen c2099f5d3e issue #2732: Moving 'scripting/javascript/bindings/generated' to 'scripting/auto-generated'. 2013-08-27 14:50:53 +08:00
James Chen 43a0225267 issue #2732: Deleting tolua/userconf.ini 2013-08-27 14:45:19 +08:00
samuele3hu e557b6b7c2 issue #2433:Add lua deprecated fiel and modify some test samples 2013-08-23 16:12:59 +08:00
samuele3hu 5f6d9815ca issue #2433:Modify platform config and some test samples 2013-08-22 15:06:34 +08:00
samuele3hu bea62800b4 issue #2433:Modify TestLua samples and add some manual binding code 2013-08-22 10:16:57 +08:00
samuele3hu 7a9f1d6804 issue #2433:Modify TestLua samples and some .ini files 2013-08-20 13:44:37 +08:00
samuele3hu 2d5482a0ab issue #2433:Modify cocos2d.ini 2013-08-15 16:14:14 +08:00
samuele3hu f29525bbc6 issue #2433:Modify Testlua sample and add some manual binding functions 2013-08-15 15:51:22 +08:00
samuele3hu 13fd369beb issue #2433:Modify lua binding generator template and releated action test 2013-08-14 21:35:55 +08:00
samuele3hu 980bea8a97 issue #2433:lua binding generator add hello.lua 2013-08-09 10:07:10 +08:00
samuele3hu 200c5de83f issue #2433:lua binding generator 2013-08-07 10:37:20 +08:00
James Chen 904f85e0a8 Adding tools/tolua . 2013-08-05 18:30:36 +08:00