Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

merge animations action #625

Closed
wants to merge 3 commits into from
Closed

merge animations action #625

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
248c896
merge animations action
neph1 Nov 27, 2024
75c0eb2
include config
neph1 Nov 27, 2024
2ccb23d
Merge branch 'master' into merge_animations
neph1 Nov 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion branding/core/core.jar/org/netbeans/core/startup/Bundle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Updated by build script
#Sat, 27 Aug 2011 22:46:29 +0200
currentVersion=jMonkeyEngine SDK 3.2.0-glsl-SNAPSHOT
currentVersion=jMonkeyEngine SDK 3.7.0-merge_animations-SNAPSHOT
LBL_splash_window_title=Starting jMonkeyEngine SDK
SPLASH_HEIGHT=350
SPLASH_WIDTH=500
Expand Down
4 changes: 2 additions & 2 deletions ...modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#Updated by build script
#Sat, 27 Aug 2011 22:46:29 +0200
CTL_MainWindow_Title=jMonkeyEngine SDK 3.2.0-glsl-SNAPSHOT
CTL_MainWindow_Title_No_Project=jMonkeyEngine SDK 3.2.0-glsl-SNAPSHOT
CTL_MainWindow_Title=jMonkeyEngine SDK 3.7.0-merge_animations-SNAPSHOT
CTL_MainWindow_Title_No_Project=jMonkeyEngine SDK 3.7.0-merge_animations-SNAPSHOT
12 changes: 9 additions & 3 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,9 @@ dependencies {
corelibs dep("org.jmonkeyengine:jme3-plugins-json:$jmeVersion-$jmeVersionTag", true, true)
corelibs dep("org.jmonkeyengine:jme3-lwjgl:$jmeVersion-$jmeVersionTag", true, true)
corelibs dep("org.jmonkeyengine:jme3-effects:$jmeVersion-$jmeVersionTag", true, true)
corelibs dep("com.github.stephengold:Minie:8.2.0", true, true) // replacement for bullet-native
corelibs dep("com.github.stephengold:Minie:8.2.0", false, false) // replacement for bullet-native
corelibs dep("com.github.stephengold:Heart:9.1.0", true, true) // requirement for Minie
corelibs dep("com.github.stephengold:Wes:0.8.1", true, true) // Animation toolkit
corelibs dep(fileTree("lib"), false, false)
corelibs dep("org.jmonkeyengine:jme3-jogg:$jmeVersion-$jmeVersionTag", true, true)

Expand All @@ -63,7 +64,6 @@ dependencies {
optlibs dep("org.jmonkeyengine:jme3-ios:$jmeVersion-$jmeVersionTag", true, true)
optlibs dep("org.jmonkeyengine:jme3-android-native:$jmeVersion-$jmeVersionTag", true, true)
optlibs dep("org.jmonkeyengine:jme3-lwjgl3:$jmeVersion-$jmeVersionTag", true, true)
optlibs dep("com.github.stephengold:Wes:0.8.1", true, true)
testdatalibs dep("org.jmonkeyengine:jme3-testdata:$jmeVersion-$jmeVersionTag", false, false)
examplelibs dep("org.jmonkeyengine:jme3-examples:$jmeVersion-$jmeVersionTag", false, true)
}
Expand Down Expand Up @@ -132,7 +132,13 @@ task copyBaseLibs(dependsOn:configurations.corelibs) {
into "jme3-core-baselibs/release/modules/ext/"
}
} else if( file.name.contains("Heart") && !isSourceOrJavadoc(file.name)) {
// Special handling of Minie, since it doesn't follow the name convention
// Special handling of Heart, since it doesn't follow the name convention
copy {
from file
into "jme3-core-baselibs/release/modules/ext/"
}
} else if( file.name.contains("Wes") && !isSourceOrJavadoc(file.name)) {
// Special handling of Wes, since it doesn't follow the name convention
copy {
from file
into "jme3-core-baselibs/release/modules/ext/"
Expand Down
2 changes: 1 addition & 1 deletion jme3-android/nbproject/project.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ license.file=../license-jme.txt
nbm.homepage=https://www.jmonkeyengine.org
nbm.module.author=Normen Hansen
nbm.needs.restart=true
spec.version.base=3.5.2
spec.version.base=3.7.0
2 changes: 1 addition & 1 deletion jme3-android/nbproject/project.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<compile-dependency/>
<run-dependency>
<release-version>1</release-version>
<specification-version>3.3.0</specification-version>
<specification-version>3.7.0</specification-version>
</run-dependency>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion jme3-angelfont/nbproject/project.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ javac.source=21
javac.compilerargs=-Xlint -Xlint\:-serial
nbm.homepage=https://www.jmonkeyengine.org
nbm.module.author=Normen Hansen
spec.version.base=3.5.2
spec.version.base=3.7.0
4 changes: 2 additions & 2 deletions jme3-angelfont/nbproject/project.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<compile-dependency/>
<run-dependency>
<release-version>1</release-version>
<specification-version>3.3.0</specification-version>
<specification-version>3.7.0</specification-version>
</run-dependency>
</dependency>
<dependency>
Expand All @@ -21,7 +21,7 @@
<compile-dependency/>
<run-dependency>
<release-version>1</release-version>
<specification-version>3.3.0</specification-version>
<specification-version>3.7.0</specification-version>
</run-dependency>
</dependency>
<dependency>
Expand Down
4 changes: 2 additions & 2 deletions jme3-assetbrowser/nbproject/genfiles.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ build.xml.script.CRC32=f284e28d
[email protected]
# 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=37385f23
nbproject/build-impl.xml.data.CRC32=a9fdd044
nbproject/build-impl.xml.script.CRC32=a691b4aa
nbproject/build-impl.xml.stylesheet.CRC32=49aa68b0@2.91
nbproject/build-impl.xml.stylesheet.CRC32=49aa68b0@2.95
12 changes: 6 additions & 6 deletions jme3-assetbrowser/nbproject/project.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<compile-dependency/>
<run-dependency>
<release-version>1</release-version>
<specification-version>3.6.0</specification-version>
<specification-version>3.7.0</specification-version>
</run-dependency>
</dependency>
<dependency>
Expand All @@ -21,7 +21,7 @@
<compile-dependency/>
<run-dependency>
<release-version>1</release-version>
<specification-version>3.6.0</specification-version>
<specification-version>3.7.0</specification-version>
</run-dependency>
</dependency>
<dependency>
Expand All @@ -30,7 +30,7 @@
<compile-dependency/>
<run-dependency>
<release-version>1</release-version>
<specification-version>3.6.0</specification-version>
<specification-version>3.7.0</specification-version>
</run-dependency>
</dependency>
<dependency>
Expand All @@ -39,7 +39,7 @@
<compile-dependency/>
<run-dependency>
<release-version>1</release-version>
<specification-version>3.6.0</specification-version>
<specification-version>3.7.0</specification-version>
</run-dependency>
</dependency>
<dependency>
Expand All @@ -48,7 +48,7 @@
<compile-dependency/>
<run-dependency>
<release-version>1</release-version>
<specification-version>3.6.0</specification-version>
<specification-version>3.7.0</specification-version>
</run-dependency>
</dependency>
<dependency>
Expand All @@ -57,7 +57,7 @@
<compile-dependency/>
<run-dependency>
<release-version>1</release-version>
<specification-version>3.6.0</specification-version>
<specification-version>3.7.0</specification-version>
</run-dependency>
</dependency>
<dependency>
Expand Down
4 changes: 2 additions & 2 deletions jme3-assetpack-support/nbproject/genfiles.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ build.xml.script.CRC32=c0969383
[email protected]
# 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=d9c1f5c5
nbproject/build-impl.xml.data.CRC32=15b8055f
nbproject/build-impl.xml.script.CRC32=4d376df0
nbproject/build-impl.xml.stylesheet.CRC32=49aa68b0@2.78
nbproject/build-impl.xml.stylesheet.CRC32=49aa68b0@2.95
2 changes: 1 addition & 1 deletion jme3-assetpack-support/nbproject/project.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ license.file=../license-jme.txt
nbm.homepage=https://www.jmonkeyengine.org
nbm.module.author=Normen Hansen
nbm.needs.restart=true
spec.version.base=3.5.2
spec.version.base=3.7.0
6 changes: 3 additions & 3 deletions jme3-assetpack-support/nbproject/project.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<compile-dependency/>
<run-dependency>
<release-version>1</release-version>
<specification-version>3.3.0</specification-version>
<specification-version>3.7.0</specification-version>
</run-dependency>
</dependency>
<dependency>
Expand All @@ -21,7 +21,7 @@
<compile-dependency/>
<run-dependency>
<release-version>1</release-version>
<specification-version>3.3.0</specification-version>
<specification-version>3.7.0</specification-version>
</run-dependency>
</dependency>
<dependency>
Expand All @@ -30,7 +30,7 @@
<compile-dependency/>
<run-dependency>
<release-version>1</release-version>
<specification-version>3.3.0</specification-version>
<specification-version>3.7.0</specification-version>
</run-dependency>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion jme3-autodesk/nbproject/project.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ auxiliary.org-netbeans-spi-editor-hints-projects.perProjectHintSettingsFile=nbpr
#Thu, 25 Aug 2011 20:26:49 +0200
javac.source=21
javac.compilerargs=-Xlint -Xlint\:-serial
spec.version.base=3.6.1
spec.version.base=3.7.0
4 changes: 2 additions & 2 deletions jme3-autodesk/nbproject/project.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<compile-dependency/>
<run-dependency>
<release-version>1</release-version>
<specification-version>3.6.1</specification-version>
<specification-version>3.7.0</specification-version>
</run-dependency>
</dependency>
<dependency>
Expand All @@ -21,7 +21,7 @@
<compile-dependency/>
<run-dependency>
<release-version>1</release-version>
<specification-version>3.6.1</specification-version>
<specification-version>3.7.0</specification-version>
</run-dependency>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion jme3-blender/nbproject/project.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ license.file=../license-jme.txt
nbm.homepage=https://www.jmonkeyengine.org
nbm.module.author=Kaelthas
nbm.needs.restart=true
spec.version.base=3.5.2
spec.version.base=3.7.0
6 changes: 3 additions & 3 deletions jme3-blender/nbproject/project.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<compile-dependency/>
<run-dependency>
<release-version>1</release-version>
<specification-version>3.6.1</specification-version>
<specification-version>3.7.0</specification-version>
</run-dependency>
</dependency>
<dependency>
Expand All @@ -21,7 +21,7 @@
<compile-dependency/>
<run-dependency>
<release-version>1</release-version>
<specification-version>3.6.1</specification-version>
<specification-version>3.7.0</specification-version>
</run-dependency>
</dependency>
<dependency>
Expand All @@ -30,7 +30,7 @@
<compile-dependency/>
<run-dependency>
<release-version>1</release-version>
<specification-version>3.6.1</specification-version>
<specification-version>3.7.0</specification-version>
</run-dependency>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion jme3-cinematics/nbproject/project.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ license.file=../license-jme.txt
nbm.homepage=https://www.jmonkeyengine.org
nbm.module.author=R\u00e9my Bouquet
nbm.needs.restart=true
spec.version.base=3.5.2
spec.version.base=3.7.0
6 changes: 3 additions & 3 deletions jme3-cinematics/nbproject/project.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<compile-dependency/>
<run-dependency>
<release-version>1</release-version>
<specification-version>3.3.0</specification-version>
<specification-version>3.7.0</specification-version>
</run-dependency>
</dependency>
<dependency>
Expand All @@ -21,7 +21,7 @@
<compile-dependency/>
<run-dependency>
<release-version>1</release-version>
<specification-version>3.3.0</specification-version>
<specification-version>3.7.0</specification-version>
</run-dependency>
</dependency>
<dependency>
Expand All @@ -30,7 +30,7 @@
<compile-dependency/>
<run-dependency>
<release-version>1</release-version>
<specification-version>3.3.0</specification-version>
<specification-version>3.7.0</specification-version>
</run-dependency>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion jme3-code-check/nbproject/project.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ javac.compilerargs=-Xlint -Xlint:-serial
license.file=../license-jme.txt
nbm.homepage=https://www.jmonkeyengine.org
nbm.module.author=Normen Hansen
spec.version.base=3.5.2
spec.version.base=3.7.0
2 changes: 1 addition & 1 deletion jme3-code-check/nbproject/project.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<compile-dependency/>
<run-dependency>
<release-version>1</release-version>
<specification-version>3.3.0</specification-version>
<specification-version>3.7.0</specification-version>
</run-dependency>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion jme3-codepalette/nbproject/project.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ license.file=../license-jme.txt
nbm.homepage=https://www.jmonkeyengine.org
nbm.module.author=Normen Hansen
nbm.needs.restart=true
spec.version.base=3.5.2
spec.version.base=3.7.0
8 changes: 4 additions & 4 deletions jme3-core-baselibs/nbproject/genfiles.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
build.xml.data.CRC32=dd2eed71
build.xml.data.CRC32=a81d1f46
build.xml.script.CRC32=cdae6a36
build.xml.stylesheet.CRC32=15ca8a54@2.78
build.xml.stylesheet.CRC32=15ca8a54@2.95
# 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=dd2eed71
nbproject/build-impl.xml.data.CRC32=a81d1f46
nbproject/build-impl.xml.script.CRC32=246f9b81
nbproject/build-impl.xml.stylesheet.CRC32=49aa68b0@2.78
nbproject/build-impl.xml.stylesheet.CRC32=49aa68b0@2.95
16 changes: 15 additions & 1 deletion jme3-core-baselibs/nbproject/project.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,21 @@
file.reference.Heart-9.0.0.jar=release/modules/ext/Heart-9.0.0.jar
file.reference.jme3-awt-dialogs-3.7.0-stable.jar=release/modules/ext/jme3-awt-dialogs-3.7.0-stable.jar
file.reference.jme3-core-3.7.0-stable.jar=release/modules/ext/jme3-core-3.7.0-stable.jar
file.reference.jme3-desktop-3.7.0-stable.jar=release/modules/ext/jme3-desktop-3.7.0-stable.jar
file.reference.jme3-effects-3.7.0-stable.jar=release/modules/ext/jme3-effects-3.7.0-stable.jar
file.reference.jme3-jogg-3.7.0-stable.jar=release/modules/ext/jme3-jogg-3.7.0-stable.jar
file.reference.jme3-lwjgl-3.7.0-stable.jar=release/modules/ext/jme3-lwjgl-3.7.0-stable.jar
file.reference.jme3-networking-3.7.0-stable.jar=release/modules/ext/jme3-networking-3.7.0-stable.jar
file.reference.jme3-niftygui-3.7.0-stable.jar=release/modules/ext/jme3-niftygui-3.7.0-stable.jar
file.reference.jme3-plugins-3.7.0-stable.jar=release/modules/ext/jme3-plugins-3.7.0-stable.jar
file.reference.jme3-plugins-json-3.7.0-stable.jar=release/modules/ext/jme3-plugins-json-3.7.0-stable.jar
file.reference.jme3-plugins-json-gson-3.7.0-stable.jar=release/modules/ext/jme3-plugins-json-gson-3.7.0-stable.jar
file.reference.jme3-terrain-3.7.0-stable.jar=release/modules/ext/jme3-terrain-3.7.0-stable.jar
file.reference.Minie-8.0.0.jar=release/modules/ext/Minie-8.0.0.jar
javac.source=21
javac.compilerargs=-Xlint -Xlint\:-serial
license.file=../license-jme.txt
nbm.homepage=https://www.jmonkeyengine.org
nbm.module.author=jMonkeyEngine
nbm.needs.restart=true
spec.version.base=3.5.2
spec.version.base=3.7.0
2 changes: 1 addition & 1 deletion jme3-core-libraries/nbproject/project.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ license.file=../license-jme.txt
nbm.homepage=https://www.jmonkeyengine.org
nbm.module.author=jMonkeyEngine
nbm.needs.restart=true
spec.version.base=3.5.2
spec.version.base=3.7.0
2 changes: 1 addition & 1 deletion jme3-core-updatecenters/nbproject/project.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#Thu, 25 Aug 2011 20:26:49 +0200
javac.source=21
javac.compilerargs=-Xlint -Xlint\:-serial
spec.version.base=3.5.2
spec.version.base=3.7.0
3 changes: 2 additions & 1 deletion jme3-core/nbproject/project.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
file.reference.commons-beanutils-1.8.3.jar=release/modules/ext/commons-beanutils-1.8.3.jar
#Thu, 25 Aug 2011 20:26:48 +0200
file.reference.DDSUtils.jar=release/modules/ext/DDSUtils.jar
#Thu, 25 Aug 2011 19:32:54 +0200
Expand All @@ -8,4 +9,4 @@ nbm.homepage=https://www.jmonkeyengine.org
nbm.module.author=Normen Hansen
nbm.needs.restart=true
project.license=jme
spec.version.base=3.5.2
spec.version.base=3.7.0
8 changes: 4 additions & 4 deletions jme3-core/nbproject/project.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<compile-dependency/>
<run-dependency>
<release-version>1</release-version>
<specification-version>3.6.0</specification-version>
<specification-version>3.7.0</specification-version>
</run-dependency>
</dependency>
<dependency>
Expand All @@ -21,20 +21,20 @@
<compile-dependency/>
<run-dependency>
<release-version>1</release-version>
<specification-version>3.6.0</specification-version>
<specification-version>3.7.0</specification-version>
</run-dependency>
</dependency>
<dependency>
<code-name-base>com.jme3.gde.core.updatecenters</code-name-base>
<run-dependency>
<specification-version>3.6.0</specification-version>
<specification-version>3.7.0</specification-version>
</run-dependency>
</dependency>
<dependency>
<code-name-base>com.jme3.gde.project.testdata</code-name-base>
<run-dependency>
<release-version>1</release-version>
<specification-version>3.6.0</specification-version>
<specification-version>3.7.0</specification-version>
</run-dependency>
</dependency>
<dependency>
Expand Down
Loading