knoxHuang
|
90fe87ef1b
|
fix get spriteFrame name error for jsb
|
2016-06-01 14:38:39 +08:00 |
|
Jare Guo
|
39cd20a24d
|
Merge pull request #756 from 2youyouo2/doc
update collider doc
|
2016-06-01 11:34:37 +08:00 |
|
2youyouo2
|
d5bafe9aab
|
update CCIntersection doc
|
2016-06-01 11:27:01 +08:00 |
|
2youyouo2
|
a9339b83a8
|
fixed collider doc
|
2016-06-01 11:11:30 +08:00 |
|
Jare Guo
|
54538104e2
|
Merge pull request #755 from knoxHuang/master
update updateWorldTransform example for Skeleton
|
2016-05-31 14:45:17 +08:00 |
|
knoxHuang
|
9d47cc05e7
|
update updateWorldTransform example for Skeleton
|
2016-05-31 14:31:13 +08:00 |
|
Wang Nan
|
e8faf84be9
|
Merge pull request #753 from knoxHuang/master
fix find Bone after bone get worldX and worldY Is 0 bug.
|
2016-05-31 14:07:53 +08:00 |
|
Wang Nan
|
26ca0cd3cd
|
Merge pull request #754 from VisualSJ/master_3133
video
|
2016-05-31 14:07:16 +08:00 |
|
knoxHuang
|
a8fd1f125a
|
remove auto updateWorldTransform, add updateWorldTransform api for Skeleton
|
2016-05-31 14:06:09 +08:00 |
|
ViusualSJ
|
f40d672c5f
|
Don't send event when video===null
|
2016-05-31 12:04:01 +08:00 |
|
ViusualSJ
|
82caecc334
|
Don't send paused event
|
2016-05-31 11:43:17 +08:00 |
|
ViusualSJ
|
54b08a16ad
|
add resume and fixed setContentSize
|
2016-05-31 10:58:03 +08:00 |
|
Wang Nan
|
dcf94ee13f
|
Merge pull request #752 from zilongshanren/add-fixed-position-API
add scroll to fixed position API
|
2016-05-31 10:33:59 +08:00 |
|
zilongshanren
|
341633201f
|
improve docs
|
2016-05-31 10:29:46 +08:00 |
|
zilongshanren
|
0118566038
|
add API docs
|
2016-05-31 09:46:04 +08:00 |
|
Wang Nan
|
7d91ee033b
|
Merge pull request #751 from knoxHuang/master
perfect game and director pause / resume API
|
2016-05-31 09:19:08 +08:00 |
|
Wang Nan
|
a6899c170c
|
Merge pull request #749 from VisualSJ/master_3133
video player 增加 visible 的支持
|
2016-05-31 09:17:59 +08:00 |
|
zilongshanren
|
97f7d95074
|
add scroll to fixed position API
|
2016-05-30 21:28:55 +08:00 |
|
ViusualSJ
|
c86e7b26dc
|
review updateDisplay -> updateVisibility
|
2016-05-30 18:44:15 +08:00 |
|
ViusualSJ
|
9b179c2b11
|
Fixed video position bug
|
2016-05-30 18:38:38 +08:00 |
|
Johnny Wu
|
563d6fe7fc
|
remove deprected electron code
|
2016-05-30 17:31:26 +08:00 |
|
knoxHuang
|
f3cda54407
|
perfect game and director pause / resume API
|
2016-05-30 14:24:31 +08:00 |
|
Wang Nan
|
97ae12ad56
|
Merge pull request #746 from jareguo/temp
log the engine size when building html5
|
2016-05-30 11:33:40 +08:00 |
|
ViusualSJ
|
92f9c79ede
|
video visible
|
2016-05-30 11:09:28 +08:00 |
|
Jare Guo
|
e02ebf309f
|
log the engine size when building html5
|
2016-05-29 00:53:55 +08:00 |
|
Jare Guo
|
32e0bd8254
|
Merge pull request #744 from jareguo/temp
CCClass should not omit type info if default value is defined by function
|
2016-05-27 17:44:22 +08:00 |
|
Jare Guo
|
78768eb5fa
|
CCClass should not omit type info if default value is defined by function
|
2016-05-27 17:40:39 +08:00 |
|
Wang Nan
|
fcb8705831
|
Merge pull request #743 from 2youyouo2/collider
disable collider animatable for now
|
2016-05-27 16:11:10 +08:00 |
|
Nan Wang
|
c05950b988
|
Merge branch 'master' of github.com:cocos-creator/engine
|
2016-05-27 16:02:56 +08:00 |
|
2youyouo2
|
eb9c052720
|
disable collider animatable for now
|
2016-05-27 16:02:35 +08:00 |
|
Nan Wang
|
45f70f758c
|
update engine version
|
2016-05-27 16:02:15 +08:00 |
|
Jare Guo
|
b68243768a
|
Merge pull request #742 from jareguo/temp
support negative scaling widget
|
2016-05-27 15:56:07 +08:00 |
|
Jare Guo
|
af08d1139e
|
support negative scaling widget
|
2016-05-27 15:46:02 +08:00 |
|
pandamicro
|
1efcfb89ec
|
Merge pull request #740 from jareguo/temp
fix bug of rotated spriteframe in Canvas
|
2016-05-27 14:04:06 +08:00 |
|
Jare Guo
|
777f9f8718
|
Merge pull request #741 from natural-law/issue3170
Remove the size provider when a TiledLayer component is destroyed.
|
2016-05-27 13:35:48 +08:00 |
|
zhangbin
|
206fade8cc
|
Remove the size provider when a TiledLayer component is destroyed.
|
2016-05-27 12:05:08 +08:00 |
|
Jare Guo
|
17dddc24de
|
Merge pull request #739 from natural-law/issue3170
Solve the issue : Can't reorder the children of TiledMap nodes.
|
2016-05-27 11:57:01 +08:00 |
|
zhangbin
|
4453110d09
|
Improve the method name.
|
2016-05-27 11:56:16 +08:00 |
|
Jare Guo
|
d7aabda077
|
fix bug of rotated spriteframe in Canvas
|
2016-05-27 11:41:29 +08:00 |
|
zhangbin
|
a6c55e73e5
|
Solve the issue : Can't reorder the children of TiledMap nodes.
|
2016-05-27 11:37:27 +08:00 |
|
Wang Nan
|
84da728e43
|
Merge pull request #734 from dabingnn/fix_spriteDistortion_JSB
fix sprite distortion JSB
|
2016-05-27 10:57:04 +08:00 |
|
Wang Nan
|
9f3bb5f6ec
|
Merge pull request #736 from knoxHuang/master
fix android UC Can not run example error. #fireball/issues/3112
|
2016-05-27 10:22:41 +08:00 |
|
Wang Nan
|
c3981c87bc
|
Merge pull request #738 from jareguo/temp
spine should be visible after adding to existing node.
|
2016-05-27 09:39:18 +08:00 |
|
Wang Nan
|
0b96d4d455
|
Merge pull request #737 from pandamicro/master
Fix orientation adaptation may fail when rotated size stays unchange
|
2016-05-27 09:35:08 +08:00 |
|
Jare Guo
|
466d0faa90
|
Merge pull request #735 from jareguo/master
should support nil component during preload
|
2016-05-26 21:39:06 +08:00 |
|
Jare Guo
|
98580b1a28
|
spine should be visible after adding to existing node.
|
2016-05-26 21:25:56 +08:00 |
|
pandamicro
|
715f1d5f70
|
Fix orientation adaptation may fail when rotated size stays unchange
|
2016-05-26 19:25:07 +08:00 |
|
Jare Guo
|
1e047fc1ef
|
should support nil component during preload
|
2016-05-26 18:47:40 +08:00 |
|
Huabing.Xu
|
18d099731f
|
use functions to make scale9sprite JSB happy
|
2016-05-26 18:37:31 +08:00 |
|
knoxHuang
|
18e79ccd2b
|
fix android UC Can not run example error. #fireball/issues/3112
|
2016-05-26 18:36:25 +08:00 |
|