Commit Graph

590 Commits

Author SHA1 Message Date
Johnny Wu 2d60ac2c2b Merge branch 'master' of github.com:cocos-creator/engine into inspector 2016-07-14 14:37:33 +08:00
Johnny Wu 8230fdd797 Merge branch 'master' of github.com:cocos-creator/engine into inspector 2016-07-12 18:24:09 +08:00
Johnny Wu a462ce79e4 change inspector url 2016-07-12 18:22:28 +08:00
Jare Guo ef436d9da4 deferred load scene's raw asset 2016-07-08 17:15:57 +08:00
Wang Nan 3b787c7e86 Merge pull request #883 from cocos-creator/v1.1
merge V1.1
2016-07-07 16:47:57 +08:00
zilongshanren f3f121b6e2 stop scroll when scrollview is disabled 2016-07-06 18:51:46 +08:00
zilongshanren 7bf63124d7 fix editbox can't be clicked on top of scrollview 2016-07-06 18:06:46 +08:00
Wang Nan c8fe562a91 Merge pull request #872 from cocos-creator/v1.1
merge V1.1
2016-07-05 16:14:05 +08:00
zilongshanren 7fbd7364e5 fix child active issue in none layout 2016-07-04 15:07:42 +08:00
zilongshanren 07cb26f1fc should remove listeners when child removed 2016-07-04 15:05:42 +08:00
zilongshanren 11db3a89c1 minor fix
add docs for actualFontSize

remove unnedded bind call

only define debounce method in Editor
2016-07-01 18:38:12 +08:00
zilongshanren 5ad4e6fca9 fix web system font shrink wrap effect
fix label font size

add measure text height

make a skeleton of label ttf shrink algorithm

add debounce method for node string

finish no \n wrap

add debounced font size to label

finish web ttf shrink
2016-07-01 18:13:26 +08:00
Nan Wang 5b4214c496 Merge branch 'v1.1' of github.com:cocos-creator/engine 2016-07-01 15:42:01 +08:00
Wang Nan bca1825f00 Merge pull request #855 from nantas/v1.1
change widget.alignOnce to true as default
2016-06-30 13:51:56 +08:00
Nan Wang e586c7c00e change widget.alignOnce to true as default 2016-06-30 11:59:14 +08:00
VisualSJ 336171daac Fixed audio source rewind 2016-06-29 16:02:14 +08:00
zilongshanren c7d589289f refactor EditBox, fix double click issue on mobile
finish first version of refactoring

remove dom node working now.

remove previous comments

add webgl render

fix editbox running

improve editbox

fix PC editbox
2016-06-28 18:25:37 +08:00
Wang Nan 5f21a76049 Merge pull request #826 from zilongshanren/fix-button-state-in-scrollview
fix button state error when scroll in scrollview
2016-06-24 15:04:22 +08:00
zilongshanren 7d2a9985e4 reuse _onTouchCancel logic 2016-06-24 14:59:17 +08:00
zilongshanren a6ebe3ce5f fix button state error when scroll in scrollview 2016-06-24 14:36:21 +08:00
Jare Guo b0a4e3f750 remove Sprite's getOriginalSize 2016-06-22 14:39:44 +08:00
Jare Guo fb5e1df331 DRY 2016-06-22 11:19:29 +08:00
Jare Guo 14d2dc6e4e should not redefine Node._id as non-writable 2016-06-22 10:48:21 +08:00
zilongshanren 3b9d875014 fix bmfont and ttf shrink in editor
fix bmfont vertical clamp precision

fix a bunch of label issues

fix bmfont inital font metrics
2016-06-17 16:32:02 +08:00
zilongshanren 91ded17834 add _previousNormalSprite to ctor 2016-06-16 17:13:15 +08:00
zilongshanren 64144568a3 fix toggle button interactable in editor 2016-06-16 17:04:19 +08:00
zilongshanren 134c3d8679 add docs to VideoPlayer component 2016-06-15 11:46:29 +08:00
zilongshanren ae42b8950b refactor private method of videoPlayer component 2016-06-15 11:22:58 +08:00
knoxHuang 89ab77b91a fix CCLabel TextAlignment API 2016-06-14 17:00:06 +08:00
Jare Guo 842a68ea83 fix scale of skeleton is readonly after upgrading from old version 2016-06-12 14:33:12 +08:00
zilongshanren 303cd014c3 remove unused logic 2016-06-08 17:32:56 +08:00
Nan Wang e05160ac22 fixed node not clickable in scrollview 2016-06-08 16:09:40 +08:00
Wang Nan a9983c470f Merge pull request #779 from pandamicro/master
add capture phase and refactor button and scrollview
2016-06-08 15:45:39 +08:00
pandamicro c3e28939ca Merge pull request #774 from jareguo/v1.1
fix error when deactivating detached RendererInSG
2016-06-08 10:49:40 +08:00
knoxHuang 39ca441ca3 add CCAudioSource isPlaying api 2016-06-08 10:35:11 +08:00
Jare Guo 34888547a5 fix error when deactivating detached RendererInSG 2016-06-07 17:41:39 +08:00
Wang Nan 144b6f398e Merge pull request #770 from zilongshanren/fix-scrollview-scrollto-api
Fix scrollview scrollto api
2016-06-07 09:25:31 +08:00
Jare Guo 05e88726aa Merge pull request #771 from zilongshanren/fixLabelResizeHeight
Fix label resize height
2016-06-06 18:41:46 +08:00
zilongshanren 998cdb1dc8 only set line height when label is bmfont 2016-06-06 18:37:19 +08:00
zilongshanren 6098e801cd fix label resize height issue 2016-06-06 17:10:00 +08:00
Jare Guo 4aef0964b8 Merge pull request #768 from 2youyouo2/resize
register window-resize in jsb
2016-06-06 17:05:29 +08:00
2youyouo2 924225fcaa optimize canvas resize 2016-06-06 16:40:26 +08:00
zilongshanren 8c2e92b009 add bmfont layout 2016-06-06 16:34:22 +08:00
2youyouo2 2c85cdddef register window-resize in jsb 2016-06-06 15:38:40 +08:00
zilongshanren 1befbf572e improve none layout anchor and size precision 2016-06-06 14:55:39 +08:00
zilongshanren de1b8d0a5e fix scrollview scrollToOffset 2016-06-06 14:34:23 +08:00
Jare Guo 3a660d7aab fix label color can not changed before update phase 2016-06-03 14:12:36 +08:00
knoxHuang c555d045ba fix start multiple runs #fireball/issues/3258 2016-06-02 17:52:32 +08:00
pandamicro 272ac66762 Remove preventDefault in event 2016-06-02 15:33:01 +08:00
Wang Nan 97f707e781 Merge pull request #760 from dabingnn/fix_label_bugs
Fix label bugs
2016-06-02 15:19:59 +08:00