github.com/jMonkeyEngine/jmonkeyengine commits

Merge branch 'BorealFeast-master'

0ab73359caee9ca59558b4ee9d96988d1939d30b authored almost 9 years ago

Merge branch 'master' into BorealFeast-master

Conflicts:
jme3-core/src/main/java/com/jme3/material/RenderState.java
jme3-core/src/main/java/...

cb61e760cee21f60e2885cb5cbd407f695193e78 authored almost 9 years ago

native bullet: allow cross compiling linux -> windows

62968196971a98e8778ef4b0e892b4c7343b310e authored almost 9 years ago

minor cleanup

9332a04b1804e369e3f43e1705673b4ccf5e2a46 authored almost 9 years ago

material: rename PostShadow15 -> PostShadow

f2f748ed7ecb4f158f2eb5a4247db24476b44e32 authored almost 9 years ago

test: add missing test data

5584ca9119790b9477c4565c139eee883ef1a7e9 authored almost 9 years ago

GL: add missing GL_MAX* constants

d8cda6d23a3612ddf9e8ad9d754c21f0f10d31aa authored almost 9 years ago

Renderer: add setDefaultAnisotropicFilter

33b67a381cd448dc197ecdb8f4a9b537a9a10721 authored almost 9 years ago

Renderer: make getLimits() public

eecca5fa0f81bc44113be41ac3e10cb9fefefee9 authored almost 9 years ago

static pass: fix various issues

ad129ff4981f76cd8e6cea4b53e5b1bc8ab4a0f5 authored almost 9 years ago

material: warn / ignore fixed function techniques

8bd5b59a0e081d4e7327d7dca77f5c8eee3f3d42 authored almost 9 years ago

code / comment cleanup

b6729c46d402499a3dfa0cfc904ccb44518a9521 authored almost 9 years ago

deprecate alpha test / point sprite

876015ab47da18d39d10990fd0d82a59be2be864 authored almost 9 years ago

more deprecation cleanup

37f8ee91afa40223650c0ff4c3b5c35a2a08c78f authored almost 9 years ago

test: don't use deprecated box constructor

112a77fd5dfcb85c636740740488b374fbb5e714 authored almost 9 years ago

remove deprecated classes

f4e948d7bd87ce7b2e294b564a37586d3b6cc51a authored almost 9 years ago

remove deprecated classes

a563c6cc7b902ee5f8175a783c8b4059a9529175 authored almost 9 years ago

Merge branch 'master' into PBRisComing

# Conflicts:
# jme3-core/src/main/java/com/jme3/material/Material.java

6a9c655be3c0226a9ae8b6b22851fedb7af7361b authored almost 9 years ago

Fixed the name of shadow shaders in PBRLighting.j3md, it has changed since the merge with master

7101bbe1e0742817035a7605b9c659f838944b58 authored almost 9 years ago

material: refer to default technique via constant

2f26b34bd0643d1882a7cf6f5ec61c56b356f941 authored almost 9 years ago

test: add required file

fbcfbc04843d5ce7963d0e6e15e387ce125739af authored almost 9 years ago

Material: allow multiple named techniques

e4f7916301dd837f58b95a2ffd6899dc100eb561 authored almost 9 years ago

RM: add ability to force mat param

83259061d379b6842735034943c8c5ad191fa7e3 authored almost 9 years ago

test: fix syntax error

d0035b0bc63aa9aebc2196719d5cbd350a995516 authored almost 9 years ago

test: remove duplicate annotation

fc488be37b8151db5bc557c8633cb0fcc87dc8af authored almost 9 years ago

Material / MatParamTexture: remove texture unit fields

2e6f2701c0f7748308c77be7c61d26b1a2f338ac authored almost 9 years ago

Merge branch 'master' of github.com:jMonkeyEngine/jmonkeyengine

f5c5d161d049bd7034a9c538c23b52da5fe5817c authored almost 9 years ago

MPO: make sure child overrides parent

f72df167c0311dc9a4fe14bba86d84669f6cefa7 authored almost 9 years ago

Moved glBlendEquationSeparate from GL2 interface to GL interface. Added an example of the feature. Minors issues.

bffa2191e5753b7013c5224e45ccf8f749a7ef83 authored almost 9 years ago

Added support to glBlendEquation for renderes implementing GL2, and material loading support

d1aae8d4791ac4b6a85157c3e6402431b7afb380 authored almost 9 years ago

Fixed a crash with singlepass an multipass TDL when a lightProbe is added to the scene

17ef34ad3a53dec29a89e39ea84a3bd78463c946 authored almost 9 years ago

Merged master into PBR and migrated to TechniqueDefLogic

0ec2263ae95706166e04fbabcfefba8218a835b1 authored almost 9 years ago

Fixed cloning to not confuse the hardware skinning safety check

that attempts to protect users from shared materials.

80f4e0493528d7689ea306d95b72b1de6f0ba576 authored almost 9 years ago

Fixed a bug in cloning that prevented a null from being usable

as a 'precloned' value. This made Spatial attempt to clone its
parent.

271f6492dd852830ab5d1ff20694ea1f4583b201 authored almost 9 years ago

Fixed a little bug I left on reversing the list :S:

513eedaea1df73dd7378ca8abbd4f51f4059b74e authored almost 9 years ago

Reversed raytest results when needed

In some cases, native-bullet returns the ray results on a reversed order so it leads to unexpect...

2a44aa4aecccabec6d96ed5f7ea0d4614b967c89 authored almost 9 years ago

Feature: appending user defined UV sets to the mesh even if they are not

directly used by the model.

008768f18c7133c0ae977035e939b5f5a626d46b authored almost 9 years ago

Merge branch 'master' of https://github.com/jMonkeyEngine/jmonkeyengine.git

c07ef80d43441c40df6e2b409f8c576fd2cfe755 authored almost 9 years ago

run: only set log file path if non-null

a2554874d3e44496ba2a7d96d08f6ea1c69fa513 authored almost 9 years ago

don't use deprecated AudioNode constructor

d1b866735ab7b9d7cb50fbdac9529407cb7117c3 authored almost 9 years ago

VB: indicate refresh when usage changes

a1fd3ff3d93114b467342f85b9e2a8237a3e6656 authored almost 9 years ago

TestRenderToMemory: fix fps display

a82b9a4a3de7c472a5de0ff2fedafff25506826d authored almost 9 years ago

MPO: refresh MPOs on Spatial.deepClone()

acda6e371cadad26544bb91a3fc16e9b05b5a543 authored almost 9 years ago

fix crashes in several tests

52487041b4f833061cdfa9d335f6741e91534f31 authored almost 9 years ago

fix issue #441

47c26ac0e4a7ec25f8a7c0931762a812ea4ebd80 authored almost 9 years ago

fix issue #441

a8aabac1c999ca1605c7308833db438666c0d350 authored almost 9 years ago

Merge pull request #467 from jMonkeyEngine/tdl-mpo

TDL/MPO

ec9f8100c3701ef3919fe324120531d5d17edea3 authored almost 9 years ago

GLRenderer: fix line width

a4b65ec921e9aa8abe9967b5039cf5bca5cc1aad authored almost 9 years ago

renderstate: disallow line width < 1f

3b5d1eebd8273ee703b424340c45a343ef2a8117 authored almost 9 years ago

unit test: delete library loader test

13755fb75beb859bae29ede16f0ef9cdd9c27a28 authored almost 9 years ago

fix renderer crash due to merge

49a9a6f99bdf63db66f3dc769ef3fcfa1759255b authored almost 9 years ago

merge fixes

2e4148f3c3e580fee8e131030fd1e06b1e5c1a1d authored almost 9 years ago

MPO: fix unit test

f3414acc733ae802175ee482dc4e43b0c949fd31 authored almost 9 years ago

unit test: more descriptive failure message

85ffb48efb0b23d93b9d00181b94d205ec63134a authored almost 9 years ago

SkeletonControl: fix syntax error

Conflicts:
jme3-core/src/main/java/com/jme3/animation/SkeletonControl.java

c03e831f3c123b1a92a7c2ae2961077ec7ad9aef authored almost 9 years ago

MPO: clone MPOs instead of sharing references

Conflicts:
jme3-core/src/main/java/com/jme3/scene/Spatial.java

c6c6b48bda01d1327a0b412d67e01d576b714501 authored almost 9 years ago

fix null checks

14438e78e33a3bd61494b88880206e8230eca3c1 authored almost 9 years ago

MPO: add null override list check

21e63687cf2cc1b81d8db30114401ad84d661ddf authored almost 9 years ago

MPO: clear param for null textures

5588e859cbe21a990bde4770eb78596628a905c9 authored almost 9 years ago

MPO: add javadoc

06b817e116aac8f4c9b3777f24c05a91f5e96090 authored almost 9 years ago

MPO: use List instead of ArrayList

Also rename get*Overrides to get*MatParamOverrides to be more specific.

8344994328d490967754f3027610aa4e19b0c087 authored almost 9 years ago

MPO: add ability to disable an override

50658b8e539e93bbc3ac0eaa979b712738947ef3 authored almost 9 years ago

MPO: add example

db691dab998690f99d2b85b1d85c05af27747013 authored almost 9 years ago

spatial: fix bug in remove/clear MPO

add unit test for those methods

5d2f2b19e6110c8c8429d16beb4f68f305d9db8b authored almost 9 years ago

material: fix sort id unit test failure

5be03af56413569307bf52f788a3035b09faabfa authored almost 9 years ago

MPO: implement overrides on uniforms and add test

59614e177c139ae0030843a06a6975bfea1ce6a1 authored almost 9 years ago

MPO: implement propagation and add test

Conflicts:
jme3-core/src/main/java/com/jme3/scene/Node.java
jme3-core/src/main/java/com/jme3/s...

2b35f288c273ab42ca01d49f9c3e98603d951822 authored almost 9 years ago

material: move technique logic into its own package

280733c1ce218dafcbf88962b59724c350a9549d authored almost 9 years ago

add StaticPassLightingLogic

10a87ce24eababa56db0c0471c72cfb3d447400f authored almost 9 years ago

initial implementation of MPO (untested!)

cb5c1395b3b21190878fdec7f41ee9d92329f3f0 authored almost 9 years ago

desktop: don't show dialogs when headless

239524c85bfe8a5a66dd5b81d03c150ed9eeb900 authored almost 9 years ago

syntax error fixes

80af02e1f34ca42a5caee6d3be8e273648ca2f4e authored almost 9 years ago

minor formatting changes

Conflicts:
jme3-lwjgl/src/main/java/com/jme3/system/lwjgl/LwjglContext.java

0f1c35c5f06c84431854a9b5a505c5401665e527 authored almost 9 years ago

gitignore: more cleanup

Conflicts:
.gitignore

01a67b6c66e4801717bbc9a293b19fbfad8950e0 authored almost 9 years ago

gitignore: cleanup

Conflicts:
.gitignore

4b8acb96a70bc034b3201f003063ee83228fde96 authored almost 9 years ago

FastMathTest: ignore failing test (for now)

e8df94de1c5829d0a2fed67042b9ec0f58039f78 authored almost 9 years ago

TestShaderNodes: fix build error

47bae5af595ddd75c1a0d42e9022aa4c2a6afb06 authored almost 9 years ago

DefineList: fix build error

Also add additional unit tests for DefineList.

6a47319dbbc9c75825250e7466a5abba741cba50 authored almost 9 years ago

Add the new material system

Also includes some unrelated tests

Conflicts:
jme3-core/src/main/java/com/jme3/renderer/Render...

9d035f747a76f8333a1005e9671f15192bebab75 authored almost 9 years ago

Uniform: fix crash when using vector4array

49339497fa3ab6fd3ba51cf81dc1f40d72a45e62 authored almost 9 years ago

GLRenderer: added fast uniforms - still need to fix Uniform.clear()

e6d829fac4d0744e59deb22b634b1910edad6f5b authored almost 9 years ago

Merge pull request #464 from Perjin/synced-tangent-space

Get normals and tangent synced with mikk tangent space.

56f02bcba73fa053bb53895e0e7667ede7b119f3 authored almost 9 years ago

Get normals and tangent synced with mikk tangent space.

4abba9b56c4ec57b0bff91ee75f7fcfdd0b7af96 authored almost 9 years ago

Normalized the wNormal and wTangent before computing the TBN mat in the PBRLighting frag shader

556aaa439680ab923cf80611d81785c39224f916 authored almost 9 years ago

Merge pull request #445 from Fadorico/master

Fixed collision group listeners not being notified

b4d295ee1bb239942446d424ccd01905f10fa0d4 authored almost 9 years ago

Merge pull request #462 from Georgeto/fix_lwjgl_alphabits

Let lwjgl respect the AlphaBits setting

ed90d3ef4208876e9c26c74cafa40359ead603ed authored almost 9 years ago

Let lwjgl respect the AlphaBits setting.

b39c46a82a975256b54c3e7e6128075d3e62d391 authored almost 9 years ago

Combine result of both listeners to determine if the collision should occur (jbullet)

f61b1439cc1ea63e456ea1ac6fca9c722dea2745 authored almost 9 years ago

Merge pull request #461 from Perjin/shadow_renderer

Texture arrays as render targets, bugfix for shader nodes and new getter and setter in Light class

cb2901c5d2c9526e7f6bc4ac7d392af7f9dc4d9e authored almost 9 years ago

Combine result of both listeners to determine if the collision should occur

83b26be45afdf7699fc48d2783b88b55bdcf4514 authored almost 9 years ago

For LightFilter to be implementable frustumCheckNeeded and intersectsFrustum need to be accesible.

75791883ec5ac9818a435256e8d90bbeddac8cf4 authored almost 9 years ago

Fixed shader generation bug for array variables.

98a9f5c628ba3644289b2e23ada3924492a10424 authored almost 9 years ago

Rendering depth to texture arrays.

c6143ae6409b59b863eb23170c40b0e57515532c authored almost 9 years ago

Texture arrays are now allowed as color buffer render targets.

4162fb9447f642ef64149431aeb673e60737d566 authored almost 9 years ago

Merge pull request #458 from JavaSaBr/fix_lwjgl3

Fixes in lwjgl3

099ebeaec968652bbc26391169b6e791846760b9 authored almost 9 years ago

moved the magic number to constant

85e284a7b00afef820e962445dffd54f37c6edc8 authored almost 9 years ago

fixed NPE

98f1bfc0c15fef8e8653d420fbc7a60d75e15bad authored almost 9 years ago

fixed the scroll of mouse and the buffer overflow.

7a3a0627c2b0c46e929ec98255457ca5ff5fc812 authored almost 9 years ago

fixed the input of chars for UI.

b5b6ebd97cfb72f13a18db92ae0282a5f4a8910d authored almost 9 years ago

Fixed an NPE when jmeClone() was asked to clone a null.

68ace33dbd9e0e9630d5aa54cc11296fa82270a2 authored almost 9 years ago

Ecosyste.ms: OpenCollective

github.com/jMonkeyEngine/jmonkeyengine