Commit Graph

62 Commits

Author SHA1 Message Date
Jare Guo b32ff4d02e register engine version for both web and jsb 2018-02-09 00:31:36 +08:00
Jare Guo a6fb92ad90 updating license 2018-02-01 09:38:54 +08:00
Jare Guo bd15543093 updating license: Chukong Aipu -> Xiamen Yaji 2018-01-31 17:51:49 +08:00
Jare Guo b31566d75f Merge 1.8 2018-01-09 18:40:43 +08:00
Jare Guo df36e5dc9c Merge branch 'v1.8-release' into v1.8 2018-01-09 18:25:55 +08:00
Jare Guo 2e2fd59193 add CC_SUPPORT_JIT macro 2018-01-03 22:58:37 +08:00
Jare Guo 5706539bd5 remove cc._LogInfos, use cc._getError instead 2017-12-27 10:55:34 +08:00
Jare Guo dc533d2811 merge message formater for logger 2017-12-27 02:00:03 +08:00
knoxHuang c2dd872f5c refine code 2017-11-30 11:43:34 +08:00
James Chen c9d477edf0 Fixes str.startswith isn't found on JSC in iOS 8. 2017-10-25 18:08:59 +08:00
yinkaile dc7ae7fc8f refine code 2017-10-20 09:29:45 +08:00
yinkaile 62841321a5 fallback function if not support Function 2017-10-19 17:32:03 +08:00
James Chen d1e56cb58a Removes fake console.log since it's implemented in native code now. 2017-10-17 15:46:44 +08:00
James Chen e5d8a288ab Reverts ...args 2017-10-10 18:01:33 +08:00
Jare Guo 8442569917 polyfill console.time 2017-07-27 11:32:55 +08:00
Jare Guo 0ef01329fb remove jsb versions polyfill 2017-07-27 10:13:42 +08:00
knoxHuang 7b57bdb093 fix require DebugInfo mode error 2017-07-23 12:15:58 +08:00
Jare Guo bf79d94fe6 remove extname used in require 2017-07-05 16:32:41 +08:00
pandamicro 110123df64 Use pure js event instead of native event 2017-06-30 18:12:49 +08:00
Jare Guo 98055d9074 should not include zip utils and tiled map in core module 2017-06-23 09:55:02 +08:00
Jare Guo d936b9628b fix CC_DEV in build worker 2017-06-21 17:34:17 +08:00
Jare Guo 0ce0a71d29 tweaks 2017-06-21 13:37:41 +08:00
Jare Guo 9c1de1ac5f update predefine 2017-06-21 11:00:02 +08:00
Jare Guo fbd875bd96 sync jsb 2017-06-14 16:51:11 +08:00
pandamicro 8a7e8ceabe Reverse pure JS Action, reuse JSB Action 2017-04-22 14:58:55 +08:00
pandamicro 07d4f22c26 Move ActionManager to actions module 2017-03-29 18:42:28 +08:00
Nan Wang d9b5cef497 merge v1.4 2017-03-29 18:16:41 +08:00
pandamicro 34cd3c30b7 Remove arguments usage in jsb 2017-03-12 15:25:36 +08:00
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