pandamicro
|
77febbfe3d
|
Merge branch 'master' into next
|
2018-03-13 15:07:21 +08:00 |
|
Jare Guo
|
a6fb92ad90
|
updating license
|
2018-02-01 09:38:54 +08:00 |
|
Jare Guo
|
bd15543093
|
updating license: Chukong Aipu -> Xiamen Yaji
|
2018-01-31 17:51:49 +08:00 |
|
pandamicro
|
7712da14f5
|
Merge remote-tracking branch 'fireball/master' into next
|
2018-01-15 17:51:33 +08:00 |
|
knoxHuang
|
7798ad818b
|
fix button bug
|
2017-12-20 16:28:45 +08:00 |
|
pandamicro
|
12e1c50c13
|
Move State API from Scale9Sprite to Sprite component
|
2017-10-11 13:46:23 +08:00 |
|
Jare Guo
|
20155c6541
|
fix api about event type
|
2017-05-19 11:22:50 +08:00 |
|
knoxHuang
|
bd8127aff7
|
optimization shader and tooltip for #fireball/issues/4771
|
2016-12-19 18:19:18 +08:00 |
|
zilongshanren
|
a22b669d02
|
remove unused logic
|
2016-11-08 17:43:54 +08:00 |
|
zilongshanren
|
4b7066f76c
|
improve scale transition touch move
|
2016-11-08 17:41:12 +08:00 |
|
zilongshanren
|
362b8b131f
|
refactoring button
|
2016-11-08 16:52:38 +08:00 |
|
zilongshanren
|
b672b8d0fe
|
improve button cancel behavior
|
2016-11-08 16:03:44 +08:00 |
|
zilongshanren
|
21a40e37c1
|
add the missing API docs
|
2016-10-19 15:22:39 +08:00 |
|
zilongshanren
|
89b6afcd09
|
add simplified click event registration
|
2016-10-12 17:19:48 +08:00 |
|
zilongshanren
|
b4e1a3f7dc
|
don't enable auto gray effect by default
|
2016-10-10 10:18:44 +08:00 |
|
zilongshanren
|
551802ba26
|
improve sprite transition hover state
|
2016-10-08 09:42:36 +08:00 |
|
zilongshanren
|
c5cde3de2a
|
fix button color transition hover state
|
2016-10-08 08:22:20 +08:00 |
|
zilongshanren
|
68884c4e70
|
add richtext image click event support
|
2016-09-26 11:19:25 +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 |
|
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 |
|
zilongshanren
|
9ac8238770
|
refactoring zoom feature
|
2016-09-08 14:50:48 +08:00 |
|
zilongshanren
|
1cfde666a7
|
fix transition touch move
|
2016-09-08 14:05:41 +08:00 |
|
zilongshanren
|
d735f05096
|
add scale transition
|
2016-09-07 17:53:41 +08:00 |
|
zilongshanren
|
771b92d26a
|
minor fix of Button docs
|
2016-08-30 13:34:27 +08:00 |
|
Wang Nan
|
5e2a5dbb4c
|
Merge pull request #1017 from zilongshanren/fixButtonHoverSprite
if hoverSprite is null, don't process hover event
|
2016-08-09 17:05:36 +08:00 |
|
zilongshanren
|
65f37bf8fa
|
if hoverSprite is null, don't process hover event
|
2016-08-08 15:30:25 +08:00 |
|
zilongshanren
|
7ba3dd91bd
|
fix button color transition interactive=false
|
2016-08-05 11:00:06 +08:00 |
|
Jare Guo
|
b521d61650
|
avoid reference error about _Scene.AssetsWatcher
|
2016-07-22 01:09:26 +08:00 |
|
Nan Wang
|
1f7adb2c5c
|
merge v1.1 fixes
|
2016-07-19 10:04:06 +08:00 |
|
zilongshanren
|
511c643718
|
fix button change interactable in event callback
|
2016-07-15 15:14:41 +08:00 |
|
Johnny Wu
|
2d60ac2c2b
|
Merge branch 'master' of github.com:cocos-creator/engine into inspector
|
2016-07-14 14:37:33 +08:00 |
|
Johnny Wu
|
a462ce79e4
|
change inspector url
|
2016-07-12 18:22:28 +08:00 |
|
Jare Guo
|
ef436d9da4
|
deferred load scene's raw asset
|
2016-07-08 17:15:57 +08:00 |
|
zilongshanren
|
91ded17834
|
add _previousNormalSprite to ctor
|
2016-06-16 17:13:15 +08:00 |
|
zilongshanren
|
64144568a3
|
fix toggle button interactable in editor
|
2016-06-16 17:04:19 +08:00 |
|
zilongshanren
|
303cd014c3
|
remove unused logic
|
2016-06-08 17:32:56 +08:00 |
|
pandamicro
|
3064e05aa7
|
Add capturing phase in event system and refactor CCScrollView & CCButton
|
2016-05-30 10:40:21 +08:00 |
|
Jare Guo
|
142aeed175
|
add preload lifecycle method
|
2016-05-16 15:41:49 +08:00 |
|
Nan Wang
|
3e396e3080
|
merged v1.0
|
2016-05-11 17:29:17 +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 |
|
Jare Guo
|
1bfe4f3fd1
|
Merge pull request #591 from cocos-creator/v1.0
sync V1.0
|
2016-04-12 14:39:26 +08:00 |
|
Nan Wang
|
c3961feb8a
|
update i18n differed component help link
|
2016-04-11 19:06:30 +08:00 |
|
zilongshanren
|
6668a4a9ba
|
fix button missing event arg
|
2016-03-30 16:53:30 +08:00 |
|
zilongshanren
|
ea2ab56079
|
fix interactive state change issue.
ticket id: https://github.com/cocos-creator/fireball/issues/2426#event-596704935
|
2016-03-21 14:36:10 +08:00 |
|
knoxHuang
|
dc9975a2cb
|
update CCButton and CCComponentEventHandler API
|
2016-03-17 11:31:57 +08:00 |
|
knoxHuang
|
1885d0ff84
|
update CCButton API
|
2016-03-17 09:58:26 +08:00 |
|