Commit Graph

182 Commits

Author SHA1 Message Date
pandamicro 70e648397e Fix loader.getResCount 2017-02-14 17:18:48 +08:00
pandamicro 873c27f9c0 Fix unit tests 2017-01-23 15:51:00 +08:00
Jare Guo ba3bdf284b fix global pollute while instantiating 2017-01-10 19:10:34 +08:00
Jare Guo 9ed97adbc8 fix unit tests about loader 2017-01-10 16:23:23 +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 98c151c405 add outline color 2017-01-04 16:55:50 +08:00
Jare Guo 31efbebb60 fully support serialization for FastDefined value types 2016-12-23 14:11:45 +08:00
VisualSJ 32d2f3dad5 Fixed a bug about missing url 2016-12-14 10:33:37 +08:00
Jare Guo 31dd92280a support for loading the same asset from multiple packages 2016-12-13 11:02:53 +08:00
Jare Guo 5dc7735e0d optimize destruct operation by using eval 2016-11-24 18:29:38 +08:00
Jare Guo c5526caee8 rename loadResAll to loadResDir 2016-11-17 16:15:04 +08:00
Jare Guo 4e511774d8 escape string for baked js source 2016-11-17 11:27:24 +08:00
Nan Wang a93d65d0f6 Merge branch 'v1.3' of github.com:cocos-creator/engine 2016-11-17 10:10:04 +08:00
2youyouo2 3a48a569b4 improve animation interface, fixed typo 2016-11-15 11:41:41 +08:00
Jare Guo 08a6b31398 sync with changes of Editor.utils 2016-11-09 10:51:07 +08:00
Jare Guo 4c2c52ead9 CCClass: ctor of mixin should be called only once 2016-11-08 20:54:43 +08:00
Jare Guo b54c819f38 minify code and output warning if _super method undefined 2016-11-08 17:36:50 +08:00
Jare Guo a2876a33f8 bake CCClass property initializer (JIT) 2016-11-07 17:08:07 +08:00
Jare Guo b22b36ea58 bake instantiate codes (JIT) 2016-11-07 17:08:07 +08:00
Jare Guo 4bedb8a993 minor tweaks 2016-11-07 17:08:07 +08:00
Nan Wang 3c49921cfe merged v1.3 2016-11-07 15:21:06 +08:00
Jare Guo d661039439 Merge pull request #1234 from jareguo/master
add widget.updateAlignment
2016-11-02 20:55:26 +08:00
Jare Guo d52a9d43f4 optimize operation for changing enabled 2016-10-25 16:49:21 +08:00
Jare Guo 85ea595c0e widget.updateAlignment 2016-10-24 17:03:18 +08:00
Jare Guo db4d56dd93 support es6 for testing engine-extends 2016-10-19 16:48:15 +08:00
Jare Guo 2b14093891 optimize operation for changing enabled 2016-10-11 17:03:47 +08:00
2youyouo2 a0e418ec2d fixed animation may emit wrong event when set time 2016-10-10 14:06:10 +08:00
Wang Nan 0c311378af Merge pull request #1150 from zilongshanren/addRichTextImageElement
Add rich text image element
2016-09-26 17:02:18 +08:00
pandamicro 4f6100323e Make new loader pass the unit test 2016-09-24 23:23:20 +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
Wang Nan 71b6a59046 Merge pull request #1140 from cocos-creator/v1.2
merge V1.2
2016-09-22 14:13:42 +08:00
2youyouo2 cda712dc96 add delay events for animation 2016-09-20 14:40:45 +08:00
Jare Guo 9bbe1dd8d2 prevent loop in widget manager out of sync 2016-09-12 11:24:33 +08:00
Jare Guo ea2c2057b7 add mutable-forward-iterator 2016-09-09 18:17:01 +08:00
Nan Wang 6acbbe6373 merged v1.2 2016-09-05 12:06:47 +08:00
Jare Guo 8a244d64b2 minor tweaks 2016-09-03 17:20:00 +08:00
Jare Guo 7c53c47b5f working on synced prefab 2016-09-03 16:56:39 +08:00
zilongshanren a41f4505c0 fix richtext instantiate issue 2016-09-02 14:25:08 +08:00
zilongshanren 9173a9c0a6 fix newline rich text element 2016-09-02 14:01:32 +08:00
zilongshanren 8f072ece92 add more br element test 2016-09-02 11:10:22 +08:00
zilongshanren 54d0467fb5 add newline richtext element 2016-09-01 22:35:35 +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 feca3e5780 add more tests 2016-08-19 17:36:21 +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
knoxHuang f605874747 backing out loader code, Later refactoring 2016-07-27 18:07:27 +08:00
knoxHuang 9ecc4d226b fix cc.hide、cc.show、cc.toggleVisibility Web no effect for issues/3698 2016-07-27 12:51:08 +08:00
knoxHuang c48e18cd5f fix load prefab bug for fireball/issues/3749 2016-07-27 10:02:51 +08:00
pandamicro 9c2aff5e59 Fix scale 9 sprite unit test 2016-07-26 12:17:58 +08:00