Commit Graph

4291 Commits

Author SHA1 Message Date
pandamicro 78428b4943 Use customizable max concurrent number 2017-05-26 18:28:47 +08:00
pandamicro 65662e0dd2 Fix long call stack in downloader 2017-05-26 18:06:46 +08:00
Jare Guo 167a24ec6f Merge pull request #1680 from 2youyou2/animation
avoid fire event error
2017-05-26 17:27:26 +08:00
2youyouo2 5d69039f3a avoid fire event error 2017-05-26 17:04:58 +08:00
Wang Nan 9fe62ad04a Merge pull request #1678 from jareguo/v1.5
skipped onLoad should be called after node re-activated
2017-05-26 10:06:51 +08:00
Jare Guo df12f42392 skipped onLoad should be called after node re-activated 2017-05-26 02:35:15 +08:00
Wang Nan d948d14a4f Merge pull request #1676 from zilongshanren/improve-richtext-memory-consumption
fix editbox error after chaning parent
2017-05-25 14:10:43 +08:00
zilongshanren bf0d21251d fix editbox issue 2017-05-25 10:35:30 +08:00
Jare Guo d357c53b00 Merge pull request #1675 from 2youyou2/physics
fixed jsb rigidbody.getJointList
2017-05-25 10:33:40 +08:00
2youyouo2 9ff7f824e7 fixed jsb rigidbody.getJointList 2017-05-25 10:11:52 +08:00
Jare Guo d4cad5f01d Merge pull request #1673 from 2youyou2/physics
update physics api docs
2017-05-24 16:01:52 +08:00
2youyouo2 4d8408fb48 update physics api docs 2017-05-24 15:34:28 +08:00
Wang Nan d0dfb4ac1f Merge pull request #1672 from 2youyou2/animation
fixed animator not auto stop
2017-05-24 14:20:48 +08:00
2youyouo2 b09d88e2c8 fixed animator not auto stop 2017-05-24 14:12:20 +08:00
Wang Nan a6eae641ed Merge pull request #1669 from jareguo/v1.5
Node.getContentSize should return copy
2017-05-23 14:59:33 +08:00
Wang Nan 8020682f4c Merge pull request #1666 from zilongshanren/improve-richtext-memory-consumption
minor performance improvement
2017-05-23 14:54:42 +08:00
Jare Guo 8eebe67434 Node.getContentSize should return copy 2017-05-23 14:29:07 +08:00
zilongshanren 728e264e98 minor performance improvement 2017-05-22 18:09:44 +08:00
Wang Nan 925b6b269e Merge pull request #1664 from zilongshanren/fix-richtext-size-notification
fix richtext content size change notification
2017-05-19 11:47:32 +08:00
zilongshanren f796158239 fix richtext content size change notification 2017-05-19 11:42:49 +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 7d3e500f16 Merge pull request #1662 from jareguo/master
fix api about event type
2017-05-19 11:23:51 +08:00
Jare Guo 20155c6541 fix api about event type 2017-05-19 11:22:50 +08:00
Nan Wang a9b7298e16 update version to v1.5 2017-05-19 10:22:59 +08:00
Wang Nan 01fb4ba903 Merge pull request #1659 from jareguo/master
refine js arguments
2017-05-18 11:43:17 +08:00
pandamicro 1a1a7123e6 Merge pull request #1660 from pandamicro/master
Update loader api doc
2017-05-18 11:41:19 +08:00
pandamicro 6797b4d25a Update loader api doc 2017-05-18 11:38:02 +08:00
Jare Guo 3fcd0c8b46 no need to copy arguments for apply, see petkaantonov/bluebird#1389 2017-05-17 17:46:51 +08:00
Jare Guo 2083603d80 shift arguments in cc.js.shiftArguments function to make code more concise 2017-05-17 17:36:53 +08:00
Wang Nan 5ea18cd6e8 Merge pull request #1658 from zilongshanren/fix-webview-callstack-issue
fix issue: https://github.com/cocos-creator/fireball/issues/5757
2017-05-17 17:22:46 +08:00
Wang Nan 07ad383afa Merge pull request #1657 from knoxHuang/master
fix Inactive node event trigger bug for fireball/issues/5727
2017-05-17 17:17:12 +08:00
zilongshanren 0961899068 fix issue: https://github.com/cocos-creator/fireball/issues/5757 2017-05-17 17:10:55 +08:00
knoxHuang 158418de53 fix Inactive node event trigger bug for fireball/issues/5727 2017-05-17 17:08:50 +08:00
Wang Nan f74769ef90 Merge pull request #1656 from jareguo/master
refine cc.instantiate API doc
2017-05-17 16:58:12 +08:00
Jare Guo 40dc6b23f1 make CCDebugger more concise 2017-05-17 16:26:03 +08:00
Jare Guo da567994c3 refine cc.instantiate API doc 2017-05-17 14:51:14 +08:00
Wang Nan 5b9b94caef Merge pull request #1655 from jareguo/master
refine creator.d.ts
2017-05-17 14:22:39 +08:00
Jare Guo 4393080acf refine creator.d.ts 2017-05-17 10:55:03 +08:00
Nan Wang 32a90f5ad6 update api doc for anysdk and systemEvent 2017-05-16 17:35:38 +08:00
Jare Guo 68869a3167 update example of CCEnum 2017-05-16 16:02:15 +08:00
Wang Nan 4823eb3e87 Merge pull request #1654 from jareguo/master
支持 TypeSciprt 枚举定义
2017-05-16 15:51:02 +08:00
Jare Guo 4bd7c7f628 implement TypeScript support for CCEnum 2017-05-16 15:35:01 +08:00
Jare Guo d187f903e4 refine cc.Enum 2017-05-16 14:31:41 +08:00
Jare Guo 323c156733 Merge pull request #1652 from zilongshanren/fix-webview-ios-size
webview and bmfont bug fix
2017-05-16 11:13:46 +08:00
zilongshanren 2db44085f9 bug fix 2017-05-16 11:03:44 +08:00
Jare Guo bd7f23cbce Merge pull request #1651 from knoxHuang/master
Remove redundant code for CCPageView
2017-05-16 10:12:22 +08:00
knoxHuang 1fe4eac00b Remove redundant code for CCPageView 2017-05-16 10:10:39 +08:00
Wang Nan 05a0f4901b Merge pull request #1649 from jareguo/master
优化场景下载性能
2017-05-16 09:47:22 +08:00
Wang Nan d69154a4a2 Merge pull request #1650 from 2youyou2/physics
improve physics
2017-05-15 17:25:52 +08:00