Commit Graph

81 Commits

Author SHA1 Message Date
pandamicro 77febbfe3d Merge branch 'master' into next 2018-03-13 15:07:21 +08:00
pandamicro ba6e8f11a3 Remove cc._renderType, cc._canvas, cc.container 2018-02-24 11:31:51 +08:00
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
pandamicro 7712da14f5 Merge remote-tracking branch 'fireball/master' into next 2018-01-15 17:51:33 +08:00
Jare Guo 5706539bd5 remove cc._LogInfos, use cc._getError instead 2017-12-27 10:55:34 +08:00
pandamicro 8cf1591e3a Use cc.renderer to point at new renderer 2017-12-25 14:02:15 +08:00
Jare Guo e0e8169759 remove cc._drawingUtil from core module
private cc.DrawingPrimitiveCanvas and cc.DrawingPrimitiveWebGL
2017-09-10 22:46:25 +08:00
Nan Wang f5a2ef50e9 update version to 1.6.0 2017-08-18 10:37:06 +08:00
Jare Guo 4936aa1531 remove cc._tmp 2017-07-05 14:46:55 +08:00
Jare Guo 5e26feaf8c remove unused code for moduleConfig.json 2017-06-16 14:20:32 +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
Wang Nan d95c3e9c76 Merge pull request #1618 from nantas/master
add tooltips for physics collider and joint
2017-04-27 11:26:23 +08:00
Nan Wang 9da09ecc1e add tooltips for physics collider and joint 2017-04-27 11:24:00 +08:00
Jare Guo f054f504b6 fix typescript api 2017-04-26 17:17:59 +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
Nan Wang 3d9ef3eff8 merged 2016-12-21 14:37:20 +08:00
Nan Wang fa8cae5c2d update version to 1.3.3 2016-12-20 09:32:19 +08:00
Nan Wang 9ba66e2d9a update version to 1.4.0-beta.2 2016-12-01 13:43:10 +08:00
Nan Wang 56af842c58 update version to 1.4.3-beta.1 2016-11-25 11:30:54 +08:00
Nan Wang 0e52cf6ea1 update version to 1.3.2 2016-11-16 10:12:43 +08:00
Nan Wang b0bf554d53 update version to 1.3.2-beta.2 2016-11-15 18:30:57 +08:00
Nan Wang d6a2a1aa88 update engine version to 1.3.2-beta.1 2016-11-10 10:37:28 +08:00
Nan Wang 35f91d42b4 update version to 1.3.1 2016-10-28 16:54:39 +08:00
Nan Wang e68afea422 update version to 1.3.0-beta.1 2016-10-26 17:58:46 +08:00
Nan Wang a11a552730 update engine version to 1.3.0 2016-10-26 13:50:50 +08:00
Nan Wang 4a65c530d1 update version to 1.3.0-rc.2 2016-10-24 17:18:48 +08:00
Nan Wang 032d2d2abd fix api doc reference 2016-10-20 18:36:01 +08:00
Nan Wang bfb18e249e update version to v1.3.0-beta.8 2016-10-14 14:38:18 +08:00
Nan Wang c018751cbe update version to v1.3.0-beta.7 2016-10-11 13:46:24 +08:00
Nan Wang c817a61fdb update version to v1.3.0-beta.6 2016-10-08 12:01:43 +08:00
Nan Wang 712b8450ab update version to 1.3.0-beta.4 2016-09-26 17:17:29 +08:00
Nan Wang 3f8b399919 update version to 1.3.0-beta.3 2016-09-23 17:59:21 +08:00
Nan Wang 363a1f7d96 merge v1.2 2016-09-12 10:15:24 +08:00
pandamicro eb8f888a74 Improve WebGL detection 2016-09-08 15:52:02 +08:00
pandamicro 4bdf2446c9 Fix cc.log issue 2016-09-07 09:52:06 +08:00
pandamicro 54e07aa6ac Fix cc.log issue in JSB 2016-09-05 17:50:40 +08:00
Nan Wang 6acbbe6373 merged v1.2 2016-09-05 12:06:47 +08:00
Nan Wang c74095b441 update engine version 2016-09-02 10:23:25 +08:00
Nan Wang 2ec8bf2c6b merged 2016-08-31 14:30:54 +08:00
Nan Wang f4da3e3b28 update engine version 2016-08-23 17:17:38 +08:00
Nan Wang 4edadb381c update engine version 2016-08-19 15:55:56 +08:00
Nan Wang 52989d64e2 update engine version 2016-08-16 11:00:41 +08:00
Nan Wang be1d4140d2 update engine version 2016-08-15 09:33:20 +08:00
Nan Wang 130b8449b2 update engine version 2016-08-12 12:02:00 +08:00
Nan Wang d6c05b93b4 update engine version 2016-08-10 09:41:26 +08:00