sigonasr2/jmonkeyengine
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
5,606 Commits 21 Branches 35 Tags
Commit Graph

5606 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kirill Vainer
fbcfbc0484 test: add required file 2016-04-08 23:38:02 -04:00
Kirill Vainer
e4f7916301 Material: allow multiple named techniques 2016-04-08 23:31:39 -04:00
Kirill Vainer
83259061d3 RM: add ability to force mat param 2016-04-08 23:28:02 -04:00
Kirill Vainer
d0035b0bc6 test: fix syntax error 2016-04-08 23:15:49 -04:00
Kirill Vainer
fc488be37b test: remove duplicate annotation 2016-04-08 23:13:28 -04:00
Kirill Vainer
2e6f2701c0 Material / MatParamTexture: remove texture unit fields 2016-04-08 23:09:19 -04:00
Kirill Vainer
f5c5d161d0 Merge branch 'master' of github.com:jMonkeyEngine/jmonkeyengine 2016-04-08 23:05:34 -04:00
Kirill Vainer
f72df167c0 MPO: make sure child overrides parent 2016-04-08 23:05:15 -04:00
Paul Speed
80f4e04935 Fixed cloning to not confuse the hardware skinning safety check 
that attempts to protect users from shared materials.
 2016-04-05 11:01:27 -04:00
Paul Speed
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.
 2016-04-05 09:12:45 -04:00
jmekaelthas
008768f18c Feature: appending user defined UV sets to the mesh even if they are not 
directly used by the model.
 2016-04-04 18:57:56 +02:00
jmekaelthas
c07ef80d43 Merge branch 'master' of https://github.com/jMonkeyEngine/jmonkeyengine.git 2016-04-04 18:50:23 +02:00
Kirill Vainer
a2554874d3 run: only set log file path if non-null 2016-04-03 17:55:58 -04:00
Kirill Vainer
d1b866735a don't use deprecated AudioNode constructor 2016-04-03 16:56:03 -04:00
Kirill Vainer
a1fd3ff3d9 VB: indicate refresh when usage changes 2016-04-03 16:55:06 -04:00
Kirill Vainer
a82b9a4a3d TestRenderToMemory: fix fps display 2016-04-03 16:46:32 -04:00
Kirill Vainer
acda6e371c MPO: refresh MPOs on Spatial.deepClone() 2016-04-03 16:44:47 -04:00
Kirill Vainer
52487041b4 fix crashes in several tests 2016-04-03 16:42:11 -04:00
Kirill Vainer
47c26ac0e4 fix issue #441 2016-04-03 16:40:45 -04:00
Kirill Vainer
a8aabac1c9 fix issue #441 2016-04-03 16:25:26 -04:00
Kirill Vainer
ec9f8100c3 Merge pull request #467 from jMonkeyEngine/tdl-mpo 
TDL/MPO
 2016-04-02 17:39:44 -04:00
Kirill Vainer
a4b65ec921 GLRenderer: fix line width 2016-04-02 17:30:48 -04:00
Kirill Vainer
3b5d1eebd8 renderstate: disallow line width < 1f 2016-04-02 16:28:00 -04:00
Kirill Vainer
13755fb75b unit test: delete library loader test 2016-04-02 16:27:14 -04:00
Kirill Vainer
49a9a6f99b fix renderer crash due to merge 2016-04-02 16:13:46 -04:00
Kirill Vainer
2e4148f3c3 merge fixes 2016-04-02 15:54:45 -04:00
Kirill Vainer
f3414acc73 MPO: fix unit test 2016-04-02 15:17:26 -04:00
Kirill Vainer
85ffb48efb unit test: more descriptive failure message 2016-04-02 15:17:21 -04:00
Kirill Vainer
c03e831f3c SkeletonControl: fix syntax error 
Conflicts:
	jme3-core/src/main/java/com/jme3/animation/SkeletonControl.java
 2016-04-02 15:17:13 -04:00
Kirill Vainer
c6c6b48bda MPO: clone MPOs instead of sharing references 
Conflicts:
	jme3-core/src/main/java/com/jme3/scene/Spatial.java
 2016-04-02 15:15:40 -04:00
Kirill Vainer
14438e78e3 fix null checks 2016-04-02 15:09:04 -04:00
Kirill Vainer
21e63687cf MPO: add null override list check 2016-04-02 15:09:00 -04:00
Kirill Vainer
5588e859cb MPO: clear param for null textures 2016-04-02 15:08:55 -04:00
Kirill Vainer
06b817e116 MPO: add javadoc 2016-04-02 15:08:49 -04:00
Kirill Vainer
8344994328 MPO: use List instead of ArrayList 
Also rename get*Overrides to get*MatParamOverrides to be more specific.
 2016-04-02 15:08:45 -04:00
Kirill Vainer
50658b8e53 MPO: add ability to disable an override 2016-04-02 15:08:40 -04:00
Kirill Vainer
db691dab99 MPO: add example 2016-04-02 15:08:35 -04:00
Kirill Vainer
5d2f2b19e6 spatial: fix bug in remove/clear MPO 
add unit test for those methods
 2016-04-02 15:08:31 -04:00
Kirill Vainer
5be03af564 material: fix sort id unit test failure 2016-04-02 15:08:26 -04:00
Kirill Vainer
59614e177c MPO: implement overrides on uniforms and add test 2016-04-02 15:08:21 -04:00
Kirill Vainer
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
 2016-04-02 15:08:17 -04:00
Kirill Vainer
280733c1ce material: move technique logic into its own package 2016-04-02 15:04:45 -04:00
Kirill Vainer
10a87ce24e add StaticPassLightingLogic 2016-04-02 15:04:40 -04:00
Kirill Vainer
cb5c1395b3 initial implementation of MPO (untested!) 2016-04-02 15:04:33 -04:00
Kirill Vainer
239524c85b desktop: don't show dialogs when headless 2016-04-02 15:04:27 -04:00
Kirill Vainer
80af02e1f3 syntax error fixes 2016-04-02 15:04:21 -04:00
Kirill Vainer
0f1c35c5f0 minor formatting changes 
Conflicts:
	jme3-lwjgl/src/main/java/com/jme3/system/lwjgl/LwjglContext.java
 2016-04-02 15:03:52 -04:00
Kirill Vainer
01a67b6c66 gitignore: more cleanup 
Conflicts:
	.gitignore
 2016-04-02 15:01:41 -04:00
Kirill Vainer
4b8acb96a7 gitignore: cleanup 
Conflicts:
	.gitignore
 2016-04-02 15:00:21 -04:00
Kirill Vainer
e8df94de1c FastMathTest: ignore failing test (for now) 2016-04-02 14:57:33 -04:00