minggo
cd5bcb87af
issue #2284 : merge master and fixed some conflicts
2013-06-13 17:54:05 +08:00
minggo
29607bd741
fixed #2259:add description of path that custom font can put in
2013-06-10 23:01:48 +08:00
carlo morgantini
494ec43fe8
new CCLabelTTF (static) create with fontDefinition method, and new CPP test using it
2013-06-08 10:59:07 +08:00
carlo morgantini
b7ffb5b810
new CCLabelTTF (static) create with fontDefinition method, and new CPP test using it
2013-06-07 16:33:01 -07:00
James Chen
cb08479b7e
Log error instead of triggering an assert for shadow and stroke.
2013-06-06 15:02:57 +08:00
James Chen
359225806b
Log error instead of triggering an assert for shadow and stroke.
2013-06-06 14:19:16 +08:00
Ricardo Quesada
479062fdb7
on dealloc, log "this" with %p, not %x.
...
Also adds %p where it was missing.
And make a few fixes on the iOS project
2013-06-05 18:21:05 -07:00
Rodrigo Goncalves de Oliveira
78967b7c8e
Removing unused variable
...
These variables are just used on CCAssert comparisons, and result on a
compilation error on Linux (-Werror=unused-variable).
Signed-off-by: Rodrigo Goncalves de Oliveira <rodrigo.goncalves@openbossa.org>
2013-06-03 09:17:03 -04:00
Yongqin Liu
aea9e04fbf
Add out of bound check for the index before do the update
...
Signed-off-by: Yongqin Liu <liuyq0307@thundersoft.com>
2013-05-29 19:18:46 +08:00
Yongqin Liu
f6b5208be5
CCLabelAtlas.cpp: add check for n when call setDirty
...
in CCLabelAtlas::updateAtlasValues, there is the case that n equal to 0,
so we need to check it before when call m_pTextureAtlas->setDirty(true) and do
other process.
Signed-off-by: Yongqin Liu <liuyq0307@thundersoft.com>
2013-05-29 10:45:47 +08:00
Yongqin Liu
56037a4939
CCTextureAtlas::updateQuad modify for the memcpy hot spot
...
change the place that call CCTextureAtlas::updateQuad method to
update the quads with pointer reference directly.
Signed-off-by: Yongqin Liu<liuyq0307@thundersoft.com>
2013-05-28 10:23:47 +08:00
James Chen
d6a0af86eb
fixed #2217 : Updating logic when m_bIgnoreContentScaleFactor is enabled.
2013-05-23 16:12:04 +08:00
James Chen
bb11182279
fixed #2217 : Using CCLabelAtlas instead of CCLabelTTF to show FPS.
2013-05-23 15:06:57 +08:00
Ed Bartley
719eb15326
Make shadowOffset parameter of CCLabelTTF::enableShadow(…) a const reference.
2013-05-21 15:42:26 -04:00
carlo morgantini
a3f5238407
fix a warning caused by member variables initialization order in constructor
2013-05-15 16:37:08 -07:00
carlo morgantini
4d3ed48905
initWithStringShadowStroke() renamed to initWithString()
2013-05-15 16:37:08 -07:00
carlo morgantini
3b50ffe5ba
Fix problem with CCLabelTTF + shadow and text alignment; also fontDefinition property names now are lowercase
2013-05-15 16:37:08 -07:00
carlo morgantini
d77604b958
initWithStringAndTextDefinition() changed method's signature
2013-05-15 16:37:08 -07:00
carlo morgantini
04c890522d
class renamed and moved to ccTypes.h
2013-05-15 16:35:25 -07:00
carlo morgantini
ed981aee7e
ccTextDefinition becomes CCTextDefinition
2013-05-15 16:29:33 -07:00
carlo morgantini
d9a53b3eb1
CCLabelTTF new interface for ccBuilder
2013-05-15 16:29:33 -07:00
carlo morgantini
9ba489bba4
new assert() added on unsupported platforms for CCLabelTTF and CCTexture2D
2013-05-15 16:29:33 -07:00
carlo morgantini
74441203cb
stroke and shadow are implemented and supported only on iOS and Android for now
2013-05-15 16:29:33 -07:00
carlo morgantini
54347bf767
setFontTintColor renamed to setFontFillColor
2013-05-15 16:29:33 -07:00
carlo morgantini
7bc3ceb8c8
uses const ccColor & in the interface instead of ccColor&
2013-05-15 16:29:33 -07:00
carlo morgantini
c727fa33c0
CCLabelTTF have now a tint, plus bug fixing and code clean up
2013-05-15 16:29:33 -07:00
carlo morgantini
221884f6d4
better CCTexture2D API for init texture with shadow and stroke
2013-05-15 16:29:32 -07:00
carlo morgantini
dd9b4a8932
new shadow and stroke for CCLabelTTF
2013-05-15 16:12:43 -07:00
Sergey Shambir
3ae98978d4
Added CC_FORMAT_PRINTF to CCString
...
Added for CCString::initWithFormat() and CCString::createWithFormat().
Fixed warnings.
2013-04-19 14:00:16 +04:00
James Chen
9336ab710f
fix a logic error and a memory leak in CCLabelBMFont.
2013-03-20 13:55:43 +08:00
Sam Clegg
38878b084b
Fix all compiler warnings produced by gcc.
...
This allows the linux and NaCl builds (and perhaps others)
to be compiles with -Wall and -Werror, and it makes the build
output much less noisy.
2013-03-05 17:01:00 -08:00
minggo
370fe7d937
issue #1686:fixed a logical error in CCLabelBMFont
2013-03-01 18:15:20 +08:00
James Chen
65f19f5c53
Removing some deprecated functions.
2013-03-01 10:57:52 +08:00
James Chen
56340f9555
Merge branch 'iss1686-synchronize' of https://github.com/minggo/cocos2d-x into iss1686-synchronize
...
Conflicts:
cocos2dx/proj.ios/cocos2dx.xcodeproj/project.pbxproj
2013-02-28 13:01:45 +08:00
minggo
63e4091bfa
fixed #1686:finish updating
2013-02-28 11:55:36 +08:00
minggo
0070371045
issue #1686:synchronize CCLabelBMFont.cpp
2013-02-28 10:37:47 +08:00
James Chen
473e8e6139
issue #1753 : Upgrading SpiderMonkey to Firefox19.0, iOS works ok.
2013-02-27 15:16:49 +08:00
James Chen
7dc64fc9a6
issue #1686 : sync to CCLayer
2013-02-27 09:38:30 +08:00
James Chen
eb7cae93fd
Merge pull request #1937 from dumganhar/revert-ttf-update
...
Reverted the logic of CCLabelTTF::updateTexture.
2013-01-30 22:28:48 -08:00
James Chen
da59570214
Reverted the logic of CCLabelTTF::updateTexture.
2013-01-31 14:26:45 +08:00
James Chen
157e229f8c
fixed #1634 : Added the very first implementation of CCEditBox for Win32.
2013-01-31 14:04:49 +08:00
James Chen
f0fc414a81
Fixing a bug in CCLabelTTF.cpp, checking the return value of CCTexture2D::initWithString.
2013-01-28 21:17:43 +08:00
James Chen
6f3b22031f
Using new API of getting full path for file name.
2013-01-25 20:51:52 +08:00
walzer
c9c227873f
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
2013-01-14 17:07:07 +08:00
walzer
1ab552b482
Add a sample doxygen sample in CCSprite.h and CCProtocol.h
2013-01-14 16:54:20 +08:00
James Chen
6733f786a5
fixed #1649 : Reverted some invokings of function that returns const reference.
2013-01-14 16:06:18 +08:00
James Chen
6565fa92cc
fixed #1649 : Changed return type to const reference for member variable access.
2013-01-14 15:51:53 +08:00
minggo
a75f8b7e7a
fixed #1593:remove all deprecated methods expect CCBAnimationManager
2012-12-06 18:51:33 +08:00
James Chen
b632c3cd7c
issue #1564 : Minor fix in CCLabelBMFont::createFontChars().
2012-11-21 10:06:03 +08:00
James Chen
8f6c8e202e
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1564-update-tests
...
Conflicts:
samples/TestCpp/Classes/DrawPrimitivesTest/DrawPrimitivesTest.cpp
2012-11-20 16:35:42 +08:00