minggo 26a4eaaac7 Merge pull request #6939 from dabingnn/v3FixAndroid ... V3 fix android		2014-06-03 10:26:01 +08:00
..
2d	fix coding style	2014-05-30 15:13:59 +08:00
3d	Squashed commit of the following:	2014-05-18 14:49:16 -07:00
audio	Merge pull request #6657 from asmodehn/asmo_newv3_cmake_win32	2014-05-29 15:25:58 +08:00
base	CCUserDefault.cpp: Should not compile on Mac platform (should be using CCUserDefault.mm implementation).	2014-05-29 10:36:15 -04:00
deprecated	Point is no longer deprecated	2014-05-18 15:12:48 -07:00
editor-support	Merge pull request #6616 from xhcnb/fix_callback	2014-05-27 14:51:36 +08:00
math	Point is no longer deprecated	2014-05-18 15:12:48 -07:00
network	Merge pull request #6657 from asmodehn/asmo_newv3_cmake_win32	2014-05-29 15:25:58 +08:00
physics	closed #4944: fixed bug: physics engine crashes occasionally when remove bodies at physics contact callback.	2014-05-21 16:07:49 +08:00
platform	Merge pull request #6922 from zawasp/android_flicker	2014-05-29 15:15:15 +08:00
renderer	Merge branch 'v3.1hotfix' into v3	2014-05-30 10:19:56 +08:00
scripting/lua-bindings	[AUTO]: updating luabinding automatically	2014-05-27 06:31:18 +00:00
storage	upgrade win32 projects for Visual Studio 2013 (solves Platform Toolset v100 not found).	2014-05-07 17:41:04 +03:00
ui	rename UILayout	2014-05-28 10:17:34 +08:00
Android.mk	Squashed commit of the following:	2014-05-18 14:49:16 -07:00
CMakeLists.txt	Squashed commit of the following:	2014-05-18 14:49:16 -07:00
cocos2d-prefix.pch	Squashed commit of the following:	2014-05-16 14:36:00 -07:00
cocos2d.cpp	update version	2014-05-23 14:30:08 +08:00
cocos2d.h	move the capturen screen interface from Director to ccUtils	2014-05-27 10:44:23 +08:00