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

506 Commits

Author SHA1 Message Date
YuLei Liao f860edc744 Merge remote-tracking branch 'refs/remotes/upstream/master' 2011-12-01 22:00:21 +08:00
Walzer 21af60ee9c update xcode4 templates 2011-12-01 17:00:30 +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
minggo f693a5a10e fix type error according the change of CCSprite 2011-11-30 17:49:52 +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 757f840b47 * update tolua++ .pkg files, add CCScene::registerScriptEventsHandler(), CCScene::unregisterScriptEventsHandler() 2011-11-29 17:12:08 +08:00
YuLei Liao c7ee84ccd4 * update tolua++ .pkg files 2011-11-29 15:45:20 +08:00
YuLei Liao 153774b46d * merge CCTransitionPageTurn.pkg, CCTransitionRadial.pkg to CCTransition.pkg 2011-11-28 11:27:24 +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 ca111e2937 * update tolua++ .pkg files 2011-11-18 20:34:39 +08:00
minggo d48da20b0f synchrolize to master 2011-11-18 18:53:53 +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 0f93cbf219 * update tolua++ .pkg files 
+ add bulid_macosx.xml
+ add basic.lua
 2011-11-09 23:23:47 +08:00
YuLei Liao 4b8e39e77b - delete unused tolua++ .pkg files 2011-11-09 23:18:32 +08:00
YuLei Liao ce0b17adec Merge remote-tracking branch 'upstream/master' 2011-10-31 23:16:28 +08:00
dumganhar da794c1613 Merge branch 'master' into bada 2011-10-21 09:28:29 +08:00
Walzer 00669cc5ad update xcode4 templates generator & xcode4 template for lua. 2011-10-19 23:11:17 +08:00
YuLei Liao 40da58c153 * add lua function object interface 2011-10-02 07:43:14 +08:00
YuLei Liao 1c18a114b1 + add tolua build config for macosx 2011-10-01 22:42:25 +08:00
dumganhar db4d51496e Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into bada 
Conflicts:
	cocos2dx/platform/CCAccelerometer_platform.h
	cocos2dx/platform/CCApplication_platform.h
	cocos2dx/platform/CCArchOptimalParticleSystem.h
	cocos2dx/platform/CCEGLView_platform.h
	cocos2dx/platform/CCPlatformConfig.h
	cocos2dx/platform/CCSAXParser.h
	cocos2dx/platform/CCStdC.h
	tests/AppDelegate.cpp
	tests/tests/Box2DTestBed/Tests/EdgeShapes.h
 2011-09-29 16:03:37 +08:00
ciaranj d1f031d2de Add support for particleWithFile for both Quad & Point Particle Systems 2011-09-27 23:15:54 +01:00
minggo 8f1208368b Merge pull request #515 from ciaranj/lua_project_generator 
Initial example working version of a lua project generator
 2011-09-20 01:50:12 -07:00
ciaranj 0296027335 Supplying README file 2011-09-20 08:03:52 +01:00
ciaranj 209214008e Adding in Particle Systems to Lua Bindings (inc. the example systems.) 2011-09-20 07:58:04 +01:00
ciaranj 2662af753a Initial example working version of a lua project generator 2011-09-19 23:42:22 +01:00
ciaranj d91c728a52 Updating README file as requested 2011-09-19 07:47:17 +01:00
ciaranj 11f03e9c8c Adding a build file that correctly generates LuaCocos2d.cpp 2011-09-18 18:29:17 +01:00
ciaranj 75edaccac9 Updating AccelerometerDelegate related classes 
The checked in .pkg files seemed to be generating lua-bindings for
cocos2d methods that don't exist.  This seems strange, so have fixed it
for now.
 2011-09-18 18:18:02 +01:00
minggo d42336df56 remove functions of AccelerometerKeep & AccelerometerDestroy declation 2011-08-31 11:34:45 +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
minggo c6cb8f4980 make HelloLua work ok on win32 2011-08-15 16:23:23 +08:00
minggo 6892787afa fixed #653: add CCScheduler::unscheduleScriptFunc() 2011-08-03 14:15:35 +08:00
minggo 792204e908 fixed #645: update pkg file to v1.0.1 2011-08-02 16:21:23 +08:00
minggo 914706735f update LuaCocos2d.cpp and pkg files 2011-07-18 17:04:15 +08:00
minggo d97fcbf752 fixed #612: export some CCNode methods to lua 2011-07-18 10:28:25 +08:00
minggo a3e9679578 fixed #611: add some functions for lua 2011-07-18 10:18:36 +08:00
RongHong 9328991cbd to update lua support 2011-07-12 15:18:14 +08:00
RongHong 41049ec0be Merge https://github.com/flyingpacer/cocos2d-x 2011-07-11 14:02:34 +08:00
RongHong 30166ad023 to commit the rest pkg files 2011-07-11 14:00:55 +08:00
unknown 54242d709e commit some pkg files 2011-07-08 22:32:54 +08:00
RongHong 1a869e7c3a to commit some pkg files 2011-07-08 18:31:02 +08:00
minggo 39a3b715cd fixed #589 2011-07-08 15:28:13 +08:00
Walzer bf99245dbb hide the xcode4 template generator script into tools folder 2011-06-25 14:20:10 +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 3498a91710 [ios] issue #528, add script_support into xcode4 template 2011-06-23 10:01:57 +08:00
minggo 022e2b9998 issue #528: refactor ok on win32 2011-06-20 17:31:38 +08:00
minggo 9c49e27bf1 add extensions & tools directory 2011-06-14 14:31:25 +08:00