Dhilan007
30b3a6f8c3
fix compiling error on liblua VS 2012 project
2013-12-30 14:21:32 +08:00
James Chen
0d16f7bc3b
Merge pull request #4712 from dumganhar/cocostudio-test
...
Merge PR #4672 : We need to replace trigger system by EventDispatcher in future.
2013-12-27 05:05:41 -08:00
James Chen
b03c8259b1
Merge commit 'refs/pull/4672/head' of git://github.com/cocos2d/cocos2d-x into cocostudio-test
...
Conflicts:
cocos/scripting/auto-generated
2013-12-27 20:18:58 +08:00
samuele3hu
30439e4689
Improve the coding style
2013-12-27 20:07:00 +08:00
chengstory
faaf6d3f2b
fixed #3457 fixes some bug.
2013-12-27 17:21:13 +08:00
samuele3hu
ee7aa0f077
Rename EVENT_KEYBOARD_RELEASED and resolve a possible memory leak bug
2013-12-27 12:05:12 +08:00
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
17ff6ef764
Renames: IntValueMap —> ValueMapIntKey
2013-12-26 22:07:20 +08:00
James Chen
93ed5a4f0f
long --> ssize_t for TableView callback.
2013-12-26 04:09:24 -08:00
samuele3hu
756a72cbca
Reconstruct the operation of handling lua script event
2013-12-26 19:43:49 +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
7c3978bdd8
Add missing file for linux lua binding
2013-12-25 17:42:59 +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
0ff85852cc
Don’t use FileUtils::getInstance()->getFileData, please use getStringFromFile and getDataFromFile instead.
2013-12-24 18:08:40 +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
e497f823ea
Merge branch 'lua_spine_dev' of https://github.com/edwardzhou/cocos2d-x into Spine
2013-12-24 16:14:10 +08:00
samuele3hu
98e4e802f4
Support pass by value for setPosition\setAnchorPoint\setContentSize for lua binding
2013-12-24 13:42:32 +08:00
Edward Zhou
4082c86070
1. add Spine LUA binding with testcase; 2. CCSkeleton inherites from Node since NodeRGBA is deprecated.
2013-12-24 11:55:53 +08:00
James Chen
6b73fa570e
Merge pull request #4601 from samuele3hu/toluaerror
...
issue #3353 Lua gc mechanism will make the extended attributes of lua userdata disapper
2013-12-23 05:40:15 -08:00
samuele3hu
b1dd233a04
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into NewEventDispatcher
2013-12-23 20:30:33 +08:00
samuele3hu
48a95cfa55
[Lua Binding] Supports to bind more container: std::vector<std::string>, std::vector<int>, cocos2d::Map<std::string, T>.
2013-12-23 20:29:05 +08:00
samuele3hu
783be69322
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into toluaerror
...
Conflicts:
tools/tolua/cocos2dx.ini
2013-12-23 17:20:17 +08:00
James Chen
9dff1dcd36
[LUA] Removes CCCameraDeprecated table in Deprecated.lua.
2013-12-23 16:37:40 +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
James Chen
aeafe06d7f
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into data-refactor
...
Conflicts:
cocos/scripting/lua/bindings/lua_cocos2dx_manual.cpp
2013-12-23 11:57:29 +08:00
James Chen
ca082080b5
Binds FileUtils::getStringFromFile automatically since we have added this method.
2013-12-23 11:47:56 +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
50bcdee725
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into NewEventDispatcher
2013-12-22 22:11:17 +08:00
samuele3hu
97f26176e8
issue #3403:Add the EventDispatcher lua binding and the releated test cases
2013-12-22 22:10:21 +08:00
James Chen
55ff96df3a
closed #3463 : Potential hash collision by using typeid(T).hash_code() in JSB and LuaBinding.
...
Instead of using std::unordered_map<long, T>(long is the hash_code generated by typeid(T).hash_code()),
We needs to use std::unordered_map<std::string, T> to avoid collision since unordered_map internally processes collisions.
2013-12-20 17:13:09 +08:00
James Chen
755d29b0e1
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into more_container_bind
2013-12-19 20:17:54 +08:00
James Chen
f73e939b57
Supports to bind more container: std::vector<std::string>, std::vector<int>, cocos2d::Map<std::string, T>.
2013-12-19 20:17:44 +08:00
boyu0
ef54ed3c15
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into HEAD
...
Conflicts:
cocos/2d/CCLabel.cpp
cocos/2d/CCLabel.h
cocos/2d/CCLabelBMFont.cpp
cocos/2d/CCLabelBMFont.h
cocos/2d/CCLayer.cpp
cocos/2d/CCLayer.h
cocos/2d/CCNode.cpp
extensions/GUI/CCControlExtension/CCControl.cpp
extensions/GUI/CCControlExtension/CCControlButton.cpp
extensions/GUI/CCControlExtension/CCScale9Sprite.cpp
tools/tojs/cocos2dx.ini
2013-12-19 17:05:59 +08:00
samuele3hu
f5f95399fd
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developConversion
2013-12-18 14:58:35 +08:00
samuele3hu
55830c3023
Add support for unsigned short
2013-12-18 13:47:59 +08:00
samuele3hu
4d4b96ba30
issue #3402:Add the new label lua binding and the releated test cases
2013-12-18 11:39:43 +08:00
James Chen
3a11dafda7
Uses reinterpret_cast instead of static_cast for jsval_to_ssize and luaval_to_ssize.
2013-12-16 14:13:24 +08:00
James Chen
adb45d3c68
Adds conversions for ssize_t.
2013-12-16 13:01:20 +08:00
boyu0
defae416f3
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into bug3162_opacity_incorrect
2013-12-13 18:09:39 +08:00
samuele3hu
98bd84c436
Fix:Add lua binding of ’registerScriptHandler’、’unregisterScriptHandler’ and ’removeObjectAllHandlers’ of ScriptHandlerMgr and some constants define
2013-12-13 15:50:12 +08:00
boyu0
d4c8fb0be6
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into bug3162_opacity_incorrect
2013-12-13 10:47:52 +08:00
boyu0
c8c0e2270e
issue #3162 : deprecated RGBAProtocol, NodeRGBA and LayerRGBA
2013-12-13 10:10:49 +08:00
boyu0
d7106d49be
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into bug3162_opacity_incorrect
2013-12-12 17:04:21 +08:00
samuele3hu
4ccceea230
Fix:Remove some needless lua binding functions and resolve a bug
2013-12-12 14:47:35 +08:00
James Chen
320ae15db4
issue #2790 : Lua compilation fix.
2013-12-12 10:54:41 +08:00