Daniel Johansson
|
9f9cb824cd
|
Fixed an issue with J3MLoader thinking certain texture path patterns with new texture options still looked like old style and hence ignoring new options and getting the texture path wrong.
|
2016-03-07 16:38:43 +00:00 |
|
Daniel Johansson
|
e530fa644b
|
Merged with master after pull.
|
2016-03-07 16:36:43 +00:00 |
|
Daniel Johansson
|
93ac80d44f
|
Fixed an issue with SSAO normal.vert throwing an error when using instancing.
|
2016-03-07 16:33:57 +00:00 |
|
Nehon
|
f14e609287
|
Updated MatParam.getAsString to reflect recent change on j3m texture parameter format
|
2016-03-07 00:30:20 +01:00 |
|
Daniel Johansson
|
763763503b
|
Updated lwjgl dependencies to version 3.0.0b
|
2016-03-06 20:32:42 +00:00 |
|
Kirill Vainer
|
644b8167b8
|
MPO: add example
|
2016-03-05 19:32:21 -05:00 |
|
Kirill Vainer
|
2cdb4a8486
|
spatial: fix bug in remove/clear MPO
add unit test for those methods
|
2016-03-05 19:31:26 -05:00 |
|
Kirill Vainer
|
152a7638cd
|
material: fix sort id unit test failure
|
2016-03-05 19:30:28 -05:00 |
|
Kirill Vainer
|
adc5084f5d
|
MPO: implement overrides on uniforms and add test
|
2016-03-05 19:05:36 -05:00 |
|
Kirill Vainer
|
42d76cfd29
|
MPO: implement propagation and add test
|
2016-03-05 19:02:16 -05:00 |
|
Kirill Vainer
|
ba22487c38
|
material: move technique logic into its own package
|
2016-03-05 18:59:04 -05:00 |
|
Kirill Vainer
|
00b6d904af
|
add StaticPassLightingLogic
|
2016-03-05 17:33:16 -05:00 |
|
Kirill Vainer
|
2d2c394b42
|
Merge remote-tracking branch 'origin/master' into experimental
|
2016-03-05 12:42:54 -05:00 |
|
Rémy Bouquet
|
eea4d54be7
|
removed sdks compilation form the engine compilation
|
2016-03-05 18:04:06 +01:00 |
|
Rémy Bouquet
|
6ff69d907f
|
Removed SDK from the Engine repo as it's been extracted in its own repo
|
2016-03-05 17:43:05 +01:00 |
|
Kirill Vainer
|
655457ab6a
|
Merge branch 'master' into experimental
|
2016-03-04 19:55:01 -05:00 |
|
Kirill Vainer
|
18dc729d6a
|
Merge branch 'BorealFeast-master'
|
2016-03-04 19:52:52 -05:00 |
|
Kirill Vainer
|
b431d16981
|
Cylinder: fix incorrect axis samples for closed
|
2016-03-04 19:51:18 -05:00 |
|
Kirill Vainer
|
90c234175d
|
Merge pull request #439 from InShadow/geometry-spelling
Corrected spelling mistake.
|
2016-03-04 19:36:00 -05:00 |
|
Kirill Vainer
|
7639657fc1
|
initial implementation of MPO (untested!)
|
2016-03-04 16:59:15 -05:00 |
|
Kirill Vainer
|
3b1b146014
|
Merge pull request #440 from MeFisto94/WelcomeScreen
WelcomeScreen sometimes didn't appear due to a fault
|
2016-03-04 10:40:39 -05:00 |
|
Rémy Bouquet
|
b746c71441
|
Used the instancing transformation method for the normal pass in SSAO as it was producing a crash when instancing was enabled.
|
2016-03-04 14:12:33 +01:00 |
|
MeFisto94
|
ab3ee87b17
|
WelcomeScreen sometimes didn't appear due to a fault
|
2016-03-04 12:16:49 +01:00 |
|
InShadow
|
6c9cd46e11
|
Corrected spelling mistake.
|
2016-03-03 21:57:19 -08:00 |
|
Rémy Bouquet
|
a22f6772e6
|
fixed a NPE in the shader node editor when the navigator panel is collapsed
|
2016-03-03 20:44:47 +01:00 |
|
Teencrusher
|
5468a48050
|
Removed the modification of the input parameter that lead to a wrong axisSamples member then the cylinder was closed
|
2016-03-03 13:23:04 -05:00 |
|
Kirill Vainer
|
eada244b34
|
lwjgl3: re-enable native loading for native bullet
|
2016-03-03 11:40:36 -05:00 |
|
Kirill Vainer
|
2f218f0cdb
|
Merge pull request #435 from AlrikG/BoneAnimationBindTransformBug
Bone animation bind transform bug
|
2016-03-02 17:11:05 -05:00 |
|
Kirill Vainer
|
e87f008244
|
build: fix missing version tag
|
2016-03-02 16:59:10 -05:00 |
|
Kirill Vainer
|
12b3c4a140
|
build: fix build error
|
2016-03-02 16:42:55 -05:00 |
|
Kirill Vainer
|
ae7fb6984c
|
lwjgl3: re-enable native loading for native bullet
|
2016-03-02 16:36:12 -05:00 |
|
Kirill Vainer
|
3b9e412f80
|
build: fix build errors
|
2016-03-02 16:35:45 -05:00 |
|
Alrik
|
f925e3eb81
|
- revert mistake
|
2016-03-02 21:44:51 +01:00 |
|
Alrik
|
546850130d
|
- make the comment more precise because user control and world inverse /
local bind pose transforms are also copied
|
2016-03-02 21:43:45 +01:00 |
|
Alrik
|
54d563dde2
|
- remove unnecessary comment
|
2016-03-02 21:32:04 +01:00 |
|
Kirill Vainer
|
8b2d38d52d
|
Merge pull request #423 from Dokthar/sdk
sdk filters : replaced all Jme...Filter by a single JmeFilter class
|
2016-03-02 15:00:48 -05:00 |
|
Kirill Vainer
|
9b3f6a475d
|
Merge pull request #434 from MeFisto94/SceneComposerFix
Fixed the Issue where removing a Control didn't set the dirty flag
|
2016-03-02 14:25:58 -05:00 |
|
Kirill Vainer
|
a416eafec5
|
Merge pull request #436 from TehLeo/patch-2
Update BufferUtils.java
|
2016-03-02 14:02:21 -05:00 |
|
Kirill Vainer
|
e541a5a147
|
lwjgl3: start jME3 on main thread (needed for mac)
|
2016-03-02 13:57:32 -05:00 |
|
Kirill Vainer
|
c77905a4a3
|
lwjgl3: fix syntax error
|
2016-03-02 13:57:31 -05:00 |
|
Kirill Vainer
|
91974a6800
|
lwjgl3: use lwjgl's native loader
|
2016-03-02 13:57:31 -05:00 |
|
Kirill Vainer
|
0aaa28e66b
|
Merge branch 'master' into experimental
|
2016-03-02 13:56:17 -05:00 |
|
Kirill Vainer
|
9b45189f48
|
lwjgl3: start jME3 on main thread (needed for mac)
|
2016-03-02 13:49:28 -05:00 |
|
Kirill Vainer
|
69eaf39da9
|
lwjgl3: fix syntax error
|
2016-03-02 13:47:17 -05:00 |
|
Kirill Vainer
|
8024babb47
|
lwjgl3: use lwjgl's native loader
|
2016-03-02 13:45:50 -05:00 |
|
Kirill Vainer
|
c7da1c4efd
|
desktop: don't show dialogs when headless
|
2016-03-02 13:44:12 -05:00 |
|
Kirill Vainer
|
ab8527770c
|
GLRenderer: support VBO without VAO
|
2016-03-02 13:41:46 -05:00 |
|
TehLeo
|
449bc443b3
|
Update BufferUtils.java
Fixes #395
|
2016-03-02 16:05:14 +01:00 |
|
MeFisto94
|
e33e226959
|
Removed duplicate code and placed it into JmeControl instead
|
2016-03-02 14:11:35 +01:00 |
|
Kirill Vainer
|
c6b568c125
|
test: disable NativeLibraryLoaderIT
using the filesystem on Travis-CI causes issues
|
2016-03-02 00:00:03 -05:00 |
|