Merge branch 'master' into bow

examples/breakdanceToy.js

@@ -11,7 +11,7 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-Script.include("../libraries/utils.js");
+Script.include("libraries/utils.js");
 Script.include("breakdanceCore.js");
 breakdanceStart();
 Script.update.connect(breakdanceUpdate);

examples/entityScripts/breakdanceEntity.js

@@ -12,7 +12,7 @@
 //
 
 (function() {
-    Script.include("../toys/breakdanceCore.js");
+    Script.include("../breakdanceCore.js");
     Script.include("../libraries/utils.js");
 
     var _this;

examples/magBalls.js

@@ -7,10 +7,10 @@
 //
 
 // FIXME Script paths have to be relative to the caller, in this case libraries/OmniTool.js
-Script.include("../entityScripts/magBalls/constants.js");
-Script.include("../entityScripts/magBalls/graph.js");
-Script.include("../entityScripts/magBalls/edgeSpring.js");
-Script.include("../entityScripts/magBalls/magBalls.js");
+Script.include("../magBalls/constants.js");
+Script.include("../magBalls/graph.js");
+Script.include("../magBalls/edgeSpring.js");
+Script.include("../magBalls/magBalls.js");
 Script.include("avatarRelativeOverlays.js");
 
 OmniToolModuleType = "MagBallsController"

tests/render-utils/CMakeLists.txt

@@ -8,6 +8,4 @@ set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "Tests/manual-tests/")
 # link in the shared libraries
 link_hifi_libraries(render-utils gpu shared)
 
-message(${PROJECT_BINARY_DIR})
-
 copy_dlls_beside_windows_executable()

tests/shaders/CMakeLists.txt

@@ -17,6 +17,4 @@ include_directories("${PROJECT_BINARY_DIR}/../../libraries/render-utils/")
 include_directories("${PROJECT_BINARY_DIR}/../../libraries/entities-renderer/")
 include_directories("${PROJECT_BINARY_DIR}/../../libraries/model/")
 
-message(${PROJECT_BINARY_DIR})
-
 copy_dlls_beside_windows_executable()