Commit Graph

6 Commits

Author SHA1 Message Date
Jare Guo 338c8d90d2 prevent method name duplicate with property name 2016-12-28 23:51:03 +08:00
Jare Guo 11f5e3d6a9 Merge pull request #1381 from pandamicro/master
Fix loader load subAsset with the same url issue
2016-12-21 12:51:25 +08:00
pandamicro 181d6b32a3 Fix loader load subAsset with the same url issue 2016-12-21 11:12:16 +08:00
knoxHuang bd8127aff7 optimization shader and tooltip for #fireball/issues/4771 2016-12-19 18:19:18 +08:00
Nan Wang 52b1a7658c fix merge conflict of CCLoader getReferenceKey 2016-12-16 10:53:37 +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