Commit Graph

77 Commits

Author SHA1 Message Date
pandamicro e8f116778a Fix issues 2017-01-22 17:35:38 +08:00
pandamicro eb71e44cb8 Remove useless modules 2017-01-22 17:34:22 +08:00
Wang Nan 03e31f8dd9 Merge pull request #1407 from 2youyou2/watch
fixed watch sourcemaps error
2016-12-29 15:25:23 +08:00
Jare Guo db4d56dd93 support es6 for testing engine-extends 2016-10-19 16:48:15 +08:00
Jare Guo 6382ca1216 Revert "try to fix #4269" 2016-10-17 15:29:59 +08:00
Jare Guo f1f21b7758 try to fix #4269 2016-09-28 10:10:30 +08:00
Jare Guo 41c5ffddea minor tweaks 2016-09-23 11:25:27 +08:00
zilongshanren bb8a941e4f move richtext common logic to CCTextUtils 2016-09-21 18:05:41 +08:00
zhangbin 28fa0aab1b Merge branch 'master' of github.com:cocos-creator/engine into issue3120
# Conflicts:
#	cocos2d/tilemap/CCSGTMXObjectGroup.js
2016-09-09 16:58:21 +08:00
zilongshanren bcb269cfa4 Merge remote-tracking branch 'fireball/master' into add-webview-support 2016-07-25 10:49:34 +08:00
Jare Guo 51c4a0756d remove cc.isEditor, use CC_EDITOR instead to reduce engine size 2016-07-22 11:44:26 +08:00
Jare Guo b521d61650 avoid reference error about _Scene.AssetsWatcher 2016-07-22 01:09:26 +08:00
zhangbin 7501b4bd85 Merge branch 'master' into issue3120
# Conflicts:
#	cocos2d/tilemap/CCSGTMXObjectGroup.js
#	cocos2d/tilemap/CCTMXXMLParser.js
2016-07-18 14:40:52 +08:00
VisualSJ 19d6111c44 add WebView 2016-07-18 11:58:39 +08:00
Jare Guo f335780ac9 fix unit tests 2016-07-11 15:06:30 +08:00
zhangbin 77880ced69 Support draw object group in TiledMap. 2016-07-11 11:26:12 +08:00
VisualSJ d2cdd12848 Finishing dependence 2016-07-07 10:54:18 +08:00
2youyouo2 0066e0e4a8 fixed watch sourcemaps error 2016-07-06 13:53:08 +08:00
VisualSJ 2e83444cde Fixed a bug 2016-06-29 11:45:30 +08:00
VisualSJ c0cb8e3cf4 Fixed a bug 2016-06-29 11:10:37 +08:00
VisualSJ 210139ec89 Prevent the file missing from causing errors 2016-06-28 17:13:53 +08:00
VisualSJ 18c7ff5b13 Missing a file (engine-extends-entry.js) 2016-06-28 14:36:04 +08:00
SijieWang 6f9ca5b91e Remove fire-fs / fire-path (#834)
* Remove fire-fs / fire-path

* Remove fire-fs / fire-path
2016-06-28 11:46:15 +08:00
VisualSJ 18d8755676 add Modular print size info 2016-06-27 15:13:20 +08:00
VisualSJ b7f4a276f1 add Modular print size info 2016-06-27 15:01:24 +08:00
VisualSJ 69ec6aa460 add Modular print size info 2016-06-27 15:00:21 +08:00
ViusualSJ d0192a8b19 review 2016-06-23 15:39:27 +08:00
ViusualSJ a772bdf730 Modular gulp command and define module entry 2016-06-23 14:05:13 +08:00
Nan Wang 77d1896e76 for preview engine do not include source content in map files 2016-06-16 17:34:20 +08:00
Jare Guo e02ebf309f log the engine size when building html5 2016-05-29 00:53:55 +08:00
Jare Guo f02b2f4e1c add gulp build-min for editor 2016-05-26 10:36:50 +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 e4236e5cbf add watch gulp command 2016-05-20 18:18:33 +08:00
Jare Guo 00d48bfcb7 build a single js for preview 2016-05-19 19:28:44 +08:00
Nan Wang 3e396e3080 merged v1.0 2016-05-11 17:29:17 +08:00
knoxHuang 99972b8380 transplant MotionStreak 2016-05-06 18:48:33 +08:00
Jare Guo 1b8fafc9cc turn on dead code optimization in building 2016-04-25 14:32:57 +08:00
Jare Guo dcb3d08d3a rename fast-build to build-dev 2016-04-12 21:09:52 +08:00
pandamicro 6f530df13b Cleanup other modules 2016-03-14 21:46:13 +08:00
pandamicro b6f7dd04f0 Cleanup Particle and TiledMap 2016-03-14 21:46:12 +08:00
pandamicro 5a690106ea Modulize and cleanup shaders 2016-03-14 21:46:12 +08:00
pandamicro 6a3bc53a0a Cleanup kazmath module 2016-03-14 11:49:03 +08:00
pandamicro 8306801243 Modulize event-manager, renderer and clean up core 2016-03-14 11:49:03 +08:00
pandamicro 771bf0b362 Remove Base64Images.js 2016-03-14 11:49:02 +08:00
pandamicro 334d99f414 Cleanup CCCommon, CCConfig, CCMacro, CCShaders 2016-03-13 18:57:13 +08:00
pandamicro a161cc658c Clean up Action module 2016-03-11 18:22:09 +08:00
Nan Wang 3a70ae6060 update license file and source code header. 2016-03-01 11:04:12 +08:00
pandamicro 0ea99226cc Replace cc.loader with pipeline loader 2016-02-25 10:34:09 +08:00
zhangbin 16cbc4fb85 Implement component cc.TiledLayer 2016-02-22 18:28:38 +08:00
pandamicro 5efc1d49d2 Merge branch 'master' of github.com:fireball-x/engine 2016-02-19 20:31:59 +08:00