Commit Graph

133 Commits

Author SHA1 Message Date
pandamicro 027274708f Fix issues caused by merging master 2018-01-16 17:28:05 +08:00
pandamicro 7712da14f5 Merge remote-tracking branch 'fireball/master' into next 2018-01-15 17:51:33 +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
pandamicro d9b4303d67 Fix gulp build issue 2018-01-05 17:52:26 +08:00
Jare Guo fdba2619ad support build engine with any macro flag 2018-01-04 10:51:27 +08:00
Jare Guo 2e2fd59193 add CC_SUPPORT_JIT macro 2018-01-03 22:58:37 +08:00
Jare Guo 1143c84522 support compile with CC_WECHATGAME macro 2018-01-03 17:15:03 +08:00
Jare Guo 298ab19d19 fix bug of asset type on JSB 2018-01-03 11:07:45 +08:00
Jare Guo 6b97d4d6cf remove unused modules from jsb_polyfill 2018-01-03 00:30:30 +08:00
Jare Guo cc5dcab175 update uglify-es to fix regex problem (mishoo/UglifyJS2#2242) and inline problem 2017-12-30 15:14:55 +08:00
Jare Guo bad036fbf8 encapsulate uglify pipe for editor 2017-12-29 18:49:54 +08:00
Jare Guo c068b98881 lock uglifyjs to new version 2017-12-28 19:49:39 +08:00
Jare Guo bd22095ea5 Merge pull request #2221 from cocos-creator/v1.7
sync branch
2017-12-28 10:24:50 +08:00
Jare Guo 55319542d9 fix incompatibility when upgrading uglify-es from 3.2 to 3.3 2017-12-28 10:21:39 +08:00
pandamicro f4c589d8c1 Remove useless files
- DrawingPrimitives
- Scale9Sprite
- SpriteBatchNode
- RenderTexture
- DrawNode
2017-12-26 16:46:06 +08:00
pandamicro 97f25414cf Remove old ParticleSystem implementation 2017-12-25 20:07:28 +08:00
Jare Guo ebad7082bf add gulp build-html5-preview-dev to optimize build time for development preview 2017-12-22 18:16:10 +08:00
Jare Guo 20e9a1020c add gulp build-html5-preview-dev to optimize build time for development preview 2017-12-22 18:07:00 +08:00
pandamicro 31686bbfd0 Remove CCClippingNode 2017-12-14 17:24:27 +08:00
pandamicro 150883a6af Fix gulp build issue 2017-12-12 15:55:09 +08:00
pandamicro b760be59ce Remove useless jsb skip files 2017-12-08 14:46:56 +08:00
Jare Guo fb3310fb12 Merge master 2017-10-29 01:14:15 +08:00
yinkaile 2a1ad289e3 escape Unicode characters in strings and regexps 2017-10-24 17:02:02 +08:00
Jare Guo ed40ff034f Merge commit '763209db4dd8e7867e08ee14a63d3de8ef2a8945' into asset 2017-10-24 10:06:25 +08:00
Jare Guo 70a472dd23 fix and optimize jsb polyfill 2017-10-24 01:02:41 +08:00
Jare Guo 23f0cb4a6b Merge master into asset
# Conflicts:
#	cocos2d/core/load-pipeline/CCLoader.js
#	cocos2d/core/platform/deserialize.js
#	gulpfile.js
#	jsb/jsb-loader.js
2017-10-23 18:00:20 +08:00
yinkaile bb338fe0e0 support native modules 2017-10-13 17:09:47 +08:00
Jare Guo e1601ac00f Merge 1.6
# Conflicts:
#	cocos2d/core/CCDirector.js
#	cocos2d/core/components/CCSprite.js
2017-09-22 10:48:01 +08:00
Jare Guo ebeb1eb491 hack typeof for JavaScriptCore on simulator 2017-08-31 16:30:27 +08:00
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