Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into iss2151-customttf

.travis.yml

@@ -14,9 +14,7 @@ env:
   # - GEN_JSB=YES
   - PLATFORM=linux DEBUG=1
   - PLATFORM=nacl DEBUG=1
-  - PLATFORM=android SAMPLE_LANG=Cpp APPNAME=HelloCpp
-  - PLATFORM=android SAMPLE_LANG=Javascript APPNAME=TestJavascript
-  - PLATFORM=android SAMPLE_LANG=Lua APPNAME=TestLua
+  - PLATFORM=android
 branches:
   only:
     - master

AUTHORS

@@ -411,6 +411,9 @@ Developers:
     Clarinexus
         Fixing a bug that setColor and setOpacity of CCControlButton and CCScale9Sprite are broken.
 
+    Xander84
+        Fixing a bug in CCBValue::getByteValue.
+
 Retired Core Developers:
     WenSheng Yang
         Author of windows port, CCTextField,

extensions/CCBReader/CCBValue.cpp

@@ -131,7 +131,7 @@ bool CCBValue::getBoolValue()
 
 unsigned char CCBValue::getByteValue()
 {
-    assert(mType = kUnsignedCharValue);
+    assert(mType == kUnsignedCharValue);
     
     return (unsigned char)(mValue.nValue);
 }

tools/travis-scripts/run-script.sh

@@ -13,9 +13,16 @@ if [ "$GEN_JSB"x = "YES"x ]; then
     ./generate-jsbindings.sh
 fi
 
-if [ "$PLATFORM"x = "android"x ]; then 
-    cd $COCOS2DX_ROOT/samples/$SAMPLE_LANG/$APPNAME/proj.android
+build_android()
+{
+    cd $COCOS2DX_ROOT/samples/$1/$2/proj.android
     ./build_native.sh
+}
+
+if [ "$PLATFORM"x = "android"x ]; then 
+    build_android Cpp HelloCpp
+    build_android Javascript TestJavascript
+    build_android Lua TestLua
 fi
 
 if [ "$PLATFORM"x = "nacl"x ]; then