Merge pull request cocos2d#5 from cocos2d/master

update cocos2d-x

Author: waiter

.gitignore

@@ -64,6 +64,7 @@ build_*_vc10/
 xcschememanagement.plist
 build/
 .DS_Store
+._.*
 xcuserdata/
 DerivedData/
 

AUTHORS

@@ -12,6 +12,9 @@ Developers:
     Rolando Abarca
         Javascript Binding and testjs
 
+    biteforest
+        fix cc scale9 sprite bug
+
     Jimmy Sambuo
         fix the bug that SimpleAudioEngine::playEffect() and playBackgroundMusic() play twice on linux
 
@@ -71,6 +74,8 @@ Developers:
         Used fontconfig to enhance font rendering on linux.
         Fixed a bug about missing horizontal alignment for Custom TTF fonts on linux.
         Fixed a bug that the truetype fonts from resource directory can't be found on linux.
+        Fixed the size calculations for true type fonts (especially for italic fonts).
+        Added a very simple greedy line break algorithmfor true type labels.
 
     Nat Weiss (iphonegamekit.com)
         author of Mac port
@@ -98,6 +103,7 @@ Developers:
 
     Rohan Kuruvilla (rohankuruvilla, Zynga)
         Improvements to JS Bindings.
+        Synchronizing CCBReader to version 5.
 
     Jianfeng Zou (NetDragon Inc)
         contributes CCListView and CCTextureWatcher.
@@ -225,6 +231,7 @@ Developers:
 
     neokim
         Adds 'setFont' and 'setAnchorPoint' to CCEditBox.
+        Workaround for some problems due to UITextField of CCEditBoxImplIOS is attached as a view above OpenGL view.
 
     Sam Clegg (sbc100)
         Author of Native Client port.
@@ -241,6 +248,12 @@ Developers:
     Asad ur Rehman (AsadR)
         Adding CCNotificationCenter::removeAllObservers(CCObject *target).
 
+    jedy
+        Fix of CCNode.h's document with doxygen 1.8.3 can't be generated.
+
+    whitegfx
+        Implementation of kEditBoxInputFlagSensitive setting for CCEditBoxImplIOS.
+
 Retired Core Developers:
     WenSheng Yang
         Author of windows port, CCTextField,

CHANGELOG

@@ -1,3 +1,86 @@
+cocos2d-2.1rc0-x-2.1.2 @Mar.20 2013
+[all platforms]
+     Bug      #1529: use NSUserDefaults on iOS and SharedPreferences on Android implement CCUserDefault
+     Bug      #1672: fix a bug that CCTableView is too sensitive on some devices with high density display
+     Bug      #1689: support horizontal alignment for Custom TTF fonts
+     Bug      #1691: fix a bug that CCControlSwitch::setOn(isOn,false) doesn't work
+     Bug      #1692: add TMX polygon parsing
+     Bug      #1697: fix a logical error in CCRenderTexture::initWithWidthAndHeight()
+     Bug      #1710: add simpler,correct handling of spritesheet sources for CCScale9Sprite
+     Bug      #1711: fix a bug that clipping rectangle of CCScrollView is wrong when the scale of its ancestors isn't equal to 1
+     Bug      #1731: change declaration of CCSize, CCPoint and CCRect in pkg file
+     Bug      #1751: fix a bug that clicking outside of CCTableViewCell will also get response when container size is smaller than view size
+     Bug      #1754: fix a bug that offset of the container is wrong in CCTableView
+     Bug      #1821: fix a bug that the display result is wrong when invoking CCControlButton::setHighlighted()
+     Feature  #1686: synchronize to cocos2d-iphone v2.1rc0
+     Feature  #1708: adding Portuguese and Arabic language support
+     Feature  #1712: add an interface to get DPI
+     Feature  #1741: CCLens3d can be concave
+     Feature  #1742: add 'rotationIsDir' property to ParticleSystem
+     Feature  #1761: implement setVisible() for CCEditBox
+     Feature  #1807: add getStartLocationInView() and getStartLocation() methods in CCTouch
+     Feature  #1822: add CCNotificationCenter::removeAllObservers(CCObject *target)
+     Feature  #1838: synchronize CCBReader to the lastest version
+     Feature  #1489: add AssetsManager
+     Refactor #1687: refactor CCFileUtils and CCImage
+     Refactor #1700: add webp image format support
+     Refactor #1702: change return value of CCFileUtils::getWritablePath()
+     Refactor #1703: replace libxml2 with tinyxml2
+     Refactor #1749: add 'setFont' and 'setAnchorPoint' to CCEditBox
+[android]
+     Bug      #1752: fix a bug that libcurl.a causes link error after being stripped
+     Bug      #1760: fix a bug that cpufeatures module is redefined
+     Bug      #1775: fix a bug that OpenSLEngine can not load resources from SD card
+     Bug      #1812: fix a warning of getStringWithEllipsisJni() function when compiling it with clang
+     Feature  #1827: support building android project, including native codes, in Eclipse
+[iOS]
+     Bug      #1750: fix a bug that CCEditBox's position is incorrect when it's added to a non-fullscreen CCNode
+     Bug      #1804: fix for loading custom fonts on iOS when referenced from a CCB file
+     Feature  #1842: support kEditBoxInputFlagSensitive setting for CCEditBox on iOS
+     Refactor #1755: add CocosDenshion xcode project
+     Refactor #1825: use CCLabelTTF to show text for CCEditBox
+[javascript binding]
+     Bug      #1707: fix a crash caused by unaligned memory access in CCBReader::readFloat()
+     Bug      #1726: fix crash of JSB application on android device with armv6 architecture
+     Bug      #1729: fix compiling error of ScriptingCore.cpp with C++11 on iOS
+     Bug      #1747: fix a crash when passing null to cc.AnimationFrame.initWithSpriteFrame()
+     Bug      #1823: use shared NodeLoaderLibrary in CCBReader bindings
+     Feature  #1724: add HelloJS sample
+     Feature  #1730: bind CCScrollView and CCTableView to js
+     Feature  #1748: separate chipmunk and sqlite from js_binding_core.cpp
+     Feature  #1753: upgrade SpiderMonkey to Firefox19.
+     Feature  #1808: make cxx_generator support parsing functions that have default parameters
+     Feature  #1811: add a method to get file data for JSB
+     Feature  #1824: bind CCEditBox to JS
+     Refactor #1682: add ScriptingCore::getGlobalObject() function
+     Refactor #1740: add cleanup and reset methods to ScriptingCore
+     Refactor #1830: use JS::CompileOptions::setUTF8(true) to compile script
+     Refactor #1836: make js target of "cc.Scheduler().scheduleCallbackForTarget()" accept a object that not depend on CCNode or its subclass
+     Refactor #1837: refactor schedule binding codes
+[lua binding]
+     Bug      #1745: fix a bug that CCRepeat:create() receives error argument
+     Feature  #1425: fix errors in lua test cases and add more test cases
+     Feature  #1698: add CCLuaObjcBridge
+     Feature  #1802: add TouchesTest for lua binding
+     Refactor #1818: cleanup the tolua++ bindings build system
+[win32]
+     Feature  #1634: CCEditBox support
+     Feature  #1746: add VS2012 Express template installing support
+[linux]
+     Bug      #1688: fix a bug that truetype fonts from resource directory can't be found
+     Bug      #1810: fix a bug that SimpleAudioEngine::playEffect() and playBackgroundMusic() play twice on linux
+     Bug      #1819: fix a bug that building script exits when missing packages
+     Bug      #1834: fix the size calculations for true type fonts (especially for italic fonts)
+     Refactor #1806: refactor linux build system
+     Refactor #1820: add 'make run' target for linux projects
+[mac os]
+     Bug      #1637: fix a bug that CCLabelTTF & CCMenuItemLabel cannot display on Mac Retina
+[black berry]
+     Refactor #1709: add support for multiple background music sources
+[chrome native client]
+     Feature  #1762: add Native Client support
+
+
 cocos2d-2.1beta3-x-2.1.1 @Jan.29 2013
 [ all platforms]
      Bug      #1547: fix a bug that when CCMenuItem is removed before touch ended, application will crash if keeping moving

cocos2d-win32.vc2010.sln

@@ -19,6 +19,11 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "liblua", "scripting\lua\pro
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libExtensions", "extensions\proj.win32\libExtensions.vcxproj", "{21B2C324-891F-48EA-AD1A-5AE13DE12E28}"
+	ProjectSection(ProjectDependencies) = postProject
+		{98A51BA8-FC3A-415B-AC8F-8C7BD464E93E} = {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}
+		{207BC7A9-CCF1-4F2F-A04D-45F72242AE25} = {207BC7A9-CCF1-4F2F-A04D-45F72242AE25}
+		{F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6} = {F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6}
+	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HelloCpp", "samples\Cpp\HelloCpp\proj.win32\HelloCpp.vcxproj", "{B8BF9E81-35FD-4582-BA1C-B85FA365BABB}"
 EndProject
@@ -92,6 +97,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AssetsManagerTest", "sample
 	EndProjectSection
 EndProject
 Global
+	GlobalSection(DPCodeReviewSolutionGUID) = preSolution
+		DPCodeReviewSolutionGUID = {00000000-0000-0000-0000-000000000000}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
 		Release|Win32 = Release|Win32
@@ -188,7 +196,4 @@ Global
 		{39379840-825A-45A0-B363-C09FFEF864BD} = {68B43009-A1C1-41B2-8AF7-77278B70E897}
 		{9A17D9A4-4B11-4E32-94F6-895FF4909EC5} = {68B43009-A1C1-41B2-8AF7-77278B70E897}
 	EndGlobalSection
-	GlobalSection(DPCodeReviewSolutionGUID) = preSolution
-		DPCodeReviewSolutionGUID = {00000000-0000-0000-0000-000000000000}
-	EndGlobalSection
 EndGlobal

cocos2d-win32.vc2012.sln

@@ -21,6 +21,8 @@ EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libExtensions", "extensions\proj.win32\libExtensions.vcxproj", "{21B2C324-891F-48EA-AD1A-5AE13DE12E28}"
 	ProjectSection(ProjectDependencies) = postProject
 		{98A51BA8-FC3A-415B-AC8F-8C7BD464E93E} = {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}
+		{207BC7A9-CCF1-4F2F-A04D-45F72242AE25} = {207BC7A9-CCF1-4F2F-A04D-45F72242AE25}
+		{F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6} = {F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HelloCpp", "samples\Cpp\HelloCpp\proj.win32\HelloCpp.vcxproj", "{B8BF9E81-35FD-4582-BA1C-B85FA365BABB}"
@@ -87,6 +89,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libJSBinding", "scripting\j
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CrystalCraze", "samples\Javascript\CrystalCraze\proj.win32\CrystalCraze.vcxproj", "{9A17D9A4-4B11-4E32-94F6-895FF4909EC5}"
+	ProjectSection(ProjectDependencies) = postProject
+		{21B2C324-891F-48EA-AD1A-5AE13DE12E28} = {21B2C324-891F-48EA-AD1A-5AE13DE12E28}
+		{39379840-825A-45A0-B363-C09FFEF864BD} = {39379840-825A-45A0-B363-C09FFEF864BD}
+	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AssetsManagerTest", "samples\Cpp\AssetsManagerTest\proj.win32\AssetsManagerTest.vcxproj", "{6D37505F-A890-441D-BD3F-A61E2C0469CE}"
 EndProject

cocos2dx/CCScheduler.cpp

@@ -472,8 +472,8 @@ void CCScheduler::scheduleUpdateForTarget(CCObject *pTarget, int nPriority, bool
     if (nPriority == 0)
     {
         appendIn(&m_pUpdates0List, pTarget, bPaused);
-    } else
-    if (nPriority < 0)
+    }
+    else if (nPriority < 0)
     {
         priorityIn(&m_pUpdatesNegList, pTarget, nPriority, bPaused);
     }
@@ -785,18 +785,11 @@ void CCScheduler::update(float dt)
     // Iterate over all the Updates' selectors
     tListEntry *pEntry, *pTmp;
 
-    CCScriptEngineProtocol* pEngine = CCScriptEngineManager::sharedManager()->getScriptEngine();
-
     // updates with priority < 0
     DL_FOREACH_SAFE(m_pUpdatesNegList, pEntry, pTmp)
     {
         if ((! pEntry->paused) && (! pEntry->markedForDeletion))
         {
-            if (pEngine != NULL && kScriptTypeJavascript == pEngine->getScriptType())
-            {
-                pEngine->executeSchedule(0, dt, (CCNode *)pEntry->target);
-            }
-
             pEntry->target->update(dt);
         }
     }
@@ -806,11 +799,6 @@ void CCScheduler::update(float dt)
     {
         if ((! pEntry->paused) && (! pEntry->markedForDeletion))
         {
-            if (pEngine != NULL && kScriptTypeJavascript == pEngine->getScriptType())
-            {
-                pEngine->executeSchedule(0, dt, (CCNode *)pEntry->target);
-            }
-            
             pEntry->target->update(dt);
         }
     }
@@ -820,11 +808,6 @@ void CCScheduler::update(float dt)
     {
         if ((! pEntry->paused) && (! pEntry->markedForDeletion))
         {
-            if (pEngine != NULL && kScriptTypeJavascript == pEngine->getScriptType())
-            {
-                pEngine->executeSchedule(0, dt, (CCNode *)pEntry->target);
-            }
-
             pEntry->target->update(dt);
         }
     }

cocos2dx/base_nodes/CCNode.cpp

@@ -1105,7 +1105,7 @@ void CCNode::update(float fDelta)
 {
     if (m_nUpdateScriptHandler)
     {
-        CCScriptEngineManager::sharedManager()->getScriptEngine()->executeSchedule(m_nUpdateScriptHandler, fDelta);
+        CCScriptEngineManager::sharedManager()->getScriptEngine()->executeSchedule(m_nUpdateScriptHandler, fDelta, this);
     }
 }
 

cocos2dx/base_nodes/CCNode.h

@@ -125,7 +125,6 @@ enum {
 class CC_DLL CCNode : public CCObject
 {
 public:
-    //////////////////////////////
     /// @{
     /// @name Constructor, Distructor and Initializers
 
@@ -160,7 +159,6 @@ class CC_DLL CCNode : public CCObject
 
 
 
-    ///////////////////////////////////////////////////////
     /// @{
     /// @name Setters & Getters for Graphic Peroperties
 
@@ -549,7 +547,6 @@ class CC_DLL CCNode : public CCObject
     /// @}  end of Setters & Getters for Graphic Peroperties
 
 
-    ///////////////////////////////////////////////////////
     /// @{
     /// @name Children and Parent
 
@@ -705,7 +702,6 @@ class CC_DLL CCNode : public CCObject
 
 
 
-    ////////////////////////////////////
     /// @{
     /// @name Grid object for effects
 
@@ -725,7 +721,6 @@ class CC_DLL CCNode : public CCObject
     /// @} end of Grid
 
 
-    /////////////////////////////////////
     /// @{
     /// @name Tag & User data
 
@@ -814,7 +809,6 @@ class CC_DLL CCNode : public CCObject
     /// @} end of Tag & User Data
 
 
-    ///////////////////////////////
     /// @{
     /// @name Shader Program
     /**
@@ -837,8 +831,6 @@ class CC_DLL CCNode : public CCObject
     virtual void setShaderProgram(CCGLProgram *pShaderProgram);
     /// @} end of Shader Program
 
-    ///////////////////////////////////////
-    ///////////////////////////////////////
 
     /**
      * Returns a camera object that lets you move the node using a gluLookAt
@@ -863,7 +855,6 @@ class CC_DLL CCNode : public CCObject
     virtual bool isRunning();
 
 
-    /////////////////////////////////
     /// @{
     /// @name Script Bindings for lua
 
@@ -912,7 +903,6 @@ class CC_DLL CCNode : public CCObject
     /// @}  end Script Bindings
 
 
-    //////////////////////////
     /// @{
     /// @name Event Callbacks
 
@@ -981,7 +971,6 @@ class CC_DLL CCNode : public CCObject
      */
     CCRect boundingBox(void);
 
-    /////////////////////////////////////////
     /// @{
     /// @name Actions
 
@@ -1053,7 +1042,6 @@ class CC_DLL CCNode : public CCObject
     /// @} end of Actions
 
 
-    //////////////////
     /// @{
     /// @name Scheduler and Timer
 
@@ -1176,9 +1164,9 @@ class CC_DLL CCNode : public CCObject
      * Update method will be called automatically every frame if "scheduleUpdate" is called, and the node is "live"
      */
     virtual void update(float delta);
-    
 
-    ////////////////////////////
+    /// @} end of Scheduler and Timer
+
     /// @{
     /// @name Transformations
 
@@ -1226,7 +1214,6 @@ class CC_DLL CCNode : public CCObject
     /// @} end of Transformations
 
 
-    ///////////////////
     /// @{
     /// @name Coordinate Converters
 

cocos2dx/cocoa/CCSet.cpp

@@ -56,6 +56,18 @@ CCSet::~CCSet(void)
     CC_SAFE_DELETE(m_pSet);
 }
 
+CCSet * CCSet::create()
+{
+    CCSet * pRet = new CCSet();
+    
+    if (pRet != NULL)
+    {
+        pRet->autorelease();
+    }
+    
+    return pRet;
+}
+
 CCSet* CCSet::copy(void)
 {
     CCSet *pSet = new CCSet(*this);

cocos2dx/cocoa/CCSet.h

@@ -44,6 +44,11 @@ class CC_DLL CCSet : public CCObject
     CCSet(const CCSet &rSetObject);
     virtual ~CCSet(void);
 
+    /**
+    * @brief Create and return a new empty set.
+    */
+    static CCSet * create();
+
     /**
     *@brief Return a copy of the CCSet, it will copy all the elements.
     */