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

6526 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Julien Seinturier
41bead60e3 Creating a VRAppState 2017-02-10 11:10:05 +01:00
empirephoenix
1d98c712b3 Merge pull request #616 from delt0r/master 
Fixed a exception in Material toString with blender materials.
 2017-02-08 09:36:43 +01:00
delt0r
f416d7af18 Fixed a exception in Materal toString with blender materials. 
Some blender materials have null Material Param keys. This shouldn't
throw an exception in a toString method. So rather than throwing a
OperaitonNotSupported exception a string is returned informative of the
null state of the key.
 2017-02-08 14:53:45 +13:00
Nehon
8dcc67a318 Fixed an issue in DetailedProfiler where time would become negative with low fps 2017-02-07 20:43:42 +01:00
Nehon
0610f703d7 Fixed a crash in the PBR shader when adding a light map. 2017-02-06 19:49:04 +01:00
empirephoenix
09ce6205c7 Merge pull request #614 from riccardobl/FixMeshCollisionShapeJ3oRead 
Fix bullet crash when MeshCollisionShape is loaded from j3o
 2017-02-06 15:34:44 +01:00
Riccardo Balbo
e452ec8f0c Fix MeshCollisionShape crash when loaded from j3o: always create BVH before scaling. 2017-02-06 14:31:19 +01:00
Nehon
1eb894111a Fixed a crash in ssao.frag when enabling multisampling 2017-02-05 17:57:28 +01:00
Nehon
12fe7ba035 Added a DetailedProfiler and its associated AppState for detailed time profiling 2017-02-05 17:57:28 +01:00
Nehon
6b33ae470a Added a new step in AppProfiler for viewport processors and added method to pass the profiler to all processors. 2017-02-05 17:57:28 +01:00
Nehon
6a467ecb53 Added gpu profiling to Renderer and all the GL backends except ios 2017-02-05 17:57:28 +01:00
empirephoenix
6f32651fb1 Merge pull request #613 from JavaSaBr/fixed_saving_and_cloning_some_controls 
Fixed cloning and saving some contorls.
 2017-02-03 08:43:16 +01:00
javasabr
e26f0f133b fixed cloning and saving some contorls. 2017-02-03 09:16:06 +03:00
Julien Seinturier
b9071513e7 Working on Controller interaction 2017-02-02 17:34:32 +01:00
empirephoenix
071e449a3e Merge pull request #612 from JavaSaBr/fixed_cloning_and_saving_RigidBodyControl-2 
Fixed saving/cloning enabled state of a RigidBodyControl.
 2017-02-02 13:27:20 +01:00
Julien Seinturier
e61eff13ae Updating Java native binds to OpenVR 1.0.6 with strict JNA direct access 2017-02-02 13:21:23 +01:00
Julien Seinturier
3520273dce Static lonks removal & OpenVR refactoring 
Removing static call between classes
Refactoring OpenVR system package
 2017-01-30 15:47:20 +01:00
javasabr
637635d53f Fixed saving/cloning enabled state of a RigidBodyControl. 2017-01-29 23:30:28 +03:00
FrozenShade666
39560ea7ae Update README.md 
New mashup image including Skullstone.
 2017-01-28 21:42:23 +01:00
Rémy Bouquet
3a2f4075dc Merge pull request #610 from FrozenShade666/patch-1 
Update README.md
 2017-01-28 13:27:37 +01:00
FrozenShade666
e1dd515321 Update README.md 
Added Skullstone
 2017-01-28 12:21:26 +01:00
Rémy Bouquet
33b3514368 Merge pull request #608 from JavaSaBr/fixed_motion_event 
Fixed saving a spatial of a motion event control.
 2017-01-27 09:09:09 +01:00
javasabr
ba4886da80 fixed saving spatial of motion event control. 2017-01-27 05:54:14 +03:00
Nehon
74858976eb Fixed an issue where ParticleEmitter had NaN bounds during the first update when added to the scene graph during the update loop 2017-01-26 21:09:02 +01:00
Julien Seinturier
825b1baccb Updating .gitignore in order to skip eclipse project configuration to be 
send to GitHub
 2017-01-26 15:01:33 +01:00
Julien Seinturier
06759d1eb3 Adding native lib required by OpenVR and OSVR 2017-01-26 14:58:17 +01:00
Julien Seinturier
2af2b121ec Conforming to LWJGL3 library 2017-01-26 12:37:59 +01:00
Julien Seinturier
59d41c865b First jme3-vr commit 2017-01-26 12:00:24 +01:00
Nehon
390d35180b Soft particles now has only one shader and one technique to work with any glsl version 2017-01-24 20:06:12 +01:00
Rémy Bouquet
4fbe5ec84d Merge pull request #605 from JavaSaBr/add_cloneable_support_to_shadow_renderers_and_filters 
Add cloneable support to shadow renderers and filters
 2017-01-24 15:10:26 +01:00
javasabr
87562bfbae fixed NPE. 2017-01-24 06:43:39 +03:00
javasabr
c2219ecce5 removed the comment and returned a final modification to the method. 2017-01-23 23:05:46 +03:00
javasabr
f016469933 to prev 2017-01-23 22:50:30 +03:00
javasabr
6c3100f929 Added cloneable and jmeCloneable interfaces to shadows renders and filters 2017-01-23 22:34:03 +03:00
Rémy Bouquet
4c664f8df3 Merge pull request #603 from JavaSaBr/fix_editing_color_overlay_filter 
Fix editing color overlay filter
 2017-01-23 08:33:09 +01:00
javasabr
1be4a48223 changed access to some methods of shadow render. 2017-01-23 09:08:47 +03:00
Nehon
f7181c38dc Removed all xxx15.frag shaders and used GLSLCompat to have the same shader whatever version it's used for 2017-01-22 14:08:22 +01:00
javasabr
e7d95ee734 to prev 2017-01-22 09:59:50 +03:00
javasabr
56fc653725 fixed editing of color overlay filter 2017-01-22 09:58:24 +03:00
Nehon
a64594eea9 Better cloning for TechniqueDefs 2017-01-20 23:33:17 +01:00
Nehon
51eccfea2e Imported the glslCompat directly in multisample.glsllib to have it to work properly with glsl 1.5+ 2017-01-20 23:33:17 +01:00
Rémy Bouquet
93fff9fae8 Merge pull request #601 from mitm001/patch-1 
Update MotionEvent.java
 2017-01-20 08:08:54 +01:00
mitm001
756a7c2683 Update MotionEvent.java 
Corrected minor spelling and class naming errors.
 2017-01-19 10:41:13 -07:00
appveyor
f376ebb5c0 [ci skip] bullet: update windows natives 2017-01-19 17:20:09 +00:00
MeFisto94
0587c84527 Triggering a Native Physics build 2017-01-19 18:16:29 +01:00
Nehon
b0ed053472 Fixed a cloning issue and some tests 2017-01-15 20:32:42 +01:00
Nehon
d537a1c22e Added a GLSL150 to most of the shaders used in the engine (except deprecated ones). 
All shaders now import the GLSLCompat.glsllib
 2017-01-15 19:02:10 +01:00
Nehon
12a2f0f63c One can now define several versions for the shader in a Technique in a J3md file, ie: 
VertexShader GLSL150 GLSL110 : "path/to/shader/file.vert"
FragmentShader GLSL150 GLSL110 : "path/to/shader/file.frag"

Versions must be separated with spaces. They will be matched together when creating the technique so they have to follow the same order for different shaders.
 2017-01-15 18:57:53 +01:00
Nehon
4777c591b1 GLSLLoader now moves all extensions declaration found in the dependencies at the top of the shader code 2017-01-14 23:13:08 +01:00
Nehon
f2709858bb Got rid of the sorting for Technique selection 2017-01-14 18:53:18 +01:00