Push developer branch to master branch #1295
Merged
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 Iss1152_FixParticleSystemsBug
…ale9SpriteBug Fixed a bug of ControlButton and Scale9Sprite
…t's reference for some Engine class to avoid some mistake.
…t's reference for some Engine class to avoid some mistake.
…ct's reference for some Engine class to avoid some mistake.
…to Iss2844_RenameVersion Conflicts: cocos2d/sprite_nodes/CCSprite.js
Closed cocos2d#2844: Rename version 2.1.6 of Cocos2d-html5 to 2.2
…to Iss2833_ReturnNewObjectForFunciton
…ctForFunciton Closed cocos2d#2833: Returning a new object instead returning an object's reference for some Engine class to avoid some mistake.
…to Iss2833_ReturnNewObjectForFunciton
…ctForFunciton fixed cocos2d#2833: correct a mistake for latest commit
…to Iss2833_ReturnNewObjectForFunciton
…ctForFunciton Fixed cocos2d#2833: refactor cc.Sprite's _rect to make its fault tolerance stronger
… to _removeTargetWithActionForControlEvent
change API name from cc.Control.removeTargetWithActionForControlEvent to _removeTargetWithActionForControlEvent
…to Iss2833_ReturnNewObjectForFunciton
…ctForFunciton fixed cocos2d#2833: Correct a mistake for cc.Sprite
fixed cocos2d#2226: Clean up some unused codes in CCClass.js
fixed cocos2d#2853: Fix a bug of cc.EditBox that setFontSize is invalid
Closed cocos2d#2867: Fixed a bug of jsloader that it doesn't work on some browsers
…to optimize performance for mobile browser
…to Iss2852_RefactorMultResources
fixed ccVisibleRect bug
fixed ccVisibleRect bug
issue cocos2d#3192 fixed bug that set wrong height in ios7
rename cocostudio.js
issue cocos2d#3192 fixed a bug for baidu browser
In Cocos2D-ios, you can draw a polygon with only a border but a transparent fillcolor. the same should be true here.
Should outline even if fillcolor is fully transparent
issue cocos2d#3192 fixed some bug for cocostudio reader
…et content scale.
Fixed bug that CCControl send action by all types of event.
…n't stop/pause when the effect didn't preload.
…to Iss2829_ImproveAudioCompatibility
…ompatibility Issue cocos2d#2829: fixed a bug of WebAudioEngine that it's effect can't stop/pause when the effect didn't preload.
…amesWithJson add json support to SpriteFrameCache
…or when target have not own RGBAProtocol.
closed cocos2d#3256: Fixed a bug of CCActionInterval that it will error when target have not own RGBAProtocol.
dingpinglv
added a commit
that referenced
this pull request
Dec 4, 2013
Push developer branch to master branch
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
11 participants
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.
Push developer branch to master branch