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

5241 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kirill Vainer
5cf6b0c9a6 LwjglContext: add custom handler for GL debug messages 2015-04-25 23:09:58 -04:00
Kirill Vainer
0a3e9a434e Image: treat setMipMapSizes as a request to generate mips 2015-04-25 23:09:11 -04:00
Kirill Vainer
10cde0a4b2 DXTFlipper: fix incorrect flipping of DXT5 images of size 2x2 
For DXT1/3 images, the format for color and alpha blocks is the same,
so the bug would not appear. For DXT5 images, the alpha block is formatted
differently. The issue is that it flips the color block and then the alpha
block for 2x2 images, but the correct order is alpha block then color block.
 2015-04-25 22:42:20 -04:00
Kirill Vainer
aba48495e1 J3MLoader: enforce MaterialKey requirements based on extension 2015-04-25 18:25:07 -04:00
Kirill Vainer
ed4b70bcad GLTiming: new GL wrapper to profile GL calls 2015-04-25 17:41:50 -04:00
Kirill Vainer
a6c71c4f50 Fix missing glPatchParameter and another syntax error 2015-04-25 17:34:29 -04:00
Kirill Vainer
5b95f8a4b0 GLRenderer: Improve compatibility with OpenGL 3.2 core profile 
* Separate GLFbo and GLExt implementations. GLFbo can now be implemented either via vanilla OpenGL3 calls or GL_EXT_framebuffer_*** extensions (OpenGL2.1- only).
 * Use modern way of getting supported extensions in core profile.
 * Luminance and Alpha formats are not available when running in core profile.
 * Bind a dummy vertex array object (VAO) when running in core profile.
 * Point sprite mode is always enabled. Since both OpenGL ES 2.0 and OpenGL 3.2 core require it, jME3 is no longer capable of rendering regular points.
 2015-04-25 16:57:24 -04:00
Kirill Vainer
389b117fb6 IosGL: reset buffer position in fromArray() 2015-04-25 12:45:30 -04:00
Kirill Vainer
ca6b492cea SSAOFilter: remove excessive GPU mipmap generation (not needed for filters) 2015-04-24 23:46:56 -04:00
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
Alrik
cdf614d3ad - revert commit to master 2015-04-09 08:58:04 +02:00
jmekaelthas
f9be42ee62 Bugfix: fixed problem with ipo curves computin during animations import. 2015-04-08 20:02:33 +02:00
Alrik
73c3f39e46 - add test case 2015-04-08 12:58:25 +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