12 Commits

Author	SHA1	Message	Date
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
James Chen	88a0dbec5e	Merge branch 'iss2305-replace-pthread' of https://github.com/minggo/cocos2d-x into minggo-iss2305-replace-pthread	2013-06-21 21:29:25 +08:00
minggo	0a768da240	issue #2305: use 4.7 toolchain to fix compiling errors	2013-06-21 17:17:23 +08:00
James Chen	d1bd34fd08	issue #2129: Removing CC prefix for template.	2013-06-20 22:18:43 +08:00
minggo	78d3c7f048	fixed #1613:not reload resources on Android platform after return from background	2013-04-17 15:34:57 +08:00
James Chen	a54edec0e3	issue #1733: Adding "multi-platform-cpp" and "multi-platform-lua" projects to template folder.	2013-02-19 15:38:30 +08:00