5772 Commits

Author SHA1 Message Date
empirephoenix
ec71c5e04e Merge pull request #671 from JavaSaBr/backport_changes_from_3.2
Backport changes from the master branch.
2017-06-23 12:49:40 +02:00
javasabr
fa84e7bf28 backport changes from the master branch. 2017-06-16 05:40:57 +03:00
Nehon
b1727b9772 Fixed InstanceGeomerty not working properly when using the lighting material and a non DirectionalLight
see https://hub.jmonkeyengine.org/t/instancednode-doesnt-work-with-light/38316/5
2017-04-12 20:58:33 +02:00
empirephoenix
088419eef0 Merge pull request #582 from FennelFetish/font
Fixes tab stops in BitmapText / BitmapFont (3.1)
2017-04-07 10:23:03 +02:00
Rémy Bouquet
9ba574e584 fixed bad comma in previous commit 2017-04-01 22:06:31 +02:00
Nehon
c154a47b02 Fixed tangent and normal argument position in Skinning.glsllib 2017-04-01 05:46:19 +02:00
MeFisto94
10b23db94d TestMipMapGen: Use the non AWT MipMap Generator (Don't depend on jme3-desktop but jme3-core, to run this test on android) 2017-03-20 14:35:22 +01:00
MeFisto94
479392f6fd TestFancyCar: Remove unused SettingsDialog imports, allowing the Test to also run on android (no jme3-desktop dependency anymore) 2017-03-20 14:30:47 +01:00
Rémy Bouquet
5470abb2b0 Fixed warnings in Terrain shader.
Fixed the use of the first diffuse map
Fixed the camera positioning in the TestSpotLightTerrain
2017-02-26 09:30:08 +01:00
empirephoenix
8214346e8b Merge pull request #624 from jMonkeyEngine/revert-573-cleanup_build_scripts
Revert "Cleanup build scripts (3.1)"
2017-02-24 16:39:35 +01:00
empirephoenix
a87db2c117 Revert "Cleanup build scripts (3.1)" 2017-02-24 16:39:20 +01:00
empirephoenix
0f93df648e Merge pull request #573 from jMonkeyEngine/cleanup_build_scripts
Cleanup build scripts (3.1)
2017-02-24 10:03:44 +01:00
Paul Speed
af04bf9d22 Forcing one of the files to change so we might actually get a new build. v3.1.0-stable 2017-02-12 22:35:55 -05:00
empirephoenix
2761bc3677 Merge pull request #615 from riccardobl/FixMeshCollisionShapeJ3oReadv3.1
Fix bullet crash when MeshCollisionShape is loaded from j3o [v3.1]
v3.1.0-beta4
2017-02-06 15:34:56 +01:00
Riccardo Balbo
1ae6e98d05 Fix MeshCollisionShape crash when loaded from j3o: always create BVH before scaling. 2017-02-06 14:59:30 +01:00
Nehon
69cd160956 Fixed an issue where ParticleEmitter had NaN bounds during the first update when added to the scene graph during the update loop v3.1.0-beta3 2017-01-26 21:10:49 +01:00
Nehon
789daa6295 Fixed warning that were coming out of the particle.j3md. Also fixed the preshadow technique 2017-01-24 20:17:19 +01:00
Rémy Bouquet
659ed8fd23 Merge pull request #602 from stephengold/v3.1
fix errors in how vector projection is calculated
2017-01-20 23:14:15 +01:00
Stephen Gold
f3e2925bd8 fix errors in how vector projection is calculated 2017-01-20 13:08:28 -08:00
Rémy Bouquet
5d2c89f040 Merge pull request #599 from stephengold/v3.1
CapsuleCollisionShape: warn about scaling only if it's not identity
2017-01-17 21:31:31 +01:00
Stephen Gold
ac8eb4d40a CapsuleCollisionShape: warn about scaling only if it's not identity
same diff riccardobl committed to 'master' on Jun 20, 2016
2017-01-17 11:42:21 -08:00
Nehon
aae6170cc5 Fixed MikktSpaceTangentGenerator that was not replacing existing Tangent buffers on the mesh. That could cause crashes when the old tangent buffer did not have the same amount of components 2016-12-30 16:53:09 +01:00
iwgeric
7ecb81c230 Update AndroidLocator to allow assets to be stored in Android assets, drawable, or mipmap directories.
Texture assets can now be stored in Android Drawable and Mipmap directories.  Allows Android to automatically select the closest matching image asset for the actual device configuration (ie. lower resolution textures for lower-end devices).  Search order is:  assets -> drawable -> mipmap.  First match found is returned.

(cherry picked from commit c219ce1)
2016-12-29 00:41:02 -05:00
Paul Speed
63e8c9c485 Convert Skeleton and Bone over to use the JME cloner system for cloning...
this should do automatic fix-up and hopefully make bones attachments work 
properly again in clones.
2016-12-13 06:03:43 -05:00
empirephoenix
975954fb17 Merge pull request #575 from Fadorico/upstream3.1
Write/read the width and height of a quad (3.1)
2016-12-07 13:01:26 +01:00
Fennel
e60d67b1bb Fixes tab stops in BitmapText / BitmapFont.
The first explicitely set tab stop was always skipped.
For all non-explicitely set tab stops it inserted a fixed spacing.
This commit changes the behaviour so tabs are aligned to columns.
It also adds handling of tabs to BitmapFont.getLineWidth() which ignored tabs before.
2016-12-07 07:05:23 +01:00
Paul Speed
92b5d40003 Modified BitmapTextPage to always deep clone its mesh since otherwise
BitmapText objects end up sharing them and that's bad.
2016-12-04 20:35:49 -05:00
Paul Speed
4952ad0cb5 Broke out the Serializer's static initializer into a separate initialize()
static method.  This allows servers to completely reset the Serializer's
registry when restarting the server in the same JVM instance.
2016-12-04 16:28:12 -05:00
Paul Speed
a13a3a7f09 Another bitmap text clone fix. The text pages array (the list of the actual geometry of
the bitmap text) wasn't really being cloned... only the elements were.  This meant that
that a cloned BitmapText object would continue to share the meshes from the original.
2016-12-04 15:49:51 -05:00
Paul Speed
735397f16e Another fix for BitmapText cloning where the regular clone() was
completely bypassing the JME cloner framework... and making a bad
clone.
2016-12-04 15:31:30 -05:00
Paul Speed
c1764bc425 Fixed the cloned Letters to use the cloned StringBlock instead of the
original reference.
2016-12-04 14:24:34 -05:00
Paul Speed
da1b7da329 Added a test for cloning BitmapText. 2016-12-04 04:26:41 -05:00
Paul Speed
e879a0e142 Fix for issue #577 StringBlock cannot be cloned with the cloner because
it is package private and the cloner cannot instantiate one directly.
Since it is extremely unlikely (read: impossible) that there would ever 
be shared StringBlock references between BitmapText objects then it is safe 
to just clone it directly.
It is important to note that BitmapText never really did support clone
before and only pretended to... so this wasn't really a regression.
2016-12-04 04:20:55 -05:00
Fadorico
e3bd122519 Write/read the width and height of the quad 2016-11-24 18:16:48 -05:00
Kirill Vainer
36e99bf032 misc: gitignore update for gradle 3.2.1 2016-11-24 15:32:56 -05:00
Kirill Vainer
c37f0e59d2 build: fix gradle 3.2.1 deprecations 2016-11-24 15:31:15 -05:00
Kirill Vainer
06757f73b4 travis: upload artifacts only on linux/jdk8 2016-11-24 15:26:29 -05:00
Kirill Vainer
35b9eed76f travis: reorder structure a bit 2016-11-24 15:25:28 -05:00
Kirill Vainer
e4ed3313d5 travis: fix unsupported jdk 2016-11-24 15:19:39 -05:00
Kirill Vainer
8ce2f9cfe7 travis: test matrix build 2016-11-24 15:08:34 -05:00
Kirill Vainer
b99d03bd3c version: remove sdk related configuration 2016-11-24 14:48:49 -05:00
Kirill Vainer
f800d74e87 travis: remove uneeded install directive 2016-11-24 14:46:21 -05:00
Kirill Vainer
78ac8df78a cleanup build cache according to travis docs 2016-11-24 14:44:31 -05:00
Kirill Vainer
39dc140f79 build v3.1, master, and PRs only from now on
Developers should be using PRs instead of plain branches.
2016-11-24 14:41:00 -05:00
Kirill Vainer
f38becf2c6 remove SSH based maven publishing
The updates.jmonkeyengine.org server is no longer used.
2016-11-24 14:24:52 -05:00
Kirill Vainer
72b9f186ed fix broken bullet native source url 2016-11-24 13:31:59 -05:00
Kirill Vainer
8c4b44941e Fix #550 2016-11-23 22:04:56 -05:00
Nehon
a71fb286f4 Fixed shadow fade and zfar computation as it was breaking shadow border filtering. v3.1.0-beta2 2016-11-20 23:55:47 +01:00
Nehon
69d8e5d13e Fixed an issue where some occluders were wrongly culled out from the shadow map at very steep light angle, and when the view cam was almost align with light direction. 2016-11-20 19:04:53 +01:00
Paul Speed
4919620e61 Improved the "compare result changed" error message to include the most
likely cause of the error.
2016-11-20 07:14:24 -05:00