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

6447 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rémy Bouquet
c2d25ee9d6 Merge pull request #658 from jmecn/master 
Fix issue #654
 2017-06-06 19:58:17 +02:00
Rémy Bouquet
530596838c Merge pull request #664 from iamcreasy/MeshPointDocFix 
Mesh point doc fix
 2017-06-04 21:30:43 +02:00
Nehon
ee9c6d366a ShaderNodeVariable now has a prefix attribute that is concatenated to the name when generating the shader (basically g_ and m_ when the variable is an uniform) 
It avoid to change the name of the variable when loading the definition and always have weird inconsistencies with mat params because the name has a m_ or not.
 2017-06-02 00:37:01 +02:00
Nehon
2f06c9b37b ShaderNodeDefinition path is now set while loading the definition. 2017-06-02 00:37:01 +02:00
Nehon
26ccaaea88 DDSLoader now supports Luminance16f format (r16f) 2017-06-02 00:37:01 +02:00
Quazi Irfan GD
97135fa9bb Add missing override in Geometry 2017-05-27 14:13:57 -05:00
Quazi Irfan GD
cf07e094af Cleanup Mesh(Point) documentation 2017-05-27 00:40:04 -05:00
Quazi Irfan GD
1bfabd8d8f Update Mesh(Point) documentation 2017-05-27 00:30:12 -05:00
NemesisMate
88125da16d Fixed IllegalArgumentException when removing a LodControl from a spatial 
LodControl throws an exception when the spatial being added to isn't a geometry, however, when the controls is removed it calls setSpatial with a null value triggering the exception throw. Now checking for this null value case.
 2017-05-24 13:51:28 +01:00
Yan
6479a7cdf8 Add locale translation for zh_CN 
Add locale translation for zh_CN
 2017-05-18 13:55:03 +08:00
Yan
8e45937974 Fix issue #654 
Fix issue #654
 2017-05-15 11:06:35 +08:00
empirephoenix
080a89e14b Merge pull request #655 from mitm001/patch-4 
Updated broken link to point to wiki.
 2017-05-11 20:37:07 +02:00
mitm001
80bec2e7a0 Updated broken link to point to wiki. 2017-05-11 07:31:52 -07:00
Paul Speed
2fc25f5743 Merge pull request #645 from grizeldi/patch-2 
Added Xbox One S controller mappings
 2017-04-26 19:43:58 -04:00
grizeldi
23d6def5ed Made right trigger usable on Xbox based controllers 2017-04-26 18:05:49 +02:00
grizeldi
ddfa728d60 Add Xbone S controller mappings 2017-04-26 17:52:15 +02:00
empirephoenix
bfbb0d61ea Merge pull request #498 from TripleSnail/master 
Add/remove all PhysicsControls even when a RigidBodyControl is present
 2017-04-25 13:25:53 +02:00
empirephoenix
4d48f5c8a4 Merge pull request #644 from rpax/patch-1 
NullContext thread safety
 2017-04-25 08:59:44 +02:00
Rafael Pax
543268593b NullContext thread safety 
The fields `timeThen` and  `timeLate` are static. If multiple Applications are launched in different threads in headless mode, sync fails. This can be fixed removing the static modifier of the fields.
 2017-04-24 19:57:34 +02:00
jseinturier
16b4dade2d Removing more static references. 2017-04-13 11:37:36 +02:00
jseinturier
f7a852b755 Merge remote-tracking branch 'origin/master' into jme3-vr-dev 2017-04-13 11:16:21 +02:00
jseinturier
2cacf16f69 Conform to... Oh you know what i mean... 2017-04-13 11:13:52 +02:00
jseinturier
0ecd38892c Conform to master... boring.... 2017-04-13 11:12:11 +02:00
jseinturier
9e945462f7 Conforming to last master branch 2017-04-13 10:00:11 +02:00
seint
888b66892d Ignoring .gitignore files 2017-04-13 08:43:34 +02:00
seint
651e77953a VR controller clean integration 2017-04-13 08:40:34 +02:00
Nehon
d20cf3f20a Reverted changes in Spatial made for VR. 2017-04-12 23:59:30 +02:00
Nehon
29875e6085 Fixed InstanceGeomerty not working properly when using the lighting material and a non DirectionalLight 
see https://hub.jmonkeyengine.org/t/instancednode-doesnt-work-with-light/38316/5
 2017-04-12 20:33:28 +02:00
empirephoenix
0111cddaa5 Merge pull request #639 from shamanDevel/DDSLoader-less-constraints 
Weakens the flag tests in DDSLoader: some textures lack the DDSCAPS_TEXTURE flag
 2017-04-12 10:39:57 +02:00
Rickard Edén
d6fb7d85f1 Fixed controller buttons: unControllerSize is size of struct in bytes. 
Cleaned up controller detection code from last commit
 2017-04-11 14:33:14 +02:00
Sebastian Weiß
02781e799f oh man, I should have learned it by now, that jme uses spaces, not tabs 2017-04-08 21:24:15 +02:00
Sebastian Weiß
04b0578173 Certain dds texture lack the DDSCAPS_TEXTURE-flag, but are still recognized by programs like IrfanView and can also be loaded in the engine. 
This commit weakens the check for this flag: Instead of throwing an exception, a warning is logged.
 2017-04-08 21:22:06 +02:00
Sebastian Weiß
a3cd3cbb04 Certain dds texture lack the DDSCAPS_TEXTURE-flag, but are still recognized by programs like IrfanView and can also be loaded in the engine. 
This commit weakens the check for this flag: Instead of throwing an exception, a warning is logged.
 2017-04-08 21:18:16 +02:00
empirephoenix
1265f46fed Merge pull request #638 from stephengold/master 
Version 3.1.0 is now stable, both for the SDK and the Engine itself.
 2017-04-07 09:50:53 +02:00
Stephen Gold
35978f9c38 Version 3.1.0 is now stable, both for the SDK and the Engine itself. 2017-04-06 22:00:35 -07:00
Stephen Gold
3d07e165af Merge pull request #637 from stephengold/master 
fix SkeletonControl.getAttachmentsNode() for odd models (such as Jaime)
 2017-04-06 14:55:29 -07:00
Stephen Gold
9905c4f011 getAttachmentNode(): move target selection from SkeletonControl to Bone 2017-04-06 14:12:52 -07:00
Stephen Gold
b2aa1ff9f1 fix SkeletonControl.getAttachmentNode() for odd models (such as Jaime) 2017-04-05 18:28:43 -07:00
Stephen Gold
5f9cf52c13 Merge pull request #633 from stephengold/master 
add PointSize to Unshaded matdef, test with SkeletonDebugger
 2017-04-05 13:35:51 -07:00
Stephen Gold
dcb92e1d15 Unshaded.vert: put declaration in #ifdef to avoid an unused uniform 2017-04-05 13:02:36 -07:00
Rémy Bouquet
4dd65eb81c Merge pull request #611 from FrozenShade666/patch-2 
Update README.md
 2017-04-05 21:39:13 +02:00
Rickard Edén
39fad9cb3a Fix for mirror cam not being initialized 2017-04-04 15:30:49 +02:00
Rickard Edén
7818f985be Fix for NPE when initializing mirror view 2017-04-04 15:30:35 +02:00
Rickard Edén
1c22bd26b7 Support for Vive Tracker 2017-04-04 15:30:17 +02:00
Rémy Bouquet
b0a5384046 Moved worldMatrix declaration in instancing.glsl so that it works on android 2017-04-02 12:53:16 +02:00
Rémy Bouquet
09fa4f165e fixed bad comma in previous commit 2017-04-01 22:06:11 +02:00
Nehon
8caf05734c Fixed tangent and normal argument position in Skinning.glsllib 2017-04-01 05:45:04 +02:00
empirephoenix
eca531fdc8 Merge pull request #630 from rvandoosselaer/fix_appsettings_resizable 
use the resizable parameter instead of a default 'true' value
 2017-03-29 11:36:52 +02:00
Stephen Gold
259f599d1d add PointSize to Unshaded matdef, test with SkeletonDebugger 2017-03-23 13:33:08 -07:00
rvandoosselaer
81a301f8ef use the resizable parameter instead of a default 'true' value 2017-03-13 15:22:06 +01:00