Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #912 from minggo/merge_nicolasgramlich 

Merge pull request by nicolasgramlich
This commit is contained in:
minggo 2012-05-23 19:56:05 -07:00
parent aae5d881fc 6d9e6b31ee
commit 138de3171f
10 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
AUTHORS
View File

@ -22,6 +22,9 @@ Developers:
Surith Thekkiam (folecr, Zynga)
contribute for Android module building
Nicolas Gramlich (nicolasgramlich, Zynga)
fixed CCDirector to use CCLabelBMFont instead of CCLabelTTF
Jianfeng Zhou (NetGragon Inc)
contributes CCListView and CCTextureWatcher.

1
HelloLua/Resources/fonts/arial.ttf.REMOVED.git-id
View File

@ -1 +0,0 @@
abc899cd55086105f439df7a6d01db84168aebb5

2
HelloLua/proj.ios/HelloLua.xcodeproj/project.pbxproj.REMOVED.git-id
View File

@ -1 +1 @@
3ffb5ef04b897f971e1e9c941002d06e5a91da50
6463956a32bf45c476904160aa23da947b30e0c1

1
HelloWorld/Resources/fonts/arial.ttf.REMOVED.git-id
View File

@ -1 +0,0 @@
abc899cd55086105f439df7a6d01db84168aebb5

2
HelloWorld/proj.ios/HelloWorld.xcodeproj/project.pbxproj.REMOVED.git-id
View File

@ -1 +1 @@
92dc1f3cb8db6691dae94a502b38db89e5293d2d
4573789c928b734a05fb2766677b230a8a497ee5

7
cocos2dx/CCDirector.cpp
View File

@ -40,7 +40,6 @@ THE SOFTWARE.
#include "CCApplication.h"
#include "CCLabelBMFont.h"
#include "CCActionManager.h"
#include "CCLabelTTF.h"
#include "CCConfiguration.h"
#include "CCKeypadDispatcher.h"
#include "CCAccelerometer.h"
@ -720,9 +719,9 @@ void CCDirector::createStatsLabel()
CC_SAFE_RELEASE_NULL(m_pSPFLabel);
CC_SAFE_RELEASE_NULL(m_pDrawsLabel);
m_pFPSLabel = CCLabelTTF::labelWithString("00.0", "Arial", 16);
m_pSPFLabel = CCLabelTTF::labelWithString("0.000", "Arial", 16);
m_pDrawsLabel = CCLabelTTF::labelWithString("000", "Arial", 16);
m_pFPSLabel = CCLabelBMFont::labelWithString("00.0", "fps_images.fnt");
m_pSPFLabel = CCLabelBMFont::labelWithString("0.000", "fps_images.fnt");
m_pDrawsLabel = CCLabelBMFont::labelWithString("000", "fps_images.fnt");
m_pFPSLabel->retain();
m_pSPFLabel->retain();

9
cocos2dx/CCDirector.h
View File

@ -54,7 +54,8 @@ typedef enum {
kCCDirectorProjectionDefault = kCCDirectorProjection3D,
} ccDirectorProjection;
class CCLabelTTF;
/* Forward declarations. */
class CCLabelBMFont;
class CCScene;
class CCEGLView;
class CCDirectorDelegate;
@ -334,9 +335,9 @@ protected:
ccTime m_fAccumDt;
ccTime m_fFrameRate;
CCLabelTTF *m_pFPSLabel;
CCLabelTTF *m_pSPFLabel;
CCLabelTTF *m_pDrawsLabel;
CCLabelBMFont *m_pFPSLabel;
CCLabelBMFont *m_pSPFLabel;
CCLabelBMFont *m_pDrawsLabel;
/* is the running scene paused */
bool m_bPaused;

2
cocos2dx/sprite_nodes/CCSpriteBatchNode.cpp
View File

@ -129,8 +129,6 @@ void CCSpriteBatchNode::visit(void)
{
CC_PROFILER_START_CATEGORY(kCCProfilerCategoryBatchSprite, "CCSpriteBatchNode - visit");
CCAssert(m_pParent != NULL, "CCSpriteBatchNode should NOT be root node");
// CAREFUL:
// This visit is almost identical to CocosNode#visit
// with the exception that it doesn't call visit on it's children

2
tests/proj.ios/test.xcodeproj/project.pbxproj.REMOVED.git-id
View File

@ -1 +1 @@
9189dbb79a9d878a265d10ad5834bcae8a1ce1b5
0db65c0bf802f20d588ccc6b3b7204dd1941abc9

2
tests/tests/MenuTest/MenuTest.cpp
View File

@ -44,7 +44,7 @@ MenuLayerMainMenu::MenuLayerMainMenu()
CCMenuItem* item2 = CCMenuItemImage::itemWithNormalImage(s_SendScore, s_PressSendScore, this, menu_selector(MenuLayerMainMenu::menuCallback2) );
// Label Item (LabelAtlas)
CCLabelAtlas* labelAtlas = CCLabelAtlas::labelWithString("0123456789", "fonts/fps_images.png", 16, 24, '.');
CCLabelAtlas* labelAtlas = CCLabelAtlas::labelWithString("0123456789", "fonts/labelatlas.png", 16, 24, '.');
CCMenuItemLabel* item3 = CCMenuItemLabel::itemWithLabel(labelAtlas, this, menu_selector(MenuLayerMainMenu::menuCallbackDisabled) );
item3->setDisabledColor( ccc3(32,32,64) );
item3->setColor( ccc3(200,200,255) );