Permalink
Browse files

update to latest code

  • Loading branch information...
2 parents 7bb95c1 + d47e763 commit b07e04e782bff0768a51dd87de1d80447a16a65d @minggo minggo committed Mar 28, 2012
Showing with 31,796 additions and 2,252 deletions.
  1. +2 −2 HelloLua/android/build_native.sh
  2. +2 −2 HelloWorld/android/build_native.sh
  3. +1 −1 cocos2dx/CCScheduler.cpp
  4. +30 −0 cocos2dx/actions/CCActionInterval.cpp
  5. +651 −648 cocos2dx/include/CCActionInterval.h
  6. +41 −42 cocos2dx/include/CCParallaxNode.h
  7. +1 −1 cocos2dx/include/CCScheduler.h
  8. +1 −1 cocos2dx/include/CCTexturePVR.h
  9. +34 −34 cocos2dx/tileMap_parallax_nodes/CCParallaxNode.cpp
  10. +30,022 −336 lua/cocos2dx_support/LuaCocos2d.cpp
  11. +0 −2 lua/cocos2dx_support/LuaCocos2d.h
  12. +7 −211 tools/tolua++/CCAction.pkg
  13. +5 −5 tools/tolua++/CCActionCamera.pkg
  14. +52 −48 tools/tolua++/CCActionEase.pkg
  15. +24 −11 tools/tolua++/CCActionGrid.pkg
  16. +6 −9 tools/tolua++/CCActionGrid3D.pkg
  17. +35 −0 tools/tolua++/CCActionInstant.pkg
  18. +144 −0 tools/tolua++/CCActionInterval.pkg
  19. +4 −5 tools/tolua++/CCActionManager.pkg
  20. +10 −0 tools/tolua++/CCActionProgressTimer.pkg
  21. +6 −10 tools/tolua++/CCActionTiledGrid.pkg
  22. +3 −6 tools/tolua++/CCAnimation.pkg
  23. +3 −3 tools/tolua++/CCAnimationCache.pkg
  24. +0 −1 tools/tolua++/CCApplication.pkg
  25. +2 −3 tools/tolua++/CCAtlasNode.pkg
  26. +2 −8 tools/tolua++/CCCamera.pkg
  27. +2 −2 tools/tolua++/CCCommon.pkg
  28. +40 −0 tools/tolua++/CCConfiguration.pkg
  29. +14 −19 tools/tolua++/CCDirector.pkg
  30. +0 −8 tools/tolua++/CCDrawingPrimitives.pkg
  31. +7 −0 tools/tolua++/CCFileUtils.pkg
  32. +11 −11 tools/tolua++/CCGeometry.pkg
  33. +12 −0 tools/tolua++/CCImage.pkg
  34. +3 −9 tools/tolua++/CCLabelAtlas.pkg
  35. +17 −11 tools/tolua++/CCLabelBMFont.pkg
  36. +4 −4 tools/tolua++/CCLabelTTF.pkg
  37. +18 −16 tools/tolua++/CCLayer.pkg
  38. +15 −10 tools/tolua++/CCMenu.pkg
  39. +54 −40 tools/tolua++/CCMenuItem.pkg
  40. +4 −3 tools/tolua++/CCMotionStreak.pkg
  41. +61 −38 tools/tolua++/CCNode.pkg
  42. +9 −0 tools/tolua++/CCNotificationCenter.pkg
  43. +1 −1 tools/tolua++/CCObject.pkg
  44. +2 −16 tools/tolua++/CCParallaxNode.pkg
  45. +55 −0 tools/tolua++/CCParticleExamples.pkg
  46. +1 −44 tools/tolua++/CCParticleSystem.pkg
  47. +4 −0 tools/tolua++/CCParticleSystemPoint.pkg
  48. +4 −0 tools/tolua++/CCParticleSystemQuad.pkg
  49. +29 −29 tools/tolua++/CCPointExtension.pkg
  50. +2 −2 tools/tolua++/CCProgressTimer.pkg
  51. +4 −3 tools/tolua++/CCRenderTexture.pkg
  52. +9 −12 tools/tolua++/CCRibbon.pkg
  53. +4 −12 tools/tolua++/CCScheduler.pkg
  54. +56 −67 tools/tolua++/CCSprite.pkg
  55. +5 −4 tools/tolua++/CCSpriteBatchNode.pkg
  56. +0 −5 tools/tolua++/CCSpriteFrame.pkg
  57. +7 −11 tools/tolua++/CCSpriteFrameCache.pkg
  58. +0 −4 tools/tolua++/CCString.pkg
  59. +11 −21 tools/tolua++/CCTMXLayer.pkg
  60. +0 −19 tools/tolua++/CCTMXObjectGroup.pkg
  61. +10 −17 tools/tolua++/CCTMXTiledMap.pkg
  62. +0 −66 tools/tolua++/CCTMXXMLParser.pkg
  63. +10 −10 tools/tolua++/CCTextFieldTTF.pkg
  64. +21 −21 tools/tolua++/CCTexture2D.pkg
  65. +11 −12 tools/tolua++/CCTextureAtlas.pkg
  66. +7 −8 tools/tolua++/CCTextureCache.pkg
  67. +13 −0 tools/tolua++/CCTexturePVR.pkg
  68. +2 −9 tools/tolua++/CCTileMapAtlas.pkg
  69. +40 −51 tools/tolua++/CCTransition.pkg
  70. +5 −0 tools/tolua++/CCTransitionPageTurn.pkg
  71. +10 −0 tools/tolua++/CCTransitionRadial.pkg
  72. +13 −13 tools/tolua++/CCUserDefault.pkg
  73. +74 −31 tools/tolua++/Cocos2d.pkg
  74. +6 −6 tools/tolua++/SimpleAudioEngine.pkg
  75. +8 −3 tools/tolua++/build.xml
  76. +8 −3 tools/tolua++/build_macosx.xml
  77. +5 −192 tools/tolua++/ccTypes.pkg
@@ -65,10 +65,10 @@ done
# build
if [[ $buildexternalsfromsource ]]; then
echo "Building external dependencies from source"
- $NDK_ROOT_LOCAL/ndk-build -C $GAME_ANDROID_ROOT \
+ $NDK_ROOT_LOCAL/ndk-build -C $GAME_ANDROID_ROOT $* \
NDK_MODULE_PATH=${COCOS2DX_ROOT_LOCAL}:${COCOS2DX_ROOT_LOCAL}/cocos2dx/platform/third_party/android/source
else
echo "Using prebuilt externals"
- $NDK_ROOT_LOCAL/ndk-build -C $GAME_ANDROID_ROOT \
+ $NDK_ROOT_LOCAL/ndk-build -C $GAME_ANDROID_ROOT $* \
NDK_MODULE_PATH=${COCOS2DX_ROOT_LOCAL}:${COCOS2DX_ROOT_LOCAL}/cocos2dx/platform/third_party/android/prebuilt
fi
@@ -62,10 +62,10 @@ done
if [[ $buildexternalsfromsource ]]; then
echo "Building external dependencies from source"
- $NDK_ROOT_LOCAL/ndk-build -C $HELLOWORLD_ROOT \
+ $NDK_ROOT_LOCAL/ndk-build -C $HELLOWORLD_ROOT $* \
NDK_MODULE_PATH=${COCOS2DX_ROOT_LOCAL}:${COCOS2DX_ROOT_LOCAL}/cocos2dx/platform/third_party/android/source
else
echo "Using prebuilt externals"
- $NDK_ROOT_LOCAL/ndk-build -C $HELLOWORLD_ROOT \
+ $NDK_ROOT_LOCAL/ndk-build -C $HELLOWORLD_ROOT $* \
NDK_MODULE_PATH=${COCOS2DX_ROOT_LOCAL}:${COCOS2DX_ROOT_LOCAL}/cocos2dx/platform/third_party/android/prebuilt
fi
View
@@ -555,7 +555,7 @@ void CCScheduler::unscheduleAllSelectorsForTarget(CCObject *pTarget)
unscheduleUpdateForTarget(pTarget);
}
-unsigned int CCScheduler::scheduleScriptFunc(unsigned int nHandler, ccTime fInterval, bool bPaused)
+unsigned int CCScheduler::scheduleScriptFunc(int nHandler, ccTime fInterval, bool bPaused)
{
CCSchedulerScriptHandlerEntry* pEntry = CCSchedulerScriptHandlerEntry::entryWithHandler(nHandler, fInterval, bPaused);
if (!m_pScriptHandlerEntries)
@@ -196,6 +196,20 @@ CCFiniteTimeAction* CCSequence::actionsWithArray(CCArray *actions)
return prev;
}
+CCSequence* CCSequence::actionsWithArrayLua(CCArray *actions)
+{
+ if (actions->count() >= 2)
+ {
+ CCFiniteTimeAction* prev = (CCFiniteTimeAction*)actions->objectAtIndex(0);
+ for (unsigned int i = 1; i < actions->count(); ++i)
+ {
+ prev = actionOneTwo(prev, (CCFiniteTimeAction*)actions->objectAtIndex(i));
+ }
+ return (CCSequence*)prev;
+ }
+ return NULL;
+}
+
bool CCSequence::initOneTwo(CCFiniteTimeAction *pActionOne, CCFiniteTimeAction *pActionTwo)
{
CCAssert(pActionOne != NULL, "");
@@ -553,6 +567,22 @@ CCFiniteTimeAction* CCSpawn::actionsWithArray(CCArray *actions)
return prev;
}
+CCSpawn* CCSpawn::actionsWithArrayLua(CCArray *actions)
+{
+ if (actions->count() >= 2)
+ {
+ CCFiniteTimeAction* prev = (CCFiniteTimeAction*)actions->objectAtIndex(0);
+
+ for (unsigned int i = 1; i < actions->count(); ++i)
+ {
+ prev = actionOneTwo(prev, (CCFiniteTimeAction*)actions->objectAtIndex(i));
+ }
+
+ return (CCSpawn*)prev;
+ }
+ return NULL;
+}
+
CCSpawn* CCSpawn::actionOneTwo(CCFiniteTimeAction *pAction1, CCFiniteTimeAction *pAction2)
{
CCSpawn *pSpawn = new CCSpawn();
Oops, something went wrong.

0 comments on commit b07e04e

Please sign in to comment.