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

Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developTableView

This commit is contained in:
samuele3 2013-11-18 15:57:14 +08:00
parent b281a2f06f 946fd16adc
commit ee815c8e9a
6 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cocos/2d/CCEventListenerKeyboard.cpp
View File

@ -31,7 +31,11 @@ NS_CC_BEGIN
bool EventListenerKeyboard::checkAvailable()
{
CCASSERT(onKeyPressed && onKeyReleased, "");
if (onKeyPressed == nullptr && onKeyReleased == nullptr)
{
CCASSERT(false, "Invalid EventListenerKeyboard!");
return false;
}
return true;
}

14
cocos/editor-support/cocosbuilder/CCBAnimationManager.cpp
View File

@ -622,9 +622,9 @@ Object* CCBAnimationManager::actionForCallbackChannel(CCBSequenceProperty* chann
Array *actions = Array::create();
Array *keyframes = channel->getKeyframes();
int numKeyframes = keyframes->count();
long numKeyframes = keyframes->count();
for (int i = 0; i < numKeyframes; ++i)
for (long i = 0; i < numKeyframes; ++i)
{
CCBKeyframe *keyframe = (CCBKeyframe*)keyframes->getObjectAtIndex(i);
@ -640,10 +640,14 @@ Object* CCBAnimationManager::actionForCallbackChannel(CCBSequenceProperty* chann
if(_jsControlled) {
String* callbackName = String::createWithFormat("%d:%s", selectorTarget, selectorName.c_str());
CallFunc *callback = ((CallFunc*)(_keyframeCallFuncs->objectForKey(callbackName->getCString())))->clone();
Object* callback = _keyframeCallFuncs->objectForKey(callbackName->getCString());
if (nullptr != callback)
{
CallFunc *callbackClone = (static_cast<CallFunc*>(callback))->clone();
if(callback != NULL) {
actions->addObject(callback);
if(callbackClone != NULL) {
actions->addObject(callbackClone);
}
}
}
else

5
cocos/editor-support/cocostudio/CCBatchNode.cpp
View File

@ -163,6 +163,11 @@ void BatchNode::visit()
void BatchNode::draw()
{
if (_children == nullptr)
{
return;
}
CC_NODE_DRAW_SETUP();
for(auto object : *_children)

4
cocos/scripting/lua/bindings/LuaBasicConversions.cpp
View File

@ -1203,7 +1203,7 @@ void array_to_luaval(lua_State* L,Array* inValue)
if (nullptr == obj)
continue;
uint32_t typeId = typeid(*obj).hash_code();
long typeId = typeid(*obj).hash_code();
auto iter = g_luaType.find(typeId);
if (g_luaType.end() != iter)
{
@ -1292,7 +1292,7 @@ void dictionary_to_luaval(lua_State* L, Dictionary* dict)
if (NULL == element)
continue;
uint32_t typeId = typeid(element->getObject()).hash_code();
long typeId = typeid(element->getObject()).hash_code();
auto iter = g_luaType.find(typeId);
if (g_luaType.end() != iter)

2
cocos/scripting/lua/bindings/lua_cocos2dx_extension_manual.cpp
View File

@ -691,7 +691,7 @@ int register_cocos2dx_extension_CCBProxy(lua_State* tolua_S)
tolua_endmodule(tolua_S);
tolua_endmodule(tolua_S);
uint32_t typeId = typeid(CCBProxy).hash_code();
long typeId = typeid(CCBProxy).hash_code();
g_luaType[typeId] = "CCBProxy";
return 1;
}

2
plugin

@ -1 +1 @@
Subproject commit 8f01fc10fcb658e9f8314d8a044f032c7740bd27
Subproject commit cb3fdd990368b7bc3c67a0c94ad1f7b579828d73