James Chen bb86a9e350 Merge pull request #5517 from bmanGH/feature/fix_timer_cancel_bug ... closed #4272: Timer::cancel always call Director::getInstance()->getScheduler() even in another Scheduler		2014-03-04 22:08:55 +08:00
..
2d	Merge pull request #5517 from bmanGH/feature/fix_timer_cancel_bug	2014-03-04 22:08:55 +08:00
audio	Merge branch 'develop' of https://github.com/akof1314/cocos2d-x into develop	2014-01-08 17:03:44 +08:00
base	fix console loop	2014-02-26 23:51:45 +08:00
editor-support	Merge branch 'develop' into visit_draw_improved	2014-03-03 11:27:42 -08:00
gui	issue #4234: Fixes linking error in UI.	2014-03-04 13:49:54 +08:00
math/kazmath	Implements AABB culling for sprites	2014-02-22 17:47:56 -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