# By carlo morgantini (28) and others
# Via minggo (6) and zhangbin (3)
* master: (40 commits)
Update AUTHORS
Update AUTHORS
fixed#2155 : Resolve the bug of callback methods in plugin.
Update AUTHORS
fix a warning caused by member variables initialization order in constructor
it now shares code between createTextBitmap and createTextBitmapShadowStroke (no more duplication)
initWithStringShadowStroke() renamed to initWithString()
comment fixed
fix alignent problem when rendering text with shadow
fix a problem with float stroke size
Fix problem with CCLabelTTF + shadow and text alignment; also fontDefinition property names now are lowercase
CCLabelTTF C++ test fixed
new "manual" conversion for ccFontDefinition in JS and also updated LabelTest.js using this new way of passing parameters to CCLabelTTF through ccFontDefinition
initWithStringAndTextDefinition() changed method's signature
no more bingins for ccTextDefinition
class renamed and moved to ccTypes.h
CCTextDefinition is passed now by pointers
bindings for CCTextDefinition
ccTextDefinition becomes CCTextDefinition
changed the label test (shadows + stroke) for using ccTextDefinition when creating CCLabelTTF
...
# By James Chen (23) and others
# Via James Chen (19) and others
* master: (57 commits)
Update AUTHORS [ci skip]
fixed#2151: Commenting a log in CCFileUtils::fullPathForFilename.
Update AUTHORS [ci skip].
fixed#2105: Refactoring travis build script.
Assert statement modifies 'mType'.
fixed#2151: Custom font can't be loaded correctly if using full path of filename.
fixed#2150: Updating AUTHORS.
fixed#2150: Adding tests for this issue and fix compilation error of CCScale9Sprite.
fixed#2150: Updating ccb and ccbi files.
Update AUTHORS
fixed#2105: Updating the URL of 'Building Status' for travis.
fixed#2105: Adding Travis build support. Moving script to 'tools/travis-script'.
fixed#2149: "const CCSize& CCScrollView::getContentSize()" --> "const CCSize& CCScrollView::getContentSize() const".
Update AUTHORS
Update AUTHORS
Update AUTHORS
issue #2103 Add more lua test case(Replace encoding error)
Added const to CCNode::getChildrenCount()
Fix for wrong alignment using texture format sizes other than 4 bytes. For example RGBA4444 is 2 bytes per pixel. A texture with width of 1 passes the previous power of 2 test, but the alignment value needs to be 2, not 4.
issue #2103 Add more lua test case(Add PerformanceSpriteTest of PerformanceTest)
...
Merge branch 'curl_raii' of https://github.com/sergey-shambir/cocos2d-x into sergey-shambir-curl_raii
Conflicts:
extensions/network/HttpClient.cpp
samples/Cpp/TestCpp/Classes/ExtensionsTest/NetworkTest/HttpClientTest.cpp
flamingo