From 0347c12d4bbbab3c17c0b2c2d41f8819c16727cb Mon Sep 17 00:00:00 2001 From: rickard Date: Sat, 15 Apr 2023 16:23:51 +0200 Subject: [PATCH 1/2] behavior tree editor --- jme3-behaviortrees/nbproject/project.xml | 6 +++--- .../behaviortrees/editor/BTreeNodeEditorElement.java | 4 ++++ .../jme3/gde/behaviortrees/editor/TreeDiagram.java | 4 ++++ nbproject/project.properties | 12 +++++++----- 4 files changed, 18 insertions(+), 8 deletions(-) diff --git a/jme3-behaviortrees/nbproject/project.xml b/jme3-behaviortrees/nbproject/project.xml index bd9008e0b..7f014c152 100644 --- a/jme3-behaviortrees/nbproject/project.xml +++ b/jme3-behaviortrees/nbproject/project.xml @@ -12,7 +12,7 @@ 1 - 3.2.0 + 3.6.0 @@ -21,7 +21,7 @@ 1 - 3.2.0 + 3.6.0 @@ -30,7 +30,7 @@ 1 - 3.2.0 + 3.6.0 diff --git a/jme3-behaviortrees/src/com/jme3/gde/behaviortrees/editor/BTreeNodeEditorElement.java b/jme3-behaviortrees/src/com/jme3/gde/behaviortrees/editor/BTreeNodeEditorElement.java index c144b5f32..abf394c97 100644 --- a/jme3-behaviortrees/src/com/jme3/gde/behaviortrees/editor/BTreeNodeEditorElement.java +++ b/jme3-behaviortrees/src/com/jme3/gde/behaviortrees/editor/BTreeNodeEditorElement.java @@ -578,5 +578,9 @@ public void componentActivated() { } @Override public void componentDeactivated() { } + + @Override + public void notifyDefaultValueUpdated(String name, String value) { + } } diff --git a/jme3-behaviortrees/src/com/jme3/gde/behaviortrees/editor/TreeDiagram.java b/jme3-behaviortrees/src/com/jme3/gde/behaviortrees/editor/TreeDiagram.java index dbdff538d..99bed6e46 100644 --- a/jme3-behaviortrees/src/com/jme3/gde/behaviortrees/editor/TreeDiagram.java +++ b/jme3-behaviortrees/src/com/jme3/gde/behaviortrees/editor/TreeDiagram.java @@ -281,4 +281,8 @@ public List getOrphanedNodes() { public void restoreOrphanedNodes(List orphans) { orphans.forEach(o -> addNode(o)); } + + @Override + public void toggleUpdateThread(boolean on) { + } } diff --git a/nbproject/project.properties b/nbproject/project.properties index e5e8dde42..2619f2531 100644 --- a/nbproject/project.properties +++ b/nbproject/project.properties @@ -1,4 +1,4 @@ -#Sat, 19 Mar 2022 09:34:49 +0100 +#Wed, 05 Apr 2023 19:09:02 +0200 app.icon=branding/core/core.jar/org/netbeans/core/startup/frame48.gif #same as ${branding.token} app.name=jmonkeyplatform @@ -7,10 +7,10 @@ app.description=A complete 3D game development suite written purely in Java. app.categories=Development,Graphics,IDE,3DGraphics,Java app.icon.icns=jmonkeyplatform.icns #version name used for application and settings folder, no spaces! -app.version=3.4.1-SNAPSHOT +app.version=unknown #version number used for plugins, only 3 numbers (e.g. 3.1.3) -plugins.version=3.4.1 -nbm.revision=2026 +plugins.version=3.6.0 +nbm.revision=0 #command line args run.args.extra=-J-Dsun.java2d.noddraw\=true -J--add-opens\=java.base/java.net\=ALL-UNNAMED -J--add-exports\=java.desktop/sun.awt\=ALL-UNNAMED -J--add-opens\=java.desktop/javax.swing.text\=ALL-UNNAMED -J--add-opens\=java.desktop/javax.swing\=ALL-UNNAMED -J--add-opens\=java.prefs/java.util.prefs\=ALL-UNNAMED -J--add-opens\=java.base/java.security\=ALL-UNNAMED -J--add-exports\=java.base/sun.reflect.annotation\=ALL-UNNAMED auxiliary.org-netbeans-modules-apisupport-installer.license-file=license-jme.txt @@ -19,9 +19,10 @@ auxiliary.org-netbeans-modules-apisupport-installer.os-macosx=true auxiliary.org-netbeans-modules-apisupport-installer.os-solaris=false auxiliary.org-netbeans-modules-apisupport-installer.os-windows=true auxiliary.org-netbeans-modules-apisupport-installer.pack200-enabled=true -modules=${project.com.jme3.gde.core}\:${project.com.jme3.gde.core.baselibs}\:${project.com.jme3.gde.core.libraries}\:${project.com.jme3.gde.templates}\:${project.com.jme3.gde.project.baselibs}\:${project.com.jme3.gde.project.libraries}\:${project.com.jme3.gde.tests}\:${project.com.jme3.gde.project.testdata}\:${project.com.jme3.gde.scenecomposer}\:${project.com.jme3.gde.materials}\:${project.com.jme3.gde.gui}\:${project.com.jme3.gde.codepalette}\:${project.com.jme3.gde.textureeditor}\:${project.com.jme3.gde.core.updatecenters}\:${project.com.jme3.gde.wavefront}\:${project.com.jme3.gde.terraineditor}\:${project.com.jme3.gde.assetpack}\:${project.com.jme3.gde.modelimporter}\:${project.com.jme3.gde.lwjgl.applet}\:${project.com.jme3.gde.desktop.executables}\:${project.com.jme3.gde.cinematics}\:${project.com.jme3.gde.vehiclecreator}\:${project.com.jme3.gde.welcome}\:${project.com.jme3.gde.codecheck}\:${project.com.jme3.gde.obfuscate}\:${project.com.jme3.gde.blender}\:${project.com.jme3.gde.angelfont}\:${project.com.jme3.gde.android}\:${project.com.jme3.gde.nmgen}\:${project.com.jme3.gde.docs}\:${project.org.jme3.netbeans.plaf.darkmonkey}\:${project.com.jme3.gde.glsl.highlighter} +modules=${project.com.jme3.gde.core}\:${project.com.jme3.gde.core.baselibs}\:${project.com.jme3.gde.core.libraries}\:${project.com.jme3.gde.templates}\:${project.com.jme3.gde.project.baselibs}\:${project.com.jme3.gde.project.libraries}\:${project.com.jme3.gde.tests}\:${project.com.jme3.gde.project.testdata}\:${project.com.jme3.gde.scenecomposer}\:${project.com.jme3.gde.materials}\:${project.com.jme3.gde.gui}\:${project.com.jme3.gde.codepalette}\:${project.com.jme3.gde.textureeditor}\:${project.com.jme3.gde.core.updatecenters}\:${project.com.jme3.gde.wavefront}\:${project.com.jme3.gde.terraineditor}\:${project.com.jme3.gde.assetpack}\:${project.com.jme3.gde.modelimporter}\:${project.com.jme3.gde.lwjgl.applet}\:${project.com.jme3.gde.desktop.executables}\:${project.com.jme3.gde.cinematics}\:${project.com.jme3.gde.vehiclecreator}\:${project.com.jme3.gde.welcome}\:${project.com.jme3.gde.codecheck}\:${project.com.jme3.gde.obfuscate}\:${project.com.jme3.gde.blender}\:${project.com.jme3.gde.angelfont}\:${project.com.jme3.gde.android}\:${project.com.jme3.gde.nmgen}\:${project.com.jme3.gde.docs}\:${project.org.jme3.netbeans.plaf.darkmonkey}\:${project.com.jme3.gde.glsl.highlighter}\:${project.com.jme3.gde.assetbrowser} project.com.jme3.gde.android=jme3-android project.com.jme3.gde.angelfont=jme3-angelfont +project.com.jme3.gde.behaviortrees=jme3-behaviortrees project.com.jme3.gde.blender=jme3-blender project.com.jme3.gde.codecheck=jme3-code-check project.com.jme3.gde.customcontrols=jme3-custom-controls @@ -53,3 +54,4 @@ project.com.jme3.gde.vehiclecreator=jme3-vehicle-creator project.com.jme3.gde.wavefront=jme3-wavefront project.com.jme3.gde.welcome=jme3-welcome-screen project.org.jme3.netbeans.plaf.darkmonkey=jme3-dark-laf +project.com.jme3.gde.assetbrowser=jme3-assetbrowser From d285c904cf648a1da253e48a58dc9d0038ee3bb1 Mon Sep 17 00:00:00 2001 From: rickard Date: Sat, 15 Apr 2023 18:24:21 +0200 Subject: [PATCH 2/2] removed assetbrowser --- nbproject/project.properties | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/nbproject/project.properties b/nbproject/project.properties index 2619f2531..2c1e861d4 100644 --- a/nbproject/project.properties +++ b/nbproject/project.properties @@ -19,7 +19,7 @@ auxiliary.org-netbeans-modules-apisupport-installer.os-macosx=true auxiliary.org-netbeans-modules-apisupport-installer.os-solaris=false auxiliary.org-netbeans-modules-apisupport-installer.os-windows=true auxiliary.org-netbeans-modules-apisupport-installer.pack200-enabled=true -modules=${project.com.jme3.gde.core}\:${project.com.jme3.gde.core.baselibs}\:${project.com.jme3.gde.core.libraries}\:${project.com.jme3.gde.templates}\:${project.com.jme3.gde.project.baselibs}\:${project.com.jme3.gde.project.libraries}\:${project.com.jme3.gde.tests}\:${project.com.jme3.gde.project.testdata}\:${project.com.jme3.gde.scenecomposer}\:${project.com.jme3.gde.materials}\:${project.com.jme3.gde.gui}\:${project.com.jme3.gde.codepalette}\:${project.com.jme3.gde.textureeditor}\:${project.com.jme3.gde.core.updatecenters}\:${project.com.jme3.gde.wavefront}\:${project.com.jme3.gde.terraineditor}\:${project.com.jme3.gde.assetpack}\:${project.com.jme3.gde.modelimporter}\:${project.com.jme3.gde.lwjgl.applet}\:${project.com.jme3.gde.desktop.executables}\:${project.com.jme3.gde.cinematics}\:${project.com.jme3.gde.vehiclecreator}\:${project.com.jme3.gde.welcome}\:${project.com.jme3.gde.codecheck}\:${project.com.jme3.gde.obfuscate}\:${project.com.jme3.gde.blender}\:${project.com.jme3.gde.angelfont}\:${project.com.jme3.gde.android}\:${project.com.jme3.gde.nmgen}\:${project.com.jme3.gde.docs}\:${project.org.jme3.netbeans.plaf.darkmonkey}\:${project.com.jme3.gde.glsl.highlighter}\:${project.com.jme3.gde.assetbrowser} +modules=${project.com.jme3.gde.core}\:${project.com.jme3.gde.core.baselibs}\:${project.com.jme3.gde.core.libraries}\:${project.com.jme3.gde.templates}\:${project.com.jme3.gde.project.baselibs}\:${project.com.jme3.gde.project.libraries}\:${project.com.jme3.gde.tests}\:${project.com.jme3.gde.project.testdata}\:${project.com.jme3.gde.scenecomposer}\:${project.com.jme3.gde.materials}\:${project.com.jme3.gde.gui}\:${project.com.jme3.gde.codepalette}\:${project.com.jme3.gde.textureeditor}\:${project.com.jme3.gde.core.updatecenters}\:${project.com.jme3.gde.wavefront}\:${project.com.jme3.gde.terraineditor}\:${project.com.jme3.gde.assetpack}\:${project.com.jme3.gde.modelimporter}\:${project.com.jme3.gde.lwjgl.applet}\:${project.com.jme3.gde.desktop.executables}\:${project.com.jme3.gde.cinematics}\:${project.com.jme3.gde.vehiclecreator}\:${project.com.jme3.gde.welcome}\:${project.com.jme3.gde.codecheck}\:${project.com.jme3.gde.obfuscate}\:${project.com.jme3.gde.blender}\:${project.com.jme3.gde.angelfont}\:${project.com.jme3.gde.android}\:${project.com.jme3.gde.nmgen}\:${project.com.jme3.gde.docs}\:${project.org.jme3.netbeans.plaf.darkmonkey} project.com.jme3.gde.android=jme3-android project.com.jme3.gde.angelfont=jme3-angelfont project.com.jme3.gde.behaviortrees=jme3-behaviortrees @@ -54,4 +54,3 @@ project.com.jme3.gde.vehiclecreator=jme3-vehicle-creator project.com.jme3.gde.wavefront=jme3-wavefront project.com.jme3.gde.welcome=jme3-welcome-screen project.org.jme3.netbeans.plaf.darkmonkey=jme3-dark-laf -project.com.jme3.gde.assetbrowser=jme3-assetbrowser