Issue #4768: merge develop branch to master branch #1774
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
…s width larger than the dimension width CCEGLView: better readability
Fixed cocos2d#3612: add jsdocs to cc.NodeRGBA and cc.LayerRGBA
…to develop_20131218
closed #3623 Schedule doesn't restart when widget is re-added after being removed
Fixed cocos2d#3591: Remove arguments.callee which is forbidden in ECMAScript strict mode
Fixed #3614: Avoid CCLabelTTF enter in infinite loop while character's width larger than the dimension width
Fixed cocos2d#3602: WEBGL now share the same viewport as canvas version
Fixed #3659: Add retina support to CCEGLView
…sprite doesn't work well.
closed #3666: setCascadeColorEnabled and setCascadeOpacityEnabled of sprite doesn't work well.
Fixed #3659: Fixed a bug related to the event location conversion
…n to permit not swallow touches
Fixed #3673: Add swallow option to cc.Layer’s setTouchEnabled function
…to Iss3652_nodeToParentTransformForCanvas
Issue: Refactoring cc.Node's nodeToParentTransform for better performance.
issue #3690: Rewrite CCNS.js
issue #3690: Rewrite CCNS.js
Fixed a bug of Sprite that it doesn't work when its texture doesn't preload and its parent is a SpriteBatchNode
…es handling, and first letter "swallowing".
cc.LabelBMFont issues
Sounds pause issue (iOS 7 bug)
Closed #4581: Replace cc._pConst and cc._sizeConst to cc.p and cc.size
Fixed a typo in an error log
fixed a bug of loader
…to Iss4768_ReleaseV223
Issue 4768: add an assert to cc.Sprite for debug friendly
Issue #4768: update the version number
…to Iss4768_ReleaseV223
Issue #4768: update the CHANGELOG.txt
…to Iss4768_ReleaseV223
dingpinglv
added a commit
that referenced
this pull request
Apr 14, 2014
Issue #4768: merge develop branch to master branch
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
13 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.
merge develop branch to master branch