Commit Graph

194 Commits

Author SHA1 Message Date
Jare Guo db4d56dd93 support es6 for testing engine-extends 2016-10-19 16:48:15 +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
2youyouo2 ceadbdbfa3 support animation callback 2016-07-22 15:10:14 +08:00
pandamicro a2eefba043 Merge pull request #945 from pandamicro/master
Fix some issues
2016-07-22 15:00:32 +08:00
pandamicro fa0cd9081f Fix scale9sprite unit test 2016-07-22 14:51:10 +08:00
Jare Guo bbbb38dc80 try to fix unit test 2016-07-22 11:54:58 +08:00
Nan Wang 1f7adb2c5c merge v1.1 fixes 2016-07-19 10:04:06 +08:00
Jare Guo a66aee3f31 Merge pull request #896 from jareguo/attr
reimplement attribute system
2016-07-18 10:04:50 +08:00
Jare Guo 768ac4d28c should not destroy persistRootNode 2016-07-16 17:00:50 +08:00
Jare Guo ce8ee75ce7 reimplement attribute system 2016-07-13 15:39:53 +08:00
2youyouo2 b328983cef add group-changed event 2016-07-11 11:24:19 +08:00
knoxHuang 89f4156891 merge html5 code for #fireball/issues/2787 2016-06-29 13:40:46 +08:00
Jare Guo 2882e90e81 add json-unpacker 2016-06-16 18:08:05 +08:00
2youyouo2 ab81a869ab optimize code 2016-06-12 18:09:34 +08:00
2youyouo2 1efcbf02d0 add getSpriteFrames for SpriteAtlas 2016-06-12 17:20:21 +08:00
2youyouo2 523977fd3b add createWithSpriteFrames for AnimationClip 2016-06-12 17:19:42 +08:00
knoxHuang c555d045ba fix start multiple runs #fireball/issues/3258 2016-06-02 17:52:32 +08:00
Johnny Wu 563d6fe7fc remove deprected electron code 2016-05-30 17:31:26 +08:00
Wang Nan c59b3c14bf Merge pull request #714 from pandamicro/master
Fix callback handlers has function
2016-05-23 17:40:02 +08:00
2youyouo2 964590a4de fixed animation removeClip 2016-05-23 15:59:41 +08:00
pandamicro 34baf4f4bb Fix callback handlers has function 2016-05-23 15:49:33 +08:00
Wang Nan ef96a955a0 Merge pull request #693 from jareguo/master
refactor error checking codes for type attribute in CCClass
2016-05-20 15:35:00 +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
Jare Guo dbba94fbfb refactor error checking codes for type attribute in CCClass 2016-05-19 11:51:31 +08:00
2youyouo2 4a22551b21 move _updateClip to editor 2016-05-19 11:17:22 +08:00
ViusualSJ b187f08c70 remove audio source tests 2016-05-18 11:52:23 +08:00
Jare Guo a8ab54b558 Merge pull request #674 from jareguo/temp
add preload lifecycle method
2016-05-17 11:26:13 +08:00
Jare Guo fcaa3aadc2 add test for #2561 2016-05-17 11:18:54 +08:00