Update fork PR #7
Merged
Conversation
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
* Fixed MorphAnim.glsllib to compile on android and avoid enabling GL_VERTEX_PROGRAM_POINT_SIZE in android as it's not supported
…ment. -SNAPSHOT releases should be based on real version numbers and not partial prefixes or it makes it harder to continuing development on the branch.
…o expand later) to see if they've changed in the current frame. SimpleApplication will configure this by default to use asserts but the application is free to change it to throw regular exceptions or just log the error as desired.
…surprise if a user later chooses to call updatePoints() after having created the line with JME constants... since updatePoints() would actually call set() instead of just replacing the references. The constructor and updatePoints() should match and I chose to err on the side of caution and make them both operate on local instances.
…of NullPointerException because user code should never throw NullPointerException. Also made trying to add a child to itself an error instead of a no-op. Attempting to do something like guiNode.attachChild(guiNode) will now throw an IllegalArgumentException.
…javadoc (#1230) * re-publicize 3 no-arg constructors, correct/remove erroneous javadoc * re-protect 2 no-arg constructors, restore javadoc
when building locally. Normal auto-detected versions will be based on the base version parsed from the most recent tag on the branch with a -SNAPSHOT appended. If the current commit is the tagged commit then it is used directly to preserve backwards compatibility... but really that should be a CI only option for most use-cases. A new includeBranchInVersion option was added to allow the old behavior of including the branch name in a munged version string for those wanting to keep their experimental branch builds separate from their normal master/version-branch builds.
master branch. (On master we want to default to the gradle.properties version and not the latest tag for non-specific-commit tags.) Updated gradle.properties to set master to be 3.4.0 for further development.
* Update GLImageFormats.java * First implementation to solve the glTexSubImage issue * Setting proper format to the image * Removed the Image.convertToFormat method and its usage from GLRenderer.modifyTexture. Added a warning instead for the potential failing cases Fixing the issue in JmeBatchRenderBackend.loadImage transforming it to RGBA8 if required
…g from cpp source and not using the build target.
Fixes Bullet-Native Artifacts not containing natives when not building from cpp source and not using the build target.
…m file still works (after cloning, the picker would have the wrong terrain quad instance)
Fixes #1261 - Clone the Terrain Picker, so that loading a terrain from file still works (after cloning, the picker would have the wrong terrain quad instance)
* Upgrade Gradle 4.10 -> 5.6.4 * Use Gradle wrapper
* Update PBRLighting.j3md * Create PreShadowPBR.frag * Create PostShadowPBR.frag
* Test case for issue #801 * Reset the context with the initial values
…ks (#1271) * Added Override annotations, finals, some cleanup and better null checks * More general null check * Follow naming conventions
* jme3-core: add the missing @OverRide annotations * jme3-desktop: add the missing @OverRide annotations * jme3-bullet and jme3-jbullet: add the missing @OverRide annotations * jme3-effects: add the missing @OverRide annotations * jme3-terrain: add the missing @OverRide annotations * jme3-examples: add the missing @OverRide annotations * jme3-android: add the missing @OverRide annotations * jme3-blender: add the missing @OverRide annotations * jme3-ios: add the missing @OverRide annotations * jme3-jogg and jme3-jogl: add the missing @OverRide annotations * jme3-plugind: add the missing @OverRide annotations * jme3-lwjgl and jme3-lwjgl3: add the missing @OverRide annotations * jme3-networking: add the missing @OverRide annotations * jme3-vr: add the missing @OverRide annotations
Fixes #1251 - Support OpenGL3.1 on LWJGL2 and LWJGL3
re-assign Simsilica LLC copyrights with Paul's permission (issue #1001)
* JmeVersion: Don't throw a NullPointerException when version.properties can't be found. * ImplHandler: Reduce Code-Duplication by using a multi-catch statement
#1285) * remove unnecessary tests for null, discovered using NetBeans * jme3-core: remove unnecessary casts * jme3-examples: remove unnecessary casts * jme3-vr: remove unnecessary casts * jme-plugins: remove unnecessary casts * jme3-terrain: remove unnecessary casts * jme3-desktop: remove unnecessary casts * jme3-android: remove unnecessary casts * remove unnecessary casts, discovered using NetBeans * TerrainQuad: back out one casting delta that's not a removal * TerrainPatch: simplify generateLodEntropies() after removal of the cast * TerrainPatch: simplify reIndexGeometry() after removal of the cast
* Reinit inputs on context restart * Added test issue from issue #1013 * Verify that the inputs are already initialized
joliver82
pushed a commit
that referenced
this pull request
Jan 25, 2021
* Update Weights.java * Update SkinningControl.java * Update SeparateJointModelTransform.java (#2) * Update SeparateJointModelTransform.java * Update MorphControl.java * Update MatrixJointModelTransform.java * Update Joint.java * Update ArmatureMask.java * Update Armature.java * Update AnimationMask.java * Update AnimTrack.java * Update AnimComposer.java * Update AnimClip.java * Update Weighted.java * Update Primitives.java * Update JointModelTransform.java * Update HasLocalTransform.java * Update AnimMigrationUtils.java * Update ContainsTweens.java * Update LinearBlendSpace.java * Update ClipAction.java * Update BlendableAction.java * Update BlendSpace.java * Update BlendAction.java * Update BaseAction.java * Update Action.java * Update AnimTrack.java (#3) * Update AnimTrack.java * Update ArmatureMask.java * Update MatrixJointModelTransform.java * Update SeparateJointModelTransform.java * Update Weights.java * Update Action.java * Update BaseAction.java * Update ContainsTweens.java * Update SkinningControl.java * Update AnimTrack.java (#6) * Update AnimTrack.java * Update BlendAction.java * Update BlendSpace.java * Update BlendableAction.java * Update AnimMigrationUtils.java (#7) * Update AnimMigrationUtils.java * Update HasLocalTransform.java * Update JointModelTransform.java * Update Primitives.java * Update Weighted.java * Update ClipAction.java * Update AnimInterpolator.java * Update AnimInterpolators.java * Update FrameInterpolator.java * Update LinearBlendSpace.java * Revert AnimTrack.java to original state. * Delete AnimTrack.java * Add files via upload
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
10 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.