262 Commits

Author	SHA1	Message	Date
Nite Luo	a28f3f6f03	Merge branch 'develop' into newRenderer	2013-11-11 12:04:28 -08:00
Nite Luo	5a1d92cbf2	Merge branch 'develop' into newRenderer ... Conflicts: samples/Cpp/TestCpp/Classes/controller.cpp	2013-11-08 14:01:08 -08:00
Huabing.Xu	6f1e98df34	Merge branch 'develop' of github.com:cocos2d/cocos2d-x into iss3025_TextureCache	2013-11-08 13:50:22 +08:00
Nite Luo	be71eb8626	Merge branch 'develop' into newRenderer ... Conflicts: .gitignore build/cocos2d_libs.xcodeproj/project.pbxproj build/cocos2d_samples.xcodeproj/project.pbxproj cocos/2d/CCDirector.cpp	2013-11-07 17:24:57 -08:00
Huabing.Xu	99bcca0532	issue #3025: replace TextureCache::getInstance() by Director::getInstance()->getTextureCache() in cocos folder	2013-11-07 19:11:09 +08:00
Nite Luo	21cd03bc13	Remove transform from QuadCommand, NewSprite using world coordinates	2013-11-06 16:39:20 -08:00
Michael Contento	b7173cd60d	add Sprite::setScale(float, float)	2013-11-06 14:42:31 +01:00
Ricardo Quesada	555f3609c8	Uses `const std::string&` ... ... instead of const char* * Because it is more robust * and it is faster... yes faster. It is faster because internally some of our classes use std::string (like FileUtils and Dictionary) so converting back-and-forth from const char * to std::string is very expensive. It is faster to have everthing in std::string as soon as possible to prevent further conversions. There are still some parts of the code that require conversion, but most of the code was converted.	2013-11-05 19:02:03 -08:00
Nite Luo	e4ffd250cb	Simple implementation of RenderCommand and RenderQueue	2013-11-04 09:14:22 -08:00
boyu0	d12ee5f120	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2771_physical	2013-10-18 15:34:13 +08:00
minggo	95acb1b9e3	issue #2905: helloworld build ok on android	2013-10-14 14:01:00 +08:00
minggo	49d7bbd600	issue #2905: remove sub folders except platform	2013-10-12 15:41:45 +08:00