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 |
|
zilongshanren
|
ba74d95fb1
|
improve button interactable behavior
|
2016-03-14 10:35:11 +08:00 |
|
knoxHuang
|
2d7f991a11
|
update components api url
|
2016-03-09 18:33:13 +08:00 |
|
knoxHuang
|
57a8e12052
|
built-in module in the title next to add a help icon.
|
2016-03-09 17:57:13 +08:00 |
|
zilongshanren
|
89b36a38ce
|
fix ui range value
|
2016-03-04 11:32:29 +08:00 |
|
zilongshanren
|
46fd75348c
|
clear all the flag when Button is onDisable
|
2016-03-03 11:17:58 +08:00 |
|
zilongshanren
|
4e075c197f
|
fix wrong state switch in touch move
|
2016-03-03 10:17:59 +08:00 |
|
Nan Wang
|
3a70ae6060
|
update license file and source code header.
|
2016-03-01 11:04:12 +08:00 |
|
zhangbin
|
f8a543520a
|
Move emitEvents from cc.Component to cc.Component.EventHandler.
|
2016-02-25 14:25:02 +08:00 |
|
zhangbin
|
e10ae216e8
|
Emit mapLoaded when the map loading is finished.
|
2016-02-25 14:25:02 +08:00 |
|
Jare Guo
|
e187eeb533
|
Merge pull request #313 from minggo/master
fix some comments
|
2016-02-02 15:56:59 +08:00 |
|
minggo
|
136f494c74
|
fix some comments
|
2016-02-02 15:53:12 +08:00 |
|
minggo
|
abf53d15a6
|
fix some comments
|
2016-02-02 15:46:20 +08:00 |
|
pandamicro
|
a93ae1478c
|
Merge pull request #308 from minggo/master
fix some comments
|
2016-02-02 11:29:31 +08:00 |
|
minggo
|
bd71a5f727
|
fix some comments
|
2016-02-01 15:36:25 +08:00 |
|
Jare Guo
|
653e8915e5
|
Fix CCButton:
- disabled button should not be able to response click
- released button should keep hovered
|
2016-01-30 22:37:09 +08:00 |
|
Jare Guo
|
ee3663131b
|
specifiy default button colors
|
2016-01-30 20:32:23 +08:00 |
|
pandamicro
|
40f91ad4d2
|
Merge pull request #279 from zilongshanren/add-editobox-support
add EditBox component.
|
2016-01-26 15:18:30 +08:00 |
|
2youyouo2
|
628aeb7737
|
add animatable: false for component
|
2016-01-25 12:08:10 +08:00 |
|
zilongshanren
|
7c66c1e4b6
|
add EditBox component.
rename editbox to sgEditBox
add editbox components
add background scale9sprite to editbox
add function to change editbox bgsprite size
add editbox properties
add string property
sync all the interfaces
refactor button event handler
finish single line editobox
finish multiline editbox
add editbox component
|
2016-01-22 18:08:04 +08:00 |
|
pandamicro
|
93fc5681e9
|
Fix CCButton _hitTest usage
|
2016-01-11 10:40:29 +08:00 |
|
pandamicro
|
8a8d139e1c
|
Roll back some mistaken changes to Button/ScrollView, my bad
|
2016-01-11 10:17:13 +08:00 |
|
pandamicro
|
e0e741884d
|
Fix event handling issues in Button/ScrollView
|
2016-01-10 03:29:06 +08:00 |
|
zilongshanren
|
3ce238070d
|
don't do hitTest in touch move and touch ended
|
2015-12-29 15:11:29 +08:00 |
|
zilongshanren
|
2a471bae7b
|
Improve button and scroll touch dispatch
Squashed commit of the following:
commit 8fcc4f4d116372072959d4c8a6192247d953d0ae
Author: zilongshanren <guanghui8827@126.com>
Date: Mon Dec 28 21:51:25 2015 +0800
refactor button and scrollview to use new event.
commit f3c1bc2153c85ee913a3a674c8f418087384146d
Author: zilongshanren <guanghui8827@126.com>
Date: Mon Dec 28 17:04:06 2015 +0800
fix touch move out and in, button state is wrong.
commit 57ad4c7d887b879a1f71281798347057652decff
Merge: 7b3fe78 7c6f572
Author: zilongshanren <guanghui8827@126.com>
Date: Mon Dec 28 15:39:03 2015 +0800
Merge remote-tracking branch 'fireball/v0.7' into fixButtonClickEvent
commit 7b3fe785dee943abfcfdc04ad5c228b4247bbd2f
Author: zilongshanren <guanghui8827@126.com>
Date: Mon Dec 28 15:38:24 2015 +0800
remove self emit touch event
commit c1afba5131e3f3735ca236fdb693a72cff52ba4b
Merge: 6939b66 45e877a
Author: zilongshanren <guanghui8827@126.com>
Date: Mon Dec 28 11:44:59 2015 +0800
Merge remote-tracking branch 'fireball/v0.7' into fixButtonClickEvent
commit 6939b66f6c2bbe4de1adc26b81613ddd40828b6e
Author: zilongshanren <guanghui8827@126.com>
Date: Mon Dec 28 11:44:28 2015 +0800
fix typo
|
2015-12-28 21:53:27 +08:00 |
|
zilongshanren
|
f75925209c
|
improve ui components
|
2015-12-25 10:22:22 +08:00 |
|
knoxHuang
|
38cae90d05
|
update CCButton and CCSprite and deprecated
|
2015-12-21 17:43:00 +08:00 |
|
knoxHuang
|
9945eeb559
|
spriteRender renname sprite
|
2015-12-21 17:06:49 +08:00 |
|
Wang Nan
|
26ceb5072b
|
Merge pull request #84 from nantas/master
更新组件属性 tooltip
|
2015-12-19 18:18:25 +08:00 |
|
Nan Wang
|
d099c7b73b
|
add tooltip for component up to label.
|
2015-12-19 18:11:43 +08:00 |
|
2youyouo2
|
dff392cf99
|
fixed cc.Button hittest
|
2015-12-19 16:15:44 +08:00 |
|
Nan Wang
|
9362210cc2
|
Merge branch 'master' of github.com:nantas/engine
|
2015-12-19 02:34:48 +08:00 |
|
Nan Wang
|
fbce1743aa
|
update button tooltip.
|
2015-12-18 18:44:27 +08:00 |
|
2youyouo2
|
0b65e7b6df
|
use enabledInHierarchy
|
2015-12-18 18:30:17 +08:00 |
|
2youyouo2
|
f1b5dbeee9
|
should not trigger button event when node is not active
|
2015-12-18 18:02:54 +08:00 |
|
Nan Wang
|
1d0b14b32f
|
add i18n updates to components.
|
2015-12-16 20:43:55 +08:00 |
|
knoxHuang
|
20ff5ec173
|
EButton Renamed Button
|
2015-12-16 17:15:35 +08:00 |
|
Nan Wang
|
4b059294d2
|
fixed code-editor parsing error for engine apis.
|
2015-12-10 16:38:26 +08:00 |
|
Jare Guo
|
1fc0b6bc9a
|
Merge commit '067f62a6568adacee1d3f114723f45e5eb7aa279'
# Conflicts:
# cocos2d/core/base-nodes/CCAtlasNode.js
# cocos2d/core/sprites/CCSprite.js
# extensions/ccui/base-classes/UIScale9Sprite.js
|
2015-12-09 20:56:38 +08:00 |
|
Jare Guo
|
ef24960351
|
mixin EventTarget instead of inherit by polyfill
|
2015-12-09 20:53:59 +08:00 |
|
knoxHuang
|
9e057e3c6d
|
update fireball-x/fireball#433: Shielding original cc.ENode and cc.EScene
|
2015-12-09 18:25:08 +08:00 |
|