conflict_resolution
stringlengths
27
16k
<<<<<<< /// <summary> /// Whether sign in should be shown in Dynamo. In instances where Dynamo obtains /// authentication capabilities from a host, Dynamo's sign in should generally be /// hidden to avoid inconsistencies in state. /// </summary> public bool ...
<<<<<<< /// <summary> /// Indicates whether surface and solid edges will /// be rendered. /// </summary> public bool ShowEdges { get; set; } ======= /// <summary> /// Indicates the default state of the "Open in Manual Mode" /// checkbox in OpenFileDial...
<<<<<<< public void ProcessExit(object sender, EventArgs e) { messageQueue.Shutdown(); } ======= public void ExecuteFileFromSocket(byte[] file, string sessionId) { UploadFileMessage msg = new UploadFileMessage(file); ExecuteMessageFromSocket...
<<<<<<< using Dynamo.Utilities; using Dynamo.Core; ======= using Microsoft.Practices.Prism.ViewModel; >>>>>>> using Dynamo.Utilities; using Dynamo.Core; using Microsoft.Practices.Prism.ViewModel; <<<<<<< ======= >>>>>>>
<<<<<<< InPortData.Add(new PortData("colors", "A list of colors to include in the range.")); InPortData.Add(new PortData("indices", "A list of values between 0.0 and 1.0 which position the colors along the range.")); InPortData.Add(new PortData("value", "A list of values between 0 an...
<<<<<<< using Dynamo.UI.Commands; using DSCoreNodesUI.Properties; ======= using Microsoft.Practices.Prism.Commands; >>>>>>> using DSCoreNodesUI.Properties; using Microsoft.Practices.Prism.Commands; <<<<<<< RequiresRecalc = true; RaisePropertyChanged(/*NXLT*/"SelectionResults"); ======= ...
<<<<<<< Assert.AreEqual(42, ws.Nodes.Count()); // The number of connectors is less than what we would expect // beause several of the nodes load as un-commented dummy nodes. Assert.AreEqual(46, ws.Connectors.Count()); ======= Assert.AreEqual(42, ws.Nodes.Co...
<<<<<<< if (command.DefaultPosition == false) // Position was specified. { node.X = command.X; node.Y = command.Y; } if ((node is Symbol || node is Output) && CurrentWorkspace is HomeWorkspace) ======= if ((node is Symbol || ...
<<<<<<< undoRecorder.BeginActionGroup(); var newNodeWorkspace = new CustomNodeWorkspaceModel(args.Name, args.Category, args.Description, 0, 0) { WatchChanges = false, HasUnsavedChanges = true }; var newNodeDefinition = new Cus...
<<<<<<< } [HttpPut] [Route("api/v1/product/{ProductId:int:min(1)}/flags/{FeatureId:int:min(1)}/rollout")] public async Task<IActionResult> Rollout([FromRoute]RolloutFlagRequest rolloutFlagRequest, CancellationToken cancellationToken = default) { ======= } [Htt...
<<<<<<< var message = "'AttachmentToRowColumnConverter' expects a " + "'ConverterParameter' value to be either 'Row' or 'Column'"; ======= var message = Wpf.Properties.Resources.MessageFailedToAttachToRowColumn; >>>>>>> var message = Wpf.Properties....
<<<<<<< else if (message is ClearWorkspaceMessage) { ClearWorkspace(); } ======= else if (message is SaveFileMessage) { SaveFile(dynamo, message, sessionId); } else if (message is GetNodeGeometryMessage...
<<<<<<< RunCommandsFromFile("Defect_MAGN_57.xml"); ======= // Details are available in defect http://adsk-oss.myjetbrains.com/youtrack/issue/MAGN-57 RunCommandsFromFile("Defect_MAGN_57.xml", true); >>>>>>> // Details are available in defect http://adsk-oss.myjetbrains...
<<<<<<< ======= try { zipPath = Greg.Utility.FileUtilities.Zip(rootDir.FullName); info = new FileInfo(zipPath); } catch { // give nicer error throw new Exception("Could not compress file. Is th...
<<<<<<< ======= private Timer backupFilesTimer; >>>>>>> private Timer backupFilesTimer;
<<<<<<< //var env = new ExecutionEnvironment(); Controller = new DynamoController(typeof(DynamoViewModel), "None", null, updateManager, new DefaultWatchHandler(), new PreferenceSettings()) { Testing = true }; ======= var env = new ExecutionE...
<<<<<<< //return FScheme.Value.NewList(Utils.SequenceToFSharpList(data)); { FSharpList<FScheme.Value> result = FSharpList<FScheme.Value>.Empty; //data.reverse(); // this breaks under certain circumstances List<dynamic> reversal_list = new Lis...
<<<<<<< // Populating each class entry vtables with their respective // member variables signatures globalClassIndex = core.ClassTable.GetClassId(classDecl.className); ======= // Populating each class entry vtables with their respective member variable...
<<<<<<< ======= /// <summary> /// The maximum number of recent file paths to be saved. /// </summary> >>>>>>> /// <summary> /// The maximum number of recent file paths to be saved. /// </summary> <<<<<<< ======= public LengthUnit LengthUnit { ...
<<<<<<< [NodeDescription("ListMapDescription", typeof(Resources))] [NodeSearchTags("ListMapSearchTags",typeof(Resources))] ======= [NodeDescription("ListMapDescription", typeof(DSCoreNodesUI.Properties.Resources))] >>>>>>> [NodeDescription("ListMapDescription", typeof(DSCoreNodesUI.Properties.Resourc...
<<<<<<< runtimeCore.RuntimeStatus.LogWarning(WarningID.kDereferencingNonPointer, Resources.kDeferencingNonPointer); ======= core.RuntimeStatus.LogWarning(WarningID.kDereferencingNonPointer, ...
<<<<<<< public PackageLoader PackageLoader { get; private set; } ======= internal PackageLoader PackageLoader { get { return packageLoader; } } >>>>>>> internal PackageLoader PackageLoader { get; private set; } <<<<<<< PackageLoader.MessageLogged -= On...
<<<<<<< var c = new ConnectorViewModel(_port); dynSettings.Controller.DynamoViewModel.CurrentSpaceViewModel.ActiveConnector = c; dynSettings.Controller.DynamoViewModel.CurrentSpaceViewModel.IsConnecting = true; ======= if ...
<<<<<<< #region Icon Resources Strings public const string SmallIconPostfix = ".Small"; public const string LargeIconPostfix = ".Large"; public const string ResourcesDLL = ".resources.dll"; #endregion #region Class button public const int MaxLengthClassButtonTi...
<<<<<<< using ICSharpCode.AvalonEdit.Rendering; using ProtoCore.Mirror; ======= >>>>>>> using ProtoCore.Mirror; <<<<<<< private ICompletionData[] GetCompletionData(string code, string stringToComplete, Guid codeBlockGuid) { var completions = new List<CodeBlockCompletionData>(); ...
<<<<<<< using RuntimeWarning = ProtoCore.Runtime.WarningEntry; ======= using RuntimeWarning = ProtoCore.RuntimeData.WarningEntry; using ProtoCore.Utils; >>>>>>> using RuntimeWarning = ProtoCore.Runtime.WarningEntry; using ProtoCore.Utils;
<<<<<<< //private bool _isCustomFunction = false; ======= >>>>>>> <<<<<<< catch(CancelEvaluationException ex) ======= catch (CancelEvaluationException) >>>>>>>
<<<<<<< // Version information for an assembly consists of the following four values: // // Major Version // Minor Version // Build Number // Revision // // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: [assembly: AssemblyVersi...
<<<<<<< //string newNodeName ="", newNodeCategory =""; var args = new FunctionNamePromptEventArgs(); dynSettings.Controller.DynamoModel.OnRequestsFunctionNamePrompt(null, args); //if (!dynSettings.Controller.DynamoViewModel.ShowNewFunctionDialog(ref newNodeName, ref newN...
<<<<<<< /// <summary> /// </summary> /// <param name="workspaceGuid">Guid of the target workspace. Guid.Empty means current workspace</param> /// <param name="modelGuid">Guid of node model</param> /// <param name="name"></param> /// <param name="va...
<<<<<<< public List<ICustomNodeWorkspaceModel> CustomNodesWorkspaces ======= public List<CustomNodeWorkspaceModel> CustomNodeWorkspaces >>>>>>> public List<ICustomNodeWorkspaceModel> CustomNodeWorkspaces <<<<<<< CustomNodesWorkspaces = new List<ICustomNodeWorkspaceModel>(); ====...
<<<<<<< services.AddMvc(options => options.EnableEndpointRouting = false) .AddNewtonsoftJson(); // In production, the React files will be served from this directory services.AddSpaStaticFiles(configuration => { configuration.RootPath = "C...
<<<<<<< DocumentManager.CurrentDoc = dynRevitSettings.Doc.Document; if (!DynamoViewModel.RunInDebug) { //Do we need manual transaction control? bool manualTrans = topElements.Any(CheckManualTransaction.TraverseUntilAny); ======= DocumentM...
<<<<<<< private readonly string rootPkgDir; private readonly CustomNodeManager customNodeManager; ======= [Obsolete] internal readonly static string PackageContainsBinariesConstant = "|ContainsBinaries(5C698212-A139-4DDD-8657-1BF892C79821)"; [Obsolete] internal readonl...
<<<<<<< /// <summary> /// Determine if undo operation is currently possible. /// </summary> public bool CanUndo { get { return ((null == undoRecorder) ? false : undoRecorder.CanUndo); } } /// <summary> /// Determine if redo operation i...
<<<<<<< { throw new Exception(/*NXLT*/"The header is missing a name or version field."); } ======= throw new Exception("The header is missing a name or version field."); >>>>>>> throw new Exception(/*NXLT*/"The header is miss...
<<<<<<< ======= /// <summary> /// Event that is fired when a workspace requests that a Node or Note model is /// centered. /// </summary> >>>>>>> /// <summary> /// Event that is fired when a workspace requests that a Node or Note model is ...
<<<<<<< using Autodesk.DesignScript.Interfaces; ======= using DynCmd = Dynamo.ViewModels.DynamoViewModel; using System.Reflection; >>>>>>> using Autodesk.DesignScript.Interfaces; using DynCmd = Dynamo.ViewModels.DynamoViewModel; using System.Reflection;
<<<<<<< using System.Xml; using Dynamo.Models; ======= using Dynamo.Models; using Dynamo.Selection; >>>>>>> using System.Xml; using Dynamo.Models; using Dynamo.Selection; <<<<<<< private int renderingTier; private DynamoViewModel viewModel; ======= private int renderingTier; priva...
<<<<<<< [Test, Category("RegressionTests")] public void Defect_MAGN_4364() { //Detail steps are here http://adsk-oss.myjetbrains.com/youtrack/issue/MAGN-4364 DynamoModel model = ViewModel.Model; string openPath = Path.Combine(GetTestDirectory(), @"core\Dynamo...
<<<<<<< using Esquio.Abstractions.Providers; using Esquio.AspNetCore.Toggles; using FluentAssertions; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; ======= using Microsoft.Extensions.DependencyInjection; >>>>>>> using Microsoft.Extensions.Configuration; using Microsoft.E...
<<<<<<< public void Track(IEnumerable<LivenessResult> responses) { if (_beatPulseContext.AllTrackers != null) { foreach (var tracker in _beatPulseContext.AllTrackers) { tracker.Track(responses); } } ...
<<<<<<< [ScriptField] public Dictionary XhrFields { ======= [IntrinsicProperty] public Dictionary<string, object> XhrFields { >>>>>>> [ScriptField] public Dictionary<string, object> XhrFields {
<<<<<<< var st = new Kernel32.SYSTEMTIME(); int res = (int)User32.SendMessageW(this, (User32.WindowMessage)User32.MCM.GETTODAY, IntPtr.Zero, ref st); ======= Kernel32.SYSTEMTIME st = new Kernel32.SYSTEMTIME(); int res = (int)UnsafeNativeM...
<<<<<<< ======= private ITelemetryService2 _telemetry; >>>>>>> <<<<<<< ======= _telemetry = services.GetService<ITelemetryService2>(); >>>>>>>
<<<<<<< AccessibilityObject.RaiseStructureChangedEvent(UiaCore.StructureChangeType.ChildRemoved, dgv.EditingControlAccessibleObject.RuntimeId); ======= AccessibilityObject.RaiseStructureChangedEvent(UnsafeNativeMethods.StructureChangeType.ChildRemoved, dgv.EditingControlAccessibleO...
<<<<<<< MCM_SETMAXSELCOUNT = (0x1000 + 4), MCM_SETSELRANGE = (0x1000 + 6), MCM_GETMONTHRANGE = (0x1000 + 7), MCM_GETMINREQRECT = (0x1000 + 9), MCM_SETCOLOR = (0x1000 + 10), MCM_HITTEST = (0x1000 + 14), MCM_SETFIRSTDAYOFWEEK = (0x1000 + 15), MCM_SETRANGE = ...
<<<<<<< IntPtr hWndOwner = owner == null ? owner.Handle : User32.GetActiveWindow(); ======= IntPtr hWndOwner = owner != null ? owner.Handle : UnsafeNativeMethods.GetActiveWindow(); >>>>>>> IntPtr hWndOwner = owner != null ? owner.Handle : User32.GetActiveWindow();
<<<<<<< if (ContextMenu != null || ContextMenuStrip != null) ======= //set the mouse capture .. this is the Child Wndproc.. // if (ContextMenuStrip != null) >>>>>>> if (ContextMenuStrip != null) <<<<<<< ...
<<<<<<< ======= /// <summary> /// Associates an existing module with a new name. /// </summary> /// <remarks>New in 2.1</remarks> public void AddModuleAlias(string moduleName, string moduleAlias) { if (Modules.TryImport(moduleName, out var modRef)) { ...
<<<<<<< /// Gets or sets the <see cref='MainMenu'/> /// that is displayed in the form. /// </summary> [ SRCategory(nameof(SR.CatWindowStyle)), DefaultValue(null), SRDescription(nameof(SR.FormMenuDescr)), TypeConverter(typeof(ReferenceConverter)), ...
<<<<<<< case "?": Console.WriteLine("Available commands:"); Console.WriteLine(" ? help (this menu)"); Console.WriteLine(" q quit"); Console.WriteLine(" cls clear screen"); ...
<<<<<<< case @"/debug/TeslaAPI/vehicles": case @"/debug/TeslaAPI/charge_state": case @"/debug/TeslaAPI/climate_state": case @"/debug/TeslaAPI/drive_state": case @"/debug/TeslaAPI/vehicle_config": case...
<<<<<<< ======= case bool _ when request.Url.LocalPath.Equals("/setpassword"): SetPassword(request, response); break; // car values case bool _ when Regex.IsMatch(request.Url.LocalPath, @"/get/[0-9]+/.+"): ...
<<<<<<< private void Debug_TeslaLoggerMessages(HttpListenerRequest request, HttpListenerResponse response) { response.AddHeader("Content-Type", "text/html; charset=utf-8"); WriteString(response, "<html><head></head><body><table border=\"1\">" + string.Concat(Tools.debugBuffer.Sel...
<<<<<<< if (lines.Length > 1) { mod.Desc = lines[1]; ======= if (lines.Length > 2) { string s = lines[2]; string[] s2 = s.Split(new char[]{' '}); ...
<<<<<<< ======= //var list = GameTools.GetContentList(true); >>>>>>> <<<<<<< Session.Resolution = "1024*680"; //"925*520"; //LargeContextMenu = true; ======= Session.Resolution = "1000*620"; //"925*520"; ...
<<<<<<< private float circleRaidus = 1f; //internal Sprite sprite; //internal Material material; //internal Color color; ======= private float colliderRadius = 1f; internal Sprite sprite; internal Material material; internal Color color; >>>>>>> private float colliderRadius = 1f; //internal Sprit...
<<<<<<< ======= _compression = compression; _srpClient = new SrpClient(); >>>>>>> _compression = compression; <<<<<<< if (operation == IscCodes.op_cond_accept || operation == IscCodes.op_accept_data) { var data = xdrStream.ReadBuffer(); var acceptPluginName = xdrStream.ReadString...
<<<<<<< XdrStream.Write(IscCodes.op_attach); XdrStream.Write(0); // Database object ID ======= Write(IscCodes.op_attach); Write(0); // Database object ID if (!string.IsNullOrEmpty(UserID)) { dpb.Append(IscCodes.isc_dpb_user_name, UserID); if (!string.IsNullOrEmpty(Password)) { ...
<<<<<<< using PFW; ======= /** * Copyright (c) 2017-present, PFW Contributors. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in * compliance with the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unles...
<<<<<<< public IEnumerable<TabInfo> GetPageList(PortalSettings settings, int parentId = -1, string searchKey = "", bool includeHidden = true, bool includeDeleted = false) ======= public IEnumerable<TabInfo> GetPageList(int parentId = -1, string searchKey = "", bool includeHidden = true, bool includeDe...
<<<<<<< ======= using System.Web.UI.WebControls; >>>>>>> using System.Web.UI.WebControls; <<<<<<< var cookie = new HttpCookie(MobileViewSiteCookieName, isMobile.ToString()) { Path = Globals.ApplicationPath ...
<<<<<<< /// <exception cref="DynamicContentTypeDoesNotExistException">requested content type by ContentTypeId and PortalId does not exist</exception> ======= /// <exception cref="ContentTypeInUseException">Content Type is in use by other component</exception> >>>>>>> /// <exception cref="Dyna...
<<<<<<< using System.Web.UI; using System.Collections.Generic; ======= using System.IO; >>>>>>> using System.Web.UI; using System.Collections.Generic; using System.IO;
<<<<<<< /// <summary> /// Deprecated Apollo localization. /// </summary> [Obsolete("Deprecated in 9.4.0, due to limited developer support. Scheduled removal in v10.0.0.")] ======= [Obsolete("Deprecated in 9.4.0, due to limited developer support. Scheduled removal in v11.0.0.")] >>>>>>> /// ...
<<<<<<< robot.LoadScript<ScriptsScripts>(); ======= robot.AutoLoadScripts = false; robot.LoadScriptFile(@"E:\Code\mmbot\MMBot\Scripts\ping.csx"); robot.LoadScriptFile(@"E:\Code\mmbot\MMBot\Scripts\whenisay.csx"); >>>>>>> robot.LoadScript<ScriptsScripts>...
<<<<<<< uiImages.Add("ExcelSplitRangeByColumnCommand", taskt.Properties.Resources.command_spreadsheet); ======= uiImages.Add("WordCreateApplicationCommand", taskt.Properties.Resources.command_files); uiImages.Add("WordCloseApplicationCommand", taskt.Properties.Resources.command_fil...
<<<<<<< newLocation.FileLocation.UriBaseId.ShouldBeEquivalentTo(rootName, "We should set the root name for these."); newLocation.FileLocation.Uri.Should().Be(baseUri.MakeRelativeUri(locationUri).ToString(), "Base URI should be relative if the expected difference is there."); ...
<<<<<<< foreach (var value_6 in obj.Attachments) ======= foreach (var value_9 in obj.ConversionProvenance) >>>>>>> foreach (var value_9 in obj.Attachments) <<<<<<< foreach (var value_7 in obj.ConversionProvenance) ======= ...
<<<<<<< ToolResultsLogKind SyntaxKind { get; } ======= SarifGrammarKind Kind { get; } >>>>>>> SarifGrammarKind SyntaxKind { get; } <<<<<<< public ToolResultsLogKind SyntaxKind { get { return ToolResultsLogKind.AnnotatedCodeLocation; } } ======= public SarifGrammarKind Kind ...
<<<<<<< RuleKey = v2Result.RuleId, ======= >>>>>>> <<<<<<< if (v2Result.AnalysisTarget != null) { // TODO: set Uri on result.Locations[0] } ======= if (_currentV2Run.Resources?.Rules != null) {...
<<<<<<< ======= public static Rule CreateRule(RuleVersionOne v1Rule) { Rule rule = null; if (v1Rule != null) { rule = new Rule { Id = v1Rule.Id, MessageStrings = v1Rule.MessageFormats, ...
<<<<<<< Init(other.RuleId, other.RuleKey, other.Level, other.Message, other.RichMessage, other.TemplatedMessage, other.Locations, other.Snippet, other.Id, other.ToolFingerprintContribution, other.Stacks, other.CodeFlows, other.RelatedLocations, other.SuppressionStates, other.Attachments, other.BaselineState...
<<<<<<< _run.Files[fileDataKey] = FileData.Create(new Uri(uri, UriKind.RelativeOrAbsolute), _loggingOptions, null, encoding); ======= _run.Files[fileDataKey] = FileData.Create(uri, _dataToInsert, null, encoding); >>>>>>> _run.Files[fileDataKey] = FileData.Create(new Uri(uri, UriKi...
<<<<<<< Init(other.RuleId, other.RuleKey, other.Level, other.Message, other.RichMessage, other.TemplatedMessage, other.AnalysisTarget, other.Locations, other.Snippet, other.Id, other.ToolFingerprintContributions, other.Stacks, other.CodeFlows, other.RelatedLocations, other.SuppressionStates, other.BaselineS...
<<<<<<< EnsureInitialized(); EnsureNoInProgressSerialization(); EnsureStateNotAlreadySet(Conditions.Disposed | Conditions.ToolInfoWritten); ======= this.EnsureNotDisposed(); if (_writeState == State.WritingResults) { throw new Inv...
<<<<<<< public bool RenameRefactoringEnabled { get { return chbRenameRefactoring.Checked; } set { chbRenameRefactoring.Checked = value; } } ======= public bool DepthColorizerEnabled { get { return chbDepthColorizer.Checked; } set...
<<<<<<< using Microsoft.VisualStudio.Text.Classification; using Microsoft.VisualStudio.Text.Formatting; ======= using EnvDTE; using EnvDTE80; using FSharpVSPowerTools.Folders; >>>>>>> using Microsoft.VisualStudio.Text.Classification; using Microsoft.VisualStudio.Text.Formatting; using EnvDTE; using EnvDTE80; using F...
<<<<<<< bool TaskListCommentsEnabled { get; set; } ======= bool GoToMetadataEnabled { get; set; } >>>>>>> bool TaskListCommentsEnabled { get; set; } bool GoToMetadataEnabled { get; set; } <<<<<<< TaskListCommentsEnabled = true; ======= GoToMetadataEnable...
<<<<<<< delegate { return GetDialogPage(typeof(FantomasOptionsPage)); }, promote:true); ======= delegate { return GetDialogPage(typeof(FantomasOptionsPage)); }, true); VSUtils.SolutionEvents.Initialize(); >>>>>>> delegate { return GetDialogPage(typeof(Fantom...
<<<<<<< [DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)] public bool RenameRefactoringEnabled { get; set; } ======= [DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)] public bool DepthColorizerEnabled { get; set; } >>>>>>> [...
<<<<<<< using FSharpVSPowerTools.Navigation; ======= using Microsoft.VisualStudio.Text.Classification; using Microsoft.VisualStudio.Text.Formatting; using EnvDTE; using EnvDTE80; using FSharpVSPowerTools.Folders; >>>>>>> <<<<<<< private uint objectManagerCookie; private FSharpLibrary library; ====...
<<<<<<< return Task.Run(() => { var list = _dbRepository.Where<ApiResource>(a => a.Scopes.Any(s => scopeNames.Contains(s.Name))); var t = list.ToList(); return list.AsEnumerable(); }); ======= var list = _dbRepository.Wh...
<<<<<<< [InputTemplate()] ======= internal static class OculusSupport { internal static string FilterLayout(XRDeviceDescriptor deviceDescriptor) { if (deviceDescriptor.manufacturer == "__Oculus__" || deviceDescriptor.manufacturer == "Oculus") { if ((...
<<<<<<< .WithInterface(XRUtilities.kXRInterfaceMatchingPattern) ======= .WithInterface(XRUtilities.kXRInterface) >>>>>>> .WithInterface(XRUtilities.kXRInterfaceMatchingPattern) <<<<<<< .WithInterface(XRUtilities.kXRInterfaceMatchingPattern) ...
<<<<<<< [NonSerialized] internal StateChangeMonitorsForDevice[] m_StateChangeMonitors; ======= internal StateChangeMonitorsForDevice[] m_StateChangeMonitors; >>>>>>> internal StateChangeMonitorsForDevice[] m_StateChangeMonitors; <<<<<<< device.m_LastUpdateT...
<<<<<<< using UnityEngine.InputSystem.XR.Haptics; using UnityEngine.InputSystem.Haptics; using UnityEngine.InputSystem.Layouts; using UnityEngine.XR; namespace UnityEngine.InputSystem.XR { /// <summary> /// The base type of all XR head mounted displays. This can help organize shared behaviour across all HMDs....
<<<<<<< [InputTemplate()] ======= internal static class DaydreamSupport { internal static string FilterLayout(XRDeviceDescriptor deviceDescriptor) { if (String.IsNullOrEmpty(deviceDescriptor.manufacturer)) { if (deviceDescriptor.deviceName == "Daydre...
<<<<<<< ======= static List<Func<XRDeviceDescriptor, string>> availableLayouts = new List<Func<XRDeviceDescriptor, string>>(); >>>>>>> <<<<<<< char letter = templateName[i]; if (char.IsUpper(letter) || char.IsLower(letter) || char.IsDigit(letter) || letter == ':') ======= ...
<<<<<<< private class TestHMD : UnityEngine.InputSystem.InputDevice ======= [Preserve] private class TestHMD : InputDevice >>>>>>> [Preserve] private class TestHMD : UnityEngine.InputSystem.InputDevice
<<<<<<< [InputTemplate()] ======= internal static class WMRSupport { internal static string FilterLayout(XRDeviceDescriptor deviceDescriptor) { if (deviceDescriptor.manufacturer == "Microsoft") { if (deviceDescriptor.deviceName == "Windows Mixed Real...
<<<<<<< [InputControl(aliases = new[] { "Primary2DAxis", "thumbstickaxes" })] ======= [Scripting.Preserve] [InputControl(aliases = new[] { "Primary2DAxis" })] >>>>>>> [Scripting.Preserve] [InputControl(aliases = new[] { "Primary2DAxis", "thumbstickaxes" })] <<<<<<< [I...
<<<<<<< .WithInterface(XRUtilities.kXRInterfaceMatchingPattern) .WithManufacturer("Microsoft") ======= .WithInterface(XRUtilities.kXRInterface) >>>>>>> .WithInterface(XRUtilities.kXRInterfaceMatchingPattern) <<<<<<< .WithInterface(XRUti...
<<<<<<< using System.IO.Compression; using System.Globalization; using System.Linq; using System.Drawing; using Depressurizer.Lib; ======= using Depressurizer.Properties; >>>>>>> using Depressurizer.Lib; using Depressurizer.Properties;
<<<<<<< ======= public string GetUserIdForUsername(string username) { var user = _connection.UserNameCache.FirstOrDefault(x => x.Value.Equals(username, StringComparison.InvariantCultureIgnoreCase)); return string.IsNullOrEmpty(user.Key) ? string.Empty : user.Key; } ...
<<<<<<< return this.client.HttpClient.RequestAsync(HttpMethod.Put, string.Format("push/installations/{0}", Uri.EscapeUriString(this.client.InstallationId)), this.client.CurrentUser, installation.ToString(), ensureResponseContent: false); ======= return this.client.MobileAppHttpClient.RequestAs...
<<<<<<< protected TooltipButtons[] availableButtons; protected VRTK_ObjectTooltip[] buttonTooltips; protected bool[] tooltipStates; protected bool overallState = true; ======= protected TooltipButtons[] availableButtons = new TooltipButtons[0]; protected VRTK_ObjectTool...
<<<<<<< private void UpdateProjectName() { if (ProjectName.IsChecked == true && this.Topoligies.SelectedItem != null && this.Tags.SelectedItem != null) { this.envModel.ProjectName = $"{this.defaultProjectName}-{((NameValueModel)this.Topoligies.SelectedItem).Name}-{this.Tags.Selecte...
<<<<<<< using SIM.ContainerInstaller.Repositories.TagRepository; ======= using SIM.Tool.Windows.Dialogs; using ContainerInstaller.Repositories.TagRepository; using TaskDialogInterop; >>>>>>> using SIM.Tool.Windows.Dialogs; using SIM.ContainerInstaller.Repositories.TagRepository; using SIM.Tool.Base; <<<<<<< t...