Commit Graph

152 Commits

Author SHA1 Message Date
zilongshanren 35dfa5e318 add spacingX for bmfont 2017-02-17 20:52:13 +08:00
zilongshanren a3e1c1d071 finish label gradient effect 2017-02-17 20:06:45 +08:00
zilongshanren 478ce6446f add gradient color properties 2017-02-17 18:15:46 +08:00
pandamicro a9aaaec6ab Improve RenderCmd construction performance 2017-01-22 17:34:22 +08:00
zilongshanren 25855cf860 remove unneeded if 2017-01-19 10:52:01 +08:00
zilongshanren 21020296ec fix bmfont lazy loading issue 2017-01-19 10:44:01 +08:00
zilongshanren 069e5432a0 add _notifyRegionStatus call 2017-01-16 10:04:26 +08:00
zilongshanren 435b895c4e fix label opacity performance issue 2017-01-13 11:44:09 +08:00
zilongshanren 1a799671e5 finish outline tag parser 2017-01-05 16:37:14 +08:00
zilongshanren 8a89d303d9 add more outline tests 2017-01-05 16:17:46 +08:00
zilongshanren a514d4ddc6 make labelatlas inheritent from bitmapfont 2016-12-23 21:18:41 +08:00
zilongshanren 331c65ac5f fix parsing fnt data string error 2016-12-23 17:57:27 +08:00
zilongshanren 025f92da24 finish labelatlas 2016-12-23 17:43:38 +08:00
zilongshanren 0d1b94651f bmfont spriteFrame respect trim 2016-12-21 23:37:00 +08:00
zilongshanren 0d0d18c1b7 add bmfont batch rendering
commit 68c7b5ed8e174238514b4b680634f197a976de60
Author: zilongshanren <guanghui8827@126.com>
Date:   Wed Dec 21 11:19:21 2016 +0800

    finish web bmfont batch

commit 3d038e14128a375848efec99f3706c0e252cdbd0
Author: zilongshanren <guanghui8827@126.com>
Date:   Fri Dec 16 17:25:05 2016 +0800

    bitmap support spriteframe on web

commit 87d371410de223956c50bd5a4b85958973181c11
Author: zilongshanren <guanghui8827@126.com>
Date:   Fri Dec 16 16:42:51 2016 +0800

    make bitmap depends on spriteframe
2016-12-21 16:49:09 +08:00
Nan Wang 4dea8e7a8a move all error logs to DebugInfos.js and only show error id in release build 2016-12-15 17:07:01 +08:00
Jare Guo cfc193f894 preload fnt when loading scene 2016-12-08 14:02:43 +08:00
zilongshanren ce9c752f0c optimize custom ttf font load notification 2016-11-17 18:09:00 +08:00
zilongshanren 086f092227 add custom font loader
add richtext font load

improve custom ttf font cache

fix almost the cases

fix for android mobile device

add custom font loader

fix font load issue

remove unneeded logs
2016-11-10 16:18:45 +08:00
zilongshanren e947cf0592 optimize label same property settings 2016-10-28 14:11:06 +08:00
zilongshanren fe410a5505 fix bmfont size notification 2016-10-25 16:59:54 +08:00
zilongshanren 1484a038b9 add ready to play event to videoplayer 2016-10-17 12:04:35 +08:00
zilongshanren 98f2938542 add rich element image parser support 2016-09-23 13:55:31 +08:00
zilongshanren 2bd9d08262 add img test 2016-09-23 10:20:27 +08:00
zilongshanren c11e29f212 renaming functions 2016-09-22 13:38:54 +08:00
zilongshanren b7b3f440e5 add cyrillic language support 2016-09-22 11:46:37 +08:00
zilongshanren def203cddc fix bmfont 2016-09-22 10:56:28 +08:00
zilongshanren 20038b8fb9 unify CJK and space unicode in engine 2016-09-22 10:41:45 +08:00
zilongshanren 23fbed9cc9 replace sglabel fragment text 2016-09-22 10:37:18 +08:00
zilongshanren 31eeb4e61c make fragment text more generic 2016-09-22 10:03:07 +08:00
zilongshanren bb8a941e4f move richtext common logic to CCTextUtils 2016-09-21 18:05:41 +08:00
zilongshanren cf25027c87 sync rich text italics implementation with native 2016-09-12 14:19:34 +08:00
Wang Nan d7952024b7 Merge pull request #1092 from zilongshanren/fix-label-shrink
fix label shrink effect
2016-09-07 10:39:15 +08:00
Wang Nan 83908b2ea3 Merge pull request #1097 from dabingnn/v1.2_fix_ttf_loading
refine ttf file loading
2016-09-07 10:38:07 +08:00
Huabing.Xu dd62837856 small adjusts 2016-09-07 10:13:49 +08:00
Huabing.Xu 4734c20e22 refine ttf file loading 2016-09-06 18:02:00 +08:00
zilongshanren d15b82f476 fix label shrink effect 2016-09-06 10:41:03 +08:00
zilongshanren 7a745fa740 refactoring code 2016-09-02 15:24:07 +08:00
zilongshanren 9173a9c0a6 fix newline rich text element 2016-09-02 14:01:32 +08:00
zilongshanren 54d0467fb5 add newline richtext element 2016-09-01 22:35:35 +08:00
Wang Nan f8e6e55d6a Merge pull request #1077 from zilongshanren/fix-label-shrink-bug-richtext
fix shrink bug
2016-09-01 10:35:21 +08:00
zilongshanren f893152aa2 fix shrink bug 2016-08-31 17:58:16 +08:00
Nan Wang 2ec8bf2c6b merged 2016-08-31 14:30:54 +08:00
zilongshanren eb454e5ce0 add richtext bold/italics/underline 2016-08-30 11:25:24 +08:00
zilongshanren 66fa31d3e1 add bold/italic/underline support 2016-08-30 11:06:32 +08:00
zilongshanren a15c2cf750 add bold and italic support 2016-08-29 16:47:23 +08:00
zilongshanren 4a89edb410 refactoring 2016-08-26 17:44:21 +08:00
zilongshanren 57e17c73b9 add RichText component
A minimal working prototype

try and fix

fix richtext color

make richtext properties tweakable

temp

refine

add measure text

fix fragment text

finish non \n case

make non maxWidth working

adjust calling order

fix wired bugs

get first word

still one bug remained

fix wrap error

refactoring

update lineOffsetX

refactoring

refactoring

fix a return issue

don't display vertical alignment

improve performance

refactoring almost done

refactoring

refactoring

improve setColor

use shared htmlTextParser

fix contentSize change issue

add click event handler

add hoverin and hoverout event handler

fix a issue

remove mousein and mouseover

done
2016-08-25 16:47:59 +08:00
zilongshanren e2fbf3de2c add bbcode parser
commit 98767c294a5b5ac1272d320358a65821b8adbbe4
Author: zilongshanren <guanghui8827@126.com>
Date:   Fri Aug 12 18:41:16 2016 +0800

    fix tag

commit 4f6bde4e147b69d8c4c91f149140be6e81a41bbd
Author: zilongshanren <guanghui8827@126.com>
Date:   Fri Aug 12 18:11:40 2016 +0800

    add bold/italic/underline

commit 69a498c44b38f302c448f23e6e544a13e419c2ea
Author: zilongshanren <guanghui8827@126.com>
Date:   Fri Aug 12 17:31:07 2016 +0800

    finish nested tag test

commit 0a7328a8cf9752612de4f8a4cababf00c8e74427
Author: zilongshanren <guanghui8827@126.com>
Date:   Fri Aug 12 15:44:08 2016 +0800

    finish tag parsing

commit d375700850ea52e18710d44d39626f8f22d677ba
Author: zilongshanren <guanghui8827@126.com>
Date:   Fri Aug 12 11:53:16 2016 +0800

    refactoring done

commit 38b567c3439a8b0858b59645ff81cd458ce235a9
Merge: a30fa24 c6cab77
Author: zilongshanren <guanghui8827@126.com>
Date:   Fri Aug 12 11:49:44 2016 +0800

    Merge branch 'master' into add-rich-text-support

commit a30fa24f7127a3cae3945ad994458744766894dc
Author: zilongshanren <guanghui8827@126.com>
Date:   Fri Aug 12 11:48:30 2016 +0800

    refactor tag parsing

commit f123f52c24b3c994769f8c17de1b3a4099af72cd
Merge: ad6e15b f8f9f72
Author: zilongshanren <guanghui8827@126.com>
Date:   Fri Aug 12 09:56:44 2016 +0800

    Merge branch 'master' into add-rich-text-support

commit ad6e15b0124c93fa51c551a9d25d71e2d08c85da
Author: zilongshanren <guanghui8827@126.com>
Date:   Fri Aug 12 09:50:42 2016 +0800

    parse event tag

commit 88cf8a900318408da6f1efba9660efebb2f7469f
Author: zilongshanren <guanghui8827@126.com>
Date:   Wed Aug 10 15:11:03 2016 +0800

    add event handler

commit a409e294b8b39c0bfc79c1e9872bca7339d06e93
Author: zilongshanren <guanghui8827@126.com>
Date:   Wed Aug 10 11:30:53 2016 +0800

    add size parser

commit 15406e1884da24f1d9aade74664f18ce055c91cd
Author: zilongshanren <guanghui8827@126.com>
Date:   Wed Aug 10 10:22:58 2016 +0800

    make color parsing works

commit 6a5e1966e33ed6bf7aa253c1c4d8df52c5906d4c
Author: zilongshanren <guanghui8827@126.com>
Date:   Tue Aug 9 18:31:20 2016 +0800

    support color value

commit 5ee73d1fbbaac7b2e2183182dd095ec3ffa76c20
Author: zilongshanren <guanghui8827@126.com>
Date:   Tue Aug 9 18:21:38 2016 +0800

    add basic tag parser

commit 05a4de6da69a7101376432e19b4a28c098db22ac
Author: zilongshanren <guanghui8827@126.com>
Date:   Thu Jul 14 14:37:09 2016 +0800

    add escape symbol test
2016-08-19 17:36:21 +08:00
zilongshanren b107896350 rename member variables 2016-08-19 17:09:51 +08:00