16 Commits

Author	SHA1	Message	Date
zhangbin	b9eacf8517	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop	2013-07-25 10:20:56 +08:00
zhangbin	9944a5d186	Rename the singleton methods name in sample project of plugin. ... Remove the deprecated methods.	2013-07-24 15:31:20 +08:00
James Chen	35dec5d71e	More CCLog --> log.	2013-07-24 10:46:13 +08:00
zhangbin	9edc1dff80	closed #2416, Add social plugin : SocialNd91 & add sample code for social plugins.	2013-07-23 14:29:11 +08:00
James Chen	56419b9e90	issue #2410: [Android] Adding listener for CCDrawNode when application resume from background. ... Reset the order of reloading shaders and textures in main.cpp.	2013-07-17 12:53:30 +08:00
James Chen	510b29a2ff	Merge branch 'android-textures-fix' of https://github.com/jotel/cocos2d-x into shared-codes ... Conflicts: cocos2dx/textures/CCTextureCache.cpp	2013-07-16 16:33:02 +08:00
James Chen	759831c1d8	issue #2397: Application::sharedApplication --> Application::getInstance.	2013-07-15 16:24:42 +08:00
James Chen	f8cd252c5c	issue #2397: sharedNotificationCenter --> getInstance	2013-07-12 14:17:42 +08:00
James Chen	1f8e852020	issue #2397: Shader::sharedShaderCache() --> Shader::getInstance().	2013-07-12 13:40:01 +08:00
James Chen	2c1b26acf8	issue #2397: EGLView::sharedOpenGLView() --> EGLView::getInstance()	2013-07-12 13:11:21 +08:00
James Chen	88a28b041e	issue #2397: Director::sharedDirector --> Director::getInstance() for all files.	2013-07-12 11:50:36 +08:00
Jaroslaw Lewandowski	626ba2686f	Solving 'black screen' on android	2013-07-09 21:21:43 +01:00
zhangbin	2bdf55d78d	Add workspace for iOS projects of plugin-x.	2013-07-05 11:42:01 +08:00
zhangbin	e999cc9541	closed #2376, Add online IAP feature in plugins : uc, nd91 & qh360.	2013-07-05 10:51:08 +08:00
zhangbin	5b1d5e0d3e	closed #2349, Add user login/logout plugin UC.	2013-07-02 10:51:01 +08:00
zhangbin	530afbb9d9	issue #2336, Add a sample project with all plugins.	2013-06-28 11:46:39 +08:00