Commit Graph

12 Commits

Author SHA1 Message Date
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
knoxHuang 4e6d645f97 fix cc.path.dirname bug 2018-01-18 17:21:13 +08:00
knoxHuang 9a092f8882 add path api and refine code format 2018-01-12 16:26:21 +08:00
Jare Guo 826301e6f5 add cc.path.stripSep (+1 squashed commit)
Squashed commits:
[5c386cc] stash
2017-08-01 17:09:17 +08:00
Nan Wang 3a70ae6060 update license file and source code header. 2016-03-01 11:04:12 +08:00
pandamicro 591e3fdb87 Remove LoadingItems completed map 2016-02-18 23:15:50 +08:00
pandamicro e44c2f56ad Improve pipeline implementation and fix issues 2016-02-17 17:19:49 +08:00
pandamicro 934ff9626f More complete implementation of Pipeline and Downloader & Loader 2016-02-16 20:44:28 +08:00
Nan Wang 3981104a1f correct example path. 2015-12-10 19:26:35 +08:00
Nan Wang c0f59c1598 synchronized to cocos2d-html5#6700f8bb94b2. starting from fresh history. 2015-12-05 12:22:41 +08:00