yangxiao ae180d8326 merge		2014-06-17 11:02:05 +08:00
..
2d	test new version and modify vs2012 project	2014-06-17 10:52:55 +08:00
3d	resolve conflict	2014-06-17 10:52:48 +08:00
audio	Merge pull request #6657 from asmodehn/asmo_newv3_cmake_win32	2014-05-29 15:25:58 +08:00
base	Merge pull request #7030 from Rumist/v3	2014-06-12 16:16:13 +08:00
deprecated	Point is no longer deprecated	2014-05-18 15:12:48 -07:00
editor-support	Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3	2014-06-12 15:53:41 +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	The filename should be converted to lower case before comparing.	2014-06-13 15:32:49 +08:00
renderer	Merge branch 'newcode' into v3	2014-06-16 22:36:01 +08:00
scripting/lua-bindings	[AUTO]: updating luabinding automatically	2014-06-16 02:49:38 +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	Fix the crash of cocostudio ui lua test cases and add some deprecated functions of Widget	2014-06-10 11:30:39 +08:00
Android.mk	fix cache, android work	2014-06-16 23:43:07 +08: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	* Set COCOS2D_VERSION to 3.2.0	2014-06-06 12:58:32 +03:00