2youyouo2
|
3acf11a567
|
support physics
|
2017-03-08 14:02:45 +08:00 |
|
Jare Guo
|
1f0b5503f0
|
Merge commit 'aaa2ac73b9dc0b05bf3d1b05342d10676e0ad432' into temp2
# Conflicts:
# cocos2d/core/platform/CCClass.js
# cocos2d/core/platform/CCView.js
# cocos2d/core/platform/_CCClass.js
# jsb/jsb-director.js
|
2017-03-02 14:30:09 +08:00 |
|
pandamicro
|
a9ab402766
|
Merge part of cocos/scripting/js-bindings/scripts to engine/jsb
|
2017-02-24 17:41:57 +08:00 |
|
Jare Guo
|
a4beba2740
|
use Function instead eval to optimize evaluation and variable mangling (cocos-creator/fireball#5220)
|
2017-02-14 17:33:57 +08:00 |
|
zhangbin
|
058121c1ad
|
Mixin CCArmatureDisplay with EventTarget in jsb environment.
|
2016-12-22 16:39:58 +08:00 |
|
zhangbin
|
899f121859
|
Improve the implementation of showing Object Group in TiledMap.
|
2016-09-13 16:12:12 +08:00 |
|
Wang Nan
|
40f5f45e75
|
Merge pull request #1057 from VisualSJ/master_audioEngine
Master audio engine
|
2016-09-07 10:57:17 +08:00 |
|
VisualSJ
|
c1f319721f
|
Merge branch 'master' of github.com:cocos-creator/engine into master_audioEngine
|
2016-09-05 18:47:32 +08:00 |
|
VisualSJ
|
bd1d89ae98
|
review code
|
2016-09-05 18:46:56 +08:00 |
|
pandamicro
|
54e07aa6ac
|
Fix cc.log issue in JSB
|
2016-09-05 17:50:40 +08:00 |
|
pandamicro
|
922c7420ae
|
Fix initDebugSettings in jsb
|
2016-09-01 10:53:03 +08:00 |
|
zilongshanren
|
f738204e1b
|
fix a few webview related issues
|
2016-07-25 15:46:26 +08:00 |
|
pandamicro
|
aca5a40551
|
Add runtime polyfill for remote image loading
|
2016-07-08 12:26:37 +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 |
|
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 |
|
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 |
|
2youyouo2
|
ebc999da13
|
load version polyfills first
|
2016-04-18 10:11:17 +08:00 |
|
Jare Guo
|
17f9641d23
|
allows users to use CC_EDITOR in JSB
|
2016-03-15 19:06:39 +08:00 |
|
pandamicro
|
334d99f414
|
Cleanup CCCommon, CCConfig, CCMacro, CCShaders
|
2016-03-13 18:57:13 +08:00 |
|
pandamicro
|
62090dd4d1
|
Fix console.log & cc.log in JSB
|
2016-03-11 18:21:09 +08:00 |
|
Jare Guo
|
95ba52b316
|
polyfill spine on JSB
|
2016-03-02 19:53:29 +08:00 |
|
Nan Wang
|
3a70ae6060
|
update license file and source code header.
|
2016-03-01 11:04:12 +08:00 |
|
pandamicro
|
c18c728fbd
|
Fix properties synchronize issue in action (JSB)
|
2016-02-28 20:44:50 +08:00 |
|
pandamicro
|
600e7a59ef
|
Use pipeline loader in JSB
|
2016-02-25 13:06:57 +08:00 |
|
zilongshanren
|
d6a977fd38
|
fix jsb editbox issue
|
2016-02-24 21:26:05 +08:00 |
|
pandamicro
|
e5e8ade1bd
|
Fix JSB issues
|
2016-02-03 11:17:38 +08:00 |
|
Jare Guo
|
98c161d3c2
|
_sgNode should reset by editor
|
2016-01-27 18:33:39 +08:00 |
|
Jare Guo
|
e9ab74b35b
|
move cc.log jsb polyfill to jsb/index.js
|
2016-01-25 16:45:01 +08:00 |
|
pandamicro
|
0778975676
|
Put scale9sprite polyfill into jsb-scale9sprite.js
|
2016-01-07 19:59:45 +08:00 |
|
pandamicro
|
f1e1ffee9e
|
Fix undefined cc.initEngine issue and fix break issue for v3.3
|
2016-01-07 10:45:25 +08:00 |
|
pandamicro
|
38f270aaba
|
Support older version (<= v3.9) of JSB
|
2016-01-06 19:33:34 +08:00 |
|
pandamicro
|
692cc79500
|
Separate JSB polyfills into different modules
|
2016-01-05 18:11:51 +08:00 |
|