2youyouo2
|
32f92efa8e
|
refine code
|
2016-08-15 14:02:51 +08:00 |
|
2youyouo2
|
8605cf4d8f
|
fixed graphics arc
|
2016-08-15 11:45:12 +08:00 |
|
Nan Wang
|
130b8449b2
|
update engine version
|
2016-08-12 12:02:00 +08:00 |
|
Wang Nan
|
b474a9dd57
|
Merge pull request #1029 from pandamicro/v1.2
Fix some issues introduced in v1.2
|
2016-08-12 11:51:32 +08:00 |
|
Wang Nan
|
37c41b0bca
|
Merge pull request #1021 from jareguo/v1.2
auto release
|
2016-08-12 11:18:52 +08:00 |
|
Wang Nan
|
6f99838b27
|
Merge pull request #1028 from nantas/v1.2
update api doc, fix typo
|
2016-08-12 11:17:38 +08:00 |
|
Jare Guo
|
788b48852a
|
improve api document for auto release
|
2016-08-12 11:16:24 +08:00 |
|
Nan Wang
|
52c0dbdb0c
|
Merge branch 'v1.2' of github.com:cocos-creator/engine into v1.2
|
2016-08-12 11:14:17 +08:00 |
|
Nan Wang
|
af30ff6f7b
|
fix api doc typo
|
2016-08-12 11:13:52 +08:00 |
|
Jare Guo
|
8f3001c289
|
add Scene.autoReleaseAssets
|
2016-08-12 11:12:46 +08:00 |
|
Jare Guo
|
05f3ce563a
|
rename autoRelease to setAutoRelease
|
2016-08-12 11:12:46 +08:00 |
|
Jare Guo
|
b09203e4fb
|
do not release assets loaded by loadRes
|
2016-08-12 11:12:46 +08:00 |
|
Jare Guo
|
5477ba9bd9
|
implement autoReleaseRecursively
|
2016-08-12 11:12:46 +08:00 |
|
Jare Guo
|
0a03ec658c
|
should release texture specially
|
2016-08-12 11:12:46 +08:00 |
|
Jare Guo
|
f04a119e94
|
working on auto release
|
2016-08-12 11:12:46 +08:00 |
|
Jare Guo
|
b542c68b99
|
house keeping
|
2016-08-12 11:12:46 +08:00 |
|
Wang Nan
|
8205d85aad
|
Merge pull request #1024 from 2youyou2/collision
fixed CollisionManager
|
2016-08-11 18:51:31 +08:00 |
|
Wang Nan
|
8c5407e220
|
Merge pull request #1023 from 2youyou2/animation
Animation
|
2016-08-11 18:49:27 +08:00 |
|
pandamicro
|
6b1c8bb568
|
Fix small API issues
|
2016-08-11 15:44:50 +08:00 |
|
pandamicro
|
aa4d23076c
|
Only send one touch cancel event when ScrollView scrolled
|
2016-08-11 15:44:40 +08:00 |
|
pandamicro
|
7851c97a32
|
break batch for scale9sprite with distortion
|
2016-08-11 15:43:42 +08:00 |
|
pandamicro
|
b50454d8cd
|
Fix event.target not set in emit
|
2016-08-11 15:42:06 +08:00 |
|
pandamicro
|
8bcc91e590
|
Fix mouse hovered node access issue during scene switch
|
2016-08-11 15:39:05 +08:00 |
|
pandamicro
|
f9a4a573fb
|
Merge pull request #1026 from knoxHuang/v1.2
add syncPositionUpdate for CardinalSplineTo fireball/issues/3956
|
2016-08-11 10:53:22 +08:00 |
|
knoxHuang
|
7e8c1a0cd8
|
add syncPositionUpdate for CardinalSplineTo fireball/issues/3956
|
2016-08-11 10:08:17 +08:00 |
|
2youyouo2
|
775963c5da
|
fixed CollisionManager
|
2016-08-10 15:15:46 +08:00 |
|
2youyouo2
|
e04b69e55d
|
refine code
|
2016-08-10 14:06:16 +08:00 |
|
2youyouo2
|
4e2da16103
|
animation playOnLoad should handle in onEnable
|
2016-08-10 13:55:19 +08:00 |
|
Nan Wang
|
d6c05b93b4
|
update engine version
|
2016-08-10 09:41:26 +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 |
|
Wang Nan
|
0fa0ef78ff
|
Merge pull request #1022 from dabingnn/fix_node_transform_bug
fix node transform bug
|
2016-08-09 17:05:09 +08:00 |
|
Jare Guo
|
71d97ed794
|
Merge pull request #1015 from knoxHuang/v1.2
fix runAction error for fireball/issues/3891
|
2016-08-09 16:59:07 +08:00 |
|
knoxHuang
|
17e31566c1
|
fix runAction error for fireball/issues/3891
|
2016-08-09 16:57:16 +08:00 |
|
Huabing.Xu
|
d0c177f8f2
|
fix node transform bug
|
2016-08-09 16:41:46 +08:00 |
|
Wang Nan
|
d8a211e0f3
|
Merge pull request #1020 from knoxHuang/v1.2_Action
fix runAction skewBy “too much recursion” error for fireball/issues/3922
|
2016-08-09 16:22:59 +08:00 |
|
Wang Nan
|
496a8c2731
|
Merge pull request #1019 from natural-law/v1.2
Solve the code merging error in _ccsg.TMXLayer.
|
2016-08-09 16:22:16 +08:00 |
|
zhangbin
|
af69c2ae3c
|
Solve the logic error in _ccsg.TMXLayer.
It's caused by code merging.
|
2016-08-09 15:56:52 +08:00 |
|
knoxHuang
|
08f5810fd2
|
fix runAction “too much recursion” error for fireball/issues/3922
|
2016-08-09 14:26:11 +08:00 |
|
zhangbin
|
c38a848931
|
Solve the error interface name in _ccsg.TMXLayer.
|
2016-08-09 10:30:29 +08:00 |
|
zilongshanren
|
65f37bf8fa
|
if hoverSprite is null, don't process hover event
|
2016-08-08 15:30:25 +08:00 |
|
Wang Nan
|
1bfce7c1cb
|
Merge pull request #1013 from dabingnn/fix_labelTTF_bug
fix label ttf webGL rendering
|
2016-08-08 11:55:32 +08:00 |
|
Wang Nan
|
b9f8600953
|
Merge pull request #1014 from zilongshanren/a-few-fixes-v1.2
A few fixes v1.2
|
2016-08-08 11:05:36 +08:00 |
|
zilongshanren
|
76b969dc4a
|
add async decencies to package.json
|
2016-08-05 11:00:14 +08:00 |
|
zilongshanren
|
7ba3dd91bd
|
fix button color transition interactive=false
|
2016-08-05 11:00:06 +08:00 |
|
zilongshanren
|
dd85de6cbb
|
fix scrollbar opacity issue
|
2016-08-05 10:59:51 +08:00 |
|
Huabing.Xu
|
17734ed874
|
fix label ttf webGL rendering
|
2016-08-05 10:35:31 +08:00 |
|
Jare Guo
|
fa5a5b2810
|
Merge pull request #1008 from hylthink/v1.2
modify anysdk api doc
|
2016-08-03 16:59:12 +08:00 |
|
yanli.huang
|
72accea8cc
|
modify anysdk api doc
|
2016-08-03 16:09:05 +08:00 |
|
Wang Nan
|
e9753e4229
|
Merge pull request #1006 from hylthink/v1.2
add anysdk api doc
|
2016-08-03 10:54:19 +08:00 |
|
yanli.huang
|
2d259d2f4d
|
add anysdk api doc
|
2016-08-03 10:30:23 +08:00 |
|