Combine Studio change for particle 3d #14420
Merged
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
|
It looks good to me. @super626 |
|
@minggo |
|
I think @ricardoquesada takes charge of these codes. |
|
looks good to me. I'll merge it (I think @super626 is the owner of Particle3D since it belongs to 3d). |
ricardoquesada
added a commit
that referenced
this pull request
Nov 25, 2015
Combine Studio change for particle 3d
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 dll_export statement to particle 3d related class to make it can be use when cocos2d-x compiled as dynamic library.
Move initSystem function in PUParticleSystem3D class to public, so editor can change particle resource of a particle 3d object.
@pandamicro @minggo Please review this PR.