minggo
|
1d04b42947
|
Put "initxx" functions into protected.
|
2014-01-03 18:15:56 +08:00 |
James Chen
|
cf006df9ff
|
closed #2865: Deprecates CCNotificationCenter, uses EventDispatcher instead.
|
2013-12-31 10:54:37 +08:00 |
boyu0
|
2fb0179293
|
change QuadCommand variable to class member.
|
2013-12-26 16:36:03 +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 |
Nite Luo
|
8801f508eb
|
Partcle system use the new renderer
|
2013-12-02 12:13:05 -08:00 |
Ricardo Quesada
|
dd68eb4796
|
ParticleSystem uses protected constructors
|
2013-11-14 16:21:49 -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
|
49d7bbd600
|
issue #2905: remove sub folders except platform
|
2013-10-12 15:41:45 +08:00 |