Commit Graph

25 Commits

Author SHA1 Message Date
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
minggo 86646bb820 issue #2329:fixed a compiling error of AssetsManager on Android 2013-06-25 17:09:10 +08:00
minggo 0a768da240 issue #2305: use 4.7 toolchain to fix compiling errors 2013-06-21 17:17:23 +08:00
James Chen 1fb9f44d15 issue #2129: Removing CC prefix for samples module. 2013-06-20 14:17:10 +08:00
minggo 4f484cbcbf enable c++11 for android projects 2013-06-03 11:02:41 +08:00
minggo 78d3c7f048 fixed #1613:not reload resources on Android platform after return from background 2013-04-17 15:34:57 +08:00
fape e9343c2d8a - update README files
- format javascript sample README files like cpp samples
2013-03-21 16:04:53 +01:00
minggo ee37529884 remove unsupported parameter in android 2013-03-20 16:04:42 +08:00
minggo 58618172e6 merge pull request and fix some conflicts 2013-03-18 16:15:48 +08:00
minggo 19cf6665c4 Merge pull request #2176 from folecr/easierandroidbuild
Improvements to android build setup and samples' build scripts
2013-03-17 18:58:11 -07:00
folecr 6dba49f25b Android build_native.sh now reads local.properties for environment variables 2013-03-15 16:44:16 -07:00
Ricardo Quesada 59ca1e198a README.md eclipse improvements
Includes screenshots, fixes instructions, looks better
2013-03-15 15:20:39 -07:00
Rohan Kuruvilla 7149f0598d Adding missing eclipse project files 2013-03-07 12:13:50 -08:00
Rohan Kuruvilla 360519dad5 Removing /bin/bash for executing build command, and keep only bash 2013-03-07 12:09:17 -08:00
Rohan Kuruvilla 7d90fc2254 Adding README files to each sample project 2013-03-04 11:50:39 -08:00
Rohan Kuruvilla 4d14afa686 Modifying C++ project files to remove dependency on scripting 2013-03-04 11:50:39 -08:00
minggo 442e8ea0cc issue #1489:android works ok 2013-02-25 16:58:10 +08:00
minggo c8baa94753 issue #1489: update ios libcurl and add android project 2013-02-25 14:33:04 +08:00