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

5078 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
zzuegg
afc8f3f1cd Fixed SpotLight default inititalisation for invSpotRange 2015-05-22 12:51:09 +02:00
Michael Zuegg
4e8ed1c346 Merge pull request #4 from jMonkeyEngine/master 
merge from upstream
 2015-05-22 12:50:57 +02:00
normen
f6a2452ad0 Merge pull request #273 from Dokthar/scenecomposer/master 
SDK SceneComposer : new ShortcutTool
 2015-05-16 15:47:34 +02:00
Maselbas
97e1cf8cf3 SDK SceneComposer : added comments in the ShortCutManager 
- refactor getNumberkey() to getNumberKey()
 2015-05-15 22:38:18 +02:00
Maselbas
bbca035a43 SDK SceneComposer : all shortcuts tool are now outside of the selectTool, 
- added the Delete and Duplicate shortcut
 - deleted the MoveManager
 - clean up the SelectTool (removed old shortCuts)
 - now the ShortcutManager can also provide to SorthcutTools the state of ctr, alt and shift key
 2015-05-15 20:36:55 +02:00
Maselbas
e9b1972aca SDK SceneComposer : clean up in the RotateTool, changed the name of the UndoableSceneEdit 
from ScaleUndo to RotateUndo
 2015-05-15 18:47:14 +02:00
Maselbas
1f4ee34de8 SDK SceneComposer : add Rotate and Scale Shortcut, plus done some clean up into the MoveShorcut 2015-05-15 18:43:45 +02:00
Maselbas
6ef33e4c10 SDK SceneComposer : added UndoRedo for the MoveShortcut 2015-05-15 17:57:47 +02:00
Maselbas
fb44f5fb7b SDK SceneComposer : Added the new Move Shortcut, you can use this shortcut with all others tools 2015-05-14 19:09:07 +02:00
Maselbas
e27b8a5739 SDK SceneComposer : bugfix in the ShortcutManager, prevent from setting the currentShorcut to NULL when there are no new activable shortcuts 2015-05-14 19:02:35 +02:00
Maselbas
92ab8b8060 SDK SceneComposer : small modifications on the PickManager, now the camera rotation isn't cloned so it's no more necessary to update the rotation before the updataPick() 2015-05-14 18:55:07 +02:00
Alrik
b133dc4c47 Merge branch 'master' of https://github.com/jMonkeyEngine/jmonkeyengine.git 2015-05-12 21:31:24 +02:00
Nehon
14c5304f27 Fixed defines tests in multisample.glsllib so that one can have a single sampled beck buffer and a multisampled depth buffer without having the shader to crash. 
Also optimized the way glsl 150 texture vs texture2D is handled
 2015-05-12 21:15:14 +02:00
Nehon
04f6b01d2e Reverted commit 3f3ef99b86 
as it was not valid and introducing another issue.
 2015-05-12 21:13:17 +02:00
Kirill Vainer
5002413e51 GLRenderer: fix wrap / filter modes 
* They were not configured properly due to an old workaround
 2015-05-11 19:33:35 -04:00
Kirill Vainer
0dc77b4d6e GLRenderer: remove commented out limits 2015-05-11 19:32:48 -04:00
Kirill Vainer
5c35b9bb22 Renderer: delete deprecated renderers 2015-05-11 19:31:10 -04:00
Paul Speed
9a8aa3b394 Prevent an NPE for null parameter arrays. 2015-05-11 02:28:56 -04:00
Maselbas
f6b7c3819a SDK SceneComposer : added abstract ShortcutTool class that extends SceneEditTool 
- added a shortcutManager that provide some usefull methodes for ShortcutTools. Also handle activation of shortcuts.
- wip : implementation of the MoveShortcut (based on the same shortcut provided by the selectTool) using ShortcutTool and the ShortcutManager.
- modified the SceneComposerToolController to work with the ShortcutManager & ShortcutTool
 2015-05-10 01:57:27 +02:00
Alrik
dba5c2e8fb Merge branch 'master' of https://github.com/jMonkeyEngine/jmonkeyengine.git 2015-05-09 10:20:17 +02:00
Kirill Vainer
31fc1d9ac6 GLRenderer: fix srgb warning logging 
Only complain about missing sRGB support if the user wants to enable it, not disable it.
 2015-05-08 11:09:20 -04:00
Nehon
ec7432c90c Added a graddle.properties to je jme-examples project with an override of buildJavaDoc to false, to not generate the javadoc when building from jme-examples 
Also added a parameter to enable assertion as executable classes are only in this project anyway.
Removed the global assertion setting as it's only needed in jme-examples.
 2015-05-08 15:07:43 +02:00