James Chen
|
a4a010465c
|
Merge commit 'refs/pull/5071/head' of git://github.com/cocos2d/cocos2d-x into merge5071
|
2014-01-26 16:41:35 +08:00 |
samuele3hu
|
a91d9161c7
|
issue #3822:Update the KeypadTest using the new event-dispatcher
|
2014-01-23 16:17:24 +08:00 |
samuele3hu
|
e1476c8d60
|
fix:Replace cc.TextureCache:getInstance() —> cc.Director:getInstance():getTextureCache()
|
2014-01-22 17:09:33 +08:00 |
samuele3hu
|
c4d2f1d83c
|
fix:Add the deprecated function for the “dumpCachedTextureInfo” and update the related test case
|
2014-01-22 15:41:46 +08:00 |
samuele3hu
|
77b5d4c772
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developBugFix
|
2014-01-21 17:52:13 +08:00 |
samuele3hu
|
2338d773dc
|
fix:Add the “setZOrder” and “getZOrder” deprecated functions of the Node class in the lua’s script and update the related test cases
|
2014-01-21 17:51:49 +08:00 |
samuele3hu
|
da8e208f47
|
close #3802: Add some manual lua-binding functions for the Lable and update the related test cases
|
2014-01-21 16:36:29 +08:00 |
samuele3hu
|
31339d10e5
|
issue #3626:Add the deprecated support for the WebSocket and the XMLHttpRequest in the script
|
2014-01-17 10:19:57 +08:00 |
samuele3hu
|
de698aaea7
|
issue #3626:Add lua binding for ScollView and TableView classes in the cocos2d::extension namespace and the related test cases
|
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 |
boyu0
|
de30a9cfea
|
issue #3401: add lua physics slide test, add more banding code, and fix some bugs.
|
2014-01-14 15:48:44 +08:00 |
samuele3hu
|
a61f9fce27
|
Fix:Resolve the pLengthSQ’s error in the Cocos2d.lua
|
2014-01-07 22:16:07 +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 |
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
|
0550ec33ad
|
Fix:Resolve the bugs that some lua test cases can’t run
|
2014-01-04 15:46:04 +08:00 |
samuele3hu
|
2b19da00df
|
Update the lua test cases about the armature
|
2014-01-03 14:51:36 +08:00 |
samuele3hu
|
07a3efb585
|
Update the lua test cases about the GUI
|
2014-01-03 10:39:19 +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 |
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 |
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
|
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
|
9dff1dcd36
|
[LUA] Removes CCCameraDeprecated table in Deprecated.lua.
|
2013-12-23 16:37:40 +08:00 |
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
|
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
|
c8c0e2270e
|
issue #3162: deprecated RGBAProtocol, NodeRGBA and LayerRGBA
|
2013-12-13 10:10:49 +08:00 |
boyu0
|
a71394b122
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into bug3162_opacity_incorrect
|
2013-12-10 18:03:41 +08:00 |
samuele3
|
c2e7299d8f
|
Issue #2790:Add more conversion functions to support templates containers
|
2013-12-10 11:21:30 +08:00 |
boyu0
|
d6d7923134
|
closed #3162: add RGBAProtocol, NodeRGBA and LayerRGBA back and deprecate them
|
2013-12-09 11:32:28 +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 |
samuele3
|
c1a226686f
|
issue #3309:Modify some deprecated cpp files and lua files
|
2013-12-04 15:15:55 +08:00 |
samuele3
|
a8c1bba464
|
issue #3309:Add some deprecated functions and classes to support master cocostudio lua bindings
|
2013-12-03 15:40:59 +08:00 |
samuele3
|
ec9bc0069f
|
Modify template of lua ios_mac config and some bugs
|
2013-11-15 13:48:34 +08:00 |
samuele3
|
babc985409
|
Add deprecated functions of class TextureCache
|
2013-11-14 14:12:25 +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
|
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 |
Ricardo Quesada
|
5faae4a51e
|
removes exe bit from text files
|
2013-11-08 11:30:50 -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
|
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 |