Commit Graph

2055 Commits

Author SHA1 Message Date
pandamicro 5bcdffd2cb Merge pull request #799 from knoxHuang/v1.1
fix prefab save data error fireball/issues/3352
2016-06-15 16:07:54 +08:00
knoxHuang 5580368817 fix prefab save data error fireball/issues/3352 2016-06-15 15:56:13 +08:00
Wang Nan 9973c712e2 Merge pull request #798 from 2youyou2/name
prevent '/' in node name
2016-06-15 15:26:19 +08:00
2youyouo2 d00c6aa3c6 prevent '/' in node name 2016-06-15 15:13:58 +08:00
Wang Nan 4ec39fe511 Merge pull request #796 from knoxHuang/v1.1
fix node.targetOff Interface registered event cannot be cancelled
2016-06-15 14:27:09 +08:00
knoxHuang 2e3702e4f7 fix node.targetOff Interface registered event cannot be cancelled 2016-06-15 14:25:11 +08:00
Jare Guo 35814fd14f Merge pull request #794 from zilongshanren/fixEditBoxDoubleClick
Improve VideoPlayer docs and coding style
2016-06-15 11:47:09 +08:00
zilongshanren 134c3d8679 add docs to VideoPlayer component 2016-06-15 11:46:29 +08:00
zilongshanren ae42b8950b refactor private method of videoPlayer component 2016-06-15 11:22:58 +08:00
pandamicro 15f861a68c Merge pull request #793 from pandamicro/v1.1
Fix director event registration issue
2016-06-14 18:40:34 +08:00
pandamicro 662716d320 Fix director event registration issue 2016-06-14 18:37:23 +08:00
pandamicro ece83a22e0 Merge pull request #792 from knoxHuang/v1.1
fix CCLabel TextAlignment API
2016-06-14 17:42:55 +08:00
knoxHuang 89ab77b91a fix CCLabel TextAlignment API 2016-06-14 17:00:06 +08:00
pandamicro d782123710 Merge pull request #789 from knoxHuang/v1.1
fix off event error.
2016-06-13 09:50:31 +08:00
knoxHuang a9197fe442 fix off event error. 2016-06-13 09:46:37 +08:00
pandamicro 72ef7c6ebf Merge pull request #787 from knoxHuang/v1.1
fix Opacity for jsb-action bug fireball/issues/#3165
2016-06-13 09:45:47 +08:00
Jare Guo 818a53a575 Merge pull request #788 from 2youyouo2/animation-clip
Animation clip
2016-06-12 18:37:50 +08:00
Wang Nan 00230b8c7c Merge pull request #785 from jareguo/v1.1
fix scale of skeleton is readonly after upgrading from old version
2016-06-12 18:23:09 +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 c04b98d3dc fix Opacity for jsb-action bug fireball/issues/#3165 2016-06-12 16:33:51 +08:00
Jare Guo bbcbcd5d40 Merge pull request #786 from natural-law/issue3324
Rename the method getTileset/setTileset to getTileSet/setTileSet.
2016-06-12 14:50:03 +08:00
zhangbin f1eb36dbb6 Move the deprecated methods to deprecated.js 2016-06-12 14:46:46 +08:00
zhangbin 3e73454df7 Rename the method getTileset/setTileset to getTileSet/setTileSet. 2016-06-12 14:33:35 +08:00
Jare Guo 842a68ea83 fix scale of skeleton is readonly after upgrading from old version 2016-06-12 14:33:12 +08:00
pandamicro 6de331f797 Merge pull request #784 from pandamicro/v1.1
Fixed EventTouch getID issue
2016-06-12 14:06:08 +08:00
pandamicro b5e58d5769 Fixed EventTouch getID issue 2016-06-12 14:04:23 +08:00
Jare Guo 3f63de63a2 Merge pull request #783 from pandamicro/v1.1
Do not stop sending event after propagationStopped
2016-06-12 12:01:11 +08:00
pandamicro ae1868efb2 Do not stop sending event after propagationStopped 2016-06-12 11:56:11 +08:00
Jare Guo 8a49f697d9 Merge pull request #782 from dabingnn/v1.1_fix_Label_outline
fix error in JSB for label outline
2016-06-12 11:36:18 +08:00
Huabing.Xu 8436d7cc0f fix error in JSB for label outline 2016-06-12 11:22:35 +08:00
Wang Nan c31d52563b Merge pull request #780 from zilongshanren/fix-bmfont-resize-height
remove unused logic
2016-06-08 17:34:02 +08:00
zilongshanren 303cd014c3 remove unused logic 2016-06-08 17:32:56 +08:00
Nan Wang e05160ac22 fixed node not clickable in scrollview 2016-06-08 16:09:40 +08:00
Wang Nan a9983c470f Merge pull request #779 from pandamicro/master
add capture phase and refactor button and scrollview
2016-06-08 15:45:39 +08:00
Nan Wang 056e8c70ee update version to v1.1.1 2016-06-08 15:08:21 +08:00
Wang Nan d33a81fac5 Merge pull request #778 from zilongshanren/fix-bmfont-resize-height
fix bmfont label resize height
2016-06-08 13:44:54 +08:00
Wang Nan ed4c4395d9 Merge pull request #777 from dabingnn/master_fix_toomanyTiles
add error log to prevent too many tiles
2016-06-08 13:44:47 +08:00
zilongshanren f4582d9515 fix bmfont label resize height 2016-06-08 12:03:10 +08:00
Wang Nan 418adacd33 Merge pull request #776 from knoxHuang/v1.1
fix Label string is null for webGL waring
2016-06-08 11:49:13 +08:00
knoxHuang 28a06758b9 fix Label string is null for webGL waring 2016-06-08 11:47:44 +08:00
Huabing.Xu 441367e11a add error log to prevent too many tiles 2016-06-08 11:34:45 +08:00
pandamicro c3e28939ca Merge pull request #774 from jareguo/v1.1
fix error when deactivating detached RendererInSG
2016-06-08 10:49:40 +08:00
Wang Nan 59cc798e5c Merge pull request #775 from knoxHuang/v1.1
add CCAudioSource isPlaying api
2016-06-08 10:46:41 +08:00
knoxHuang 39ca441ca3 add CCAudioSource isPlaying api 2016-06-08 10:35:11 +08:00
Jare Guo 34888547a5 fix error when deactivating detached RendererInSG 2016-06-07 17:41:39 +08:00
Wang Nan 144b6f398e Merge pull request #770 from zilongshanren/fix-scrollview-scrollto-api
Fix scrollview scrollto api
2016-06-07 09:25:31 +08:00
Wang Nan bcfdbe6d93 Merge pull request #772 from jareguo/v1.1
update PULL_REQUEST_TEMPLATE.md
2016-06-07 09:25:00 +08:00
Jare Guo 743ab3c59f update PULL_REQUEST_TEMPLATE.md 2016-06-06 18:52:05 +08:00