Zhe Wang
|
9b6027d284
|
Merge pull request #4947 from walzer/develop
udpate copyrights for the new year 2014 and Chukong.
|
2014-01-06 19:50:18 -08:00 |
walzer
|
d4c1aa92d5
|
add copyrights for 2014, in folders other then 2d.
|
2014-01-07 11:47:11 +08:00 |
samuele3hu
|
01013195d3
|
Fix:Resolve the release lua test sample compile error
|
2014-01-07 10:08:58 +08:00 |
James Chen
|
baeacaddfc
|
closed #3579: Bug fix in setTouchEnabledForLayer for luabindings.
Also fixed lua module error.
|
2014-01-04 10:30:11 +08:00 |
James Chen
|
67c5ba8dfb
|
closed #3565: Adds missing `lua_pop`to prevent lua stack issues.
|
2014-01-02 16:21:35 +08:00 |
Kenneth Chan
|
80df88d2cf
|
Add missing bindings to setBlendFunc for various classes
Conflicts:
cocos/scripting/lua/bindings/lua_cocos2dx_manual.cpp
|
2014-01-02 16:21:35 +08:00 |
Dhilan007
|
30b3a6f8c3
|
fix compiling error on liblua VS 2012 project
|
2013-12-30 14:21:32 +08:00 |
samuele3hu
|
ee7aa0f077
|
Rename EVENT_KEYBOARD_RELEASED and resolve a possible memory leak bug
|
2013-12-27 12:05:12 +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 |
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
|
98e4e802f4
|
Support pass by value for setPosition\setAnchorPoint\setContentSize for lua binding
|
2013-12-24 13:42:32 +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 |
samuele3hu
|
f0dc7f0b15
|
issue #3403:Modify the registerScriptHandler functions inputparams and some EventData struct info
|
2013-12-23 11:19:55 +08:00 |
James Chen
|
0a2490333b
|
Compilation fix after this PR (https://github.com/cocos2d/cocos2d-x/pull/4583).
|
2013-12-23 10:03:36 +08:00 |
samuele3hu
|
71d5896d41
|
issue #3403:Delete Camera manual lua binding
|
2013-12-23 09:42:36 +08:00 |
samuele3hu
|
97f26176e8
|
issue #3403:Add the EventDispatcher lua binding and the releated test cases
|
2013-12-22 22:10:21 +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
|
c2e7299d8f
|
Issue #2790:Add more conversion functions to support templates containers
|
2013-12-10 11:21:30 +08:00 |
James Chen
|
ebcdf2f87d
|
issue #3258: Bug fix of MenuItemToggle binding.
|
2013-11-26 15:44:49 +08:00 |
samuele3
|
192deb7952
|
issue #3228: Reconstruct the Callfunc create method to support std::function and add callFuncND + auto remove lua test case
|
2013-11-22 11:51:07 +08:00 |
samuele3
|
a2e9920288
|
Hot fix:Repair some lua test samples and modify layer touch listener functions
|
2013-11-18 22:16:49 +08:00 |