Commit Graph

176 Commits

Author SHA1 Message Date
pandamicro 7cdbfaf5f8 Fix build issues 2018-09-19 10:20:46 +08:00
yinkaile 114dd6f9dc fixed jsb modular (#3080) 2018-08-13 17:23:09 +08:00
yinkaile e9ae53d4d0 fixed wechat game modular (#3076) 2018-08-13 14:49:58 +08:00
yinkaile a4d17d3d1b improve modular (#3069)
* improve modular

* fixed test

* remove previousRequire from engine prelude
2018-08-10 19:00:33 +08:00
pandamicro 96897f85a2 Merge remote-tracking branch 'origin/master' into merge 2018-07-30 20:37:26 +08:00
Knox dcd3357d61 fix wechat developer tool reports error when "source maps" is uncheck… (#3028)
* fix wechat developer tool reports error when "source maps" is unchecked in the build panel

* refine code
2018-07-30 18:30:24 +08:00
pandamicro aff5345cfd Merge remote-tracking branch 'origin/master' into next 2018-07-17 15:49:38 +08:00
PP 293e31756a cut debug info when build project (#2976)
ensure DebugInfo ignored even if cwd not in engine
2018-07-13 15:36:29 +08:00
pandamicro 88e58d39b7 Add forceCanvas build option, rearrange modules for canvas renderer (#2969)
* Remove useless requires

* Build engine support forceCanvas to use canvas version render engine

* Rearrange modules, separate webgl & canvas renderer

* Do not create material in canvas

* Cleanup canvas renderers

* Improve modules.json

* Fix unit test

* Fix wechat sub domain build issues

* Make Camera working for canvas render mode

* Fix canvas renderer issues

* Reenable camera in Canvas

* Fix label colorizing issue
2018-07-13 14:13:48 +08:00
pandamicro 93e115ebdd Add runtime parameter and disable CC_SUPPORT_JIT (#2926) 2018-07-01 01:51:00 +08:00
pandamicro 1f39837ac1 Remove cc.Class.isInstanceOf usage (#2877)
* Remove cc.Class.isInstanceOf usage

* Remove check jsb instanceof task
2018-06-19 17:54:48 +08:00
pandamicro 03e2af76a5 Merge remote-tracking branch 'fireball/master' into merge 2018-06-15 18:37:33 +08:00
PP 16dd4028be cull Debuginfos.json in cocos2d-js-min.js && replace \r\n with \n (#2845)
* cull Debuginfos.json in cocos2d-js-min.js

* replace \r\n with \n  in Debuginfos.json


errInfo replace \r\n
2018-06-11 15:51:08 +08:00
Jare Guo de2bad05c2 revert workaround for mishoo/UglifyJS2#2821 (#2772) 2018-05-30 22:28:27 +08:00
Jare Guo a58c18d5a9 Merge branch 'master' into next
# Conflicts:
#	cocos2d/core/platform/CCSys.js
2018-05-30 21:53:45 +08:00
Jare Guo 9e246f7682 fix uglify-es (#2771) 2018-05-30 21:39:59 +08:00
Jare Guo 2d7f854027 fix uglify-es 2018-05-30 21:37:25 +08:00
pandamicro 0f87a11100 Merge pull request #2564 from cocos-creator/optimize
Merge optimizations into next
2018-04-19 18:31:30 +08:00
pandamicro d2ad2ffcde Fix opt_macroFlags is null issue in gulp task 2018-04-19 10:35:43 +08:00
pandamicro d6f15a3e77 Support build native with native renderer option 2018-04-18 12:36:46 +08:00
pandamicro 14a555e0fb Merge remote-tracking branch 'fireball/master' into next 2018-04-16 19:14:08 +08:00
PP d0f4602413 Merge remote-tracking branch 'origin/master' 2018-04-11 15:50:53 +08:00
pandamicro c89ee01a56 Fix JSB build issues 2018-04-08 00:39:39 +08:00
James Chen ebef9795a0 Merge runtime builtin scripts. 2018-04-03 20:55:02 +08:00
minggo 02bc807ebf merge and fix conflict 2018-03-30 10:34:50 +08:00
pandamicro 9fdde9f676 Improve aliasify usage 2018-03-29 10:30:44 +08:00
pandamicro 729fa55cde Support build jsb with render-engine.jsb.js 2018-03-29 09:53:13 +08:00
PP f594daeeb1 reimplement debugInfos workflow
debugInfos


debuginfos


README updated


debugInfos workflow


reimplement debugInfos workflow
2018-03-26 17:11:53 +08:00
minggo 6e37e154f5 JSB adaption 2018-03-26 10:54:09 +08:00
pandamicro 49fd994035 Move CCTexture2D & CCSpriteFrame to assets 2018-03-13 17:48:38 +08:00
pandamicro 77febbfe3d Merge branch 'master' into next 2018-03-13 15:07:21 +08:00
pandamicro 4e47017aa4 Merge branch 'v1.9' 2018-03-13 11:54:54 +08:00
pandamicro 5f09233526 Improve engine modules
s
2018-03-07 18:50:51 +08:00
knox 141d2a1d09 update disabled CC_SUPPORT_JIT 2018-03-06 15:04:38 +08:00
Jare Guo 6c809263e6 Merge 1.8 2018-02-24 14:58:57 +08:00
knoxHuang 1a2f0b584c remove chipmunk 2018-02-22 10:49:51 +08:00
Jare Guo 992b74f0ac merge bricks (#2328)
* support bk game

* update code

* update code

* update code

* update code

* refine code

* update code

* update code

* update code
2018-02-09 10:12:44 +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
Jare Guo ded7092432 Merge branch 'v1.8'
# Conflicts:
#	cocos2d/core/platform/deserialize.js
#	extensions/dragonbones/CCFactory.js
#	gulp/util/utils.js
2018-01-25 13:47:35 +08:00
Jare Guo d7e197c095 Revert "workaround mishoo/UglifyJS2#2821"
This reverts commit d953ace2a4.
2018-01-25 11:31:02 +08:00
Jare Guo d953ace2a4 workaround mishoo/UglifyJS2#2821 2018-01-24 13:49:38 +08:00
Jare Guo 63dc008ebb uglify: disable negate_iife 2018-01-24 13:49:38 +08:00
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