James Chen
|
f51c39c034
|
closed #3897 : Constructors should be protected, but should be a way to disable them, added CC_CONSTRUCTOR_ACCESS.
Thank @pandamicro.
|
2014-03-21 13:44:29 +08:00 |
walzer
|
64af0de648
|
update copyrights for 2014, in cocos/2d/ folder
|
2014-01-07 11:25:07 +08:00 |
boyu0
|
ef54ed3c15
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into HEAD
Conflicts:
cocos/2d/CCLabel.cpp
cocos/2d/CCLabel.h
cocos/2d/CCLabelBMFont.cpp
cocos/2d/CCLabelBMFont.h
cocos/2d/CCLayer.cpp
cocos/2d/CCLayer.h
cocos/2d/CCNode.cpp
extensions/GUI/CCControlExtension/CCControl.cpp
extensions/GUI/CCControlExtension/CCControlButton.cpp
extensions/GUI/CCControlExtension/CCScale9Sprite.cpp
tools/tojs/cocos2dx.ini
|
2013-12-19 17:05:59 +08:00 |
boyu0
|
e07c4ffec1
|
Change NULL to nullptr, edit hungarian notation.
|
2013-12-18 17:47:20 +08:00 |
boyu0
|
d4c8fb0be6
|
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into bug3162_opacity_incorrect
|
2013-12-13 10:47:52 +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 |
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 |
James Chen
|
54289276de
|
issue #2790: ValueArray —> ValueVector, ValueDict —> ValueMap, IntValueDict —> IntValueMap.
|
2013-12-04 17:46:57 +08:00 |
James Chen
|
5c60f66c63
|
issue #2790: Menu::itemForTouch —> Menu::getItemForTouch. Array* —> ValueArray.
|
2013-12-04 16:02:53 +08:00 |
James Chen
|
90062b656d
|
issue #2790: Node::_children is Vector<Node*> now.
|
2013-12-04 16:00:17 +08:00 |
Ricardo Quesada
|
7c2ed2743c
|
Menu + MenuItem
`Menu` and `MenuItem` have protected constructors
|
2013-11-15 13:14:12 -08:00 |
James Chen
|
9ed263056c
|
Use eventDispatcher to dispatch event. Remove controller codes in Layer.
|
2013-10-25 10:53:46 +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 |