Commit Graph

77 Commits

Author SHA1 Message Date
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
boyu0 7cbce905bf issue #3162: delete duplicate functions. 2013-12-11 16:12:14 +08:00
Ricardo Quesada 8df96b1a6e Layercolor uses the new API 2013-12-06 17:59:34 -08:00
boyu0 af5f496861 issue #3162: Merge Node and NodeRGBA, fix bug: Child's opacity will not be changed when its parent's setCascadeOpacityEnabled was set to true and opacity was changed. 2013-12-06 18:07:16 +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
James Chen 499a0404d4 issue #2790: Renames some functions in Vector<T>. Makes it more like stl vector. 2013-12-05 10:35:10 +08:00
James Chen 9928e8bef1 issue #2790: Uses Vector<T>::getObjectAtIndex instead of Vector<T>[] operator to avoid some mistakes. 2013-12-04 16:01:55 +08:00
James Chen cb215bc931 issue #2790: Vector<T> replaces Array* finished. 2013-12-04 16:01:55 +08:00
James Chen 1d5984b29a issue #2790: Vector::makeObjectsPerformCallback —> Vector::forEach 2013-12-04 16:01:02 +08:00
James Chen 90062b656d issue #2790: Node::_children is Vector<Node*> now. 2013-12-04 16:00:17 +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 f3830985bb Sprite now using New renderer 2013-11-25 16:33:05 -08:00
Nite Luo b67ec6618f Finish converting LayerColor start working on particle system 2013-11-22 17:14:24 -08:00
Dhilan007 bd3789e0b5 add miss api 2013-11-20 10:40:43 +08:00
Dhilan007 0646e59bf3 resolve conflict 2013-11-20 10:26:00 +08:00
Ricardo Quesada 582afe3b61 Fixes warnings in CCLabel
These warnings were introduced yesterday.
Since we are paying attention to the warnings, new code MUST NOT
generate new warnings.
2013-11-19 13:51:40 -08:00
Dhilan007 1a65af9d1a fix warn 2013-11-19 15:54:54 +08:00
Dhilan007 f0ab3f9ca1 fix some error in layer controller code 2013-11-19 15:41:22 +08:00
Dhilan007 0586c4d275 recover controller on layer. 2013-11-19 13:56:30 +08:00
boyu0 e8d06496d0 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2771_physical 2013-10-30 17:27:09 +08:00
boyu0 66d1bbd89f issue #2771: edit physics effect with all bodies and fix some bugs 2013-10-28 16:17:19 +08:00
James Chen efa5afb1c3 [Dispatcher] Removing unused codes in Layer. 2013-10-25 15:19:25 +08:00
James Chen 9632cd7949 memoryleak fix. 2013-10-25 10:53:47 +08:00
James Chen 779e539658 Remove event controller codes from Layer class. HelloCpp works. 2013-10-25 10:53:45 +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