conflict_resolution stringlengths 27 16k |
|---|
<<<<<<<
msbuildProject.ToolsVersion = "14.0";
=======
msbuildProject = new MSBuildProject ();
msbuildProject.ToolsVersion = GetToolsVersion ();
>>>>>>>
msbuildProject.ToolsVersion = GetToolsVersion (); |
<<<<<<<
[assembly:AddinDependency ("Core", "6.0")]
[assembly:AddinDependency ("Ide", "6.0")]
[assembly:AddinDependency ("DesignerSupport", "6.0")]
[assembly:AddinDependency ("Debugger", "6.0")]
[assembly:AddinDependency ("Debugger.Soft", "6.0")]
=======
[assembly:AddinDependency ("Core", "5.9")]
[assembly:AddinDepend... |
<<<<<<<
using System.Linq;
using System.Xml;
using MonoDevelop.Core;
using MonoDevelop.Projects.MSBuild;
=======
using System.Reflection;
using System.Xml;
using MonoDevelop.Core;
using MonoDevelop.Projects.Formats.MSBuild;
>>>>>>>
using System.Linq;
using System.Reflection;
using System.Xml;
using MonoDevelop.Core;... |
<<<<<<<
MSBuildPropertyGroup globals = AddGlobalsProperties (projectGuid, rootNamespace);
=======
AddDotNetCoreProps ();
AddGlobalsProperties (projectGuid, rootNamespace);
>>>>>>>
MSBuildPropertyGroup globals = AddGlobalsProperties (projectGuid, rootNamespace);
<<<<<<<
AddDnxTargets ();
AddDnxProp... |
<<<<<<<
new Dictionary<string, string> {
{ "DNX_BUILD_PORTABLE_PDB", GetDnxBuildPortablePDBValue () }
}
) {
UserAssemblyPaths = new List<string> ()
};
}
static string GetDnxBuildPortablePDBValue ()
{
if (DnxServices.IsPortablePdbSupported)
return "1";
return "0";
}
ProcessA... |
<<<<<<<
using System.Threading.Tasks;
using Microsoft.Framework.DesignTimeHost.Models.OutgoingMessages;
=======
using Microsoft.DotNet.ProjectModel.Server.Models;
>>>>>>>
using System.Threading.Tasks;
using Microsoft.DotNet.ProjectModel.Server.Models;
<<<<<<<
ProgressMonitor monitor;
ManualResetEventSlim waitEv... |
<<<<<<<
[assembly:AddinDependency ("Core", "6.0")]
[assembly:AddinDependency ("Ide", "6.0")]
[assembly:AddinDependency ("DesignerSupport", "6.0")]
=======
[assembly:AddinDependency ("Core", "5.9")]
[assembly:AddinDependency ("Ide", "5.9")]
[assembly:AddinDependency ("DesignerSupport", "5.9")]
[assembly:AddinDependenc... |
<<<<<<<
using Microsoft.CodeAnalysis.CSharp;
using Microsoft.Framework.DesignTimeHost.Models.OutgoingMessages;
=======
using Microsoft.DotNet.ProjectModel.Server.Models;
>>>>>>>
using Microsoft.CodeAnalysis.CSharp;
using Microsoft.DotNet.ProjectModel.Server.Models;
<<<<<<<
using Solution = MonoDevelop.Projects.Solu... |
<<<<<<<
Logger.Log(Logger.LogChannel.Warn, () => $"{instance.Id}: You should only patch implemented methods/constructors to avoid issues. Path the declared method {original.GetDeclaredMember().FullDescription()} instead of {original.FullDescription()}.");
=======
{
var declaredMember = original.GetDeclared... |
<<<<<<<
#if __ANDROID__ || __IOS__ || NET461 || __WASM__ || false
=======
#if __ANDROID__ || __IOS__ || NET461 || __WASM__ || __SKIA__ || __NETSTD_REFERENCE__ || __MACOS__
>>>>>>>
#if __ANDROID__ || __IOS__ || NET461 || __WASM__ || __SKIA__ || __NETSTD_REFERENCE__ || false
<<<<<<<
#if __ANDROID__ || __IOS__ ||... |
<<<<<<<
var instruction = instructions[i];
if (instruction["opcode"] != null && instruction["operand"] != null)
target.Instructions[i] =
Instruction.Create((OpCode)GetInstructionField(instruction.... |
<<<<<<<
_recentsFragment = new ArticlesPageTabFragment(false);
_statsFragment = new ProfilePageStatsTabFragment();
=======
_recentsFragment = new ProfilePageRecentUpdatesFragment();
_statsFragment = new ArticlesPageTabFragment(false);
>>>>>>>
_statsFragment... |
<<<<<<<
#region Blockchain
string GetBestBlockHash();
GetBlockResponse GetBlock(string hash, bool verbose = true);
=======
String AddMultiSigAddress(Int32 nRquired, List<String> publicKeys, String account = null);
void AddNode(String node, NodeAction action);
void Back... |
<<<<<<<
errorsListener.EnableEvents(SemanticLoggingEventSource.Log, EventLevel.Verbose);
listener.LogToElasticsearch("testInstance", elasticsearchUri, this.indexPrefix, this.type, bufferingInterval: bufferingInterval);
=======
listener.LogToElasticSearch("te... |
<<<<<<<
public void PlaySoundFromGroup(List<AudioClip> group, float volume) {
if(group.Count == 0) {
return;
}
int which_shot = Random.Range(0, group.Count);
GetComponent<AudioSource>().PlayOneShot(group[which_shot], volume * PlayerPrefs.GetFloat("sound_volume", 1f));
... |
<<<<<<<
return OnFromTableOrView<TObject>(DatabaseMetadata.GetTableOrViewFromClass<TObject>().Name, filterValue, filterOptions);
=======
return OnFromTableOrView<TObject>(DatabaseObjectAsTableOrView<TObject>(OperationType.Select).Name, filterValue, FilterOptions.None);
>>>>>>>
ret... |
<<<<<<<
[AutoRetry]
[ActivePlatforms(Platform.Android, Platform.iOS)]
public void FlyoutTest_DataBoundButton_CommandExecutes()
{
Run("UITests.Shared.Windows_UI_Xaml_Controls.Flyout.Flyout_ButtonInContent");
var flyoutButton = _app.Marked("FlyoutButton");
var dataBoundButton = _app.Marked("DataBoundBut... |
<<<<<<<
readonly SqlServerTableOrViewMetadata<SqlDbType> m_Table;
readonly string m_WhereClause;
=======
readonly TableOrViewMetadata<SqlServerObjectName, SqlDbType> m_Table;
readonly object m_NewValues;
readonly string m_UpdateExpression;
readonly object m_UpdateArgum... |
<<<<<<<
/// <remarks>If you don't override this method, it will call execute on the previous link.</remarks>
public virtual Task<TResult> ExecuteAsync(CancellationToken cancellationToken, object state = null)
{
return PreviousLink.ExecuteAsync(cancellationToken, state);
}
... |
<<<<<<<
{
var cacheKey = m_CacheKeyFunction(item);
await DataSource.Cache.WriteAsync(cacheKey, item, m_Policy);
cacheKeys.Add(cacheKey);
}
m_ActualCacheKeys = cacheKeys.ToImmutableArray();
=======
await DataSource.Cach... |
<<<<<<<
actualSchema = reader.GetString(reader.GetOrdinal("SchemaName"));
actualName = reader.GetString(reader.GetOrdinal("Name"));
objectId = reader.GetInt32(reader.GetOrdinal("ObjectId"));
sqlTypeName = reader.IsDBNull(re... |
<<<<<<<
=======
private class ColumnData
{
public ColumnData(int index, Type columnType, string getter)
{
ColumnType = columnType;
Getter = getter;
Index = index;
}
public int Index { get; }
... |
<<<<<<<
sqlBuilder.BuildSelectClause(sql, " OUTPUT ", "Deleted.", intoClause);
sql.Append(" WHERE " + m_WhereClause);
=======
sqlBuilder.BuildSelectClause(sql, " OUTPUT ", "Deleted.", null);
if (m_FilterValue != null)
{
sql.Append(" WHERE " +... |
<<<<<<<
var sqlTypeName = reader.GetString(reader.GetOrdinal("udt_name"));
parameters.Add(new ParameterMetadata<NpgsqlDbType>(parameterName, "@" + parameterName, sqlTypeName, SqlTypeNameToDbType(sqlTypeName)));
=======
var typeName = ... |
<<<<<<<
/// Gets a value indicating whether this table or view has primary key.
/// </summary>
/// <value>
/// <c>true</c> if this instance has a primary key; otherwise, <c>false</c>.
/// </value>
public bool HasPrimaryKey => Columns.Any(c => c.IsPrimaryKey);
/... |
<<<<<<<
var sqlTypeName = reader.GetString("DATA_TYPE");
var maxLength = reader.IsDBNull(reader.GetOrdinal("CHARACTER_MAXIMUM_LENGTH")) ? (UInt64?)null : reader.GetUInt64("CHARACTER_MAXIMUM_LENGTH");
var precisionA = reader.IsDBNull(rea... |
<<<<<<<
#if SQL_SERVER || POSTGRESQL || OLE_SQL_SERVER
=======
#if SQL_SERVER || POSTGRESQL || MYSQL
>>>>>>>
#if SQL_SERVER || POSTGRESQL || OLE_SQL_SERVER || MYSQL
<<<<<<<
#elif OLE_SQL_SERVER
const string CheckA = @"SELECT Count(*) FROM Sales.Customer c WHERE c.State = ?;";
const string CheckB ... |
<<<<<<<
var hsrel5 = (HSREL5)_ccToolsBoardService.RegisterDevice(CCToolsDevice.HSRel5, InstalledDevice.BedroomHSREL5.ToString(), 38);
var hsrel8 = (HSREL8)_ccToolsBoardService.RegisterDevice(CCToolsDevice.HSRel8, InstalledDevice.BedroomHSREL8.ToString(), 21);
=======
>>>>>>>
var h... |
<<<<<<<
using System.Text;
=======
using System.Data.Common;
>>>>>>>
using System.Text;
using System.Data.Common;
<<<<<<<
public long GetBytes(int i, long fieldOffset, byte[] buffer, int bufferOffset, int length)
=======
public override long GetBytes(int i, long fieldOffset, byte[] buffer, int buf... |
<<<<<<<
=======
// excel and google plugin have its own template files,
// so we need to set the different path when the asset file is created.
private readonly string gDataTemplatePath = "QuickSheet/GDataPlugin/Templates";
>>>>>>>
<<<<<<<
private void Awake() {
// exce... |
<<<<<<<
public void Exit()
{
NSApplication.SharedApplication.Terminate(null);
}
=======
[Export("themeChanged:")]
public void ThemeChanged(NSObject change) => OnSystemThemeChanged();
>>>>>>>
[Export("themeChanged:")]
public void ThemeChanged(NSObject change) => OnSystemThemeChanged();
public... |
<<<<<<<
public static int AddTask(string boardID, string dateCreated, string title, string desc, string categ, string colorKey, string tags)
=======
public static void UpdateColumnData(CustomKanbanModel selectedCardModel, string targetCategory)
{
using (SqliteConnection db =
... |
<<<<<<<
private string GetArgumentsString(ArgumentContainer container)
{
var resContainer = new ArgumentContainer { new InputArgument("input.mp4") };
foreach (var a in container)
{
resContainer.Add(a.Value);
}
resContainer.Add(n... |
<<<<<<<
#if __ANDROID__ || false || NET461 || __WASM__ || false
#if __ANDROID__ || false || NET461 || __WASM__ || false
=======
#if __ANDROID__ || __IOS__ || NET461 || __WASM__ || __SKIA__ || __NETSTD_REFERENCE__ || __MACOS__
#if __ANDROID__ || __IOS__ || NET461 || __WASM__ || __SKIA__ || __NETSTD_REFERENCE__ || ... |
<<<<<<<
[Test]
public void Ensure_Can_Parse_Multiple_Nullable_Enums_To_A_List()
{
var parser = CreateFluentParser();
var actual = new List<TestEnum?>();
parser.Setup<List<TestEnum?>>("enums")
.Callback(actual.AddRange);
var res... |
<<<<<<<
#if NET461 || __WASM__ || false
=======
#if false || false || NET461 || __WASM__ || __MACOS__
>>>>>>>
#if false || false || NET461 || __WASM__ || false
<<<<<<<
#if NET461 || __WASM__ || false
=======
#if false || false || NET461 || __WASM__ || __MACOS__
>>>>>>>
#if false || false || NET461 || __... |
<<<<<<<
Console.WriteLine("{0}.exe [/log] - compiles sources in current directory. optionally logs diagnostics info.", appName);
Console.WriteLine("{0}.exe /lib - compiles sources in current directory ito dll.", appName);
Console.WriteLine("{0}.exe /clean - deletes tools, packages, and bin proje... |
<<<<<<<
=======
>>>>>>> |
<<<<<<<
return destinationImage;
}
else
{
throw new InvalidOperationException(SR.Format(SR.ResizeInvalidParameters, width, height));
}
}
//Transparency
//opacityMultiplier is between 0-1
public static void S... |
<<<<<<<
internal DLLImports.gdImageStruct gdImageStruct;
=======
IntPtr gdImageStructPtr;
>>>>>>>
internal IntPtr gdImageStructPtr; |
<<<<<<<
/* Factory Methods */
public static Image Create(int width, int height)
{
return new Image(width, height);
}
public static Image Load(string filePath)
{
return new Image(filePath);
}
public static Image Load(Stream strea... |
<<<<<<<
public bool CopyNumberSwapped;
public bool IsHeterogeneous;
=======
public bool CopyNumberSwapped;
>>>>>>>
public bool CopyNumberSwapped;
public bool IsHeterogeneous;
<<<<<<<
writer.WriteLine("##INFO=<ID=SUBCLONAL,Number=0,Type=Flag,Description=\"Subcl... |
<<<<<<<
using CanvasPedigreeCaller.Visualization;
=======
using CanvasCommon;
>>>>>>>
using CanvasCommon;
using CanvasPedigreeCaller.Visualization;
<<<<<<<
using Isas.Framework.Settings;
using Isas.Framework.Utilities;
using Isas.Framework.WorkManagement;
using Isas.Framework.WorkManagement.CommandBuilding;
using I... |
<<<<<<<
#if __ANDROID__ || __IOS__ || NET461 || __WASM__ || false
=======
#if __ANDROID__ || __IOS__ || NET461 || __WASM__ || __SKIA__ || __NETSTD_REFERENCE__ || __MACOS__
>>>>>>>
#if __ANDROID__ || __IOS__ || NET461 || __WASM__ || __SKIA__ || __NETSTD_REFERENCE__ || false
<<<<<<<
#if __ANDROID__ || __IOS__ ||... |
<<<<<<<
_coverageBigWigWriter = coverageBigWigWriter;
QualityFilterThreshold = qualityFilterThreshold;
DeNovoQualityFilterThreshold = deNovoQualityFilterThreshold;
CallerParameters = callerParameters;
=======
_qualityFilterThreshold = qualityFilterThreshold;... |
<<<<<<<
using Utilities = Isas.Framework.Utilities.Utilities;
=======
using Isas.Framework.Utilities;
using Isas.SequencingFiles;
>>>>>>>
using Isas.Framework.Utilities;
using Isas.SequencingFiles;
<<<<<<<
var sampleTypesEnum = sampleTypesString.Select(GetSampleType).ToList();
=======
>>>>>>>
... |
<<<<<<<
private static readonly FileOption PloidyFile = FileOption.Create("bed or vcf file specifying the regions where reference ploidy is not 2", "p", "ploidy");
=======
private static readonly FileOption PloidyBed = FileOption.Create("Bed file specifying the regions where reference ploidy is not 2"... |
<<<<<<<
[Test]
[AutoRetry]
public void ListView_ExpandableItem_ExpandSingleItem()
{
Run("SamplesApp.Windows_UI_Xaml_Controls.ListView.ListView_Expandable_Item");
var checkBox = _app.Marked("CheckBox");
_app.WaitForElement(checkBox);
// Save initial state(not expanded)
var screenshot1 = TakeS... |
<<<<<<<
public const string TokenCacheJsonSerializerFailedParse = "MSAL V3 Deserialization failed to parse the cache contents. Is this possibly an earlier format needed for DeserializeMsalV2?";
public const string TokenCacheDictionarySerializerFailedParse = "MSAL V2 Deserialization failed to parse the... |
<<<<<<<
private async Task<T> GetResponseAsync<T>(string endpointType, bool respondToDeviceAuthChallenge)
{
=======
private async Task<T> GetResponseAsync<T>(bool respondToDeviceAuthChallenge)
{
>>>>>>>
private async Task<T> GetResponseAsync<T>(bool respondToDeviceAuthChallen... |
<<<<<<<
public override string GetDeviceNetworkState()
{
// TODO(mats):
return string.Empty;
}
public override string GetDpti()
{
// TODO(mats):
return string.Empty;
}
public override string GetMatsOsPlatform()
... |
<<<<<<<
///
=======
/// Sets the Application token cache. This cache is used in client credential flows
/// (<see cref="IConfidentialClientApplication.AcquireTokenForClientAsync(System.Collections.Generic.IEnumerable{string})"/>
/// and its override
/// </summary>
/// ... |
<<<<<<<
public override string GetDeviceNetworkState()
{
// TODO(mats):
return string.Empty;
}
public override string GetDpti()
{
// TODO(mats):
return string.Empty;
}
public override string GetMatsOsPlatform()
... |
<<<<<<<
CacheQueryData = new CacheQueryData();
CacheQueryData.Authority = Authenticator.Authority;
CacheQueryData.Resource = this.Resource;
CacheQueryData.ClientId = this.ClientKey.ClientId;
CacheQueryData.SubjectType = this.TokenSubjectType;
Cach... |
<<<<<<<
/// <remarks>You can add several authorities, but only one can be the default authority.</remarks>
=======
>>>>>>>
<<<<<<<
/// <remarks>You can add several authorities, but only one can be the default authority.</remarks>
=======
>>>>>>>
<<<<<<<
/// <remarks>You can add several a... |
<<<<<<<
public const string ClientApplicationBaseExecutorNotImplemented =
"ClientApplicationBase implementation does not implement IClientApplicationBaseExecutor.";
public const string ActivityRequiredForParentObjectAndroid = "Activity is required for parent object on Android.";
p... |
<<<<<<<
public static string InvalidRedirectUriReceived(string invalidRedirectUri)
{
return $"Invalid RedirectURI was received ({invalidRedirectUri}) Not parseable into System.Uri class.";
}
=======
public static string DefaultAuthorityTypeInstanceAudienceMismatch(Author... |
<<<<<<<
public static class Midi
{
#if __WASM__
/// <summary>
/// Allows MIDI System eclusive access for WebAssembly.
/// </summary>
public static bool RequestSystemExclusiveAccess { get; set; }
#endif
}
=======
public static class NetworkInformation
{
public static string ReachabilityHostn... |
<<<<<<<
get;
set;
=======
get
{
return GetXmlNodeDoubleNull(_crossesAtPath);
}
set
{
if (value == null)
{
DeleteNode(_crossesAtPath, true);
}
... |
<<<<<<<
var selectedMethod = candidateMethods
.Where(m => m.Name == name &&
m.GetParameters().Skip(1)
.All(p => p.HasDefaultValue
|| suppliedArgumentValues.Any(s => s.Key.Equals(p.Name, StringCompar... |
<<<<<<<
using System.Collections.Generic;
using Serilog.Debugging;
=======
>>>>>>>
using System.Collections.Generic;
using Serilog.Debugging;
<<<<<<<
SelfLog.Enable(Console.Error);
=======
Thread.CurrentThread.Name = "Main thread";
>>>>>>>
Thread.CurrentThread.Name = "Main t... |
<<<<<<<
private UnityEngine.Rendering.Universal.RenderPassEvent m_renderPassEvent = UnityEngine.Rendering.Universal.RenderPassEvent.AfterRenderingOpaques;
=======
private RenderPassEvent m_renderPassEvent = RenderPassEvent.AfterRenderingOpaques;
>>>>>>>
private RenderPassEvent m_renderPassEvent = RenderPassEve... |
<<<<<<<
using System;
using System.Collections.Generic;
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Windows;
using System.Windows.Controls;
=======
>>>>>>>
using System;
using System.Collections.Generic;
using System.Reflection;
using System.Windows;
using System.Windows.Controls;
... |
<<<<<<<
using LiveCharts.Geared;
=======
using System.Collections.Generic;
using LiveCharts;
using LiveCharts.Wpf.Charts.Base;
>>>>>>>
using System.Collections.Generic;
using LiveCharts;
using LiveCharts.Geared;
using LiveCharts.Wpf.Charts.Base;
<<<<<<<
=======
>>>>>>> |
<<<<<<<
Activated += MainForm_Activated;
Deactivate += MainForm_Deactivate;
foreach (var control in new[] { SystemLabel, MinimizeLabel, MaximizeLabel, CloseLabel })
{
control.MouseEnter += (s, e) => SetLabelColors((Control)s, MouseState.Hover);
... |
<<<<<<<
&& context.resources.computeShaders.lut3DBaker != null
&& SystemInfo.graphicsDeviceType != GraphicsDeviceType.OpenGLCore;
=======
&& SystemInfo.graphicsDeviceType != GraphicsDeviceType.OpenGLCore
&& SystemInfo.graphicsDeviceType != GraphicsDevice... |
<<<<<<<
cmd.GetTemporaryRT(mipDown, tw, th, 0, FilterMode.Bilinear, context.sourceFormat);
cmd.GetTemporaryRT(mipUp, tw, th, 0, FilterMode.Bilinear, context.sourceFormat);
cmd.BlitFullscreenTriangle(lastDown, mipDown, sheet, pass);
=======
context.GetScr... |
<<<<<<<
=======
public AmbientOcclusion ambientOcclusion;
public ScreenSpaceReflections screenSpaceReflections;
>>>>>>>
public ScreenSpaceReflections screenSpaceReflections;
<<<<<<<
RuntimeUtilities.CreateIfNull(ref debugLayer);
=======
RuntimeUtilitie... |
<<<<<<<
/// <summary>
/// The ambient occlusion method to use.
/// </summary>
[Tooltip("The ambient occlusion method to use. \"MSVO\" is higher quality and faster on desktop & console platforms but requires compute shader support.")]
=======
[Tooltip("The ambient occlusion met... |
<<<<<<<
case ServerPackets.QuestOffer:
HandleQuestOffer(bf.ReadBytes(bf.Length()));
break;
case ServerPackets.QuestProgress:
HandleQuestProgress(bf.ReadBytes(bf.Length()));
break;
===... |
<<<<<<<
protected byte _renderPriority = 1;
=======
public int AnimationFrame;
>>>>>>>
protected byte _renderPriority = 1;
public int AnimationFrame; |
<<<<<<<
public static void SendParty(Client client)
{
var bf = new ByteBuffer();
bf.WriteLong((long)ServerPackets.PartyData);
bf.WriteInteger(client.Entity.Party.Count);
for (int i = 0; i < client.Entity.Party.Count; i++)
{
bf.... |
<<<<<<<
if (MapInstance.Lookup.Get<MapInstance>(mapNum) != null)
{
if (Globals.CurrentMap == MapInstance.Lookup.Get<MapInstance>(mapNum))
Globals.CurrentMap = map;
MapInstance.Lookup.Get<MapInstance>(mapNum).Delete();
... |
<<<<<<<
sizeLabel.Text = TranslationServer.Translate("SIZE") + " " +
size.ToString(CultureInfo.CurrentCulture);
=======
sizeLabel.Text = size.ToString(CultureInfo.CurrentCulture);
UpdateCellStatsIndicators();
>>>>>>>
sizeLabel.Text = size.ToString(CultureInfo.CurrentCultu... |
<<<<<<<
DespawnNpc,
=======
//Questing
StartQuest,
CompleteQuestTask,
EndQuest,
>>>>>>>
DespawnNpc,
//Questing
StartQuest,
CompleteQuestTask,
EndQuest, |
<<<<<<<
public void ApplyPropertiesFromSave(Microbe microbe)
{
SaveApplyHelper.CopyJSONSavedPropertiesAndFields(this, microbe, new List<string>()
{
"organelles",
});
NodeGroupSaveHelper.CopyGroups(this, microbe);
organelles.Clear();
while (microbe.o... |
<<<<<<<
foreach (var map in MapInstance.Lookup.Copy)
=======
var timeMs = Globals.System.GetTimeMs();
var maps = MapInstance.GetObjects();
foreach (var map in maps)
>>>>>>>
var timeMs = Globals.System.GetTimeMs();
foreach... |
<<<<<<<
private void questEditorToolStripMenuItem_Click(object sender, EventArgs e)
{
PacketSender.SendQuestEditor();
}
=======
//Help
private void aboutToolStripMenuItem_Click(object sender, EventArgs e)
{
frmAbout aboutfrm = new frmAbout();
... |
<<<<<<<
/*foreach (var evt in EventBase.GetObjects())
=======
foreach (var evt in EventBase.Lookup)
>>>>>>>
/*foreach (var evt in EventBase.Lookup) |
<<<<<<<
this.mapListToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.hideTilePreviewToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
=======
this.hideTilePreviewToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
>>>>>>>
... |
<<<<<<<
BenchBase b = BenchBase.Lookup.Get(InCraft);
if (CraftTimer + b.Crafts[CraftIndex].Time < timeMs)
=======
BenchBase b = BenchBase.GetCraft(InCraft);
if (CraftTimer + b.Crafts[CraftIndex].Time < timeMs)
>>>>>>>
BenchBase b = Bench... |
<<<<<<<
ChatBubble,
MapEntities
=======
PartyData,
PartyInvite,
ChatBubble,
>>>>>>>
PartyData,
PartyInvite,
ChatBubble,
MapEntities |
<<<<<<<
dbObj = new AnimationBase(predefinedid);
=======
>>>>>>>
<<<<<<<
dbObj = new ClassBase(predefinedid);
=======
>>>>>>>
<<<<<<<
dbObj = new ItemBase(predefinedid);
=======
>>>>>>>
<<<<<<<
dbObj = new NpcBase(predefinedid);... |
<<<<<<<
Name = resource.Name;
Sprite = resource.InitialGraphic;
Vital[(int) Vitals.Health] = Globals.Rand.Next(Math.Min(1, resource.MinHp),
Math.Max(resource.MaxHp, Math.Min(1, resource.MinHp)) + 1);
MaxVital[(int) Vitals.Health] = Vital[(int) Vitals.Healt... |
<<<<<<<
BenchBase b = BenchBase.Lookup.Get(InCraft);
if (CraftTimer + b.Crafts[CraftIndex].Time < Environment.TickCount)
=======
BenchBase b = BenchBase.GetCraft(InCraft);
if (CraftTimer + b.Crafts[CraftIndex].Time < timeMs)
>>>>>>>
Benc... |
<<<<<<<
LoadingScreen.Instance.Show(TranslationServer.Translate("LOADING_GAME"),
TranslationServer.Translate("CREATING_OBJECTS_FROM_SAVE"))));
=======
LoadingScreen.Instance.Show("Loading Game", "Creating objects from save")));
... |
<<<<<<<
cmbItem.SelectedIndex = Database.GameObjectListIndex(GameObjectType.Item, _myTask.Data1);
scrlItemQuantity.Value = _myTask.Data2;
lblItemQuantity.Text = "Amount: " + scrlItemQuantity.Value;
=======
cmbItem.SelectedIndex = Database... |
<<<<<<<
public static void SendQuestOffer(Player player, int questId)
{
var bf = new ByteBuffer();
bf.WriteLong((int)ServerPackets.QuestOffer);
bf.WriteInteger(questId);
SendDataTo(player.MyClient, bf.ToArray());
bf.Dispose();
}
... |
<<<<<<<
TryGiveItem(new ItemInstance(BenchBase.GetCraft(InCraft).Crafts[index].Item, 1));
PacketSender.SendPlayerMsg(MyClient, Strings.Get("crafting","crafted", ItemBase.GetName(BenchBase.GetCraft(InCraft).Crafts[index].Item)), Color.Green);
=======
if (TryGiveItem(new ... |
<<<<<<<
=======
this.txtMaxHp = new System.Windows.Forms.TextBox();
this.lblMaxHp = new System.Windows.Forms.Label();
this.scrlAnimation = new System.Windows.Forms.HScrollBar();
this.lblAnimation = new System.Windows.Forms.Label();
>>>>>>>
<<<<<<<
// picEn... |
<<<<<<<
private const string DIRECTORY_BACKUPS = "resources/backups";
private const int DbVersion = 10;
=======
private const int DbVersion = 11;
>>>>>>>
private const string DIRECTORY_BACKUPS = "resources/backups";
private const int DbVersion = 11; |
<<<<<<<
namespace Intersect.Server.Classes.Entities
=======
/////////////////////////////////////////////////////
/// Welcome to Kibbelz Boss ass projectile system ///
/// Glad you took the time to view the code :) ///
/////////////////////////////////////////////////////
namespace Intersect_Server.Classes.Entiti... |
<<<<<<<
//Event trigger
for (var i = 0; i < MyEvents.Count; i++)
{
MyEvents[i].PlayerHasDied = true;
}
base.Die(dropitems);
=======
base.Die(dropitems, killer);
>>>>>>>
//Event trigger
for (var i = 0; i <... |
<<<<<<<
this.kernel.Bind<IRemovableDriveWatcher>().To<RemovableDriveWatcher>();
this.kernel.Bind<ILibraryReader>().To<LibraryFileReader>().WithConstructorArgument("sourcePath", FilePath);
this.kernel.Bind<ILibraryWriter>().To<LibraryFileWriter>().WithConstructorArgument("targetPath",... |
<<<<<<<
// Add managment endpoint services
services.AddCloudFoundryActuators(Configuration);
=======
>>>>>>>
// Add managment endpoint services
services.AddCloudFoundryActuators(Configuration);
<<<<<<<
=======
#if NETCOREAPP3_1
>>>>>>>
<<<<<<<
===... |
<<<<<<<
=======
internal static readonly PropertyInfo String_Length =
typeof(string).GetProperty(nameof(string.Length));
>>>>>>> |
<<<<<<<
using System.Threading.Tasks;
using Microsoft.Actions.Actors.Communication;
using Microsoft.Actions.Actors.Communication.Client;
=======
using System.Threading.Tasks;
using Newtonsoft.Json;
>>>>>>>
using System.Threading.Tasks;
using Microsoft.Actions.Actors.Communication;
u... |
<<<<<<<
using Microsoft.Actions.Actors.Communication;
using Microsoft.Actions.Actors.Resources;
=======
using Microsoft.Actions.Actors.Runtime;
>>>>>>>
using Microsoft.Actions.Actors.Communication;
using Microsoft.Actions.Actors.Resources;
using Microsoft.Actions.Actors.Runtime;
<<<<<<<
... |
<<<<<<<
this.btnCenterText = new System.Windows.Forms.Button();
=======
this.btnRectangle = new System.Windows.Forms.Button();
>>>>>>>
this.btnCenterText = new System.Windows.Forms.Button();
this.btnRectangle = new System.Windows.Forms.Button();
<<<<<<<
//... |
<<<<<<<
this.btnCenterText = new System.Windows.Forms.Button();
this.txtBoundaries = new ThoNohT.NohBoard.Controls.VectorTextBox();
this.txtTextPosition = new ThoNohT.NohBoard.Controls.VectorTextBox();
=======
this.btnRectangle = new System.Windows.Forms.Button();
>>>>... |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.