Commit Graph

10 Commits

Author SHA1 Message Date
Wang Nan ef96a955a0 Merge pull request #693 from jareguo/master
refactor error checking codes for type attribute in CCClass
2016-05-20 15:35:00 +08:00
zhangbin 8ecb85ffa9 Remove unused code. 2016-05-20 14:43:50 +08:00
zhangbin b56dfce1da Change the bmFontOriginalSize property to private. 2016-05-20 14:35:00 +08:00
zhangbin bd83852ec5 Record the original size in the BitmapFont Asset object. 2016-05-20 11:35:00 +08:00
Jare Guo dbba94fbfb refactor error checking codes for type attribute in CCClass 2016-05-19 11:51:31 +08:00
knoxHuang 451561bfd7 Bitmap Font resources from Raw Asset to Asset (#2661) 2016-04-18 18:29:20 +08:00
knoxHuang eef23a0c35 update assets api 2016-03-23 14:21:56 +08:00
Nan Wang 3a70ae6060 update license file and source code header. 2016-03-01 11:04:12 +08:00
Nan Wang 79e546d6cf update to fireball-x/cocos2d-html5#dc5f6bc7aeaeb473e53a93436dd3c7d94c4fbfbc 2015-12-06 18:01:18 +08:00
Nan Wang c0f59c1598 synchronized to cocos2d-html5#6700f8bb94b2. starting from fresh history. 2015-12-05 12:22:41 +08:00