Merge branch 'develop' into window-restyle

ClientApp/ViewModels/LoginViewModel.cs

@@ -7,6 +7,7 @@ using System.Windows.Controls;
 using System.Windows.Input;
 using ClientApp.Utils;
 using GalaSoft.MvvmLight.Command;
+using Util;
 
 namespace ClientApp.ViewModels
 {

ClientApp/ViewModels/MainViewModel.cs

@@ -1,14 +1,15 @@
 using ClientApp.Models;
 using ClientApp.Utils;
 using GalaSoft.MvvmLight.Command;
+using System.Diagnostics;
 using System.Windows.Input;
+using Util;
 
 namespace ClientApp.ViewModels
 {
     class MainViewModel : ObservableObject
     {
         public ICommand RetryServerCommand { get; set; }
-        public ICommand RetryVREngineCommand { get; set; }
         public MainWindowViewModel MainWindowViewModel { get; set; }
 
         private Client client;
@@ -24,15 +25,6 @@ namespace ClientApp.ViewModels
                 //try connect server
                 this.MainWindowViewModel.InfoModel.ConnectedToServer = true;
             });
-            this.RetryVREngineCommand = new RelayCommand(() =>
-            {
-                //try connect vr-engine
-                
-                this.MainWindowViewModel.InfoModel.ConnectedToVREngine = true;
-                this.MainWindowViewModel.InfoModel.CanConnectToVR = false;
-                client.engineConnection.CreateConnection();
-
-            });
         }
 
         private void retryEngineConnection()

ClientApp/ViewModels/MainWindowViewModel.cs

@@ -6,6 +6,7 @@ using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Text;
+using Util;
 using System.Windows;
 using System.Windows.Input;