Merge pull request cocos2d#12 from cocos2d/develop

update coco2d-x

Author: chuanweizhang2013

.gitignore

@@ -60,7 +60,6 @@ build_*_vc10/
 *.mode*v*
 *.pbxuser
 *.xcbkptlist
-*.xcscheme
 *.xcworkspacedata
 *.xcuserstate
 *.xccheckout
@@ -105,3 +104,8 @@ tags
 /lib
 /build/linux-build
 
+# Cmake files
+CMakeCache.txt
+CMakeFiles
+Makefile
+cmake_install.cmake

.gitmodules

@@ -4,12 +4,12 @@
 [submodule "cocos/scripting/auto-generated"]
 	path = cocos/scripting/auto-generated
 	url = git://github.com/cocos2d-x/bindings-auto-generated.git
-[submodule "samples/Javascript/Shared"]
-	path = samples/Javascript/Shared
-	url = git://github.com/cocos2d/cocos2d-js-tests.git
 [submodule "tools/cocos2d-console"]
 	path = tools/cocos2d-console
 	url = git://github.com/cocos2d/cocos2d-console.git
 [submodule "plugin"]
 	path = plugin
 	url = https://github.com/cocos2d-x/plugin-x.git
+[submodule "tests/test-javascript/tests"]
+	path = tests/test-javascript/tests
+	url = git://github.com/cocos2d/cocos2d-js-tests.git

.travis.yml

@@ -1,8 +1,9 @@
 language: cpp
 env:
   matrix:
-  - GEN_JSB=YES
-  - PLATFORM=linux DEBUG=1
+  - GEN_COCOS_FILES=YES
+  - PLATFORM=linux DEBUG=1 CC_COMPILER=gcc CXX_COMPILER=g++
+  - PLATFORM=linux DEBUG=1 CC_COMPILER=clang CXX_COMPILER=clang++
   # Since switching to C++11 only the ARM version of the nactive client
   # port currently builds.  TODO(sbc): Re-enable all architectures.
   # Disabled travis-ci build for native client port since it doesn't support std::thread, std::mutex.
@@ -23,6 +24,8 @@ env:
       9lV+vgJQDRcFe7dKwtC86vk10EU7Ym2bhVmhMxi/AlmJXgavjmPVdizRT7rh
       X2Ry/Nb6hGRkH3WS0T3D/KG1+e7lP/TMB9bvo6/locLJ2A6Z1YI=
 script:
+- export CC=$CC_COMPILER
+- export CXX=$CXX_COMPILER
 - tools/travis-scripts/run-script.sh
 before_install:
 - tools/travis-scripts/before-install.sh

AUTHORS

@@ -94,6 +94,9 @@ Developers:
         use tinyxml2 to replace libxml2
         Added Mingw-crt Support without breaking VS SDK
         CMake support for windows.
+        Added support for x64 target of windows.
+        Added Dutch Language support.
+        Added clang support for Windows.
 
     mchinen
         fix emulator issue for OpenGL ES 2.0 on Android
@@ -356,6 +359,7 @@ Developers:
 
     ThePickleMan
         Adding 'rotationIsDir' property to ParticleSystem.
+        DrawNode supports to draw triangle, quad bezier, cubic bezier.
 
     Jianghua (jxhgzs)
         Adding an additional transform for CCNode.
@@ -402,6 +406,7 @@ Developers:
     Zecken (gelldur)
         Fixing a profiling compilation error in CCParticleBatchNode.
         Fixing linking errors for TestCPP with libcurl on linux.
+        Fixing a bug that crash was triggered if there is not `textureFileName`section in particle plist file.
 
     flamingo (flaming0)
         Null pointer check in order to prevent crashes.
@@ -428,9 +433,12 @@ Developers:
         Use of a single emscripten HTML template file.
         Added some guards in fileutils. Fixed a bug in emscripten file utils.
         Added emscripten keyboard support
-        Clang support for Linux
+        Clang support for Linux.
         Multiple emscripten template support. Emscripten multiple resolutions support.
-        Toplevel Makefile refactoring
+        Toplevel Makefile refactoring.
+        Ignored files generated by cmake.
+        Added GLFW include path for Fedora.
+        Linux javascript bindings support.
 
     elmiro
         Correction of passed buffer size to readlink and verification of result return by readlink.
@@ -507,6 +515,8 @@ Developers:
 
     Lee, Jae-Hong (pyrasis)
         Maintainer of tizen port.
+        localStorageGetItem crashes when column text is NULL.
+        fix image bug on Android
 
     lumendes
         Updating spine-runtime to EsotericSoftware/spine-runtimes@5f90386.
@@ -518,6 +528,7 @@ Developers:
         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.
         fix of WebSocket url parse error for 'ws://domain.com/websocket' pattern.
+        Fixed a bug that Websocket doesn't support send/receive data which larger than 4096 bytes.
 
     musikov
         Fixing a bug that missing precision when getting strokeColor and fontFillColor
@@ -599,9 +610,11 @@ Developers:
         Makes Colors are now comparable and explicit convertible
 
     bmanGH
-        Use gl caching functions in TexturePVR::createGLTexture()
+        Used gl caching functions in TexturePVR::createGLTexture()
         Configuration of VAO in runtime
-        Add setUniformLocationWithMatrix2fv, setUniformLocationWithMatrix3fv mothed into GLProgram class
+        Added setUniformLocationWithMatrix2fv, setUniformLocationWithMatrix3fv mothed into GLProgram class
+        Fixed a bug that object which isn't in Vector would also be released when invoking Vector::eraseObject.
+        Fixed a bug that Timer::cancel always call Director::getInstance()->getScheduler() even in another Scheduler.
 
     metadao
         make create_project.py more pythonic and fix some typoes
@@ -635,7 +648,8 @@ Developers:
         Fixed a bug that CCBReader can't play sequence automatically in JSB.
         Could not set next animation in CCBAnimationCompleted callback.
         Fixed missing to add JSAutoCompartment when invoking JS functions from C++.
-        CCBReader: To set anchor point to 0,0 when created by loader
+        CCBReader: To set anchor point to 0,0 when created by loader.
+        Potential crash when websocket connection closes.
 
     lite3
         Fixed a bug that Node's anchor point was changed after being added to ScrollView.
@@ -656,6 +670,7 @@ Developers:
 
     xhcnb
         Device::setAccelerometerEnabled needs to be invoked before adding ACC listener.
+        Fixed a bug that it will get wrong custom properties when use different count custom properties in CocosBuilder.
 
     bopohaa
         Fixed a bug that Webp test crashes.
@@ -669,6 +684,8 @@ Developers:
     zhiqiangxu
         Fixed a logic error in ControlUtils::RectUnion.
         Fixed an issue that there is an useless conversion in ScrollView::onTouchBegan.
+        Deleted several lines of useless code in ScrollView::deaccelerateScrolling.
+        Fixed that ScrollView should implement ActionTweenDelegate.
 
     yinkaile (2youyouo2)
         Maintainer of Armature Bone Animation.
@@ -703,6 +720,63 @@ Developers:
     daltomi
         Fixed a typo in Director class.
         Removed an unnecessary boolean flag in CCFontAtlasCache.cpp.
+        Used 'cbegin/cend', 'const std::string' where it's reasonable.
+        
+    v1ctor
+        ControlSlider supports to set selected thumb sprite.
+        ControlButton supports to set scale ratio of touchdown state
+        
+    akof1314
+        TestCpp works by using CMake and mingw on Windows.
+        
+    Pisces000221
+        Corrected a few mistakes in the README file of project-creator.
+        Corrected a mistake in README.
+        Fixed a bug that a string which only contains CJK characters can't make a line-break when it's needed.
+        
+    hbbalfred
+        Fixed a bug that crash if file doesn't exist when using FileUtils::getStringFromFile.
+        Fixed a bug that cc.BuilderReader.load( path, null, parentSize ); was not allowed.
+        
+    liang8305
+        Use multiple processes according the number of cores to build android project
+        
+    pandamicro
+        Exposed SAXParser to JS, it is used for parsing XML in JS.
+        
+    hanjukim
+        Fixed a bug that color and opacity settings were not applied when invoking Label::alignText.
+        
+    bagobor
+        Fixed a memory leak in AssetsManager::uncompress.
+        Code format fix and small optimizations in cocostudio/CCActionNode.cpp.
+        
+    ucchen
+        Exposed the missing data structures of Spine to JS.
+        
+    justmao945
+        Corrected the definition of CMake variables.
+        
+    maksqwe
+        Fixed string size check in BitmapDC::utf8ToUtf16 on win32 and assert condition in TriggerMng.
+        
+    wefiends
+        s3tc compressed textures with no mipmaps fail to be loaded.
+        
+    floatinghotpot
+        Fixed a bug that no callback is invoked when websocket connection fails
+        
+    Linghui
+        Updated README of template: fix wrong platform java path.
+        
+    seemk
+        Fixed crash if invoking Director::end() on WINDOWS.
+        
+    odedsh
+        Fixed a bug that loading custom fonts from ttf file fails on windows.
+        
+    Wilhansen
+        Fixed a bug that spine::Skeleton would not be updated after re-adding to scene.
 
 Retired Core Developers:
     WenSheng Yang