10 Commits

Author	SHA1	Message	Date
samuele3hu	d51440f62a	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into DispatcherBak1 ... Conflicts: cocos/scripting/lua/bindings/lua_cocos2dx_extension_manual.cpp	2013-12-27 11:17:11 +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
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
samuele3hu	6d8deac8a8	issue #3374:Register the lua manual binding funtions leading to the top index of lua state	2013-12-11 12:05:46 +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	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	16d572c04f	issue #2868:Add manual lua binding files	2013-11-07 23:22:11 +08:00