CocosRobot
|
6492f61691
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-12-25 10:34:46 +00:00 |
samuele3hu
|
7c3978bdd8
|
Add missing file for linux lua binding
|
2013-12-25 17:42:59 +08:00 |
samuele3hu
|
a2c5881699
|
Add include_directories for spine
|
2013-12-25 17:22:14 +08:00 |
samuele3hu
|
1075a711e0
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into Spine
|
2013-12-25 16:58:19 +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 |
CocosRobot
|
c71cd5a407
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-12-25 06:39:38 +00: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 |
CocosRobot
|
9aa48cac37
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-12-25 03:49:23 +00:00 |
James Chen
|
0ff85852cc
|
Don’t use FileUtils::getInstance()->getFileData, please use getStringFromFile and getDataFromFile instead.
|
2013-12-24 18:08:40 +08:00 |
CocosRobot
|
c3b7406b43
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-12-24 09:00:04 +00: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 |
CocosRobot
|
3875d89ce6
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-12-24 07:31:29 +00:00 |
James Chen
|
451d76f6b0
|
Merge pull request #4611 from dumganhar/spine-test
Merge PR #4572, Spine JS test support.
|
2013-12-23 22:55:58 -08:00 |
CocosRobot
|
4775b4c4d8
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-12-24 06:33:43 +00:00 |
CocosRobot
|
c170559759
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-12-24 05:59:50 +00:00 |
samuele3hu
|
7f4e384886
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into NewEventDispatcher
|
2013-12-24 13:43:57 +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 |
CocosRobot
|
e50b6b616b
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-12-24 03:45:37 +00:00 |
James Chen
|
325f2e21a7
|
[JSB] long —> ssize_t in JSB_TableViewDataSource::callJSDelegate.
|
2013-12-24 10:41:45 +08:00 |
CocosRobot
|
d22f2aaf67
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-12-24 02:28:17 +00:00 |
CocosRobot
|
a9d8a64e63
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-12-23 14:10:01 +00:00 |
James Chen
|
05f6a5b09b
|
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into spine-test
|
2013-12-23 22:05:20 +08:00 |
James Chen
|
44f9009a5d
|
Merge pull request #4610 from dumganhar/lastest-js-test
Updates JS-test to the latest version and some binding fixes
|
2013-12-23 06:04:49 -08:00 |
James Chen
|
3327614a99
|
Binds Node::setAnchorPoint manually.
|
2013-12-23 21:54:02 +08:00 |
CocosRobot
|
cc7aa1ee0d
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-12-23 13:45:59 +00: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 |
James Chen
|
cafebe7295
|
Merge commit 'refs/pull/4572/head' of git://github.com/cocos2d/cocos2d-x into spine-test
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
|
2013-12-23 20:28:51 +08:00 |
James Chen
|
3096c34311
|
Removes unneeded binding glue codes, Sprite::setPosition.
|
2013-12-23 20:25:46 +08:00 |
CocosRobot
|
2efe4b7420
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-12-23 12:14:14 +00:00 |
CocosRobot
|
509d4513eb
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-12-23 11:48:15 +00:00 |
James Chen
|
eb9cb237d5
|
Merge pull request #4600 from dumganhar/remove-unneeded-bindings-codes
closed #3480: Removes unneeded codes of override function.
|
2013-12-23 03:43:27 -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
|
43e9df17bb
|
Removes unneeded ‘clone’ in cocos2d_specifics.cpp.
|
2013-12-23 16:39:25 +08:00 |
James Chen
|
9dff1dcd36
|
[LUA] Removes CCCameraDeprecated table in Deprecated.lua.
|
2013-12-23 16:37:40 +08:00 |
CocosRobot
|
9901703f4a
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-12-23 05:52:59 +00: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
|
9128960c13
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into NewEventDispatcher
|
2013-12-23 11:22:41 +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 |
CocosRobot
|
bc5fd247ac
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-12-21 20:35:41 +00:00 |