yinkaile
|
8f1ba73a52
|
fixed add ParticleSystem display crashed
|
2014-03-03 14:56:56 +08:00 |
minggo
|
4381685a9d
|
deprecated some functions in Object
|
2014-01-22 13:47:29 +08:00 |
Ricardo Quesada
|
d0dbf34319
|
removes "include "cocos2d.h" from cocos2d files
|
2014-01-16 21:35:58 -08:00 |
walzer
|
d4c1aa92d5
|
add copyrights for 2014, in folders other then 2d.
|
2014-01-07 11:47:11 +08:00 |
yinkaile
|
1f38fc28a6
|
change interface
|
2014-01-02 11:07:31 +08:00 |
yinkaile
|
ba809a0096
|
change const char* to const std::string&
|
2013-12-23 14:05:46 +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 |
yinkaile
|
d3a575e8cc
|
change for iterator and callfunc
|
2013-12-18 22:07:33 +08:00 |
yinkaile
|
581a7856de
|
fixed compiler error
|
2013-12-17 19:32:16 +08:00 |
youyou
|
a884a70045
|
fix2d compling warning
|
2013-12-09 13:56:07 +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 |
youyou
|
e17b9d839b
|
1.add TEST_EASING
2.add play serveral movement function
3.update TEST_COLLIDER_DETECTOR
4.fixed movement event
|
2013-12-06 13:40:49 +08:00 |
yinkaile
|
677cf00355
|
fix compiler warning
|
2013-11-11 15:29:24 +08:00 |
2youyou2
|
0a72c3c1c2
|
1.when add a skin to last index, applay it's skindata to the previous skindata
2.Do not retain target when regist frame event and movement event
|
2013-11-11 13:33:47 +08:00 |
2youyou2
|
12d6bc1722
|
1. change CCARRAY_FOREACH to range-based loop
|
2013-11-06 15:25:44 +08:00 |
2youyou2
|
f05c1590ae
|
1.fix particle kCCPositionTypeFree state bug
|
2013-11-06 11:20:16 +08:00 |
2youyou2
|
16c23d0ad3
|
remove CC_PROPERTY and CC_SYNTHESIZE.
|
2013-11-05 19:53:38 +08:00 |
2youyou2
|
3eef64c3b8
|
1. Change NULL to null
2. Remove CocoStudio/Armature files
|
2013-11-05 15:32:13 +08:00 |
yinkaile
|
8fa8b9f844
|
update develop
|
2013-10-30 09:41:40 +08:00 |
yinkaile
|
2d3df69982
|
fix add display
|
2013-10-29 16:57:06 +08:00 |
minggo
|
8f7a489a4d
|
issue #2905:make cocostudio and gui flat
|
2013-10-16 16:48:39 +08:00 |