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

Merge branch 'master' of https://github.com/cocos2d/cocos2d-x

This commit is contained in:
zhangbin 2013-04-24 09:59:46 +08:00
parent 8d60e11a9f 84ec031fcf
commit 297e32c20d
8 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cocos2dx/support/user_default/CCUserDefault.cpp
View File

@ -66,6 +66,7 @@ static tinyxml2::XMLElement* getXMLNodeForKey(const char* pKey, tinyxml2::XMLEle
break;
}
xmlDoc->Parse(pXmlBuffer);
delete[] pXmlBuffer;
// get root node
*rootNode = xmlDoc->RootElement();
if (NULL == *rootNode)

1
cocos2dx/support/user_default/CCUserDefault.mm
View File

@ -81,6 +81,7 @@ static tinyxml2::XMLElement* getXMLNodeForKey(const char* pKey, tinyxml2::XMLDoc
break;
}
xmlDoc->Parse(pXmlBuffer);
delete[] pXmlBuffer;
// get root node
rootNode = xmlDoc->RootElement();
if (NULL == rootNode)

1
cocos2dx/support/user_default/CCUserDefaultAndroid.cpp
View File

@ -82,6 +82,7 @@ static tinyxml2::XMLElement* getXMLNodeForKey(const char* pKey, tinyxml2::XMLDoc
break;
}
xmlDoc->Parse(pXmlBuffer);
delete[] pXmlBuffer;
// get root node
rootNode = xmlDoc->RootElement();
if (NULL == rootNode)

9
extensions/CCBReader/CCBReader.cpp
View File

@ -1040,9 +1040,16 @@ CCArray* CCBReader::getAnimationManagersForNodes() {
Static functions
************************************************************************/
static float __ccbResolutionScale = 1.0f;
float CCBReader::getResolutionScale()
{
return 1;
return __ccbResolutionScale;
}
void CCBReader::setResolutionScale(float scale)
{
__ccbResolutionScale = scale;
}
NS_CC_EXT_END;

1
extensions/CCBReader/CCBReader.h
View File

@ -270,6 +270,7 @@ public:
void addDocumentCallbackNode(CCNode *node);
static float getResolutionScale();
static void setResolutionScale(float scale);
CCNode* readFileWithCleanUp(bool bCleanUp, CCDictionary* am);

2
samples/Cpp/HelloCpp/proj.android/jni/hellocpp/main.cpp
View File

@ -3,8 +3,6 @@
#include <jni.h>
#include <android/log.h>
#include "HelloWorldScene.h"
#define LOG_TAG "main"
#define LOGD(...) __android_log_print(ANDROID_LOG_DEBUG,LOG_TAG,__VA_ARGS__)

2
scripting/javascript/bindings/cocos2d_specifics.cpp.REMOVED.git-id
View File

@ -1 +1 @@
643c72abe675dc711e46f2dd6b14187713cfb8d3
3ff60497346cab1d4592901c3a03048c34bf725a

2
scripting/javascript/bindings/generated

@ -1 +1 @@
Subproject commit bffc3adca972b977b6d22888e23b58cbe3d17d97
Subproject commit 6e3124f76cde92091615793137dbd2a1c451dac5