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

5133 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nehon
69f1677649 Moved PBR implementation 2015-08-08 09:25:09 +02:00
Nehon
4b1c61dec1 Merge branch 'master' into PBRisComing 2015-07-16 21:59:26 +02:00
Rémy Bouquet
292a891d1f Merge pull request #228 from davidB/fix_cinematic_clear 
fix a NPE and a ClassCastExcpetion on Cinematic.clear()
 2015-07-16 21:41:24 +02:00
Rémy Bouquet
fbe558779e Merge pull request #282 from Dokthar/sdk_scenecomposer 
SDK SceneComposer : smalls changes and cleaner code
 2015-07-16 21:39:11 +02:00
Nehon
f2b9343d51 Merge branch 'master' into PBRisComing 2015-07-15 23:56:12 +02:00
Nehon
5989711f73 Added multi selection to the ShaderNode editor. 
One can now select several items by left clicking with ctrl or shit held.
One can now move all selected items at once.
One can now delete all selected items at once.
 2015-07-15 23:55:33 +02:00
Nehon
9a3976ed50 Merge branch 'master' into PBRisComing 2015-07-14 09:44:43 +02:00
Nehon
129faf00d7 Fixed warning when trying to find a srgb format for a Depth format. 2015-07-14 09:43:49 +02:00
Nehon
b0db53b5d6 Fixed warning when trying to find a srgb format for a Depth format. 2015-07-14 09:41:55 +02:00
Kirill Vainer
cad8ca4d8e Merge pull request #294 from davidB/david_gl3_mrt_unshaded 
add GL3 support for Unshaded and MRT (v2)
 2015-07-13 16:44:44 -04:00
Nehon
9256f2e4d4 Merge branch 'master' into PBRisComing 2015-07-13 16:22:19 +02:00
Nehon
c7606ccff2 Fixed issue https://github.com/jMonkeyEngine/jmonkeyengine/issues/291 2015-07-12 20:43:54 +02:00
Nehon
327e0125d9 Merge branch 'master' into PBRisComing 
Conflicts:
	jme3-core/src/main/java/com/jme3/material/Material.java
	jme3-core/src/main/java/com/jme3/material/TechniqueDef.java
 2015-07-11 21:34:30 +02:00
Nehon
95d5fdf9c5 Fixed issue https://github.com/jMonkeyEngine/jmonkeyengine/issues/252 
This was due to a bug in the code where triangle data were stored after calculation.
 2015-07-11 21:15:42 +02:00
Nehon
57dd2748e2 Tested if a joystick axis is not the nullAxis before assigning action to it. 2015-07-10 21:28:42 +02:00
Nehon
34220640aa Fixed how model bound were refreshed in BathNode : issue https://github.com/jMonkeyEngine/jmonkeyengine/issues/275 2015-07-06 19:01:00 +02:00
Nehon
6d1ab7af65 Redesign of the frag part of unshadedNodes so it's more modular, and can be properly used as GLSL 1.5 shader. 
Added a stress test for unshadedNodes.
Changed the name of the texture parameter to textureMap in TextureFetch shaderNode as it was conflicting with the texture function used to fetch a texel from a a texture in glsl 1.5
 2015-07-05 23:43:38 +02:00
Nehon
596954b056 Redesign of the frag part of unshadedNodes so it's more modular, and can be properly used as GLSL 1.5 shader. 
Added a stress test for unshadedNodes.
Changed the name of the texture parameter to textureMap in TextureFetch shaderNode as it was conflicting with the texture function used to fetch a texel from a a texture in glsl 1.5
 2015-07-05 23:35:34 +02:00
David Bernard
568ee09d17 add GLSL150 compatible Unshaded 2015-07-05 20:06:07 +02:00
David Bernard
704c3f1a10 enable MRT on gl3 2015-07-05 11:39:55 +02:00
Nehon
2b8898b7b2 Here is the rest of last commit 2015-07-04 19:05:57 +02:00
Nehon
dca050b96b Added a protected modifier to getReceivers in Abstract shadow renderer 
see issue https://github.com/jMonkeyEngine/jmonkeyengine/issues/212
 2015-07-04 19:00:39 +02:00
Rémy Bouquet
9883a18d85 Update CONTRIBUTING.md 2015-07-04 18:58:12 +02:00
Kirill Vainer
328966ba79 Merge pull request #293 from davidB/david_materiel_no_render 
add TechniqueDef.noRender
 2015-07-03 19:52:17 -04:00
Nehon
be58be75ef Merge branch 'master' into PBRisComing 2015-07-03 23:34:26 +02:00
Nehon
6d3377a2a8 Fixed Parallax without normal map in lighting.j3md 2015-07-03 23:33:19 +02:00
Nehon
485af7cf2a TextureFetch shader node now works with glgl1.5 2015-07-03 22:58:42 +02:00
Nehon
719a683c2c Fixed Parallax for PBR lighting 2015-07-03 22:53:29 +02:00
David Bernard
fe72dd67dd add TechniqueDef.noRender 2015-07-03 20:49:20 +02:00
Nehon
4342d97439 Fixed roughness fetch in the spec / gloss pipeline 
See issue https://github.com/jMonkeyEngine/jmonkeyengine/issues/281
 2015-07-02 21:00:07 +02:00
Kirill Vainer
9226299a87 Merge pull request #290 from AlrikG/ImproveCompressedSerialization 
Improve compressed serialization
 2015-06-30 22:29:48 -04:00
jmekaelthas
b0e751c81a Bugfix: avoiding infinite loops while applying constraints. 2015-06-28 15:48:49 +02:00
jmekaelthas
2d9a1b8737 Bugfix: include all bones in the chain of the IK constraint if the 
specified chain length is zero.
 2015-06-28 15:48:11 +02:00
jmekaelthas
483156f2ba Improvement: Inverse Kinematics now breaks the iteration if the computed 
angle change drops below some minimal level.
 2015-06-28 15:11:04 +02:00
kaelthas
4992eba850 Merge branch 'master' of https://github.com/jMonkeyEngine/jmonkeyengine.git 2015-06-22 18:42:54 +02:00
kaelthas
4cec908a50 Inverse Kinematics: several minor memory and CPU optimisations. 2015-06-22 18:41:53 +02:00
AlrikG
7b6a742f0f Update GZIPSerializer.java 2015-06-22 17:12:12 +02:00
AlrikG
2cf7d9eb5a Update GZIPSerializer.java 2015-06-22 17:11:50 +02:00
Alrik
1eedfa5a5f - fix GZIP and ZIP serializer copying the whole temporary buffer instead 
of only the part where the data was written.
 2015-06-22 17:04:50 +02:00
Alrik
4c5850bf00 Merge branch 'master' of https://github.com/jMonkeyEngine/jmonkeyengine.git 2015-06-22 16:54:22 +02:00
Rémy Bouquet
b4b5b19fe3 Merge pull request #289 from ChristianGaertner/patch-1 
[Nifty-GUI] Using java logger, instead of stdout
 2015-06-22 15:23:03 +02:00
Christian Gärtner
97a2f58be7 [Nifty-GUI] Using java logger, instead of stdout 
Replaced call to System.out.println() with proper logging call.
 2015-06-22 13:59:11 +02:00
Kirill Vainer
c39abf48de Travis-CI: enable releases 2015-06-20 15:59:45 -04:00
Kirill Vainer
5a1faac629 Travis-CI: create zip dist as part of build 2015-06-20 14:37:01 -04:00
Kirill Vainer
86900c9d09 Travis-CI: Try to fix notifications 2015-06-20 14:28:41 -04:00
Kirill Vainer
6312f1a813 Merge pull request #287 from riccardobl/master 
Fix for ZipLocator and path with the root slash
 2015-06-20 13:47:46 -04:00
Kirill Vainer
37c572434c Merge pull request #277 from zzuegg/master 
Added GL_MAX_VERTEX_UNIFORM_COMPONENTS
 2015-06-20 13:42:37 -04:00
zzuegg
8d0c371796 Hopefully fixed 2015-06-19 23:16:24 +02:00
zzuegg
a8b3407b46 Removed empty lines 2015-06-19 23:08:00 +02:00
zzuegg
0bd51d67e1 Merge remote-tracking branch 'origin/master' into GameOfGodsJme 2015-06-19 23:07:44 +02:00