From c95d4d0f2d611377287a6e461362092a501287ac Mon Sep 17 00:00:00 2001 From: Joshua Slack Date: Wed, 18 Oct 2017 21:27:41 -0500 Subject: Fixed a bug in javascript caused by js engine change in Java 1.7+ --- .../com/ardor3d/extension/animation/skeletal/state/loader/functions.js | 3 +++ 1 file changed, 3 insertions(+) (limited to 'ardor3d-animation') diff --git a/ardor3d-animation/src/main/resources/com/ardor3d/extension/animation/skeletal/state/loader/functions.js b/ardor3d-animation/src/main/resources/com/ardor3d/extension/animation/skeletal/state/loader/functions.js index 4e0b2cd..d449a69 100644 --- a/ardor3d-animation/src/main/resources/com/ardor3d/extension/animation/skeletal/state/loader/functions.js +++ b/ardor3d-animation/src/main/resources/com/ardor3d/extension/animation/skeletal/state/loader/functions.js @@ -1,3 +1,6 @@ +// load our helper functions first... +try{ load("nashorn:mozilla_compat.js"); } catch(e){} + importPackage(Packages.com.ardor3d.extension.animation.skeletal); importPackage(Packages.com.ardor3d.extension.animation.skeletal.blendtree); importPackage(Packages.com.ardor3d.extension.animation.skeletal.clip); -- cgit v1.2.3 From 2fcedf5a18d680093a396f89fb55d79fbd1fb4cb Mon Sep 17 00:00:00 2001 From: Joshua Slack Date: Thu, 4 Jan 2018 13:19:57 -0600 Subject: Small tweak to eclipse project settings --- ardor3d-animation/.settings/org.eclipse.jdt.ui.prefs | 2 +- ardor3d-awt/.settings/org.eclipse.jdt.ui.prefs | 2 +- ardor3d-core/.settings/org.eclipse.jdt.ui.prefs | 2 +- ardor3d-effects/.settings/org.eclipse.jdt.ui.prefs | 2 +- ardor3d-examples/.settings/org.eclipse.jdt.ui.prefs | 2 +- ardor3d-extras/.settings/org.eclipse.jdt.ui.prefs | 2 +- ardor3d-jogl/.settings/org.eclipse.jdt.ui.prefs | 2 +- ardor3d-lwjgl/.settings/org.eclipse.jdt.ui.prefs | 2 +- ardor3d-swt/.settings/org.eclipse.jdt.ui.prefs | 2 +- ardor3d-terrain/.settings/org.eclipse.jdt.ui.prefs | 2 +- ardor3d-ui/.settings/org.eclipse.jdt.ui.prefs | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) (limited to 'ardor3d-animation') diff --git a/ardor3d-animation/.settings/org.eclipse.jdt.ui.prefs b/ardor3d-animation/.settings/org.eclipse.jdt.ui.prefs index 583471d..b79d20f 100644 --- a/ardor3d-animation/.settings/org.eclipse.jdt.ui.prefs +++ b/ardor3d-animation/.settings/org.eclipse.jdt.ui.prefs @@ -2,7 +2,7 @@ cleanup_settings_version=2 eclipse.preferences.version=1 editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true org.eclipse.jdt.ui.javadoc=false -org.eclipse.jdt.ui.text.custom_code_templates=