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

4979 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kirill Vainer
73f53931f0 Image: fix mipmap generation flags not properly being updated 2015-04-24 23:35:30 -04:00
Kirill Vainer
9ba04bed8f GLRenderer: Merge Color and Screen BlendModes as they are they same 2015-04-24 23:31:52 -04:00
Nehon
7e78651ed4 Shader Nodes : fixed an issue in the shader generator that was caussing an error when there was a "//" comment in the declarative section of a node glsl code 2015-04-22 20:57:33 +02:00
Kirill Vainer
9b41b66756 Merge pull request #261 from Turakar/master 
Fixed typo #258
 2015-04-20 14:34:36 -04:00
Turakar
92b2ec664e Fixed typo #258 2015-04-20 20:01:52 +02:00
normen
a9913e4349 Merge pull request #260 from Dokthar/scenecomposer/master 
SDK / scenecomposer : axis pick for move and scale tool
 2015-04-20 13:49:57 +02:00
Kirill Vainer
aeb1b547ce FBX: fix build errors (missing functions that need to be added) 2015-04-19 21:03:51 -04:00
Kirill Vainer
ed2be5e542 FBX: new FBX importer (not yet enabled - old importer still used by default) 
Still needs work:
 * Skeletal animation (many issues with transform hierarchies)
 * N-gons triangulation (only quads supported at the moment)
 * Light & Camera importing
 * Z-up to Y-up correction
 * Morph animation
 2015-04-19 18:08:28 -04:00
Kirill Vainer
6f29772862 FBX: fix build error due to rename 2015-04-19 13:42:25 -04:00
Kirill Vainer
0a5b68983e FBX: Rename FBX -> Fbx. Support FBX 6.x IDs in FbxDump. 2015-04-19 13:33:43 -04:00
shadowislord
ba8349a0cf FBX: ContentTextureKey to disable cache 
FBXDump remove useless import
 2015-04-19 13:24:44 -04:00
iwgeric
116adbba1f Android: Support JoystickCompatibilityMappings for reassigning joystick axes and buttons. 
Also added ability to add new buttons as events come in due to Android not providing a definitive way to determine which buttons are supported on the device.
 2015-04-19 12:40:17 -04:00
iwgeric
fecfa8ccd0 Android: add joystick compatibility mapping for XBOX 360 controller connected to Android device using USB dongle 2015-04-19 12:38:43 -04:00
iwgeric
d80de0cc5b Android: Add static property to disable sensors but still have joysticks. 
May move this to AppSettings later, but not sure yet.
 2015-04-18 14:48:30 -04:00
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