Commit Graph

233 Commits

Author SHA1 Message Date
Wang Nan fc44918319 Merge pull request #1724 from 2youyou2/culling
Culling
2017-06-16 16:16:22 +08:00
Jare Guo ca1d17c772 remove unused variables 2017-06-12 18:39:47 +08:00
2youyouo2 1643955b5c support camera culling 2017-06-09 17:47:15 +08:00
Jare Guo 8eebe67434 Node.getContentSize should return copy 2017-05-23 14:29:07 +08:00
Wang Nan 4b1e2edced Merge pull request #1663 from cocos-creator/revert-1657-master
Revert "fix Inactive node event trigger bug for fireball/issues/5727"
2017-05-19 11:40:14 +08:00
Wang Nan 075bfd31fd Revert "fix Inactive node event trigger bug for fireball/issues/5727" 2017-05-19 11:39:14 +08:00
Jare Guo 20155c6541 fix api about event type 2017-05-19 11:22:50 +08:00
knoxHuang 158418de53 fix Inactive node event trigger bug for fireball/issues/5727 2017-05-17 17:08:50 +08:00
Jare Guo 0c26addab6 fix ES6 Classes on JSB 2017-05-09 15:04:48 +08:00
Jare Guo f054f504b6 fix typescript api 2017-04-26 17:17:59 +08:00
pandamicro 667c78a44c Add pauseSystemEvents and resumeSystemEvents for cc.Node 2017-04-24 16:22:32 +08:00
pandamicro 2d98b903c5 Add pauseAllActions and resumeAllActions for cc.Node 2017-04-24 15:59:57 +08:00
pandamicro 7dcbef1e85 Use !!cc.ActionManager to detect existence 2017-04-24 13:57:29 +08:00
pandamicro d5cb7bd2e5 Improve ActionManager detection 2017-04-24 10:43:12 +08:00
pandamicro 8a7e8ceabe Reverse pure JS Action, reuse JSB Action 2017-04-22 14:58:55 +08:00
Jare Guo 998cf52aa3 fix test 2017-04-13 14:17:21 +08:00
pandamicro 2c1c0681f6 Remove _releaseAllActions invocation 2017-04-12 16:04:09 +08:00
Nan Wang 509294d39b fix typo 2017-03-29 18:47:25 +08:00
pandamicro 5daa540b12 Pure JS action system working in JSB 2017-03-29 18:42:28 +08:00
pandamicro 07d4f22c26 Move ActionManager to actions module 2017-03-29 18:42:28 +08:00
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