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

4965 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
iwgeric
6c24390663 Android: Fix issue handling key events that are tied to both keyboard and gamepad 2015-04-17 19:53:55 -04:00
iwgeric
a5b4df68d8 Merge branch 'AndroidInput' 2015-04-17 19:05:34 -04:00
iwgeric
61ba11d872 Rework of Android input system to support future expansion and gamepad support. 
Gamepad support is still a work in progress, but functions.
 2015-04-17 19:02:19 -04:00
Nehon
001f3f8f0e SDK : Fixed an issue where the shader cide template was not generated properly when creating a shader node definition. 2015-04-17 20:17:04 +02:00
Nehon
f73c2b379d Fixed water filter's glsl 100 shader 2015-04-17 16:06:51 +02:00
Dokthar
ed46dc8548 Merge pull request #3 from Dokthar/master 
Master merge into scenecomposer
 2015-04-17 10:51:55 +02:00
jmekaelthas
20ea38e97e Bugfix: fixed some of the artifacts (unfortunately no all of them) that 
appeared after IK constraint computation; the algorithm now selects the
best found solution among all iterations.
 2015-04-16 22:18:36 +02:00
Dokthar
ece7104d7e Merge pull request #2 from Dokthar/scenecomposer/master 
Scenecomposer/master
 2015-04-16 21:56:52 +02:00
Dokthar
6278ecbcf1 Merge pull request #1 from jMonkeyEngine/master 
Merge branch "jmonkeyengine/master" into "scenecomposer/master"
 2015-04-16 21:53:56 +02:00
Maselbas
0d95422d53 revert some changes in MoveTool 2015-04-16 18:22:50 +02:00
Maselbas
5ef1292484 SDK : SceneComposer 
- Added support for Axis X,Y,Z scaling into the ScaleTool, still need some enhancement
 2015-04-15 23:31:13 +02:00
Maselbas
abb1a69d6f SDK : SceneComposer 
- Added support for Axis X,Y,Z movement into the MoveManager
 2015-04-15 20:34:57 +02:00
Maselbas
b27f86a3ae fix SceneEditTool : 
- axis pick is now available
 2015-04-15 00:34:59 +02:00
normen
60ed6b7620 Merge pull request #256 from Dokthar/scenecomposer/master 
Fix issue #255 - scenecomposer : forcedCamera
 2015-04-13 17:06:10 +02:00
Erlend Sogge Heggen
d884ecb317 Update README.md 
No v3.1 in Q4 2014.
 2015-04-13 12:56:12 +02:00
jmekaelthas
cd97741f9c Bugfix: fix for IK constraint: rotation locks are now applied only on 
boned woning the constraint and not to all that define it as it was
before.
 2015-04-12 17:39:18 +02:00
Maselbas
684c923632 Fix issue #255 - scenecomposer : forcedCamera 
- Now you can't use scenecomposer tool while overiding the camera control
 - Fixed a tool modificaton not undo/redo able.
 2015-04-12 15:31:48 +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
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