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

5501 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nehon
6a1383a155 Merge branch 'master' into PBRisComing 2016-02-28 18:39:31 +01:00
Nehon
44601cf5ff Added an experimental MikkTspace generator v3.1.0-alpha2 2016-02-28 18:38:52 +01:00
Nehon
570c714c25 Merge branch 'master' into PBRisComing 2016-02-28 16:42:01 +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
Nehon
a670877df1 Fixed Image disposal in LightProbeFactory (issue https://github.com/jMonkeyEngine/jmonkeyengine/issues/424) 2016-02-25 18:31:26 +01: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
Rémy Bouquet
0e580f9594 Merge pull request #422 from MeFisto94/ShaderNodes 
Two small ShaderNodes fixes : 
- clicking the technique combo box when there was only one technique was crashong the editor
- malformed def files was crashing the editor, we now wheck for missing or empty blocks
 2016-02-23 07:46:34 +01:00
MeFisto94
ecef8ff521 Two small ShaderNodes fixes 2016-02-23 01:42:32 +01:00
David Bernard
f29b77ea36 Merge remote-tracking branch 'upstream/master' into exp_bintray2 2016-02-22 23:34:08 +01:00
Rémy Bouquet
0b23f195e2 Merge pull request #408 from JavaSaBr/PBRisComing 
Added support of overriding
 2016-02-21 09:25:32 +01:00
Rémy Bouquet
a22412fcb8 Merge pull request #420 from MeFisto94/135 
Simplify Naming of SDK Windows (#135)
 2016-02-21 09:22:57 +01:00
Rémy Bouquet
32b93a5e96 Merge pull request #418 from MeFisto94/81 
Validate SkyboxWizard's Input (#81)
 2016-02-21 09:22:34 +01:00
MeFisto94
e051936f9b Simplify Naming of SDK Windows (#135) 2016-02-20 13:30:12 +01:00
MeFisto94
1c12b68bb0 Validate SkyboxWizard's Input on multiple ways to inform the user rather than throwing an exception (#81). 2016-02-20 11:19:07 +01:00
Kirill Vainer
2a959e17ab particle: fix fading not working correctly 2016-02-19 14:20:25 -05:00
MeFisto94
6f6e93e01b Simplified the AudioNode constructors (#342) and allow looping/seeking on every AudioNode now by default. 2016-02-19 00:59:15 +01:00
Paul Speed
947c576ca8 Merge pull request #416 from MeFisto94/CloneLights 
Fixes the bug of shallow copies when cloning lights
 2016-02-17 18:42:26 -05:00
MeFisto94
f233565031 Changed the copyright notice in the comments just like it was done on 25ca07d. 2016-02-18 00:10:39 +01:00
MeFisto94
6c4e8010f2 Fixes the bug of shallow copies when cloning lights (See http://hub.jmonkeyengine.org/t/what-is-the-expected-meaning-of-light-clone/35100 ) 2016-02-17 23:45:27 +01:00
Kirill Vainer
d1a09536e5 Merge pull request #415 from MeFisto94/master 
Fixes #360 : Material now serializes name
 2016-02-17 15:17:57 -05:00
MeFisto94
04566d8c6a Fixes #360 : Material now serializes name 2016-02-17 12:21:17 +01:00
Rémy Bouquet
bc73765d7c Merge pull request #414 from BorealFeast/PBRisComing 
Fixed indirect light extraction in Material
 2016-02-16 20:04:54 +01:00
Teencrusher
b4737b0206 Fixed indirect light extraction in Material 2016-02-16 13:38:37 -05:00
Paul Speed
8c1eb6f455 Merge pull request #413 from john01dav/EnqueueRunnable 
Added enqueue runnable
 2016-02-14 16:31:01 -05:00
john01dav
f9a9839228 Added enqueue runnable 2016-02-14 15:16:45 -06:00
Paul Speed
f128ff8df7 Merge pull request #409 from MeFisto94/JavaDoc 
Tiny Javadoc Issue
 2016-02-10 19:14:51 -05:00
MeFisto94
75360a2f92 Just a small javadoc issue that was catching my eye 2016-02-10 20:51:15 +01:00
javasabr
718b66ba62 Added support of overriding 2016-02-09 07:07:54 +03:00
jmekaelthas
1b99896be4 Bugfix: fixed a bug that caused ClassCastException while loading linked 
meshes.
 2016-02-08 13:29:02 +01:00