Merge pull request #881 from joshuastray/develop

fix wrong label height in moonwarrior

Author: dingpinglv

samples/js-moonwarriors/src/AboutLayer.js

@@ -17,7 +17,7 @@ var AboutLayer = cc.Layer.extend({
         this.addChild(title);
 
         // There is a bug in LabelTTF native. Apparently it fails with some unicode chars.
-        var about = new cc.LabelTTF("   This showcase utilizes many features from Cocos2d-html5 engine, including: Parallax background, tilemap, actions, ease, frame animation, schedule, Labels, keyboard Dispatcher, Scene Transition. \n    Art and audio is copyrighted by Enigmata Genus Revenge, you may not use any copyrigted material without permission. This showcase is licensed under GPL. \n \n Programmer: \n Shengxiang Chen (陈升想) \n Dingping Lv (吕定平) \n Effects animation: Hao Wu(吴昊)\n Quality Assurance:  Sean Lin(林顺)", "Arial", 21, cc.size(MW.WIDTH * 0.85, MW.HEIGHT / 2), cc.TEXT_ALIGNMENT_LEFT );
+        var about = new cc.LabelTTF("   This showcase utilizes many features from Cocos2d-html5 engine, including: Parallax background, tilemap, actions, ease, frame animation, schedule, Labels, keyboard Dispatcher, Scene Transition. \n    Art and audio is copyrighted by Enigmata Genus Revenge, you may not use any copyrigted material without permission. This showcase is licensed under GPL. \n \n Programmer: \n Shengxiang Chen (陈升想) \n Dingping Lv (吕定平) \n Effects animation: Hao Wu(吴昊)\n Quality Assurance:  Sean Lin(林顺)", "Arial", 21, cc.size(MW.WIDTH * 0.85, 0), cc.TEXT_ALIGNMENT_LEFT );
         about.attr({
             x: winSize.width / 2,
             y: MW.HEIGHT / 2 + 30,