minggo
cd5bcb87af
issue #2284 : merge master and fixed some conflicts
2013-06-13 17:54:05 +08:00
chengstory
cfb424a6c9
1. add Component struct.
2013-06-04 17:38:43 +08:00
Lucian Varlan
a70569ff03
OnEnterTransitionDidFinish was called twice when a node is added in onEnter
...
Fix ported from cocos2d-iphone:
99b7bef880
2013-05-27 16:07:09 +03:00
Xavier Arias
71df5706bd
Added const to CCNode::getChildrenCount()
2013-05-12 20:45:41 +02:00
Xavier Arias
1c6c13b3e5
Added const to CCNode's getTag & getContentSize
2013-05-09 00:20:08 +02:00
James Gregory
9500448f87
Get CCGrid to work.
2013-05-06 20:58:46 -07:00
Sam Clegg
87f57d6ca6
Fix CCPhysicsSprite getPosition variants
...
CCPhysicsSprite was overriding only some of the getPosition
methods on a node resulting in, for example, getPositionX
and getPositionY not working for physics nodes.
This change also makes this overloads shared between box2d
and chipmunk implementations.
2013-04-15 07:35:49 -07:00
wu.hao
521fac290d
fix: can't generate CCNode.h's document with doxygen 1.8.3
2013-03-13 14:56:17 +08:00
James Chen
7093807f3f
CCNodeRGA isn't a pure abstract class anymore. Updated tools/tojs/cocos2d.ini.
2013-03-01 10:41:06 +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
7b16494862
well documented CCNode
2013-01-17 11:20:25 +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
268aa45d2c
rename CCNode:scheduleUpdateScriptHandlerWithPriority() to CCNode::scheduleUpdateWhitPriorityLua()
...
remove unused functions
2012-12-10 16:09:23 +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
a701eaecce
issue #1555:update to v2.1 beta3
2012-11-14 18:05:15 +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
Donald Alan Morrison
4cbd993091
Minor English Spelling Corrections. A few grammar corrections.
2012-09-17 00:02:24 -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
James Chen
9ba5a1bfef
issue #1454 : Removed COCOS2D_JAVASCRIPT macro.
2012-08-31 21:23:23 +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
mustime
60a64d0eca
issue #1425 : remove the scheduleScriptHandler interface from CCNode
2012-08-28 12:49:43 +08:00
Rolando Abarca
a114502929
removes OBJECT_TYPE thing
2012-08-27 08:43:38 -07:00
Rohan Kuruvilla
0e9ba1173a
Callbacks
2012-08-27 08:43:37 -07:00
Rolando Abarca
4e640ecb35
uses new ADD_OBJECT_TYPE macro
2012-08-27 08:43:37 -07:00
Rolando Abarca
e757d55a29
updates cocos2d-x API to support getObjectType()
2012-08-27 05:45:11 -07:00
mustime
be116f5352
issue #1425 : update TestLua project
2012-08-27 11:43:47 +08:00
mustime
9949a34669
issue 1381: change setContentSize(CCSize size) to setContentSize(const
...
CCsize & size) in CCNode
2012-07-27 16:57:56 +08:00
Walzer
9eab0c19f8
add groups to all classes for doxygen
2012-06-20 18:09:11 +08:00
James Chen
24e3ec7499
fixed #1336 : Updated comment information for deprecated apis.
2012-06-20 14:31:36 +08:00
James Chen
b818c0afa6
fixed #1336 : Used CC_DEPRECATED_ATTRIBUTE macro to mark deprecated interfaces.
2012-06-20 11:48:31 +08:00
minggo
2666df9472
issue #1269:mrege latest code and fix conflict
2012-06-19 13:57:33 +08:00