Merge master to next #1700
Merged
Merge master to next #1700
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
Fixed #1478. Missing GL_CW and GL_CCW enum values.
Fixed Vector4::operator<
Fixed Vector4::operator< (properly)
Texture was not being released when creating a new ParticleEmitter. This affects both current and Next branches
Fix leak in ParticleEmitter
Fix TerrainPatch leaking camera
Fix typo in PlatformAndroid.cpp - Fixes #1536
fix calculation of distance from plane to origin
fix calculation of distance from plane to origin
Correct array deallocation
Fixed bug where loading tile sources for a TileSet would fail for any cell with a 0. Made sure font, particle, and sprite samples were located in src folder.
SpriteSample loads a majority of it's content from a .scene file.
Conflicts: samples/browser/sample-browser.vcxproj.filters
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.
No description provided.