6 Commits

Author	SHA1	Message	Date
Ricardo Quesada	81b06f06a9	Merge branch 'develop' into newRenderer ... Conflicts: cocos/2d/CCAtlasNode.h	2013-12-05 22:24:41 -08:00
Ricardo Quesada	e699a3b765	Uses MV in Quad Command	2013-12-05 19:04:01 -08:00
Ricardo Quesada	f68dcd9969	Merge branch 'develop' into newRenderer ... Conflicts: build/cocos2d_libs.xcodeproj/project.pbxproj samples/Cpp/TestCpp/Classes/tests.h	2013-12-05 11:47:46 -08:00
Huabing.Xu	757f1abc7f	1. protected render command construction/destruction function. ... 2. use renderCommandPool<T> to allocate and deallocate command 3. use releaseToCommandPool interface to push command back to pool	2013-12-03 14:08:47 +08:00
Huabing.Xu	ace75eebce	refactor: quad command use a non parameter constructor and a reentrant init function	2013-12-03 11:11:46 +08:00
Nite Luo	fbadb3329a	Merge branch 'develop' into newRenderer ... Conflicts: build/cocos2d_libs.xcodeproj/project.pbxproj	2013-12-02 10:55:31 -08:00