Merge remote-tracking branch 'upstream/master'

jme3-android/src/main/java/com/jme3/renderer/android/OGLESShaderRenderer.java

@@ -392,9 +392,22 @@ public class OGLESShaderRenderer implements Renderer {
     public void clearBuffers(boolean color, boolean depth, boolean stencil) {
         int bits = 0;
         if (color) {
+            //See explanations of the depth below, we must enable color write to be able to clear the color buffer
+            if (context.colorWriteEnabled == false) {
+                GLES20.glColorMask(true, true, true, true);
+                context.colorWriteEnabled = true;
+            }
             bits = GLES20.GL_COLOR_BUFFER_BIT;
         }
         if (depth) {
+            //glClear(GL_DEPTH_BUFFER_BIT) seems to not work when glDepthMask is false
+            //here s some link on openl board
+            //http://www.opengl.org/discussion_boards/ubbthreads.php?ubb=showflat&Number=257223
+            //if depth clear is requested, we enable the depthMask
+            if (context.depthWriteEnabled == false) {
+                GLES20.glDepthMask(true);
+                context.depthWriteEnabled = true;
+            }
             bits |= GLES20.GL_DEPTH_BUFFER_BIT;
         }
         if (stencil) {

jme3-examples/build.gradle

@@ -44,7 +44,7 @@ jar.doFirst{
     }
 }
 
-task dist (dependsOn: ['build', ':jme3-jogl:jar', ':jme3-bullet:jar']){
+task dist (dependsOn: ['build', ':jme3-jogl:jar', ':jme3-bullet:jar']) << {
     // Copy all dependencies to ../dist/lib, remove versions from jar files
     configurations.compile.resolvedConfiguration.resolvedArtifacts.each { artifact ->
         copy {

jme3-ios/src/main/java/com/jme3/renderer/ios/IGLESShaderRenderer.java

@@ -121,9 +121,22 @@ public class IGLESShaderRenderer implements Renderer {
         logger.log(Level.FINE, "IGLESShaderRenderer clearBuffers");
         int bits = 0;
         if (color) {
+            //See explanations of the depth below, we must enable color write to be able to clear the color buffer
+            if (context.colorWriteEnabled == false) {
+                JmeIosGLES.glColorMask(true, true, true, true);
+                context.colorWriteEnabled = true;
+            }
             bits = JmeIosGLES.GL_COLOR_BUFFER_BIT;
         }
         if (depth) {
+            //glClear(GL_DEPTH_BUFFER_BIT) seems to not work when glDepthMask is false
+            //here s some link on openl board
+            //http://www.opengl.org/discussion_boards/ubbthreads.php?ubb=showflat&Number=257223
+            //if depth clear is requested, we enable the depthMask
+            if (context.depthWriteEnabled == false) {
+                JmeIosGLES.glDepthMask(true);
+                context.depthWriteEnabled = true;
+            }
             bits |= JmeIosGLES.GL_DEPTH_BUFFER_BIT;
         }
         if (stencil) {

jme3-niftygui/build.gradle

@@ -12,5 +12,5 @@ dependencies {
     compile project(':jme3-core')
     compile 'lessvoid:nifty:1.3.3'
     compile 'lessvoid:nifty-default-controls:1.3.3'
-//    compile 'lessvoid:nifty-style-black:1.3.3'
+    compile 'lessvoid:nifty-style-black:1.3.3'
 }

sdk/jme3-core-baselibs/nbproject/project.xml

@@ -29,7 +29,6 @@
         <package>com.jme3.scene.plugins.blender.lights</package>
         <package>com.jme3.scene.plugins.blender.materials</package>
         <package>com.jme3.scene.plugins.blender.meshes</package>
-        <package>com.jme3.scene.plugins.blender.meshes.builders</package>
         <package>com.jme3.scene.plugins.blender.modifiers</package>
         <package>com.jme3.scene.plugins.blender.objects</package>
         <package>com.jme3.scene.plugins.blender.particles</package>
@@ -67,6 +66,7 @@
         <package>com.jme3.material.plugins</package>
         <package>com.jme3.math</package>
         <package>com.jme3.post</package>
+        <package>com.jme3.profile</package>
         <package>com.jme3.renderer</package>
         <package>com.jme3.renderer.queue</package>
         <package>com.jme3.scene</package>
@@ -127,6 +127,8 @@
         <package>com.jme3.network.serializing.serializers</package>
         <package>com.jme3.niftygui</package>
         <package>com.jme3.export.xml</package>
+        <package>com.jme3.scene.plugins.fbx</package>
+        <package>com.jme3.scene.plugins.fbx.file</package>
         <package>com.jme3.scene.plugins.ogre</package>
         <package>com.jme3.scene.plugins.ogre.matext</package>
         <package>com.jme3.terrain</package>

sdk/jme3-core-libraries/nbproject/project.xml

@@ -215,6 +215,10 @@
         <runtime-relative-path>ext/nifty-default-controls-1.3.3.jar</runtime-relative-path>
         <binary-origin>release/modules/ext/nifty-default-controls-1.3.3.jar</binary-origin>
       </class-path-extension>
+      <class-path-extension>
+        <runtime-relative-path>ext/nifty-style-black-1.3.3.jar</runtime-relative-path>
+        <binary-origin>release/modules/ext/nifty-style-black-1.3.3.jar</binary-origin>
+      </class-path-extension>
       <class-path-extension>
         <runtime-relative-path>ext/xpp3-1.1.4c.jar</runtime-relative-path>
         <binary-origin>release/modules/ext/xpp3-1.1.4c.jar</binary-origin>

sdk/jme3-core/src/com/jme3/gde/core/core-helpset.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-To change this template, choose Tools | Templates
-and open the template in the editor.
--->
-<!DOCTYPE helpsetref PUBLIC "-//NetBeans//DTD JavaHelp Help Set Reference 1.0//EN" "http://www.netbeans.org/dtds/helpsetref-1_0.dtd">
-<helpsetref url="nbdocs:/com/jme3/gde/core/docs/core-hs.xml"/>

sdk/jme3-core/src/com/jme3/gde/core/layer.xml

@@ -319,9 +319,6 @@
     </folder>
     <folder name="Services">
         <folder name="JavaHelp">
-            <file name="core-helpset.xml" url="core-helpset.xml">
-                <attr name="position" intvalue="3358"/>
-            </file>
             <file name="org-netbeans-modules-java-helpset.xml_hidden"/>
         </folder>
         <folder name="MIMEResolver">

sdk/jme3-gui/nbproject/genfiles.properties

@@ -8,12 +8,12 @@ nbproject/build-impl.xml.data.CRC32=971927a9
 nbproject/build-impl.xml.script.CRC32=55a34aaf
 nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.66.1
 =======
-build.xml.data.CRC32=d998e9a1
+build.xml.data.CRC32=e69ed2ba
 build.xml.script.CRC32=a0136781
-build.xml.stylesheet.CRC32=a56c6a5b@2.56.1
+build.xml.stylesheet.CRC32=a56c6a5b@2.66.1
 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=d998e9a1
+nbproject/build-impl.xml.data.CRC32=e69ed2ba
 nbproject/build-impl.xml.script.CRC32=55a34aaf
-nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.56.1
+nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.66.1
 >>>>>>> experimental

sdk/jme3-gui/nbproject/project.properties

@@ -1,8 +1,19 @@
+file.reference.beansbinding-1.2.1.jar=release/modules/ext/beansbinding-1.2.1.jar
+file.reference.guava-16.0.1.jar=release/modules/ext/guava-16.0.1.jar
+file.reference.javassist.jar=release/modules/ext/javassist.jar
+file.reference.jTatoo.jar=release/modules/ext/jTatoo.jar
+file.reference.Nifty-Editor0.5.7.jar=release/modules/ext/Nifty-Editor0.5.7.jar
+file.reference.nifty-java2d-renderer-1.4.0-SNAPSHOT.jar=release/modules/ext/nifty-java2d-renderer-1.4.0-SNAPSHOT.jar
+file.reference.reflections-0.9.9-RC1.jar=release/modules/ext/reflections-0.9.9-RC1.jar
+file.reference.relaxngDatatype-1.5.jar=release/modules/ext/relaxngDatatype-1.5.jar
+file.reference.slf4j-simple-1.7.7.jar=release/modules/ext/slf4j-simple-1.7.7.jar
+file.reference.swingtonifty.jar=release/modules/ext/swingtonifty.jar
+file.reference.xsom-20110101-SNAPSHOT.jar=release/modules/ext/xsom-20110101-SNAPSHOT.jar
 #Thu, 25 Aug 2011 20:26:49 +0200
 javac.source=1.5
-javac.compilerargs=-Xlint -Xlint\:-serial
+javac.compilerargs=-Xlint -Xlint:-serial
 license.file=../license-jme.txt
-nbm.homepage=http\://www.jmonkeyengine.com
+nbm.homepage=http://www.jmonkeyengine.com
-nbm.module.author=Normen Hansen
+nbm.module.author=Relucri
 nbm.needs.restart=true
 spec.version.base=3.1.0

sdk/jme3-gui/nbproject/project.xml

@@ -42,6 +42,15 @@
                         <specification-version>1.36.1</specification-version>
                     </run-dependency>
                 </dependency>
+                <dependency>
+                    <code-name-base>org.netbeans.api.progress</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <release-version>1</release-version>
+                        <specification-version>1.37.1</specification-version>
+                    </run-dependency>
+                </dependency>
                 <dependency>
                     <code-name-base>org.netbeans.core.multiview</code-name-base>
                     <build-prerequisite/>
@@ -51,6 +60,15 @@
                         <specification-version>1.32.1</specification-version>
                     </run-dependency>
                 </dependency>
+                <dependency>
+                    <code-name-base>org.netbeans.modules.editor.mimelookup</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <release-version>1</release-version>
+                        <specification-version>1.35.1</specification-version>
+                    </run-dependency>
+                </dependency>
                 <dependency>
                     <code-name-base>org.netbeans.modules.java.project</code-name-base>
                     <build-prerequisite/>
@@ -78,6 +96,15 @@
                         <implementation-version/>
                     </run-dependency>
                 </dependency>
+                <dependency>
+                    <code-name-base>org.netbeans.spi.navigator</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <release-version>1</release-version>
+                        <specification-version>1.32.1</specification-version>
+                    </run-dependency>
+                </dependency>
                 <dependency>
                     <code-name-base>org.netbeans.spi.palette</code-name-base>
                     <build-prerequisite/>
@@ -171,10 +198,50 @@
             <public-packages>
                 <package>com.jme3.gde.gui</package>
             </public-packages>
+            <class-path-extension>
+                <runtime-relative-path>ext/xsom-20110101-SNAPSHOT.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/xsom-20110101-SNAPSHOT.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/guava-16.0.1.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/guava-16.0.1.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/reflections-0.9.9-RC1.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/reflections-0.9.9-RC1.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/jTatoo.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/jTatoo.jar</binary-origin>
+            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/swingtonifty.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/swingtonifty.jar</binary-origin>
             </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/slf4j-simple-1.7.7.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/slf4j-simple-1.7.7.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/nifty-java2d-renderer-1.4.0-SNAPSHOT.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/nifty-java2d-renderer-1.4.0-SNAPSHOT.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/javassist.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/javassist.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/beansbinding-1.2.1.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/beansbinding-1.2.1.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/Nifty-Editor0.5.7.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/Nifty-Editor0.5.7.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/relaxngDatatype-1.5.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/relaxngDatatype-1.5.jar</binary-origin>
+            </class-path-extension>
         </data>
     </configuration>
 </project>

sdk/jme3-gui/src/com/jme3/gde/gui/view/NiftyGuiVisualElement.java

@@ -4,12 +4,16 @@
  */
 package com.jme3.gde.gui.view;
 
-import com.jme3.app.Application;
+import com.jme3.asset.AssetInfo;
+import com.jme3.asset.AssetKey;
+import com.jme3.asset.AssetManager;
+import com.jme3.asset.AssetNotFoundException;
 import com.jme3.gde.core.assets.ProjectAssetManager;
 import com.jme3.gde.gui.NiftyGuiDataObject;
 import com.jme3.gde.gui.nodes.GElementNode;
 import com.jme3.gde.gui.nodes.GUINode;
 import de.lessvoid.nifty.Nifty;
+import de.lessvoid.nifty.tools.resourceloader.ResourceLocation;
 import jada.ngeditor.controller.CommandProcessor;
 import jada.ngeditor.controller.GUIEditor;
 import jada.ngeditor.guiviews.DND.PaletteDropTarget;
@@ -27,21 +31,18 @@ import java.awt.event.ItemEvent;
 import java.awt.event.ItemListener;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
-import java.beans.PropertyVetoException;
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
-import java.util.ArrayList;
+import java.net.URL;
 import java.util.Collection;
 import java.util.Collections;
-import java.util.HashSet;
 import java.util.Observable;
 import java.util.Observer;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import javax.swing.Action;
-import javax.swing.ActionMap;
 import javax.swing.DefaultComboBoxModel;
 import javax.swing.JComboBox;
 import javax.swing.JComponent;
@@ -58,18 +59,14 @@ import org.netbeans.core.spi.multiview.MultiViewElementCallback;
 import org.netbeans.spi.actions.AbstractSavable;
 import org.openide.awt.UndoRedo;
 import org.openide.explorer.ExplorerManager;
-import org.openide.explorer.ExplorerUtils;
 import org.openide.loaders.DataObject;
-import org.openide.nodes.Node;
 import org.openide.util.Exceptions;
 import org.openide.util.Lookup;
 import org.openide.util.NbBundle.Messages;
 import org.openide.util.lookup.AbstractLookup;
 import org.openide.util.lookup.InstanceContent;
-import org.openide.util.lookup.ProxyLookup;
 import org.openide.windows.TopComponent;
 import org.xml.sax.SAXException;
-import sun.rmi.runtime.Log;
 
 @MultiViewElement.Registration(
         displayName = "#LBL_NiftyGui_VISUAL",
@@ -93,13 +90,37 @@ public final class NiftyGuiVisualElement extends JPanel implements MultiViewElem
     private int guiID;
      private final InstanceContent content = new InstanceContent();
      private Lookup lookup;
+     private AssetManager assetManager;
+
+    protected class ResourceLocationJmp implements ResourceLocation {
+
+        public InputStream getResourceAsStream(String path) {
+            AssetKey<Object> key = new AssetKey<Object>(path);
+            AssetInfo info = assetManager.locateAsset(key);
+            if (info != null){
+                return info.openStream();
+            }else{
+                throw new AssetNotFoundException(path);
+            }
+        }
+
+        public URL getResource(String path) {
+            throw new UnsupportedOperationException();
+        }
+    }
+    
+    private ResourceLocation resourceLocation = new ResourceLocationJmp();
+    
         
     public NiftyGuiVisualElement(Lookup lkp) {
         obj = lkp.lookup(NiftyGuiDataObject.class);
         assert obj != null;
+        assetManager = obj.getLookup().lookup(AssetManager.class);
+        assert assetManager != null;
+        System.out.println("AssetManagerNifty " + assetManager);
         initComponents();
         view = new J2DNiftyView(800, 600);
-        view.init();
+        view.init(resourceLocation);
         this.scrollArea.getViewport().addChangeListener(view);
         this.scrollArea.setViewportView(view);
         TrasferHandling tranf = new TrasferHandling();

sdk/jme3-project-baselibs/src/com/jme3/gde/project/baselibs/jme3-jogl.xml

@@ -7,42 +7,42 @@
   <volume>
     <type>classpath</type>
     <resource>jar:nbinst://com.jme3.gde.project.baselibs/libs/jme3-jogl-3.1.0-snapshot-github.jar!/</resource>
-    <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/gluegen-rt-main-2.1.4.jar!/</resource>
+    <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/gluegen-rt-main-2.2.0.jar!/</resource>
-    <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/jogl-all-main-2.1.4.jar!/</resource>
+    <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/jogl-all-main-2.2.0.jar!/</resource>
-    <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/joal-main-2.1.4.jar!/</resource>
+    <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/joal-main-2.2.0.jar!/</resource>
-    <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/gluegen-rt-2.1.4-natives-android-armv6.jar!/</resource>
+    <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/gluegen-rt-2.2.0-natives-android-armv6.jar!/</resource>
-    <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/gluegen-rt-2.1.4-natives-linux-amd64.jar!/</resource>
+    <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/gluegen-rt-2.2.0-natives-linux-amd64.jar!/</resource>
-    <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/gluegen-rt-2.1.4-natives-linux-armv6.jar!/</resource>
+    <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/gluegen-rt-2.2.0-natives-linux-armv6.jar!/</resource>
-    <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/gluegen-rt-2.1.4-natives-linux-armv6hf.jar!/</resource>
+    <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/gluegen-rt-2.2.0-natives-linux-armv6hf.jar!/</resource>
-    <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/gluegen-rt-2.1.4-natives-linux-i586.jar!/</resource>
+    <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/gluegen-rt-2.2.0-natives-linux-i586.jar!/</resource>
-    <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/gluegen-rt-2.1.4-natives-macosx-universal.jar!/</resource>
+    <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/gluegen-rt-2.2.0-natives-macosx-universal.jar!/</resource>
-    <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/gluegen-rt-2.1.4-natives-solaris-amd64.jar!/</resource>
+    <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/gluegen-rt-2.2.0-natives-solaris-amd64.jar!/</resource>
-    <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/gluegen-rt-2.1.4-natives-solaris-i586.jar!/</resource>
+    <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/gluegen-rt-2.2.0-natives-solaris-i586.jar!/</resource>
-    <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/gluegen-rt-2.1.4-natives-windows-amd64.jar!/</resource>
+    <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/gluegen-rt-2.2.0-natives-windows-amd64.jar!/</resource>
-    <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/gluegen-rt-2.1.4-natives-windows-i586.jar!/</resource>
+    <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/gluegen-rt-2.2.0-natives-windows-i586.jar!/</resource>
-    <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/gluegen-rt-2.1.4.jar!/</resource>
+    <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/gluegen-rt-2.2.0.jar!/</resource>
-    <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/jogl-all-2.1.4-natives-android-armv6.jar!/</resource>
+    <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/jogl-all-2.2.0-natives-android-armv6.jar!/</resource>
-    <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/jogl-all-2.1.4-natives-linux-amd64.jar!/</resource>
+    <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/jogl-all-2.2.0-natives-linux-amd64.jar!/</resource>
-    <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/jogl-all-2.1.4-natives-linux-armv6.jar!/</resource>
+    <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/jogl-all-2.2.0-natives-linux-armv6.jar!/</resource>
-    <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/jogl-all-2.1.4-natives-linux-armv6hf.jar!/</resource>
+    <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/jogl-all-2.2.0-natives-linux-armv6hf.jar!/</resource>
-    <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/jogl-all-2.1.4-natives-linux-i586.jar!/</resource>
+    <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/jogl-all-2.2.0-natives-linux-i586.jar!/</resource>
-    <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/jogl-all-2.1.4-natives-macosx-universal.jar!/</resource>
+    <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/jogl-all-2.2.0-natives-macosx-universal.jar!/</resource>
-    <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/jogl-all-2.1.4-natives-solaris-amd64.jar!/</resource>
+    <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/jogl-all-2.2.0-natives-solaris-amd64.jar!/</resource>
-    <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/jogl-all-2.1.4-natives-solaris-i586.jar!/</resource>
+    <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/jogl-all-2.2.0-natives-solaris-i586.jar!/</resource>
-    <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/jogl-all-2.1.4-natives-windows-amd64.jar!/</resource>
+    <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/jogl-all-2.2.0-natives-windows-amd64.jar!/</resource>
-    <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/jogl-all-2.1.4-natives-windows-i586.jar!/</resource>
+    <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/jogl-all-2.2.0-natives-windows-i586.jar!/</resource>
-    <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/jogl-all-2.1.4.jar!/</resource>
+    <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/jogl-all-2.2.0.jar!/</resource>
-    <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/joal-2.1.4-natives-android-armv6.jar!/</resource>
+    <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/joal-2.2.0-natives-android-armv6.jar!/</resource>
-    <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/joal-2.1.4-natives-linux-amd64.jar!/</resource>
+    <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/joal-2.2.0-natives-linux-amd64.jar!/</resource>
-    <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/joal-2.1.4-natives-linux-armv6.jar!/</resource>
+    <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/joal-2.2.0-natives-linux-armv6.jar!/</resource>
-    <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/joal-2.1.4-natives-linux-armv6hf.jar!/</resource>
+    <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/joal-2.2.0-natives-linux-armv6hf.jar!/</resource>
-    <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/joal-2.1.4-natives-linux-i586.jar!/</resource>
+    <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/joal-2.2.0-natives-linux-i586.jar!/</resource>
-    <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/joal-2.1.4-natives-macosx-universal.jar!/</resource>
+    <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/joal-2.2.0-natives-macosx-universal.jar!/</resource>
-    <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/joal-2.1.4-natives-solaris-amd64.jar!/</resource>
+    <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/joal-2.2.0-natives-solaris-amd64.jar!/</resource>
-    <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/joal-2.1.4-natives-solaris-i586.jar!/</resource>
+    <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/joal-2.2.0-natives-solaris-i586.jar!/</resource>
-    <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/joal-2.1.4-natives-windows-amd64.jar!/</resource>
+    <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/joal-2.2.0-natives-windows-amd64.jar!/</resource>
-    <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/joal-2.1.4-natives-windows-i586.jar!/</resource>
+    <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/joal-2.2.0-natives-windows-i586.jar!/</resource>
-    <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/joal-2.1.4.jar!/</resource>
+    <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/joal-2.2.0.jar!/</resource>
   </volume>
   <volume>
     <type>src</type>

sdk/jme3-project-baselibs/src/com/jme3/gde/project/baselibs/jme3-niftygui.xml

@@ -9,6 +9,7 @@
     <resource>jar:nbinst://com.jme3.gde.project.baselibs/libs/jme3-niftygui-3.1.0-snapshot-github.jar!/</resource>
     <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/nifty-1.3.3.jar!/</resource>
     <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/nifty-default-controls-1.3.3.jar!/</resource>
+    <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/nifty-style-black-1.3.3.jar!/</resource>
     <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/xpp3-1.1.4c.jar!/</resource>
     <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/eventbus-1.4.jar!/</resource>
     <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/jglfont-core-1.3.jar!/</resource>