Nehon
8e9148f95f
Fix for previous too optimistic merge
2015-04-11 16:14:54 +02:00
Nehon
e1d0e06c59
Merge branch 'master' into PBRisComing
...
Conflicts:
jme3-core/src/main/java/com/jme3/material/TechniqueDef.java
2015-04-11 16:01:01 +02:00
Nehon
81c995edc4
PBR shader and PBR test case with custom model
2015-04-11 15:37:05 +02:00
jmekaelthas
f9be42ee62
Bugfix: fixed problem with ipo curves computin during animations import.
2015-04-08 20:02:33 +02:00
iwgeric
1a19c4291a
Merge branch 'master' of https://github.com/jMonkeyEngine/jmonkeyengine
2015-04-07 18:35:59 -04:00
iwgeric
22d3f7f9f4
Android: Refactor joystick support to prepare for upcoming gamepad support.
2015-04-07 18:35:48 -04:00
iwgeric
47e9b9ba16
Android: Remove unused property to track if joysticks are enabled.
2015-04-07 17:53:54 -04:00
Kai Börnert
9f32bcf7bb
Hack fix for blenderloader.
...
The optimisation disabled would result in null TextureKeys.
-> This would then result in textures being embedded into the j3o file, seriously bloating the assets.
Signed-off-by: Kai Börnert <kai-boernert@visiongamestudios.de>
2015-04-07 01:26:13 +02:00
Julien Gouesse
5b56f1e513
Updates the JogAmp backend, uses JOGL 2.3.1
2015-04-04 16:37:36 +02:00
iwgeric
4102e91456
Android: remove unused properties in AndroidHarnessFragment
2015-04-02 23:51:26 -04:00
iwgeric
d00c8a109f
SDK: Switch android projects to use an Android Fragment
2015-04-02 23:50:37 -04:00
iwgeric
b095158bc0
SDK: Add temporary fix to remove android.jar from mobile/libs folder during build.
...
android.jar is being added to jme3-android.jar during the build. Build script of jme3-android project needs to be updated to not add android.jar to begin with.
2015-04-02 13:16:03 -04:00
iwgeric
664dfc037c
SDK: Update creation of MainActivity and AndroidManifest to support jME 3.1
...
Add screen orientation to manifest and update the min version to 9.
Update MainActivity creation to remove references to properties removed from AndroidHarness.
2015-04-02 13:14:16 -04:00
iwgeric
be6416b736
SDK: Add layout.xml and strings.xml to Important Files node in Android projects.
...
Useful to quickly modify the layout for the upcoming switch to Android Fragments.
2015-04-02 13:12:08 -04:00
iwgeric
5ab8fb8f6a
Android: remove reference to screenOrientation from unused test project
2015-04-02 13:09:49 -04:00
iwgeric
1569e9583a
Android: remove deprecated screenOrientation from AndroidHarness.
...
Screen orientation is set in manifest instead of in MainActivity.
2015-04-02 13:08:53 -04:00
iwgeric
00a2a84447
SDK: fix message during android build
2015-03-31 13:32:26 -04:00
iwgeric
32275596bf
SDK: Update mobile-impl.xml in user projects for jME 3.1 libraries
2015-03-31 13:29:25 -04:00
iwgeric
1fa4eb441d
SDK: Remove android.jar from jme3-android global library
2015-03-31 13:12:15 -04:00
iwgeric
ca76754889
SDK: Add missing global library for android native bullet
2015-03-29 23:02:05 -04:00
shadowislord
36493353c9
TechniqueDef: fix caps loading for shader language versions
2015-03-29 11:47:58 -04:00
shadowislord
03819b17d1
Merge branch 'rainmantsr-master'
2015-03-28 13:24:09 -04:00
shadowislord
87b6c117f2
TestSweepTest: ignore collisions against ourselves (needed for native bullet)
2015-03-28 13:23:00 -04:00
shadowislord
fe7f30d5ec
Native SweepTest: fix formatting
2015-03-28 13:17:16 -04:00
shadowislord
55829d46cf
Merge branch 'master' of git://github.com/rainmantsr/jmonkeyengine into rainmantsr-master
2015-03-28 12:49:38 -04:00
Nehon
3135f2f4bf
Added utilities class to compute the Irradiance Map, and Prefiltered Environment Map needed for PBR indirect lighting.
2015-03-28 15:30:08 +01:00
rainmantsr
5c8b1fe585
Corrected JavaDoc comment
2015-03-28 13:30:53 +01:00
shadowislord
38e4580857
TestSweepTest: fix crash on native bullet (natives not loaded when shapes are created)
2015-03-27 23:37:13 -04:00
shadowislord
414e1b3fff
Lighting.glsllib: Use quadratic spotlight falloff in SRGB mode
2015-03-27 23:34:53 -04:00
shadowislord
19338deaf8
LWJGL Backend: fix issue #232
2015-03-27 22:42:34 -04:00
shadowislord
d2af0017b2
Nifty BatchRenderBackend: set colorspace property on images
2015-03-27 22:40:18 -04:00
shadowislord
51952de16a
jme3-testdata: fix issue #241
2015-03-27 22:21:14 -04:00
shadowislord
22957c3d28
IOS Renderer: remove clear texture units (does nothing anyway)
2015-03-27 22:20:38 -04:00
shadowislord
26109fcbac
(SP)Lighting.vert: clarify comment regarding material colors
2015-03-27 22:19:02 -04:00
shadowislord
6252258c98
TechniqueDef: remove useless usesShaders variable
2015-03-27 21:55:32 -04:00
shadowislord
fa324cad8f
Dome: fix crash when center = null
2015-03-27 21:49:59 -04:00
shadowislord
26f702cc91
GLTracer: add more no-enum methods
2015-03-27 21:49:33 -04:00
shadowislord
a3467def1e
WeakRefCloneAssetCache: remove useless "synchronized" (the map is already thread-safe)
2015-03-27 21:48:24 -04:00
shadowislord
06408410cf
CollisionResult: add hashCode() - required if we have equals()
2015-03-27 21:47:54 -04:00
shadowislord
305e56a921
ShaderNode: remove incorrect attribution
2015-03-27 21:47:21 -04:00
shadowislord
068047200e
Threads: standardize names. Make sure they all start with "jME3".
2015-03-27 21:43:32 -04:00
shadowislord
a683fbb16c
Texture: allow setting aniso = 0, since that's the default anyway
2015-03-27 21:39:27 -04:00
shadowislord
fdf050c13d
J3MLoader: set texture name in addition to key when loading it
2015-03-27 21:38:56 -04:00
shadowislord
f0fbdffb85
BoundingSphere: remove useless null check
2015-03-27 21:38:14 -04:00
shadowislord
4f15fa3147
AnimChannel: remove useless println
2015-03-27 21:37:50 -04:00
shadowislord
2bc5545171
OGLESShaderRenderer: remove clearTextureUnits since it doesnt do anything
2015-03-27 21:36:43 -04:00
shadowislord
400c09a633
jme3-core: fix minor issues pointed in static analysis
2015-03-27 21:33:29 -04:00
rainmantsr
31835366b2
Add: sweepTest to jme3-bullet-native
2015-03-27 20:37:23 +01:00
Kirill Vainer
1076b489ab
GLRenderer: remove check FB error calls as it causes GPU stall
2015-03-26 17:03:04 -04:00
Kirill Vainer
25da36e590
jme3-bullet-native: copyBinaryToLibs to depend on building native lib
2015-03-26 17:02:01 -04:00
