Commit Graph

59 Commits

Author SHA1 Message Date
pandamicro 77febbfe3d Merge branch 'master' into next 2018-03-13 15:07:21 +08:00
pandamicro b5194cce06 Remove useless polyfill 2018-03-09 09:46:59 +08:00
pandamicro b778dde9c9 Fix wechat game HTMLVideoElement issue and deserialize issue 2018-03-08 11:42:36 +08:00
pandamicro 5f09233526 Improve engine modules
s
2018-03-07 18:50:51 +08:00
pandamicro 8cfc154ba2 Remove kazmath 2018-02-09 10:08:13 +08:00
pandamicro eb94d3b301 Remove old shaders 2018-02-09 10:07:37 +08:00
Jare Guo 530e7512dc remove chipmunk and studio namespace 2018-02-09 09:49:14 +08:00
Jare Guo b32ff4d02e register engine version for both web and jsb 2018-02-09 00:31:36 +08:00
yinkaile 3bede929af remove require file suffix 2018-02-02 16:39:13 +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
yinkaile fe05892708 Merge branch 'next' of github.com:fireball-x/engine into next 2018-01-16 17:56:52 +08:00
yinkaile 8c18b5efa6 small fix some problems 2018-01-16 17:55:13 +08:00
Jare Guo b31566d75f Merge 1.8 2018-01-09 18:40:43 +08:00
Jare Guo 2e2fd59193 add CC_SUPPORT_JIT macro 2018-01-03 22:58:37 +08:00
Jare Guo 5706539bd5 remove cc._LogInfos, use cc._getError instead 2017-12-27 10:55:34 +08:00
Jare Guo dc533d2811 merge message formater for logger 2017-12-27 02:00:03 +08:00
pandamicro e63e1aa1d2 Fix window access in editor environment 2017-11-15 16:05:21 +08:00
pandamicro 593686cf56 forbid supportJit in wx environment 2017-11-06 20:50:51 +08:00
pandamicro 25a42c101e Merge pull request #2055 from 2youyou2/jit
fallback function if not support Function
2017-11-03 17:48:27 +08:00
yinkaile cd302bbc03 add comment for window undefined 2017-10-23 15:10:19 +08:00
yinkaile 93910fbb9a fixed window is not defined when load editor from bash 2017-10-20 10:29:48 +08:00
yinkaile dc7ae7fc8f refine code 2017-10-20 09:29:45 +08:00
yinkaile 62841321a5 fallback function if not support Function 2017-10-19 17:32:03 +08:00
2youyouo2 73e1358a20 remove ccui defines 2017-09-19 17:19:20 +08:00
2youyouo2 fee17aee0e revert changes 2017-08-22 11:37:02 +08:00
2youyouo2 cf88a9b817 remove cc._require 2017-08-22 11:30:58 +08:00
Nan Wang f5a2ef50e9 update version to 1.6.0 2017-08-18 10:37:06 +08:00
Jare Guo 98055d9074 should not include zip utils and tiled map in core module 2017-06-23 09:55:02 +08:00
Jare Guo d936b9628b fix CC_DEV in build worker 2017-06-21 17:34:17 +08:00
Jare Guo 5c45b6a7af move predefine.js to cocos2d/core/ 2017-06-21 11:55:55 +08:00
Jare Guo 9c1de1ac5f update predefine 2017-06-21 11:00:02 +08:00
Jare Guo f3d365dc42 add macro’s en api doc 2017-06-14 16:51:11 +08:00
Jare Guo 2a66ab6d51 define CC_PREVIEW, CC_DEBUG, CC_BUILD 2017-06-14 16:51:11 +08:00
Jare Guo 1df57cb031 add macro’s api doc 2017-06-14 16:51:11 +08:00
Jare Guo 20155c6541 fix api about event type 2017-05-19 11:22:50 +08:00
zilongshanren 9651447d8e remove useless try catch 2017-04-24 14:14:29 +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 a4beba2740 use Function instead eval to optimize evaluation and variable mangling (cocos-creator/fireball#5220) 2017-02-14 17:33:57 +08:00
Jare Guo 7e4a75be75 show error box if js engine not build 2016-10-20 11:41:58 +08:00
Jare Guo 489a4807fe add cc.hasExtension 2016-10-17 12:59:02 +08:00
VisualSJ 2bc87645f2 review code and support jsb 2016-09-06 18:22:54 +08:00
Johnny Wu b5b65faee5 fix tap can not be detected 2016-07-18 10:19:27 +08:00
Jare Guo f335780ac9 fix unit tests 2016-07-11 15:06:30 +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
ViusualSJ cd3f9aa4ca review code 2016-06-23 15:16:39 +08:00
ViusualSJ a772bdf730 Modular gulp command and define module entry 2016-06-23 14:05:13 +08:00