minggo
|
9a3d2e941e
|
Merge pull request #3969 from dualface/develop
[ci skip]fix tolua_fix, cleanup peertable after object deleted
|
2013-11-10 17:44:24 -08:00 |
dualface
|
c75c20de04
|
fix Lua 5.2 compatibility
|
2013-11-10 11:49:52 +08:00 |
samuele3
|
d4dbc7a442
|
Add conversion config for long type
|
2013-11-10 09:21:33 +08:00 |
dualface
|
2a2fc81f86
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
|
2013-11-10 00:00:19 +08:00 |
Ricardo Quesada
|
5faae4a51e
|
removes exe bit from text files
|
2013-11-08 11:30:50 -08:00 |
samuele3
|
8c025a2cee
|
Reslove the linux compiled error
|
2013-11-07 15:12:19 +08:00 |
James Chen
|
2e80e95a37
|
[Linux] compilation fix for PR #4099
|
2013-11-06 15:26:33 +08:00 |
samuele3
|
61d8f9673c
|
issue #2868:Move armature related lua binding from namespace 'cc' to namespace 'ccd'
|
2013-11-05 17:34:25 +08:00 |
samuele3
|
b445f0824a
|
issue #2868:Bind UI and Scene parser to lua by bindings-generator and add releated test samples
|
2013-11-05 15:09:51 +08:00 |
samuele3
|
80f3a7d57a
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developAssetsManager
Conflicts:
build/cocos2d_samples.xcodeproj/project.pbxproj
cocos/scripting/lua/bindings/LuaScriptHandlerMgr.h
cocos/scripting/lua/script/Cocos2dConstants.lua
|
2013-11-01 17:17:21 +08:00 |
samuelhu
|
4031556398
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developHttp
Conflicts:
build/cocos2d_samples.xcodeproj/project.pbxproj
samples/Lua/TestLua/Resources/luaScript/mainMenu.lua
|
2013-10-31 21:57:24 +08:00 |
samuelhu
|
5891f00967
|
issue #3037:Add assetsmananger lua binding and a releated test sample
|
2013-10-31 21:52:28 +08:00 |
samuelhu
|
7c45ddafe2
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developAssetsManager
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
|
2013-10-31 17:22:14 +08:00 |
samuelhu
|
faf3b30e9b
|
issue #3069:Add LuaObjectCBridge and related test sample
|
2013-10-31 15:20:53 +08:00 |
samuelhu
|
1f07a659a6
|
issue #3069:Modify layer lua register and add some compatible lua binding functions
|
2013-10-31 09:49:04 +08:00 |
samuelhu
|
c08a09a7e0
|
#3049:Add LICENSE_JSON4LUA and some constant values.
|
2013-10-30 10:52:04 +08:00 |
samuelhu
|
471bbb8af9
|
issue #3049:Add XMLHttpRequest lua binding and corresponding test sample
|
2013-10-29 18:21:15 +08:00 |
samuelhu
|
70082ddc29
|
issue #3409:Add XMLHttpRequest lua binding and corresponding test sample
|
2013-10-29 17:54:35 +08:00 |
samuelhu
|
3508213615
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developHttp
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
|
2013-10-29 11:45:19 +08:00 |
samuelhu
|
a4d028e905
|
issue #3409:Add XMLHttpRequest lua binding and corresponding test sample
|
2013-10-29 11:40:41 +08:00 |
samuelhu
|
d7689073e0
|
issue #3049:Add XMLHttpRequest lua binding and corresponding test sample
|
2013-10-24 11:12:21 +08:00 |
samuelhu
|
26caaa0a36
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developAssetsManager
|
2013-10-23 09:57:21 +08:00 |
minggo
|
abcf8f268d
|
fix conflicts
|
2013-10-22 18:36:13 +08:00 |
minggo
|
6a664d480a
|
issue #2905:samples build ok on linux
|
2013-10-22 18:01:56 +08:00 |
samuelhu
|
5f769b2313
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developAssetsManager
|
2013-10-22 16:52:44 +08:00 |
samuelhu
|
be1f17ca0f
|
issue #3037:Add assetsmananger lua binding and a releated test sample
|
2013-10-22 16:14:49 +08:00 |
Dhilan007
|
f11dba586a
|
issue #2905:modification vs-project for folder structure change
|
2013-10-21 22:09:21 +08:00 |
dualface
|
8f2f524f2d
|
fix tolua_fix, cleanup peertable after object deleted
|
2013-10-18 11:30:28 +08:00 |
minggo
|
e50f9fc43b
|
issue #2905: jsbinding samples and lua binding samples build ok on android
|
2013-10-17 15:04:30 +08:00 |
James Chen
|
225738ecc5
|
issue #2905: [iOS Mac] HelloLua and TestLua work now.
|
2013-10-16 17:19:02 +08:00 |
James Chen
|
352d1f6768
|
issue #2905: Renaming lua/cocos2dx_support to lua/bindings.
|
2013-10-16 16:40:07 +08:00 |
James Chen
|
f6275667bf
|
Removing unused ios projects.
|
2013-10-12 15:02:28 +08:00 |
minggo
|
ad6325b0dd
|
fix conflicts
|
2013-10-12 11:31:32 +08:00 |
minggo
|
4313c46e93
|
issue #2905:adjust folder structure
|
2013-10-12 11:22:05 +08:00 |