James Chen
|
177bf4df9d
|
Some warning fixes.
|
2014-03-14 15:38:43 +08:00 |
James Chen
|
5e6130c92c
|
issue #4058: Get rid of Object ,rename it to Ref.
|
2014-02-20 10:53:49 +08:00 |
James Chen
|
46153d8c34
|
More warning fixes.
|
2014-01-04 09:17:37 +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 |
James Chen
|
d74ebe18a9
|
issue #2171: NULL —> nullptr for Android warning of CCBAnimationManager.cpp.
|
2013-12-17 14:19:35 +08:00 |
boyu0
|
defae416f3
|
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into bug3162_opacity_incorrect
|
2013-12-13 18:09:39 +08:00 |
boyu0
|
d7106d49be
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into bug3162_opacity_incorrect
|
2013-12-12 17:04:21 +08:00 |
minggo
|
1e9c763b40
|
use ssize_t for index and capacity
|
2013-12-12 14:48:26 +08:00 |
James Chen
|
f10bd853c0
|
A warning fix in CCBAnimationManager. Uses CallFuncN::create(std::function) instead.
|
2013-12-10 20:33:21 +08:00 |
boyu0
|
a71394b122
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into bug3162_opacity_incorrect
|
2013-12-10 18:03:41 +08:00 |
James Chen
|
479477be52
|
issue #2790: Stops all actions when reset _rootNode.
|
2013-12-10 13:41:51 +08:00 |
James Chen
|
64fd2386a9
|
issue #2790: Uses Map<K, V> instead of Dictionary in CCBAnimationManager.
|
2013-12-09 18:17:04 +08:00 |
James Chen
|
d1d5659818
|
issue #2790: Uses Vector<T> or Map<K, V> as many as possible for CCBReader.
|
2013-12-09 17:55:56 +08:00 |
James Chen
|
d63b933eb3
|
issue #2790: More CCArray —> Vector<T> or ValueVector for CCBAnimationMangager
|
2013-12-09 17:55:55 +08:00 |
James Chen
|
e07f2bdddd
|
issue #2790: Vector<T> and Map<K, V> for CCBReader. Not finished yet.
|
2013-12-08 22:17:54 +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
|
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
|
c152652c5b
|
issue #2790: Vector<FiniteTimeAction*> for Sequence::create(arr) and Spawn::create(arr).
|
2013-12-04 15:56:08 +08:00 |
samuele3
|
5c8d24a11e
|
hot fix:Repair the crash of cocostudio and the bug of some lua test samples can't come in
|
2013-11-18 14:12:07 +08:00 |
minggo
|
db804891ed
|
fix some warnings
|
2013-11-16 20:02:49 +08:00 |
garfield_ho
|
0002815acb
|
Modify the sequenceCompleted method in CCBAnimationManager,So it can set the next sequence in callback
|
2013-10-22 15:56:35 +08:00 |
minggo
|
6fc2be62f5
|
issue #2905: testcpp bild ok on Android
|
2013-10-15 18:00:03 +08:00 |
minggo
|
4313c46e93
|
issue #2905:adjust folder structure
|
2013-10-12 11:22:05 +08:00 |