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

131 Commits

Author SHA1 Message Date
YuLei Liao e22dff0469 * add Lua CJSON module 2011-12-05 13:56:51 +08:00
YuLei Liao fb4582b9fd * add TOLUA_RELEASE macro 2011-12-05 11:38:38 +08:00
YuLei Liao 442e06e62e * add CCNode:getPositionLua(), return CCPoint 2011-12-04 11:35:55 +08:00
YuLei Liao ffe54c4ce5 * add more Lua property for CCNode, CCSprite 2011-12-04 10:57:20 +08:00
YuLei Liao f0e5cd9896 * add Lua property support for CCNode 2011-12-04 10:28:20 +08:00
YuLei Liao cf12806558 merge luafix-0.9.2 2011-12-01 22:02:16 +08:00
YuLei Liao fe7f810096 * make CCEase* working for CCNode:runAction() 2011-12-01 16:55:21 +08:00
YuLei Liao 2d9e8f065b * add CCNode:getPositionX(), CCNode:getPositionY(), CCNode:setPositionX(), CCNode:setPositionY() 2011-12-01 14:58:39 +08:00
YuLei Liao 45fe3b3090 * merge luafix-0.9.2 2011-11-30 21:42:18 +08:00
YuLei Liao 216ad9b9cb * merge upstream/master to master 2011-11-30 21:38:20 +08:00
YuLei Liao 31285fea17 * add Touch & MultiTouches lua support 2011-11-30 21:27:50 +08:00
Tsz Ming WONG a7fddfc641 Fix for the rename of getHornorParentTransform/setHornorParentTransform: ab7db20809 2011-11-30 18:19:34 +08:00
YuLei Liao 4bf68e79fd * merge upstream/master to master 2011-11-29 19:56:20 +08:00
YuLei Liao ebd381af26 * merge luafix-0.9.2 to master 2011-11-29 19:20:49 +08:00
YuLei Liao 07a468cec9 * merge LuaSimpleAudioEngine to LuaCocos2d 2011-11-29 17:39:47 +08:00
YuLei Liao 9aa72c23b2 * remove LuaEngineImpl.cpp 2011-11-29 17:13:44 +08:00
YuLei Liao 83aaa504d2 * change error message 2011-11-29 17:11:47 +08:00
YuLei Liao 3e47f7a546 * add CCLuaEngine::executeFunctionWith...Data() 2011-11-29 17:11:20 +08:00
YuLei Liao 149e33ef69 * fix tolua_ref_function() and tolua_remove_function_by_refid() 2011-11-29 15:51:18 +08:00
YuLei Liao ab184c7ead * CCLuaEngine::executeFunctionByRefID() support additional parameters 2011-11-29 15:44:54 +08:00
YuLei Liao e9fa8116e9 * rename tolua_fix.cpp to tolua_fix.c 2011-11-29 15:40:15 +08:00
YuLei Liao 4ba170d82f * rename LuaEngine.cpp/.h to CCLuaEngine.cpp/.h 2011-11-29 12:35:34 +08:00
YuLei Liao 153774b46d * merge CCTransitionPageTurn.pkg, CCTransitionRadial.pkg to CCTransition.pkg 2011-11-28 11:27:24 +08:00
minggo 6aedc258b4 fixed #838: tests and HelloLua support x86 2011-11-23 15:51:30 +08:00
YuLei Liao 0ec47ddf38 * rename luax_initpreload() to luax_exts() 2011-11-23 13:55:07 +08:00
YuLei Liao 4ff2bf96d1 * ccConfig: add LUA_ENGINE macro, turn on Lua support when LUA_ENGINE defined 2011-11-23 13:41:48 +08:00
YuLei Liao fc9cabc447 * add lua_socket module 2011-11-23 13:37:32 +08:00
YuLei Liao 44b5e55876 * add lua_socket module 2011-11-23 12:24:14 +08:00
YuLei Liao 151b373239 * ccConfig: add LUA_ENGINE macro, turn on Lua support when LUA_ENGINE defined 2011-11-23 00:58:31 +08:00
YuLei Liao 7a6253d9aa * merge cocos2d-1.0.1-x-0.9.2-luafix to master 2011-11-21 16:38:00 +08:00
YuLei Liao 396568a22e * merge upstream master -> master 2011-11-21 12:12:13 +08:00
YuLei Liao 5b696828dc * update tolua++ .pkg files 2011-11-21 00:30:55 +08:00
YuLei Liao f928bc949f * tolua_pushusertype() push nil when ptr is NULL 2011-11-20 21:12:35 +08:00
YuLei Liao 01bf6b57f4 * import lua/exts (luasocket) 2011-11-18 21:31:01 +08:00
YuLei Liao 8afe909819 * merge LuaEngineImpl to LuaEngine 2011-11-18 20:36:39 +08:00
YuLei Liao ba3fa3fec0 * format tolua++ source files 2011-11-18 20:34:13 +08:00
YuLei Liao cfed3afa4c * format lua source files 2011-11-18 20:33:52 +08:00
Phenix Yu 255293119d add tolua_usertype(tolua_S,"void*") to fix CCCallFuncND 2011-11-15 17:01:07 +08:00
Phenix Yu 786feb6a8d Merge remote-tracking branch 'remotes/upstream/master' 
Conflicts:
	HelloLua/Classes/AppDelegate.cpp
	HelloLua/Resource/hello.lua
	HelloLua/ios/HelloLua.xcodeproj/project.pbxproj
	HelloLua/win32/HelloLua.win32.vcproj
	HelloLua/win32/HelloLua.win32.vcxproj.filters
	cocos2dx/include/ccMacros.h
	cocos2dx/platform/ios/AccelerometerDelegateWrapper.mm
	lua/cocos2dx_support/LuaCocos2d.cpp
	lua/cocos2dx_support/LuaEngineImpl.cpp
	template/xcode3/cocos2d-x_lua_app/___PROJECTNAME___.xcodeproj/project.pbxproj
	template/xcode4/cocos2dx_lua.xctemplate/Resources/hello.lua
	template/xcode4/cocos2dx_lua.xctemplate/TemplateInfo.plist
	tests/test.win32/test.win32.vcxproj.filters
 2011-11-15 14:43:55 +08:00
Phenix Yu 441f8e6da9 Merge branch 'master' of https://github.com/jbyu/cocos2d-x 
Conflicts:
	cocos2dx/CCScheduler.cpp
	lua/cocos2dx_support/LuaEngine.cpp
	lua/cocos2dx_support/LuaEngine.h
 2011-11-15 14:00:52 +08:00
YuLei Liao 0873f049cb * update LuaCocos2d.cpp/.h 2011-11-09 23:24:57 +08:00
YuLei Liao fc7d8b5c3b * update LuaCocos2d.cpp 2011-10-01 23:15:54 +08:00
minggo 4166d87869 Merge pull request #529 from ciaranj/lua_gc_additions 
Adding some lua_gc calls post script load-ins
 2011-09-27 23:36:32 -07:00
ciaranj 1aae893ad2 Adding some lua_gc calls post script load-ins 2011-09-27 23:23:43 +01:00
ciaranj d1f031d2de Add support for particleWithFile for both Quad & Point Particle Systems 2011-09-27 23:15:54 +01:00
ciaranj 209214008e Adding in Particle Systems to Lua Bindings (inc. the example systems.) 2011-09-20 07:58:04 +01:00
ciaranj 11f03e9c8c Adding a build file that correctly generates LuaCocos2d.cpp 2011-09-18 18:29:17 +01:00
minggo d6cc12ffe4 issue #707: require works ok on android 2011-09-05 17:13:52 +08:00
minggo 86536c3683 issue #707: add lua loader on android 2011-09-05 16:14:51 +08:00
minggo d86ce612c0 issue #707: add lua loader on android 2011-09-05 16:11:48 +08:00
minggo e92bce5590 print error message & pop error code 2011-08-31 11:25:49 +08:00
Phenix Yu ed42bc388c fixed lua memory leak 2011-08-18 12:26:33 +08:00
sunzhuoshi 9a9cb02405 Added CocsDenshion lua support and tested with HelloLua on iOS 
The test music and sound effect come from "tests" project
 2011-08-16 23:56:41 +08:00
Phenix Yu 2eafb827cf avoid memory leaking from lua script module 2011-08-14 17:26:51 +08:00
Walzer b326b85808 HelloLua compile succeed in xcode4 2011-08-12 22:42:58 +08:00
Guillaume Maury f86da27a38 Merge branch '0.9.0' 2011-08-02 03:49:36 +08:00
Guillaume Maury b789927ca3 added possibility to add a path to the lua search path (package.path/LUA_PATH) 2011-08-02 03:47:39 +08:00
minggo 17e915fc24 use release version of tolua 2011-07-21 14:01:55 +08:00
minggo 3e080476f3 [win32] fixed #620: change the output of lua to a lib 2011-07-20 15:21:51 +08:00
minggo 914706735f update LuaCocos2d.cpp and pkg files 2011-07-18 17:04:15 +08:00
minggo 9bbab7897a fixed #615: CCLog may crash when invoke lua function 2011-07-14 17:52:56 +08:00
RongHong 9328991cbd to update lua support 2011-07-12 15:18:14 +08:00
RongHong c8f5f703a5 to commit LuaCocos2d.cpp 2011-07-11 15:33:27 +08:00
minggo 6482f5662b fixed #557: upgrade label_nodes to 1.0.1-rc3 2011-07-04 10:59:35 +08:00
natural-law 4d5dab4a40 fixed #558, Upgrade folder layers_scenes_transitions_nodes to rc3. 2011-07-01 11:26:26 +08:00
Walzer 850f23d295 update doxygen configs for 0.8.5 2011-07-01 07:52:05 +08:00
yangws 3b6265aa58 Compile ok on vs2010 2011-06-27 17:02:58 +08:00
natural-law 739d6d30e5 Modify the vcproj files to build liblua & HelloLua projects with release configuration. 2011-06-27 14:11:29 +08:00
Walzer fbcb3806d9 [android] HelloLua use shared link with other libraries 2011-06-25 11:57:34 +08:00
Walzer e606027b59 fixed #528, Lua can get the CCTouch array in callback function; Add CCNode parent for CCLayer in LuaCocos2d.cpp, HelloLua can move the farm layer now. 2011-06-24 21:03:33 +08:00
Walzer a88aa00526 improve HelloLua, rename images, add error msg in LuaEngine, refactor hello.lua, add RootViewController. issue #540 #528 2011-06-24 17:00:14 +08:00
Walzer d6a729d7f1 update cocos2d-win32.vc2008.sln to match the new folder structure of cocos2d-x/lua 2011-06-23 15:47:56 +08:00
Walzer 14956c4f87 add icon for HelloLua on ios 2011-06-23 15:36:25 +08:00
Walzer 19c539247d [android] issue #528, rename the folders in cocos2d-x/lua, for xcode4 template generator. 2011-06-23 12:01:02 +08:00
Walzer cbab879c55 add license of lua & lua++ 2011-06-21 16:12:07 +08:00
minggo 968779912a fixed #528: add copyright & modify pop menu position 2011-06-21 15:50:47 +08:00
minggo 80e618f6ed issue #528: fix some bug & complete hello.lua 2011-06-21 11:47:57 +08:00
minggo 2f97a43439 issue #528: refactor lua ok on Android 2011-06-21 10:18:43 +08:00
minggo 022e2b9998 issue #528: refactor ok on win32 2011-06-20 17:31:38 +08:00
minggo dedbd638d3 lua runs ok on Android 2011-06-01 14:35:28 +08:00
minggo 697368cf20 support lua 2011-05-31 14:04:14 +08:00