Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fixed #1280: BitmapFontMultiLineAlignment test can't work correctly. #953

Merged
merged 3 commits into from
May 31, 2012
Merged

fixed #1280: BitmapFontMultiLineAlignment test can't work correctly. #953

merged 3 commits into from
May 31, 2012

Commits on May 31, 2012

  1. fixed cocos2d#1280: BitmapFontMultiLineAlignment test can't work corr… 

    …ectly.

We should invoke 'this->setString(m_sString_initial.c_str(), true);' in the 'CCLabelBMFont::updateLabel'.
    James Chen committed May 31, 2012
    Configuration menu
    Copy the full SHA
    8574ad4 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into is… 

    …s1280_labeltest
    James Chen committed May 31, 2012
    Configuration menu
    Copy the full SHA
    e392d61 View commit details
    Browse the repository at this point in the history

  3. fixed cocos2d#1280: Renamed some functions.

    James Chen committed May 31, 2012
    Configuration menu
    Copy the full SHA
    137ce20 View commit details
    Browse the repository at this point in the history