minggo cc221e5e16 Merge pull request #8036 from CocosRobot/update_lua_bindings_1410745737 ... [AUTO]: updating luabinding automatically		2014-09-15 09:56:20 +08:00
..
2d	fix memory leak when use menu_selector.	2014-09-14 21:41:19 +08:00
3d	support transparent object	2014-09-12 17:57:54 +08:00
audio	Merge pull request #7920 from rny/audio_win32	2014-09-15 09:37:11 +08:00
base	even more cmake fixes	2014-09-11 17:36:49 -07:00
deprecated	Adds MARK: TODO: FIXME: in code	2014-08-29 12:54:24 -07:00
editor-support	remove deprecated warning	2014-09-12 17:06:13 +08:00
math	Merge pull request #7976 from samuele3hu/v3_check_mat	2014-09-11 14:47:39 +08:00
network	Rename setSSLVerification	2014-09-14 00:28:11 +09:00
physics	Moved base/CCPlatform* -> platform/CCPlatform*	2014-09-09 17:17:07 -07:00
platform	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_shadercompilefix	2014-09-12 15:38:29 +08:00
renderer	Merge pull request #8020 from dabingnn/v3_MaterialIDBug	2014-09-12 17:15:49 +08:00
scripting/lua-bindings	[AUTO]: updating luabinding automatically	2014-09-15 01:50:32 +00:00
storage/local-storage	Moved base/CCPlatform* -> platform/CCPlatform*	2014-09-09 17:17:07 -07:00
ui	remove auto scale text	2014-09-15 09:28:56 +08:00
Android.mk	Merge pull request #7968 from Dhilan007/v3-audio903	2014-09-11 15:23:17 +08:00
CMakeLists.txt	Merge branch 'billboard' of https://github.com/super626/cocos2d-x into billboard	2014-09-11 16:06:00 +08:00
cocos2d-prefix.pch	add cocos2d.h into pre-compiled header	2014-08-26 16:45:24 +08:00
cocos2d.cpp	Moved base/CCPlatform* -> platform/CCPlatform*	2014-09-09 17:17:07 -07:00
cocos2d.h	merge cocos	2014-09-10 10:28:59 +08:00