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

Merge pull request #4409 from mlepage/develop 

[ci skip]Fix typos
This commit is contained in:
minggo 2013-12-03 19:13:23 -08:00
parent 9babdaa1fa 940b0ffd56
commit 92b180080c
7 changed files with 428 additions and 428 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cocos/2d/CCNode.h
View File

@ -627,7 +627,7 @@ public:
/**
* Sets the parent node
*
* @param parent A pointer to the parnet node
* @param parent A pointer to the parent node
*/
virtual void setParent(Node* parent);
/**
@ -635,7 +635,7 @@ public:
*
* @see `setParent(Node*)`
*
* @returns A pointer to the parnet node
* @returns A pointer to the parent node
*/
virtual Node* getParent() { return _parent; }
virtual const Node* getParent() const { return _parent; }

2
cocos/2d/CCParticleBatchNode.cpp
View File

@ -176,7 +176,7 @@ void ParticleBatchNode::addChild(Node * aChild, int zOrder, int tag)
setBlendFunc(child->getBlendFunc());
}
CCASSERT( _blendFunc.src == child->getBlendFunc().src && _blendFunc.dst == child->getBlendFunc().dst, "Can't add a PaticleSystem that uses a different blending function");
CCASSERT( _blendFunc.src == child->getBlendFunc().src && _blendFunc.dst == child->getBlendFunc().dst, "Can't add a ParticleSystem that uses a different blending function");
//no lazy sorting, so don't call super addChild, call helper instead
unsigned int pos = addChildHelper(child,zOrder,tag);

6
samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.cpp
View File

@ -404,7 +404,7 @@ void TestPerformance::onDecrease(Object* pSender)
{
removeArmatureFromParent(ArmaturePerformanceTag + armatureCount);
armatureCount --;
refreshTitile();
refreshTitle();
}
}
void TestPerformance::addArmature(int number)
@ -423,7 +423,7 @@ void TestPerformance::addArmature(int number)
armature->release();
}
refreshTitile();
refreshTitle();
}
void TestPerformance::addArmatureToParent(cocostudio::Armature *armature)
{
@ -433,7 +433,7 @@ void TestPerformance::removeArmatureFromParent(int tag)
{
removeChildByTag(ArmaturePerformanceTag + armatureCount);
}
void TestPerformance::refreshTitile()
void TestPerformance::refreshTitle()
{
char pszCount[255];
sprintf(pszCount, "%s %i", subtitle().c_str(), armatureCount);

2
samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.h
View File

@ -114,7 +114,7 @@ public:
virtual void addArmature(int number);
virtual void addArmatureToParent(cocostudio::Armature *armature);
virtual void removeArmatureFromParent(int tag);
virtual void refreshTitile();
virtual void refreshTitle();
int armatureCount;

6
samples/Cpp/TestCpp/Classes/ParticleTest/ParticleTest.cpp
View File

@ -1110,7 +1110,7 @@ std::string ParticleDemo::title()
std::string ParticleDemo::subtitle()
{
return "No titile";
return "No title";
}
void ParticleDemo::onTouchesBegan(const std::vector<Touch*>& touches, Event *event)
@ -1238,7 +1238,7 @@ void ParticleBatchHybrid::switchRender(float dt)
std::string ParticleBatchHybrid::title()
{
return "Paticle Batch";
return "Particle Batch";
}
std::string ParticleBatchHybrid::subtitle()
@ -1280,7 +1280,7 @@ void ParticleBatchMultipleEmitters::onEnter()
std::string ParticleBatchMultipleEmitters::title()
{
return "Paticle Batch";
return "Particle Batch";
}
std::string ParticleBatchMultipleEmitters::subtitle()

8
samples/Lua/TestLua/Resources/luaScript/CocoStudioTest/CocoStudioArmatureTest/CocoStudioArmatureTest.lua
View File

@ -405,7 +405,7 @@ function TestPerformance.extend(target)
return target
end
function TestPerformance:refreshTitile()
function TestPerformance:refreshTitle()
local subTitleInfo = ArmatureTestLayer.subTitle(5) .. self._armatureCount
local label = tolua.cast(self:getChildByTag(10001),"LabelTTF")
label:setString(subTitleInfo)
@ -429,7 +429,7 @@ function TestPerformance:addArmature(num)
self:addArmatureToParent(armature)
end
self:refreshTitile()
self:refreshTitle()
end
function TestPerformance:onEnter()
@ -446,7 +446,7 @@ function TestPerformance:onEnter()
for i = 1, 20 do
self:removeArmatureFromParent(armaturePerformanceTag + self._armatureCount)
self._armatureCount = self._armatureCount - 1
self:refreshTitile()
self:refreshTitle()
end
end
@ -523,7 +523,7 @@ function TestPerformanceBatchNode:onEnter()
for i = 1, 20 do
self:removeArmatureFromParent(armaturePerformanceTag + self._armatureCount)
self._armatureCount = self._armatureCount - 1
self:refreshTitile()
self:refreshTitle()
end
end

4
samples/Lua/TestLua/Resources/luaScript/ParticleTest/ParticleTest.lua
View File

@ -330,7 +330,7 @@ local function ParticleBatchHybrid()
layer:registerScriptHandler(ParticleBatchHybrid_onEnterOrExit)
titleLabel:setString("Paticle Batch")
titleLabel:setString("Particle Batch")
subtitleLabel:setString("Hybrid: batched and non batched every 2 seconds")
return layer
end
@ -364,7 +364,7 @@ local function ParticleBatchMultipleEmitters()
layer:addChild(batch, 10)
titleLabel:setString("Paticle Batch")
titleLabel:setString("Particle Batch")
subtitleLabel:setString("Multiple emitters. One Batch")
return layer
end