minggo
63e4091bfa
fixed #1686:finish updating
2013-02-28 11:55:36 +08:00
minggo
cd4f18c48f
issue #1686:synchronize CCLayer.cpp
2013-02-27 18:21:35 +08:00
minggo
94076a5b9c
issue #1686:synchronize CCSprite.cpp
2013-02-27 15:30:49 +08:00
minggo
f571d66ed7
issue #1686:synchronize CCNode.cpp
2013-02-27 14:48:19 +08:00
James Chen
7dc64fc9a6
issue #1686 : sync to CCLayer
2013-02-27 09:38:30 +08:00
James Chen
fdf8595353
tab -> 4 space.
2013-02-22 16:16:16 +08:00
James Chen
476e3801eb
tab -> 4 space.
2013-02-22 16:15:17 +08:00
James Chen
b54b924923
fixed #1743 : Adding an additional transform for CCNode.
2013-02-22 16:01:49 +08:00
jiang xiaohua
d875edbd74
Additional a transformation matrix, Used in is not parent-child relationship but we still need to maintain transformation parent-child
Example:
GameObject_Parent(CCNode; create from CCNode)
GameObject_sub1(CCNode; Create from the same CCSpriteBatchNode,the node's parent is CCLayer )
RenderComponents1( Create form the same CCSpriteBatchNode)
Components2
....
GameObject_sub2 (CCNode; Create from the CCNode,the node's parent is GameObject_Parent )
RenderComponents1( not used batchNode)
Now, GameObject_sub1 not GameObject_Parent node, but I want it to simulate the change of the son is GameObject_Parent;
I Need additional the father's matrix in child Node ;
2013-02-20 22:33:28 +08:00
James Chen
f2303b854a
Fixed a typo, and regenerated luabinding codes.
2013-01-23 15:59:13 +08:00
walzer
db59b047f0
remove "inline" keyword from set/getPositionX/Y() methods to make the compilation property without additional flags.
2013-01-21 20:57:06 +08:00
walzer
b1285ca7a7
CCNode: add [set|get]Position[X|Y](void) back.
2013-01-21 16:26:33 +08:00
walzer
996d2be2b6
CCNode: add [set|get]Position[X|Y](void) back.
2013-01-21 16:26:02 +08:00
walzer
8657da80a6
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
2013-01-18 18:06:51 +08:00
minggo
6379b61400
fixed #1664:fixed a logical error in CCAtlasNode::setOpacityModifyRGB()
2013-01-18 16:40:42 +08:00
walzer
7b16494862
well documented CCNode
2013-01-17 11:20:25 +08:00
James Chen
6733f786a5
fixed #1649 : Reverted some invokings of function that returns const reference.
2013-01-14 16:06:18 +08:00
James Chen
6565fa92cc
fixed #1649 : Changed return type to const reference for member variable access.
2013-01-14 15:51:53 +08:00
dualface
c3f900d36c
[lua] remove current schedule before register new script schedule
2012-12-14 18:06:21 +08:00
James Chen
15251626b0
Merge pull request #1748 from guanqun/fix-doxygen
...
fix the doxygen output of CCAtlasNode
2012-12-10 01:01:21 -08:00
dualface
268aa45d2c
rename CCNode:scheduleUpdateScriptHandlerWithPriority() to CCNode::scheduleUpdateWhitPriorityLua()
...
remove unused functions
2012-12-10 16:09:23 +08:00
Lu Guanqun
64772d09b0
fix the doxygen output of CCAtlasNode
2012-12-10 15:31:26 +08:00
dualface
d854f68c63
[scripting] add CCNode::scheduleUpdateScriptHandlerWithPriority()
2012-12-10 13:51:37 +08:00
dualface
c8753f72ef
[scripting] add CCNode::scheduleUpdateScriptHandlerWithPriority()
2012-12-10 13:48:27 +08:00
minggo
a75f8b7e7a
fixed #1593:remove all deprecated methods expect CCBAnimationManager
2012-12-06 18:51:33 +08:00
James Chen
be914811fb
fixed #1576 : CCNode::setUserObject needs to be retained.
2012-11-26 22:11:04 +08:00
James Chen
ebd522e3fa
issue #1564 : Return a new object instead of 'const reference' for some get methods.
2012-11-20 16:34:55 +08:00
minggo
fb5b7ed7bb
fixed #1560:fix a logical error in CCNode::schedule()
2012-11-19 11:24:03 +08:00
minggo
a701eaecce
issue #1555:update to v2.1 beta3
2012-11-14 18:05:15 +08:00
minggo
d2a5723973
issue #1555:add CCDrawNode
2012-11-09 12:08:18 +08:00
James Chen
270676b74d
issue #1549 : Added some functions for CCNode.
...
virtual void removeFromParent();
virtual void removeChild(CCNode* child);
virtual void removeChildByTag(int tag);
virtual void removeAllChildren();
2012-11-05 18:41:52 +08:00
James Chen
9f6d263c15
fixed #1531 : The CCSprite::updateTransform() function needs to inherited from a base function on the CCNode.
2012-10-30 10:24:28 +08:00
Rohan Kuruvilla
16d5659b17
Adding ScriptingEngine callback for onCleanup event
2012-10-29 15:00:52 +08:00
walzer
06f639edab
update copyright to 2012, update cocos2d version to 2.0.3
...
1. update all copyright from 2010-2011 to 2010-2012 cocos2d-x.org
2. update COCOS2D_VERSION to 0x00020003
3. update const char* cocos2dVersion() to "cocos2d-2.0-x-2.0.3"
2012-09-24 21:22:20 +08:00
dualface
e36c4abb65
[Lua] remove Lua script handler on CCNode destroy
2012-09-21 00:21:24 +08:00
Donald Alan Morrison
4cbd993091
Minor English Spelling Corrections. A few grammar corrections.
2012-09-17 00:02:24 -07:00
Donald Alan Morrison
b8412f3b7e
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
2012-09-14 15:27:55 -07:00
Donald Alan Morrison
7c750dc9c5
Minor changes to comments. One integer literal changed to float literal.
2012-09-14 15:26:38 -07:00
James Chen
7d8b261ced
fixed #1477 : Abstracts Lua and JS binding protocol, some bugs fixes in lua-binding, adding custom menu on win32 and mac for switching resolutions.
2012-09-11 14:02:33 +08:00
YuLei
58ea948cc8
Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into gles20
2012-09-07 19:21:15 +08:00
ivzave
cf67922ee0
remove delete this from init methods
2012-09-05 22:30:44 +04:00
YuLei
da79992275
Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into gles20
2012-09-02 00:38:57 +08:00
James Chen
9ba5a1bfef
issue #1454 : Removed COCOS2D_JAVASCRIPT macro.
2012-08-31 21:23:23 +08:00
minggo
860d3eff4b
issue #1454 : make js binding work together with lua binding and native codes
2012-08-31 17:55:45 +08:00
James Chen
e584b94728
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into js
...
Conflicts:
scripting/javascript/bindings/cocos2d_generated.cpp
2012-08-30 20:16:54 +08:00
James Chen
55423ed5b9
Moved '#include <stdint.h>' to 'platform/ios(android,linux,blackberry)/CCStdC.h' since win32 don't have a stdint.h.
2012-08-29 14:49:02 -07:00
Rohan Kuruvilla
c62462d997
Including callback support for onEnterTransitionDidFinish and onExitTransitionDidStart
2012-08-28 17:43:35 -07:00
YuLei
b411c00f38
Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into gles20
2012-08-28 14:23:31 +08:00
mustime
60a64d0eca
issue #1425 : remove the scheduleScriptHandler interface from CCNode
2012-08-28 12:49:43 +08:00
YuLei
02e77faf51
Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into gles20
2012-08-28 12:22:57 +08:00