d0035b0bc6
test: fix syntax error
9 years ago
fc488be37b
test: remove duplicate annotation
9 years ago
2e6f2701c0
Material / MatParamTexture: remove texture unit fields
9 years ago
f5c5d161d0
Merge branch 'master' of github.com:jMonkeyEngine/jmonkeyengine
9 years ago
f72df167c0
MPO: make sure child overrides parent
9 years ago
80f4e04935
Fixed cloning to not confuse the hardware skinning safety check
...
that attempts to protect users from shared materials.
9 years ago
271f6492dd
Fixed a bug in cloning that prevented a null from being usable
...
as a 'precloned' value. This made Spatial attempt to clone its
parent.
9 years ago
008768f18c
Feature: appending user defined UV sets to the mesh even if they are not
...
directly used by the model.
9 years ago
c07ef80d43
Merge branch 'master' of https://github.com/jMonkeyEngine/jmonkeyengine.git
9 years ago
a2554874d3
run: only set log file path if non-null
9 years ago
d1b866735a
don't use deprecated AudioNode constructor
9 years ago
a1fd3ff3d9
VB: indicate refresh when usage changes
9 years ago
a82b9a4a3d
TestRenderToMemory: fix fps display
9 years ago
acda6e371c
MPO: refresh MPOs on Spatial.deepClone()
9 years ago
52487041b4
fix crashes in several tests
9 years ago
47c26ac0e4
fix issue #441
9 years ago
a8aabac1c9
fix issue #441
9 years ago
ec9f8100c3
Merge pull request #467 from jMonkeyEngine/tdl-mpo
...
TDL/MPO
9 years ago
a4b65ec921
GLRenderer: fix line width
9 years ago
3b5d1eebd8
renderstate: disallow line width < 1f
9 years ago
13755fb75b
unit test: delete library loader test
9 years ago
49a9a6f99b
fix renderer crash due to merge
9 years ago
2e4148f3c3
merge fixes
9 years ago
f3414acc73
MPO: fix unit test
9 years ago
85ffb48efb
unit test: more descriptive failure message
9 years ago
c03e831f3c
SkeletonControl: fix syntax error
...
Conflicts:
jme3-core/src/main/java/com/jme3/animation/SkeletonControl.java
9 years ago
c6c6b48bda
MPO: clone MPOs instead of sharing references
...
Conflicts:
jme3-core/src/main/java/com/jme3/scene/Spatial.java
9 years ago
14438e78e3
fix null checks
9 years ago
21e63687cf
MPO: add null override list check
9 years ago
5588e859cb
MPO: clear param for null textures
9 years ago
06b817e116
MPO: add javadoc
9 years ago
8344994328
MPO: use List instead of ArrayList
...
Also rename get*Overrides to get*MatParamOverrides to be more specific.
9 years ago
50658b8e53
MPO: add ability to disable an override
9 years ago
db691dab99
MPO: add example
9 years ago
5d2f2b19e6
spatial: fix bug in remove/clear MPO
...
add unit test for those methods
9 years ago
5be03af564
material: fix sort id unit test failure
9 years ago
59614e177c
MPO: implement overrides on uniforms and add test
9 years ago
2b35f288c2
MPO: implement propagation and add test
...
Conflicts:
jme3-core/src/main/java/com/jme3/scene/Node.java
jme3-core/src/main/java/com/jme3/scene/Spatial.java
9 years ago
280733c1ce
material: move technique logic into its own package
9 years ago
10a87ce24e
add StaticPassLightingLogic
9 years ago
cb5c1395b3
initial implementation of MPO (untested!)
9 years ago
239524c85b
desktop: don't show dialogs when headless
9 years ago
80af02e1f3
syntax error fixes
9 years ago
0f1c35c5f0
minor formatting changes
...
Conflicts:
jme3-lwjgl/src/main/java/com/jme3/system/lwjgl/LwjglContext.java
9 years ago
01a67b6c66
gitignore: more cleanup
...
Conflicts:
.gitignore
9 years ago
4b8acb96a7
gitignore: cleanup
...
Conflicts:
.gitignore
9 years ago
e8df94de1c
FastMathTest: ignore failing test (for now)
9 years ago
47bae5af59
TestShaderNodes: fix build error
9 years ago
6a47319dbb
DefineList: fix build error
...
Also add additional unit tests for DefineList.
9 years ago
9d035f747a
Add the new material system
...
Also includes some unrelated tests
Conflicts:
jme3-core/src/main/java/com/jme3/renderer/RenderManager.java
jme3-core/src/main/java/com/jme3/renderer/opengl/GLRenderer.java
9 years ago
Kirill Vainer
Paul Speed
Paul Speed
jmekaelthas