Commit Graph

17466 Commits

Author SHA1 Message Date
2youyouo2 2b82023eb1 add defaultClip to clips if defaultClip is not added to clips 2015-12-21 16:03:16 +08:00
Jare Guo d3e951c62d Merge pull request #92 from jareguo/master
widget's property should be adjusted to fit new position in edit mode
2015-12-21 15:48:41 +08:00
Jare Guo af69bf0988 widget's property should be adjusted to fit new position in edit mode 2015-12-21 15:46:44 +08:00
pandamicro d2c90b08a1 Merge branch 'master' of github.com:fireball-x/engine 2015-12-21 14:27:05 +08:00
Jare Guo dd0d7a4795 Merge pull request #91 from knoxHuang/sprite
cc.Sprite ranname _ccsg.Sprite and file name
2015-12-21 14:00:57 +08:00
knoxHuang 140a34b31d update CCSGSprite.js and deprecated.js 2015-12-21 13:58:36 +08:00
Jare Guo a1d79af185 Merge pull request #90 from jareguo/master
spriteframe should support packing
2015-12-21 13:38:20 +08:00
knoxHuang 5717fe7155 Merge branch 'master' into sprite
Conflicts:
	extensions/ccui/base-classes/UIScale9Sprite.js
2015-12-21 13:36:25 +08:00
Jare Guo 793bea0283 spriteframe should support packing 2015-12-21 13:35:34 +08:00
knoxHuang f86cad8c5f cc.sprite renname _ccsg.sprite and file name 2015-12-21 13:29:01 +08:00
Jare Guo 0aaadbc1bf Merge pull request #88 from dabingnn/refine-scale9Sprite
add deprecated
2015-12-21 11:59:16 +08:00
Wang Nan ab88fd50ef Merge pull request #89 from nantas/master
update i18n component tooltip.
2015-12-21 11:51:48 +08:00
Huabing.Xu 0c44e4d105 add deprecated 2015-12-21 11:50:00 +08:00
Nan Wang 682363d12d update i18n component tooltip. 2015-12-21 11:49:40 +08:00
Jare Guo 88d7194795 Merge pull request #82 from 2youyouo2/master
improve cc.Animation api
2015-12-21 11:22:56 +08:00
2youyouo2 c20d8c9563 update cc.Animation api 2015-12-21 10:50:51 +08:00
pandamicro f4e0cb2b2c Merge pull request #77 from dabingnn/refine-scale9Sprite
Refine scale9 sprite
2015-12-21 10:29:40 +08:00
Huabing.Xu aefd6e5d8e adding comments back 2015-12-21 10:16:21 +08:00
pandamicro ea835f8e70 Fix jshint issue in CCNode 2015-12-21 09:46:00 +08:00
Huabing.Xu 6dfc52435a add interface getRenderingType 2015-12-21 09:45:28 +08:00
2youyouo2 91fa5815ab Merge branch 'master' of github.com:fireball-x/engine 2015-12-21 09:25:02 +08:00
Jare Guo 939abfad79 Merge pull request #87 from jareguo/master
fix Rect height exceeds maximum margin
2015-12-21 02:05:50 +08:00
Jare Guo 60e0622755 should still check images loading state 2015-12-21 02:03:06 +08:00
Jare Guo 3cb0582920 callbacks invoker should supports remove operation during invoking, like event-listeners 2015-12-21 01:39:03 +08:00
Jare Guo 59f3cdf8a6 Merge pull request #86 from jareguo/master
callbacks invoker should supports remove operation during invoking
2015-12-20 23:57:58 +08:00
Jare Guo 58fcbc1f8a callbacks invoker should supports remove operation during invoking, like event-listeners 2015-12-20 23:56:11 +08:00
Wang Nan ba27c840f5 Merge pull request #85 from nantas/master
update scrollview menu path.
2015-12-20 23:26:12 +08:00
Nan Wang bb5a297413 update scrollview menu path. 2015-12-20 23:22:13 +08:00
2youyouo2 8e9a68def8 Merge branch 'master' of github.com:fireball-x/engine
Conflicts:
	cocos2d/core/components/CCAnimation.js
2015-12-19 21:36:28 +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
Jare Guo 9eeb6c4200 Merge pull request #83 from 2youyouo2/1023
fixed cc.Button hittest
2015-12-19 17:12:23 +08:00
Huabing.Xu b768a4c267 param rename 2015-12-19 16:35:36 +08:00
2youyouo2 dff392cf99 fixed cc.Button hittest 2015-12-19 16:15:44 +08:00
2youyouo2 972e475566 improve cc.Animation api 2015-12-19 14:18:53 +08:00
pandamicro e0f3152699 Merge pull request #81 from dabingnn/refine-label
Refine label
2015-12-19 13:43:31 +08:00
Huabing.Xu 0ce1a4cc8e rename variable to local scope 2015-12-19 13:41:23 +08:00
Huabing.Xu 7d967d0144 new _fragmentText works 2015-12-19 13:31:46 +08:00
Huabing.Xu 5ec0a93991 temp slash 2015-12-19 11:24:11 +08:00
Huabing.Xu 2ed8cec149 change default blend function to non premultiplied 2015-12-19 09:40:22 +08:00
Nan Wang 9362210cc2 Merge branch 'master' of github.com:nantas/engine 2015-12-19 02:34:48 +08:00
Nan Wang a1580e3774 update audio and animation tooltip. 2015-12-19 02:33:51 +08:00
Jare Guo bee04b2666 Merge pull request #79 from 2youyouo2/892
should not trigger button event when node is not active
2015-12-18 22:06:09 +08:00
Wu Jie a035eb631e Merge pull request #80 from jwu/master
fix _addComponentAt can not add component instance
2015-12-18 18:47:28 +08:00
Johnny Wu 66f101ba3e fix _addComponentAt can not add component instance 2015-12-18 18:46:58 +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
Jare Guo 9fe16e0ca3 Merge pull request #76 from zilongshanren/addScrollView_V2
Add ScrollView and ScrollBar
2015-12-18 18:24:05 +08:00
zilongshanren 7bf2a8b28d rename a _isCurrAndPrevTouchPositionHitTest method 2015-12-18 18:22:00 +08:00
zilongshanren e571a476a8 refactor scrollview naming 2015-12-18 18:07:16 +08:00