Commit Graph

69 Commits

Author SHA1 Message Date
ViusualSJ 306a61707a remove useSystemFont from CCGLabel 2016-05-20 15:28:51 +08:00
zhangbin bd83852ec5 Record the original size in the BitmapFont Asset object. 2016-05-20 11:35:00 +08:00
Wang Nan c51e89f49e Merge pull request #684 from zilongshanren/fix-label-webgl-size-issue
fix label not updating content size
2016-05-18 18:24:52 +08:00
zhangbin 8a85398ab1 Rename the property & the method. 2016-05-18 16:21:30 +08:00
zhangbin 215cd99831 Add property in Label component for the origin size of BMFont. 2016-05-18 15:37:41 +08:00
Wang Nan f680c2c591 Merge pull request #685 from dabingnn/label_add_outline
adjust outline effect
2016-05-17 18:28:42 +08:00
zilongshanren 1f4770d32a simplify label content update size logic 2016-05-17 18:28:41 +08:00
Huabing.Xu e2c12e672c multiply width by 2 2016-05-17 18:13:44 +08:00
Huabing.Xu 714a9816e9 adjust outline effect 2016-05-17 17:53:27 +08:00
zilongshanren 34ae8d3ccf fix label not updating content size 2016-05-17 17:15:35 +08:00
Wang Nan edf92d24a5 Merge pull request #679 from dabingnn/label_add_outline
add width for stroke
2016-05-17 14:02:10 +08:00
Huabing.Xu a9d5ea5053 add width for stroke 2016-05-17 12:13:30 +08:00
Wang Nan df62232316 Merge pull request #670 from dabingnn/label_add_outline
Label add outline
2016-05-17 09:23:50 +08:00
Wang Nan 5d9ce5d57e Merge pull request #669 from cocos-creator/v1.0
merge V1.0
2016-05-13 13:45:01 +08:00
Huabing.Xu 101e710683 implement outline effect 2016-05-13 10:32:20 +08:00
Huabing.Xu c8a56b13f7 add outline effect 2016-05-12 18:38:34 +08:00
Huabing.Xu af55d43f89 add outline feature 2016-05-12 15:10:00 +08:00
knoxHuang b0122605fb fix Inherits from SGNode nodes can not overload a method in BaseNodePropertyDefine.js 2016-05-12 11:06:36 +08:00
Jare Guo 3f1b682d19 Merge commit '0d438a748a5aae594e29344fffe4ea040e235c81'
# Conflicts:
#	cocos2d/core/components/CCRendererInSG.js
#	cocos2d/core/load-pipeline/asset-table.js
#	cocos2d/tilemap/CCTiledMap.js
#	jsb/jsb-editbox.js
2016-04-27 10:01:06 +08:00
knoxHuang 451561bfd7 Bitmap Font resources from Raw Asset to Asset (#2661) 2016-04-18 18:29:20 +08:00
Jare Guo f2fc319677 Merge pull request #582 from zilongshanren/fix-label-cascaded-opacity
fix cascaded opacity issue of label
2016-04-18 14:53:42 +08:00
zilongshanren aaea7ce6df rename locFlag to this._dirtyFlag 2016-04-12 10:19:01 +08:00
zilongshanren ccc3a2abfa fix label positioning 2016-04-12 09:20:37 +08:00
zilongshanren 296f07f30e fix cascaded opacity issue of label 2016-04-11 17:13:34 +08:00
zilongshanren f7d44afd73 fix system font lineHeight calculate issue 2016-03-22 18:25:09 +08:00
zilongshanren 1b8d835d48 make ttf and bmfont behavior the same 2016-03-18 21:52:13 +08:00
zilongshanren 61d2ecf641 refactor bmFontSize to drawFontSize 2016-03-18 19:59:35 +08:00
zilongshanren 46913e7d87 fix webgl label rendering position 2016-03-17 09:47:34 +08:00
zilongshanren e6336209c9 don't excluse color,opacity and textDirty logic 2016-03-16 18:11:30 +08:00
zilongshanren bb8481e184 fix label color opacity issue 2016-03-16 16:42:12 +08:00
zilongshanren 34b62651d1 refactoring label 2016-03-16 15:36:04 +08:00
zilongshanren 9cd4dd5aba reuse textDirty dirty flag 2016-03-16 14:44:29 +08:00
zilongshanren c016ae2aec fix bmfont getContentSize cause chilrenOrderDrity 2016-03-16 14:33:40 +08:00
zilongshanren 7f0007c09a Merge remote-tracking branch 'fireball/v1.0' into fix-label-blink-issue 2016-03-16 10:31:46 +08:00
pandamicro 6f530df13b Cleanup other modules 2016-03-14 21:46:13 +08:00
zilongshanren e74bc01add refactoring label, fix blink issue
make it works

remove unused code
2016-03-14 21:24:48 +08:00
pandamicro 1d8a6f29e0 Refactor cc.Macro to cc.macro 2016-03-14 11:49:03 +08:00
pandamicro 8306801243 Modulize event-manager, renderer and clean up core 2016-03-14 11:49:03 +08:00
pandamicro 334d99f414 Cleanup CCCommon, CCConfig, CCMacro, CCShaders 2016-03-13 18:57:13 +08:00
pandamicro c26dd4b9df Avoid creating duplicated sprite batch node for bmfont Label 2016-03-10 16:17:01 +08:00
zilongshanren 201bf96706 fix jsb overflow none 2016-03-10 10:11:59 +08:00
zilongshanren ca4380b123 fix bmfont color change issue 2016-03-04 18:16:24 +08:00
pandamicro 4048a6fbb0 Polish single file loading API for cc.loader.load 2016-02-25 17:38:58 +08:00
pandamicro 2f861d8cb6 Fix issues for Creator editor 2016-02-25 10:34:09 +08:00
pandamicro 0ea99226cc Replace cc.loader with pipeline loader 2016-02-25 10:34:09 +08:00
knoxHuang 4c623eeb22 Merge branch 'master' of github.com:cocos-creator/engine 2016-02-24 13:55:54 +08:00
zilongshanren 0a6293bad0 Improve EditBox
Squashed commit of the following:

commit ad31d2beadceea31732970145238a68a97995b76
Merge: 8e15189 061e6ca
Author: zilongshanren <guanghui8827@126.com>
Date:   Tue Feb 23 16:51:09 2016 +0800

    Merge remote-tracking branch 'me/master'

commit 8e15189d4a37d7215ffb66d6c08ec0b79cc57a19
Merge: 7c233f0 968480e
Author: zilongshanren <guanghui8827@126.com>
Date:   Tue Feb 23 16:50:19 2016 +0800

    Merge remote-tracking branch 'fireball/master'

commit 7c233f03db2a78b1ab2c5866520efef04a6c4920
Author: zilongshanren <guanghui8827@126.com>
Date:   Tue Feb 23 16:47:25 2016 +0800

    minor fix

commit fc89b4f920f979497e5961e48c1c796e18c3aa8e
Author: zilongshanren <guanghui8827@126.com>
Date:   Tue Feb 23 14:24:43 2016 +0800

    add editbox reorder functionality

commit 6fd1b48199ce351716c43250497e5b192194b1d5
Author: zilongshanren <guanghui8827@126.com>
Date:   Mon Feb 22 18:21:48 2016 +0800

    fix label rendering issue on editor

commit 2a335cd701ed62c6bc45f8849b4322413cf9acca
Author: zilongshanren <guanghui8827@126.com>
Date:   Mon Feb 22 16:10:43 2016 +0800

    add label

commit 51180fae14b43bfe2a2e11d618dda7a91b7522f1
Author: zilongshanren <guanghui8827@126.com>
Date:   Mon Feb 22 14:02:47 2016 +0800

    refactoring, add EditBoxImpl

commit d40cf8839963a98446a3b85f033f352b3325f7ed
Author: zilongshanren <guanghui8827@126.com>
Date:   Mon Feb 22 11:30:35 2016 +0800

    add toggle native editbox logic

commit 6114905f7222e8a21a8bc32be71f0bef1c4c658e
Author: zilongshanren <guanghui8827@126.com>
Date:   Fri Feb 19 13:37:34 2016 +0800

    remove resize and add vertical scrollbar

commit 061e6cadf259a2c6ae3b178fb45a747427af8589
Merge: c2a142c 0314e4c
Author: zilongshanren <guanghui8827@126.com>
Date:   Tue Feb 23 14:25:41 2016 +0800

    Merge remote-tracking branch 'fireball/master'

commit c2a142ce003f2d85d5f161be69f79dd6c0eaa68d
Author: zilongshanren <guanghui8827@126.com>
Date:   Tue Feb 23 14:24:43 2016 +0800

    add editbox reorder functionality

commit 48f02e97f27847b431c510d60fdf9380b14b650f
Author: zilongshanren <guanghui8827@126.com>
Date:   Mon Feb 22 18:21:48 2016 +0800

    fix label rendering issue on editor

commit 3b40ce5bd6a9ef8aa6c4f4b7874408e446ecc655
Author: zilongshanren <guanghui8827@126.com>
Date:   Mon Feb 22 16:10:43 2016 +0800

    add label

commit c304e8f40f9097905023d5bb5206faa6cf20be1a
Author: zilongshanren <guanghui8827@126.com>
Date:   Mon Feb 22 14:02:47 2016 +0800

    refactoring, add EditBoxImpl

commit 913b52536e9085ec2baaf3c71cd8300d7a988962
Author: zilongshanren <guanghui8827@126.com>
Date:   Mon Feb 22 11:30:35 2016 +0800

    add toggle native editbox logic

commit 2058f73ab82c1aa28c2ccf36046a727477a4c519
Merge: 744d8ad 595d744
Author: zilongshanren <guanghui8827@126.com>
Date:   Mon Feb 22 10:48:43 2016 +0800

    Merge remote-tracking branch 'fireball/master'

commit 744d8ad93d6b8bc322173c828be954b9f2834bbb
Author: zilongshanren <guanghui8827@126.com>
Date:   Fri Feb 19 13:37:34 2016 +0800

    remove resize and add vertical scrollbar
2016-02-23 16:52:22 +08:00
knoxHuang 36b5f75aec remove contentScaleFactor 2016-02-22 17:42:59 +08:00
Jare Guo 16490118c6 .fire should not changed by label and widget with no user input 2016-02-02 14:37:55 +08:00
zilongshanren 4701b70474 refine 2016-01-28 14:43:41 +08:00