Commit Graph

2895 Commits

Author SHA1 Message Date
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 66eb9c6db9 make html text parser modular 2016-09-21 16:10:37 +08:00
Jare Guo aaf7cec02d Merge pull request #1133 from zilongshanren/addToggle_v2
fix type circle reference warning in editor
2016-09-21 14:38:25 +08:00
zilongshanren 0a05098c11 fix type circle reference warning in editor 2016-09-21 14:37:03 +08:00
Jare Guo 503f501d4f Merge pull request #1132 from zilongshanren/addToggle_v2
Add Toggle and Toggle Group
2016-09-21 14:25:17 +08:00
zilongshanren 4a19c75688 Add Toggle and Toggle Group
commit 88cc46ea71258d32698157c8b6cbd5453d98bffe
Merge: e4323ec 91c87a8
Author: zilongshanren <guanghui8827@126.com>
Date:   Wed Sep 21 14:16:52 2016 +0800

    Merge branch 'master' into addCheckBox

commit e4323ecf3b21f54850228ff9a6bb3d81ce86462a
Author: zilongshanren <guanghui8827@126.com>
Date:   Wed Sep 21 14:11:26 2016 +0800

    fix toggle group tooltip

commit 897fe28ec0f750c0c0c7fa01b19bd95f6ea7a6c6
Author: zilongshanren <guanghui8827@126.com>
Date:   Tue Sep 20 17:44:00 2016 +0800

    update component doc string

commit 90559147b74d581b229c916521265c92f22b6205
Author: zilongshanren <guanghui8827@126.com>
Date:   Tue Sep 20 11:33:05 2016 +0800

    remove executeInEditMode

commit 2c60439c4166f36c785c04d74e6d0d02aa6d7eb0
Author: zilongshanren <guanghui8827@126.com>
Date:   Tue Sep 20 10:55:19 2016 +0800

    refactor checkmark

commit e91cab956f93df0460be7de960ad27fab23dbe42
Author: zilongshanren <guanghui8827@126.com>
Date:   Tue Sep 20 10:19:38 2016 +0800

    add missing class docs

commit bf800a799873e0afa8026f98833cbbf73b00863c
Author: zilongshanren <guanghui8827@126.com>
Date:   Mon Sep 19 18:33:37 2016 +0800

    rename member variables

commit a4f0e859f033a78a76797e3fb820ac897521aaf0
Author: zilongshanren <guanghui8827@126.com>
Date:   Mon Sep 19 18:20:11 2016 +0800

    refine the Toggle and ToggleGroup

commit 54204c36c219f770ad58148b766f0419d25bf21c
Author: zilongshanren <guanghui8827@126.com>
Date:   Mon Sep 19 09:24:05 2016 +0800

    add ToggleGroup

    refactor toggle

    fix button zoom scale

    finish checkbox

    finish toggle and togglegroup

commit 3a18c096ef49ada7e8cc9757cd2df2900743890c
Author: zilongshanren <guanghui8827@126.com>
Date:   Wed Sep 14 10:18:43 2016 +0800

    add toggle.js
2016-09-21 14:19:28 +08:00
Jare Guo 91c87a8169 Merge pull request #1128 from knoxHuang/master
add slider component for fireball/issues/1462
2016-09-21 14:03:18 +08:00
knoxHuang f9492d325e update slider component cases for fireball/issues/1462 2016-09-21 12:04:28 +08:00
knoxHuang 9f5dc12c61 add slider component for fireball/issues/1462 2016-09-21 11:34:52 +08:00
Wang Nan 2a56116b83 Merge pull request #1130 from 2youyou2/animation-event
add delay events for animation
2016-09-20 15:42:54 +08:00
2youyouo2 cda712dc96 add delay events for animation 2016-09-20 14:40:45 +08:00
Wang Nan 6363a79b88 Merge pull request #1117 from zilongshanren/fix-richtext-italics-clip-issue
Fix richtext italics clip issue
2016-09-19 17:56:54 +08:00
Wang Nan ec4455218d Merge pull request #1125 from 2youyou2/graphics-warning
fixed graphics warning
2016-09-19 17:56:13 +08:00
Wang Nan 4146aaccc1 Merge pull request #1123 from natural-law/issue3120
Support show the object group in TiledMap.
2016-09-19 17:42:40 +08:00
2youyouo2 434826d5a3 fixed graphics warning 2016-09-19 15:29:26 +08:00
zhangbin 899f121859 Improve the implementation of showing Object Group in TiledMap. 2016-09-13 16:12:12 +08:00
Wang Nan 11c4217e2b Merge pull request #1120 from jareguo/master
fallback particle texture to plist if non-existent
2016-09-13 11:45:13 +08:00
Wang Nan f1c51c4fd0 Merge pull request #1119 from knoxHuang/master
add raw assets are not cached in the CC_EDITOR for fireball/issues/4158
2016-09-13 11:40:31 +08:00
Jare Guo 6d56ef78fe fallback particle texture to plist if non-existent 2016-09-13 11:04:36 +08:00
Jare Guo 990acec751 Merge pull request #1118 from cocos-creator/v1.2
Sync V1.2
2016-09-13 10:59:07 +08:00
knoxHuang 1410e5d52e add raw assets are not cached in the CC_EDITOR for fireball/issues/4158 2016-09-13 10:57:16 +08:00
zilongshanren 5670ff7524 optimize richtext status update 2016-09-13 10:13:46 +08:00
Jare Guo 2edd6842f5 Merge pull request #1115 from jareguo/v1.2
V1.2
2016-09-13 10:00:34 +08:00
zilongshanren 17b8a74c8a cache measureText label segment 2016-09-12 17:40:36 +08:00
zilongshanren 5466367f42 fix italic re-layout 2016-09-12 17:02:59 +08:00
zilongshanren cf25027c87 sync rich text italics implementation with native 2016-09-12 14:19:34 +08:00
Jare Guo 26761ff2ec fix isRunning 2016-09-12 13:59:44 +08:00
Jare Guo 927f5e860a house keeping for cocos-creator/fireball#2478 2016-09-12 13:49:40 +08:00
Wang Nan 8eb337365a Merge pull request #1107 from knoxHuang/master
add pageview to componet for fireball/issues/1461
2016-09-12 12:04:18 +08:00
zhangbin d4d3a22531 Support draw shape objects in Object Group. 2016-09-12 12:04:00 +08:00
knoxHuang bb6d966e59 update CCPageView code 2016-09-12 11:28:37 +08:00
knoxHuang 99765ac2f4 add pageview to componet for fireball/issues/1461 2016-09-12 10:37:15 +08:00
Nan Wang 363a1f7d96 merge v1.2 2016-09-12 10:15:24 +08:00
zhangbin 36e6bcd8de Improve the implementation of TMXObjectGroup & TMXObject. 2016-09-09 18:08:47 +08:00
Wang Nan f0dd404907 Merge pull request #1096 from jareguo/v1.2
support missing prefab
2016-09-09 17:13:21 +08:00
zhangbin 28fa0aab1b Merge branch 'master' of github.com:cocos-creator/engine into issue3120
# Conflicts:
#	cocos2d/tilemap/CCSGTMXObjectGroup.js
2016-09-09 16:58:21 +08:00
zhangbin df4be9dd3c Improve the logic of tile map parser. 2016-09-09 16:56:14 +08:00
Wang Nan f8dfc1133c Merge pull request #1109 from jareguo/remove_non-existent_prop
remove non-existent property wrapper
2016-09-09 14:21:36 +08:00
Wang Nan 2c3197ea51 Merge pull request #1103 from natural-law/issue4153
Solve the error in the TiledMap parser.
2016-09-09 14:20:35 +08:00
Wang Nan d9bc0e19f6 Merge pull request #1104 from jareguo/temp
support premultipliedAlpha on spine
2016-09-09 14:17:48 +08:00
Wang Nan fbc78162fd Merge pull request #1111 from zilongshanren/add-button-scale-transition
Add button scale transition
2016-09-09 14:16:22 +08:00
zilongshanren 8fe1d04111 improve button equality test logic 2016-09-09 11:41:21 +08:00
zilongshanren d15afcf418 improve button scale transition 2016-09-09 11:37:07 +08:00
zilongshanren e93b8c22a4 finish resize node to target node 2016-09-08 19:02:03 +08:00
zilongshanren 05591ad27e all button custom scale 2016-09-08 16:35:43 +08:00
Wang Nan 786845ee81 Merge pull request #1110 from pandamicro/v1.2
Improve WebGL detection
2016-09-08 16:22:29 +08:00
pandamicro eb8f888a74 Improve WebGL detection 2016-09-08 15:52:02 +08:00
Jare Guo 83c5761cfb Merge pull request #1108 from jareguo/fix-cc.Audio
fix cc.Audio
2016-09-08 14:54:43 +08:00