Commit Graph

54 Commits

Author SHA1 Message Date
Jare Guo b1e8e498e9 make sizeProvider error more clear 2016-05-21 18:23:03 +08:00
ViusualSJ 02c8015610 Fixed a bug about use system font 2016-05-20 17:46:04 +08:00
ViusualSJ 3861c76385 remove useSystemFont from CCGLabel 2016-05-20 15:38:51 +08:00
ViusualSJ 306a61707a remove useSystemFont from CCGLabel 2016-05-20 15:28:51 +08:00
zhangbin b56dfce1da Change the bmFontOriginalSize property to private. 2016-05-20 14:35:00 +08:00
zhangbin bd83852ec5 Record the original size in the BitmapFont Asset object. 2016-05-20 11:35:00 +08:00
Jare Guo 655ca3412b remove duplicated setFontFileOrFamily in Label 2016-05-19 13:52:12 +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
Jare Guo 142aeed175 add preload lifecycle method 2016-05-16 15:41:49 +08:00
Jare Guo f8edcbe802 remove cc.sys.isNative in html5 2016-05-13 11:21:22 +08:00
ViusualSJ a60db52569 Add label inspector html 2016-05-06 13:52:10 +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
Jare Guo 2f66e219a0 Merge pull request #625 from jareguo/master
optimizations
2016-04-25 15:03:25 +08:00
Jare Guo 1b8fafc9cc turn on dead code optimization in building 2016-04-25 14:32:57 +08:00
Nan Wang b746266448 fix api typo 2016-04-22 10:56:16 +08:00
knoxHuang ffb2c9af14 Label.file change to .font 2016-04-20 18:08:16 +08:00
knoxHuang 451561bfd7 Bitmap Font resources from Raw Asset to Asset (#2661) 2016-04-18 18:29:20 +08:00
Jare Guo 1bfe4f3fd1 Merge pull request #591 from cocos-creator/v1.0
sync V1.0
2016-04-12 14:39:26 +08:00
Nan Wang c3961feb8a update i18n differed component help link 2016-04-11 19:06:30 +08:00
zilongshanren 719bcf9766 fix scrollview content boundary 2016-03-30 14:35:06 +08:00
zilongshanren 83c30ea536 fix editbox maxLength 2016-03-24 18:01:41 +08:00
zilongshanren b01f458217 fix label, editbox first time content size change 2016-03-24 17:07:38 +08:00
knoxHuang 9b8d4a3624 update label API 2016-03-16 15:23:11 +08:00
knoxHuang f4b8b94267 update label API 2016-03-16 14:32:49 +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
zilongshanren ca4380b123 fix bmfont color change issue 2016-03-04 18:16:24 +08:00
Nan Wang 3a70ae6060 update license file and source code header. 2016-03-01 11:04:12 +08:00
Jare Guo 94da7696c5 update PR 2016-02-27 17:09:06 +08:00
Jare Guo e115117881 add RendererInSG 2016-02-26 19:28:22 +08:00
Jare Guo 0d4022436c rename ComponentInSG -> RendererBelowSG 2016-02-26 19:28:22 +08:00
zilongshanren 7cb89ec578 fix jsb label 2016-02-24 18:34:21 +08:00
Jare Guo 802650165b fix label size not initialized in play mode 2016-02-23 16:41:04 +08:00
pandamicro 897a0d08e1 Remove duplicated retain 2016-02-04 09:42:37 +08:00
pandamicro d8dbbda902 Fix more JSB crash issues 2016-02-04 00:47:47 +08:00
Jare Guo e187eeb533 Merge pull request #313 from minggo/master
fix some comments
2016-02-02 15:56:59 +08:00
minggo abf53d15a6 fix some comments 2016-02-02 15:46:20 +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
zilongshanren a008a91135 fix label layout issue 2016-01-28 11:22:37 +08:00
zilongshanren 1e3e136186 fix label comp initial string and file issue 2016-01-27 17:05:12 +08:00
Jare Guo 077b6638eb make it likely to initialize comp._sgNode just in constructor 2016-01-27 16:10:51 +08:00
2youyouo2 628aeb7737 add animatable: false for component 2016-01-25 12:08:10 +08:00
zilongshanren dc1caef5cd fix label component init font size issue.
fix https://github.com/cocos-creator/fireball/issues/1612

fix https://github.com/cocos-creator/fireball/issues/1573
2016-01-18 17:39:52 +08:00
Jare Guo 6604053da8 add _initSgNode for ComponentInSG 2016-01-13 14:05:24 +08:00
zilongshanren 91065e322f add bmfont NONE mode support
fix switch font file in resize height mode

don't resize when label overflow is NONE

fixup! add bmfont NONE mode support
2016-01-11 15:04:31 +08:00
Huabing.Xu 4fbad8590a Label NONE mode works on ttf 2016-01-08 10:32:34 +08:00
Huabing.Xu a07ab99b24 treat None as Clamp in label
hack in ccLabel component when overflow is NONE
2016-01-05 19:26:05 +08:00
zilongshanren b55ccb8438 fix label jsb
fix ttf config

fix label overflow issue

improving coding style

make code more cleaner

remove cc._Label from cc namespace
2016-01-05 11:27:28 +08:00