zilongshanren
|
dd85de6cbb
|
fix scrollbar opacity issue
|
2016-08-05 10:59:51 +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 |
|
Nan Wang
|
e5f73f4bfe
|
update engine version
|
2016-08-03 10:01:27 +08:00 |
|
Wang Nan
|
52d66741ea
|
Merge pull request #1004 from dabingnn/fix_sprite_webGL
Fix sprite web gl
|
2016-08-02 16:07:59 +08:00 |
|
pandamicro
|
f16ad78698
|
Merge pull request #1003 from pandamicro/v1.2
Fix tile map transform update issue under Canvas
|
2016-08-02 15:21:27 +08:00 |
|
Wang Nan
|
c936107b11
|
Merge pull request #1005 from nantas/v1.2
fixed api comment syntax error
|
2016-08-02 15:20:21 +08:00 |
|
Nan Wang
|
67322b3f2a
|
fixed api comment syntax error
|
2016-08-02 15:19:25 +08:00 |
|
Huabing.Xu
|
878a05fa02
|
fix filled radial sprite bug
|
2016-08-02 15:03:01 +08:00 |
|
pandamicro
|
7781aff2ab
|
Fix tile map transform update issue under Canvas
|
2016-08-02 14:39:32 +08:00 |
|
Huabing.Xu
|
d185af11ac
|
fix filled bar sprite bug
|
2016-08-02 14:28:48 +08:00 |
|
pandamicro
|
8a76b779e6
|
Merge pull request #1000 from VisualSJ/v1.2
WebGLRenderingContext does not exist
|
2016-08-02 11:34:01 +08:00 |
|
pandamicro
|
030c9ee26b
|
Merge pull request #1002 from pandamicro/v1.2
Fix label color being applied twice
|
2016-08-02 11:33:07 +08:00 |
|
pandamicro
|
862a8e9f0e
|
Fix label color being applied twice
|
2016-08-02 11:31:14 +08:00 |
|
VisualSJ
|
37132fd798
|
WebGLRenderingContext does not exist
|
2016-08-02 10:27:55 +08:00 |
|
pandamicro
|
23be140246
|
Merge pull request #999 from pandamicro/v1.2
Fix touch start point haven't been scaled issue
|
2016-08-01 18:22:22 +08:00 |
|
pandamicro
|
9f29fdc8ff
|
Merge pull request #996 from dabingnn/fix_label_dirtyregion_bug
fix dirty region not updated correctly for label
|
2016-08-01 18:20:43 +08:00 |
|
pandamicro
|
a2766c3f77
|
Fix touch start point haven't been scaled issue
|
2016-08-01 18:16:17 +08:00 |
|
Huabing.Xu
|
6a1322b572
|
fix dirty region not updated correctly for label
|
2016-08-01 16:46:15 +08:00 |
|
pandamicro
|
61a54db549
|
Merge pull request #994 from pandamicro/v1.2
Fix game EVENT_HIDE&SHOW not working in JSB
|
2016-08-01 16:31:56 +08:00 |
|
Jare Guo
|
4ccfb04a2f
|
fix build
|
2016-08-01 16:21:49 +08:00 |
|
pandamicro
|
3dfc574f4d
|
Fix game EVENT_HIDE&SHOW not working in JSB
|
2016-08-01 16:20:39 +08:00 |
|
pandamicro
|
0b0f7e42fc
|
Merge pull request #993 from pandamicro/v1.2
Add back ActionCatmullRom
|
2016-08-01 16:17:05 +08:00 |
|
pandamicro
|
4f8a6daf81
|
Add back ActionCatmullRom
|
2016-08-01 14:41:40 +08:00 |
|
Wang Nan
|
3342812976
|
Merge pull request #992 from pandamicro/v1.2
Improve pause & resume logic
|
2016-08-01 14:25:59 +08:00 |
|
pandamicro
|
a57fcd2514
|
Add async to package.json
|
2016-08-01 14:23:01 +08:00 |
|
pandamicro
|
15670df9ec
|
Improve pause & resume logic
|
2016-08-01 12:26:49 +08:00 |
|
Jare Guo
|
61f4e9ab23
|
Merge pull request #991 from jareguo/master
make widget's enable state persist when animation editor not changed
|
2016-08-01 12:18:49 +08:00 |
|
Jare Guo
|
1f80aa3291
|
make widget's enable state persist when animation editor not changed
|
2016-08-01 12:08:31 +08:00 |
|
Jare Guo
|
34b0f529c9
|
remove setVisible from api
|
2016-08-01 12:08:31 +08:00 |
|
Wang Nan
|
c62302ff74
|
Merge pull request #990 from cocos-creator/master
update v1.2
|
2016-08-01 12:01:38 +08:00 |
|
Wang Nan
|
d3e03b9500
|
Merge pull request #989 from natural-law/issue3831
Add interface for set the tiles opacity of TiledLayer.
|
2016-08-01 11:35:09 +08:00 |
|
zhangbin
|
09e0b05067
|
Add interface for set the tiles opacity of TiledLayer.
|
2016-08-01 11:30:09 +08:00 |
|
Nan Wang
|
8f01758fa9
|
update version
|
2016-08-01 11:15:07 +08:00 |
|
Nan Wang
|
701aff13f9
|
update engine version
|
2016-07-30 16:33:19 +08:00 |
|
Jare Guo
|
7c43a3eb4f
|
Merge pull request #988 from jareguo/master
should not reset _sgNode in #986
|
2016-07-30 16:15:48 +08:00 |
|
Jare Guo
|
48c8fa6422
|
should not reset _sgNode in #986
|
2016-07-30 16:14:58 +08:00 |
|
Wang Nan
|
dfa2437f19
|
Merge pull request #986 from nantas/master
hotfix node.parent invalid native object issue
|
2016-07-30 11:34:56 +08:00 |
|
Nan Wang
|
edd0d5d6ec
|
remove replaced.release to fix node.parent invalid native object issue when switching scenes
|
2016-07-30 11:33:11 +08:00 |
|
Nan Wang
|
1acbe1b78f
|
Merge branch 'master' of github.com:cocos-creator/engine
|
2016-07-30 09:58:06 +08:00 |
|
Wang Nan
|
870b7a025a
|
Merge pull request #985 from pandamicro/master
Fix memory leak caused by event listener
|
2016-07-30 09:46:06 +08:00 |
|
pandamicro
|
c70058964d
|
Fix Event.EventTouch is undefined issue in JSB
|
2016-07-29 18:49:46 +08:00 |
|
pandamicro
|
3b75a0ab9d
|
Fix memory leak caused by event listener
|
2016-07-29 18:49:45 +08:00 |
|
Wang Nan
|
c67c3e7e72
|
Merge pull request #984 from dabingnn/fix_graphics_node
fix graphics node canvas rendering bug with hacking
|
2016-07-29 18:07:47 +08:00 |
|
Nan Wang
|
855ed7dcf1
|
Merge branch 'master' of github.com:cocos-creator/engine
|
2016-07-29 17:46:03 +08:00 |
|
Huabing.Xu
|
f932ce0a2e
|
fix graphics node canvas rendering bug with hacking
|
2016-07-29 17:45:34 +08:00 |
|
Wang Nan
|
dd11e55208
|
Merge pull request #981 from zilongshanren/improve-brake-scrollview
make scrollview brake more aggressive
|
2016-07-29 17:39:46 +08:00 |
|
Wang Nan
|
6b45ef83c5
|
Merge pull request #982 from dabingnn/fix_rotated_spriteFrame_canvas
bug fix for rotated sprite frame on canvas
|
2016-07-29 17:39:00 +08:00 |
|