Merge develop to master #1145
Merged
Merge develop to master #1145
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…to optimizeForMobileBrowser
…ardinalSplineBy
…resolutionPolicy of EGLView is NOBORDER
…Browser fixed cocos2d#2452:Optimize for mobile browser
fixed cocos2d#2454 Fixed a bug of EditBox that position is wrong when _resolutionPolicy of EGLView is NOBORDER
Conflicts: cocos2d/base_nodes/CCNode.js cocos2d/label_nodes/CCLabelTTF.js cocos2d/sprite_nodes/CCSpriteFrame.js
…ng code for performance
Fixed cocos2d#2441: Improve update function of Action, avoid using temp cc.p or cc.size
Fixed cocos2d#2445 refactor code for rendering classes to optimize performance
…ometerBug fixed cocos2d#2459: fix Accelerometer bug on UCWeb version 9.0 and below.
…t work when controller is _jsControlled
Fixed a bug that engine can't load from single engine file
…ontrolButton on _jsControlled Mode
…to Iss2468_FixCCBReaderBug
…a changing var
fixed cocos2d#2806: Correct the errors of Tests for Cocos2d-Html5 releasing
…to Iss2803_V2.1.6Release
Issue cocos2d#2803: correct some mistakes in AUTHORS.txt
Issue cocos2d#2803: Update authors of Cocos2d-html5
Issue cocos2d#2803: update submodule reference
Merge from trunk
1、Fix error that cc.TextureCache.dumpCachedTextureInfo() will crash when there are cc.LabelBMFont has been created 2、Fix bug when calculate HTMLCanvasElement 's memory
fix code format
Fix cc.TextureCache.dumpCachedTextureInfo 's bug
… property through reference when initiating actions.
Issue cocos2d#2803: fixed some bugs for actions that set their object property through reference when initiating actions.
…t work when _rect's width or height greater than 0 and less than 1.
Issue cocos2d#2803: fixed a bug for cc.Sprite that its drawing doesn't work when _rect's width or height greater than 0 and less than 1.
…tFlippedX, setFlippedY
…to Iss2803_V2.1.6Release
Issue cocos2d#2803: cc.Sprite's setFlipX, setFlipY have renamed to setFlippedX, setFlippedY
…to Iss2803_V2.1.6Release
Issue cocos2d#2803: add a sample game link to index.html
Closed cocos2d#2803: update DragonBones' link in CHANGELOG.txt
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Merge develop to master