Daniel Johansson 9ba90251d6 Merge remote-tracking branch 'upstream/master' ...

Conflicts:
	jme3-bullet-native-android/build.gradle

2015-09-13 20:15:22 +01:00

..

main

Merge remote-tracking branch 'upstream/master'

2015-09-13 20:15:22 +01:00

plugins/java/com/jme3

Added unit test for J3MLoader to cover the new texture parameters available in #295. Also fixed a couple of issues in the code to reduce logging that was not needed and removed redundant code. This update also updates junit to 4.12 and adds Mockito and Fest Assertions as test dependencies.

2015-07-20 11:22:16 +01:00

test

Merge remote-tracking branch 'upstream/master' into issue295

2015-09-08 09:25:29 +01:00

tools/java/jme3tools

BatchNode safe catch of a crash when the batch node geoms don't have the same buffer types.

2015-05-04 20:29:50 +02:00