conflict_resolution stringlengths 27 16k |
|---|
<<<<<<<
List<string> parts = Environment.GetCommandLineArgs().ToList();
option_nowindowreposition = parts.FindIndex(x => x.Equals("-NoRepositionWindow", StringComparison.InvariantCultureIgnoreCase)) != -1 ||
parts.FindIndex(x => x.Equals("-NRW", StringComparison.InvariantCulture... |
<<<<<<<
=======
this.TopPanel = new System.Windows.Forms.Panel();
this.eDDNTestToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
>>>>>>>
this.TopPanel = new System.Windows.Forms.Panel();
this.eDDNTestToolStripMenuItem = new System.Windows.Forms.ToolStri... |
<<<<<<<
=======
string namecalc ="!"; // need to keep the name as TryTake empties the string
>>>>>>>
<<<<<<<
vsc = cursys;
while (closestsystem_queue.TryTake(out nextsys)) // try and empty the queue in case multiple ones are there
=====... |
<<<<<<<
=======
this.viewOnEDSMToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.comboBoxHistoryWindow = new System.Windows.Forms.ComboBox();
>>>>>>>
this.viewOnEDSMToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.comboBoxHist... |
<<<<<<<
ArrowObj arrow = new ArrowObj(xSelected.Value, ySelected.Value, xSelected.Value,
ySelected.Value) { Line = { Color = GraphSummary.ColorSelected } };
zedGraphControl.GraphPane.GraphObjList.Insert(0, arrow);
=======
const float ... |
<<<<<<<
using osu.Game.Rulesets.Tau.Configuration;
using osu.Game.Rulesets.Tau.UI;
using osu.Game.Rulesets.Tau.UI.Particles;
=======
using osu.Framework.Allocation;
using osu.Game.Rulesets.Tau.UI;
>>>>>>>
using osu.Framework.Allocation;
using osu.Game.Rulesets.Tau.UI;
using osu.Game.Rulesets.Tau.Configuration;
using... |
<<<<<<<
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
public static System.Drawing.Bitmap SmallMoleculeMethodDevCEOpt_thumb {
get {
object obj = ResourceManager.GetObject("SmallMoleculeMethodDevCEOpt_thumb", resourceCulture);
... |
<<<<<<<
using System;
using System.Linq;
=======
using System;
using System.Collections.Generic;
using System.Linq;
using osu.Framework.Graphics.Pooling;
>>>>>>>
using System;
using System.Collections.Generic;
using System.Linq;
using osu.Framework.Graphics.Pooling;
<<<<<<<
using osu.Framework.Timing;
using osu.Fr... |
<<<<<<<
protected override ReplayRecorder CreateReplayRecorder(Replay replay) => new TauReplayRecorder(replay);
=======
public override PlayfieldAdjustmentContainer CreatePlayfieldAdjustmentContainer() => new TauPlayfieldAdjustmentContainer();
>>>>>>>
public override PlayfieldAdjus... |
<<<<<<<
=======
using osu.Game.Rulesets.UI;
using osuTK;
>>>>>>>
<<<<<<<
=======
private const float playfield_size_adjust = 0.8f;
>>>>>>>
private const float playfield_size_adjust = 0.8f;
<<<<<<<
Size = new Vector2(1f);
=======
// Calculated from osu!stable as 512 (def... |
<<<<<<<
using Npgsql.Bulk.SampleRunner.DotNetStandard20.DAL;
=======
using System.Transactions;
>>>>>>>
using Npgsql.Bulk.SampleRunner.DotNetStandard20.DAL;
using System.Transactions; |
<<<<<<<
[Test]
public void FlushCatchExceptions()
{
_mockRequestHandler.Setup(r => r.MakeRequest(It.IsAny<Batch>())).Throws<System.Exception>();
_ = _handler.Process(new Track(null, null, null, null));
_handler.Flush();
_mockRequestHandler.Verif... |
<<<<<<<
using System.Threading;
using System.Threading.Tasks;
using Moq;
=======
>>>>>>>
using System.Threading;
using System.Threading.Tasks;
using Moq; |
<<<<<<<
[Test]
public void FlushCatchExceptions()
{
_mockRequestHandler.Setup(r => r.MakeRequest(It.IsAny<Batch>())).Throws<System.Exception>();
_ = _handler.Process(new Track(null, null, null, null));
_handler.Flush();
_mockRequestHandler.Verif... |
<<<<<<<
RegisterCommand(new PlaceBaseCommand());
RegisterCommand(new PlaceFurnitureCommand());
=======
RegisterCommand(new AniCommand());
RegisterCommand(new BuildCommand());
>>>>>>>
RegisterCommand(new PlaceBaseCommand());
RegisterCommand(new P... |
<<<<<<<
using NzbDrone.Model;
=======
using Ninject;
>>>>>>>
using Ninject;
using NzbDrone.Model;
<<<<<<<
public virtual AuthenticationType AuthenticationType
{
get { return (AuthenticationType)GetValueInt("AuthenticationType", 0); }
set { SetValue("AuthenticationType", (int)... |
<<<<<<<
var progressNotification = new ProgressNotification("Settings");
_notificationProvider.Register(progressNotification);
=======
>>>>>>>
_notificationProvider.Register(progressNotification);
<<<<<<<
var progressNotification = new ProgressNotification("Settings"... |
<<<<<<<
_logger.Info("Skipping refresh of artist: {0}", artist.ArtistName);
_diskScanService.Scan(artist);
=======
_logger.Info("Skipping refresh of artist: {0}", artist.Name);
//TODO: _diskScanService.Sca... |
<<<<<<<
using Ninject;
=======
using NzbDrone.Model;
>>>>>>>
using Ninject;
using NzbDrone.Model;
<<<<<<<
=======
public virtual AuthenticationType AuthenticationType
{
get { return (AuthenticationType)GetValueInt("AuthenticationType", 0); }
set { SetValue("AuthenticationT... |
<<<<<<<
int priority = (int)Enum.Parse(typeof(SabnzbdPriorityType), _configProvider.SabTvPriority);
=======
string priority = _configProvider.SabTvPriority;
>>>>>>>
int priority = (int)Enum.Parse(typeof(SabnzbdPriorityType), _configProvider.SabTvPriority);
<<<<<<<
public ... |
<<<<<<<
//Remove the error prefix before processing
var parseResult = Parser.ParseTitle(directoryInfo.Name.Substring(GetPrefixLength(postDownloadStatus)));
=======
//Add to InfoList for possible later processing
InfoList.Add(new PostDownloadInfoModel
... |
<<<<<<<
parseResult.AirDate, parseResult.EpisodeTitle, parseResult.Quality.Quality);
=======
parseResult.AirDate, parseResult.Episodes.First().Title, parseResult.Quality.QualityType);
>>>>>>>
parseResult.Ai... |
<<<<<<<
// start logging here...
LogManagerFactory.Initialize();
LogManagerFactory.ConfigureGlobalHandler();
=======
this.UnhandledException += App_UnhandledException;
}
async void App_UnhandledException(object sender, UnhandledExceptionEventArgs e)
... |
<<<<<<<
private MethodDeclarationSyntax GenerateShadowCallback(CsCallable csElement, PlatformDetectionType platform, InteropMethodSignature sig)
=======
private static CatchClauseSyntax GenerateCatchClause(CatchClauseSyntax catchClause, CsCallable csElement, SyntaxToken exceptionVariableIdentifier, pa... |
<<<<<<<
//gameObject.guiText.fontSize = 60;
Debug.Log(ArabicSupport.ArabicFixer.Fix("نص عربي على يونيتي، أهلا وسهلا", ShowTashkeel, UseHinduNumbers));
}
// Update is called once per frame
void Update () {
=======
>>>>>>>
//gameObject.guiText.fontSize = 60;
Debug.Log(ArabicSupport.ArabicFixer.Fix("نص عر... |
<<<<<<<
Book = item.Book,
ContainerItems = item.ContainerItems,
=======
Container =
{
Size = item.Container.Size,
Items = item.Container.Items,
IsOpen = item.Container.IsOpen,
... |
<<<<<<<
[typeof(IApiKey)] = typeof(DefaultApiKey),
=======
[typeof(ISamlPolicy)] = typeof(DefaultSamlPolicy),
[typeof(ISamlServiceProvider)] = typeof(DefaultSamlServiceProvider),
[typeof(ISsoInitiationEndpoint)] = typeof(DefaultSsoInitiationEndpoint),
[typeo... |
<<<<<<<
/// <summary>
/// Synchronously gets an <see cref="IApiKey">API Key</see>, by its ID, that belongs to an <see cref="IAccount">Account</see>
/// that has access to this application by a mapped account store.
/// </summary>
/// <param name="application">The application.</p... |
<<<<<<<
/// <summary>
/// Synchronous counterpart to <see cref="IApplication.GetApiKeyAsync(string, System.Threading.CancellationToken)"/>.
/// </summary>
/// <param name="apiKeyId">The API Key ID.</param>
/// <exception cref="ArgumentNullException"><paramref name="apiKeyId"/> i... |
<<<<<<<
// ReSharper disable once NotAccessedField.Local
public PropertyInfo PropertyInfo { get; private set; }
=======
// ReSharper disable once NotAccessedField.Global
public PropertyInfo _propertyInfo;
>>>>>>>
// ReSharper disable once NotAccessedField.Global
public... |
<<<<<<<
public bool VerticalHUD { get; set; } = false;
public bool SingleplayerHUD { get; set; } = false;
public bool Hologram { get; set; } = true;
public bool CustomSongs { get; set; } = true;
public bool FreeMod { get; set; } = false;
public string Color { get; set; } ... |
<<<<<<<
IList keyCodeList;
KeyCode[] reservedKeys = new KeyCode[] { KeyCode.Escape, KeyCode.BackQuote };
=======
KeyCode[] reservedKeys = new KeyCode[] { KeyCode.Escape, KeyCode.BackQuote, KeyCode.F8 };
>>>>>>>
IList keyCodeList;
KeyCode[] reservedKeys = new KeyCode[] { KeyCod... |
<<<<<<<
DaggerfallUI.Instance.PlayOneShot(SoundClips.ButtonClick);
=======
speedCautious = (sender == cautiousToggleButton);
Refresh();
}
public void ToggleSpeedButtonOnScrollHandler(BaseScreenComponent sender)
{
>>>>>>>
DaggerfallUI.Instance.P... |
<<<<<<<
private PlayerHeightChanger heightChanger;
=======
private Croucher myCroucher;
private PlayerSpeedChanger speedChanger;
>>>>>>>
private PlayerHeightChanger heightChanger;
private PlayerSpeedChanger speedChanger; |
<<<<<<<
//mainCamera = GameManager.Instance.MainCamera;
climbingMotor = GetComponent<ClimbingMotor>();
=======
>>>>>>>
climbingMotor = GetComponent<ClimbingMotor>(); |
<<<<<<<
foreach(var item in keyBindsData.actionKeyBinds)
{
if (actionKeyDict.ContainsKey(item.Key))
actionKeyDict[item.Key] = item.Value;
else
actionKeyDict.Add(item.Key, item.Value);
}
//actionKeyDic... |
<<<<<<<
using System.Collections.Immutable;
=======
using System.IO;
>>>>>>>
using System.IO;
using System.Collections.Immutable;
<<<<<<<
using Microsoft.CodeAnalysis.Text;
using Microsoft.DotNet.Try.Protocol;
using WorkspaceServer.LanguageServices;
using CompletionItem = Microsoft.DotNet.Try.Protocol.CompletionIte... |
<<<<<<<
using Serilog;
=======
using System.Diagnostics;
using Serilog.Events;
>>>>>>>
using System.Diagnostics;
using Serilog;
using Serilog.Events;
<<<<<<<
}
=======
options.AddLogLevelOptions();
}
protected Options Options { get; } = new Options();
protected IL... |
<<<<<<<
.Where(t => t.AsType() != typeof(IOctopusSpaceAsyncRepository))
.Where(t => t.AsType() != typeof(IOctopusSystemAsyncRepository))
.Where(t => t.AsType() != typeof(IOctopusCommonAsyncRepository))
#if SYNC_CLIENT
=======
>>>>>>>
.Where(t => t.AsType() != typeof(IO... |
<<<<<<<
if (IsTenantedDeployment && !await Repository.SupportsTenants().ConfigureAwait(false))
throw new CommandException("Your Octopus server does not support tenants, which was introduced in Octopus 3.4. Please upgrade your Octopus server, enable the multi-tenancy feature or remove the --t... |
<<<<<<<
=======
public bool IsMultiTenancyEnabled { get; set; }
[Writeable]
public bool IsBuiltInWorkerEnabled { get; set; } = true;
[Writeable]
>>>>>>>
public bool IsBuiltInWorkerEnabled { get; set; } = true;
[Writeable] |
<<<<<<<
var parameters = ParameterHelper.CombineParameters(AdditionalQueryParameters, pathParameters);
return Client.Paginate(path ?? Client.RootDocument.Link(CollectionLinkName), parameters, getNextPage);
=======
return Client.Paginate(path ?? Client.Link(CollectionLin... |
<<<<<<<
var parameters = ParameterHelper.CombineParameters(AdditionalQueryParameters, pathParameters);
client.Paginate(path ?? client.RootDocument.Link(CollectionLinkName), parameters, getNextPage);
=======
client.Paginate(path ?? client.Link(CollectionLinkName), pathParameters ?? ... |
<<<<<<<
OctopusAsyncClient(OctopusServerEndpoint serverEndpoint, OctopusClientOptions options, bool addCertificateCallback, string requestingTool)
=======
// Use the Create method to instantiate
protected OctopusAsyncClient(OctopusServerEndpoint serverEndpoint, OctopusClientOptions options, bo... |
<<<<<<<
public async Task Rerun(TaskResource resource)
=======
public Task<TaskTypeResource[]> GetTaskTypes()
{
return Client.Get<TaskTypeResource[]>(Client.RootDocument.Links["TaskTypes"]);
}
public Task Rerun(TaskResource resource)
>>>>>>>
public Task<Ta... |
<<<<<<<
protected SpaceContext ExtendedSpaceContext { get; set; }
=======
protected SpaceQueryParameters CreateParameters(bool includeSystem, string[] spaceIds)
{
var newParameters = new SpaceQueryParameters(includeSystem, spaceIds);
ValidateSpaceParameters(newParameter... |
<<<<<<<
IScheduledProjectTriggerRepository ScheduledProjectTriggers { get; set; }
=======
ITagSetRepository TagSets { get; }
>>>>>>>
IScheduledProjectTriggerRepository ScheduledProjectTriggers { get; set; }
ITagSetRepository TagSets { get; } |
<<<<<<<
protected SpaceContext ExtendedSpaceContext { get; set; }
=======
protected SpaceQueryParameters CreateParameters(bool includeSystem, string[] spaceIds)
{
var newParameter = new SpaceQueryParameters(includeSystem, spaceIds);
ValidateSpaceParameters(newParameter)... |
<<<<<<<
ThrowIfServerVersionIsNotCompatible().ConfigureAwait(false);
=======
>>>>>>>
<<<<<<<
ThrowIfServerVersionIsNotCompatible().ConfigureAwait(false);
=======
>>>>>>>
ThrowIfServerVersionIsNotCompatible().ConfigureAwait(false); |
<<<<<<<
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using OctopusTools.Client;
using OctopusTools.Infrastructure;
using OctopusTools.Model;
using log4net;
namespace OctopusTools.Commands
{
public class CreateReleaseCommand : ApiCommand
{
public CreateReleaseComm... |
<<<<<<<
public class FeedResource : Resource, INamedResource, IHaveSpaceResource
=======
/// <summary>
/// The FeedResource type has been deprecated on Octopus Deploy 3.5 servers. Use NuGetFeedResource instead")]
/// </summary>
public class FeedResource : Resource, INamedResource
>>>>>>>
/// ... |
<<<<<<<
if (!ROS.ok || shutting_down) return;
Publication p = lookupPublicationWithoutLock(topic);
=======
Publication p;
if ((p = lookupPublicationWithoutLock(topic)) == null || shutting_down) return;
>>>>>>>
if (!ROS.ok || shutting_do... |
<<<<<<<
private const int back_cam = 1;
private const int front_cam = 0;
=======
//Stopwatch
Stopwatch sw = new Stopwatch();
>>>>>>>
private const int back_cam = 1;
private const int front_cam = 0;
//Stopwatch
Stopwatch sw = new Stopwatch();
<<<<<<<
... |
<<<<<<<
{
ROS.ROS_MASTER_URI = "http://10.0.2.182:11311";
=======
{
ROS.ROS_MASTER_URI = "http://10.0.2.42:11311";
>>>>>>>
{
ROS.ROS_MASTER_URI = "http://10.0.2.182:11311";
<<<<<<<
// ROS.ROS_HOSTNAME = "10.0.2.163";
=======
... |
<<<<<<<
toDebugInstead = false;
=======
>>>>>>>
toDebugInstead = false;
<<<<<<<
if (printit)
EDB.WriteLine(ROSOUT_FMAT, ROSOUT_PREFIX[level], o);
RosOutAppender.Instance.Append(o.ToString(), level);
=======
if (pri... |
<<<<<<<
using Serilog;
using System;
using System.Threading;
=======
using System;
using System.Threading;
>>>>>>>
using Serilog;
using System;
using System.Threading;
<<<<<<<
private IntPtr Wow;
private Random rand;
private int a_CastingDelay = 0;
private int a_LootingDelay = 0;
... |
<<<<<<<
public bool Initialize { get; set; }
public System.Text.Encoding FileEncoding { get; set; }
}
=======
public string ConfigurationFile { get; set; }
}
>>>>>>>
public bool Initialize { get; set; }
public string ConfigurationFile { get; set; }
public System.T... |
<<<<<<<
using migrators;
=======
using environments;
>>>>>>>
using migrators;
using environments; |
<<<<<<<
using System.Reflection;
using log4net.Repository;
using log4net.Core;
=======
using Newtonsoft.Json;
using System.Collections.Generic;
>>>>>>>
using System.Reflection;
using log4net.Repository;
using Newtonsoft.Json;
using System.Collections.Generic;
using log4net.Core;
<<<<<<<
.Add("isupto... |
<<<<<<<
namespace roundhouse.databases.mysql
=======
using roundhouse.consoles;
using roundhouse.infrastructure.logging;
namespace roundhouse.databases.mysql
>>>>>>>
using roundhouse.consoles;
namespace roundhouse.databases.mysql |
<<<<<<<
public static ExiledVersion Version = new ExiledVersion { Major = 1, Minor = 10, Patch = 0 };
=======
public bool TestingEnabled;
public bool AutoUpdateEnabled;
public static ExiledVersion Version = new ExiledVersion
{
Major = 2,
Minor = 0,
Patch = 0
};
>>>>>>>
public bool TestingE... |
<<<<<<<
public class SCP914UpgradeEvent : EventArgs
{
public bool Allow;
public Scp914.Scp914Machine Machine;
public List<ReferenceHub> Players;
public List<Pickup> Items;
public Scp914.Scp914Knob KnobSetting;
}
=======
public class Scp914UpgradeEvent : EventArgs
{
public bool Allow { get; s... |
<<<<<<<
/// Invoked before triggering a speaker with SCP-079.
/// </summary>
public static event CustomEventHandler<StartingSpeakerEventArgs> StartingSpeaker;
/// <summary>
/// Invoked before stopping a speaker with SCP-079.
/// </summary>
public static event Cus... |
<<<<<<<
=======
>>>>>>>
<<<<<<<
/// <summary>
/// Gets the HintDisplay of the players ReferenceHub.
/// </summary>
/// <returns>Returns Hintdisplay of ReferenceHub.</returns>
public HintDisplay GetHintDisplay()
{
return ReferenceHub.hints;
... |
<<<<<<<
/// <summary>
/// Returns the list of players in this room.
/// </summary>
/// <returns>List of <see cref="ReferenceHub"/></returns>
public static List<ReferenceHub> GetHubs(this Room room) =>ReferenceHub.Hubs.Values.Where(h => !h.IsHost() && h.GetCurrentRoom().Name == room.Name).ToList();
=======
... |
<<<<<<<
var handlerInvokers = await ((Task<HandlerInvokers>)methodToInvoke.Invoke(this, new[] { body, transactionContext, message })).ConfigureAwait(false);
=======
var handlerInvokers = await ((Task<HandlerInvokers>)methodToInvoke.Invoke(this, new[] { messageId, body, transactionContext, mess... |
<<<<<<<
LogStartStop("Starting periodic task {taskDescription} with interval {timerInterval}", _description, Interval);
=======
LogStartStop("Starting periodic task '{0}' with interval {1}", _description, Interval);
#if NET45
>>>>>>>
LogStartStop("Starting periodic task {taskDesc... |
<<<<<<<
/* Copyright (c) 2008-2014 Peter Palotas, Jeffrey Jangli, Normalex
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the ... |
<<<<<<<
public static void WithModel(Action<IModel> modelCallback)
{
using (var connection = new ConnectionFactory {Uri = ConnectionString}.CreateConnection())
using (var model = connection.CreateModel())
{
modelCallback(model);
}
}... |
<<<<<<<
/// <summary>
/// Allows for specifying the ID for the saga requesting the timeout.
/// The ID will be returned with the <see cref="TimeoutReply"/>.
/// </summary>
public Guid SagaId { get; set; }
=======
/// <summary>
/// Allows for additional data to... |
<<<<<<<
/* Copyright (c) 2008-2014 Peter Palotas, Jeffrey Jangli, Normalex
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the r... |
<<<<<<<
#endregion // State
#region Timeout
/// <summary>Specifies the time-out, in seconds, of the DFS root or link.</summary>
public long Timeout { get; internal set; }
=======
/// <summary>Specifies the time-out, in seconds, of the DFS root or link.</summary>
publi... |
<<<<<<<
UnitTestAssert.ThrowsException<System.IO.FileNotFoundException>(() => Alphaleonis.Win32.Filesystem.File.GetFileSystemEntryInfo(tempPath));
=======
ExceptionAssert.FileNotFoundException(() => Alphaleonis.Win32.Filesystem.File.GetFileSystemEntryInfo(folder.FullName));
}
>>>>>>>
... |
<<<<<<<
if (inboundMessage == null) Task.FromResult(false);
=======
if (inboundMessage == null) return Task.FromResult(false);
>>>>>>>
if (inboundMessage == null) return Task.FromResult(false);
<<<<<<<
return Task.FromResult(false);
}
private Task Han... |
<<<<<<<
public void IIS_EXITED(object obj, EventArgs args)
{
RestartServer();
}
=======
>>>>>>>
public void IIS_EXITED(object obj, EventArgs args)
{
RestartServer();
} |
<<<<<<<
parseResult.Quality = new QualityModel{ Quality = episodeFile.Quality, Proper = episodeFile.Proper };
=======
parseResult.Quality = new Quality{ QualityType = episodeFile.Quality, Proper = episodeFile.Proper };
parseResult.Episodes = episodes;
>>>>>>>
parseResu... |
<<<<<<<
var progressNotification = new ProgressNotification("Settings");
_notificationProvider.Register(progressNotification);
=======
>>>>>>>
_notificationProvider.Register(progressNotification);
<<<<<<<
var progressNotification = new ProgressNotification("Settings"... |
<<<<<<<
public virtual bool IsFolderLocked(string path)
{
var files = GetFileInfos(path, "*.*", SearchOption.AllDirectories);
foreach(var fileInfo in files)
{
if (IsFileLocked(fileInfo))
return true;
}
ret... |
<<<<<<<
=======
using NzbDrone.Core.Providers.Jobs;
using NzbDrone.Core.Repository;
>>>>>>>
using NzbDrone.Core.Repository; |
<<<<<<<
parseResult.AirDate, parseResult.EpisodeTitle, parseResult.Quality.Quality);
=======
parseResult.AirDate, parseResult.Episodes.First().Title, parseResult.Quality.QualityType);
>>>>>>>
parseResult.Ai... |
<<<<<<<
public class GBufferManager
{
public const int k_MaxGbuffer = 8;
public int gbufferCount { get; set; }
RenderTargetIdentifier[] m_ColorMRTs;
RenderTargetIdentifier[] m_RTIDs = new RenderTargetIdentifier[k_MaxGbuffer];
public void InitGBuffers(RenderTextureDescr... |
<<<<<<<
var sourceValue = (string)valueContext.Value;
var targetType = valueContext.TargetType;
=======
var targetType = valueContext.Assignment.Member.MemberType;
var sourceValue = (string)valueContext.Assignment.Value;
>>>>>>>
var targetType = valueContex... |
<<<<<<<
// Init Gbuffer description
m_GbufferManager.gbufferCount = m_DeferredMaterial.GetMaterialGBufferCount();
RenderTextureFormat[] rtFormat;
RenderTextureReadWrite[] rtReadWrite;
m_DeferredMaterial.GetMaterialGBufferDescription(out rtFormat, out rtReadWri... |
<<<<<<<
var compressImagesMessages = Substitute.For<ICollector<CompressImagesMessage>>();
=======
var settingsTable = Substitute.For<CloudTable>(new Uri("https://myaccount.table.core.windows.net/Tables/settings"));
>>>>>>>
var compressImagesMessages = Substitute.For<ICollector<Com... |
<<<<<<<
=======
using DevExpress.LookAndFeel;
using DevExpress.Utils.Drawing.Helpers;
using DevExpress.XtraEditors;
>>>>>>>
using DevExpress.LookAndFeel;
using DevExpress.Utils.Drawing.Helpers;
using DevExpress.XtraEditors;
<<<<<<<
using System.Threading.Tasks;
=======
using System.Runtime.InteropServices;
>>>>... |
<<<<<<<
using (new EditorGUILayout.HorizontalScope())
{
=======
#region General Settings
using (new EditorGUILayout.HorizontalScope())
{
>>>>>>>
using (new EditorGUILayout.HorizontalScope())
{
<<<<<<<
InspectorUIUtil... |
<<<<<<<
=======
/// <inheritdoc />
public SpeechEventData(EventSystem eventSystem) : base(eventSystem) { }
>>>>>>>
<<<<<<<
/// <inheritdoc />
public SpeechEventData(EventSystem eventSystem) : base(eventSystem) { }
=======
/// <summary>
/// A semantic meani... |
<<<<<<<
type == typeof(IMixedRealityBoundarySystem) ||
type == typeof(IMixedRealityDiagnosticsManager);
=======
type == typeof(IMixedRealityTeleportSystem) ||
type == typeof(IMixedRealityBoundarySystem);
>>>>>>>
type == ty... |
<<<<<<<
private IMixedRealityController controller;
=======
[SerializeField]
[Tooltip("Should this GameObject clean itself up after source is lost?")]
private bool destroyOnSourceLost = true;
/// <summary>
/// Should this GameObject clean itself up after source is lost... |
<<<<<<<
#endregion Delete Tests
[AsyncTestMethod]
public async Task UndeleteAsync()
{
TestHttpHandler hijack = new TestHttpHandler();
hijack.SetResponseContent("{\"id\":\"an id\",\"String\":\"Hey\"}");
hijack.OnSendingRequest = req =>
{
... |
<<<<<<<
private SerializedProperty teleportDuration;
private SerializedProperty boundaryVisualizationProfile;
// Diagnostic system properties
private SerializedProperty enableDiagnosticsSystem;
private SerializedProperty diagnosticsSystemType;
private SerializedProperty d... |
<<<<<<<
base.OnEnable();
if (!CheckMixedRealityManager(false) ||
!MixedRealityManager.Instance.ActiveProfile.IsInputSystemEnabled ||
MixedRealityManager.Instance.ActiveProfile.InputSystemProfile.InputActionsProfile == null)
=======
if (!CheckMixedR... |
<<<<<<<
Debug.LogError($"Unable to register the {concreteType.GetType()} service. It does not implement the IMixedRealityService interface.");
=======
Debug.LogError($"Unable to register the {concreteType} service. It does not implement the IMixedRealityToolkitService interface.");
>>... |
<<<<<<<
DebugUtilities.LogWarning($"There's already a {interfaceType.Name} registered.");
=======
Debug.LogError($"There's already a {type.Name} registered.");
>>>>>>>
Debug.LogError($"There's already a {interfaceType.Name} registered.");
<<<<<<<
Debug... |
<<<<<<<
base.OnEnable();
if (!CheckMixedRealityManager(false))
=======
if (!CheckMixedRealityConfigured(false))
>>>>>>>
base.OnEnable();
if (!CheckMixedRealityConfigured(false)) |
<<<<<<<
public void OnPointerUp(MixedRealityPointerEventData eventData)
=======
public void OnPointerDragged(MixedRealityPointerEventData eventData) { }
public void OnPointerUp(MixedRealityPointerEventData eventData)
{
if (manipulatorToDisable != null)
>>>>>>>
public void OnPoint... |
<<<<<<<
=======
#region Monobehaviour Implementation
protected virtual void OnValidate()
{
CheckInitialization();
}
protected override void OnEnable()
{
base.OnEnable();
CheckInitialization();
}
#endregion Monobehav... |
<<<<<<<
private static bool[] providerFoldouts;
=======
private static bool showHandTrackingProperties = true;
private SerializedProperty handTrackingProfile;
>>>>>>>
private static bool showHandTrackingProperties = true;
private SerializedProperty handTrackingProfile;
... |
<<<<<<<
=======
if (States == null)
{
States = States.GetDefaultInteractableStates();
}
>>>>>>>
if (States == null)
{
States = States.GetDefaultInteractableStates();
}
<<<<<<<
#region NearInteractionHa... |
<<<<<<<
Assert.AreEqual(0, MixedRealityServiceRegistry.GetAllServices().Count);
=======
Assert.IsEmpty(MixedRealityToolkit.Instance.GetServices<IMixedRealityService>());
>>>>>>>
Assert.IsEmpty(MixedRealityToolkit.Instance.GetServices<IMixedRealityService>());
<<<<<<<
#reg... |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.