pandamicro 92a33225ff Fixed #5533: Make SpriteFrame's constructor and init functions public temporarily to avoid issues		2014-06-10 11:39:48 +08:00
..
2d	Fixed #5533: Make SpriteFrame's constructor and init functions public temporarily to avoid issues	2014-06-10 11:39:48 +08:00
3d	Merge remote-tracking branch 'cocos2d/v3' into normalized_position	2014-06-04 09:19:22 -07:00
audio	Merge pull request #6657 from asmodehn/asmo_newv3_cmake_win32	2014-05-29 15:25:58 +08:00
base	Merge pull request #6938 from CaryZheng/v3	2014-06-06 15:29:33 +08:00
deprecated	Point is no longer deprecated	2014-05-18 15:12:48 -07:00
editor-support	Merge remote-tracking branch 'cocos2d/v3' into normalized_position	2014-06-04 09:19:22 -07: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	fix issue on Xcode 6	2014-06-09 17:06:40 +08:00
renderer	Save the bound texture unit so that the sampler can be updated dynamiclly.	2014-06-09 10:58:28 +08:00
scripting/lua-bindings	[AUTO]: updating luabinding automatically	2014-06-09 07:30:49 +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	Merge pull request #7014 from andyque/ImproveUIText	2014-06-09 15:27:04 +08:00
Android.mk	fix other platform compile error	2014-06-04 14:56:34 +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