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 developEventTrigger

This commit is contained in:
samuele3hu 2014-02-19 16:27:08 +08:00
parent 52a0b906da fe6ec12d59
commit d7b0efd6d7
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cocos/scripting/auto-generated

@ -1 +1 @@
Subproject commit 355c9ac55dbc65fed32a092ffa13f8f8d4d7eb23
Subproject commit 9048d215bef749e5084ef3c6441627299d3e9750

2
cocos/scripting/lua/bindings/lua_cocos2dx_manual.cpp.REMOVED.git-id
View File

@ -1 +1 @@
c5f8d4a3ea721a2ecb36fe381430b7ac6fad1740
29bde887dbd41a72f33704fb57cbab230d1a1688

3
tools/tolua/cocos2dx.ini
View File

@ -112,7 +112,8 @@ skip = Node::[setGLServerState description getUserObject .*UserData getGLServerS
EGLView::[end swapBuffers],
NewTextureAtlas::[*],
DisplayLinkDirector::[mainLoop setAnimationInterval startAnimation stopAnimation],
RenderTexture::[listenToBackground listenToForeground]
RenderTexture::[listenToBackground listenToForeground],
TMXTiledMap::[getPropertiesForGID]
rename_functions = SpriteFrameCache::[addSpriteFramesWithFile=addSpriteFrames getSpriteFrameByName=getSpriteFrame],
ProgressTimer::[setReverseProgress=setReverseDirection],