Iss1489 assets manager #2040
Merged
Iss1489 assets manager #2040
Conversation
This file contains 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
…os2d-x into iss1489-AssetsManager
…os2d-x into minggo-iss1489-AssetsManager
issue cocos2d#1489: Updates with upstream.
…cocos2d-x into minggo-iss1489-AssetsManager
Adds AssetsManager support for win32.
dumganhar
pushed a commit
to dumganhar/cocos2d-x
that referenced
this pull request
Apr 15, 2013
…ger an assert of 'CCAssert( m_fScaleX == m_fScaleY, "CCNode#scale. ScaleX != ScaleY. Don't know which one to return");'.
dumganhar
pushed a commit
that referenced
this pull request
Apr 15, 2013
fixed #2040: Getting scale property from sub-ccb node may trigger an assert of 'CCAssert( m_fScaleX == m_fScaleY, "CCNode#scale. ScaleX != ScaleY. Don't know which one to return");'.
angeltown
pushed a commit
to angeltown/cocos2d-x
that referenced
this pull request
Apr 28, 2014
Iss1489 assets manager
angeltown
pushed a commit
to angeltown/cocos2d-x
that referenced
this pull request
Apr 28, 2014
…ger an assert of 'CCAssert( m_fScaleX == m_fScaleY, "CCNode#scale. ScaleX != ScaleY. Don't know which one to return");'.
angeltown
pushed a commit
to angeltown/cocos2d-x
that referenced
this pull request
Apr 28, 2014
fixed cocos2d#2040: Getting scale property from sub-ccb node may trigger an assert of 'CCAssert( m_fScaleX == m_fScaleY, "CCNode#scale. ScaleX != ScaleY. Don't know which one to return");'.
angeltown
pushed a commit
to angeltown/cocos2d-x
that referenced
this pull request
Apr 29, 2014
Iss1489 assets manager
angeltown
pushed a commit
to angeltown/cocos2d-x
that referenced
this pull request
Apr 29, 2014
…ger an assert of 'CCAssert( m_fScaleX == m_fScaleY, "CCNode#scale. ScaleX != ScaleY. Don't know which one to return");'.
angeltown
pushed a commit
to angeltown/cocos2d-x
that referenced
this pull request
Apr 29, 2014
fixed cocos2d#2040: Getting scale property from sub-ccb node may trigger an assert of 'CCAssert( m_fScaleX == m_fScaleY, "CCNode#scale. ScaleX != ScaleY. Don't know which one to return");'.
dumganhar
pushed a commit
that referenced
this pull request
May 4, 2014
…assert of 'CCAssert( m_fScaleX == m_fScaleY, "CCNode#scale. ScaleX != ScaleY. Don't know which one to return");'.
dumganhar
pushed a commit
that referenced
this pull request
May 4, 2014
fixed #2040: Getting scale property from sub-ccb node may trigger an assert of 'CCAssert( m_fScaleX == m_fScaleY, "CCNode#scale. ScaleX != ScaleY. Don't know which one to return");'.
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.
Add AssetsManager and corresponding sample.
Now the sample can only run on iOS.
Other platforms will come soon.