Merge jMonkeyEngine/master into scenecomposer/master#5
Merged
Conversation
…me3/asset/DesktopAssetManager.registerAndCloneSmartAsset. Added ogg loader
iOS: Fixed incorrect behaviour in J3MLoader. Added ogg loader
…od in favor of BulletAppState.setDebugEnabled.
…bugEnabled instead of PhysicsSpace.enableDebug.
SDK SceneComposer - 3D scale and rotate tool
GL_NUM_EXTENSIONS and glGetStringi is only available in OpenGL3.0+. The gl3 != null check will always be true for LWJGL backend.
For some reason Travis-CI will create folders that were requested to be cached, thus causing the build to fail.
Those are determined automatically by gradle, no need to specify explicitly.
Currently to local repo only.
dokthar
added a commit
that referenced
this pull request
Apr 29, 2015
Merge jMonkeyEngine/master into scenecomposer/master
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 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.