Commit Graph

103 Commits

Author SHA1 Message Date
Jare Guo 7929bb9c09 adjust uglifyjs for jsc 2017-08-28 15:58:12 +08:00
Jare Guo da3cd5a3cd optimize test pipeline, add gulp buld-test-sm for debugging 2017-07-25 11:17:36 +08:00
Jare Guo 384cd9ee39 update gulp-uglify to v3 2017-07-24 16:31:46 +08:00
Jare Guo 668e202a24 refactor gulp utils 2017-07-19 23:00:27 +08:00
Jare Guo 45b28c33f2 fix jsb on JavaScriptCore 2017-06-29 12:50:07 +08:00
Jare Guo 4e18f7929e optimize unit-test compile time 2017-06-14 22:58:29 +08:00
Jare Guo 8715800ad2 add gulp build-jsb-preview 2017-06-14 16:51:11 +08:00
Jare Guo bfc207012d refine uglify’s macro 2017-06-14 16:51:11 +08:00
Jare Guo ff6dd78d2a fix typescript on JSB 2017-05-08 15:03:05 +08:00
Jare Guo 96de0a1dd9 optimize engine startup time by wrapping IIFE 2017-05-05 13:39:11 +08:00
Jare Guo 886c8d8cae optimize engine startup time by removing some js.mixin 2017-05-05 13:39:11 +08:00
Jare Guo 6c75eb09cb optimize browserify startup time 2017-05-05 13:37:03 +08:00
zilongshanren 15832966f9 remove modular.js 2017-04-24 14:04:28 +08:00
zilongshanren 462714b70d remove modular engine code 2017-04-24 13:44:10 +08:00
Jare Guo 23e8309738 cc.assertID should not copy arguments when not failed 2017-04-14 10:08:31 +08:00
Jare Guo 998cf52aa3 fix test 2017-04-13 14:17:21 +08:00
Jare Guo 29a3356faa fix …args for unit test 2017-04-07 11:02:07 +08:00
Jare Guo 0bd31f0932 Merge commit 'be31191693322daf4f2cd5c25060502fa2fda0ca'
# Conflicts:
#	cocos2d/core/platform/CCClass.js
2017-04-07 10:37:08 +08:00
Jare Guo 7b660e8c9f add decorators for CCClass, add ES6 support for unit test 2017-04-01 16:27:11 +08:00
Nan Wang d9b5cef497 merge v1.4 2017-03-29 18:16:41 +08:00
Jare Guo 431f2ecc41 fix unit test 2017-03-15 14:44:41 +08:00
pandamicro d741ec638d Use Uglify harmony instead of Uglify 2017-03-12 15:25:36 +08:00
Jare Guo c43c5262aa minor fix (+1 squashed commit)
Squashed commits:
[c91748a] minor fix
2017-03-01 14:02:54 +08:00
Jare Guo e36f4b9c33 fix engine bulid error again 2017-02-17 18:33:17 +08:00
Jare Guo 9c629cf32d fix engine bulid error 2017-02-14 16:35:06 +08:00
Jare Guo 1029c9d9f5 use babel compiler 2017-02-10 17:58:37 +08:00
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