conflict_resolution stringlengths 27 16k |
|---|
<<<<<<<
Assert.AreEqual(tradesPage.Records[0].BaseAccount, "GBZXCJIUEPDXGHMS64UBJHUVKV6ETWYOVHADLTBXJNJFUC7A7RU5B3GN");
=======
Assert.AreEqual(tradesPage.Records[0].BaseOfferId, "10");
Assert.AreEqual(tradesPage.Records[0].CounterOfferId, "11");
Assert.AreEqual(tradesP... |
<<<<<<<
public ChangeTrustOperationResponse(string assetCode, string assetIssuer, string assetType, string limit, string trustee, string trustor)
=======
public ChangeTrustOperationResponse()
{
}
public ChangeTrustOperationResponse(string assetCode, string assetIssuer, string... |
<<<<<<<
public string From { get; }
=======
[JsonConverter(typeof(KeyPairTypeAdapter))]
public KeyPair From { get; private set; }
>>>>>>>
public string From { get; private set; }
<<<<<<<
public string To { get; }
=======
[JsonConverter(typeof(KeyPairTypeAdapter))]
... |
<<<<<<<
=======
if (title == null)
{
// Re-label a couple of scan names to make them nicer
nameRemap["AltimetryLoRes"] = "Low resolution altimetry";
nameRemap["AltimetryHiRes"] = "High resolution altimetry";
string scanTypeName =... |
<<<<<<<
LoggingUtil.LogError(this.GetType(), ErrorPrefix(configNode) +
": missing required value 'altitude'.");
=======
Debug.LogError("ContractConfigurator: " + ErrorPrefix(configNode) +
": invalid value of " + configNode.GetValue("altitude") + ... |
<<<<<<<
/// <summary>
/// ParameterFactory to provide logic for SequenceNode.
/// </summary>
=======
/*
* ParameterFactory to provide logic for SequenceNode.
*/
[Obsolete("Obsolete as of Contract Configurator 0.6.7, please use the completeInSequence attribute instead.")]
>>>>>>>
///... |
<<<<<<<
LoggingUtil.LogDebug(this.GetType(), "Start Registering ParameterFactories");
// Get everything that extends ParameterFactory
var subclasses =
from assembly in AppDomain.CurrentDomain.GetAssemblies()
from type in assembly.GetTypes()
... |
<<<<<<<
[Theory]
[InlineData("auto")]
public async Task UseHardwareAcceleration(string hardwareAccelerator)
{
string output = Path.Combine(Path.GetTempPath(), Guid.NewGuid() + FileExtensions.Mp4);
IMediaInfo info = await MediaInfo.Get(Resources.MkvWithAudio);
... |
<<<<<<<
// adds CommonPart by default
=======
// CommonPart is added by default to all Content Types.
>>>>>>>
// CommonPart is added by default to all Content Types.
<<<<<<<
Content = content,
AllPlacements = listPlacements,
Tabs... |
<<<<<<<
if (user != null) {
if (String.Equals(Services.WorkContext.CurrentSite.SuperUser, user.UserName, StringComparison.Ordinal)) {
Services.Notifier.Error(T("The Super user can't be removed. Please disable this account or specify another Super user account."));
... |
<<<<<<<
public TouchNotification(TouchNotificationKind kind, Point position, Size clientArea, int id, bool primary, Size contactArea)
=======
public TouchNotification(TouchNotificationKind kind, Point position, Size clientArea, int id, Size contactArea, long touchDeviceID)
>>>>>>>
public Touc... |
<<<<<<<
//private readonly Func<Tuple<IntPtr, int>> FGetUnmanagedArrayFunc;
private readonly int* FPLength;
private readonly Func<bool> FValidateFunc;
=======
protected readonly Func<Tuple<IntPtr, int>> FGetUnmanagedArrayFunc;
protected readonly Func<bool> FValidateFunc;
>>>>>>>
//private readonly Func<T... |
<<<<<<<
using System.Security.Cryptography.X509Certificates;
=======
using System.Globalization;
>>>>>>>
using System.Security.Cryptography.X509Certificates;
using System.Globalization; |
<<<<<<<
using Owin;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Reflection;
using System.Text;
using System.Threading.Tasks;
using System.Web.Http;
using Autofac.Integration.WebApi;
using Microsoft.Owin;
using Jackett;
using Microsoft.Owin.StaticFiles;
using Microsoft.Owin.FileSyste... |
<<<<<<<
[assembly: EdmRelationshipAttribute("Models.NorthwindIB.EDMX", "FK_UserRole_Role", "Role", System.Data.Metadata.Edm.RelationshipMultiplicity.One, typeof(Models.NorthwindIB.EDMX.Role), "UserRole", System.Data.Metadata.Edm.RelationshipMultiplicity.Many, typeof(Models.NorthwindIB.EDMX.UserRole), true)]
=======
[... |
<<<<<<<
private bool _restoreSuccessful;
=======
private double? _reportedProgress;
>>>>>>>
private bool _restoreSuccessful;
private double? _reportedProgress;
<<<<<<<
_executionHost.RestoreMessage += AddResult;
=======
_executionHost.ProgressChanged += p =>... |
<<<<<<<
public event Action<RestoreResultObject>? RestoreMessage;
=======
public event Action<ProgressResultObject>? ProgressChanged;
>>>>>>>
public event Action<RestoreResultObject>? RestoreMessage;
public event Action<ProgressResultObject>? ProgressChanged; |
<<<<<<<
public static Gdk.Point Center (this Gdk.Rectangle rect)
{
return new Gdk.Point(rect.X + rect.Width / 2, rect.Y + rect.Height / 2);
}
=======
public static ColorBgra ToBgraColor (this Gdk.Color color)
{
return ColorBgra.FromBgr ((byte)(color.Blue * 255 / ushort.MaxValue), (byte)(color.G... |
<<<<<<<
var oldBottomSurface = doc.Layers[0].Surface.Clone ();
=======
CompoundHistoryItem hist = new CompoundHistoryItem ("Menu.Image.Flatten.png", Catalog.GetString ("Flatten"));
SimpleHistoryItem h1 = new SimpleHistoryItem (string.Empty, string.Empty, doc.UserLayers[0].Surface.Clone (), 0);
>>>>>>>
va... |
<<<<<<<
PintaCore.Actions.Effects.MotionBlur.Activated += HandleEffectMotionBlurActivated;
PintaCore.Actions.Effects.Glow.Activated += HandleEffectGlowActivated;
PintaCore.Actions.Effects.RedEyeRemove.Activated += HandleEffectsRedEyeRemoveActivated;
PintaCore.Actions.Effects.Sharpen.Activated += HandleEffec... |
<<<<<<<
using (ImageSurface i = new ImageSurface (Format.ARGB32, iconBBox.Width, iconBBox.Height)) {
using (Context g = new Context (i)) {
// Don't show shape if shapeWidth less than 3,
if (shapeWidth > 3) {
int diam = Math.Max (1, shapeWidth - 2);
Cairo.Rectangle shapeRect = new Cairo.Rect... |
<<<<<<<
private PointD center_position;
public PointD ImageSize { get; set; }
=======
public Point ImageSize { get; set; }
>>>>>>>
private PointD center_position;
public Point ImageSize { get; set; }
<<<<<<<
ImageSize = new PointD (800, 600);
center_position = new PointD (400, 300);... |
<<<<<<<
Document doc = PintaCore.Workspace.ActiveDocument;
doc.Selection.SelectionClipper.Clear ();
doc.Selection.SelectionPolygons = newSelectionPolygons;
using (var g = new Cairo.Context (doc.CurrentLayer.Surface)) {
doc.Selection.SelectionPath = g.CreatePolygonPath (DocumentSelection.ConvertToPolygon... |
<<<<<<<
public Gtk.Action Emboss { get; private set; }
=======
public Gtk.Action Relief { get; private set; }
>>>>>>>
public Gtk.Action Relief { get; private set; }
public Gtk.Action Emboss { get; private set; }
<<<<<<<
IconFactory fact = new IconFactory ();
fact.Add ("Menu.Effects.Artistic.Ink... |
<<<<<<<
public static Gdk.Point Center (this Gdk.Rectangle rect)
{
return new Gdk.Point(rect.X + rect.Width / 2, rect.Y + rect.Height / 2);
}
=======
public static ColorBgra ToBgraColor (this Gdk.Color color)
{
return ColorBgra.FromBgr ((byte)(color.Blue * 255 / ushort.MaxValue), (byte)(color.G... |
<<<<<<<
Context g = new Context (CurrentLayer.Surface);
Selection.Clip (g);
=======
Context g = new Context (CurrentUserLayer.Surface);
g.AppendPath (SelectionPath);
g.FillRule = Cairo.FillRule.EvenOdd;
g.Clip ();
>>>>>>>
Context g = new Context (CurrentUserLayer.Surface);
Selection.Clip (g... |
<<<<<<<
public Gtk.Action SurfaceBlur { get; private set; }
public Gtk.Action ZoomBlur { get; private set; }
public Gtk.Action Unfocus { get; private set; }
=======
public Gtk.Action RadialBlur { get; private set; }
public Gtk.Action MotionBlur { get; private set; }
>>>>>>>
publi... |
<<<<<<<
paste_action.Push (new PasteHistoryItem (image, old_path, old_show_selection));
doc.History.PushNewItem (paste_action);
=======
doc.History.PushNewItem (new PasteHistoryItem (image, old_selection, old_show_selection));
>>>>>>>
paste_action.Push (new PasteHistoryItem (image, old_selection, old_sho... |
<<<<<<<
g.SetSourceColor (outline_color);
g.Fill ();
=======
g.Color = outline_color;
g.FillPreserve();
g.Color = outline_color;
g.Stroke();
>>>>>>>
g.SetSourceColor (outline_color);
g.FillPreserve();
g.SetSourceColor (outline_color);
g.Stroke();
<<<<<<<
g.SetS... |
<<<<<<<
DeleteLayerHistoryItem h1 = new DeleteLayerHistoryItem (string.Empty, string.Empty, doc.CurrentLayer, doc.CurrentLayerIndex);
=======
DeleteLayerHistoryItem h1 = new DeleteLayerHistoryItem (string.Empty, string.Empty, doc.CurrentUserLayer, doc.CurrentUserLayerIndex);
SimpleHistoryItem h2 = new Simple... |
<<<<<<<
public Gtk.Action AddNoise { get; private set; }
public Gtk.Action Median { get; private set; }
public Gtk.Action ReduceNoise { get; private set; }
public Gtk.Action Outline { get; private set; }
=======
public Gtk.Action Relief { get; private set; }
public Gtk.Action Emboss { get; private set; }
... |
<<<<<<<
public Gtk.Action Emboss { get; private set; }
=======
>>>>>>>
public Gtk.Action Emboss { get; private set; }
<<<<<<<
IconFactory fact = new IconFactory ();
fact.Add ("Menu.Effects.Artistic.InkSketch.png", new IconSet (PintaCore.Resources.GetIcon ("Menu.Effects.Artistic.InkSketch.png")));
fa... |
<<<<<<<
PintaCore.Actions.Effects.MotionBlur.Activated += HandleEffectActivated<MotionBlurEffect>;
PintaCore.Actions.Effects.Glow.Activated += HandleEffectActivated<GlowEffect>;
PintaCore.Actions.Effects.RedEyeRemove.Activated += HandleEffectActivated<RedEyeRemoveEffect>;
PintaCore.Actions.Effects.Sharpen.A... |
<<<<<<<
g.SetSourceSurface (original.Surface, (int)original.Offset.X, (int)original.Offset.Y);
g.Paint ();
=======
original.Draw(g, original.Surface, 1, canvas_offset.X, canvas_offset.Y, 1);
>>>>>>>
original.Draw(g, original.Surface, 1);
<<<<<<<
if (!layer.Offset.IsEmpty ())
layer = CreateO... |
<<<<<<<
fact.Add ("Menu.Effects.Photo.Sharpen.png", new IconSet (PintaCore.Resources.GetIcon ("Menu.Effects.Photo.Sharpen.png")));
fact.Add ("Menu.Effects.Photo.SoftenPortrait.png", new IconSet (PintaCore.Resources.GetIcon ("Menu.Effects.Photo.SoftenPortrait.png")));
fact.Add ("Menu.Effects.Render.Clouds.png",... |
<<<<<<<
public Gtk.Action FrostedGlass { get; private set; }
public Gtk.Action Pixelate { get; private set; }
=======
public Gtk.Action Tile { get; private set; }
>>>>>>>
public Gtk.Action Tile { get; private set; }
public Gtk.Action FrostedGlass { get; private set; }
public Gtk.Action Pixelate { get; pr... |
<<<<<<<
using Stratis.Bitcoin.Primitives;
=======
using Stratis.Bitcoin.Tests.Common;
>>>>>>>
using Stratis.Bitcoin.Primitives;
using Stratis.Bitcoin.Tests.Common; |
<<<<<<<
: base(consensusManager, dateTimeProvider, loggerFactory, mempool, mempoolLock, network, stakeChain, stakeValidator)
=======
: base(consensusLoop, dateTimeProvider, loggerFactory, mempool, mempoolLock, minerSettings, network, stakeChain, stakeValidator)
>>>>>>>
... |
<<<<<<<
private readonly CoinView coinView;
=======
private readonly LookaheadBlockPuller blockPuller;
private readonly ICoinView coinView;
>>>>>>>
private readonly ICoinView coinView;
<<<<<<<
=======
private readonly StakeChainStore stakeChain;
private readonly I... |
<<<<<<<
=======
using NBitcoin.Rules;
using Stratis.Bitcoin.Utilities;
>>>>>>>
using NBitcoin.Rules; |
<<<<<<<
var powRuleContext = new PowRuleContext(new ValidationContext(), this.dateTimeProvider.Object.GetTimeOffset());
=======
var powRuleContext = new PowRuleContext(new ValidationContext(), this.testNet.Consensus, chain.Tip, this.dateTimeProvider.Object.GetTimeOffset());
>>>>>>>
... |
<<<<<<<
protected Mock<IBlockPuller> lookaheadBlockPuller;
protected Mock<CoinView> coinView;
=======
protected Mock<ILookaheadBlockPuller> lookaheadBlockPuller;
protected Mock<ICoinView> coinView;
>>>>>>>
protected Mock<IBlockPuller> lookaheadBlockPuller;
protected Mo... |
<<<<<<<
const string wrongVersion = "You're referencing the Portable version in your App - you need to reference the platform (iOS/Android) version";
/// <summary>
/// Initializes a new instance of the <see
/// cref="ModernHttpClient.Portable.NativeMessageHandler"/> class.
/// <... |
<<<<<<<
: base(consensusManager, dateTimeProvider, loggerFactory, mempool, mempoolLock, network, new BlockDefinitionOptions() { IsProofOfStake = true })
=======
: base(consensusLoop, dateTimeProvider, loggerFactory, mempool, mempoolLock, minerSettings, network)
>>>>>>>
: base(cons... |
<<<<<<<
new Mock<CoinView>().Object, receiptStorage.Object, new Mock<IChainState>().Object);
=======
new Mock<ILookaheadBlockPuller>().Object,
new Mock<ICoinView>().Object, receiptStorage.Object);
>>>>>>>
new Mock<ICoinView>().Object, receiptStorage.Obj... |
<<<<<<<
=======
private readonly StakeChainStore stakeChain;
private readonly ConsensusSettings consensusSettings;
private readonly IConsensusRules consensusRules;
>>>>>>>
<<<<<<<
ConsensusStats consensusStats)
=======
ConsensusStats consensusStats,
I... |
<<<<<<<
using Stratis.Bitcoin.Base;
=======
using NBitcoin.Rules;
>>>>>>>
using NBitcoin.Rules;
using Stratis.Bitcoin.Base;
<<<<<<<
private Mock<IRuleRegistration> ruleRegistration;
public TestPosConsensusRules(Network network, ILoggerFactory loggerFactory, IDateTimeProvider dateTimeProvider, Concu... |
<<<<<<<
using Stratis.Bitcoin.Consensus;
using Stratis.Bitcoin.Features.Consensus.CoinViews;
using Stratis.Bitcoin.Features.SmartContracts.Consensus;
=======
using Stratis.Bitcoin.Features.SmartContracts.ReflectionExecutor;
>>>>>>>
using Stratis.Bitcoin.Consensus;
using Stratis.Bitcoin.Features.Consensus.CoinViews;
... |
<<<<<<<
using NBitcoin.Policy;
using Stratis.Bitcoin.Base;
=======
using NBitcoin.Policy;
using Stratis.Bitcoin.BlockPulling;
>>>>>>>
using NBitcoin.Policy;
<<<<<<<
public sealed class ReflectionVirtualMachineFeature : FullNodeFeature
{
private readonly IConsensusRuleEngine consensusRules;
p... |
<<<<<<<
public SmartContractMempoolValidator(ITxMempool memPool, MempoolSchedulerLock mempoolLock, IDateTimeProvider dateTimeProvider, MempoolSettings mempoolSettings, ConcurrentChain chain, CoinView coinView, ILoggerFactory loggerFactory, NodeSettings nodeSettings, IConsensusRuleEngine consensusRules)
=======... |
<<<<<<<
/// <summary>Reference to the parent block puller.</summary>
public BlockPuller Puller => this.puller;
/// <summary>Reference to a component responsible for keeping the chain up to date.</summary>
public BlockStore.ChainBehavior ChainBehavior { get; private set; ... |
<<<<<<<
SemaphoreSlim.Wait(CancelSource.Token);
Logger.LogTrace("RemoveFrontend() locked");
Logger.LogInformation("Unregistering frontend of dispatcher {0}", d.GetHashCode());
DisappearingMessagesManager.RemoveFrontend(d);
Frames.Remove(d);
Semapho... |
<<<<<<<
if (!Token.IsCancellationRequested)
{
await MessageSender.SendMessage(Token, new SignalServiceAddress(outgoingSignalMessage.ThreadId), message);
UpdateExpiresAt(outgoingSignalMessage);
... |
<<<<<<<
protected override void OnDisplaying(HiddenField element, ElementDisplayingContext context) {
context.ElementShape.TokenizedValue = _tokenizer.Replace(element.Value, null);
=======
protected override void OnDisplaying(HiddenField element, ElementDisplayContext context) {
... |
<<<<<<<
=======
// Concat Rule
tok = scanner.LookAhead(TokenType.EOI); // Option Rule
if (tok.Type == TokenType.EOI)
{
tok = scanner.Scan(TokenType.EOI); // Terminal Rule: EOI
n = node.CreateNode(tok, tok.ToString() );
no... |
<<<<<<<
public Lexicon(IEnumerable<KeyValuePair<Structure, Structure>> lexicon) : this()
=======
public Lexicon(IEnumerable<Structure> values) : this()
{
FillWithEnumerableValues(values);
}
private Lexicon(IEnumerable<KeyValuePair<Structure, Structure>> lexicon)
... |
<<<<<<<
public static VersionInfo VersionInfo;
private readonly SharedObjects shared;
=======
public static VersionInfo VersionInfo = new VersionInfo(0, 17, 2);
>>>>>>>
public static VersionInfo VersionInfo = new VersionInfo(0, 17, 2);
private readonly SharedObjects shared; |
<<<<<<<
using kOS.Suffixed.PartModuleField;
using kOS.Module;
=======
using kOS.Safe.Encapsulation;
>>>>>>>
using kOS.Suffixed.PartModuleField;
using kOS.Module;
using kOS.Safe.Encapsulation;
<<<<<<<
[Function("processor")]
public class FunctionProcessor : FunctionBase
{
public override void Ex... |
<<<<<<<
if (blizzyButton != null)
blizzyButton.Destroy();
// force close the font picker window if it was still open:
if (fontPicker != null)
{
fontPicker.Close();
Destroy(fontPicker);
fontPicker = null;
... |
<<<<<<<
dumped[key] = Dump(dumped[key] as IDumper, includeType);
} else if (IsEncapsulatedValue(dumped[key]) || IsValue(dumped[key]))
=======
dumped[key] = Dump(dump, includeType);
} else if (IsValue(dumped[key]))
>>>>>>>
dum... |
<<<<<<<
AddSuffix("LENGTH", new NoArgsSuffix<ScalarValue> (() => Collection.Count));
AddSuffix("CLEAR", new NoArgsSuffix (() => Collection.Clear()));
=======
AddSuffix("LENGTH", new NoArgsSuffix<ScalarIntValue> (() => Collection.Count));
... |
<<<<<<<
using kOS.Callback;
=======
using kOS.Sound;
using System.Collections.Generic;
>>>>>>>
using kOS.Callback;
using kOS.Sound;
using System.Collections.Generic;
<<<<<<<
public GameEventDispatchManager DispatchManager
{
get { return (GameEventDispatchManager)GameEventDispatchManager;... |
<<<<<<<
using kOS.Utilities;
=======
using kOS.Safe.Encapsulation.Suffixes;
>>>>>>>
using kOS.Utilities;
using kOS.Safe.Encapsulation.Suffixes;
<<<<<<<
new Vector(Vector3d.zero);
=======
new Vector(default(float), default(float), default(float));
InitializeSuffixes();
... |
<<<<<<<
using System;
using System.Collections.Generic;
using System.Linq;
using UnityEngine;
=======
using UnityEngine;
>>>>>>>
using System;
using System.Linq;
using System.Collections.Generic;
using UnityEngine;
<<<<<<<
private int verticalSectionCount = 0;
private int horizontalSect... |
<<<<<<<
public static object InDirectSunlight(Vessel vessel)
{
bool DirectSunlight = false; // No panels at all? Always return false
foreach (Part p in vessel.parts)
{
foreach (ModuleDeployableSolarPanel c in p.FindModulesImplementing<ModuleDeployableSolarPanel... |
<<<<<<<
AddSuffix(new[] { "PILOTMAINTHROTTLE" }, new ClampSetSuffix<float>(() => Vessel.ctrlState.mainThrottle, SetPilotMainThrottle, 0, 1));
AddSuffix(new[] { "WHEELTHROTTLE" }, new ClampSetSuffix<float>(() => wheelThrottle, value => wheelThrottle = value, -1, 1));
AddSuffix(new[] {... |
<<<<<<<
this.Password,
false);
try
{
await this.ConnectToDeviceAsync(
connectOptions,
string.Empty);
}
... |
<<<<<<<
AddAssert("mod rate applied", () => MusicController.CurrentTrack.Rate != 1);
=======
AddAssert("mod rate applied", () => Beatmap.Value.Track.Rate != 1);
AddUntilStep("wait for non-null player", () => player != null);
>>>>>>>
AddAssert("mod rate applied", () => ... |
<<<<<<<
[TestCase(false)]
[TestCase(true)]
public void TestEmptyComboColours(bool allowFallback)
{
AddStep("Add custom combo colours to source1", () => source1.Configuration.ComboColours = new List<Color4>
{
new Color4(100, 150, 200, 255),
... |
<<<<<<<
using osu.Framework.Audio;
using osu.Framework.Audio.Sample;
=======
using osu.Framework.Allocation;
>>>>>>>
using osu.Framework.Audio;
using osu.Framework.Audio.Sample;
using osu.Framework.Allocation;
<<<<<<<
using osu.Framework.MathUtils;
=======
using osu.Framework.Graphics.Shapes;
using osu.Game.Graph... |
<<<<<<<
AddButton("DrumRoll", () => addDrumRoll(false));
AddButton("Strong DrumRoll", () => addDrumRoll(true));
=======
AddButton("Swell", addSwell);
>>>>>>>
AddButton("DrumRoll", () => addDrumRoll(false));
AddButton("Strong DrumRoll", () => addDrumRoll(tru... |
<<<<<<<
private static ConcurrentDictionary<PlayMode, Type> availableRulesets = new ConcurrentDictionary<PlayMode, Type>();
=======
public static IEnumerable<PlayMode> PlayModes => availableRulesets.Keys;
public abstract ScoreOverlay CreateScoreOverlay();
>>>>>>>
private static Concu... |
<<<<<<<
new SettingsCheckbox
{
LabelText = "Hit Lighting",
Bindable = config.GetBindable<bool>(OsuSetting.HitLighting)
},
new SettingsCheckbox
{
LabelText = "Rotate cursor when dra... |
<<<<<<<
public readonly Box FollowCircle;
private readonly Box ball;
private readonly DrawableSlider drawableSlider;
=======
public readonly Drawable FollowCircle;
private Drawable drawableBall;
>>>>>>>
public readonly Drawable FollowCircle;
private Drawable dr... |
<<<<<<<
protected override HitObject CreateSlider(Vector2 position, bool newCombo, int comboOffset, List<Vector2> controlPoints, double length, CurveType curveType, int repeatCount, List<List<SampleInfo>> nodeSamples)
=======
protected override HitObject CreateSlider(Vector2 position, bool newCombo, i... |
<<<<<<<
=======
using OpenTK;
using OpenTK.Graphics;
>>>>>>>
using OpenTK;
using OpenTK.Graphics;
<<<<<<<
private readonly IntroSequence introSequence;
=======
>>>>>>>
private readonly IntroSequence introSequence;
<<<<<<<
public Intro()
{
Children = new Drawable[]
... |
<<<<<<<
=======
private readonly RankChartLineGraph graph;
private readonly OsuSpriteText placeholder;
private KeyValuePair<int, int>[] ranks;
private int hoveredIndex = -1;
>>>>>>>
<<<<<<<
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
... |
<<<<<<<
/// Fired when a beatmap load is requested (into the interactive game UI).
/// </summary>
public Action<BeatmapSetInfo> PresentBeatmap;
/// <summary>
=======
/// Fired when a beatmap download is interrupted, due to user cancellation or other failures.
/// </sum... |
<<<<<<<
hudOverlay = new HUDOverlay(scoreProcessor, RulesetContainer, decoupledClock, working, adjustableSourceClock)
=======
new SkipButton(firstObjectTime) { AudioClock = decoupledClock },
hudOverlay = new HUDOverlay
>>>>>>>
... |
<<<<<<<
private readonly TimelineArea timelineArea;
=======
>>>>>>>
<<<<<<<
timelineArea = new TimelineArea
=======
new ScrollableTimeline
>>>>>>>
new TimelineArea
<<<<<<<
[BackgroundDependencyLoader]
private void load(OsuGameBase osuGame... |
<<<<<<<
using osu.Framework.MathUtils;
=======
using osu.Framework.Graphics.Sprites;
>>>>>>>
using osu.Framework.MathUtils;
using osu.Framework.Graphics.Sprites;
<<<<<<<
configBindable.BindValueChanged(v => dropdownBindable.Value = skinDropdown.Items.Single(s => s.ID == v), true);
dropdownBi... |
<<<<<<<
LoadComponentAsync(loadingInfo = new BufferedWedgeInfo(beatmap, ruleset.Value, beatmapDifficulty.Value ?? new StarDifficulty())
=======
LoadComponentAsync(loadingInfo = new BufferedWedgeInfo(beatmap, ruleset.Value, mods.Value, beatmapDifficulty.Value)
>>>>>>>
L... |
<<<<<<<
using osu.Game.Screens.Edit.Compose.Components;
using OpenTK;
=======
using osuTK;
>>>>>>>
using osu.Game.Screens.Edit.Compose.Components;
using osuTK;
<<<<<<<
protected override IReadOnlyList<HitObjectCompositionTool> CompositionTools => new HitObjectCompositionTool[]
{
new Note... |
<<<<<<<
ManiaPlayfield Playfield { get; }
=======
Vector2 ScreenSpacePositionAtTime(double time, Column column = null);
int TotalColumns { get; }
>>>>>>>
ManiaPlayfield Playfield { get; }
Vector2 ScreenSpacePositionAtTime(double time, Column column = null); |
<<<<<<<
requireMoreUpdateLoops = true;
validState = !frameStableClock.IsPaused.Value;
=======
state = frameStableClock.IsPaused.Value ? PlaybackState.NotValid : PlaybackState.Valid;
>>>>>>>
state = frameStableClock.IsPaused.Value ? PlaybackState.NotValid : PlaybackSta... |
<<<<<<<
/// <summary>
/// Contains the maximum size/position of the body prior to any offset or size adjustments.
/// </summary>
private readonly Container bodyContainer;
/// <summary>
/// Contains the offset size/position of the body such that the body extends half-way ... |
<<<<<<<
case "Play/osu/cursor":
if (GetTexture("cursor") != null)
return new LegacyCursor();
break;
=======
case "Play/osu/sliderball":
if (GetTexture("sliderb") != null)
retur... |
<<<<<<<
public Options Options;
public Toolbar Toolbar;
internal APIAccess API;
=======
public APIAccess API;
>>>>>>>
public Options Options;
public APIAccess API;
public Toolbar Toolbar; |
<<<<<<<
=======
using osu.Game.Modes.Taiko.Objects.Drawable.Pieces;
using System.Collections.Generic;
using osu.Framework.Input;
>>>>>>>
using System.Collections.Generic;
using osu.Framework.Input;
<<<<<<<
=======
protected virtual bool HandleKeyPress(Key key) { return false; }
protected overrid... |
<<<<<<<
protected readonly Bindable<IReadOnlyList<Mod>> FreeMods = new Bindable<IReadOnlyList<Mod>>(Array.Empty<Mod>());
=======
[CanBeNull]
[Resolved(CanBeNull = true)]
private IBindable<PlaylistItem> selectedItem { get; set; }
private readonly Bindable<IReadOnlyList<Mod>> f... |
<<<<<<<
editorBeatmap.ControlPointInfo.Clear();
editorBeatmap.ControlPointInfo.Add(0, new TimingControlPoint { BeatLength = beat_length });
beatDivisor.Value = 1;
=======
editorBeatmap.ControlPointInfo.DifficultyPoints.Clear();
editorBeatmap.ControlPointInf... |
<<<<<<<
using osu.Game.Rulesets.Mania.Configuration;
=======
using osu.Game.Rulesets.Mania.Mods;
>>>>>>>
using osu.Game.Rulesets.Mania.Mods;
using osu.Game.Rulesets.Mania.Configuration; |
<<<<<<<
=======
private double totalOffset => userOffsetClock.Offset + platformOffsetClock.Offset;
private readonly BindableDouble pauseFreqAdjust = new BindableDouble(1);
>>>>>>>
private double totalOffset => userOffsetClock.Offset + platformOffsetClock.Offset;
private readonly Bi... |
<<<<<<<
private APIAccess api;
private RulesetDatabase rulesets;
private readonly FilterControl filter;
=======
>>>>>>>
private APIAccess api;
private RulesetDatabase rulesets;
<<<<<<<
if (BeatmapSets == null)
{
foreach (v... |
<<<<<<<
public SliderCurve Curve;
public IEnumerable<SliderTick> Ticks
{
get
{
var length = Curve.Length;
var tickDistance = Math.Min(TickDistance, length);
var repeatDuration = length / Velocity;
var minDi... |
<<<<<<<
Set(OsuSetting.ShowProgressGraph, true);
=======
Set(OsuSetting.ShowHealthDisplayWhenCantFail, true);
>>>>>>>
Set(OsuSetting.ShowProgressGraph, true);
Set(OsuSetting.ShowHealthDisplayWhenCantFail, true);
<<<<<<<
ShowProgressGraph,
=======
Sho... |
<<<<<<<
RoomUpdated?.Invoke();
});
=======
RoomChanged?.Invoke();
}, false);
>>>>>>>
RoomUpdated?.Invoke();
}, false);
<<<<<<<
RoomUpdated?.Invoke();
});
=======
RoomChanged?.Invoke();
... |
<<<<<<<
using System;
using System.Collections.Generic;
=======
>>>>>>>
using System;
<<<<<<<
using osu.Game.Rulesets.Mods;
using osu.Game.Rulesets.Catch.Objects;
using osu.Game.Rulesets.Catch.UI;
using osu.Game.Rulesets.Objects;
=======
using osu.Game.Rulesets.Mods;
>>>>>>>
using osu.Game.Rulesets.Mods;
using o... |
<<<<<<<
protected abstract HitObject CreateSlider(Vector2 position, bool newCombo, int comboOffset, Vector2[] controlPoints, double? length, PathType pathType, int repeatCount,
List<List<SampleInfo>> nodeSamples);
=======
protected abstract HitObject C... |
<<<<<<<
/// <summary>
/// The BPM at this control point.
/// </summary>
public double BPM => 60000 / BeatLength;
private double beatLength = DEFAULT_BEAT_LENGTH;
=======
/// <summary>
/// The beat length at this control point.
/// </summary>
pub... |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.