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 |
Nite Luo
|
143df8af7d
|
Fix RenderTexture after merging commandpool
|
2013-12-04 15:13:13 -08:00 |
Nite Luo
|
f423166471
|
Fix bugs with RenderTexture with NewRender
|
2013-12-04 15:06:28 -08:00 |
Nite Luo
|
ae551ae294
|
Convert RenderTexture to use RenderCommands
|
2013-12-04 11:54:57 -08:00 |
Nite Luo
|
6862d59bb2
|
Add NewRenderTexture to convert RenderTexture to use new renderer
|
2013-12-02 17:23:52 -08:00 |