Commit Graph

57 Commits

Author SHA1 Message Date
Wang Nan 8c17eab601 Merge pull request #698 from jareguo/temp
build a single js for preview
2016-05-20 13:59:48 +08:00
Jare Guo 5f3aecb6a4 add type checking code for addChild 2016-05-20 10:30:15 +08:00
knoxHuang a1eb098225 fix start update lateUpdate calling sequence bug 2016-05-19 17:37:38 +08:00
Jare Guo 142aeed175 add preload lifecycle method 2016-05-16 15:41:49 +08:00
Jare Guo c984d9cdf9 support gizmo event 2016-04-26 18:19:56 +08:00
Wang Nan 5e8922f58f Merge pull request #598 from cocos-creator/v1.0
merge v1.0
2016-04-14 12:00:59 +08:00
Jare Guo 064475a62e prevent name confusion between node and component 2016-04-12 21:06:32 +08:00
Jare Guo 6033292369 should be able to deactivate self during onLoad 2016-04-08 17:27:01 +08:00
Johnny Wu e493f2047b upgrade editor-framework to v0.5.0 2016-04-07 16:56:39 +08:00
pandamicro a3a102626c Improve component documentation 2016-03-24 22:51:46 +08:00
knoxHuang dd7e228c34 update Node and Component API 2016-03-24 17:14:06 +08:00
pandamicro f1a066807f Improve scheduler logic, avoid using key in web & native 2016-03-16 15:57:17 +08:00
pandamicro 811aa0d1aa Fix multiply schedule failure issue in Component 2016-03-16 13:04:45 +08:00
Jare Guo d423ebeacf export uuid for persist root node 2016-03-15 20:30:11 +08:00
pandamicro 1d8a6f29e0 Refactor cc.Macro to cc.macro 2016-03-14 11:49:03 +08:00
Jare Guo d71afe666e update node.js for circle ci 2016-03-14 11:07:53 +08:00
pandamicro 334d99f414 Cleanup CCCommon, CCConfig, CCMacro, CCShaders 2016-03-13 18:57:13 +08:00
knoxHuang ae2fc9979c Development component menu 2016-03-10 17:34:44 +08:00
knoxHuang 2d7f991a11 update components api url 2016-03-09 18:33:13 +08:00
knoxHuang 57a8e12052 built-in module in the title next to add a help icon. 2016-03-09 17:57:13 +08:00
Jare Guo 420880b770 add api syntax for component's lifecycle methods to CCClass options 2016-03-02 10:39:52 +08:00
Jare Guo 288ba1c40a complete api syntax for CCClass options 2016-03-01 22:28:43 +08:00
knoxHuang 22e1e644c3 modify CCNode, CCComponent, tes-node 2016-03-01 15:04:31 +08:00
knoxHuang 742fb9e22d add getComponents, getComponentInChildren, getComponentsInChildren for Components API 2016-03-01 13:07:21 +08:00
Nan Wang 3a70ae6060 update license file and source code header. 2016-03-01 11:04:12 +08:00
Jare Guo 995cd0b8e1 minor fix 2016-02-22 11:21:08 +08:00
Jare Guo 1ae9a42546 Updating api about engine-extends 2016-02-19 09:39:39 +08:00
Jare Guo af799991c5 Updating api about engine-extends 2016-02-18 16:06:25 +08:00
Jare Guo a248cd22fe add API onRestore for reset menu and undo operation 2016-02-17 11:14:18 +08:00
Jare Guo 520eddd0f9 implement _getLocalBounds to make spine pickable 2016-02-15 17:45:20 +08:00
Jare Guo 87220547fe allows to replace scene for prefab edit mode 2016-01-21 01:23:26 +08:00
Jare Guo dd9cc99b83 CCClass now support async initialize properties via function to avoid cross reference problem 2016-01-18 15:19:33 +08:00
Wang Nan 503ab6092c Merge pull request #209 from fireball-x/v0.7
merge v0.7
2016-01-08 21:57:32 +08:00
pandamicro 55b182ae70 Remove all listeners for Component 2016-01-07 20:56:49 +08:00
Jare Guo dedaf5a6d8 Merge commit 'c344bbecd9070dc68f03fefae5e0d37f5f16e8ba' 2016-01-04 11:28:13 +08:00
Jare Guo e3998f21df component should inherit the node's name 2016-01-04 11:26:02 +08:00
pandamicro ea39a62997 Fix scheduler issues in JSB 2016-01-04 00:20:49 +08:00
Jare Guo e789f1fc48 remove unused files 2015-12-31 16:31:57 +08:00
Jare Guo 83d758d49f should not cause an infinite loops if re-activated in onLoad 2015-12-30 18:48:03 +08:00
Nan Wang bf33c56d5e merged v0.7 2015-12-29 20:55:24 +08:00
2youyouo2 d22f8e1481 sync master to 0.7 2015-12-29 20:01:30 +08:00
2youyouo2 1e6e329255 fixed animation manager will be paused when node active is set to false 2015-12-29 13:18:27 +08:00
pandamicro a278c783f3 Remove scheduleUpdate for Component 2015-12-28 21:14:02 +08:00
pandamicro 3c0e1b5e17 Support Scheduler in Component instead of Node 2015-12-25 21:09:04 +08:00
Jare Guo fd57ed9a52 make codes more concise 2015-12-23 19:41:56 +08:00
Nan Wang 47f4933de2 add tooltip for node and component title. 2015-12-21 16:51:12 +08:00
Jare Guo 9959210cd0 should not call onEnable if not executeInEditMode 2015-12-16 11:05:50 +08:00
Jare Guo 1fc0b6bc9a Merge commit '067f62a6568adacee1d3f114723f45e5eb7aa279'
# Conflicts:
#	cocos2d/core/base-nodes/CCAtlasNode.js
#	cocos2d/core/sprites/CCSprite.js
#	extensions/ccui/base-classes/UIScale9Sprite.js
2015-12-09 20:56:38 +08:00
Jare Guo ef24960351 mixin EventTarget instead of inherit by polyfill 2015-12-09 20:53:59 +08:00
knoxHuang 113755fd4a Merge remote-tracking branch 'origin/master'
Conflicts:
	cocos2d/core/CCNode.js
	cocos2d/core/utils/base-node.js
2015-12-09 18:30:15 +08:00