axmol/cocos
James Chen 02971082ba Merge pull request #5700 from dumganhar/develop
Some fixes: [lua] Reverts 'removing tolua.cast in test case, I don't know why it was re-added.
Some warning fixes in TriggerMng.cpp and TriggerObj.cpp
Comment some lines in CCEditBoxImplIOS.mm/CCEditBoxImplAndroid.cpp, since after re-implement LabelTTF by Label, '(g|s)etTextureRect' will not work, it's because LabelTTF is inherited from Node rather than Sprite now. We need to fix this as soon as possible.
2014-03-12 14:21:10 +08:00
..
2d Merge pull request #5635 from andyque/fix_ease_action 2014-03-12 12:07:26 +08:00
audio Compiles on Android 2014-03-04 16:59:39 -08:00
base remove script support 2014-03-07 15:12:46 +08:00
editor-support Some warning fixes in TriggerMng.cpp and TriggerObj.cpp 2014-03-12 14:07:34 +08:00
math/kazmath Adds CC_DLL to kazmath for windows compatibility 2014-03-04 18:07:03 -08:00
network fixed #3868. Add guard check to send method of HttpClient 2014-03-04 10:07:49 +08:00
physics closed #4324: fix double free bug. move _preContactData to PhysicsContact class, add PhysicsContact::getPreContactData() method. 2014-03-11 05:09:08 +08:00
scripting/lua-bindings [AUTO]: updating luabinding automatically 2014-03-12 03:31:17 +00:00
storage Linux local storage support. Depends on libsqlite3-dev 2014-02-13 00:53:51 +01:00
ui fix linux compile error 2014-03-11 20:46:11 +08:00