Jare Guo
|
ef436d9da4
|
deferred load scene's raw asset
|
2016-07-08 17:15:57 +08:00 |
|
Jare Guo
|
dd9a2ec17d
|
fix runtime preload
|
2016-07-06 23:05:59 +08:00 |
|
2youyouo2
|
0ff5833fbb
|
add window.__errorHandler
|
2016-07-06 13:58:16 +08:00 |
|
Jare Guo
|
13cd374d52
|
preload scene in runtime platform
|
2016-07-04 10:10:08 +08:00 |
|
Jare Guo
|
138e87bda7
|
fix addPersistRootNode on JSB
|
2016-07-01 15:43:33 +08:00 |
|
Jare Guo
|
5dcff33b98
|
fix pack loader on JSB
|
2016-06-30 21:52:14 +08:00 |
|
knoxHuang
|
d7ac3f7fa6
|
fix Follow error, for #fireball/issues/3409
|
2016-06-29 15:30:12 +08:00 |
|
knoxHuang
|
909e54350e
|
fix JSB cc.follow error and fix JSB hint sgNode is null error
|
2016-06-24 17:17:54 +08:00 |
|
knoxHuang
|
c04b98d3dc
|
fix Opacity for jsb-action bug fireball/issues/#3165
|
2016-06-12 16:33:51 +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 |
|
Huabing.Xu
|
8436d7cc0f
|
fix error in JSB for label outline
|
2016-06-12 11:22:35 +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 |
|
pandamicro
|
272ac66762
|
Remove preventDefault in event
|
2016-06-02 15:33:01 +08:00 |
|
knoxHuang
|
90fe87ef1b
|
fix get spriteFrame name error for jsb
|
2016-06-01 14:38:39 +08:00 |
|
Huabing.Xu
|
a9baa89c3d
|
fix sprite distortion JSB
|
2016-05-26 16:41:47 +08:00 |
|
zilongshanren
|
f231bd0fa0
|
add jsb polyfill file
|
2016-05-24 18:20:28 +08:00 |
|
zilongshanren
|
0b03966b0f
|
fix videoplayer running error on Mac and Windows
|
2016-05-24 10:50:40 +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
|
7172623584
|
Merge branch 'master' of github.com:fireball-x/engine
|
2016-05-23 11:32:49 +08:00 |
|
pandamicro
|
a59a872b01
|
cocos-creator/fireball#3016: Use real delta time in JSB
|
2016-05-20 17:30:16 +08:00 |
|
pandamicro
|
c6c0231a6d
|
Improve WebGL detection logic
|
2016-05-20 17:09:36 +08:00 |
|
pandamicro
|
93c9b44892
|
Fixed cocos-creator/fireball#2559: Fixed cc.callFunc callback parameter inconsistence
|
2016-05-20 17:09:22 +08:00 |
|
pandamicro
|
6adfe8dbc9
|
Fixed cocos-creator/fireball#3062: provide pure js implementation for EventCustom
|
2016-05-20 17:08:26 +08:00 |
|
Wang Nan
|
20874ca2e4
|
Merge pull request #702 from VisualSJ/master_2535_2
remove useSystemFont from CCGLabel
|
2016-05-20 16:40:55 +08:00 |
|
Wang Nan
|
7c58d0d9ed
|
Merge pull request #697 from dabingnn/label_outline_native
add wrapper for native outline api
|
2016-05-20 15:34:34 +08:00 |
|
ViusualSJ
|
306a61707a
|
remove useSystemFont from CCGLabel
|
2016-05-20 15:28:51 +08:00 |
|
pandamicro
|
e86e846a74
|
Support auto rotate canvas when screen orientation isn't correct
|
2016-05-20 10:58:52 +08:00 |
|
Huabing.Xu
|
2f522f0ba4
|
add wrapper for native outline api
|
2016-05-19 14:52:42 +08:00 |
|
Jare Guo
|
880f0e28ca
|
add preloadScene
|
2016-05-13 17:37:16 +08:00 |
|
Wang Nan
|
5d9ce5d57e
|
Merge pull request #669 from cocos-creator/v1.0
merge V1.0
|
2016-05-13 13:45:01 +08:00 |
|
Jare Guo
|
10a71746e1
|
fix jsb tex-sprite-frame polyfill
|
2016-05-12 13:58:15 +08:00 |
|
Wang Nan
|
53dde5d944
|
Merge pull request #655 from cocos-creator/v1.0
merge V1.0
|
2016-05-11 17:38:11 +08:00 |
|
Nan Wang
|
3e396e3080
|
merged v1.0
|
2016-05-11 17:29:17 +08:00 |
|
Jare Guo
|
93c0a98631
|
fix asset initialization in jsb
|
2016-05-11 17:22:02 +08:00 |
|
Wang Nan
|
aeb5b65c38
|
Merge pull request #651 from 2youyouo2/collider
Collider
|
2016-05-11 14:05:18 +08:00 |
|
2youyouo2
|
a26c56891d
|
refine collider
|
2016-05-11 10:47:19 +08:00 |
|
2youyouo2
|
9fac8dc3df
|
refine code
|
2016-05-10 15:18:15 +08:00 |
|
2youyouo2
|
168cbb0504
|
refine code
|
2016-05-10 11:53:38 +08:00 |
|
2youyouo2
|
0b843d5f99
|
fixed jsb image
|
2016-05-09 14:20:19 +08:00 |
|
knoxHuang
|
99972b8380
|
transplant MotionStreak
|
2016-05-06 18:48:33 +08:00 |
|
Nan Wang
|
3f8b93619f
|
add group and collide map to cc.game
|
2016-05-06 15:52:59 +08:00 |
|
2youyouo2
|
8361570a29
|
refine collider
|
2016-04-29 11:28:03 +08:00 |
|
Jare Guo
|
7d62a07905
|
should not remove sp.ANIMATION_EVENT_TYPE
still used in jsb_spine.js
|
2016-04-28 23:24:54 +08:00 |
|
2youyouo2
|
7ce6b87403
|
add collider manager
|
2016-04-27 17:21:45 +08:00 |
|
Jare Guo
|
3f1b682d19
|
Merge commit '0d438a748a5aae594e29344fffe4ea040e235c81'
# Conflicts:
# cocos2d/core/components/CCRendererInSG.js
# cocos2d/core/load-pipeline/asset-table.js
# cocos2d/tilemap/CCTiledMap.js
# jsb/jsb-editbox.js
|
2016-04-27 10:01:06 +08:00 |
|
pandamicro
|
0d438a748a
|
Merge pull request #628 from jareguo/v1.0
hide pushScene in doc
|
2016-04-26 14:41:10 +08:00 |
|
knoxHuang
|
20b1f00710
|
fix spriteFrame.insetTop undefined error
|
2016-04-26 13:57:00 +08:00 |
|
zilongshanren
|
e5fe29878b
|
fix editbox begin and end callback not called.
|
2016-04-25 17:57:55 +08:00 |
|