bilke

diff --git a/Applications/CLI/ogs.cpp b/Applications/CLI/ogs.cpp
index 7fe7214fc..7468e2355 100644
--- a/Applications/CLI/ogs.cpp
+++ b/Applications/CLI/ogs.cpp
@@ -119,11 +119,9 @@ int main(int argc, char *argv[])
                                 outdir_arg.getValue());
 
 #ifdef USE_INSITU
-            auto isInsituConfigured = false;
             if (auto t = project_config->getConfigSubtreeOptional("insitu"))

bilke

{
    name: "viscenter",
    host: "localhost",
    port: 9090,
    index_port: 9292,
    background: {
        color: "#ff3333"
    },
    ui: {
        clock: 24,

bilke

Keybase proof

I hereby claim:

• I am bilke on github.
• I am bilke (https://keybase.io/bilke) on keybase.
• I have a public key whose fingerprint is 2D51 A08E 6890 2E01 9B64 55A2 1A3B B331 BC2F 7FD4

To claim this, I am signing this object:

bilke

#!/bin/sh
#
# Provides missing crontab editing
# Note: Synology crond requires arguments separated by a TAB character
# and the crontab user field only supports root.  These requirements are
# enforced by this script.
#
# John Kelly, 2013-05-03
#
SCRIPTNAME=`basename $0`

bilke

module () { eval `/usr/local/modules/3.2.10-1/Modules/3.2.10/bin/modulecmd sh $*`; }

set +x
module load cmake/3.1.1-1
module load gcc/4.8.1-3
module load boost/1.55.0-3_gcc_4.8.1
module load eigen/3.2.0-1
module load doxygen/1.8.7-1_gcc_4.8.1
module load numdiff/5.8.1-1

bilke

diff --git a/public/src/ui_builder.js b/public/src/ui_builder.js
index 431bcb0..4ff6716 100755
--- a/public/src/ui_builder.js
+++ b/public/src/ui_builder.js
@@ -267,6 +267,13 @@ function UIBuilder(json_cfg, clientID) {
 			// Calculate offsets for borders
 			var borderx  = (x + 1) * this.json_cfg.resolution.borders.left + x * this.json_cfg.resolution.borders.right;
 			var bordery  = (y + 1) * this.json_cfg.resolution.borders.top  + y * this.json_cfg.resolution.borders.bottom;
+
+			if (this.json_cfg.dimensions.tile_overlap.horizontal != 0 ||

bilke

diff --git a/Assets/MiddleVR/Scripts/Internal/VRManagerScript.cs b/Assets/MiddleVR/Scripts/Internal/VRManagerScript.cs
index 7a64f93..0e7d4cc 100644
--- a/Assets/MiddleVR/Scripts/Internal/VRManagerScript.cs
+++ b/Assets/MiddleVR/Scripts/Internal/VRManagerScript.cs
@@ -106,7 +106,10 @@ public class VRManagerScript : MonoBehaviour
         }
         set
         {
-            _EnableNavigationFly(value);
+            if (m_Wand == null)

bilke

diff --git a/Assets/MarkLight/Source/Plugins/DependencyViewFields.cs b/Assets/MarkLight/Source/Plugins/DependencyViewFields.csindex 2e9b511..8eeba1e 100644
--- a/Assets/MarkLight/Source/Plugins/DependencyViewFields.cs
+++ b/Assets/MarkLight/Source/Plugins/DependencyViewFields.cs
@@ -43,26 +43,27 @@ namespace MarkLight
         public static implicit operator Color(_Color value) { return value.Value; }
     }

-       [Serializable]
-       public class _ElementSize : ViewField<ElementSize>
-       {

bilke

diff --git a/Assets/MiddleVR/Editor/VRCustomEditor.cs b/Assets/MiddleVR/Editor/VRCustomEditor.cs
index 48f930e..e0450c7 100644
--- a/Assets/MiddleVR/Editor/VRCustomEditor.cs
+++ b/Assets/MiddleVR/Editor/VRCustomEditor.cs
@@ -23,8 +23,9 @@ using UnityEditor.Callbacks;
 [CustomEditor(typeof(VRManagerScript))]
 public class VRCustomEditor : Editor
 {
-    //This will just be a shortcut to the target, ex: the object you clicked on.
-    private VRManagerScript mgr;

bilke

λ git diff
warning: LF will be replaced by CRLF in dune/common/debugallocator.cc.
The file will have its original line endings in your working directory.
diff --git a/dune/common/debugallocator.cc b/dune/common/debugallocator.cc
index a833050..3f8ac77 100644
--- a/dune/common/debugallocator.cc
+++ b/dune/common/debugallocator.cc
@@ -7,7 +7,7 @@
 #include "debugallocator.hh"