Jare Guo
|
f02b2f4e1c
|
add gulp build-min for editor
|
2016-05-26 10:36:50 +08:00 |
|
Wang Nan
|
3019c769ea
|
Merge pull request #727 from jareguo/master
support scaling widget
|
2016-05-25 17:35:04 +08:00 |
|
Jare Guo
|
8d10bd40f9
|
Merge pull request #731 from zilongshanren/fixScrollViewEvent
fix a minor bug of scrollview event
|
2016-05-25 17:16:07 +08:00 |
|
zilongshanren
|
7d21576102
|
fix a minor bug of scrollview event
|
2016-05-25 17:14:48 +08:00 |
|
zilongshanren
|
04b4ba3d25
|
Add scrollview event api (#729)
* add scrollview event type
* make scroll event working
* add bounce event
* improve code
|
2016-05-25 17:03:32 +08:00 |
|
pandamicro
|
4d27c000e3
|
Merge pull request #728 from pandamicro/master
Auto screen rotation: Fix margin set issue on some browser
|
2016-05-25 16:27:59 +08:00 |
|
pandamicro
|
9880fc4cab
|
Auto screen rotation: Fix margin set issue on some browser
|
2016-05-25 16:25:28 +08:00 |
|
Jare Guo
|
312ca05c13
|
support scaling widget
|
2016-05-25 14:22:08 +08:00 |
|
Wang Nan
|
4739d9def7
|
Merge pull request #726 from knoxHuang/master
fix api error
|
2016-05-25 11:39:11 +08:00 |
|
Wang Nan
|
9b3caf2bc3
|
Merge pull request #725 from knoxHuang/master
fix CCComponentEventHandler API error
|
2016-05-25 11:20:09 +08:00 |
|
knoxHuang
|
bb8d872a89
|
fix api error
|
2016-05-25 11:18:33 +08:00 |
|
knoxHuang
|
4c70dd29bb
|
fix CCComponentEventHandler API error
|
2016-05-25 11:16:57 +08:00 |
|
pandamicro
|
f7e5b67377
|
Merge pull request #724 from jareguo/master
convertToWorldSpace should support omit argument in JSB
|
2016-05-25 11:02:21 +08:00 |
|
Jare Guo
|
f66705b0d4
|
convertToWorldSpace should not support omitted argument
|
2016-05-25 10:58:37 +08:00 |
|
Jare Guo
|
1cf5a3bf94
|
Merge pull request #722 from pandamicro/master
Fix target not verified issue in event-listeners
|
2016-05-25 10:41:48 +08:00 |
|
pandamicro
|
09c7a9e76d
|
Callbacks handler: use REMOVE_PLACEHOLDER directly to detect
|
2016-05-25 10:40:12 +08:00 |
|
Jare Guo
|
3c4f744446
|
convertToWorldSpace should support omit argument in JSB
|
2016-05-24 21:41:31 +08:00 |
|
Jare Guo
|
cdd79c6ca3
|
Merge pull request #723 from zilongshanren/move-jsb-to-engine
add jsb polyfill file
|
2016-05-24 18:23:24 +08:00 |
|
zilongshanren
|
f231bd0fa0
|
add jsb polyfill file
|
2016-05-24 18:20:28 +08:00 |
|
pandamicro
|
409f8f123e
|
Merge branch 'master' of github.com:cocos-creator/engine
|
2016-05-24 18:16:55 +08:00 |
|
pandamicro
|
edbea7e688
|
Fix event listener's target update invoked on invalid object issue
|
2016-05-24 18:11:37 +08:00 |
|
Jare Guo
|
9748275004
|
Merge pull request #721 from pandamicro/master
Avoid issues in Editor
|
2016-05-24 16:04:27 +08:00 |
|
pandamicro
|
9fc253e40f
|
Avoid issues in Editor
|
2016-05-24 15:56:08 +08:00 |
|
Jare Guo
|
94d620b0b1
|
Merge pull request #720 from jareguo/master
sizeProvider should also be restored
|
2016-05-24 13:51:23 +08:00 |
|
Jare Guo
|
335ece5eb4
|
sizeProvider should also be restored
|
2016-05-24 13:50:07 +08:00 |
|
Jare Guo
|
b703919dac
|
Merge pull request #719 from zilongshanren/fix-videoplayer
fix videoplayer running error on Mac and Windows
|
2016-05-24 10:55:06 +08:00 |
|
zilongshanren
|
0b03966b0f
|
fix videoplayer running error on Mac and Windows
|
2016-05-24 10:50:40 +08:00 |
|
Jare Guo
|
8ce114c65f
|
Merge pull request #718 from jareguo/master
fix canvas can not change opacity if contains editbox
|
2016-05-24 10:26:37 +08:00 |
|
Jare Guo
|
5ba83bc114
|
fix canvas can not change opacity if contains editbox
|
2016-05-23 23:39:32 +08:00 |
|
Nan Wang
|
1772ad644c
|
update version to 1.1.0-beta.6
|
2016-05-23 18:59:14 +08:00 |
|
Wang Nan
|
c59b3c14bf
|
Merge pull request #714 from pandamicro/master
Fix callback handlers has function
|
2016-05-23 17:40:02 +08:00 |
|
Jare Guo
|
275bca8fa0
|
Merge pull request #717 from zilongshanren/fix-layout-resizecontainer-disable
fix layout resize container mode issue
|
2016-05-23 17:32:55 +08:00 |
|
zilongshanren
|
2829898ed7
|
fix layout resize container mode issue
1. when disable some child node, the base width/height is not updated.
|
2016-05-23 17:25:26 +08:00 |
|
pandamicro
|
222458f453
|
Fixed padding issue in View
|
2016-05-23 17:23:45 +08:00 |
|
Wang Nan
|
0c1513dd99
|
Merge pull request #716 from 2youyouo2/anim
Anim
|
2016-05-23 16:12:47 +08:00 |
|
2youyouo2
|
964590a4de
|
fixed animation removeClip
|
2016-05-23 15:59:41 +08:00 |
|
pandamicro
|
7f3f487270
|
Merge branch 'master' of github.com:cocos-creator/engine
|
2016-05-23 15:58:49 +08:00 |
|
Wang Nan
|
4c4fbce278
|
Merge pull request #715 from zilongshanren/addVideoSupport_v2
Add videoplayer component
|
2016-05-23 15:54:23 +08:00 |
|
zilongshanren
|
f02a9851fa
|
Add videoplayer component
Squashed commit of the following:
commit 7afbfa6e02df7408b11873947157085598051395
Author: zilongshanren <guanghui8827@126.com>
Date: Mon May 23 15:46:41 2016 +0800
minor tweak of the implementation
commit ddb885ef505bc9c7ed88d6977f01add391fb78b2
Merge: 9cebe78 a568ac9
Author: zilongshanren <guanghui8827@126.com>
Date: Mon May 23 15:13:53 2016 +0800
Merge branch 'master' into addVideoSupport
commit 9cebe789fa811e97b5c79186e23e33c9998e28b4
Merge: 806825e f765762
Author: zilongshanren <guanghui8827@126.com>
Date: Mon May 23 14:55:55 2016 +0800
Merge branch 'master' into addVideoSupport
commit 806825eced92003c6a06a31f202998a563cc09aa
Author: zilongshanren <guanghui8827@126.com>
Date: Mon May 23 14:51:59 2016 +0800
refactor video player component
commit 381de09ccba26817cbf29159497a1a7b0f41f994
Author: zilongshanren <guanghui8827@126.com>
Date: Fri May 20 16:51:50 2016 +0800
remove jsb-videoplayer.js
commit 82a1ef74cb1b9940cd6ff180796dcb91b5853bce
Author: zilongshanren <guanghui8827@126.com>
Date: Fri May 20 16:48:20 2016 +0800
add tooptip for video player component
commit 06a67ec425ca0713bee36d4189fb0b84e78bca57
Author: zilongshanren <guanghui8827@126.com>
Date: Fri May 20 14:08:48 2016 +0800
ios videoplayer works
commit 8e69bba2b692680737a940d926b1e4f7546a5a52
Author: zilongshanren <guanghui8827@126.com>
Date: Thu May 19 17:56:56 2016 +0800
add jsb video
commit e07fb5640cd5f4bae077923d11a2918cd8dc3b2e
Merge: a6dc10a 21fc4f7
Author: zilongshanren <guanghui8827@126.com>
Date: Wed May 18 18:12:56 2016 +0800
Merge branch 'master_video' of https://github.com/VisualSJ/engine-1 into addVideoSupport
commit 21fc4f7f17dcb2277b9c69a49bb5d66e205209bd
Author: ViusualSJ <itharbors@outlook.com>
Date: Tue May 17 11:05:05 2016 +0800
Add video click (play/pause)
commit 59040d4ea6165e1c53bb3c9d378dea696932b975
Merge: ad5b5e8 7976787
Author: ViusualSJ <itharbors@outlook.com>
Date: Tue May 17 10:46:20 2016 +0800
Merge branch 'master' of github.com:cocos-creator/engine into master_video
commit ad5b5e8587d5fd673501a5cf8c990d3ca6385a9c
Author: ViusualSJ <itharbors@outlook.com>
Date: Tue May 17 10:37:02 2016 +0800
Fixed a bug about video transform
commit 6b8e5ae2c3917ad182cf0e1bf922193ac66f17d0
Author: ViusualSJ <itharbors@outlook.com>
Date: Mon May 16 16:38:13 2016 +0800
Fixed a bug about comp can't play
commit a6dc10a314db915c12f7fd545da7d0f6f89281a9
Merge: 4e92fa8 a298738
Author: zilongshanren <guanghui8827@126.com>
Date: Mon May 16 14:45:22 2016 +0800
Merge branch 'master' into addVideoSupport
commit 4e92fa80f38544c14edce9a0a0424e4635829314
Author: ViusualSJ <itharbors@outlook.com>
Date: Fri May 13 10:22:10 2016 +0800
create videoplayer.html
commit cd0bd01df61deab6a285609f48593e478cfe44f0
Author: ViusualSJ <itharbors@outlook.com>
Date: Thu May 12 15:40:59 2016 +0800
init video player
|
2016-05-23 15:52:12 +08:00 |
|
pandamicro
|
bbbe650531
|
Merge pull request #713 from jareguo/master
fix doc of cc.sequence
|
2016-05-23 15:50:06 +08:00 |
|
pandamicro
|
34baf4f4bb
|
Fix callback handlers has function
|
2016-05-23 15:49:33 +08:00 |
|
Jare Guo
|
7a013cffa1
|
fix doc of cc.sequence
|
2016-05-23 15:41:54 +08:00 |
|
Wang Nan
|
94f04f206b
|
Merge pull request #712 from pandamicro/master
Fix a bunch of bugs
|
2016-05-23 15:29:19 +08:00 |
|
Jare Guo
|
a568ac9269
|
label should not register size provider every frame
|
2016-05-23 15:02:08 +08:00 |
|
pandamicro
|
f7657625b0
|
Merge pull request #706 from knoxHuang/master
Add resume and pause function for Skeleton.
|
2016-05-23 13:46:40 +08:00 |
|
knoxHuang
|
29b04c5e8f
|
Add resume and pause function for Skeleton.
|
2016-05-23 11:57:01 +08:00 |
|
pandamicro
|
7172623584
|
Merge branch 'master' of github.com:fireball-x/engine
|
2016-05-23 11:32:49 +08:00 |
|
pandamicro
|
f028985ba0
|
Use push/pop in cc.NodePool
|
2016-05-23 11:32:27 +08:00 |
|
Wang Nan
|
00a5067baf
|
Merge pull request #710 from jareguo/master
make sizeProvider error more clear
|
2016-05-23 11:24:21 +08:00 |
|
Wang Nan
|
55d6c4eeb6
|
Merge pull request #709 from jareguo/temp
fix rendering component can not hide in onLoad
|
2016-05-23 11:23:59 +08:00 |
|