diff --git a/ALVR/App.config b/ALVR/App.config
index 35bb1006..44628533 100644
--- a/ALVR/App.config
+++ b/ALVR/App.config
@@ -79,6 +79,9 @@
1
+
+ False
+
\ No newline at end of file
diff --git a/ALVR/Launcher.Designer.cs b/ALVR/Launcher.Designer.cs
index b6ccb527..53cd187a 100644
--- a/ALVR/Launcher.Designer.cs
+++ b/ALVR/Launcher.Designer.cs
@@ -29,13 +29,13 @@ protected override void Dispose(bool disposing)
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle14 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Launcher));
this.metroButton1 = new MetroFramework.Controls.MetroButton();
this.metroButton2 = new MetroFramework.Controls.MetroButton();
@@ -147,6 +147,7 @@ private void InitializeComponent()
this.timer1 = new System.Windows.Forms.Timer(this.components);
this.pictureBox1 = new System.Windows.Forms.PictureBox();
this.openFileDialog1 = new System.Windows.Forms.OpenFileDialog();
+ this.onlySteamVRCheckBox = new MetroFramework.Controls.MetroCheckBox();
this.metroTabControl1.SuspendLayout();
this.serverTab.SuspendLayout();
this.findingPanel.SuspendLayout();
@@ -211,7 +212,7 @@ private void InitializeComponent()
this.metroTabControl1.Controls.Add(this.aboutTab);
this.metroTabControl1.Location = new System.Drawing.Point(23, 63);
this.metroTabControl1.Name = "metroTabControl1";
- this.metroTabControl1.SelectedIndex = 3;
+ this.metroTabControl1.SelectedIndex = 4;
this.metroTabControl1.Size = new System.Drawing.Size(664, 396);
this.metroTabControl1.TabIndex = 8;
//
@@ -263,14 +264,14 @@ private void InitializeComponent()
this.dataGridView1.AllowUserToResizeRows = false;
this.dataGridView1.BackgroundColor = System.Drawing.Color.White;
this.dataGridView1.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None;
- dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
- dataGridViewCellStyle8.BackColor = System.Drawing.SystemColors.Control;
- dataGridViewCellStyle8.Font = new System.Drawing.Font("MS UI Gothic", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
- dataGridViewCellStyle8.ForeColor = System.Drawing.SystemColors.WindowText;
- dataGridViewCellStyle8.SelectionBackColor = System.Drawing.SystemColors.Highlight;
- dataGridViewCellStyle8.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
- dataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
- this.dataGridView1.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle8;
+ dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+ dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control;
+ dataGridViewCellStyle1.Font = new System.Drawing.Font("MS UI Gothic", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+ dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText;
+ dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+ dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+ dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+ this.dataGridView1.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1;
this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.dataGridView1.ColumnHeadersVisible = false;
this.dataGridView1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
@@ -278,30 +279,30 @@ private void InitializeComponent()
this.AddressColumn,
this.refreshRateColumn,
this.Button});
- dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
- dataGridViewCellStyle9.BackColor = System.Drawing.SystemColors.Window;
- dataGridViewCellStyle9.Font = new System.Drawing.Font("MS UI Gothic", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
- dataGridViewCellStyle9.ForeColor = System.Drawing.SystemColors.ControlText;
- dataGridViewCellStyle9.SelectionBackColor = System.Drawing.SystemColors.Highlight;
- dataGridViewCellStyle9.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
- dataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
- this.dataGridView1.DefaultCellStyle = dataGridViewCellStyle9;
+ dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+ dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window;
+ dataGridViewCellStyle2.Font = new System.Drawing.Font("MS UI Gothic", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+ dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlText;
+ dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+ dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+ dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+ this.dataGridView1.DefaultCellStyle = dataGridViewCellStyle2;
this.dataGridView1.Location = new System.Drawing.Point(29, 28);
this.dataGridView1.Name = "dataGridView1";
this.dataGridView1.ReadOnly = true;
- dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
- dataGridViewCellStyle10.BackColor = System.Drawing.SystemColors.Control;
- dataGridViewCellStyle10.Font = new System.Drawing.Font("MS UI Gothic", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
- dataGridViewCellStyle10.ForeColor = System.Drawing.SystemColors.WindowText;
- dataGridViewCellStyle10.SelectionBackColor = System.Drawing.SystemColors.Highlight;
- dataGridViewCellStyle10.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
- dataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
- this.dataGridView1.RowHeadersDefaultCellStyle = dataGridViewCellStyle10;
+ dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+ dataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Control;
+ dataGridViewCellStyle3.Font = new System.Drawing.Font("MS UI Gothic", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+ dataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.WindowText;
+ dataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+ dataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+ dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+ this.dataGridView1.RowHeadersDefaultCellStyle = dataGridViewCellStyle3;
this.dataGridView1.RowHeadersVisible = false;
- dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
- dataGridViewCellStyle11.SelectionBackColor = System.Drawing.Color.White;
- dataGridViewCellStyle11.SelectionForeColor = System.Drawing.Color.Black;
- this.dataGridView1.RowsDefaultCellStyle = dataGridViewCellStyle11;
+ dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+ dataGridViewCellStyle4.SelectionBackColor = System.Drawing.Color.White;
+ dataGridViewCellStyle4.SelectionForeColor = System.Drawing.Color.Black;
+ this.dataGridView1.RowsDefaultCellStyle = dataGridViewCellStyle4;
this.dataGridView1.RowTemplate.DefaultCellStyle.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(192)))), ((int)(((byte)(192)))));
this.dataGridView1.RowTemplate.Height = 40;
this.dataGridView1.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
@@ -393,38 +394,38 @@ private void InitializeComponent()
this.statDataGridView.AllowUserToDeleteRows = false;
this.statDataGridView.BackgroundColor = System.Drawing.Color.White;
this.statDataGridView.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None;
- dataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
- dataGridViewCellStyle12.BackColor = System.Drawing.SystemColors.Control;
- dataGridViewCellStyle12.Font = new System.Drawing.Font("MS UI Gothic", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
- dataGridViewCellStyle12.ForeColor = System.Drawing.SystemColors.WindowText;
- dataGridViewCellStyle12.SelectionBackColor = System.Drawing.SystemColors.Highlight;
- dataGridViewCellStyle12.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
- dataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
- this.statDataGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle12;
+ dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+ dataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Control;
+ dataGridViewCellStyle5.Font = new System.Drawing.Font("MS UI Gothic", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+ dataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.WindowText;
+ dataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+ dataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+ dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+ this.statDataGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle5;
this.statDataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.statDataGridView.ColumnHeadersVisible = false;
this.statDataGridView.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.Name1,
this.Value1});
- dataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
- dataGridViewCellStyle13.BackColor = System.Drawing.SystemColors.Window;
- dataGridViewCellStyle13.Font = new System.Drawing.Font("MS UI Gothic", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
- dataGridViewCellStyle13.ForeColor = System.Drawing.SystemColors.ControlText;
- dataGridViewCellStyle13.SelectionBackColor = System.Drawing.SystemColors.Highlight;
- dataGridViewCellStyle13.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
- dataGridViewCellStyle13.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
- this.statDataGridView.DefaultCellStyle = dataGridViewCellStyle13;
+ dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+ dataGridViewCellStyle6.BackColor = System.Drawing.SystemColors.Window;
+ dataGridViewCellStyle6.Font = new System.Drawing.Font("MS UI Gothic", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+ dataGridViewCellStyle6.ForeColor = System.Drawing.SystemColors.ControlText;
+ dataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+ dataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+ dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+ this.statDataGridView.DefaultCellStyle = dataGridViewCellStyle6;
this.statDataGridView.Location = new System.Drawing.Point(282, 28);
this.statDataGridView.Name = "statDataGridView";
this.statDataGridView.ReadOnly = true;
- dataGridViewCellStyle14.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
- dataGridViewCellStyle14.BackColor = System.Drawing.SystemColors.Control;
- dataGridViewCellStyle14.Font = new System.Drawing.Font("MS UI Gothic", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
- dataGridViewCellStyle14.ForeColor = System.Drawing.SystemColors.WindowText;
- dataGridViewCellStyle14.SelectionBackColor = System.Drawing.SystemColors.Highlight;
- dataGridViewCellStyle14.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
- dataGridViewCellStyle14.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
- this.statDataGridView.RowHeadersDefaultCellStyle = dataGridViewCellStyle14;
+ dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+ dataGridViewCellStyle7.BackColor = System.Drawing.SystemColors.Control;
+ dataGridViewCellStyle7.Font = new System.Drawing.Font("MS UI Gothic", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+ dataGridViewCellStyle7.ForeColor = System.Drawing.SystemColors.WindowText;
+ dataGridViewCellStyle7.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+ dataGridViewCellStyle7.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+ dataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+ this.statDataGridView.RowHeadersDefaultCellStyle = dataGridViewCellStyle7;
this.statDataGridView.RowHeadersVisible = false;
this.statDataGridView.RowTemplate.DefaultCellStyle.SelectionBackColor = System.Drawing.Color.White;
this.statDataGridView.RowTemplate.DefaultCellStyle.SelectionForeColor = System.Drawing.Color.Black;
@@ -903,11 +904,12 @@ private void InitializeComponent()
this.otherTab.Controls.Add(this.metroLabel26);
this.otherTab.Controls.Add(this.metroLabel25);
this.otherTab.Controls.Add(this.metroLabel24);
+ this.otherTab.Controls.Add(this.onlySteamVRCheckBox);
this.otherTab.Controls.Add(this.fakeTrackingReferenceCheckBox);
this.otherTab.HorizontalScrollbarBarColor = true;
this.otherTab.Location = new System.Drawing.Point(4, 38);
this.otherTab.Name = "otherTab";
- this.otherTab.Size = new System.Drawing.Size(656, 283);
+ this.otherTab.Size = new System.Drawing.Size(656, 354);
this.otherTab.TabIndex = 7;
this.otherTab.Text = "Other";
this.otherTab.VerticalScrollbar = true;
@@ -944,7 +946,7 @@ private void InitializeComponent()
// metroLabel28
//
this.metroLabel28.AutoSize = true;
- this.metroLabel28.Location = new System.Drawing.Point(37, 197);
+ this.metroLabel28.Location = new System.Drawing.Point(39, 208);
this.metroLabel28.Name = "metroLabel28";
this.metroLabel28.Size = new System.Drawing.Size(92, 19);
this.metroLabel28.TabIndex = 17;
@@ -953,7 +955,7 @@ private void InitializeComponent()
// metroLabel27
//
this.metroLabel27.AutoSize = true;
- this.metroLabel27.Location = new System.Drawing.Point(53, 168);
+ this.metroLabel27.Location = new System.Drawing.Point(55, 179);
this.metroLabel27.Name = "metroLabel27";
this.metroLabel27.Size = new System.Drawing.Size(76, 19);
this.metroLabel27.TabIndex = 17;
@@ -961,7 +963,7 @@ private void InitializeComponent()
//
// refDisconnectCommandButton
//
- this.refDisconnectCommandButton.Location = new System.Drawing.Point(525, 197);
+ this.refDisconnectCommandButton.Location = new System.Drawing.Point(527, 208);
this.refDisconnectCommandButton.Name = "refDisconnectCommandButton";
this.refDisconnectCommandButton.Size = new System.Drawing.Size(52, 23);
this.refDisconnectCommandButton.TabIndex = 16;
@@ -970,7 +972,7 @@ private void InitializeComponent()
//
// refConnectCommandButton
//
- this.refConnectCommandButton.Location = new System.Drawing.Point(525, 168);
+ this.refConnectCommandButton.Location = new System.Drawing.Point(527, 179);
this.refConnectCommandButton.Name = "refConnectCommandButton";
this.refConnectCommandButton.Size = new System.Drawing.Size(52, 23);
this.refConnectCommandButton.TabIndex = 16;
@@ -980,7 +982,7 @@ private void InitializeComponent()
// disconnectCommandTextBox
//
this.disconnectCommandTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", global::ALVR.Properties.Settings.Default, "disconnectCommand", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
- this.disconnectCommandTextBox.Location = new System.Drawing.Point(135, 197);
+ this.disconnectCommandTextBox.Location = new System.Drawing.Point(137, 208);
this.disconnectCommandTextBox.Name = "disconnectCommandTextBox";
this.disconnectCommandTextBox.Size = new System.Drawing.Size(383, 23);
this.disconnectCommandTextBox.TabIndex = 15;
@@ -989,7 +991,7 @@ private void InitializeComponent()
// connectCommandTextBox
//
this.connectCommandTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", global::ALVR.Properties.Settings.Default, "connectCommand", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
- this.connectCommandTextBox.Location = new System.Drawing.Point(135, 168);
+ this.connectCommandTextBox.Location = new System.Drawing.Point(137, 179);
this.connectCommandTextBox.Name = "connectCommandTextBox";
this.connectCommandTextBox.Size = new System.Drawing.Size(383, 23);
this.connectCommandTextBox.TabIndex = 15;
@@ -1055,7 +1057,7 @@ private void InitializeComponent()
// metroLabel26
//
this.metroLabel26.AutoSize = true;
- this.metroLabel26.Location = new System.Drawing.Point(33, 140);
+ this.metroLabel26.Location = new System.Drawing.Point(35, 151);
this.metroLabel26.Name = "metroLabel26";
this.metroLabel26.Size = new System.Drawing.Size(95, 19);
this.metroLabel26.TabIndex = 3;
@@ -1402,6 +1404,18 @@ private void InitializeComponent()
//
this.openFileDialog1.FileName = "openFileDialog1";
//
+ // onlySteamVRCheckBox
+ //
+ this.onlySteamVRCheckBox.AutoSize = true;
+ this.onlySteamVRCheckBox.Checked = global::ALVR.Properties.Settings.Default.onlySteamVR;
+ this.onlySteamVRCheckBox.DataBindings.Add(new System.Windows.Forms.Binding("Checked", global::ALVR.Properties.Settings.Default, "onlySteamVR", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
+ this.onlySteamVRCheckBox.Location = new System.Drawing.Point(407, 16);
+ this.onlySteamVRCheckBox.Name = "onlySteamVRCheckBox";
+ this.onlySteamVRCheckBox.Size = new System.Drawing.Size(221, 15);
+ this.onlySteamVRCheckBox.TabIndex = 2;
+ this.onlySteamVRCheckBox.Text = "Launch only SteamVR without Steam.";
+ this.onlySteamVRCheckBox.UseVisualStyleBackColor = true;
+ //
// Launcher
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
@@ -1556,6 +1570,7 @@ private void InitializeComponent()
private MetroFramework.Controls.MetroComboBox codecComboBox;
private MetroFramework.Controls.MetroLabel metroLabel31;
private MetroFramework.Controls.MetroLabel metroLabel32;
+ private MetroFramework.Controls.MetroCheckBox onlySteamVRCheckBox;
}
}
diff --git a/ALVR/Launcher.cs b/ALVR/Launcher.cs
index c23e49b5..d66dcaaf 100644
--- a/ALVR/Launcher.cs
+++ b/ALVR/Launcher.cs
@@ -182,7 +182,14 @@ private void LaunchServer()
return;
}
- Process.Start("vrmonitor:");
+ if (Properties.Settings.Default.onlySteamVR)
+ {
+ Utils.LaunchOnlySteamVR();
+ }
+ else
+ {
+ Utils.LaunchSteam();
+ }
}
private bool SaveConfig()
diff --git a/ALVR/Launcher.resx b/ALVR/Launcher.resx
index 755bd5ea..06c450da 100644
--- a/ALVR/Launcher.resx
+++ b/ALVR/Launcher.resx
@@ -138,9 +138,6 @@
303, 17
-
- 303, 17
-
17, 17
diff --git a/ALVR/Properties/Settings.Designer.cs b/ALVR/Properties/Settings.Designer.cs
index 10ef00cc..86dbb1ad 100644
--- a/ALVR/Properties/Settings.Designer.cs
+++ b/ALVR/Properties/Settings.Designer.cs
@@ -298,5 +298,17 @@ public int codec {
this["codec"] = value;
}
}
+
+ [global::System.Configuration.UserScopedSettingAttribute()]
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.Configuration.DefaultSettingValueAttribute("False")]
+ public bool onlySteamVR {
+ get {
+ return ((bool)(this["onlySteamVR"]));
+ }
+ set {
+ this["onlySteamVR"] = value;
+ }
+ }
}
}
diff --git a/ALVR/Properties/Settings.settings b/ALVR/Properties/Settings.settings
index 96a1a606..f3f4ca65 100644
--- a/ALVR/Properties/Settings.settings
+++ b/ALVR/Properties/Settings.settings
@@ -71,5 +71,8 @@
1
+
+ False
+
\ No newline at end of file
diff --git a/ALVR/Utils.cs b/ALVR/Utils.cs
index ed073753..26f0a6d5 100644
--- a/ALVR/Utils.cs
+++ b/ALVR/Utils.cs
@@ -78,5 +78,15 @@ public static Process ExecuteProcess(string path, string args)
}
return process;
}
+
+ public static void LaunchOnlySteamVR()
+ {
+ Process.Start("vrmonitor:");
+ }
+
+ public static void LaunchSteam()
+ {
+ Process.Start("steam://run/250820");
+ }
}
}