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

1295 Commits

Author SHA1 Message Date
htl c4cc6b5c34 modify event register function name 2015-01-05 14:19:27 +08:00
htl f82404f9c9 modify node register event interface 2015-01-05 14:02:29 +08:00
dualface 432bdf3541 fix framework on iOS 2014-12-31 18:01:03 +08:00
minggo bbfa7a9183 Merge pull request #9753 from samuele3hu/v3_4_httpclient 
Resolve the bug that requiring lua scrip did not consider the module dependent
 2014-12-31 16:48:33 +08:00
samuele3hu 54d376db01 Resolve the bug that requiring lua scrip did not consider the module dependent 2014-12-31 16:28:14 +08:00
CocosRobot 2e1d8b4e42 [AUTO]: updating luabinding automatically 2014-12-31 08:15:01 +00:00
CocosRobot 3614f716ae [AUTO]: updating luabinding automatically 2014-12-31 06:23:33 +00:00
samuele3hu 6bad549285 Resolve the require file errror 2014-12-31 13:43:47 +08:00
minggo 70a29a8470 Merge pull request #9709 from htlxyz/v3_origin 
modify widget interface for lua
 2014-12-30 18:32:20 +08:00
htl dce4383357 modify widget interface for lua 2014-12-30 16:45:26 +08:00
CocosRobot f4fbf51905 [AUTO]: updating luabinding automatically 2014-12-30 08:30:45 +00:00
CocosRobot 5b8492770e [AUTO]: updating luabinding automatically 2014-12-30 07:49:45 +00:00
CocosRobot ed7823c08b [AUTO]: updating luabinding automatically 2014-12-30 03:52:26 +00:00
minggo 3c1978fcc3 Merge pull request #9611 from super626/quaternion 
Rotation With Quaternion
 2014-12-30 10:09:08 +08:00
CocosRobot 75436db583 [AUTO]: updating luabinding automatically 2014-12-29 05:51:45 +00:00
dualface 653b15b4b8 add UIWidget support, fix typo 2014-12-29 13:37:20 +08:00
dualface 40acc98f14 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into update_lua_templates 2014-12-29 10:58:42 +08:00
dualface 954f170e9e remove chinese comments 2014-12-29 10:44:16 +08:00
minggo 67ae66a90e Merge pull request #9663 from dualface/update_lua_corelib 
update lua corelib
 2014-12-29 10:30:50 +08:00
CocosRobot 35774cc0f6 [AUTO]: updating luabinding automatically 2014-12-29 02:07:20 +00:00
CocosRobot 4172e7ad7f [AUTO]: updating luabinding automatically 2014-12-29 01:49:00 +00:00
minggo b01b25e17e Merge pull request #9558 from super626/frustum 
Frustum Culling
 2014-12-29 09:43:14 +08:00
dualface 8d99d8a78e fix typo 2014-12-29 05:47:37 +08:00
dualface 9684d6e164 update corelib 2014-12-29 05:41:13 +08:00
dualface 74daae1c39 update framework 2014-12-29 01:58:16 +08:00
dualface cc3021467f add more usable functions 2014-12-27 15:31:31 +08:00
dualface 46a0ad11ac update lua corelib 2014-12-27 11:59:14 +08:00
CocosRobot f8b1b34025 [AUTO]: updating luabinding automatically 2014-12-26 08:10:13 +00:00
yangxiao b0a6720cb2 reset auto lua, fix #9515 2014-12-26 15:52:27 +08:00
yangxiao 25ce54b43b reset 2014-12-26 15:46:45 +08:00
lvlong f592671df6 Merge branch 'v3' of github.com:cocos2d/cocos2d-x into frustum 
Conflicts:
	cocos/2d/libcocos2d.vcxproj.filters
	cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.hpp
 2014-12-26 13:42:13 +08:00
CocosRobot a30d606fe6 [AUTO]: updating luabinding automatically 2014-12-26 02:40:22 +00:00
CocosRobot ff37578611 [AUTO]: updating luabinding automatically 2014-12-26 01:32:36 +00:00
lvlong 75d2deb2c8 revert 2014-12-25 15:25:19 +08:00
lvlong 3f91957e79 revert 2014-12-25 15:21:53 +08:00
yangxiao 04e273e245 bind setRotationQuat 2014-12-25 14:54:20 +08:00
CocosRobot 6b15f4edcb [AUTO]: updating luabinding automatically 2014-12-25 06:14:03 +00:00
minggo 9643b87ed0 Merge pull request #9173 from 2youyouo2/v3 
improve ActionTimeline api
 2014-12-25 14:06:02 +08:00
lvlong a4a108f766 fix lua binding again!! 2014-12-25 14:04:41 +08:00
minggo 2ca143959b Merge pull request #9620 from yinjimmy/LuaStackExecuteScriptFile 
execute script with full file path
 2014-12-25 13:45:46 +08:00
youyou f678d1027c Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 
Conflicts:
	cocos/editor-support/cocostudio/ActionTimeline/CSLoader.cpp
 2014-12-25 12:09:31 +08:00
CocosRobot 381be0f6f0 [AUTO]: updating luabinding automatically 2014-12-24 09:41:09 +00:00
lvlong 4d1ca0966c lua binding 2014-12-24 15:09:26 +08:00
CocosRobot a5d3e8361b [AUTO]: updating luabinding automatically 2014-12-24 06:42:09 +00:00
kaile.yin 942abfc654 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 
Conflicts:
	cocos/2d/libcocos2d.vcxproj.filters
 2014-12-24 10:53:09 +08:00
yinjimmy 24648db2b5 execute script with full file path 2014-12-24 02:18:29 +08:00
CocosRobot 864b924dfb [AUTO]: updating luabinding automatically 2014-12-23 06:49:30 +00:00
CocosRobot facf9a1a66 [AUTO]: updating luabinding automatically 2014-12-23 04:05:21 +00:00
CocosRobot 34e1bce6c3 [AUTO]: updating luabinding automatically 2014-12-22 08:02:05 +00:00
kaile.yin b924dafe83 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 
Conflicts:
	cocos/2d/libcocos2d.vcxproj.filters
	tests/cpp-tests/Classes/ExtensionsTest/CocoStudioActionTimelineTest/ActionTimelineTestScene.cpp
 2014-12-22 11:14:31 +08:00