Merge pull request cocos2d#6 from cocos2d/develop

sync original repo

Author: zilongshanren

AUTHORS

@@ -668,6 +668,7 @@ Developers:
 
     zhiqiangxu
         Fixed a logic error in ControlUtils::RectUnion.
+        Fixed an issue that there is an useless conversion in ScrollView::onTouchBegan.
 
     yinkaile (2youyouo2)
         Maintainer of Armature Bone Animation.
@@ -688,6 +689,9 @@ Developers:
     SBKarr
         AngelCode binary file format support for LabelBMFont.
 
+    zarelaky
+        OpenAL context isn't destroyed correctly on mac and ios.
+        
 Retired Core Developers:
     WenSheng Yang
         Author of windows port, CCTextField,

CHANGELOG

@@ -19,6 +19,8 @@ cocos2d-x-3.0beta0 ?? 2013
      [FIX]          Sprites with PhysicsBody move to a wrong position when game resume from background.
      [FIX]          Crash if connection breaks during download using AssetManager.
      [NEW]          AngelCode binary file format support for LabelBMFont.
+     [FIX]          OpenAL context isn't destroyed correctly on mac and ios.
+     [FIX]          Useless conversion in ScrollView::onTouchBegan.
 [Android]
      [NEW]          build/android-build.sh: add supporting to generate .apk file
      [FIX]          XMLHttpRequest receives wrong binary array.

CMakeLists.txt

@@ -284,4 +284,19 @@ add_subdirectory(cocos/scripting)
 endif(BUILD_LIBS_LUA)
 
 # build samples
-add_subdirectory(samples)
+if(BUILD_HelloCpp)
+add_subdirectory(samples/Cpp/HelloCpp)
+endif(BUILD_HelloCpp)
+
+if(BUILD_TestCpp)
+add_subdirectory(samples/Cpp/TestCpp)
+endif(BUILD_TestCpp)
+
+if(BUILD_HelloLua)
+add_subdirectory(samples/Lua/HelloLua)
+endif(BUILD_HelloLua)
+
+if(BUILD_TestLua)
+add_subdirectory(samples/Lua/TestLua)
+endif(BUILD_TestLua)
+

README.md

@@ -30,8 +30,8 @@ How to start a new game
 Example:
 
     $ cd cocos2d-x/tools/project-creator
-    $ ./create-multi-platform-projects.py -p mygame -k com.your_company.mygame -l cpp
-    $ cd ../../projects/mygame
+    $ ./project-creator.pyw -n mygame -k com.your_company.mygame -l cpp -p /home/mygame
+    $ cd /home/mygame
 
 
 Main features

build/cocos2d_libs.xcodeproj/project.pbxproj.REMOVED.git-id

@@ -1 +1 @@
-812ab716d10a52b752f0d15b2393b2b0a7c8e969
+4b92c964454c54c1b5df9576f11365c53e253724

cocos/2d/CCDeprecated.h

@@ -545,7 +545,8 @@ CC_DEPRECATED_ATTRIBUTE typedef IMEDelegate CCIMEDelegate;
 CC_DEPRECATED_ATTRIBUTE typedef IMEKeyboardNotificationInfo CCIMEKeyboardNotificationInfo;
 CC_DEPRECATED_ATTRIBUTE typedef TextFieldDelegate CCTextFieldDelegate;
 CC_DEPRECATED_ATTRIBUTE typedef TextFieldTTF CCTextFieldTTF;
-CC_DEPRECATED_ATTRIBUTE typedef NotificationCenter CCNotificationCenter;
+CC_DEPRECATED_ATTRIBUTE typedef __NotificationCenter CCNotificationCenter;
+CC_DEPRECATED_ATTRIBUTE typedef __NotificationCenter NotificationCenter;
 //CC_DEPRECATED_ATTRIBUTE typedef TargetedTouchDelegate CCTargetedTouchDelegate;
 //CC_DEPRECATED_ATTRIBUTE typedef StandardTouchDelegate CCStandardTouchDelegate;
 //CC_DEPRECATED_ATTRIBUTE typedef TouchDelegate CCTouchDelegate;

cocos/2d/CCDirector.cpp

@@ -37,7 +37,6 @@ THE SOFTWARE.
 #include "CCArray.h"
 #include "CCScheduler.h"
 #include "ccMacros.h"
-#include "CCNotificationCenter.h"
 #include "CCTransition.h"
 #include "CCTextureCache.h"
 #include "CCSpriteFrameCache.h"
@@ -768,7 +767,6 @@ void Director::purgeDirector()
 
     // cocos2d-x specific data structures
     UserDefault::destroyInstance();
-    NotificationCenter::destroyInstance();
 
     GL::invalidateStateCache();
 

cocos/2d/CCDrawNode.cpp

@@ -23,12 +23,13 @@
 #include "CCDrawNode.h"
 #include "CCShaderCache.h"
 #include "CCGL.h"
-#include "CCNotificationCenter.h"
 #include "CCEventType.h"
 #include "CCConfiguration.h"
 #include "CCCustomCommand.h"
 #include "CCDirector.h"
 #include "CCRenderer.h"
+#include "CCEventListenerCustom.h"
+#include "CCEventDispatcher.h"
 
 NS_CC_BEGIN
 
@@ -124,10 +125,6 @@ DrawNode::~DrawNode()
         GL::bindVAO(0);
         _vao = 0;
     }
-    
-#if CC_ENABLE_CACHE_TEXTURE_DATA
-    NotificationCenter::getInstance()->removeObserver(this, EVNET_COME_TO_FOREGROUND);
-#endif
 }
 
 DrawNode* DrawNode::create()
@@ -196,10 +193,12 @@ bool DrawNode::init()
 
 #if CC_ENABLE_CACHE_TEXTURE_DATA
     // Need to listen the event only when not use batchnode, because it will use VBO
-    NotificationCenter::getInstance()->addObserver(this,
-                                                   callfuncO_selector(DrawNode::listenBackToForeground),
-                                                   EVNET_COME_TO_FOREGROUND,
-                                                   nullptr);
+    auto listener = EventListenerCustom::create(EVENT_COME_TO_FOREGROUND, [this](EventCustom* event){
+    /** listen the event that coming to foreground on Android */
+        this->init();
+    });
+
+    _eventDispatcher->addEventListenerWithSceneGraphPriority(listener, this);
 #endif
 
     return true;
@@ -472,11 +471,4 @@ void DrawNode::setBlendFunc(const BlendFunc &blendFunc)
     _blendFunc = blendFunc;
 }
 
-/** listen the event that coming to foreground on Android
- */
-void DrawNode::listenBackToForeground(Object *obj)
-{
-    init();
-}
-
 NS_CC_END

cocos/2d/CCDrawNode.h

@@ -78,12 +78,6 @@ class CC_DLL DrawNode : public Node
     * @lua NA
     */
     void setBlendFunc(const BlendFunc &blendFunc);
-    
-    /** listen the event that coming to foreground on Android
-    * @js NA
-    * @lua NA
-    */
-    void listenBackToForeground(Object *obj);
 
     void onDraw();
 

cocos/2d/CCEventType.h

@@ -9,7 +9,7 @@
 // The application will come to foreground.
 // This message is used for reloading resources before come to foreground on Android.
 // This message is posted in main.cpp.
-#define EVNET_COME_TO_FOREGROUND    "event_come_to_foreground"
+#define EVENT_COME_TO_FOREGROUND    "event_come_to_foreground"
 
 // The application will come to background.
 // This message is used for doing something before coming to background, such as save RenderTexture.