Jare Guo
|
f115d4ed9c
|
Merge pull request #1540 from jareguo/master
extract BaseNode.setParent
|
2017-03-11 17:06:30 +08:00 |
|
Jare Guo
|
91aa7d6899
|
extract BaseNode.setParent
|
2017-03-09 12:59:41 +08:00 |
|
Jare Guo
|
21eb9ed894
|
Merge pull request #1523 from jareguo/master
重新实现组件生命周期调用,支持脚本优先级
|
2017-03-09 12:56:41 +08:00 |
|
Jare Guo
|
86f3a09f98
|
reviewed
|
2017-03-08 20:33:34 +08:00 |
|
Jare Guo
|
449cde5794
|
refine internal api of BaseNode
|
2017-03-08 17:33:20 +08:00 |
|
2youyouo2
|
3acf11a567
|
support physics
|
2017-03-08 14:02:45 +08:00 |
|
Jare Guo
|
fff91611cb
|
use shorthand function in properties
stash 2
|
2017-02-18 22:48:05 +08:00 |
|
Jare Guo
|
787aa87759
|
merge _onPreDestroy
|
2017-02-18 22:48:05 +08:00 |
|
Jare Guo
|
0192e50569
|
Merge branch 'v1.4'
# Conflicts:
# cocos2d/core/CCNode.js
|
2017-02-09 11:19:38 +08:00 |
|
knoxHuang
|
744f4b2481
|
fix native error for fireball/issues/5169
|
2017-02-07 17:48:40 +08:00 |
|
pandamicro
|
35e2bd8bf6
|
Do not retain/release actions in new memory model
|
2017-02-06 14:05:10 +08:00 |
|
Jare Guo
|
28ad231315
|
optimize binarySearch
|
2017-01-24 16:36:19 +08:00 |
|
Jare Guo
|
8da330d3a7
|
Scene now inherit from Node so some Node verification should be refactored
|
2017-01-12 14:47:51 +08:00 |
|
Jare Guo
|
aeebd25f07
|
Merge commit 'b4afa96c41f9fae4781311851e7f7c433fdfa2b8' into refactor-for-3d
# Conflicts:
# cocos2d/core/CCNode.js
# cocos2d/core/utils/base-node.js
|
2017-01-12 13:56:08 +08:00 |
|
Jare Guo
|
894b3bcc4f
|
test life-cycle order between parent and children
|
2017-01-11 18:27:42 +08:00 |
|
Jare Guo
|
09583033f1
|
extract cc._RF for v1.5
|
2017-01-09 15:04:44 +08:00 |
|
Huabing.Xu
|
8416ed27f7
|
small adjust of code
|
2016-12-29 14:36:07 +08:00 |
|
Huabing.Xu
|
2f18254789
|
reformat codes
|
2016-12-29 11:57:55 +08:00 |
|
Huabing.Xu
|
3d3268dc57
|
extract _updateOrder
|
2016-12-29 11:38:17 +08:00 |
|
Huabing.Xu
|
30c2f8947b
|
refactor setSiblingIndex
|
2016-12-29 11:26:16 +08:00 |
|
Huabing.Xu
|
d087040b89
|
update comments/docs, remove used codes
|
2016-12-29 10:47:40 +08:00 |
|
Huabing.Xu
|
b2645dabac
|
refactor onRestore function
|
2016-12-29 10:47:18 +08:00 |
|
Huabing.Xu
|
caa0938b68
|
adjust the order of init
|
2016-12-29 10:17:34 +08:00 |
|
Huabing.Xu
|
96239d933b
|
reformat code
|
2016-12-29 10:15:47 +08:00 |
|
Jare Guo
|
c4a1ec752f
|
prompt dialog if user wants to nest prefabs
|
2016-12-28 17:28:48 +08:00 |
|
Huabing.Xu
|
1dee140209
|
clean up code
|
2016-12-28 10:15:11 +08:00 |
|
Huabing.Xu
|
0add0fc83a
|
refactor and move base functions to base node
|
2016-12-27 18:27:57 +08:00 |
|
Huabing.Xu
|
b75f8ffcf3
|
move active properties and some related functions to base node
|
2016-12-27 14:54:04 +08:00 |
|
Huabing.Xu
|
73aa2e640f
|
move _deactivateChildComponents to base node
|
2016-12-27 11:46:55 +08:00 |
|
Huabing.Xu
|
c072de5ae5
|
remove unused local functions
|
2016-12-26 16:35:56 +08:00 |
|
Huabing.Xu
|
3b3f61020a
|
move some components functions to base node
|
2016-12-26 16:05:27 +08:00 |
|
Huabing.Xu
|
663f8eae29
|
move common properties _active/_components/_prefab/_persistNode to base
node
|
2016-12-26 14:11:47 +08:00 |
|
Jare Guo
|
1b841bb31f
|
fileId of child of prefab should not cloned from existing node
|
2016-12-26 12:40:54 +08:00 |
|
Huabing.Xu
|
dade7424ad
|
base node is clean now
|
2016-12-26 12:07:31 +08:00 |
|
Huabing.Xu
|
5f966434a9
|
move getNodeToXXXTransform/getXXXToNodeTransform functions to CCNode
|
2016-12-26 11:12:05 +08:00 |
|
Huabing.Xu
|
28301c347d
|
move convertToXXXSpaceXXX functions to CCNode
|
2016-12-26 10:35:07 +08:00 |
|
Huabing.Xu
|
a2ae914e25
|
move parent/tag properties to CCNode
|
2016-12-26 10:25:53 +08:00 |
|
Huabing.Xu
|
a2623c7146
|
setParent/setTag/_onPreDestroy implementation move to CCNode,
|
2016-12-26 10:08:35 +08:00 |
|
Huabing.Xu
|
635e74f070
|
move
getNodeToParentTransformAR/getBoundingBox/getBoundingBoxToWorld/_getBoun
dingBoxTo to CCNode
|
2016-12-23 14:44:01 +08:00 |
|
Huabing.Xu
|
09def3a271
|
move getDisplayedOpacity/_updateDisplayedOpacity/getDisplayedColor to
CCNode
|
2016-12-23 14:24:38 +08:00 |
|
Huabing.Xu
|
59df3d9a27
|
move zIndex to CCNode
|
2016-12-23 14:07:23 +08:00 |
|
Huabing.Xu
|
4b1014e5c9
|
move globalZorder anchor to CCNode
|
2016-12-23 13:51:11 +08:00 |
|
Huabing.Xu
|
9a6c406571
|
move anchor/width/height/ignoreAnchor to CCNode
|
2016-12-23 11:58:55 +08:00 |
|
Huabing.Xu
|
a555311e23
|
move opacityModifyRGB to CCNode
|
2016-12-23 11:44:14 +08:00 |
|
Huabing.Xu
|
acc7d4061e
|
move opacity/color/cascadeOpacity to CCNode
|
2016-12-23 11:39:12 +08:00 |
|
Huabing.Xu
|
773fdd12d1
|
move position/x/y to CCNode
|
2016-12-23 11:19:12 +08:00 |
|
Huabing.Xu
|
ac259792e1
|
move skewX/skewY/rotation/rotationX/rotationY/scale/scaleX/scaleY to
CCNode
|
2016-12-23 11:06:25 +08:00 |
|
Huabing.Xu
|
55aaef1290
|
move comments to CCNode
|
2016-12-23 10:49:00 +08:00 |
|
Nan Wang
|
52b1a7658c
|
fix merge conflict of CCLoader getReferenceKey
|
2016-12-16 10:53:37 +08:00 |
|
Nan Wang
|
4dea8e7a8a
|
move all error logs to DebugInfos.js and only show error id in release build
|
2016-12-15 17:07:01 +08:00 |
|