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.

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

Fix the problem that the bitmap mode of the label is invalid. #4393

Merged
merged 1 commit into from May 17, 2019

Conversation

@caryliu1999
Copy link
Contributor

commented May 8, 2019

@2youyou2 2youyou2 merged commit 94b5b7d into cocos-creator:v2.1.2 May 17, 2019

1 check passed

ci/circleci: test Your tests passed on CircleCI!
Details

jareguo added a commit that referenced this pull request May 23, 2019

Merge branch 'v2.1.2' into v2.2.0
* v2.1.2:
  refine uuid-loader error log code (#4492)
  add baidu subcontext view help url for 2d-tasks/issues/1465 (#4491)
  refine item error log (#4487)
  Fix spine cache error when change skin (#4488)
  refine docs (#4477)
  fixed generate animation joint matrix (#4475)
  add canvas don't support button disabled state for 2d-tasks/issues/1451 (#4474)
  fix instantiate prefab scale error (#4454)
  fixed the creator.d.ts error (#4372)
  fix spine and dragonbones update cache bug (#4457)
  fix _histTest ignore scale bug (#4456)
  add builtin-2d-base material (#4443)
  merge xiaomi (#4447)
  Fix the problem that the bitmap mode of label is invalid. (#4393)
  Optimize spine and dragonbones animation cache (#4387)
  update test-deserialize code (#4432)

# Conflicts:
#	cocos2d/core/CCNode.js
#	extensions/spine/Skeleton.js
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants
You can’t perform that action at this time.