samuele3hu
|
fdac224a7b
|
issue #3626:Add namespace’s support for manual lua binding functions for classes in the cocostudio and cocos2d::gui namespace
|
2014-01-17 10:19:55 +08:00 |
samuele3hu
|
510fce7b12
|
issue #3626:Add namespace’s support for manual lua binding of functions about physics
|
2014-01-17 10:19:55 +08:00 |
samuele3hu
|
b72f309076
|
issue #3626:Add namespace’s support for manual lua binding of classes in the cocos2d::extension and cocosbuilder namespace and update the related test cases
|
2014-01-17 10:19:54 +08:00 |
samuele3hu
|
2cbe502113
|
issue #3643:Lua websocket can't receive more than 64 bytes of data
|
2014-01-09 17:23:22 +08:00 |
samuele3hu
|
a61f9fce27
|
Fix:Resolve the pLengthSQ’s error in the Cocos2d.lua
|
2014-01-07 22:16:07 +08:00 |
Dhilan007
|
ba4833e070
|
update liblua vs project for add miss file.
|
2014-01-07 18:30:12 +08:00 |
James Chen
|
f5ae2bbacc
|
Merge pull request #4932 from boyu0/iss3401_physical_lua_binding
issue #3401: physical lua binding
|
2014-01-06 23:48:47 -08:00 |
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 |
boyu0
|
8e64ef6d6d
|
issue #3401: add physics lua auto generate to android.mk
|
2014-01-07 10:20:59 +08:00 |
boyu0
|
cf146b32cf
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss3401_physical_lua_binding
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
cocos/scripting/lua/bindings/CCLuaStack.cpp
cocos/scripting/lua/script/Cocos2d.lua
cocos/scripting/lua/script/Cocos2dConstants.lua
|
2014-01-07 10:16:44 +08:00 |
samuele3hu
|
01013195d3
|
Fix:Resolve the release lua test sample compile error
|
2014-01-07 10:08:58 +08:00 |
boyu0
|
eaa3041a97
|
issue #3401: physical lua banding script, add testlua->physics test
|
2014-01-06 22:19:40 +08:00 |
samuele3hu
|
465aba951c
|
Fix:Remove the ScollView and TableView of extension gui lua binding
|
2014-01-04 18:36:33 +08:00 |
samuele3hu
|
70ee13e2e1
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developNewUI
|
2014-01-04 15:46:27 +08:00 |
samuele3hu
|
0550ec33ad
|
Fix:Resolve the bugs that some lua test cases can’t run
|
2014-01-04 15:46:04 +08:00 |
Dhilan007
|
35246b0810
|
fix compiling error and miss file on vs.
|
2014-01-04 12:25:12 +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 |
samuele3hu
|
2b19da00df
|
Update the lua test cases about the armature
|
2014-01-03 14:51:36 +08:00 |
samuele3hu
|
53f2415fcf
|
Resolve the android compile error
|
2014-01-03 11:29:56 +08:00 |
samuele3hu
|
51e3e3fd1b
|
Resolve the android and linux compile error
|
2014-01-03 11:15:46 +08:00 |
samuele3hu
|
cdc82d6e8c
|
Add a newline
|
2014-01-03 10:50:06 +08:00 |
samuele3hu
|
c4588722dd
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developNewUI
|
2014-01-03 10:41:03 +08:00 |
samuele3hu
|
07a3efb585
|
Update the lua test cases about the GUI
|
2014-01-03 10:39:19 +08:00 |
minggo
|
2b5be1bacf
|
Merge pull request #4801 from minggo/namespace
fix compiling errors because of new namespace of network module
|
2014-01-02 04:03:03 -08:00 |
minggo
|
9124f189c3
|
fix compiling errors because of new namespace of network module
|
2014-01-02 19:44:46 +08:00 |
James Chen
|
c29e328490
|
Merge pull request #4779 from samuele3hu/DispatcherBak1
Develop branch adds lua trigger for CocoStudio
|
2014-01-02 00:29:30 -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 |
samuele3hu
|
d802518413
|
Rename Cocos2dStudio.lua to CocoStudio.lua
|
2014-01-02 15:51:25 +08:00 |
samuele3hu
|
a2b706c87c
|
Rename some common script files to keep consistent
|
2014-01-02 15:18:32 +08:00 |
samuele3hu
|
b8d4010ae5
|
Develop branch adds lua trigger for CocoStudio
|
2014-01-02 12:00:37 +08:00 |
boyu0
|
0a06d93328
|
issue #3401: physical lua banding script and auto script
|
2014-01-02 11:45:11 +08:00 |
James Chen
|
edb2ad0933
|
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into ccs-binding
Conflicts:
cocos/editor-support/cocostudio/TriggerMng.cpp
|
2013-12-30 21:06:57 +08:00 |
James Chen
|
165e6c2a78
|
Adds an empty LuaEngine::parseConfig function.
|
2013-12-30 21:04:00 +08:00 |
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 |