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

5454 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kirill Vainer
90c234175d Merge pull request #439 from InShadow/geometry-spelling 
Corrected spelling mistake.
 2016-03-04 19:36:00 -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
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
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
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
MeFisto94
2297520cf7 Fixed the Issue where removing a Control didn't set the dirty flag (made the Model Savable) 2016-03-01 23:46:06 +01:00
Alrik
03b351f26c - fix Bone constructor doesn't clone the given Bone object parameter 2016-03-01 22:58:43 +01:00
Alrik
0a45432cea Merge branch 'master' of https://github.com/jMonkeyEngine/jmonkeyengine.git 2016-03-01 22:55:31 +01:00
Kirill Vainer
f4098ce89c Merge pull request #432 from MeFisto94/AssetPath 
Be more verbose when the Asset Path is outside of the root.
 2016-03-01 12:30:49 -05:00
MeFisto94
a3372284e9 Be more verbose when the Asset Path is outside of the root. 2016-03-01 09:48:23 +01:00
Nehon
44601cf5ff Added an experimental MikkTspace generator v3.1.0-alpha2 2016-02-28 18:38:52 +01:00
Rémy Bouquet
963bbd42e5 Merge pull request #430 from MeFisto94/ShaderNodes 
Improved ShaderNodes, fixed some issues with error management and crash when selecting some nodes
 2016-02-28 08:27:17 +01:00
Rémy Bouquet
013fd08bd2 Merge pull request #426 from InShadow/cleanup-batch-node 
Batch node improvements
 2016-02-28 08:19:50 +01:00
Kirill Vainer
99665055b5 Merge pull request #417 from MeFisto94/342 
Simplified the AudioNode constructors (#342)
 2016-02-27 22:45:21 -05:00
Kirill Vainer
9b7b3638a7 Merge pull request #427 from grizeldi/master 
Update Bundle.propreties to jME3.1
 2016-02-27 22:42:21 -05:00
MeFisto94
a920d9c611 Improved ShaderNodes: 
* Fixed a NPE when trying to select a Node. Now you can properly remove/edit nodes
 * "smartLog" now compares the hash across different instances (Two Material Previews led to duplicate log messages)
 * Using smartLog for CompilationErrors now to not spam the log with 60 FPS
 2016-02-28 00:30:03 +01:00
InShadow
1073eba6be Cleaned up BatchNode a bit and implemented collideWith to work only with non-batched children. 2016-02-25 20:41:33 -08:00
Kirill Vainer
d0c7bd988e travis: cleanup 2016-02-25 12:01:21 -05:00
Kirill Vainer
1f4672264e travis: upload archives for tagged builds 2016-02-25 12:01:21 -05:00
InShadow
4047d2d2fd Merge pull request #1 from jMonkeyEngine/master 
Sync
 2016-02-25 09:00:52 -08:00
Kirill Vainer
82689b650a Merge pull request #425 from InShadow/patch-javadoc-encoding 
Forcing the project to always build JavaDoc with UTF-8 encoding.
 2016-02-25 11:38:34 -05:00
InShadow
78a921e300 Forcing the project to always build JavaDoc with UTF-8 encoding. 2016-02-25 08:26:56 -08:00
Kirill Vainer
67fef7e767 travis: test to find out why upload doesn't work 2016-02-25 10:43:14 -05:00
Kirill Vainer
bc8ecc3bc3 Update Particle.vert 2016-02-25 10:24:46 -05:00
Kirill Vainer
3d8cbda240 version: fix tag parsing issues 2016-02-24 18:48:06 -05:00
Kirill Vainer
5935db5261 Merge pull request #404 from davidB/exp_bintray2 
build: upload on bintray from travis when a git tag is set
 2016-02-24 17:43:12 -05:00
David Bernard
c0af575487 build: remove “git …”.execute() to retrieve git tag. 2016-02-24 22:46:47 +01:00
grizeldi
a6a066149e Update Bundle.propreties to jME3.1 2016-02-24 21:16:56 +01:00
MeFisto94
c90048595f Removed AudioNode.Type in favor of AudioData.DataType, which is what we are using now. 2016-02-24 02:46:16 +01:00
David Bernard
8e866561b8 build: travis fix typo double double quote 2016-02-23 17:06:34 +01:00
David Bernard
4815016906 build: travis move uploadArchives to after_success section 2016-02-23 17:02:30 +01:00
Kirill Vainer
57c91c1c29 Merge pull request #381 from TripleSnail/master 
Interpolate particle positions
 2016-02-23 10:49:37 -05:00
David Bernard
f39ff62864 build: replace developers list by generic ‘jMonkeyEngine Team’ 2016-02-23 14:37:46 +01:00
David Bernard
9416387111 build: release version defined from tag in format “vX.Y.Z” and “vX.Y.Z-M”. 
Refactor to clearly split behaviour when release (based on tag) or not (SNAPSHOT).
 2016-02-23 14:32:24 +01:00
Dokthar
01a6a0e8a0 sdk filters : modification of the lookup for JmeFilter 2016-02-23 13:57:06 +01:00
Dokthar
bc6ced1ed4 sdk filters : replaced all Jme*Filter by a unique JmeFilter 2016-02-23 13:51:36 +01:00