Commit Graph

24 Commits

Author SHA1 Message Date
Jare Guo 42ba8c1fd3 reviewed 2017-02-03 14:40:05 +08:00
Jare Guo 36a7328f40 remove unused prototype properties 2017-02-03 13:53:54 +08:00
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
zhangbin cba8ddc932 Solve the warning in TMXXMLParser. 2016-11-10 16:45:50 +08:00
Nan Wang 032d2d2abd fix api doc reference 2016-10-20 18:36:01 +08:00
zhangbin d4d3a22531 Support draw shape objects in Object Group. 2016-09-12 12:04:00 +08:00
zhangbin 36e6bcd8de Improve the implementation of TMXObjectGroup & TMXObject. 2016-09-09 18:08:47 +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
zhangbin df4be9dd3c Improve the logic of tile map parser. 2016-09-09 16:56:14 +08:00
zhangbin d33cb280ae Solve the error in the TiledMap parser. 2016-09-07 15:15:56 +08:00
zhangbin 4dd2557e04 Support show object group of Tiled Map. 2016-07-25 15:56:20 +08:00
zhangbin 18dc13e393 Merge branch 'master' into issue3120 2016-07-20 16:02:02 +08:00
zhangbin c043da9ae1 Support hex map with stagger axis is y. 2016-07-19 18:33:10 +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 b4e6234010 Issue fixes 2016-07-12 16:33:52 +08:00
pandamicro c532c09eff Merge Cocos2d-html5 v3.12 webgl renderer 2016-07-12 16:33:51 +08:00
zhangbin b590a1f4ab Set the object group & object visibility when they are created. 2016-07-11 15:35:10 +08:00
zhangbin 77880ced69 Support draw object group in TiledMap. 2016-07-11 11:26:12 +08:00
zhangbin 12b60e0112 Solve the error when parsing tmx file on Web. 2016-05-12 14:47:21 +08:00
pandamicro 8d8e21831b Clean up macros 2016-03-14 21:46:12 +08:00
pandamicro 4317508f29 Modulize compression 2016-03-14 21:46:12 +08:00
pandamicro 0ea99226cc Replace cc.loader with pipeline loader 2016-02-25 10:34:09 +08:00
Nan Wang c0f59c1598 synchronized to cocos2d-html5#6700f8bb94b2. starting from fresh history. 2015-12-05 12:22:41 +08:00