Feature/community 1.8 #1188
Merged
Feature/community 1.8 #1188
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
…OAIFourier; extended MOAILayer to accept drawing functions in overlay/underlay tables (in addition to renderables); fixed possible glitch in MOAIScriptDeck implementation
…d extended MOAIStreamAdapter to support it
Conflicts: src/moai-sim/MOAIDraw.cpp src/moai-sim/MOAIParticlePexPlugin.cpp src/moai-sim/MOAIShaderProgram.h src/moai-sim/host.cpp src/zl-util/headers.h xcode/libmoai/libmoai.xcodeproj/project.pbxproj xcode/osx/moai-osx.xcodeproj/project.pbxproj
…eproc to iOS host
MOAIBox2DWorld::_getRayCast doesn't multiply the incoming raycast coordinates by self->mUnitsToMeters. This change fixes that.
…ultParent being ignored)
add missing mUnitsToMeters multiply to _getRayCast
…parents on creation
Conflicts: src/moai-sim/MOAITextDesignParser.cpp src/moai-sim/MOAITextDesignParser.h src/moai-sim/MOAITextDesigner.h src/moai-sim/MOAITextLabel.h src/zl-util/ZLRect.h xcode/libmoai/libmoai.xcodeproj/project.pbxproj xcode/libmoai/libmoai.xcodeproj/project.xcworkspace/xcshareddata/libmoai.xcscmblueprint
fix paths in vs2015 projects
|
There are still some references that need to be updated (OpenSSL ->Mbedtls). |
|
test |
…by 1024 to match MOAITexture_MemoryUse_SDFS format with k
|
test |
Free the newly allocated string, not the local buffer
Fix Texture Memory reporting
…bly caught this and freaked out.
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.
This includes all changes from community-175 but: