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

Merge pull request #1878 from dumganhar/lua-fix 

fixed compilation errors for lua projects. Rebuilt LuaCocos2d.cpp.
This commit is contained in:
James Chen 2013-01-21 22:46:03 -08:00
parent a3dbfaafd3 5a41e1fc86
commit 564001b76b
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripting/lua/cocos2dx_support/LuaCocos2d.cpp.REMOVED.git-id
View File

@ -1 +1 @@
138429d18a59715d17f73864aac1cfef5ebdda13 db687e611c0ec70bbb2e2359e4a1bb4e510b7ce0

4
tools/tolua++/CCActionCatmullRom.pkg
View File

@ -11,8 +11,8 @@ class CCPointArray : public CCNode
CCPointArray* reverse(); CCPointArray* reverse();
void reverseInline(); void reverseInline();
CCObject* copyWithZone(CCZone *zone); CCObject* copyWithZone(CCZone *zone);
CCArray* getControlPoints(); const std::vector<CCPoint*>* getControlPoints();
void setControlPoints(CCArray *controlPoints); void setControlPoints(std::vector<CCPoint*> *controlPoints);
static CCPointArray* create(unsigned int capacity); static CCPointArray* create(unsigned int capacity);
}; };

2
tools/tolua++/CCSprite.pkg
View File

@ -39,13 +39,11 @@ class CCSprite : public CCNode
CCPoint getOffsetPosition(void); CCPoint getOffsetPosition(void);
void setDirtyRecursively(bool bValue);
void ignoreAnchorPointForPosition(bool newValue); void ignoreAnchorPointForPosition(bool newValue);
void setFlipX(bool bFlipX); void setFlipX(bool bFlipX);
void setFlipY(bool bFlipY); void setFlipY(bool bFlipY);
bool isFlipX(void); bool isFlipX(void);
bool isFlipY(void); bool isFlipY(void);
void updateColor(void);
void removeChild(CCNode* pChild, bool bCleanUp); void removeChild(CCNode* pChild, bool bCleanUp);
void removeAllChildrenWithCleanup(bool bCleanup); void removeAllChildrenWithCleanup(bool bCleanup);