samuele3hu
|
f0dc7f0b15
|
issue #3403:Modify the registerScriptHandler functions inputparams and some EventData struct info
|
2013-12-23 11:19:55 +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 |
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
|
4d4b96ba30
|
issue #3402:Add the new label lua binding and the releated test cases
|
2013-12-18 11:39:43 +08:00 |
boyu0
|
af5f496861
|
issue #3162: Merge Node and NodeRGBA, fix bug: Child's opacity will not be changed when its parent's setCascadeOpacityEnabled was set to true and opacity was changed.
|
2013-12-06 18:07:16 +08:00 |
Marc Lepage
|
940b0ffd56
|
Fix typos
|
2013-11-29 12:09:38 -05:00 |
minggo
|
bf07077c52
|
Merge pull request #4361 from Dhilan007/eclipse_build_fix
[ci skip]Remove something association of CDT Builder,it make 'miss error' in buil...
|
2013-11-25 19:37:03 -08:00 |
Dhilan007
|
49a1d0ae62
|
Remove something association of CDT Builder,it make 'miss error' in builders.
|
2013-11-22 17:41:03 +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
|
eefaf9b81d
|
Hot fix:Remove the MenuLayerPriorityTest test case of menu
|
2013-11-19 14:32:17 +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 |
minggo
|
425ce40a67
|
Merge pull request #4274 from Dhilan007/helloLuaConf
[ci skip]fix Incomplete helloLua project configuration.
|
2013-11-15 00:06:49 -08:00 |
Dhilan007
|
6db31508cc
|
fix Incomplete helloLua project configuration.
|
2013-11-15 16:01:03 +08:00 |
minggo
|
5870a69bb7
|
Merge pull request #4269 from Dhilan007/di2854
[ci skip]issue #2854:Disable CDT Builder on Eclipse
|
2013-11-14 23:45:13 -08:00 |
Dhilan007
|
050a47c4eb
|
issue #2854:Disable CDT Builder on Eclipse
|
2013-11-15 14:35:55 +08:00 |
samuele3
|
ec9bc0069f
|
Modify template of lua ios_mac config and some bugs
|
2013-11-15 13:48:34 +08:00 |
samuele3
|
17f74eeb17
|
issue #2868:Modify armature test samples and add more armature test samples
|
2013-11-13 18:18:29 +08:00 |
samuele3
|
062fb85943
|
issue #2868:Modify cocos2dx_studio.ini to add more auto-binding class
|
2013-11-13 10:12:44 +08:00 |
samuele3
|
c1d256c159
|
issue #2868:modify ccs lua test samples
|
2013-11-12 16:52:03 +08:00 |
samuele3
|
482ee5d47f
|
issue #2868:Add more ccs lua test samples
|
2013-11-12 15:25:47 +08:00 |
samuele3
|
06c7d3e96d
|
issue #2868:Add ccd lua test samples
|
2013-11-11 17:03:43 +08:00 |
samuele3
|
4536798842
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCCS
|
2013-11-07 10:18:38 +08:00 |
samuele3
|
6a1a774303
|
issue #2868:Config cocoStudio GUI lua binding files and add a few script files
|
2013-11-07 10:16:02 +08:00 |
James Chen
|
c364c4f083
|
issue #3113: Updating CMakeLists.txt, Improve Copying files.
|
2013-11-06 10:57:36 +08:00 |
samuele3
|
b76865c692
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCCS
|
2013-11-05 15:11:05 +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 |
James Chen
|
edb1fc7822
|
[cmake] Deletes .icf files.
|
2013-11-04 21:03:09 +08:00 |
James Chen
|
733197fa65
|
[cmake] copy resources works.
|
2013-11-04 21:03:08 +08:00 |
James Chen
|
9be8ca3714
|
[cmake] output lib to root/lib
|
2013-11-04 21:03:08 +08:00 |
James Chen
|
daa91ad413
|
[CMake] Update library dependency.
|
2013-11-04 21:03:07 +08:00 |
James Chen
|
c085412636
|
[CMake] TestLua and HelloLua is ok.
|
2013-11-04 21:03:07 +08:00 |
samuele3
|
3289ce8fe0
|
issue #3037:Modify vs2012 config
|
2013-11-04 14:50:23 +08:00 |
samuele3
|
ba6cf00d9b
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developAssetsManager
|
2013-11-04 14:47:10 +08:00 |
samuele3
|
790be0decc
|
issue #3037:Modify vs2012 config
|
2013-11-04 14:43:22 +08:00 |
minggo
|
f6d82d21d2
|
closed #3108: add -fsigned-char to make char to signed as default
|
2013-11-04 10:48:45 +08:00 |
samuele3
|
463ed08ffe
|
issue #3037:Modify AssetsManagerTest.lua
|
2013-11-01 17:29:09 +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
|
5010779e39
|
issue #3049:Reset .project file in pro.android.
|
2013-11-01 11:36:06 +08:00 |
samuelhu
|
f3ff7955a8
|
issue #3037:Modify platform build config
|
2013-11-01 11:18:02 +08:00 |
samuelhu
|
de4aaeda2d
|
issue #3049:Add XMLHttpRequest lua binding and corresponding test sample
|
2013-10-31 22:06:34 +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
|
705da20ee7
|
issue #2794:Add LuaObjectCBridge and related test sample
|
2013-10-31 15:26:38 +08:00 |
samuelhu
|
faf3b30e9b
|
issue #3069:Add LuaObjectCBridge and related test sample
|
2013-10-31 15:20:53 +08:00 |
minggo
|
9e5420c954
|
Merge pull request #4029 from minggo/iss2905-adjust_folder
use build/android-build to build android samples, and update readme
|
2013-10-30 03:30:03 -07:00 |
minggo
|
da9f7c912b
|
use build/android-build to build android samples, and update readme
|
2013-10-30 18:27:56 +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 |