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

5382 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Johansson
b68035570d Removed a TODO note and added key count implementation (rough for now). 2015-09-13 20:26:18 +01:00
Daniel Johansson
88bf9d4580 Reverted some changes to light classes which was not meant to be committed as part of #314. 2015-09-13 20:23:07 +01:00
Daniel Johansson
9ba90251d6 Merge remote-tracking branch 'upstream/master' 
Conflicts:
	jme3-bullet-native-android/build.gradle
 2015-09-13 20:15:22 +01:00
Rémy Bouquet
9f9daa13dc Merge pull request #301 from Kendanware/issue295 
Support for setting minification and magnification filters on a texture in the j3m material file
 2015-09-13 17:53:35 +02:00
Kirill Vainer
62eede87b3 niftygui build: add niftygui repository reference to pom 2015-09-12 17:54:43 -04:00
Kirill Vainer
86439c2c2b native bullet: fix JNI crash in ray / sweep test 
Method return type does not match call function return type
 2015-09-11 13:51:48 -04:00
Kirill Vainer
e9245a753b GLTracer: generate syntax highlighting and easier to read output 2015-09-10 23:10:13 -04:00
Kirill Vainer
9da4b78830 GLRenderer: disable unused vertex attributes before rendering instead of after 2015-09-10 23:09:15 -04:00
Kirill Vainer
8fdc0f9c90 GLRenderer: avoid useless glActiveTexture calls 2015-09-10 23:08:50 -04:00
Kirill Vainer
f80364a8c2 GLRenderer: don't set depth function twice 2015-09-10 22:34:12 -04:00
Kirill Vainer
5845671409 GLRenderer: enable seamless cubemap globally 2015-09-10 22:33:08 -04:00
Kirill Vainer
0bfa7bfacd Merge pull request #336 from Dokthar/sdk_scenecomposer 
Sdk TerrainEditor : changed paintTool toolTip
 2015-09-10 20:53:51 -04:00
Kirill Vainer
edd183a2be GLRenderer: fix texture update regression introduced in 9f3a145dd7bd083c21b302e0faaf46eddfd82237 2015-09-09 22:43:37 -04:00
Dokthar
c9230d370a Merge remote-tracking branch 'doktharFork/sdk_scenecomposer' into sdk_scenecomposer 2015-09-09 21:42:19 +02:00
Dokthar
71e2a7efef SDK Terrain Editor : changed the paintTool tooltip text to match the tool actions 2015-09-09 20:27:57 +02:00
Daniel Johansson
b84bd0d120 Merge remote-tracking branch 'upstream/master' into issue295 
Conflicts:
	common.gradle
 2015-09-08 09:25:29 +01:00
Kirill Vainer
e552fb1101 travis-ci: don't try to decrypt updates key for PRs 2015-09-06 17:07:53 -04:00
normen
3ad3623084 Merge pull request #333 from Dokthar/sdk_scenecomposer 
SDK scenecomposer : fix issue #332 and added line width to the cursor
 2015-09-06 14:38:12 +02:00
Jules
a111817457 Merge pull request #7 from jMonkeyEngine/master 
Merge branch "jmonkeyengine/master" into "sdk_scenecomposer"
 2015-09-06 14:00:33 +02:00
Dokthar
7e0bd4a385 SDK scenecomposer : fix issue #332 cursor doesn't move 
the position of the cursor wasn't updated, now it's work fine
 2015-09-06 13:07:55 +02:00
Dokthar
4f1477735d SDK scenecomposer :reduce the arrows line width from 3 to 2. 2015-09-06 12:57:35 +02:00
Kirill Vainer
e93fb65bca sdk build: enable nbm signing (if key exists) 2015-09-05 14:04:01 -04:00
Kirill Vainer
148c78a943 GL: make lwjgl implementation classes final 2015-09-05 14:03:32 -04:00
Kirill Vainer
cb7d139488 GLSLCompat: support GLES compatibility 2015-09-05 13:56:28 -04:00
Kirill Vainer
139ba573bc travis-ci: try to fix incorrect .travis.yml file 2015-09-04 10:35:14 -04:00
Kirill Vainer
616dadc498 Deprecate ColoredTextured.j3md 2015-09-03 09:46:34 -04:00
Daniel Johansson
c32ac172fb Merge remote-tracking branch 'upstream/master' 
Conflicts:
	jme3-core/src/main/java/com/jme3/light/AmbientLight.java
	jme3-core/src/main/java/com/jme3/light/DirectionalLight.java
	jme3-core/src/main/java/com/jme3/light/PointLight.java
	jme3-core/src/main/java/com/jme3/light/SpotLight.java
 2015-09-03 13:48:23 +01:00
Daniel Johansson
e9e4b4a122 Improved audio renderer information log message to include more information and to print out in a format consistent with the GL renderer information. 2015-09-03 13:32:06 +01:00
Daniel Johansson
66e0e7053c Fixed an issue where GLFW would not accept window focus again due to event polling not running. 2015-09-03 13:31:25 +01:00
Daniel Johansson
971b9524bd Fixed an issue with the GLFW mouse input coordinates not being mapped correctly. 
Renamed input classes to GlfwXXX.
 2015-09-02 12:47:21 +01:00
Julien Gouesse
2677ff31b9 Adds the JogAmp backend into the Gradle dependencies 2015-08-31 23:21:19 +02:00
Julien Gouesse
da01826e43 Temporarily disables the unified renderer in the JogAmp backend 2015-08-31 23:17:48 +02:00
Julien Gouesse
fcae2e64de Removes some useless code from the JogAmp backend 2015-08-31 23:15:09 +02:00
Julien Gouesse
7bd414665b Drives the display renderable earlier in order to fix the unified renderer of the JOGL backend 2015-08-30 21:47:39 +02:00
Julien Gouesse
fae50fd36e Fixes a compile error in the unified renderer of the JOGL backend, doesn't rely on the auto-boxing 2015-08-30 21:36:58 +02:00
Kirill Vainer
2631684b3d sdk build: don't upload empty jars to maven from sdk project 2015-08-29 21:21:59 -04:00
Julien Gouesse
8ace69d0c3 Merge branch 'master' of https://github.com/jMonkeyEngine/jmonkeyengine 2015-08-29 21:29:44 +02:00
Julien Gouesse
814fb2b3ff First implementation of the unified renderer for the JOGL backend, untested 2015-08-29 21:27:20 +02:00
Kirill Vainer
2f6388c13b travis-ci: fix build failures on PRs / branches 2015-08-29 12:33:15 -04:00
Nehon
168e1755ff Added some more constructors to SpotLight and PointLight, also added javadoc to all lights constructors. 2015-08-29 12:56:26 +02:00
Rémy Bouquet
609d9a1832 Merge pull request #306 from mbenson/light-ctors 
More convenient light constructors
 2015-08-29 11:00:12 +02:00
Julien Gouesse
bbb15062af Adds the support of DebugGL for OpenGL ES 3 into the JOGL backend 2015-08-28 19:12:56 +02:00
Julien Gouesse
2e977f6535 Fixes a GLException caused by a regression on the management of the gamma correction in the JOGL backend 2015-08-28 19:09:52 +02:00
Daniel Johansson
352a532730 Merge remote-tracking branch 'origin/issue314' into issue314 
Conflicts:
	common.gradle
 2015-08-26 22:34:53 +01:00
Daniel Johansson
8f77dca931 Added jme3-lwjgl3 module which ultimately adds support for LWJGL 3.x and GLFW. 2015-08-26 22:34:05 +01:00
Daniel Johansson
bf7643f06a Merge remote-tracking branch 'upstream/master' 2015-08-26 22:29:56 +01:00
Daniel Johansson
89f10eca58 Added jme3-lwjgl3 module which ultimately adds support for LWJGL 3.x and GLFW. 2015-08-26 22:24:24 +01:00
Kirill Vainer
c8c0904bda travis-ci: re-enable maven snapshot releases 2015-08-25 23:11:41 -04:00
Kirill Vainer
734bf4a789 travis-ci: use git fetch --unshallow so the revision count is correct 2015-08-25 23:08:50 -04:00
Kirill Vainer
1fdfa269c9 build: disable maven releases 
still need to figure out why the revision
number is so low for detached HEAD builds..
 2015-08-25 00:51:03 -04:00