Skip to content

Improve bmfont api #20309

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

Merged
minggo merged 22 commits into from
Nov 13, 2019
Merged

Improve bmfont api #20309

Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
30fb96e
Merge pull request #4 from cocos2d/v3
rh101 May 29, 2019
67d2f79
Added RenderTexture::saveToFileAsNonPMA() to save images without PMA.
rh101 May 30, 2019
b5bdada
[CCImage-ios.mm] Fixed indentation.
rh101 Jun 4, 2019
7065335
Merge pull request #5 from cocos2d/v3
rh101 Jun 16, 2019
94ec877
Merge pull request #7 from cocos2d/v3
rh101 Jun 22, 2019
92dd2e5
Merge pull request #8 from cocos2d/v3
rh101 Jun 30, 2019
628c758
Merge pull request #9 from cocos2d/v3
rh101 Jul 20, 2019
df5ef30
Merge pull request #10 from cocos2d/v3
rh101 Jul 26, 2019
03c7479
Merge pull request #11 from cocos2d/v3
rh101 Sep 20, 2019
ffc7cc7
Merge pull request #13 from cocos2d/v3
rh101 Sep 23, 2019
5eac99f
Merge pull request #15 from cocos2d/v3
rh101 Nov 6, 2019
d6bdf28
Merge pull request #16 from cocos2d/v3
rh101 Nov 8, 2019
aed03c8
Added support for adding bitmap font atlas image sub-textures in a la…
rh101 Nov 8, 2019
29a8914
[LabelTest.cpp] Updated BMFontOneAtlas test to support new BMFont lab…
rh101 Nov 8, 2019
db96260
[CCFontFNT.cpp] Added missing include statement.
rh101 Nov 8, 2019
b720301
Updated LUA and JS bindings for the new BMFont code.
rh101 Nov 8, 2019
8e417f8
[CCLabelBMFont] Reverted the API to the original interface since this…
rh101 Nov 8, 2019
28b317e
[LabelTest/LabelTest.cpp] Reverted usage of deprecated API.
rh101 Nov 8, 2019
a430f40
Re-added old API for creating bitmap font labels, but prefixed them a…
rh101 Nov 11, 2019
b9dc850
Fix for incorrect usage of variable that may be null.
rh101 Nov 12, 2019
5266ffb
Added two new label tests for BM Font labels. One tests a shared atl…
rh101 Nov 12, 2019
63da6fa
Moved variable definitions outside of loop.
rh101 Nov 13, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
[CCFontFNT.cpp] Added missing include statement.
  • Loading branch information
@rh101
rh101 committed Nov 8, 2019
commit db9626093af17a30dffff1d23188492cc24db2ba
1 change: 1 addition & 0 deletions cocos/2d/CCFontFNT.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@

#include "2d/CCFontFNT.h"
#include "2d/CCFontAtlas.h"
#include "2d/CCSpriteFrameCache.h"
#include "platform/CCFileUtils.h"
#include "base/CCConfiguration.h"
#include "base/CCDirector.h"
Expand Down