Commit Graph

13 Commits

Author SHA1 Message Date
Nan Wang 4dea8e7a8a move all error logs to DebugInfos.js and only show error id in release build 2016-12-15 17:07:01 +08:00
Nan Wang 032d2d2abd fix api doc reference 2016-10-20 18:36:01 +08:00
zhangbin 684950064c Optimize the logic of TiledMap & ObjectGroup. 2016-07-21 10:06:47 +08:00
zhangbin d9283a591f Modify the implementation of object (group) position in ortho map. 2016-07-18 16:10:07 +08:00
zhangbin 7501b4bd85 Merge branch 'master' into issue3120
# Conflicts:
#	cocos2d/tilemap/CCSGTMXObjectGroup.js
#	cocos2d/tilemap/CCTMXXMLParser.js
2016-07-18 14:40:52 +08:00
pandamicro c532c09eff Merge Cocos2d-html5 v3.12 webgl renderer 2016-07-12 16:33:51 +08:00
zhangbin 77880ced69 Support draw object group in TiledMap. 2016-07-11 11:26:12 +08:00
pandamicro b6f7dd04f0 Cleanup Particle and TiledMap 2016-03-14 21:46:12 +08:00
pandamicro 8d8e21831b Clean up macros 2016-03-14 21:46:12 +08:00
pandamicro 334d99f414 Cleanup CCCommon, CCConfig, CCMacro, CCShaders 2016-03-13 18:57:13 +08:00
zhangbin 16cbc4fb85 Implement component cc.TiledLayer 2016-02-22 18:28:38 +08:00
zhangbin f11aa3e43f Remove the TMXLayers before building TiledMap with new Map information. 2016-02-22 11:19:58 +08:00
zhangbin ff4584ebdc Implement the component TMXTiledMap. 2016-02-19 10:10:45 +08:00