Merge pull request cocos2d#4 from cocos2d/master

Merge from the latest version of cocos2d

Author: sunzhuoshi

.gitignore

@@ -87,3 +87,6 @@ tools/tojs/user.cfg
 tools/tojs/userconf.ini
 # ... userconf.ini generated if running from tools/jenkins_scripts/mac/android/
 tools/jenkins_scripts/mac/android/userconf.ini
+
+# CTags
+tags

.gitmodules

@@ -10,3 +10,6 @@
 [submodule "external/emscripten"]
 	path = external/emscripten
 	url = https://github.com/kripken/emscripten.git
+[submodule "tools/cocos2d-console"]
+	path = tools/cocos2d-console
+	url = https://github.com/cocos2d/cocos2d-console.git

.travis.yml

@@ -1,17 +1,31 @@
+--- 
 language: cpp
-script:
- - export NACL_SDK_ROOT=$PWD/nacl_sdk/pepper_canary
- - export PATH=$PATH:$NACL_SDK_ROOT/toolchain/linux_x86_newlib/bin
- - make -j4
-install:
- - "if [ \"$PLATFORM\" != nacl ]; then ./install-deps-linux.sh; fi"
- - "if [ \"$PLATFORM\" = nacl ]; then sudo apt-get update; fi"
- - "if [ \"$PLATFORM\" = nacl ]; then sudo apt-get install libc6:i386; fi"
- - "if [ \"$PLATFORM\" = nacl ]; then wget http://storage.googleapis.com/nativeclient-mirror/nacl/nacl_sdk/nacl_sdk.zip; fi"
- - "if [ \"$PLATFORM\" = nacl ]; then unzip nacl_sdk.zip; fi"
- - "if [ \"$PLATFORM\" = nacl ]; then nacl_sdk/naclsdk update --force pepper_canary; fi"
-env:
- - PLATFORM=nacl DEBUG=1
- - PLATFORM=nacl DEBUG=0
- - PLATFORM=linux DEBUG=1
- - PLATFORM=linux DEBUG=0
+env: 
+  matrix: 
+  - GEN_JSB=YES
+  - PLATFORM=linux DEBUG=1
+  - PLATFORM=nacl DEBUG=1
+  - PLATFORM=android
+  - PLATFORM=emscripten DEBUG=1
+  global: 
+  - secure: |-
+      cHXOjAda+t2tmBVuVAiQfvhDN+unToO6hX1rc3dJeGDOk4rlQnylJacjA7o/
+      enkWeHagbW2Ja4h7BxQz4h7dada8zEbIbEMK4VEHx6AWwQM+GIEqkJPv5g8k
+      4P20MLpX4XyUwm/16btpnqgXlyd8Q3Zjh3Vui/5/VzwPnxUQEho=
+  - secure: |-
+      U/JsyiSR9q+8wX1arfciy3BdbMQaKmgt48/9tiU7P2RQJ/FR2AHGq85sNGI/
+      ZUxN4JPLGALEvkFMo4NYyJDUcsdRHZX3vbp5xbSSRaBigqJIj3HDxtlPVf2m
+      /W2GzcfNNX1ACO18hSWH0d2yFlF263ZmvudzQIfqTESfjGQBzwA=
+  - secure: |-
+      Wsngwo3jlZtvuPfr3RNhqrz/liNIhKYnlw4KYJO90gMQ9ZQKRTlMv2BMiPw/
+      9lV+vgJQDRcFe7dKwtC86vk10EU7Ym2bhVmhMxi/AlmJXgavjmPVdizRT7rh
+      X2Ry/Nb6hGRkH3WS0T3D/KG1+e7lP/TMB9bvo6/locLJ2A6Z1YI=
+script: 
+- export NACL_SDK_ROOT=$HOME/bin/nacl_sdk/pepper_canary
+- export PATH=$PATH:$NACL_SDK_ROOT/toolchain/linux_x86_newlib/bin
+- export NDK_ROOT=$HOME/bin/android-ndk
+- ./tools/travis-scripts/run-script.sh
+
+before_install: 
+- ./tools/travis-scripts/before-install.sh
+

AUTHORS

@@ -11,6 +11,24 @@ Developers:
     Ricardo Quesada
     Rolando Abarca
         Javascript Binding and testjs
+        
+    carlomorgantinizynga
+        CCLabelTTF supports for shadow and stroke
+        Adding CCLabelTTF::createWithFontDefinition.
+        
+    James Gregory (j4m3z0r, Zynga)
+        Maintainer of Emscripten port.
+        Initial Emscripten port.
+        Use browser font rendering instead of FreeType.
+        
+    DarraghCoy
+        Fix a potential crash SimpleAudioEngineOpenSL::playEffect
+
+    silverscania
+        Pass correct parameter to glPixelStorei when creating a texture
+
+    FlagellumDei
+        Center the window correctly on windows
 
     ggggamer
         fixed memory leak of preloadEffect on windows
@@ -39,6 +57,7 @@ Developers:
 
     martell
         use tinyxml2 to replace libxml2
+        Added Mingw-crt Support without breaking VS SDK
 
     mchinen
         fix emulator issue for OpenGL ES 2.0 on Android
@@ -62,6 +81,7 @@ Developers:
         Fix CCUserDefault.cpp compiling on Android.
         Fixing CCFileUtils 'createXXXXWithContentsOfFile' path lookup issue.
         Add CCDirector::popToSceneStackLevel(int level).
+        Fixing a bug that custom font can't be loaded correctly if using full path of filename on android.
 
     Waiter
         fix an error that OpenSLEngine can't load resources from SD card
@@ -115,6 +135,8 @@ Developers:
          CCTableView crashes if a CCTableViewDelegate is not provided.
          Fixing a bug that _realOpacity isn't assigned in CCLayerColor::initWithColor.
          CCScrollView TouchPriority Fix
+         Add encrypted PVR.CCZ support to ZipUtils + Tests
+         Fix for broken of ccArrayGetIndexOfObject after merging this commit(076f38c).
 
     Weeds (Andre Rudlaff)
         Used fontconfig to enhance font rendering on linux.
@@ -149,12 +171,15 @@ Developers:
         contribute for Android module building
         Simpler, correct handling of spritesheet sources for CCScale9Sprite.
         Clean up linked libraries for android.
+        JavaScript debugger improved and bugfixed.
+        Fix flags for debugger server socket.
 
     Nicolas Gramlich (nicolasgramlich, Zynga)
         fixed CCDirector to use CCLabelBMFont instead of CCLabelTTF
         added CCBReader (CCBI format)
         Added cleanup and reset methods to ScriptingCore.
         Fixed a bug in ScriptingCore::evalString not setting the outval.
+        Updated .classpath of Android project to latest ADT 22 build tool compatibility.
 
     Rohan Kuruvilla (rohankuruvilla, Zynga)
         Improvements to JS Bindings.
@@ -273,6 +298,7 @@ Developers:
     xyhl515
         Fixed a bug that CCControlSwitch::setOn(isOn,false) doesn't work.
         Adds VS2012 Express template installing support.
+        Fixing a logical error in CCDrawNode::drawPolygon.
 
     DarraghCoy
         Fix for unaligned memory access crash in CCBReader::readFloat().
@@ -305,12 +331,15 @@ Developers:
         Fixing a bug that CCPhysicsSprite was overriding only some of the getPosition methods.
         Adding a macro USE_BOX2D to check whether to enable Box2D for linux and nacl port.
         Adding Travis build support for linux and NaCl.
+        Logging assert messages to the console.
+        Renaming CCScriptSupport::executeAssert to CCScriptSupport::handleAssert.
 
     Peter Young (young40)
         Implements setVisible() for CCEditBox
 
     csy1988525
         Fixing a bug about display result is wrong when invoking CCControlButton:: setHighlighted.
+        fixed a bug when button's parent is hided, the button still can responce to clicked event.
 
     Asad ur Rehman (AsadR)
         Adding CCNotificationCenter::removeAllObservers(CCObject *target).
@@ -327,6 +356,7 @@ Developers:
 
     flamingo (flaming0)
         Null pointer check in order to prevent crashes.
+        Updating spine-runtime to EsotericSoftware/spine-runtimes@5f90386.
 
     rtissera (Romain TISSERAND)
         Adding missing JNIEXPORT / JNICALL declarations.
@@ -369,6 +399,7 @@ Developers:
 
     jotel (Jaroslaw Lewandowski)
         Fixing a bug that wrong type of argument signature is used in setAccelerometerIntervalJNI function.
+        Fix for broken of ccArrayGetIndexOfObject after merging this commit(076f38c).
 
     MarcelBloemendaal
         Adding secureTextEntry property to CCTextFieldTTF.
@@ -384,12 +415,44 @@ Developers:
     ptekchand (Pranav Tekchand)
         Supporting negative node scales for CCScrollView.
 
-    James Gregory (j4m3z0r, Zynga)
-        Initial Emscripten port.
-
     coolengineer (Hojin Choi)
         Refactoring callback selector for HttpResponse.
 
+    djh-
+        Fixing a bug that displayed color of CCDrawNode is incorrect when VAO is disabled.
+
+    acai (beingstudio)
+        Fix of null pointer access in CCBAnimationManager::getRunningSequenceName.
+
+    metalgit92
+        Adding const qualification to some CCNode's getters
+
+    Clarinexus
+        Fixing a bug that setColor and setOpacity of CCControlButton and CCScale9Sprite are broken.
+
+    Xander84
+        Fixing a bug in CCBValue::getByteValue.
+        
+    smshuja
+        Fixing a bug that pointQueryFirst returns invalid Shape when a shape is not found in JSB.
+        Fixing a bug that New PivotJoint can't access 4 parameters like in html5 version.
+        
+    Carsten Sandtner (casarock)
+        Adding XMLHttpRequest support for JSB.
+        
+    Lee, Jae-Hong (pyrasis)
+        Maintainer of tizen port.
+
+    lumendes
+        Updating spine-runtime to EsotericSoftware/spine-runtimes@5f90386.
+        
+    sunxiaoyu
+        Refactoring CCEditBox to add UITextField only when keyboard was opened, remove it when keyboard was closed.
+        
+    edwardzhou (Edward Zhou)
+        Correcting the type detecting order for Lua CCBProxy::getNodeTypeName.
+        Casting variables to their own type, and print warning info if no corresponding lua callback function instead of crash.
+
 Retired Core Developers:
     WenSheng Yang
         Author of windows port, CCTextField,

CHANGELOG

@@ -1,3 +1,84 @@
+2.1rc0-x-2.1.4 @Jnue.12 2013
+[all platforms]
+     Bug      #2098: fix TouchPriority issue of CCScrollView
+     Bug      #2107: fix crash in HttpClient request on 64Bit
+     Bug      #2115: fix linking errors for TestCPP with libcurl
+     Bug      #2128: remove setting ignoreAnchorPoint for child CCB files and fix crash while trying to load sprite frame when the file is missing
+     Bug      #2140: fix a bug that the displayed color of CCDrawNode is incorrect when VAO is disabled
+     Bug      #2142: adding CCDataVisitor and implementing CCPrettyPrinter
+     Bug      #2143: fix a crash caused by ScrollView.setDelegate(tmp function)
+     Bug      #2146: unpack texture data correctly
+     Bug      #2147: fix null pointer access in CCBAnimationManager::getRunningSequenceName()
+     Bug      #2150: fix a bug that setColor and setOpacity of CCControlButton and CCScale9Sprite are broken
+     Bug      #2251: fix a logical error in CCDrawNode::drawPolygon()
+     Bug      #2271: fix memory leak as possible
+     Feature  #1859: make AssetsManager download resources in a new thread
+     Feature  #2086: make CCLabelTTF supports shadows and stroke
+     Feature  #2100: add CCDirector::popToSceneStackLevel(int level)
+     Feature  #2105: add Travis build support
+     Feature  #2108: add example for russian language in TestCpp
+     Feature  #2111: add CC_DISABLE_COPY macro
+     Feature  #2114: add __attribute__(__format__()) for CCLog and CCString
+     Feature  #2116: support negative node scales for CCScrollView
+     Feature  #2117: implement CCDictionary::writeToFile()
+     Feature  #2122: add method to create a CCMenuItemToggle from a CCArray with a target selector
+     Feature  #2132: add encrypted PVR.CCZ support to ZipUtils + Tests
+     Feature  #2157: add Mingw-crt Support without breaking VS SDK
+     Feature  #2265: add CCLabelTTF::createWithFontDefinition()
+     Feature  #2270: add Armature(CocoStudio runtime) support
+     Refactor #2109: add const modifier for classes CCArray, CCObject
+     Refactor #2118: move ccpX functions to CCPoint methods and operators
+     Refactor #2119: use httpresponse_selector instead of callfuncND_selector for the callback function of CCHttpRequest
+     Refactor #2123: refactor network extension, fixing unlikely memory leaks, adding PUT/DELETE methods
+     Refactor #2127: add CCLOG before original path is returned in CCFileUtils::fullPathForFileName to aid in debugging
+     Refactor #2149: add const qualification to some CCNode's getters
+     Refactor #2189: CCLabelTTF::enableShadow() const update
+     Refactor #2215: refactor CCConfiguration
+     Refactor #2217: use CCLabelAtlas instead of CCLabelTTF to show FPS
+     Refactor #2231: implement a format of CCConfiguration
+     Refactor #2233: add support for "CCString" types for boolean and integers in CCConfiguration
+     Refactor #2236: fix memory hot spot of CCTextureAtlas::updateQuad()
+[android]
+     Bug      #1284: fix a bug that SimpleAudioEngine may cause crash on i9100
+     Bug      #2151: fix custom font loading on Android for resource mapped font files
+     Bug      #2190: updat .classpath of Android project to latest ADT 22 build tool compatibility
+     Bug      #2266: fix a bug that CCFileUtils::getFileData() may not get file data correctly on Android
+     Feature  #2161: add ETC1 image format
+[iOS]
+     Bug      #2102: fix missing protocol method warning for iOS 6.0 addition
+     Bug      #2104: fix a bug that JPEG picture not displayed correctly on iOS 4.3
+     Bug      #2260: fix a bug that CCDirectory::createWithContentsOfFile() returns a valid pointer though the file is missing on iOS
+     Refactor #2101: update cocos2dx Xcode project to detect more warnings
+     Refactor #2253: add UITextField only when keyboard was opened, removing it when keyboard was closed
+[mac]
+     Bug      #2249: fix linebreaks on Mac OSX
+[win32]
+     Bug      #2131: fix memory leak of SimpleAudioEngine::preloadEffect()
+     Bug      #2145: center the window correctly on windows
+[emscripten]
+     Feature  #2120: compile c++ to js
+     Bug      #2159: use browser font rendering instead of FreeType
+     Refactor #2133: compile for Emscripten in asm.js mode
+     Document #2121: write a document to describe the usage of emscriptenate port
+[tizen]
+     Feature  #2185: add support for Tizen
+[javascript binding]
+     Bug      #2099: fix a bug in ScriptingCore::evalString() not setting the outval
+     Bug      #2179: fix a bug that pointQueryFirst returns invalid Shape when a shape is not found
+     Bug      #2186: fix a bug that new PivotJoint can't access 4 parameters like in html5 version
+     Bug      #2187: JavaScript debugger improved and bug fixed
+     Bug      #2243: fix a bug that XMLHttpRequest dones't support non-ascii characters
+     Bug      #2244: fix a bug that cc.Camera.getEyeXYZ, cc.Camera.getCenterXYZ, cc.Camera.getUpXYZ return bad values
+     Feature  #1647: Bind websocket to javascript
+     Feature  #2092: add XMLHttpRequest and bind it to JSB
+     Feature  #2106: add support for javascript byte code
+     Feature  #2162: add command line tool for generating javascript bytecode
+     Feature  #2214: upgrade Spidermonkey to Firefox v21
+     Refactor #2152: log assert messages to the console and renaming CCScriptSupport::executeAssert to CCScriptSupport::handleAssert
+     Refactor #2247: use functions instead of macros to speeding up building for JSB project
+[lua binding]
+     Feature  #2103: implement most test cases
+
 cocos2d-2.1rc0-x-2.1.3 @May.01 2013
 [all platforms]
      Bug      #1853: use SHELLOPTS instead of "-o igncr" for Android Eclipse project

CocosDenshion/android/opensl/OpenSLEngine.cpp

@@ -289,7 +289,8 @@ bool initAudioPlayer(AudioPlayer* player, const char* filename)
 		if(fp){
 			SLDataLocator_URI loc_fd = {SL_DATALOCATOR_URI , (SLchar*)filename};
 			SLDataFormat_MIME format_mime = {SL_DATAFORMAT_MIME, NULL, SL_CONTAINERTYPE_UNSPECIFIED};
-			(player->audioSrc) = {&loc_fd, &format_mime};
+			player->audioSrc.pLocator = &loc_fd;
+			player->audioSrc.pFormat = &format_mime;
 			return createAudioPlayerBySource(player);
 		}
 		LOGD("file not found! Stop preload file: %s", filename);

CocosDenshion/android/opensl/SimpleAudioEngineOpenSL.cpp

@@ -88,24 +88,25 @@ void SimpleAudioEngineOpenSL::setEffectsVolume(float volume)
 
 unsigned int SimpleAudioEngineOpenSL::playEffect(const char* pszFilePath, bool bLoop)
 {
-	unsigned int soundID;
-	do 
-	{
-		soundID = s_pOpenSL->preloadEffect(pszFilePath);
-		if (soundID != FILE_NOT_FOUND)
-		{
-			if (s_pOpenSL->getEffectState(soundID) == PLAYSTATE_PLAYING)
-			{
-				// recreate an effect player
-				s_pOpenSL->recreatePlayer(pszFilePath);
-				break;
-			}
-			s_pOpenSL->setEffectState(soundID, PLAYSTATE_STOPPED);
-			s_pOpenSL->setEffectState(soundID, PLAYSTATE_PLAYING);
-		}
-	} while (0);
-	s_pOpenSL->setEffectLooping(soundID, bLoop);
-	return soundID;
+    unsigned int soundID = s_pOpenSL->preloadEffect(pszFilePath);
+
+    if (soundID != FILE_NOT_FOUND)
+    {
+        if (s_pOpenSL->getEffectState(soundID) == PLAYSTATE_PLAYING)
+        {
+            // recreate an effect player
+            s_pOpenSL->recreatePlayer(pszFilePath);
+        }
+        else
+        {
+            s_pOpenSL->setEffectState(soundID, PLAYSTATE_STOPPED);
+            s_pOpenSL->setEffectState(soundID, PLAYSTATE_PLAYING);
+        }
+
+        s_pOpenSL->setEffectLooping(soundID, bLoop);
+    }
+
+    return soundID;
 }
 
 void SimpleAudioEngineOpenSL::pauseEffect(unsigned int nSoundId)