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

5100 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Johansson
9059eb30e4 Added support for setting minification and magnification filters on a texture in the j3m material file. This also adds support for double and single quoted paths as well as being able to set WrapMode for a specific WrapAxis. This resolves #295 2015-07-14 22:28:13 +01:00
Daniel Johansson
2080453430 Changed build scripts slightly for bullet to not reference src outside it's own base dir. This was mainly done to be able to import the project correctly in IntelliJ IDEA. The modules will now instead reference each other through the dependency mechanism. 2015-07-12 19:18:18 +01:00
Daniel Johansson
013f67ee89 Merge remote-tracking branch 'upstream/master' 2015-07-12 11:19:23 +01:00
Daniel Johansson
8c45568772 Added intellij files to gitignore 2015-07-12 11:14:22 +01: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
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
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
David Bernard
fe72dd67dd add TechniqueDef.noRender 2015-07-03 20:49:20 +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
zzuegg
1e0468bdbe Removed empty lines 2015-06-19 23:07:28 +02:00
zzuegg
8cb2be60fe Added a switch to use VECTORS on GLES and COMPONENTS/4 on Desktop 2015-06-19 22:26:12 +02:00
zzuegg
4cd0c5bffb Added MAX_VERTEX_UNIFORM_VECTORS constant 
//untested however
 2015-06-19 22:22:40 +02:00
zzuegg
43dc7345d0 Changed to VertexUniformVectors 2015-06-19 22:21:56 +02:00
Kirill Vainer
b8fe36ed76 glsllib with macros to convert glsl 1.1 shaders to 1.5 2015-06-18 23:00:17 -04:00
jmekaelthas
f7a4fe9f25 Improvement of the Inverse Kinematics Constraint. 2015-06-18 23:51:17 +02:00
Riccardo Balbo
7fa735fdb1 Remove root slash from the asset path 2015-06-18 16:26:36 +02:00
Kirill Vainer
e2d8fe8293 GLRenderer: support luminance / alpha textures in core profile 2015-05-31 16:00:55 -04:00
Normen Hansen
6f33002f9a SDK: 
- close asset after loading with ModelImportTool
 2015-05-31 16:06:22 +02:00
Normen Hansen
ceb45ff718 SDK: 
- close asset after loading with ModelImportTool
 2015-05-31 15:18:59 +02:00
Paul Speed
4bd774a653 Created an abstract hosted connection service that has 
the autohost, start/stopHostingOnConnection support built
into it.  This is a very common things for connection based
services and I got tired of cutting/pasting it all the time.
RpcHostedService was modified to extend this base class
instead of the more basic one.
 2015-05-28 01:10:44 -04:00
zzuegg
14e4f2bfb3 Added: GL_MAX_VERTEX_UNIFORM_COMPONENTS 2015-05-24 16:12:28 +02:00
zzuegg
46e4c21c2c Added: GL_MAX_VERTEX_UNIFORM_COMPONENTS 2015-05-24 16:09:41 +02:00
Kirill Vainer
fb3a1902a8 Merge pull request #276 from zzuegg/master 
Fixes the initialisation of the default SpotLight
 2015-05-22 11:15:45 -04:00
zzuegg
611113c026 Merge branch 'master' of https://github.com/zzuegg/jmonkeyengine 2015-05-22 12:51:32 +02:00