Commit Graph

7 Commits

Author SHA1 Message Date
pandamicro e8f116778a Fix issues 2017-01-22 17:35:38 +08:00
pandamicro eb71e44cb8 Remove useless modules 2017-01-22 17:34:22 +08:00
zilongshanren bb8a941e4f move richtext common logic to CCTextUtils 2016-09-21 18:05:41 +08:00
zhangbin 28fa0aab1b Merge branch 'master' of github.com:cocos-creator/engine into issue3120
# Conflicts:
#	cocos2d/tilemap/CCSGTMXObjectGroup.js
2016-09-09 16:58:21 +08:00
VisualSJ 19d6111c44 add WebView 2016-07-18 11:58:39 +08:00
zhangbin 77880ced69 Support draw object group in TiledMap. 2016-07-11 11:26:12 +08:00
ViusualSJ a772bdf730 Modular gulp command and define module entry 2016-06-23 14:05:13 +08:00