Commit Graph

47 Commits

Author SHA1 Message Date
pandamicro 77febbfe3d Merge branch 'master' into next 2018-03-13 15:07:21 +08:00
PP 1f448e821f change all JS into js 2018-03-06 11:44:11 +08:00
Jare Guo a6fb92ad90 updating license 2018-02-01 09:38:54 +08:00
VisualSJ 2d4a67b64a Add node locked flag 2018-01-12 17:13:13 +08:00
Jare Guo b31566d75f Merge 1.8 2018-01-09 18:40:43 +08:00
Jare Guo 2e2fd59193 add CC_SUPPORT_JIT macro 2018-01-03 22:58:37 +08:00
Jare Guo 23f0cb4a6b Merge master into asset
# Conflicts:
#	cocos2d/core/load-pipeline/CCLoader.js
#	cocos2d/core/platform/deserialize.js
#	gulpfile.js
#	jsb/jsb-loader.js
2017-10-23 18:00:20 +08:00
yinkaile 62841321a5 fallback function if not support Function 2017-10-19 17:32:03 +08:00
Jare Guo bca9d854ac deprecate texture.releaseTexture(), use texture.destroy() instead 2017-09-28 22:55:59 +08:00
Jare Guo 64c13c7dab sync jsb 2017-09-23 09:02:13 +08:00
Jare Guo df12f42392 skipped onLoad should be called after node re-activated 2017-05-26 02:35:15 +08:00
Jare Guo 633e976f69 optimizing startup time by reusing property descripter 2017-05-05 13:37:03 +08:00
Jare Guo f054f504b6 fix typescript api 2017-04-26 17:17:59 +08:00
Jare Guo 998cf52aa3 fix test 2017-04-13 14:17:21 +08:00
Jare Guo b74880fa10 fix activate child node directly in parent's onDisable 2017-03-08 17:33:20 +08:00
Jare Guo c949c486f6 fix deactivate child node directly in parent's onDisable 2017-03-08 17:33:20 +08:00
Jare Guo b272941cf6 working on execution order of lifecycle methods 2017-03-08 17:33:20 +08:00
Jare Guo a4beba2740 use Function instead eval to optimize evaluation and variable mangling (cocos-creator/fireball#5220) 2017-02-14 17:33:57 +08:00
Jare Guo 5f9e46996b refine CCClass 2017-02-04 02:24:03 +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
Jare Guo 5dc7735e0d optimize destruct operation by using eval 2016-11-24 18:29:38 +08:00
Nan Wang 032d2d2abd fix api doc reference 2016-10-20 18:36:01 +08:00
Jare Guo 73477ae848 optimize enabled by removing splice 2016-10-13 16:19:53 +08:00
Jare Guo e9b07c435b minor tweaks 2016-07-26 14:40:23 +08:00
Nan Wang 1f7adb2c5c merge v1.1 fixes 2016-07-19 10:04:06 +08:00
Jare Guo 768ac4d28c should not destroy persistRootNode 2016-07-16 17:00:50 +08:00
Jare Guo 14d2dc6e4e should not redefine Node._id as non-writable 2016-06-22 10:48:21 +08:00
Jare Guo 842a68ea83 fix scale of skeleton is readonly after upgrading from old version 2016-06-12 14:33:12 +08:00
Jare Guo 5f3aecb6a4 add type checking code for addChild 2016-05-20 10:30:15 +08:00
Jare Guo a8ab54b558 Merge pull request #674 from jareguo/temp
add preload lifecycle method
2016-05-17 11:26:13 +08:00
Jare Guo 10b259a21c support minimized serialization 2016-05-17 00:39:27 +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
Jare Guo 1b8fafc9cc turn on dead code optimization in building 2016-04-25 14:32:57 +08:00
Jare Guo 98cc058392 support the live reloading of undo history 2016-04-17 14:21:58 +08:00
Jare Guo 6033292369 should be able to deactivate self during onLoad 2016-04-08 17:27:01 +08:00
knoxHuang dd7e228c34 update Node and Component API 2016-03-24 17:14:06 +08:00
minggo bd71a5f727 fix some comments 2016-02-01 15:36:25 +08:00
Jare Guo 163170729e fix 'sender' is not defined in CCSpriteFrame 2016-01-22 01:43:42 +08:00
Nan Wang ce7af67a9b Merge branch 'v0.7' of github.com:fireball-x/engine 2016-01-06 23:58:29 +08:00
knoxHuang e23bb13989 supplement cocos2d platform directory note 2016-01-06 14:55:13 +08:00
Jare Guo 83d758d49f should not cause an infinite loops if re-activated in onLoad 2015-12-30 18:48:03 +08:00
Jare Guo 379a1c5b1f support disable node property by component 2015-12-29 14:02:32 +08:00
Jare Guo fd57ed9a52 make codes more concise 2015-12-23 19:41:56 +08:00
Nan Wang 1df8075bff fixed cc.Object api comment. 2015-12-12 15:59:24 +08:00
Nan Wang 4b059294d2 fixed code-editor parsing error for engine apis. 2015-12-10 16:38:26 +08:00
Nan Wang c0f59c1598 synchronized to cocos2d-html5#6700f8bb94b2. starting from fresh history. 2015-12-05 12:22:41 +08:00