Merge branch 'master' of https://github.com/highfidelity/hifi

BUILD.md

@@ -3,7 +3,7 @@ Dependencies
 * [cmake](http://www.cmake.org/cmake/resources/software.html) ~> 2.8.11
 * [Qt](http://qt-project.org/downloads) ~> 5.2.0
 * [zLib](http://www.zlib.net/) ~> 1.2.8
-* [glm](http://glm.g-truc.net/0.9.5/index.html) ~> 0.9.5.0
+* [glm](http://glm.g-truc.net/0.9.5/index.html) ~> 0.9.5.2
 * [qxmpp](https://code.google.com/p/qxmpp/) ~> 0.7.6
 
 #####Linux only
@@ -142,4 +142,4 @@ If you need to debug Interface, you can run interface from within Visual Studio
 ####Debugging Interface
 * In the Solution Explorer, right click interface and click Set as StartUp Project
 * Set the "Working Directory" for the Interface debugging sessions to the Debug output directory so that your application can load resources. Do this: right click interface and click Properties, choose Debugging from Configuration Properties, set Working Directory to .\Debug
-* Now you can run and debug interface through Visual Studio
+* Now you can run and debug interface through Visual Studio

README.md

@@ -23,7 +23,7 @@ Running Interface
 When you launch interface, you will automatically connect to our default domain: "root.highfidelity.io".
 
 If you don't see anything, make sure your preferences are pointing to 
-root.highfidelity.io, if you still have no luck it's possible our servers are 
+root.highfidelity.io (set your domain via Cmnd+D/Cntrl+D), if you still have no luck it's possible our servers are 
 simply down; if you're experiencing a major bug, let us know by adding an issue to this repository. 
 Make sure to include details about your computer and how to reproduce the bug. 
 

examples/hydraMove.js

@@ -162,11 +162,11 @@ function flyWithHydra(deltaTime) {
         if (thrustMultiplier < MAX_THRUST_MULTIPLIER) {
             thrustMultiplier *= 1 + (deltaTime * THRUST_INCREASE_RATE);
         }
-        var currentOrientation = MyAvatar.orientation;
+        var headOrientation = MyAvatar.headOrientation;
 
-        var front = Quat.getFront(currentOrientation);
+        var front = Quat.getFront(headOrientation);
-        var right = Quat.getRight(currentOrientation);
+        var right = Quat.getRight(headOrientation);
-        var up = Quat.getUp(currentOrientation);
+        var up = Quat.getUp(headOrientation);
     
         var thrustFront = Vec3.multiply(front, MyAvatar.scale * THRUST_MAG_HAND_JETS * 
                                         thrustJoystickPosition.y * thrustMultiplier * deltaTime);

interface/interface_en.ts

@@ -4,22 +4,22 @@
 <context>
     <name>Application</name>
     <message>
-        <location filename="src/Application.cpp" line="1380"/>
+        <location filename="src/Application.cpp" line="1381"/>
         <source>Export Voxels</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/Application.cpp" line="1381"/>
+        <location filename="src/Application.cpp" line="1382"/>
         <source>Sparse Voxel Octree Files (*.svo)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/Application.cpp" line="3617"/>
+        <location filename="src/Application.cpp" line="3623"/>
         <source>Open Script</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/Application.cpp" line="3618"/>
+        <location filename="src/Application.cpp" line="3624"/>
         <source>JavaScript Files (*.js)</source>
         <translation type="unfinished"></translation>
     </message>

interface/src/Application.cpp

@@ -169,6 +169,7 @@ Application::Application(int& argc, char** argv, timeval &startup_time) :
         _bytesPerSecond(0),
         _recentMaxPackets(0),
         _resetRecentMaxPacketsSoon(true),
+        _previousScriptLocation(),
         _logger(new FileLogger(this))
 {
     // read the ApplicationInfo.ini file for Name/Version/Domain information
@@ -3610,12 +3611,20 @@ void Application::loadScript(const QString& scriptName) {
 }
 
 void Application::loadDialog() {
-    // shut down and stop any existing script
+    QString suggestedName;
-    QString desktopLocation = QStandardPaths::writableLocation(QStandardPaths::DesktopLocation);
+
-    QString suggestedName = desktopLocation.append("/script.js");
+    if (_previousScriptLocation.isEmpty()) {
+        QString desktopLocation = QStandardPaths::writableLocation(QStandardPaths::DesktopLocation);
+        suggestedName = desktopLocation.append("/script.js");
+    } else {
+        suggestedName = _previousScriptLocation;
+    }
 
     QString fileNameString = QFileDialog::getOpenFileName(_glWidget, tr("Open Script"), suggestedName, 
                                                           tr("JavaScript Files (*.js)"));
+    if (!fileNameString.isEmpty()) {
+        _previousScriptLocation = fileNameString;
+    }
     
     loadScript(fileNameString);
 }

interface/src/Application.h

@@ -483,6 +483,8 @@ private:
     ControllerScriptingInterface _controllerScriptingInterface;
     QPointer<LogDialog> _logDialog;
 
+    QString _previousScriptLocation;
+
     FileLogger* _logger;
 
     void checkVersion();