From 95b4c75f9f417c9210bb2b91d3e4c9f95b705d2a Mon Sep 17 00:00:00 2001 From: Atlante45 Date: Fri, 1 May 2015 00:21:29 +0200 Subject: [PATCH 1/2] Add missing DM::set<>() calls --- assignment-client/src/AssignmentClient.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/assignment-client/src/AssignmentClient.cpp b/assignment-client/src/AssignmentClient.cpp index 594805c7c2..39dcf4b29c 100644 --- a/assignment-client/src/AssignmentClient.cpp +++ b/assignment-client/src/AssignmentClient.cpp @@ -18,6 +18,7 @@ #include #include #include +#include #include #include #include @@ -53,7 +54,10 @@ AssignmentClient::AssignmentClient(int ppid, Assignment::Type requestAssignmentT // create a NodeList as an unassigned client DependencyManager::registerInheritance(); auto addressManager = DependencyManager::set(); - auto nodeList = DependencyManager::set(NodeType::Unassigned); + auto nodeList = DependencyManager::set(NodeType::Unassigned); // Order is important + + auto animationCache = DependencyManager::set(); + auto avatarHashMap = DependencyManager::set(); auto entityScriptingInterface = DependencyManager::set(); // make up a uuid for this child so the parent can tell us apart. This id will be changed From 762e6255d63996861dc361b18cd117dd9c0ea238 Mon Sep 17 00:00:00 2001 From: Atlante45 Date: Fri, 1 May 2015 00:34:24 +0200 Subject: [PATCH 2/2] Fix botProcedural include --- examples/acScripts/bot_procedural.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/acScripts/bot_procedural.js b/examples/acScripts/bot_procedural.js index 518ef8cc22..8386662dba 100644 --- a/examples/acScripts/bot_procedural.js +++ b/examples/acScripts/bot_procedural.js @@ -12,7 +12,7 @@ //For procedural walk animation HIFI_PUBLIC_BUCKET = "http://s3.amazonaws.com/hifi-public/"; -Script.include("proceduralAnimationAPI.js"); +Script.include(HIFI_PUBLIC_BUCKET + "scripts/acScripts/proceduralAnimationAPI.js"); var procAnimAPI = new ProcAnimAPI();