Ricardo Quesada 9ffaeec515 Merge branch 'improved_glprogram' of github.com:super626/cocos2d-x into improved_glprogram		2014-05-09 12:00:33 -07:00
..
2d	Merge branch 'improved_glprogram' of github.com:super626/cocos2d-x into improved_glprogram	2014-05-09 12:00:33 -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	moves shaders files from 2d/ to renderer/	2014-05-08 18:01:48 -07:00
deprecated	Yeahhhhhh	2014-05-08 12:34:26 -07:00
editor-support	moves shaders files from 2d/ to renderer/	2014-05-08 18:01:48 -07:00
math	Merge branch 'v3' into v3.1_unify_ZERO_ONE	2014-05-05 18:10:13 -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	Merge branch 'improved_glprogram' of github.com:super626/cocos2d-x into improved_glprogram	2014-05-09 11:36:02 -07:00
scripting/lua-bindings	fixed deprecation warnings	2014-05-08 16:42:36 -07: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 remote-tracking branch 'cocos2d/v3' into improved_glprogram	2014-05-09 11:40:13 -07:00
Android.mk	Merge remote-tracking branch 'upstream/v3' into focus3861	2014-05-07 11:42:09 +08:00
CMakeLists.txt	linux cmake improvements	2014-05-01 13:01:51 -07:00
cocos2d.cpp	Squashed commit of the following:	2014-04-26 10:11:22 -07:00
cocos2d.h	moves shaders files from 2d/ to renderer/	2014-05-08 18:01:48 -07:00