Commit Graph

514 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
Wang Nan 4e555017a1 Merge pull request #701 from natural-law/issue2610
Record the BMFont original size in the BitmapFont Asset object.
2016-05-20 15:08:40 +08:00
zhangbin b56dfce1da Change the bmFontOriginalSize property to private. 2016-05-20 14:35:00 +08:00
Wang Nan 8c17eab601 Merge pull request #698 from jareguo/temp
build a single js for preview
2016-05-20 13:59:48 +08:00
zhangbin bd83852ec5 Record the original size in the BitmapFont Asset object. 2016-05-20 11:35:00 +08:00
Jare Guo 5f3aecb6a4 add type checking code for addChild 2016-05-20 10:30:15 +08:00
pandamicro d8908507b7 Merge pull request #692 from knoxHuang/master
fix update and start calling sequence bug
2016-05-19 17:48:47 +08:00
knoxHuang a1eb098225 fix start update lateUpdate calling sequence bug 2016-05-19 17:37:38 +08:00
Wang Nan 9a08a40ff1 Merge pull request #695 from 2youyouo2/anim
move _updateClip to editor
2016-05-19 15:31:25 +08:00
Jare Guo 655ca3412b remove duplicated setFontFileOrFamily in Label 2016-05-19 13:52:12 +08:00
2youyouo2 4a22551b21 move _updateClip to editor 2016-05-19 11:17:22 +08:00
Wang Nan 3ddb895928 Merge pull request #689 from zilongshanren/fix-layout-initialize-issue
fix scrollview layout as content issue
2016-05-19 09:42:37 +08:00
zilongshanren 99d2a4b71e always listen on size-changed event 2016-05-18 18:39:11 +08:00
Wang Nan 820f615dfa Merge pull request #687 from natural-law/issue2610
Add property in Label component for the origin size of BMFont.
2016-05-18 18:24:32 +08:00
zilongshanren 13ab2a1242 fix scrollview layout as content issue 2016-05-18 18:00:41 +08:00
zilongshanren 7ae03ef67e initalize temp variable. 2016-05-18 16:35:51 +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
Nan Wang 32beee604f Merge branch 'master' of github.com:cocos-creator/engine 2016-05-17 14:10:02 +08:00
Nan Wang 2d170fd1a1 merged visualsj 2016-05-17 14:09:36 +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
Nan Wang 017f573473 merge v1.0 2016-05-17 13:00:03 +08:00
Huabing.Xu a9d5ea5053 add width for stroke 2016-05-17 12:13:30 +08:00
pandamicro f4c86f906a Fix event order not changed in setSiblings and some code cleanup 2016-05-17 11:57:21 +08:00
Jare Guo a8ab54b558 Merge pull request #674 from jareguo/temp
add preload lifecycle method
2016-05-17 11:26:13 +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
Jare Guo 142aeed175 add preload lifecycle method 2016-05-16 15:41:49 +08:00
ViusualSJ 69d786985e Merge origin:master CCAudioSource.js 2016-05-16 14:00:29 +08:00
Huabing.Xu 0d00b4e9fd fix typo 2016-05-16 10:17:48 +08:00
ViusualSJ c8eec29aed simulator audio bug 2016-05-13 14:44:53 +08:00
Jare Guo f8edcbe802 remove cc.sys.isNative in html5 2016-05-13 11:21:22 +08:00
Huabing.Xu 101e710683 implement outline effect 2016-05-13 10:32:20 +08:00
Jare Guo 0b84eb8ff4 Merge pull request #664 from 2youyouo2/anim
stop animation on destroy
2016-05-12 17:40:41 +08:00
2youyouo2 fb8cadecea stop animation on destroy 2016-05-12 17:36:52 +08:00
Nan Wang 3e396e3080 merged v1.0 2016-05-11 17:29:17 +08:00
zilongshanren 951169ca66 fix scrollView boundary calculation 2016-05-09 10:06:49 +08:00
Wu Jie 0d49945af7 Merge pull request #646 from VisualSJ/master_label
增加label的inspector显示页面
2016-05-06 14:00:41 +08:00
ViusualSJ a60db52569 Add label inspector html 2016-05-06 13:52:10 +08:00
Wang Nan 8cd4951bf7 Merge pull request #644 from zilongshanren/improve-button-normal-spriteframe
fix button target spriteframe change issue
2016-05-06 10:28:09 +08:00
zilongshanren 831187ec4b improve node event 2016-05-05 17:24:15 +08:00
zilongshanren fa06296616 fix button target spriteframe change issue
disable button event when button is disabled

improve event register code

refine code
2016-05-05 16:42:07 +08:00
zilongshanren 62dc65475a minor improve performance 2016-05-05 15:40:19 +08:00
zilongshanren 335325c3cb fix layout errors when child's width is negative 2016-05-04 15:59:02 +08:00
Jare Guo a99889f948 minor optimizations 2016-04-30 00:53:01 +08:00
2youyouo2 f6679b5a07 update animation 2016-04-28 16:01:56 +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 c984d9cdf9 support gizmo event 2016-04-26 18:19:56 +08:00