Commit Graph

32 Commits

Author SHA1 Message Date
Nan Wang f5a2ef50e9 update version to 1.6.0 2017-08-18 10:37:06 +08:00
Jare Guo 384cd9ee39 update gulp-uglify to v3 2017-07-24 16:31:46 +08:00
Jare Guo 35da9b5191 fix ci 2017-06-16 14:50:42 +08:00
Jare Guo 7abd7ebb1d update gulp-uglify 2017-06-14 16:51:11 +08:00
Nan Wang a9b7298e16 update version to v1.5 2017-05-19 10:22:59 +08:00
Nan Wang 32a90f5ad6 update api doc for anysdk and systemEvent 2017-05-16 17:35:38 +08:00
Jare Guo 96de0a1dd9 optimize engine startup time by wrapping IIFE 2017-05-05 13:39:11 +08:00
Nan Wang 9da09ecc1e add tooltips for physics collider and joint 2017-04-27 11:24:00 +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
pandamicro 133fe73563 Fix package name 2017-03-16 16:38:20 +08:00
Jare Guo 18befd0f5c compatible with gulp 3.9.1 2017-03-15 10:18:15 +08:00
pandamicro d741ec638d Use Uglify harmony instead of Uglify 2017-03-12 15:25:36 +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
Nan Wang 36f1c9f174 update version to 1.4.1-beta.1 2017-02-24 15:37:06 +08:00
Nan Wang 62c7aa9440 update engine version 2017-02-17 18:04:34 +08:00
Nan Wang b5095887ae update engine version to v1.4.0 2017-02-17 10:12:22 +08:00
Jare Guo 1029c9d9f5 use babel compiler 2017-02-10 17:58:37 +08:00
Jare Guo 7c53c47b5f working on synced prefab 2016-09-03 16:56:39 +08:00
Jare Guo e8479d2509 fix eruda 2016-08-16 09:57:36 +08:00
zilongshanren 76b969dc4a add async decencies to package.json 2016-08-05 11:00:14 +08:00
pandamicro a57fcd2514 Add async to package.json 2016-08-01 14:23:01 +08:00
Jare Guo e02ebf309f log the engine size when building html5 2016-05-29 00:53:55 +08:00
Jare Guo ca66ea052d fix engine's watchify 2016-05-22 14:58:57 +08:00
Nan Wang 2a3a64474c update engine version and package name 2016-05-18 18:52:01 +08:00
Jare Guo 1b8fafc9cc turn on dead code optimization in building 2016-04-25 14:32:57 +08:00
Jare Guo c7ca667cfd update browserify 2016-03-13 17:16:30 +08:00
Jare Guo 182b5cb5a3 make CC_EDITOR available in preview mode 2016-01-31 01:00:20 +08:00
Jare Guo 5e75462c6b destroyed object should be nullify when instantiating (+1 squashed commit)
Squashed commits:
[50e59fb] update package.json
2016-01-21 16:58:51 +08:00
Jare Guo 1711bdc468 fix ci 2016-01-19 20:12:16 +08:00
Nan Wang c0f59c1598 synchronized to cocos2d-html5#6700f8bb94b2. starting from fresh history. 2015-12-05 12:22:41 +08:00