Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
35,864 Commits 2 Branches 31 Tags 1.1 GiB
Commit Graph

72 Commits

Author SHA1 Message Date
boyu0 2fb0179293 change QuadCommand variable to class member. 2013-12-26 16:36:03 +08:00
boyu0 f878864794 Specialize GroupCommand and CustomCommand, change generateCommand to new. 2013-12-26 15:41:47 +08:00
boyu0 082c3d274a Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into edit_hungarian_notation 2013-12-18 18:05:30 +08:00
boyu0 e07c4ffec1 Change NULL to nullptr, edit hungarian notation. 2013-12-18 17:47:20 +08:00
Ricardo Quesada 33c4f891a0 Adds 'CC' to renderer files 2013-12-17 18:41:09 -08:00
Ricardo Quesada d6be81b7a8 The Renderer is not a singleton 
In order to access, you have to get it from the Director

`Director::getInstance()->getRenderer()`
 2013-12-17 17:50:17 -08:00
Ricardo Quesada 61cc365d9e Merge branch 'develop' into newRenderer 
Conflicts:
	cocos/2d/CCGLProgram.h
	cocos/2d/CCLabelTTF.h
 2013-12-12 14:41:42 -08:00
Ricardo Quesada a8c317bd83 getDescription() works as expected 
renames `description` to `getDescription`. Adds `virtual`  to it.
Adds `getDescription` to missing nodes.
 2013-12-12 14:30:22 -08:00
Ricardo Quesada ee0ef6bf46 ProgressTimer works OK 
Adds _modelViewTransform as  ivar of Node (temporary fix)
 2013-12-06 17:42:16 -08:00
Ricardo Quesada 745541979b Particles working again. 
Paticle Batch working too: increased VBO_SIE to 10500
 2013-12-06 11:51:17 -08:00
Ricardo Quesada e699a3b765 Uses MV in Quad Command 2013-12-05 19:04:01 -08:00
Huabing.Xu 7a58cb5a29 use quad command instead of custom command for ParticleSystemQuad::draw() 2013-12-05 10:20:22 +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 d33f05b3f0 refactor: custom command use a non parameter constructor and a reentrant init function 2013-12-03 11:17:21 +08:00
Nite Luo 8801f508eb Partcle system use the new renderer 2013-12-02 12:13:05 -08:00
Ricardo Quesada 5c74c938ee Merge branch 'develop' into constructors_are_protected 
Conflicts:
	cocos/2d/CCLayer.h
 2013-11-19 13:13:57 -08:00
Huabing.Xu fff851a8aa HotFix: change tab to space 2013-11-19 11:17:02 +08:00
Ricardo Quesada dd68eb4796 ParticleSystem uses protected constructors 2013-11-14 16:21:49 -08:00
bmanGH 2687ee8915 put '{' in a new line to follow cocos2d-x coding style 2013-11-13 14:52:16 +08:00
bmanGH 683ce1692d Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into feature/configuration_VAO_runtime 
Conflicts:
	cocos2dx/CCConfiguration.cpp
	cocos2dx/draw_nodes/CCDrawNode.cpp
	cocos2dx/particle_nodes/CCParticleSystemQuad.cpp
	cocos2dx/platform/android/CCEGLView.cpp
	cocos2dx/platform/ios/EAGLView.mm
	cocos2dx/textures/CCTextureAtlas.cpp
	cocos2dx/textures/CCTextureAtlas.h
 2013-11-12 20:18:04 +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