add json support to SpriteFrameCache #1260
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
dingpinglv
added a commit
that referenced
this pull request
Nov 21, 2013
…hJson add json support to SpriteFrameCache
jianglong0156
pushed a commit
to jianglong0156/cocos2d-html5
that referenced
this pull request
Jan 19, 2015
dingpinglv
added a commit
that referenced
this pull request
Jan 19, 2015
issue #1260:arranging the key code make it same with jsb key code
jianglong0156
pushed a commit
to jianglong0156/cocos2d-html5
that referenced
this pull request
Jan 19, 2015
dingpinglv
added a commit
that referenced
this pull request
Jan 20, 2015
issue #1260: fix quote and comma key code error
jianglong0156
pushed a commit
to jianglong0156/cocos2d-html5
that referenced
this pull request
Jan 21, 2015
jianglong0156
pushed a commit
to jianglong0156/cocos2d-html5
that referenced
this pull request
Jan 21, 2015
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 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.
No description provided.