samuele3hu ee4e5e4800 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_fix		2014-05-14 14:45:15 +08:00
..
2d	Adds effectNode in ShaderTest2	2014-05-13 18:12:58 -07:00
audio	upgrade win32 projects for Visual Studio 2013 (solves Platform Toolset v100 not found).	2014-05-07 17:41:04 +03:00
base	trackRef and untrackRef are static function now.	2014-05-14 11:55:20 +08:00
deprecated	Adds effectNode in ShaderTest2	2014-05-13 18:12:58 -07:00
editor-support	Matrix::identity() -> IDENTITY	2014-05-13 10:26:25 -07:00
math	Matrix::identity() -> IDENTITY	2014-05-13 10:26:25 -07:00
network	upgrade win32 projects for Visual Studio 2013 (solves Platform Toolset v100 not found).	2014-05-07 17:41:04 +03:00
physics	rolling back physics in layer	2014-05-01 16:42:35 -07:00
renderer	Adds effectNode in ShaderTest2	2014-05-13 18:12:58 -07:00
scripting/lua-bindings	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_fix	2014-05-14 14:45:15 +08:00
storage	upgrade win32 projects for Visual Studio 2013 (solves Platform Toolset v100 not found).	2014-05-07 17:41:04 +03:00
ui	issue #4900, refactor	2014-05-14 09:55:55 +08:00
Android.mk	Merge pull request #6635 from dumganhar/iss4660-unicode	2014-05-12 17:57:25 +08:00
CMakeLists.txt	linux cmake improvements	2014-05-01 13:01:51 -07:00
cocos2d.cpp	it is v3.1-alpha1	2014-05-09 17:03:34 -07:00
cocos2d.h	ShaderCache -> GLProgramCache	2014-05-09 18:39:25 -07:00