conflict_resolution stringlengths 27 16k |
|---|
<<<<<<<
if (Faction.Threats.Where(threat => !threat.IsDead).Sum(threat => (threat.AI.Position - Position).Length() < 6.0f ? 1 : 0) -
Faction.Minions.Where(minion => !minion.IsDead).Sum(minion => (minion.Position - Position).Length() < 6.0f ? 1 : 0) > Creature.Stats.Constitution)
=======
... |
<<<<<<<
public static WorldManager World { get { return DwarfGame.World; } }
=======
public WorldManager World { get; set; }
>>>>>>>
public static WorldManager World { get; set; }
<<<<<<<
public static bool Paused
=======
public bool Paused
>>>>>>>
public bool ... |
<<<<<<<
=======
if (flags.turnOnRedAllowed != null && IsNearTurnOnRedAllowedConfigurable(segNodeConf.segmentId, false, ref node)) {
SetNearTurnOnRedAllowed(segNodeConf.segmentId, false, (bool)flags.turnOnRedAllowed);
}
if (flags.farTurnOnRedAllowed != null && IsFarTurnOnRedAllowedCo... |
<<<<<<<
public WorkFence(ComponentManager componentManager, Vector3 position, float orientation) :
base(componentManager, position, new SpriteSheet(ContentPaths.Entities.DwarfObjects.constructiontape, 32, 32), new Point(0, 0))
=======
public Fence(ComponentManager componentManager, Vector3... |
<<<<<<<
VoxelChunk.CreateFaceDrawMap();
StaticInitialized = true;
=======
VertexNeighbors2D[(int)VoxelVertex.FrontTopLeft] = new List<Vector3>()
{
new Vector3(-1, 0, 0),
new Vector3(-1, 0, 1),
... |
<<<<<<<
=======
SelectionCircle = new SelectionCircle(Manager, Physics)
{
IsVisible = false
};
Inventory = new Inventory("Inventory", Physics)
{
Resources = new ResourceContainer()
{
MaxReso... |
<<<<<<<
public BedRoom(bool designation, IEnumerable<VoxelHandle> designations, WorldManager world) :
base(designation, designations, BedRoomData, world)
=======
public BedRoom(bool designation, IEnumerable<Voxel> designations, WorldManager world, Faction faction) :
base(design... |
<<<<<<<
public CraftItem CraftType { get; set; }
public VoxelHandle Voxel { get; set; }
=======
public CraftBuilder.CraftDesignation Designation { get; set; }
>>>>>>>
public CraftBuilder.CraftDesignation Designation { get; set; }
<<<<<<<
public CraftItemTask(VoxelHandle vox... |
<<<<<<<
DesignationProperties.Add(DesignationType.Put, new DesignationTypeProperties
{
Color = new Color(1.0f, 0.0f, 0.0f, 1.0f),
DrawType = DesignationTypeProperties.DrawBoxType.PreviewVoxel
});
=======
DesignationProperties.Add(Design... |
<<<<<<<
public CraftItem ItemType { get; set; }
public VoxelHandle Location { get; set; }
public Body WorkPile { get; set; }
=======
public CraftItem ItemType;
public TemporaryVoxelHandle Location;
public Body WorkPile;
public bool Ov... |
<<<<<<<
=======
private Widget PausedWidget;
private Gum.Widget ResourcePanel;
>>>>>>>
private Widget PausedWidget;
<<<<<<<
Master.Faction.RoomBuilder.CurrentRoomData = null;
Master.VoxSelector.SelectionType = Vo... |
<<<<<<<
#endif
CustomLaneSpeedLimitIndexByNetInfoName[childNetInfoName] = customSpeedLimitIndex;
=======
CustomLaneSpeedLimitByNetInfoName[childNetInfoName] = customSpeedLimit;
>>>>>>>
#endif
CustomLaneSpeedLimitByNetInfoName[childNetInfoName] = customSpeedLimit;
<<<<<<<
#if DEBUGLOAD
Log._D... |
<<<<<<<
public WorldManager WorldManager { get; set; }
=======
public static WorldManager World { get; set; }
>>>>>>>
public static WorldManager WorldManager { get; set; }
<<<<<<<
WorldManager = new WorldManager(game);
WorldManager.gameState = this;
WorldM... |
<<<<<<<
#region Setup brush
BrushTray = GuiRoot.RootItem.AddChild(new NewGui.IconTray
{
AutoLayout = AutoLayout.FloatRight,
Rect = new Rectangle(256, 0, 32, 128),
SizeToGrid = new Point(1, 3),
Border = null,
... |
<<<<<<<
=======
/// <summary>
/// Renders the component.
/// </summary>
/// <param name="gameTime">The game time.</param>
/// <param name="chunks">The chunk manager.</param>
/// <param name="camera">The camera.</param>
/// <param name="spriteBatch">The sprite b... |
<<<<<<<
DigOrders.Add(GetVoxelQuickCompare(order.Vox), order);
World.DesignationDrawer.HiliteVoxel(order.Vox.Coordinate, DesignationType.Dig);
=======
DigOrders.Add(order.Vox, order);
if (this == World.PlayerFaction)
World.DesignationDrawer.HiliteVoxel(o... |
<<<<<<<
WorldManager.MakeAnnouncement("If we don't make a profit by tomorrow, our stock will crash!");
=======
WorldManager.MakeAnnouncement("We're bankrupt!", "If we don't make a profit by tomorrow, our stock will crash!");
SoundManager.PlaySound(ContentPaths.Audio.Osc... |
<<<<<<<
//GamePerformance.Instance.StartTrackPerformance("Diplomacy");
ComponentManager.Diplomacy.Update(gameTime, Time.CurrentDate);
//GamePerformance.Instance.StopTrackPerformance("Diplomacy");
//GamePerformance.Instance.StartTrackPerformance("Componen... |
<<<<<<<
ExpandChildWhenDisabled = true,
Tooltip = "Build walls",
=======
Tooltip = "Place blocks",
>>>>>>>
ExpandChildWhenDisabled = true,
Tooltip = "Place blocks",
<<<<<<<
... |
<<<<<<<
// TODO [issue #710] Road adjust mechanism seem to have changed in Sunset Harbor DLC.
// activate when we know the mechinism.
private bool ReadjustPathMode => false; //ShiftIsPressed;
=======
// /// <summary>Set this to true to once call <see cref="RequestOnscreenDisplayUpd... |
<<<<<<<
Manager.World.MakeAnnouncement(String.Format("{0} ({1}) refuses to work!",
Stats.FullName, Stats.CurrentLevel.Name), ZoomToMe);
=======
Manager.World.MakeAnnouncement(String.Format("{0} ({1}) refuses to work!",
... |
<<<<<<<
ExpandChildWhenDisabled = true,
=======
Tooltip = "Build walls",
>>>>>>>
ExpandChildWhenDisabled = true,
Tooltip = "Build walls",
<<<<<<<
},
... |
<<<<<<<
{
BuildGrassMotes();
=======
{
>>>>>>>
{
BuildGrassMotes();
<<<<<<<
}
IsRebuilding = false;
=======
}
ShouldRebuild = false;
>>>>>>>
}
IsRebuilding = false;
... |
<<<<<<<
[JsonObject(IsReference = true)]
public class Cactus : Plant
{
public Cactus() { }
public Cactus(ComponentManager Manager, Vector3 position, string asset, float bushSize) :
base(Manager, "Cactus", Matrix.Identity, new Vector3(bushSize, bushSize, bushSize), asset, bushSiz... |
<<<<<<<
using DwarfCorp.Goals;
=======
using Newtonsoft.Json;
>>>>>>>
using Newtonsoft.Json;
using DwarfCorp.Goals;
<<<<<<<
if (LastWorldPopup != null)
{
List<uint> removals = new List<uint>();
foreach (var popup in LastWorldPopup)
{
... |
<<<<<<<
public static Gum.Input.GumInputMapper GumInputMapper;
public static Gum.Input.Input GumInput;
public static Gum.RenderData GumSkin;
=======
public static GumInputMapper GumInput;
public static Input GemInput;
public static RenderData GumSkin;
public s... |
<<<<<<<
public AnimalPen(IEnumerable<VoxelHandle> voxels, WorldManager world) :
base(voxels, AnimalPenData, world)
=======
public AnimalPen(IEnumerable<Voxel> voxels, WorldManager world, Faction faction) :
base(voxels, AnimalPenData, world, faction)
>>>>>>>
public Anim... |
<<<<<<<
result = commandExecutor.execute("cmd.exe", "/c bob123123", ApplicationParameters.DefaultWaitForExitInSeconds, fileSystem.get_current_directory(), null, (s, e) => { errorOutput += e.Data; }, updateProcessPath: false);
=======
result = CommandExecutor.execute("cmd.exe", "/c bob1... |
<<<<<<<
config.Features.CheckSumFiles = set_feature_flag(ApplicationParameters.Features.CheckSumFiles, configFileSettings, defaultEnabled: true);
config.Features.AutoUninstaller = set_feature_flag(ApplicationParameters.Features.AutoUninstaller, configFileSettings, defaultEnabled: true);
... |
<<<<<<<
using Moq;
=======
using NUnit.Framework;
>>>>>>>
using NUnit.Framework;
using Moq; |
<<<<<<<
bool nextHasPrioritySigns = Constants.ManagerFactory.TrafficPriorityManager.HasNodePrioritySign(nextNodeId);
bool nextIsRealJunction = false;
=======
ushort buildingId = 0;
>>>>>>>
bool nextHasPrioritySigns = Constants.ManagerFactory.TrafficPriorityManager.HasNodePrioritySign(nextNodeId);
bool... |
<<<<<<<
#if !SILVERLIGHT
using System.ServiceModel;
#if !NETCORE
using System.ServiceModel.Web;
=======
>>>>>>>
<<<<<<<
#if !NETCORE
[Fact(Timeout = 2000)]
=======
[Fact]
>>>>>>>
[Fact]
<<<<<<<
#region Silverlight excluded
#if !SILVERLIGHT && !NETCORE
=======
>>>>>>> |
<<<<<<<
=======
public static TAttribute GetCustomAttribute<TAttribute>(this ICustomAttributeProvider source, bool inherit)
where TAttribute : Attribute
{
object[] attrs = source.GetCustomAttributes(typeof (TAttribute), inherit);
if (attrs.Length == 0)
{
return default(TAttribute);
}
else
... |
<<<<<<<
{
foreach (var bitmap in definition.Textures)
{
var scaled = bitmap;//new Bitmap(bitmap, new System.Drawing.Size(bitmapSize, bitmapSize));
int[] data = new int[scaled.Width * scaled.Height];
var bitmapData = ... |
<<<<<<<
extCitInstMan.Reset(ref extInstance);
return ExtSoftPathState.FailedHard;
=======
extInstance.Reset();
return ExtSoftPathState.FailedHard;
}
>>>>>>>
extCitInstMan.Reset(ref extInstance);
return ExtSoftPathState.FailedHard;
}
<<<<<<<
/// <summary>
/// Updates the vehic... |
<<<<<<<
using engenious;
using OctoAwesome.Common;
using OctoAwesome.EntityComponents;
=======
>>>>>>>
<<<<<<<
/// Die Guid des aktuell geladenen Universums.
/// </summary>
public Guid UniverseId { get; private set; }
/// <summary>
/// Dienste des Spiels.
/// </summa... |
<<<<<<<
public AssetComponent Assets { get; private set; }
=======
public Settings Settings { get; private set; }
>>>>>>>
public AssetComponent Assets { get; private set; }
public Settings Settings { get; private set; }
<<<<<<<
Assets = new AssetComponent(this);
... |
<<<<<<<
/// <summary>
/// Gibt an, ob der Spieler an Boden ist
/// </summary>
=======
[XmlIgnore]
>>>>>>>
/// <summary>
/// Gibt an, ob der Spieler an Boden ist
/// </summary>
[XmlIgnore] |
<<<<<<<
using static TrafficManager.UI.SubTools.PrioritySignsTool;
using static TrafficManager.Util.Shortcuts;
using static TrafficManager.Util.SegmentTraverser;
=======
using TrafficManager.UI.SubTools.LaneArrows;
>>>>>>>
using TrafficManager.UI.SubTools.LaneArrows;
using static TrafficMana... |
<<<<<<<
using MonoGameUi;
=======
using Microsoft.Xna.Framework.Input;
using MonoGameUi;
using OctoAwesome.Client.Components;
>>>>>>>
using MonoGameUi;
using OctoAwesome.Client.Components; |
<<<<<<<
=======
bool lht = LaneArrowManager.Instance.Services.SimulationService.TrafficDrivesOnLeft;
>>>>>>> |
<<<<<<<
using System;
=======
using Microsoft.Xna.Framework;
using Microsoft.Xna.Framework.Input;
using System;
using System.Diagnostics;
>>>>>>>
using System;
using System.Diagnostics; |
<<<<<<<
/// <summary>
/// Returns a list of all the connections defined for the application.
/// </summary>
/// <returns>An IEnumerable of connections.</returns>
public IEnumerable<Connection> GetConnections()
=======
public Page<Connection> GetConnections(int pageSize ... |
<<<<<<<
#if UNITY_STANDALONE_WIN
[DllImport ("AddLibraryPath")] public static extern void AddLibraryPath();
#endif
[DllImport ("FrameCapturer")] public static extern IntPtr fcExrCreateContext(ref fcExrConfig conf);
[DllImport ("FrameCapturer")] public static extern void fcExrDestroyContext(IntPtr ... |
<<<<<<<
using (var renderer = ResultRenderer.CreatePdfRenderer(resultPath, DataPath, false)) {
var examplePixPath = this.TestFilePath("processing/multi-page.tif");
=======
using (var renderer = ResultRenderer.CreatePdfRenderer(resultPath, DataPath)) {
var exampl... |
<<<<<<<
namespace TrafficManager.U.Button {
using System.Collections.Generic;
=======
namespace TrafficManager.U.Button {
>>>>>>>
namespace TrafficManager.U.Button {
<<<<<<<
using CSUtil.Commons;
using TrafficManager.API.Traffic.Enums;
=======
>>>>>>> |
<<<<<<<
using CorePush.Interfaces;
using CorePush.Utils;
=======
using System;
>>>>>>>
using CorePush.Interfaces;
using CorePush.Utils; |
<<<<<<<
methodImports.Add(string.Format(importFormat, x.Namespace.Name.AddPrefix(), GetPrefixForRequests(), x.TypeCollectionRequestBuilder()));
methodImports.Add(string.Format(importFormat, x.Namespace.Name.AddPrefix(), GetPrefixForRequests(), x.TypeRequestBuilder()));
=======
... |
<<<<<<<
if (!includeStopped && vehicle.GetLastFrameVelocity().sqrMagnitude < TrafficPriorityManager.MAX_SQR_STOP_VELOCITY) {
=======
if (!includeStopped && state.SqrVelocity < GlobalConfig.Instance.PriorityRules.MaxStopVelocity * GlobalConfig.Instance.PriorityRules.MaxStopVelocity) {
>>>>>>>
if (!includeSto... |
<<<<<<<
GUIContent wp8SimulatorModeLabel = new GUIContent("Run in Simulator (x86 build)");
GUIContent wp8TestModeLabel = new GUIContent("Simulate Store. (Don't forget to adapt IAPMock.xml to fit your IAPs)");
=======
>>>>>>>
GUIContent wp8SimulatorModeLabel = new GUIContent("Run in Simul... |
<<<<<<<
int amount;
if (localItemBalances.TryGetValue(itemId, out amount)) {
return amount;
}
Utils.LogDebug(TAG, "SOOMLA/UNITY Calling GetItemBalance with: " + itemId);
return Instance._getItemBalance(itemId);
=======
SoomlaUtils.LogDebug(TAG, "SOOMLA/UNITY Calling GetItemBalance with: " + i... |
<<<<<<<
instance._initialize(storeAssets);
=======
// SoomlaUtils.LogDebug(TAG, "Adding currency");
JSONObject currencies = new JSONObject(JSONObject.Type.ARRAY);
foreach(VirtualCurrency vi in storeAssets.GetCurrencies()) {
currencies.Add(vi.toJSONObject());
}
// SoomlaUtils.LogDebug(TAG, ... |
<<<<<<<
else if (_lastExtractedLexem.Type == LexemType.EndOperator)
{
isCodeEntered = true;
BuildModuleBody();
}
else if (_lastExtractedLexem.Type == LexemType.Directive)
=======
else if(_lastExtrac... |
<<<<<<<
/// <summary>
/// Determines whether [is web socket request] by identifying the Upgrade: websocket header.
/// </summary>
/// <param name="request">The request.</param>
/// <returns>
/// <c>true</c> if [is web socket request] [the specified request]; otherwise, ... |
<<<<<<<
context.Install(typeof(ViewProcessorMapExtension));
context.Install(typeof(StageCrawlerExtension));
=======
// context.Install(typeof(ViewProcessorMapExtension));
>>>>>>>
context.Install(typeof(ViewProcessorMapExtension)); |
<<<<<<<
public Vector3 Direction;
public float Pad;
=======
public Vector3 Direction;
public float pad;
>>>>>>>
public Vector3 Direction;
public float pad;
public float Pad;
<<<<<<<
public Vector3 Attenuation;
public float Pad;
=======
... |
<<<<<<<
using API.Traffic.Data;
using API.Traffic.Enums;
=======
using System;
using System.Collections.Generic;
using TrafficManager.API.Traffic.Data;
using TrafficManager.API.Traffic.Enums;
using TrafficManager.Manager.Impl;
using GenericGameBridge.Service;
>>>>>>>
<<<<<<<
=======... |
<<<<<<<
ParameterTypes = methodExecutor.MethodParameters.Select(GetParameterType).ToArray();
Policies = policies.ToArray();
=======
>>>>>>>
<<<<<<<
private Type GetParameterType(ParameterInfo p)
{
var type = p.ParameterType;
if (ReflectionHelper.IsStre... |
<<<<<<<
bufferItemEndA.m_laneID = this._endLaneA;
bufferItemEndA.m_position = data.m_position01;
this.GetLaneDirection(data.m_position01, out bufferItemEndA.m_direction, out bufferItemEndA.m_lanesUsed);
bufferItemEndA.m_methodDistance = 0f;
bufferItemEndA.m_comparisonValue = 0f;
bufferItemEndA.m... |
<<<<<<<
public const int ConflictingPackageReferenceVersions = 4002;
public const int DependenciesFileDoesNotExist = 4003;
public const int PackageVersionNotFoundInLineup = 4004;
public const int PackageRefHasLiteralVersion = 4005;
public const int VariableNotFoundInDependenciesP... |
<<<<<<<
new PackageSigningRule(),
new PrereleaseDependenciesVersionRule(),
=======
>>>>>>>
new PackageSigningRule(), |
<<<<<<<
#elif NETCOREAPP3_0
=======
#elif NETCOREAPP2_1 || NETSTANDARD2_0
>>>>>>>
#elif NETCOREAPP3_0 || NETSTANDARD2_0 |
<<<<<<<
public BodyScannedEvent(DateTime timestamp, string name, string bodyclass, decimal gravity, decimal temperature, decimal pressure, bool tidallylocked, bool landable, string atmosphere, Volcanism volcanism, decimal distancefromarrival, decimal orbitalperiod, decimal rotationperiod, decimal? semimajoraxis... |
<<<<<<<
Assert.AreEqual(0.94775, (double)theEvent.solarradius, 0.01);
=======
Assert.AreEqual(theEvent.radius, (decimal)659162816.0);
Assert.AreEqual(theEvent.solarradius, StarClass.solarradius((decimal)659162816.000000));
>>>>>>>
Assert.AreEqual(theEvent.radius, (deci... |
<<<<<<<
Case(@"finally@@{`boom!` ;}", A(TT.Id, TT.At, TT.At, TT.LBrace, TT.BQOperator, TT.Semicolon, TT.RBrace),
_("finally"), _(""), _(""), null, _("boom!"), _(";"), null);
=======
Case(@"finally@@{`boom!` ;}", A(TT.Id, TT.At, TT.At, TT.LBrace, TT.BQString, TT.Semicolon, TT.RBrace),
_("finally"), _("")... |
<<<<<<<
Exact(@"123;", F.Literal(123));
Exact(@"(123);", F.InParens(F.Literal(123)));
Exact(@"123uL;", F.Literal(123uL));
Exact(@"123.25;", F.Literal(123.25));
Exact(@"123.25f;", F.Literal(123.25f));
=======
Exact(@"123", F.Literal(123));
// Exact(@"123z", F.Literal(new BigInteger(123)));
Exac... |
<<<<<<<
private System.Windows.Forms.TextBox txtAzureStorageUploadPath;
private System.Windows.Forms.Label lblAzureStorageUploadPath;
private System.Windows.Forms.CheckBox cbAzureStorageExcludeContainer;
=======
private System.Windows.Forms.Label lblFirebaseDomain;
>>>>>>>
pri... |
<<<<<<<
private System.Windows.Forms.TabPage tpGist;
private GUI.AccountTypeControl atcGistAccountType;
private GUI.OAuth2Control oAuth2Gist;
=======
private System.Windows.Forms.Button btnCustomUploaderImport;
private System.Windows.Forms.Button btnCustomUploaderExport;
>>>>>... |
<<<<<<<
this.lblTeknikUrlShortenerAPIUrl = new System.Windows.Forms.Label();
this.tbTeknikUrlShortenerAPIUrl = new System.Windows.Forms.TextBox();
this.tscCustomUploaderResponseText.ContentPanel.SuspendLayout();
this.tscCustomUploaderResponseText.TopToolStripPanel.Suspend... |
<<<<<<<
internal System.Windows.Forms.TabPage tpBackblazeB2;
private System.Windows.Forms.TextBox txtB2CustomUrl;
private System.Windows.Forms.Label lblB2UrlPreview;
private System.Windows.Forms.CheckBox cbB2CustomUrl;
private System.Windows.Forms.Label lblB2Bucket;
priva... |
<<<<<<<
using System.Runtime.InteropServices;
=======
using System.Linq;
>>>>>>>
using System.Runtime.InteropServices;
using System.Linq; |
<<<<<<<
this.Headers.Add("User-Agent", "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/48.0.2564.109 Safari/537.36");
=======
this.Headers.Add("User-Agent", "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/49.0.2623.87 Safari... |
<<<<<<<
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
=======
using System.Threading;
>>>>>>>
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using System.Threading;
<<<<<<<
this.comboBox1.SelectedIndex = Properties.Settings.Default.loginMethod;
=======
this.loginMethodInpu... |
<<<<<<<
public bool ES3Compatible = false;
=======
public bool IncludeRefs = false;
>>>>>>>
public bool ES3Compatible = false;
public bool IncludeRefs = false;
<<<<<<<
case "--help":
case "-help":
case "-?":
config.ShowHelp = true;
break;
case "--es3":
case "-es3":
con... |
<<<<<<<
using System;
using DFe.DocumentosEletronicos.Common;
=======
using System;
using CTe.CTeOSDocumento.Common;
>>>>>>>
using System;
using CTe.CTeOSDocumento.Common; |
<<<<<<<
var ctor = selector.SelectFor(typeof(WithDefaultAndSingleParameter), new Type[0], DefaultBindingFlags);
Assert.AreEqual(1, ctor.GetParameters().Length);
=======
var ctor = ConstructorSelector.SelectFor(typeof(WithDefaultAndSingleParameter), new Type[0], DefaultBindingFlags)... |
<<<<<<<
var listed = v["catalogEntry"]?["listed"] ?? true;
if (!(bool)listed) continue;
=======
DateTime? time = null;
var times = v["catalogEntry"]?["published"];
if (times != null) {
time = (DateTime)times;
... |
<<<<<<<
var serverUrl = settings.ServerUrl;
Trace.Info("ServerUrl: {0}", serverUrl);
Uri uri = new Uri(serverUrl);
VssConnection conn = ApiUtil.CreateConnection(uri, creds);
Trace.Info("Set credentials on task service");
v... |
<<<<<<<
this.glControlMotor = new OpenTK.GLControl();
=======
this.buttonCouplerObject = new System.Windows.Forms.Button();
>>>>>>>
this.buttonCouplerObject = new System.Windows.Forms.Button();
this.glControlMotor = new OpenTK.GLControl();
<<<<<<<
this.toolStripContainerDrawArea.ContentPanel.Controls... |
<<<<<<<
/// <summary>
/// Dictionary of StaticObject with Path and PreserveVertices as keys.
/// </summary>
public readonly Dictionary<ValueTuple<string, bool>, StaticObject> StaticObjectCache;
/// <summary>
/// Dictionary of AnimatedObjectCollection with Path as key.
/// </summary>
public readonly D... |
<<<<<<<
TrackManager.UpdateTrackFollower(ref World.CameraTrackFollower, -1.0, true, false);
TrackManager.UpdateTrackFollower(ref World.CameraTrackFollower, FirstStationPosition, true, false);
Camera.Alignment = new CameraAlignment(new Vector3(0.0, 2.5, 0.0), 0.0, 0.0, 0.0, FirstStationPosition, 1.0);
=======
... |
<<<<<<<
World.CameraTrackFollower.Update(World.CameraTrackFollower.TrackPosition + z, true, false);
Camera.Alignment.TrackPosition = World.CameraTrackFollower.TrackPosition;
=======
World.CameraTrackFollower.UpdateRelative(z, true, false);
Camera.CurrentAlignment.TrackPosit... |
<<<<<<<
World.CameraTrackFollower.Update(-1.0, true, false);
ObjectManager.UpdateVisibility(World.CameraTrackFollower.TrackPosition + Camera.Alignment.Position.Z);
=======
World.CameraTrackFollower.UpdateAbsolute(-1.0, true, false);
ObjectManager.UpdateVisibility(World.CameraTrackFollower.TrackPosition + ... |
<<<<<<<
using static LibRender.CameraProperties;
=======
using LibRender;
using OpenBve.RouteManager;
>>>>>>>
using static LibRender.CameraProperties;
using OpenBve.RouteManager; |
<<<<<<<
using tso.world.components;
=======
>>>>>>>
using tso.world.components; |
<<<<<<<
var switchedProjects = SwitchToPackage(mapping.Value, solution, packageName, host);
=======
var switchedProjects = SwitchToPackage(solution, projectPath, packageName, packageVersion, mappedProjectFilePaths, host);
>>>>>>>
var switchedProjects = SwitchToPackage(... |
<<<<<<<
public class Payment
{
/// <summary>
/// Identifier of the payment resource created.
/// </summary>
[JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
public string id { get; set; }
/// <summary>
/// Time the resource was created.
/// </summary>
[JsonProperty(NullValueHandling = ... |
<<<<<<<
var moduleId = new ModuleIdentity("hub", "deviceId", "moduleid", Mock.Of<ICredentials>());
var docker = new DockerModule(moduleId.ModuleId, "v1", ModuleStatus.Running, RestartPolicy.Always, Config1, ImagePullPolicy.OnCreate, Constants.DefaultPriority, DefaultConfigurationInfo, EnvVars);
... |
<<<<<<<
var identity = new ModuleIdentity("hostname", "deviceid", "Module1", Mock.Of<ICredentials>());
var docker = new DockerModule("module1", "v1", ModuleStatus.Running, RestartPolicy.Always, Config1, ImagePullPolicy.OnCreate, Constants.DefaultPriority, DefaultConfigurationInfo, EnvVarsDict);
... |
<<<<<<<
=======
const string ApiVersionKey = "api-version";
const string DeviceClientTypeKey = "DeviceClientType";
const string ModelIdKey = "digital-twin-model-id";
>>>>>>>
const string ModelIdKey = "digital-twin-model-id";
<<<<<<<
ClientInfo clientInfo = this.userna... |
<<<<<<<
["Boost"] = "kh2-icon-tent",
["Form"] = "kh2-item-key",
["Map"] = "kh2-item-key",
["Report"] = "kh2-item-key",
["Summon"] = "kh2-item-key",
["Recipe"] = "KupoCoinIcon",
=======
["Card"] = "card-generic",
["CardEnemy"] = "card-enemy",
["CardFriend"] = "card-friend",
["CardItem"] =... |
<<<<<<<
using KHSave.LibBbs;
=======
using KHSave.SaveEditor.Views;
>>>>>>>
using KHSave.LibBbs;
using KHSave.SaveEditor.Views; |
<<<<<<<
#region Component locator methods
public T GetComponent<T>() where T : Component
{
return gameObject.GetComponent<T>();
}
public Component GetComponent(Type type)
=======
public Component[] GetComponentsInChildren(Type type)
>>>>>>>
#region... |
<<<<<<<
if (NoteActive(i))
{
Notes[i].instance.Stop();
Notes[i].instance.Dispose();
}
=======
if (NoteActive(i))
Bass.BASS_ChannelStop(Notes[i].channel);
>>>>>>>
if (NoteActive(... |
<<<<<<<
DrawOrder = 1;
isUpdateable.Add(typeof(iTween));
isLateUpdateable.Add(typeof(iTween));
isFixedUpdateable.Add(typeof(iTween));
=======
DrawOrder = 0;
>>>>>>>
DrawOrder = 0;
isUpdateable.Add(typeof(iTween));
isLateU... |
<<<<<<<
using tso.simantics.engine;
using tso.files.utils;
using tso.simantics.engine.scopes;
using tso.simantics.engine.utils;
using Microsoft.Xna.Framework;
=======
using TSO.Simantics.engine;
using TSO.Files.utils;
using TSO.Simantics.engine.scopes;
using TSO.Simantics.engine.utils;
>>>>>>>
using TSO.Simantics.en... |
<<<<<<<
public void SetColor(string name, Color color)
{
this.color = color;
}
=======
public void PrepareLoadContent()
{
ContentHelper.LoadTexture(mainTexture);
}
public void EndLoadContent()
{
if (texture == null)... |
<<<<<<<
#if DEBUG
if (Camera.logRenderCalls)
{
Debug.LogFormat("Particle: {0} on {1}. Count {2}", gameObject, cam.gameObject, particlesRendered);
}
#endif
vertexBuffer.SetData(vertices, 0, particlesRendered * 4);
=======
>>>>>>>
#if DEBUG
... |
<<<<<<<
public string material;
protected Body connectedBody;
protected Vector3 lastResizeScale;
=======
public string material { get; set; }
>>>>>>>
public string material; |
<<<<<<<
if ((sharedMesh.skinnedModel != null) && (sharedMesh.skinnedModel.SkinningData != null))
{
if (sharedMesh.skinnedModel.SkinningData.AnimationClips != null)
{
animation.Initialize(sharedMesh.skinnedModel.SkinningData);
}
... |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.