conflict_resolution
stringlengths
27
16k
<<<<<<< ======= [HttpGet] [Route("{id:guid}", Name = nameof(GetProduct))] public ActionResult<Product> GetProduct(Guid id) { return ProductStub().FirstOrDefault(x => x.Id == id); } private IEnumerable<Product> ProductStub() { return new List<Product> { new...
<<<<<<< //TODO: probably completely remove public static string TrimGraphQLTypes(this string name) { return _trimPattern.Replace(name, string.Empty).Trim(); } ======= /// <summary> /// Removes brackets and exclamation points from a GraphQL type name -- for e...
<<<<<<< private static readonly Type[] _typedContainers = { typeof(IEnumerable<>), typeof(List<>), typeof(IList<>), typeof(ICollection<>), typeof(IReadOnlyCollection<>) }; ======= private static readonly Type[] _typedContainers = new [] { typeof(IEnumerable<>), typeof(List<>), typeof(IList<>), typeof(...
<<<<<<< ======= /// <inheritdoc/> public override string CollectTypes(TypeCollectionContext context) { var innerType = context.ResolveType(Type); ResolvedType = innerType; var name = innerType.CollectTypes(context); context.AddType(name, innerTyp...
<<<<<<< ======= [Obsolete] public Func<string> AnonOperationNotAloneMessage => () => "This anonymous operation must be the only defined operation."; /// <summary> /// Returns a static instance of this validation rule. /// </summary> >>>>>>> /// <summary> ...
<<<<<<< public string Symbol { get; set; } public decimal Bid { get; set; } public decimal Ask { get; set; } public decimal Mid { get; set; } public DateTime ValueDate { get; set; } public long CreationTimestamp { get; set; } ======= [ProtoMember(1)] pub...
<<<<<<< InitializeFactories(); var uri = "ws://127.0.0.1:8080/ws"; var realm = "com.weareadaptive.reactivetrader"; ======= >>>>>>> InitializeFactories(); <<<<<<< _eventStoreConnection = GetEventStoreConnection(args.Contains("es"), args.Contains("ini...
<<<<<<< using Adaptive.ReactiveTrader.EventStore; ======= using EventStore.ClientAPI; using System; using System.Net; >>>>>>> using Adaptive.ReactiveTrader.EventStore; using EventStore.ClientAPI; using System; using System.Net; <<<<<<< var memoryEventStore = new NetworkEventStore(); Refer...
<<<<<<< }, 2, null, results.Select(x => x.EagerTensorHandle).ToArray(), results.Length)); ======= }, 2, null, null, results.Select(x => x.EagerTensorHandle).ToArray(), results.Length); >>>>>>> }, ...
<<<<<<< switch (type.Name) { case "Single": nd.SetData(values.Select(x => (float)x).ToArray()); break; case "NDArray": // nd.SetData<NDArray>(values.ToArray()); //NDArray[] arr = n...
<<<<<<< }, 1, null, results.Select(x => x.EagerTensorHandle).ToArray(), results.Length)); ======= }, 1, null, null, results.Select(x => x.EagerTensorHandle).ToArray(), results.Length); >>>>>>> }, ...
<<<<<<< var results = new[] { new EagerTensor() }; using Status status = new Status(c_api.TFE_FastPathExecute(tf.context, tf.context.device_name, ======= var results = EagerTensorPass.Create(); var inputs = EagerTensorPass.From(resource, value); ...
<<<<<<< /// Returns expression builder for rule's dependencies. /// </summary> /// <returns>Dependencies expression builder.</returns> protected IDependencyExpression Dependency() { return new DependencyExpression(_builder); } /// <summary> ======= ...
<<<<<<< const string streamId = "stream"; var events = new[] { new NewStreamEvent(Guid.NewGuid(), "type", "\"data\"", "\"headers\""), new NewStreamEvent(Guid.NewGuid(), "type", "\"data\"", "\"headers\"") ...
<<<<<<< Nodes = pathmapClass.Nodes.Get()[pathmapObject]; Segments = pathmapClass.Segments.Get()[pathmapObject]; Attributes = pathmapClass.Attributes.Get()[pathmapObject]; ======= // Set nodes and segments. Nodes = pathmapClass.Nodes.Get()[pathmapObject]; ...
<<<<<<< using Deltin.Deltinteger.Debugger; using Deltin.Deltinteger.Debugger.Protocol; ======= using Deltin.Deltinteger.Decompiler.TextToElement; using Deltin.Deltinteger.Decompiler.ElementToCode; >>>>>>> using Deltin.Deltinteger.Debugger; using Deltin.Deltinteger.Debugger.Protocol; using Deltin.Deltinteger.Decompil...
<<<<<<< current = IndexedVar.AssignInternalVarExt(context.VarCollection, null, "Dijkstra: Current", context.IsGlobal); IndexedVar distances = IndexedVar.AssignInternalVar (context.VarCollection, null, "Dijkstra: Distances", context.IsGlobal); unvisite...
<<<<<<< public DefinedType(ParseInfo parseInfo, Scope scope, DeltinScriptParser.Type_defineContext typeContext, List<IApplyBlock> applyBlocks) : base(typeContext.name.Text) ======= public DefinedType(ParseInfo parseInfo, Scope scope, DeltinScriptParser.Type_defineContext typeContext) : base(typeContex...
<<<<<<< public DijkstraBase(ActionSet actionSet, Element pathmapObject, Element position, Element attributes, bool reversed) ======= protected static bool assignExtended = false; public DijkstraBase(ActionSet actionSet, Element pathmapObject, Element position, bool reversed) >>>>>>> ...
<<<<<<< using (await _sessionsLock.LockAsync(CancellationToken.None).ConfigureAwait(false)) { return _sessions.Where(s => s.Value.IsConnected).Select(s => new ConnectedMqttClient { ClientId = s.Value.ClientId, ProtocolVersio...
<<<<<<< public void Dispose() { } ======= >>>>>>>
<<<<<<< using System.Linq; using MegaMan.Common.Entities; ======= using System; using System.Collections.Generic; using System.IO; using System.Linq; using System.Text; using System.Threading.Tasks; using System.Windows.Media.Imaging; >>>>>>> using System.IO; using System.Linq; using System.Windows.Media.Imaging; ...
<<<<<<< _addEnrageItem = false; _numberTimer.Refresh(); N(nameof(RhombEnrageTimerText)); //N(nameof(EnrageHistory)); ======= _numberTimer.Refresh(); N(nameof(EnrageHistory));...
<<<<<<< new[] { posParam, moveParam, sprParam, inputParam, collParam, ladderParam, timerParam, varsParam, healthParam, weaponParam, stParam, lifeParam, playerXParam, playerYParam, gravParam, randParam, playerParam }, ======= new[] { posParam, moveParam, sprParam, inputParam, collParam,...
<<<<<<< writer.WriteStartElement("Movement"); writer.WriteElementString("Flying", info.Flying.ToString()); ======= writer.WriteElementString("Floating", info.Floating.ToString()); >>>>>>> writer.WriteStartElement("Movement"); writer.WriteElementString("Fl...
<<<<<<< using System.Xml.Serialization; ======= >>>>>>> <<<<<<< using MegaMan.IO.Xml; ======= using MegaMan.Engine.Forms.MenuControllers; using MegaMan.Engine.Forms.Settings; using MegaMan.IO.Xml; >>>>>>> using MegaMan.Engine.Forms.MenuControllers; using MegaMan.Engine.Forms.Settings; using MegaMan.IO.Xml; <<<<...
<<<<<<< public List<BaseEventTrigger> EventTriggers; ======= public List<IEventTrigger> EventTriggers { get; set; } >>>>>>> public List<BaseEventTrigger> EventTriggers { get; set; } <<<<<<< TriggerList.Children.Add(new EventTriggerUserControl(this, trigger)); ======= ...
<<<<<<< private CustomEffectsCollection _customEffects; private readonly EventTriggersCollection _eventTriggersCollection; ======= private readonly CustomEffectsCollection _customEffects; private readonly EventsCollection _events; >>>>>>> private readonly CustomEffectsColle...
<<<<<<< using NUnit.Framework; using ServiceStack.ServiceModel.Serialization; using ServiceStack.ServiceModel.Tests.DataContracts.Operations; using ServiceStack.Text; ======= >>>>>>> using ServiceStack.Text; <<<<<<< [Test] public void KVP_Serializer_fills_public_fields() { using (JsConfig.With(inc...
<<<<<<< #if !NETCORE_SUPPORT ======= [Explicit("Requires MongoDB Dependency")] >>>>>>> #if !NETCORE_SUPPORT [Explicit("Requires MongoDB Dependency")]
<<<<<<< ======= >>>>>>> <<<<<<< ======= public void UpdateThirdPartyCamera(ServerAction action) { if (action.thirdPartyCameraId <= thirdPartyCameras.Count) { Camera thirdPartyCamera = thirdPartyCameras.ToArray()[action.thirdPartyCameraId]; thirdPartyCamera.gameObject.transform.eulerAngles = a...
<<<<<<< public GameObject[] TargetCircles = null; #if UNITY_EDITOR private List<Bounds> gizmobounds = new List<Bounds>(); #endif //change visibility check to use this distance when looking down //protected float DownwardViewDistance = 2.0f; ======= public Game...
<<<<<<< primaryAgent.ProcessControlCommand (action.dynamicServerAction); ======= Time.fixedDeltaTime = action.fixedDeltaTime.GetValueOrDefault(Time.fixedDeltaTime); if (action.targetFrameRate > 0) { Application.targetFrameRate = action.targetFrameRate; } primaryAgent.P...
<<<<<<< public int actionDuration = 3; private int defaultScreenWidth = 300; private int defaultScreenHeight = 300; ======= public int actionDuration = 3; // private int defaultScreenWidth = 300; // private int defaultScreenHeight = 300; >>>>>>> public int actionDuration = 3; <<<<<<< prot...
<<<<<<< if (p.TargetId != SessionManager.CurrentPlayer.EntityId) return; ======= CheckVelikMark(p); if (!p.TargetId.IsMe()) return; >>>>>>> if (!p.TargetId.IsMe()) return; <<<<<<< if (p.TargetId != SessionManager.CurrentPlayer.EntityId) return; ===...
<<<<<<< //ignore the trigger boxes the agent is using to check rotation, otherwise the object is colliding else if (other.tag != "Player") ======= //this is hitting something else so it must be colliding at this point! if (other.tag != "Player") >>>>>>> //this is hitting something else so it must be collid...
<<<<<<< if (agentCollides || handObjectCollides || tooMuchYMovement) { ======= if(Arm != null) { if(Arm.IsArmColliding()) { errorMessage = "Mid Level Arm is actively clipping with some geometry in the envir...
<<<<<<< // Extra stuff private Dictionary<string, SimObjPhysics> uniqueIdToSimObjPhysics = new Dictionary<string, SimObjPhysics>(); [SerializeField] public string[] objectIdsInBox = new string[0]; [SerializeField] protected bool inTopLevelView = false; [SerializeField] protected ...
<<<<<<< using System.Net; ======= using System.Text.RegularExpressions; >>>>>>> using System.Net; using System.Text.RegularExpressions; <<<<<<< var redirectUri = WebUtility.UrlDecode(request.RedirectUri); ======= var redirectUri = request.RedirectUri; >>>>>>> var redirectUri =...
<<<<<<< using RhinoInside.Revit.Convert.Geometry; ======= using RhinoInside.Revit.External.DB.Extensions; >>>>>>> using RhinoInside.Revit.Convert.Geometry; using RhinoInside.Revit.External.DB.Extensions; <<<<<<< var centerCurve = wallInstance.Location as DB.LocationCurve; DA.SetData("Center Curve", c...
<<<<<<< [TestMethod, Timeout(TestTimeout)] public void WriteLockAsyncSynchronousReleaseAllowsOtherWriters() { var testComplete = new ManualResetEventSlim(); // deliberately synchronous var firstLockReleased = new AsyncManualResetEvent(); var firstLockTask = Task.Run(async delegate { using (await this.a...
<<<<<<< #pragma warning disable AvoidAsyncSuffix // Avoid Async suffix internal bool IsAsync { get; } #pragma warning restore AvoidAsyncSuffix // Avoid Async suffix ======= internal bool IsAsync { get; set; } >>>>>>> internal bool IsAsync { get; }
<<<<<<< [DebuggerBrowsable(DebuggerBrowsableState.Never)] internal Task QueueNeedProcessEvent { get { using (NoMessagePumpSyncContext.Default.Apply()) { this.owner.Context.SyncContextLock.EnterUpgradeableReadLock(); try { ...
<<<<<<< [Fact] public async Task AllowReleaseAfterDispose() { using (await this.lck.EnterAsync().ConfigureAwait(false)) { this.lck.Dispose(); } } [Fact] public async Task DisposeDoesNotAffectEnter() { ...
<<<<<<< loopStarts = LoopDetection.FindLoops(methodInterpreter.MidRepresentation); found = false; foreach (var loopStart in loopStarts) { var loopEnd = LoopDetection.GetEndLoop(methodInterpreter.MidRepresentation.LocalOperations, loopSt...
<<<<<<< using JustDecompile.API.Core; ======= using System.Windows.Forms; using JustDecompile.API.Core; >>>>>>> using JustDecompile.API.Core; using System.Windows.Forms; using JustDecompile.API.Core; <<<<<<< internal class ModuleDefinitionContextMenu : MenuItemBase { public ModuleDefinitionContextMe...
<<<<<<< using System.IO; ======= using System; using System.IO; using System.Linq; using System.Net; >>>>>>> using System.IO; using System.Net; <<<<<<< return embeddedResource ?? new EmbeddedResource(GetType().Assembly, uiPath); ======= if (resourceStream == null) return...
<<<<<<< Console.WriteLine("Prime numbers: "); var len = 1000000; var pr = new Action(() => { var primes = AddPrimes(len); Console.Write(primes); Console.WriteLine("Simpler Example: "); }); pr(); } private static int AddPrime...
<<<<<<< return BeginLifetimeScope(tag, NoConfiguration); ======= CheckNotDisposed(); CheckTagIsUnique(tag); var registry = new CopyOnWriteRegistry(ComponentRegistry, () => CreateScopeRestrictedRegistry(tag, NoConfiguration)); var scope = new LifetimeScope(...
<<<<<<< [Fact] public void Decorator_Keyed_Generic() { BenchmarkRunner.Run<Decorators.KeyedGenericBenchmark>(); } [Fact] public void Decorator_Keyed_Nested() { BenchmarkRunner.Run<Decorators.KeyedNestedBenchmark>(); } [Fa...
<<<<<<< private readonly ConcurrentDictionary<IComponentRegistration, IEnumerable<IComponentRegistration>> _decorators = new ConcurrentDictionary<IComponentRegistration, IEnumerable<IComponentRegistration>>(); private readonly IRegisteredServicesTracker _registeredServicesTracker; ======= ...
<<<<<<< using Autofac.Features.Decorators; ======= using Autofac.Builder; >>>>>>> using Autofac.Builder; using Autofac.Features.Decorators;
<<<<<<< public async Task TestDirectoryWithExistingDirectoryNameCreation(bool fileExists, bool dirExists) ======= public void TestDirectoryWithExistingNodeNameCreation(bool fileExists, bool dirExists) >>>>>>> public async Task TestDirectoryWithExistingNodeNameCreation(bool fileExists, bool di...
<<<<<<< AssemblyScanner = new AssemblyScanner(concreteTypeExtractor, CompositionRootTypeExtractor, CompositionRootExecutor); PropertyDependencySelector = options.EnablePropertyInjection ? (IPropertyDependencySelector) new PropertyDependencySelector(new PropertySelector()) ...
<<<<<<< ======= public string ForeignKey { get { return attributes.Get(x => x.ForeignKey); } set { attributes.Set(x => x.ForeignKey, value); } } public int Length { get { return attributes.Get(x => x.Length); } set { attributes.S...
<<<<<<< ======= if (mapping.IsManyToMany) WriteManyToManyIndex(mapping); else if (mapping.HasValue(x => x.Offset)) WriteListIndex(mapping); else WriteIndex(mapping); } void WriteIndex(Index...
<<<<<<< public IDictionary<string, string> UnmigratedAttributes { get { return unmigratedAttributes; } } public Type ContainingEntityType { get { return attributes.Get(x => x.ContainingEntityType); } set { attributes.Set(x => x.ContainingEntit...
<<<<<<< ======= private readonly IPublicHolidays _holidayCalendar; >>>>>>> <<<<<<< ======= this._holidayCalendar = holidayCalendar; >>>>>>> <<<<<<< this.ObservedDate = observedDate; ======= this.Name = name; } /// <summary> /// The previou...
<<<<<<< ======= using FluentNHibernate.Mapping.Builders; >>>>>>> <<<<<<< ======= using FluentNHibernate.Utils; >>>>>>> <<<<<<< private readonly IList<FilterPart> childFilters = new List<FilterPart>(); private readonly Type entity; ======= private readonly IList<FilterMapping> childFilt...
<<<<<<< EnsureDictionary(); manyToManyIndex = new IndexManyToManyPart(); ======= manyToManyIndex = new IndexManyToManyPart(typeof(ManyToManyPart<TChild>)); >>>>>>> EnsureDictionary(); manyToManyIndex = new IndexManyToManyPart(typeof(ManyToManyPart<TChild>...
<<<<<<< } /// <summary> /// Returns a list of folders found at current path. /// </summary> /// <param name="path"></param> /// <returns></returns> public static List<string> folders(this string path) ======= } public static List<string> folders(th...
<<<<<<< using FluentNHibernate.Testing.DomainModel; ======= using FluentNHibernate.Testing.Testing; >>>>>>> using FluentNHibernate.Testing.DomainModel; using FluentNHibernate.Testing.Testing; <<<<<<< var compositeElementMapping = new CompositeElementMapping(); compositeElementMapping.AddProp...
<<<<<<< IEnumerable<Permission> permissions = _permissions.GetPermissions("Folder", file.FolderId).ToList(); file.Folder.Permissions = _permissions.EncodePermissions(permissions); ======= IEnumerable<Permission> permissions = _permissions.GetPermissions(EntityNames.Fold...
<<<<<<< IEnumerable<Permission> permissions = _permissions.GetPermissions("Page", page.PageId).ToList(); page.Permissions = _permissions.EncodePermissions(permissions); ======= IEnumerable<Permission> permissions = _permissions.GetPermissions(EntityNames.Page, page.Page...
<<<<<<< IEnumerable<Permission> permissions = _permissions.GetPermissions("Folder", folder.FolderId).ToList(); folder.Permissions = _permissions.EncodePermissions(permissions); ======= IEnumerable<Permission> permissions = _permissions.GetPermissions(EntityNames.Folder,...
<<<<<<< if(comboJoysticks.SelectedItem != null && (errmsg = VJoy.Acquire(uint.Parse(comboJoysticks.SelectedItem.ToString()))) != null) { ======= Type readerType; if(comboJoysticks.SelectedItem != null && (errmsg = VJoy.Acquire(uint.Parse(comboJoysticks.SelectedItem.ToString()))) != null) { >>>>>>> i...
<<<<<<< _dataFeed.RemoveSubscription(member.Symbol); // remove symbol mappings for symbols removed from universes SymbolCache.TryRemove(member.Symbol); ======= foreach (var configuration in universe.GetSubscriptions(m...
<<<<<<< Compression.Zip(filename, data, Compression.CreateZipEntryName(_symbol.Value, _securityType, time, _resolution, _dataType)); Log.Trace("LeanDataWriter.Write(): Created: " + data); ======= Compression.Zip(data, fileName, Compression.CreateZipEntryName(_symbol, _securityType,...
<<<<<<< var cached = CachedOrderIDs .Where(o => o.Value.BrokerId.Contains(message.MakerOrderId) || o.Value.BrokerId.Contains(message.TakerOrderId)) .ToList(); ======= EmitTradeTick(message); var cached = CachedOrderIDs.Where(o => o.Value.BrokerId.C...
<<<<<<< var security = algo.AddSecurity(SecurityType.Forex, "BTCUSD", Resolution.Hour, Market.GDAX, false, 3.3m, true); ======= var security = algo.AddSecurity(SecurityType.Crypto, "BTCUSD", Resolution.Hour, Market.Bitfinex, false, 3.3m, true); >>>>>>> var security = algo.AddSecu...
<<<<<<< using System.Collections.Concurrent; ======= using QuantConnect.Securities.Future; >>>>>>> using System.Collections.Concurrent; using QuantConnect.Securities.Future;
<<<<<<< ProjectFinder.AssociateProjectWith(selectedProjectName, fileNames); ======= var selectedProjectId = projectNameDialog.GetSelectedProjectId(); _projectFinder.AssociateProjectWith(selectedProjectName, fileNames); >>>>>>> var selec...
<<<<<<< ======= /// True if the data type has OHLC properties, even if dynamic data public readonly bool IsTradeBar; /// True if the data type has a Volume property, even if it is dynamic data public readonly bool HasVolume; >>>>>>> /// True if the data type has OHLC propert...
<<<<<<< Backtesting, /// Use a brokerage for live/paper trading in realtime Brokerage, ======= Backtesting /* >>>>>>> Backtesting, /// Use a brokerage for live/paper trading in realtime Brokerage, /*
<<<<<<< [Fact] public void ReadWithDefaultColumnsShouldHandleFirstRowAsRowData() { var lines = new[] { "not,a,row,header", "second,row,is,data", "third,row,is,data" }; var content = string.Join("\n", lines); var reader = new StringReader(content); ...
<<<<<<< using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; using SynthesisAPI.PreferenceManager; ======= >>>>>>> using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; <<<<<<< public static void TestDirectory()...
<<<<<<< // We will need these public List<List<UnityRigidNode>> PWMAssignments; public Dictionary<List<int>, UnityRigidNode> SolenoidAssignments; public float speed = 5; public int[] motors = { 1, 2, 3, 4 }; RigidNode_Base skeleton; unityPacket udp = new unityPacket(); List<Vector3> unit...
<<<<<<< pwm[0] += (InputControl.GetButton(Controls.buttons.forward) ? SPEED_ARROW_PWM : 0.0f) + (InputControl.GetButton(Controls.buttons.backward) ? -SPEED_ARROW_PWM : 0.0f) + (InputControl.GetButton(Controls.buttons.left) ? -SPEED_ARROW_PWM : 0.0f) + (InputContro...
<<<<<<< RigidNode_Base Skeleton = ExportSkeleteonLite(InventorManager.Instance.ComponentOccurrences.OfType<ComponentOccurrence>().ToList()); ======= InventorManager.Instance.UserInterfaceManager.UserInteractionDisabled = true; >>>>>>> <<<<<<< /// The lightweight equivalent of the 'Add ...
<<<<<<< public static Inventor.Application INVENTOR_APPLICATION; public static void LoadInventorInstance() { if (INVENTOR_APPLICATION != null) return; try { INVENTOR_APPLICATION = (Inventor.Application)Marshal.GetActiveObject("Inventor.Application"); } c...
<<<<<<< Physics.gravity = new Vector3(0,-9.8f,0); string homePath = (System.Environment.OSVersion.Platform == PlatformID.Unix || System.Environment.OSVersion.Platform == PlatformID.MacOSX) ? System.Environment.GetEnvironmentVariable("HOME") : System.Environment.ExpandEnvironmentVariables("%HOMEDRIVE%%HOMEPATH%"); ...
<<<<<<< private FixedQueue<List<ContactDescriptor>> contactPoints; //Indicate different state (begin reset, resetting, end reset) private bool resetting; private bool beginReset; ======= //Flags to tell different types of reset private bool isResettingOrientation; private bool isResetting...
<<<<<<< using System.Threading; using System.Threading.Tasks; ======= using SynthesisAPI.Utilities; >>>>>>> using System.Threading; using System.Threading.Tasks; using SynthesisAPI.Utilities; <<<<<<< /// <summary> /// Loads a JSON file asynchronously and loads preference data /// </summary> ...
<<<<<<< #nullable enable Component? AddComponentToScene(uint entity, Type t); void RemoveComponentFromScene(uint entity, Type t); ======= Component GetComponent(Type t, uint entity); TComponent GetComponent<TComponent>(uint entity) where TComponent : Component; List<Component> GetComponents(uint entity);...
<<<<<<< reloadRobotInFrames = -1; showStatWindow = true; ======= reloadInFrames = -1; showStatWindow = false; showHelpWindow = true; >>>>>>> reloadRobotInFrames = -1; showStatWindow = false; showHelpWindow = true; <<<<<<< HotkeysWindow(); gui.AddWindow ("Exit", new DialogWindow ("Exit?", "Ye...
<<<<<<< ======= ======= /* public static void UpdateAllWheels(RigidNode_Base skeleton, unityPacket.OutputStatePacket.DIOModule[] modules) { float[] pwm = modules[0].pwmValues; List<RigidNode_Base> test = new List<RigidNode_Base>(); skeleton.ListAllNodes(test); */ >>>>>>> <<<<<<< ======= >>>>>>> <<<...
<<<<<<< AnalyticsUtils.LogPage("Joint Editor"); ======= UnsupportedComponentsForm.CheckUnsupportedComponents(RobotDataManager.RobotBaseNode.ListAllNodes()); >>>>>>> AnalyticsUtils.LogPage("Joint Editor"); UnsupportedComponentsForm.CheckU...
<<<<<<< private DirectoryInfo tempSelection; ======= string path = FB.FileBrowser.OpenSingleFolder("Open Folder", Environment.SpecialFolder.ApplicationData + "//synthesis//Fields"); >>>>>>> private DirectoryInfo tempSelection; string path = FB.FileBrowser.OpenSingleFolder("Open F...
<<<<<<< if (guiFadeIntensity > 0) ======= UserMessageManager.Render(); if (guiFadeIntensity > 0 && guiVisible) >>>>>>> if (guiFadeIntensity > 0 && guiVisible)
<<<<<<< ======= public static bool inputPanelOn = false; /// <summary> /// Link the SimUI to main state /// </summary> private void Awake() { StateMachine.Instance.Link<MainState>(this); } >>>>>>> public static bool inputPanelOn = false; <<<<<<< if (!exitPa...
<<<<<<< private Renderer meshRenderer; ======= private MeshRenderer meshRenderer; >>>>>>> private MeshRenderer meshRenderer; <<<<<<< private LastState lastState = new LastState(); private readonly ExposedList<Material> submeshMaterials = new ExposedList<Material>(); private readonly ExposedList<Submesh> subm...
<<<<<<< // Clear existing panels while (LeftWheelsPanel.Controls.Count > 0) LeftWheelsPanel.Controls[0].Dispose(); while (RightWheelsPanel.Controls.Count > 0) RightWheelsPanel.Controls[0].Dispose(); Dictionary<string, RigidNode_Base> avai...
<<<<<<< this.Text = "Save Robot"; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.SaveRobotForm_FormClosing); this.MainLayout.ResumeLayout(false); this.MainLayout.PerformLayout(); this.WindowControlLayout.ResumeLayout(false); =======...
<<<<<<< private MotorController frontLeft, frontRight, backLeft, backRight; private MotorController arm; ======= private Entity testBody; private MotorAssemblyManager motorManager; private MotorAssembly frontLeft, frontRight, backLeft, backRight, arm; >>>>>>> private ...
<<<<<<< this.toolStripMenuItem5 = new System.Windows.Forms.ToolStripSeparator(); this.showRangeOfPagesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); ======= this.toolStripSeparator7 = new System.Windows.Forms.ToolStripSeparator(); >>>>>>> this.toolSt...
<<<<<<< private List<Sprite> _cleanupSpriteList = new List<Sprite>(); private SizeF _viewportSize; ======= private List<CluwneSprite> _cleanupSpriteList = new List<CluwneSprite>(); private List<ITile> _visibleTiles; >>>>>>> private List<CluwneSprite> _cleanupSpriteList = new L...
<<<<<<< var ownerPos = Owner.GetComponent<TransformComponent>(ComponentFamily.Transform).Position; Vector2D renderPos = ClientWindowData.Singleton.WorldToScreen(ownerPos); ======= Vector2 renderPos = ClientWindowData.WorldToScreen( O...
<<<<<<< using GorgonLibrary; using Lidgren.Network; using System.Collections.Generic; ======= using Lidgren.Network; >>>>>>> using Lidgren.Network; using System.Collections.Generic; <<<<<<< event TileChangedEventHandler TileChanged; ======= event TileChangeEvent OnTileChanged; int GetTi...
<<<<<<< CluwneLib.TileSize = MapManager.TileSize; ======= >>>>>>> CluwneLib.TileSize = MapManager.TileSize; <<<<<<< ======= >>>>>>> <<<<<<< //Debug.DebugRendertarget(playerOcclusionTarget); ======= ...
<<<<<<< ======= using System.Collections; using System; using System.Collections.Generic; >>>>>>> using System; using System.Collections.Generic; <<<<<<< public ProductSearchController(ICategoryService categoryService, IProductOptionManager productOptionManager, IProductService productService) { ...