CaiWenzhi ab47cafb31 Merge branch 'develop' into develop_nutty_modify_framework_for315 ... Conflicts: build/cocos2d_libs.xcodeproj/project.pbxproj cocos/gui/UIButton.cpp cocos/gui/UIButton.h cocos/gui/UIWidget.h		2014-03-05 16:52:31 +08:00
..
2d	Merge pull request #5558 from Dhilan007/develop_label	2014-03-05 15:24:36 +08:00
audio	Compiles on Android	2014-03-04 16:59:39 -08:00
base	fix console loop	2014-02-26 23:51:45 +08:00
editor-support	Merge branch 'develop' into develop_nutty_modify_framework_for315	2014-03-05 16:52:31 +08:00
gui	Merge branch 'develop' into develop_nutty_modify_framework_for315	2014-03-05 16:52:31 +08:00
math/kazmath	Adds CC_DLL to kazmath for windows compatibility	2014-03-04 18:07:03 -08:00
network	issue #4165: Scheduler::scheduleCallback -> Scheduler::schedule, Scheduler::scheduleSelector -> Scheduler::schedule. APIs are clear for c++ developers now.	2014-03-03 11:00:30 +08:00
physics	closed #4150: add const to getPosition/RotationOffset method.	2014-03-03 14:35:44 +08:00
storage	Linux local storage support. Depends on libsqlite3-dev	2014-02-13 00:53:51 +01:00