pandamicro ce0166ef6e Merge pull request #13940 from CocosRobot/update_lua_bindings_1442584025 ... [ci skip][AUTO]: updating luabinding & jsbinding automatically		2015-09-18 21:55:21 +08:00
..
2d	Merge pull request #13913 from fusijie/revert-12889-fix_clippingRectangle_bug	2015-09-18 21:43:42 +08:00
3d	merge cocos	2015-09-18 14:08:33 +08:00
audio	AudioEngine:Fixed audio can not resume if it is interrupted cause by an incoming phone call.	2015-09-07 16:29:57 +08:00
base	Merge pull request #12071 from waiter/v3	2015-09-18 21:39:36 +08:00
deprecated	Use string::empty() to check whether string is empty.	2015-09-01 11:26:09 +08:00
editor-support	fix ReEntry a same frame when scale action's speed.	2015-09-16 15:44:43 +08:00
math	Finished AutoPolygon and Sprite	2015-06-04 15:43:31 +08:00
navmesh	fix tons of warnings	2015-07-15 12:04:48 +08:00
network	Remove AssetsManager dependence with CRUL.	2015-09-17 16:52:31 +08:00
physics	add physics component	2015-09-08 09:54:01 +08:00
physics3d	supplement annotations	2015-08-26 17:24:36 +08:00
platform	Merge pull request #13905 from perminovVS/win32-remove-dir-correct-point	2015-09-18 18:14:20 +08:00
renderer	merge cocos	2015-09-16 10:37:24 +08:00
scripting	[ci skip][AUTO]: updating luabinding & jsbinding automatically	2015-09-18 13:51:58 +00:00
storage	issue #12078: added storage group.	2015-05-28 15:48:08 +08:00
ui	add UIEditBox support linux platform.	2015-09-18 17:11:58 +08:00
Android.mk	Remove AssetsManager dependence with CRUL.	2015-09-17 16:52:31 +08:00
CMakeLists.txt	add UIEditBox support linux platform.	2015-09-18 17:11:58 +08:00
cocos2d.cpp	Update engine versions	2015-08-31 13:52:15 +08:00
cocos2d.h	merge cocos	2015-09-17 14:24:01 +08:00