conflict_resolution
stringlengths 27
16k
|
|---|
<<<<<<<
public static ControlPoint Default = new ControlPoint
{
BeatLength = 500,
TimingChange = true,
};
public string SampleBank;
public int SampleVolume;
=======
>>>>>>>
public string SampleBank;
public int SampleVolume; |
<<<<<<<
this.RotateTo(currentRotation / 2, 500, Easing.OutExpo);
}
public void Rotate(float angle)
{
if (!rotationTransferred)
{
currentRotation = Rotation * 2;
rotationTransferred = true;
}
if (angle > 180)
{
lastAngle += 360;
angle -= 360;
}
else if (-angle > 180)
{
lastAngle -= 360;
angle += 360;
}
currentRotation += angle;
RotationAbsolute += Math.Abs(angle) * Math.Sign(Clock.ElapsedFrameTime);
=======
Rotation = (float)Interpolation.Lerp(Rotation, currentRotation / 2, Math.Clamp(Math.Abs(Time.Elapsed) / 40, 0, 1));
>>>>>>>
Rotation = (float)Interpolation.Lerp(Rotation, currentRotation / 2, Math.Clamp(Math.Abs(Time.Elapsed) / 40, 0, 1));
}
public void Rotate(float angle)
{
if (!rotationTransferred)
{
currentRotation = Rotation * 2;
rotationTransferred = true;
}
if (angle > 180)
{
lastAngle += 360;
angle -= 360;
}
else if (-angle > 180)
{
lastAngle -= 360;
angle += 360;
}
currentRotation += angle;
RotationAbsolute += Math.Abs(angle) * Math.Sign(Clock.ElapsedFrameTime); |
<<<<<<<
protected sealed override Playfield CreatePlayfield() => new ManiaPlayfield(availableColumns)
=======
protected sealed override Playfield<ManiaHitObject, ManiaJudgement> CreatePlayfield() => new ManiaPlayfield(AvailableColumns)
>>>>>>>
protected sealed override Playfield CreatePlayfield() => new ManiaPlayfield(AvailableColumns) |
<<<<<<<
using osu.Framework.Allocation;
using osu.Framework.Audio.Track;
=======
using osu.Framework.Allocation;
>>>>>>>
using osu.Framework.Allocation;
using osu.Framework.Audio.Track;
<<<<<<<
using osu.Framework.Input;
using osu.Framework.Timing;
=======
using osu.Framework.Graphics.Audio;
>>>>>>>
using osu.Framework.Graphics.Audio;
using osu.Framework.Input;
using osu.Framework.Timing; |
<<<<<<<
AddUntilStep(() => ((ScoreAccessiblePlayer)Player).ScoreProcessor.TotalScore.Value > 0, "score above zero");
AddUntilStep(() => ((ScoreAccessiblePlayer)Player).HUDOverlay.KeyCounter.Children.Any(kc => kc.CountPresses > 0), "key counter counted keys");
=======
base.AddCheckSteps(player);
AddUntilStep("score above zero", () => ((ScoreAccessiblePlayer)player()).ScoreProcessor.TotalScore.Value > 0);
AddUntilStep("key counter counted keys", () => ((ScoreAccessiblePlayer)player()).HUDOverlay.KeyCounter.Children.Any(kc => kc.CountPresses > 0));
>>>>>>>
AddUntilStep("score above zero", () => ((ScoreAccessiblePlayer)Player).ScoreProcessor.TotalScore.Value > 0);
AddUntilStep("key counter counted keys", () => ((ScoreAccessiblePlayer)Player).HUDOverlay.KeyCounter.Children.Any(kc => kc.CountPresses > 0)); |
<<<<<<<
=======
using System;
using System.Collections.Generic;
using System.Linq;
using osu.Framework.Allocation;
>>>>>>>
using System;
using System.Collections.Generic; |
<<<<<<<
private Container<ChangelogContent> content;
private Sample sampleBack;
=======
private SampleChannel sampleBack;
>>>>>>>
private Sample sampleBack; |
<<<<<<<
=======
public const int RNG_SEED = 1337;
private void applyPositionOffsets()
{
var rng = new FastRandom(RNG_SEED);
// todo: HardRock displacement should be applied here
foreach (var obj in Beatmap.HitObjects)
{
switch (obj)
{
case BananaShower bananaShower:
foreach (var banana in bananaShower.NestedHitObjects.OfType<Banana>())
{
banana.X = (float)rng.NextDouble();
rng.Next(); // osu!stable retrieved a random banana type
rng.Next(); // osu!stable retrieved a random banana rotation
rng.Next(); // osu!stable retrieved a random banana colour
}
break;
case JuiceStream juiceStream:
foreach (var nested in juiceStream.NestedHitObjects)
{
var hitObject = (CatchHitObject)nested;
if (hitObject is TinyDroplet)
hitObject.X += rng.Next(-20, 20) / CatchPlayfield.BASE_WIDTH;
else if (hitObject is Droplet)
rng.Next(); // osu!stable retrieved a random droplet rotation
hitObject.X = MathHelper.Clamp(hitObject.X, 0, 1);
}
break;
}
}
}
>>>>>>>
private void applyPositionOffsets()
{
var rng = new FastRandom(RNG_SEED);
// todo: HardRock displacement should be applied here
foreach (var obj in Beatmap.HitObjects)
{
switch (obj)
{
case BananaShower bananaShower:
foreach (var banana in bananaShower.NestedHitObjects.OfType<Banana>())
{
banana.X = (float)rng.NextDouble();
rng.Next(); // osu!stable retrieved a random banana type
rng.Next(); // osu!stable retrieved a random banana rotation
rng.Next(); // osu!stable retrieved a random banana colour
}
break;
case JuiceStream juiceStream:
foreach (var nested in juiceStream.NestedHitObjects)
{
var hitObject = (CatchHitObject)nested;
if (hitObject is TinyDroplet)
hitObject.X += rng.Next(-20, 20) / CatchPlayfield.BASE_WIDTH;
else if (hitObject is Droplet)
rng.Next(); // osu!stable retrieved a random droplet rotation
hitObject.X = MathHelper.Clamp(hitObject.X, 0, 1);
}
break;
}
}
} |
<<<<<<<
var ruleset = rulesets.GetRuleset(Room.Settings.RulesetID);
var currentModeRank = User.User?.GetStatisticsFor(ruleset)?.GlobalRank;
// fallback to current mode rank for testing purposes.
currentModeRank ??= User.User?.CurrentModeRank;
userRankText.Text = currentModeRank != null ? $"#{currentModeRank.Value:N0}" : string.Empty;
userStateDisplay.Status = User.State;
=======
userStateDisplay.UpdateStatus(User.State, User.BeatmapAvailability);
>>>>>>>
var ruleset = rulesets.GetRuleset(Room.Settings.RulesetID);
var currentModeRank = User.User?.GetStatisticsFor(ruleset)?.GlobalRank;
// fallback to current mode rank for testing purposes.
currentModeRank ??= User.User?.CurrentModeRank;
userRankText.Text = currentModeRank != null ? $"#{currentModeRank.Value:N0}" : string.Empty;
userStateDisplay.UpdateStatus(User.State, User.BeatmapAvailability); |
<<<<<<<
=======
var spanDuration = length / Velocity;
>>>>>>>
<<<<<<<
var repeatStartTime = StartTime + repeat * RepeatDuration;
var reversed = repeat % 2 == 1;
=======
var spanStartTime = StartTime + span * spanDuration;
var reversed = span % 2 == 1;
>>>>>>>
var spanStartTime = StartTime + span * SpanDuration;
var reversed = span % 2 == 1;
<<<<<<<
RepeatIndex = repeat,
StartTime = repeatStartTime + timeProgress * RepeatDuration,
=======
SpanIndex = span,
StartTime = spanStartTime + timeProgress * spanDuration,
>>>>>>>
SpanIndex = span,
StartTime = spanStartTime + timeProgress * SpanDuration,
<<<<<<<
for (var repeat = 1; repeat < RepeatCount; repeat++)
=======
var repeatDuration = Distance / Velocity;
for (int repeatIndex = 0, repeat = 1; repeatIndex < RepeatCount; repeatIndex++, repeat++)
>>>>>>>
for (int repeatIndex = 0, repeat = 1; repeatIndex < RepeatCount; repeatIndex++, repeat++)
<<<<<<<
RepeatIndex = repeat,
RepeatDuration = RepeatDuration,
StartTime = StartTime + repeat * RepeatDuration,
=======
RepeatIndex = repeatIndex,
StartTime = repeatStartTime,
>>>>>>>
RepeatIndex = repeatIndex,
SpanDuration = SpanDuration,
StartTime = StartTime + repeat * SpanDuration, |
<<<<<<<
showKeyCounter.ValueChanged += keyCounterVisibilityChanged;
=======
showKeyCounter.ValueChanged += visibility =>
{
if (visibility)
KeyCounter.Show();
else
KeyCounter.Hide();
};
>>>>>>>
showKeyCounter.ValueChanged += visibility =>
{
if (visibility)
KeyCounter.Show();
else
KeyCounter.Hide();
};
<<<<<<<
private void keyCounterVisibilityChanged(object sender, EventArgs e)
{
if (showKeyCounter)
KeyCounter.Show();
else
KeyCounter.Hide();
}
private void hudVisibilityChanged(object sender, EventArgs e)
{
if (showHud)
hud.FadeIn(duration);
else
hud.FadeOut(duration);
}
=======
>>>>>>>
private void hudVisibilityChanged(object sender, EventArgs e)
{
if (showHud)
hud.FadeIn(duration);
else
hud.FadeOut(duration);
} |
<<<<<<<
=======
private void initializeSkipButton()
{
const double skip_required_cutoff = 3000;
const double fade_time = 300;
double firstHitObject = Beatmap.Beatmap.HitObjects.First().StartTime;
if (firstHitObject < skip_required_cutoff)
{
skipButton.Alpha = 0;
skipButton.Expire();
return;
}
skipButton.FadeInFromZero(fade_time);
skipButton.Action = () =>
{
decoupledClock.Seek(firstHitObject - skip_required_cutoff - fade_time);
skipButton.Action = null;
};
using (skipButton.BeginDelayedSequence(firstHitObject - skip_required_cutoff - fade_time))
skipButton.FadeOut(fade_time);
skipButton.Expire();
}
>>>>>>>
<<<<<<<
Delay(750);
Schedule(() =>
{
decoupledClock.Start();
});
=======
using (BeginDelayedSequence(750))
Schedule(() =>
{
if (!pauseContainer.IsPaused)
decoupledClock.Start();
initializeSkipButton();
});
>>>>>>>
using (BeginDelayedSequence(750))
Schedule(() =>
{
if (!pauseContainer.IsPaused)
decoupledClock.Start();
}); |
<<<<<<<
hudOverlay.ReplaySettingsOverlay.PlaybackSettings.AdjustableClock = adjustableSourceClock;
=======
breakOverlay.BindProcessor(scoreProcessor);
>>>>>>>
breakOverlay.BindProcessor(scoreProcessor);
hudOverlay.ReplaySettingsOverlay.PlaybackSettings.AdjustableClock = adjustableSourceClock; |
<<<<<<<
using osu.Framework.Extensions.IEnumerableExtensions;
=======
using osu.Framework.Configuration;
>>>>>>>
using osu.Framework.Extensions.IEnumerableExtensions;
using osu.Framework.Configuration;
<<<<<<<
protected void AddNested(Playfield otherPlayfield) => nestedPlayfields.Value.Add(otherPlayfield);
=======
protected void AddNested(Playfield otherPlayfield)
{
if (nestedPlayfields == null)
nestedPlayfields = new List<Playfield>();
nestedPlayfields.Add(otherPlayfield);
otherPlayfield.DisplayJudgements.BindTo(DisplayJudgements);
}
>>>>>>>
protected void AddNested(Playfield otherPlayfield)
{
otherPlayfield.DisplayJudgements.BindTo(DisplayJudgements);
nestedPlayfields.Value.Add(otherPlayfield);
} |
<<<<<<<
/// <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>
public double BeatLength
{
get => BeatLengthBindable.Value;
set => BeatLengthBindable.Value = value;
}
>>>>>>>
/// The beat length at this control point.
/// </summary>
public double BeatLength
{
get => BeatLengthBindable.Value;
set => BeatLengthBindable.Value = value;
}
/// <summary>
/// The BPM at this control point.
/// </summary>
public double BPM => 60000 / BeatLength; |
<<<<<<<
AddUntilStep(() => ((ScoreAccessibleReplayPlayer)Player).ScoreProcessor.TotalScore.Value > 0, "score above zero");
AddUntilStep(() => ((ScoreAccessibleReplayPlayer)Player).HUDOverlay.KeyCounter.Children.Any(kc => kc.CountPresses > 0), "key counter counted keys");
=======
base.AddCheckSteps(player);
AddUntilStep("score above zero", () => ((ScoreAccessibleReplayPlayer)player()).ScoreProcessor.TotalScore.Value > 0);
AddUntilStep("key counter counted keys", () => ((ScoreAccessibleReplayPlayer)player()).HUDOverlay.KeyCounter.Children.Any(kc => kc.CountPresses > 0));
>>>>>>>
AddUntilStep("score above zero", () => ((ScoreAccessibleReplayPlayer)Player).ScoreProcessor.TotalScore.Value > 0);
AddUntilStep("key counter counted keys", () => ((ScoreAccessibleReplayPlayer)Player).HUDOverlay.KeyCounter.Children.Any(kc => kc.CountPresses > 0)); |
<<<<<<<
protected override void OnNewDrawableHitObject(DrawableHitObject drawable)
{
((DrawableOsuHitObject)drawable).CheckHittable = CheckHittable;
Debug.Assert(!drawable.IsLoaded, $"Already loaded {nameof(DrawableHitObject)} is added to {nameof(OsuPlayfield)}");
drawable.OnLoadComplete += onDrawableHitObjectLoaded;
}
private void onDrawableHitObjectLoaded(Drawable drawable)
{
// note: `Slider`'s `ProxiedLayer` is added when its nested `DrawableHitCircle` is loaded.
switch (drawable)
{
case DrawableSpinner _:
spinnerProxies.Add(drawable.CreateProxy());
break;
case DrawableHitCircle hitCircle:
approachCircles.Add(hitCircle.ProxiedLayer.CreateProxy());
break;
}
}
=======
private void onJudgmentLoaded(DrawableOsuJudgement judgement)
{
judgementAboveHitObjectLayer.Add(judgement.GetProxyAboveHitObjectsContent());
}
>>>>>>>
protected override void OnNewDrawableHitObject(DrawableHitObject drawable)
{
((DrawableOsuHitObject)drawable).CheckHittable = CheckHittable;
Debug.Assert(!drawable.IsLoaded, $"Already loaded {nameof(DrawableHitObject)} is added to {nameof(OsuPlayfield)}");
drawable.OnLoadComplete += onDrawableHitObjectLoaded;
}
private void onDrawableHitObjectLoaded(Drawable drawable)
{
// note: `Slider`'s `ProxiedLayer` is added when its nested `DrawableHitCircle` is loaded.
switch (drawable)
{
case DrawableSpinner _:
spinnerProxies.Add(drawable.CreateProxy());
break;
case DrawableHitCircle hitCircle:
approachCircles.Add(hitCircle.ProxiedLayer.CreateProxy());
break;
}
}
private void onJudgmentLoaded(DrawableOsuJudgement judgement)
{
judgementAboveHitObjectLayer.Add(judgement.GetProxyAboveHitObjectsContent());
} |
<<<<<<<
private bool assertHeadMissTailTracked() => judgementResults[^2].Type == HitResult.SmallTickHit && judgementResults.First().Type == HitResult.Miss;
=======
private bool assertHeadMissTailTracked() => judgementResults[^2].Type == HitResult.IgnoreHit && !judgementResults.First().IsHit;
>>>>>>>
private bool assertHeadMissTailTracked() => judgementResults[^2].Type == HitResult.SmallTickHit && !judgementResults.First().IsHit; |
<<<<<<<
Padding = new MarginPadding { Top = hitPosition };
Explosions.Padding = new MarginPadding { Top = DefaultNotePiece.NOTE_HEIGHT / 2 };
=======
Explosions.Padding = new MarginPadding { Top = DefaultNotePiece.NOTE_HEIGHT };
>>>>>>>
Explosions.Padding = new MarginPadding { Top = DefaultNotePiece.NOTE_HEIGHT / 2 };
<<<<<<<
Padding = new MarginPadding { Bottom = hitPosition };
Explosions.Padding = new MarginPadding { Bottom = DefaultNotePiece.NOTE_HEIGHT / 2 };
=======
Explosions.Padding = new MarginPadding { Bottom = DefaultNotePiece.NOTE_HEIGHT };
>>>>>>>
Explosions.Padding = new MarginPadding { Bottom = DefaultNotePiece.NOTE_HEIGHT / 2 }; |
<<<<<<<
ο»Ώ//Copyright (c) 2007-2016 ppy Pty Ltd <[email protected]>.
//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using osu.Framework.Allocation;
using osu.Framework.Audio;
using osu.Framework.Graphics;
using System.Collections.Generic;
using System.Linq;
namespace osu.Game.Overlays.Options.Sections.Audio
{
public class AudioDevicesOptions : OptionsSubsection
{
protected override string Header => "Devices";
private AudioManager audio;
[BackgroundDependencyLoader]
private void load(AudioManager audio)
{
this.audio = audio;
}
protected override void LoadComplete()
{
base.LoadComplete();
var deviceItems = new List<KeyValuePair<string, string>>();
deviceItems.Add(new KeyValuePair<string, string>("Default", string.Empty));
deviceItems.AddRange(audio.GetDeviceNames().Select(d => new KeyValuePair<string, string>(d, d)));
Children = new Drawable[]
{
new OptionDropDown<string>()
{
Items = deviceItems,
Bindable = audio.AudioDevice
},
};
}
}
=======
ο»Ώ// Copyright (c) 2007-2017 ppy Pty Ltd <[email protected]>.
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
namespace osu.Game.Overlays.Options.Sections.Audio
{
public class AudioDevicesOptions : OptionsSubsection
{
protected override string Header => "Devices";
public AudioDevicesOptions()
{
Children = new[]
{
new OptionLabel { Text = "Output device: TODO dropdown" }
};
}
}
>>>>>>>
ο»Ώ// Copyright (c) 2007-2017 ppy Pty Ltd <[email protected]>.
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using osu.Framework.Allocation;
using osu.Framework.Audio;
using osu.Framework.Graphics;
using System.Collections.Generic;
using System.Linq;
namespace osu.Game.Overlays.Options.Sections.Audio
{
public class AudioDevicesOptions : OptionsSubsection
{
protected override string Header => "Devices";
private AudioManager audio;
[BackgroundDependencyLoader]
private void load(AudioManager audio)
{
this.audio = audio;
}
protected override void LoadComplete()
{
base.LoadComplete();
var deviceItems = new List<KeyValuePair<string, string>>();
deviceItems.Add(new KeyValuePair<string, string>("Default", string.Empty));
deviceItems.AddRange(audio.GetDeviceNames().Select(d => new KeyValuePair<string, string>(d, d)));
Children = new Drawable[]
{
new OptionDropDown<string>()
{
Items = deviceItems,
Bindable = audio.AudioDevice
},
};
}
} |
<<<<<<<
public override ScoreOverlay CreateScoreOverlay() => new OsuScoreOverlay();
public override HitRenderer CreateHitRendererWith(Beatmap beatmap) => new TaikoHitRenderer(beatmap);
=======
public override HitRenderer CreateHitRendererWith(Beatmap beatmap) => new TaikoHitRenderer
{
Beatmap = beatmap,
};
>>>>>>>
public override HitRenderer CreateHitRendererWith(Beatmap beatmap) => new TaikoHitRenderer(beatmap); |
<<<<<<<
Add(LeftContent = new Container
{
Origin = Anchor.BottomLeft,
Anchor = Anchor.BottomLeft,
RelativeSizeAxes = Axes.Both,
Size = new Vector2(wedged_container_size.X, 1),
Padding = new MarginPadding
{
Bottom = 50,
Top = wedged_container_size.Y + left_area_padding,
Left = left_area_padding,
Right = left_area_padding * 2,
}
});
Add(carousel = new CarouselContainer
=======
Add(carousel = new BeatmapCarousel
>>>>>>>
Add(LeftContent = new Container
{
Origin = Anchor.BottomLeft,
Anchor = Anchor.BottomLeft,
RelativeSizeAxes = Axes.Both,
Size = new Vector2(wedged_container_size.X, 1),
Padding = new MarginPadding
{
Bottom = 50,
Top = wedged_container_size.Y + left_area_padding,
Left = left_area_padding,
Right = left_area_padding * 2,
}
});
Add(carousel = new BeatmapCarousel |
<<<<<<<
using System.Collections.Generic;
=======
using osu.Framework.Graphics.Cursor;
>>>>>>>
using System.Collections.Generic;
using osu.Framework.Graphics.Cursor; |
<<<<<<<
[BackgroundDependencyLoader]
private void load(IGameBeatmap beatmap, OsuColour colours)
{
this.beatmap.BindTo(beatmap);
// linear colour looks better in this case, so let's use it for now.
Color4 gradientDark = colours.Blue.Opacity(0).ToLinear();
Color4 gradientLight = colours.Blue.Opacity(0.3f).ToLinear();
leftBox.Colour = ColourInfo.GradientHorizontal(gradientLight, gradientDark);
rightBox.Colour = ColourInfo.GradientHorizontal(gradientDark, gradientLight);
}
=======
>>>>>>> |
<<<<<<<
case ModType.Fun:
return new Mod[] {
new OsuModTransform(),
};
=======
case ModType.Fun:
return new Mod[]
{
new OsuModWiggle(),
};
>>>>>>>
case ModType.Fun:
return new Mod[] {
new OsuModTransform(),
new OsuModWiggle(),
}; |
<<<<<<<
using osu.Game.Rulesets.Scoring;
using osu.Game.Screens.Play;
=======
using osu.Game.Storyboards;
>>>>>>>
using osu.Game.Rulesets.Scoring;
using osu.Game.Screens.Play;
using osu.Game.Storyboards;
<<<<<<<
protected override Player CreatePlayer(Ruleset ruleset) => new ScoreExposedPlayer();
protected override WorkingBeatmap CreateWorkingBeatmap(IBeatmap beatmap)
=======
protected override WorkingBeatmap CreateWorkingBeatmap(IBeatmap beatmap, Storyboard storyboard = null)
>>>>>>>
protected override Player CreatePlayer(Ruleset ruleset) => new ScoreExposedPlayer();
protected override WorkingBeatmap CreateWorkingBeatmap(IBeatmap beatmap, Storyboard storyboard = null) |
<<<<<<<
var visibleSets = beatmapSets.Where(s => !s.Filtered).ToList();
if (!visibleSets.Any())
return;
=======
var visible = beatmapSets.Where(s => !s.Filtered).ToList();
if (!visible.Any())
return false;
>>>>>>>
var visibleSets = beatmapSets.Where(s => !s.Filtered).ToList();
if (!visibleSets.Any())
return false; |
<<<<<<<
=======
using osu.Framework.Logging;
using osu.Framework.Platform;
>>>>>>>
using osu.Framework.Logging;
<<<<<<<
private void load(OsuGame game, NotificationOverlay notifications)
=======
private void load(OsuGame game, NotificationOverlay notifications, GameHost host, ChannelManager channelManager)
>>>>>>>
private void load(OsuGame game, NotificationOverlay notifications, ChannelManager channelManager)
<<<<<<<
=======
this.host = host;
this.channelManager = channelManager;
>>>>>>>
this.channelManager = channelManager; |
<<<<<<<
Schedule(() =>
{
manager.Delete(manager.GetAllUsableBeatmapSets());
var temp = TestResources.GetTestBeatmapForImport();
manager.Import(temp);
Child = screenStack = new OsuScreenStack { RelativeSizeAxes = Axes.Both };
screenStack.Push(songSelect = new DummySongSelect());
});
}
=======
Child = screenStackContainer = new ScreenStackCacheContainer { RelativeSizeAxes = Axes.Both };
screenStackContainer.ScreenStack.Push(songSelect = new DummySongSelect());
});
>>>>>>>
Child = screenStack = new OsuScreenStack { RelativeSizeAxes = Axes.Both };
screenStack.Push(songSelect = new DummySongSelect());
});
<<<<<<<
private class DimAccessiblePlayerLoader : PlayerLoader
=======
private class ScreenStackCacheContainer : Container
{
[Cached]
private BackgroundScreenStack backgroundScreenStack;
public readonly ScreenStack ScreenStack;
public ScreenStackCacheContainer()
{
Add(backgroundScreenStack = new BackgroundScreenStack { RelativeSizeAxes = Axes.Both });
Add(ScreenStack = new ScreenStack { RelativeSizeAxes = Axes.Both });
}
}
private class TestPlayerLoader : PlayerLoader
>>>>>>>
private class TestPlayerLoader : PlayerLoader |
<<<<<<<
using System.Collections.Specialized;
using System.Diagnostics;
=======
using System.Linq;
>>>>>>>
using System.Collections.Specialized;
<<<<<<<
using osu.Framework.Input.States;
=======
using osu.Framework.Input.Events;
using osu.Framework.Threading;
>>>>>>>
using osu.Framework.Input.Events;
<<<<<<<
private readonly ChannelTabControl channelTabControl;
=======
private GetUpdatesRequest fetchReq;
private readonly ChatTabControl channelTabs;
>>>>>>>
private readonly ChannelTabControl channelTabControl;
<<<<<<<
public override bool Contains(Vector2 screenSpacePos) => chatContainer.ReceiveMouseInputAt(screenSpacePos) || channelSelection.State == Visibility.Visible && channelSelection.ReceiveMouseInputAt(screenSpacePos);
=======
public override bool Contains(Vector2 screenSpacePos) => chatContainer.ReceivePositionalInputAt(screenSpacePos) || channelSelection.State == Visibility.Visible && channelSelection.ReceivePositionalInputAt(screenSpacePos);
>>>>>>>
public override bool Contains(Vector2 screenSpacePos) => chatContainer.ReceivePositionalInputAt(screenSpacePos) || channelSelection.State == Visibility.Visible && channelSelection.ReceivePositionalInputAt(screenSpacePos);
<<<<<<<
protected override bool OnDragStart(InputState state)
=======
public void OpenChannel(Channel channel) => addChannel(channel);
protected override bool OnDragStart(DragStartEvent e)
>>>>>>>
protected override bool OnDragStart(DragStartEvent e)
<<<<<<<
=======
}
private long lastMessageId;
private readonly List<Channel> careChannels = new List<Channel>();
private readonly List<DrawableChannel> loadedChannels = new List<DrawableChannel>();
private void initializeChannels()
{
>>>>>>>
<<<<<<<
//for the case that channelmanager was faster at fetching the channels than our attachment to CollectionChanged.
channelSelection.UpdateAvailableChannels(channelManager.AvailableChannels);
joinedChannelsChanged(this, new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Add, channelManager.JoinedChannels));
=======
ListChannelsRequest req = new ListChannelsRequest();
req.Success += delegate(List<Channel> channels)
{
AvailableChannels = channels;
Scheduler.Add(delegate
{
//todo: decide how to handle default channels for a user now that they are saved server-side.
addChannel(channels.Find(c => c.Name == @"#lazer"));
addChannel(channels.Find(c => c.Name == @"#osu"));
channelSelection.OnRequestJoin = addChannel;
channelSelection.OnRequestLeave = removeChannel;
channelSelection.Sections = new[]
{
new ChannelSection
{
Header = "All Channels",
Channels = channels,
},
};
});
messageRequest = Scheduler.AddDelayed(fetchUpdates, 1000, true);
};
api.Queue(req);
>>>>>>>
//for the case that channelmanager was faster at fetching the channels than our attachment to CollectionChanged.
channelSelection.UpdateAvailableChannels(channelManager.AvailableChannels);
joinedChannelsChanged(this, new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Add, channelManager.JoinedChannels));
<<<<<<<
channelSelection.UpdateAvailableChannels(channelManager.AvailableChannels);
=======
get { return currentChannel; }
set
{
if (currentChannel == value) return;
if (value == null)
{
currentChannel = null;
textbox.Current.Disabled = true;
currentChannelContainer.Clear(false);
return;
}
currentChannel = value;
textbox.Current.Disabled = currentChannel.ReadOnly;
channelTabs.Current.Value = value;
var loaded = loadedChannels.Find(d => d.Channel == value);
if (loaded == null)
{
currentChannelContainer.FadeOut(500, Easing.OutQuint);
loading.Show();
loaded = new DrawableChannel(currentChannel);
loadedChannels.Add(loaded);
LoadComponentAsync(loaded, l =>
{
if (currentChannel.MessagesLoaded)
loading.Hide();
currentChannelContainer.Clear(false);
currentChannelContainer.Add(loaded);
currentChannelContainer.FadeIn(500, Easing.OutQuint);
});
}
else
{
currentChannelContainer.Clear(false);
currentChannelContainer.Add(loaded);
}
}
>>>>>>>
channelSelection.UpdateAvailableChannels(channelManager.AvailableChannels);
<<<<<<<
if (text[0] == '/')
channelManager.PostCommand(text.Substring(1));
else
channelManager.PostMessage(text);
=======
default:
currentChannel.AddNewMessages(new ErrorMessage($@"""/{command}"" is not supported! For a list of supported commands see /help"));
return;
}
}
var message = new LocalEchoMessage
{
Sender = api.LocalUser.Value,
Timestamp = DateTimeOffset.Now,
ChannelId = target.Id,
IsAction = isAction,
Content = postText
};
var req = new PostMessageRequest(message);
target.AddLocalEcho(message);
req.Failure += e => target.ReplaceMessage(message, null);
req.Success += m => target.ReplaceMessage(message, m);
>>>>>>>
if (text[0] == '/')
channelManager.PostCommand(text.Substring(1));
else
channelManager.PostMessage(text); |
<<<<<<<
=======
logoTracking = false;
hideOverlaysOnEnter.Value = true;
allowOpeningOverlays.Value = false;
>>>>>>>
logoTracking = false;
<<<<<<<
}, 150);
=======
}, buttonArea.Alpha * 150);
>>>>>>>
}, buttonArea.Alpha * 150);
<<<<<<<
logo.Impact();
=======
if (impact)
logo.Impact();
hideOverlaysOnEnter.Value = false;
allowOpeningOverlays.Value = true;
>>>>>>>
if (impact)
logo.Impact(); |
<<<<<<<
[assembly: InternalsVisibleTo("osu.Game.Rulesets.Osu.Tests.Dynamic")]
[assembly: InternalsVisibleTo("osu.Game.Rulesets.Osu.Tests.Android")]
=======
[assembly: InternalsVisibleTo("osu.Game.Rulesets.Osu.Tests.Dynamic")]
[assembly: InternalsVisibleTo("osu.Game.Rulesets.Osu.Tests.iOS")]
>>>>>>>
[assembly: InternalsVisibleTo("osu.Game.Rulesets.Osu.Tests.Dynamic")]
[assembly: InternalsVisibleTo("osu.Game.Rulesets.Osu.Tests.iOS")]
[assembly: InternalsVisibleTo("osu.Game.Rulesets.Osu.Tests.Android")] |
<<<<<<<
using System.Collections.Generic;
=======
using System;
>>>>>>>
using System;
using System.Collections.Generic;
<<<<<<<
private static readonly SkinInfo random_skin_info = new RandomSkinInfo();
private SkinManager skins;
private List<SkinInfo> usableSkins;
=======
[Resolved]
private SkinManager skins { get; set; }
private IBindable<WeakReference<SkinInfo>> managerUpdated;
private IBindable<WeakReference<SkinInfo>> managerRemoved;
>>>>>>>
private static readonly SkinInfo random_skin_info = new RandomSkinInfo();
private List<SkinInfo> usableSkins;
[Resolved]
private SkinManager skins { get; set; }
private IBindable<WeakReference<SkinInfo>> managerUpdated;
private IBindable<WeakReference<SkinInfo>> managerRemoved;
<<<<<<<
usableSkins = skins.GetAllUsableSkins();
skinDropdown.Bindable = dropdownBindable;
resetSkinButtons();
=======
skinDropdown.Current = dropdownBindable;
skinDropdown.Items = skins.GetAllUsableSkins().ToArray();
>>>>>>>
skinDropdown.Current = dropdownBindable;
updateItems();
<<<<<<<
private void randomizeSkin()
{
int n = usableSkins.Count;
if (n > 1)
configBindable.Value = (configBindable.Value + RNG.Next(n - 1) + 1) % n; // make sure it's always a different one
else
configBindable.Value = 0;
}
private void itemRemoved(SkinInfo s) => Schedule(() =>
{
usableSkins.RemoveAll(i => i.ID == s.ID);
resetSkinButtons();
});
private void itemAdded(SkinInfo s)
{
if (existing)
return;
Schedule(() =>
{
usableSkins.Add(s);
resetSkinButtons();
});
}
private void resetSkinButtons()
{
skinDropdown.Items = usableSkins.Count > 1 ? usableSkins.Concat(new[] { random_skin_info }) : usableSkins;
}
protected override void Dispose(bool isDisposing)
=======
private void itemUpdated(ValueChangedEvent<WeakReference<SkinInfo>> weakItem)
>>>>>>>
private void randomizeSkin()
{
int n = usableSkins.Count;
if (n > 1)
configBindable.Value = (configBindable.Value + RNG.Next(n - 1) + 1) % n; // make sure it's always a different one
else
configBindable.Value = 0;
}
private void updateItems()
{
usableSkins = skins.GetAllUsableSkins();
if (usableSkins.Count > 1)
usableSkins.Add(random_skin_info);
skinDropdown.Items = usableSkins;
}
private void itemUpdated(ValueChangedEvent<WeakReference<SkinInfo>> weakItem)
<<<<<<<
private class RandomSkinInfo : SkinInfo
{
public RandomSkinInfo()
{
Name = "<Random Skin>";
ID = -1;
}
public override string ToString() => Name;
}
=======
private class ExportSkinButton : SettingsButton
{
[Resolved]
private SkinManager skins { get; set; }
private Bindable<Skin> currentSkin;
[BackgroundDependencyLoader]
private void load()
{
Text = "Export selected skin";
Action = export;
currentSkin = skins.CurrentSkin.GetBoundCopy();
currentSkin.BindValueChanged(skin => Enabled.Value = skin.NewValue.SkinInfo.ID > 0, true);
}
private void export()
{
try
{
skins.Export(currentSkin.Value.SkinInfo);
}
catch (Exception e)
{
Logger.Log($"Could not export current skin: {e.Message}", level: LogLevel.Error);
}
}
}
>>>>>>>
private class RandomSkinInfo : SkinInfo
{
public RandomSkinInfo()
{
Name = "<Random Skin>";
ID = -1;
}
public override string ToString() => Name;
}
private class ExportSkinButton : SettingsButton
{
[Resolved]
private SkinManager skins { get; set; }
private Bindable<Skin> currentSkin;
[BackgroundDependencyLoader]
private void load()
{
Text = "Export selected skin";
Action = export;
currentSkin = skins.CurrentSkin.GetBoundCopy();
currentSkin.BindValueChanged(skin => Enabled.Value = skin.NewValue.SkinInfo.ID > 0, true);
}
private void export()
{
try
{
skins.Export(currentSkin.Value.SkinInfo);
}
catch (Exception e)
{
Logger.Log($"Could not export current skin: {e.Message}", level: LogLevel.Error);
}
}
} |
<<<<<<<
float halfCatchWidth;
using (var catcher = new Catcher(beatmap.BeatmapInfo.BaseDifficulty))
{
halfCatchWidth = catcher.CatchWidth * 0.5f;
halfCatchWidth *= 0.8f; // We're only using 80% of the catcher's width to simulate imperfect gameplay.
}
=======
>>>>>>> |
<<<<<<<
addControlPoint(time, new DifficultyControlPoint
=======
handleDifficultyControlPoint(new LegacyDifficultyControlPoint
>>>>>>>
addControlPoint(time, new LegacyDifficultyControlPoint |
<<<<<<<
protected virtual void Shake(double maximumLength) => shakeContainer.Shake(maximumLength);
}
=======
>>>>>>>
protected virtual void Shake(double maximumLength) => shakeContainer.Shake(maximumLength); |
<<<<<<<
public Bindable<bool> Joined = new Bindable<bool>();
=======
public readonly SortedList<Message> Messages = new SortedList<Message>(Comparer<Message>.Default);
>>>>>>>
public Bindable<bool> Joined = new Bindable<bool>();
public readonly SortedList<Message> Messages = new SortedList<Message>(Comparer<Message>.Default); |
<<<<<<<
double currentTrackTime = beatmap.Value.Track.CurrentTime + EarlyActivationMilliseconds;
ControlPoint overridePoint;
ControlPoint controlPoint = beatmap.Value.Beatmap.TimingInfo.TimingPointAt(currentTrackTime, out overridePoint);
=======
double currentTrackTime = beatmap.Value.Track.CurrentTime;
>>>>>>>
double currentTrackTime = beatmap.Value.Track.CurrentTime + EarlyActivationMilliseconds; |
<<<<<<<
ColumnLineColour,
JudgementLineColour,
ColumnBackgroundColour,
ColumnLightColour
=======
ColumnLineColour,
MinimumColumnWidth
>>>>>>>
ColumnLineColour,
JudgementLineColour,
ColumnBackgroundColour,
ColumnLightColour
MinimumColumnWidth |
<<<<<<<
ColumnBackground
HitTarget
=======
KeyArea
>>>>>>>
ColumnBackground
HitTarget
KeyArea |
<<<<<<<
AddButton("DrumRoll", () => addDrumRoll(false));
AddButton("Strong DrumRoll", () => addDrumRoll(true));
=======
AddButton("Centre", () => addCentreHit(false));
AddButton("Strong Centre", () => addCentreHit(true));
AddButton("Rim", () => addRimHit(false));
AddButton("Strong Rim", () => addRimHit(true));
>>>>>>>
AddButton("DrumRoll", () => addDrumRoll(false));
AddButton("Strong DrumRoll", () => addDrumRoll(true));
AddButton("Centre", () => addCentreHit(false));
AddButton("Strong Centre", () => addCentreHit(true));
AddButton("Rim", () => addRimHit(false));
AddButton("Strong Rim", () => addRimHit(true));
<<<<<<<
private void addDrumRoll(bool strong)
{
var d = new DrumRoll
{
StartTime = Time.Current + 1000,
Distance = 2000,
PreEmpt = 1000,
};
playfield.Add(strong ? new DrawableStrongDrumRoll(d) : new DrawableDrumRoll(d));
}
=======
private void addCentreHit(bool strong)
{
Hit h = new Hit
{
StartTime = Time.Current + 1000,
PreEmpt = 1000
};
if (strong)
playfield.Add(new DrawableStrongCentreHit(h));
else
playfield.Add(new DrawableCentreHit(h));
}
private void addRimHit(bool strong)
{
Hit h = new Hit
{
StartTime = Time.Current + 1000,
PreEmpt = 1000
};
if (strong)
playfield.Add(new DrawableStrongRimHit(h));
else
playfield.Add(new DrawableRimHit(h));
}
>>>>>>>
private void addDrumRoll(bool strong)
{
var d = new DrumRoll
{
StartTime = Time.Current + 1000,
Distance = 2000,
PreEmpt = 1000,
};
playfield.Add(strong ? new DrawableStrongDrumRoll(d) : new DrawableDrumRoll(d));
}
private void addCentreHit(bool strong)
{
Hit h = new Hit
{
StartTime = Time.Current + 1000,
PreEmpt = 1000
};
if (strong)
playfield.Add(new DrawableStrongCentreHit(h));
else
playfield.Add(new DrawableCentreHit(h));
}
private void addRimHit(bool strong)
{
Hit h = new Hit
{
StartTime = Time.Current + 1000,
PreEmpt = 1000
};
if (strong)
playfield.Add(new DrawableStrongRimHit(h));
else
playfield.Add(new DrawableRimHit(h));
} |
<<<<<<<
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, int comboOffset, Vector2[] controlPoints, double length, PathType pathType, int repeatCount, List<List<SampleInfo>> repeatSamples)
>>>>>>>
protected override HitObject CreateSlider(Vector2 position, bool newCombo, int comboOffset, Vector2[] controlPoints, double length, PathType pathType, int repeatCount, List<List<SampleInfo>> nodeSamples)
<<<<<<<
CurveType = curveType,
NodeSamples = nodeSamples,
=======
PathType = pathType,
RepeatSamples = repeatSamples,
>>>>>>>
PathType = pathType,
NodeSamples = nodeSamples, |
<<<<<<<
protected override IEnumerable<Type> ValidConversionTypes { get; } = new[] { typeof(HitObject) };
public TaikoBeatmapConverter(IBeatmap beatmap, Ruleset ruleset)
: base(beatmap, ruleset)
=======
public TaikoBeatmapConverter(IBeatmap beatmap)
: base(beatmap)
>>>>>>>
public TaikoBeatmapConverter(IBeatmap beatmap, Ruleset ruleset)
: base(beatmap, ruleset) |
<<<<<<<
=======
using osu.Game.Modes.Mods;
using osu.Game.Modes.Objects;
>>>>>>>
using osu.Game.Modes.Mods; |
<<<<<<<
using osu.Game.Input;
=======
using osu.Framework.Testing;
>>>>>>>
using osu.Framework.Testing;
using osu.Game.Input; |
<<<<<<<
public class ManiaBeatmapConversionTest : BeatmapConversionTest<ManiaConvertMapping, ConvertValue>
=======
[TestFixture]
public class ManiaBeatmapConversionTest : BeatmapConversionTest<ConvertValue>
>>>>>>>
[TestFixture]
public class ManiaBeatmapConversionTest : BeatmapConversionTest<ManiaConvertMapping, ConvertValue>
<<<<<<<
public class ManiaConvertMapping : ConvertMapping<ConvertValue>, IEquatable<ManiaConvertMapping>
{
public uint RandomW;
public uint RandomX;
public uint RandomY;
public uint RandomZ;
public ManiaConvertMapping()
{
}
public ManiaConvertMapping(IBeatmapConverter converter)
{
var maniaConverter = (ManiaBeatmapConverter)converter;
RandomW = maniaConverter.Random.W;
RandomX = maniaConverter.Random.X;
RandomY = maniaConverter.Random.Y;
RandomZ = maniaConverter.Random.Z;
}
public bool Equals(ManiaConvertMapping other) => other != null && RandomW == other.RandomW && RandomX == other.RandomX && RandomY == other.RandomY && RandomZ == other.RandomZ;
public override bool Equals(ConvertMapping<ConvertValue> other) => base.Equals(other) && Equals(other as ManiaConvertMapping);
}
public struct ConvertValue : IEquatable<ConvertValue>
=======
public struct ConvertValue : IEquatable<ConvertValue>
>>>>>>>
public class ManiaConvertMapping : ConvertMapping<ConvertValue>, IEquatable<ManiaConvertMapping>
{
public uint RandomW;
public uint RandomX;
public uint RandomY;
public uint RandomZ;
public ManiaConvertMapping()
{
}
public ManiaConvertMapping(IBeatmapConverter converter)
{
var maniaConverter = (ManiaBeatmapConverter)converter;
RandomW = maniaConverter.Random.W;
RandomX = maniaConverter.Random.X;
RandomY = maniaConverter.Random.Y;
RandomZ = maniaConverter.Random.Z;
}
public bool Equals(ManiaConvertMapping other) => other != null && RandomW == other.RandomW && RandomX == other.RandomX && RandomY == other.RandomY && RandomZ == other.RandomZ;
public override bool Equals(ConvertMapping<ConvertValue> other) => base.Equals(other) && Equals(other as ManiaConvertMapping);
}
public struct ConvertValue : IEquatable<ConvertValue> |
<<<<<<<
using osu.Game.Modes.Taiko.Beatmaps;
using osu.Game.Modes.Taiko.Mods;
=======
>>>>>>>
using osu.Game.Modes.Taiko.Mods; |
<<<<<<<
[Resolved(CanBeNull = true)]
private DrawableRuleset drawableRuleset { get; set; }
=======
private Container<PausableSkinnableSound> samplesContainer;
>>>>>>>
[Resolved(CanBeNull = true)]
private DrawableRuleset drawableRuleset { get; set; }
private Container<PausableSkinnableSound> samplesContainer; |
<<<<<<<
private void initializeSkipButton()
{
const double skip_required_cutoff = 3000;
const double fade_time = 300;
double firstHitObject = Beatmap.Beatmap.HitObjects.First().StartTime;
if (firstHitObject < skip_required_cutoff)
{
skipButton.Alpha = 0;
skipButton.Expire();
return;
}
skipButton.FadeInFromZero(fade_time);
skipButton.Action = () =>
{
sourceClock.Seek(firstHitObject - skip_required_cutoff - fade_time);
skipButton.Action = null;
};
skipButton.Delay(firstHitObject - skip_required_cutoff - fade_time);
skipButton.FadeOut(fade_time);
skipButton.Expire();
}
=======
public void Pause(bool force = false)
{
if (canPause || force)
{
lastPauseActionTime = Time.Current;
playerInputManager.PassThrough = true;
scoreOverlay.KeyCounter.IsCounting = false;
pauseOverlay.Retries = RestartCount;
pauseOverlay.Show();
sourceClock.Stop();
isPaused = true;
}
else
{
isPaused = false;
}
}
public void Resume()
{
lastPauseActionTime = Time.Current;
playerInputManager.PassThrough = false;
scoreOverlay.KeyCounter.IsCounting = true;
pauseOverlay.Hide();
sourceClock.Start();
isPaused = false;
}
public void TogglePaused()
{
isPaused = !IsPaused;
if (IsPaused) Pause(); else Resume();
}
public void Restart()
{
sourceClock.Stop(); // If the clock is running and Restart is called the game will lag until relaunch
var newPlayer = new Player();
newPlayer.Preload(Game, delegate
{
newPlayer.RestartCount = RestartCount + 1;
ValidForResume = false;
if (!Push(newPlayer))
{
// Error(?)
}
});
}
>>>>>>>
private void initializeSkipButton()
{
const double skip_required_cutoff = 3000;
const double fade_time = 300;
double firstHitObject = Beatmap.Beatmap.HitObjects.First().StartTime;
if (firstHitObject < skip_required_cutoff)
{
skipButton.Alpha = 0;
skipButton.Expire();
return;
}
skipButton.FadeInFromZero(fade_time);
skipButton.Action = () =>
{
sourceClock.Seek(firstHitObject - skip_required_cutoff - fade_time);
skipButton.Action = null;
};
skipButton.Delay(firstHitObject - skip_required_cutoff - fade_time);
skipButton.FadeOut(fade_time);
skipButton.Expire();
}
public void Pause(bool force = false)
{
if (canPause || force)
{
lastPauseActionTime = Time.Current;
playerInputManager.PassThrough = true;
scoreOverlay.KeyCounter.IsCounting = false;
pauseOverlay.Retries = RestartCount;
pauseOverlay.Show();
sourceClock.Stop();
isPaused = true;
}
else
{
isPaused = false;
}
}
public void Resume()
{
lastPauseActionTime = Time.Current;
playerInputManager.PassThrough = false;
scoreOverlay.KeyCounter.IsCounting = true;
pauseOverlay.Hide();
sourceClock.Start();
isPaused = false;
}
public void TogglePaused()
{
isPaused = !IsPaused;
if (IsPaused) Pause(); else Resume();
}
public void Restart()
{
sourceClock.Stop(); // If the clock is running and Restart is called the game will lag until relaunch
var newPlayer = new Player();
newPlayer.Preload(Game, delegate
{
newPlayer.RestartCount = RestartCount + 1;
ValidForResume = false;
if (!Push(newPlayer))
{
// Error(?)
}
});
} |
<<<<<<<
public interface IBeatmap : IJsonSerializable
{
/// <summary>
/// This beatmap's info.
/// </summary>
BeatmapInfo BeatmapInfo { get; set; }
/// <summary>
/// This beatmap's metadata.
/// </summary>
BeatmapMetadata Metadata { get; }
/// <summary>
/// The control points in this beatmap.
/// </summary>
ControlPointInfo ControlPointInfo { get; }
/// <summary>
/// The breaks in this beatmap.
/// </summary>
List<BreakPeriod> Breaks { get; }
/// <summary>
/// Total amount of break time in the beatmap.
/// </summary>
double TotalBreakTime { get; }
/// <summary>
/// The hitobjects contained by this beatmap.
/// </summary>
IEnumerable<HitObject> HitObjects { get; }
/// <summary>
/// Returns statistics of the <see cref="HitObjects"/> contained in this beatmap.
/// </summary>
/// <returns></returns>
IEnumerable<BeatmapStatistic> GetStatistics();
/// <summary>
/// Creates a shallow-clone of this beatmap and returns it.
/// </summary>
/// <returns>The shallow-cloned beatmap.</returns>
IBeatmap Clone();
}
=======
>>>>>>> |
<<<<<<<
LabelText = "Show difficulty graph on progress bar",
Bindable = config.GetBindable<bool>(OsuSetting.ShowProgressGraph)
},
new SettingsCheckbox
{
=======
LabelText = "Show health display even when you can't fail",
Bindable = config.GetBindable<bool>(OsuSetting.ShowHealthDisplayWhenCantFail),
},
new SettingsCheckbox
{
>>>>>>>
LabelText = "Show difficulty graph on progress bar",
Bindable = config.GetBindable<bool>(OsuSetting.ShowProgressGraph)
},
new SettingsCheckbox
{
LabelText = "Show health display even when you can't fail",
Bindable = config.GetBindable<bool>(OsuSetting.ShowHealthDisplayWhenCantFail),
},
new SettingsCheckbox
{ |
<<<<<<<
/// <summary>
/// Whether playback of this sound has been requested, regardless of whether it could be played or not (due to being paused, for instance).
/// </summary>
protected bool PlaybackRequested;
=======
>>>>>>>
<<<<<<<
protected virtual bool PlayWhenPaused => false;
protected readonly AudioContainer<DrawableSample> SamplesContainer;
=======
private readonly AudioContainer<DrawableSample> samplesContainer;
>>>>>>>
protected readonly AudioContainer<DrawableSample> SamplesContainer;
<<<<<<<
private readonly IBindable<bool> samplePlaybackDisabled = new Bindable<bool>();
[BackgroundDependencyLoader(true)]
private void load(ISamplePlaybackDisabler samplePlaybackDisabler)
{
// if in a gameplay context, pause sample playback when gameplay is paused.
if (samplePlaybackDisabler != null)
{
samplePlaybackDisabled.BindTo(samplePlaybackDisabler.SamplePlaybackDisabled);
samplePlaybackDisabled.BindValueChanged(disabled =>
{
if (PlaybackRequested)
{
if (disabled.NewValue && !PlayWhenPaused)
stop();
// it's not easy to know if a sample has finished playing (to end).
// to keep things simple only resume playing looping samples.
else if (Looping)
play();
}
});
}
}
=======
>>>>>>>
<<<<<<<
public void Stop()
{
PlaybackRequested = false;
stop();
}
private void stop()
=======
public virtual void Stop()
>>>>>>>
public virtual void Stop() |
<<<<<<<
Breaks = working.Beatmap.Breaks
},
RulesetContainer.Cursor?.CreateProxy() ?? new Container(),
HUDOverlay = new HUDOverlay(ScoreProcessor, RulesetContainer, working)
=======
Breaks = beatmap.Breaks
},
// display the cursor above some HUD elements.
RulesetContainer.Cursor?.CreateProxy() ?? new Container(),
HUDOverlay = new HUDOverlay(ScoreProcessor, RulesetContainer, working, adjustableClock)
>>>>>>>
Breaks = working.Beatmap.Breaks
},
// display the cursor above some HUD elements.
RulesetContainer.Cursor?.CreateProxy() ?? new Container(),
HUDOverlay = new HUDOverlay(ScoreProcessor, RulesetContainer, working) |
<<<<<<<
new OsuModTraceable(),
=======
new OsuModGrow(),
new MultiMod(new ModWindUp<OsuHitObject>(), new ModWindDown<OsuHitObject>()),
>>>>>>>
new OsuModGrow(),
new MultiMod(new ModWindUp<OsuHitObject>(), new ModWindDown<OsuHitObject>()),
new OsuModTraceable(), |
<<<<<<<
using System.Linq;
=======
using JetBrains.Annotations;
>>>>>>>
using System.Linq;
using JetBrains.Annotations; |
<<<<<<<
protected override IEnumerable<string> GetStableImportPaths() => GetStableStorage().GetDirectories(ImportFromStablePath);
=======
protected override ArchiveDownloadRequest<BeatmapSetInfo> CreateDownloadRequest(BeatmapSetInfo set, bool minimiseDownloadSize) =>
new DownloadBeatmapSetRequest(set, minimiseDownloadSize);
>>>>>>>
protected override ArchiveDownloadRequest<BeatmapSetInfo> CreateDownloadRequest(BeatmapSetInfo set, bool minimiseDownloadSize) =>
new DownloadBeatmapSetRequest(set, minimiseDownloadSize);
protected override IEnumerable<string> GetStableImportPaths() => GetStableStorage().GetDirectories(ImportFromStablePath); |
<<<<<<<
using osu.Framework.Graphics.Animations;
=======
using osu.Framework.Graphics.Containers;
>>>>>>>
using osu.Framework.Graphics.Animations;
using osu.Framework.Graphics.Containers; |
<<<<<<<
protected override void ApplyDrawNode(DrawNode node)
{
base.ApplyDrawNode(node);
var flashNode = (FlashlightDrawNode)node;
flashNode.Shader = shader;
flashNode.ScreenSpaceDrawQuad = ScreenSpaceDrawQuad;
flashNode.FlashlightPosition = Vector2Extensions.Transform(FlashlightPosition, DrawInfo.Matrix);
flashNode.FlashlightSize = FlashlightSize * DrawInfo.Matrix.ExtractScale().Xy;
flashNode.FlashlightDim = FlashlightDim;
}
=======
>>>>>>>
<<<<<<<
Shader.GetUniform<Vector2>("flashlightPos").UpdateValue(ref FlashlightPosition);
Shader.GetUniform<Vector2>("flashlightSize").UpdateValue(ref FlashlightSize);
Shader.GetUniform<float>("flashlightDim").UpdateValue(ref FlashlightDim);
=======
shader.Bind();
>>>>>>>
shader.Bind(); |
<<<<<<<
=======
/// Create a token for the given text.
/// </summary>
/// <param name="text">The text string to create the token for.</param>
/// <returns>The token that was created.</returns>
public static Token Create(string text)
{
return Create(TokenKind.Text, text);
}
/// <summary>
/// Create a token for the given text.
/// </summary>
/// <param name="kind">The token kind.</param>
/// <param name="text">The text string to create the token for.</param>
/// <returns>The token that was created.</returns>
public static Token Create(TokenKind kind, string text)
{
return new Token(kind, text);
}
/// <summary>
/// Create a token for the given character.
/// </summary>
/// <param name="ch">The character to create the token for.</param>
/// <returns>The token that was created.</returns>
public static Token Create(char ch)
{
return new Token(KindOf(ch), ch.ToString());
}
/// <summary>
/// Create a token for the given character.
/// </summary>
/// <param name="kind">The token kind.</param>
/// <param name="ch">The character to create the token for.</param>
/// <returns>The token that was created.</returns>
public static Token Create(TokenKind kind, char ch)
{
return new Token(kind, ch.ToString());
}
/// <summary>
/// Create a token for the given byte value.
/// </summary>
/// <param name="b">The byte value to create the token for.</param>
/// <returns>The token that was created.</returns>
public static Token Create(byte b)
{
return Create((char)b);
}
/// <summary>
/// Create a token for the given byte value.
/// </summary>
/// <param name="kind">The token kind.</param>
/// <param name="b">The byte value to create the token for.</param>
/// <returns>The token that was created.</returns>
public static Token Create(TokenKind kind, byte b)
{
return Create(kind, (char)b);
}
/// <summary>
/// Returns the token kind for the given byte value.
/// </summary>
/// <param name="value">The byte value to return the token kind for.</param>
/// <returns>The token kind for the given byte value.</returns>
public static TokenKind KindOf(char value)
{
return KindOf((byte) value);
}
/// <summary>
/// Returns the token kind for the given byte value.
/// </summary>
/// <param name="value">The byte value to return the token kind for.</param>
/// <returns>The token kind for the given byte value.</returns>
public static TokenKind KindOf(byte value)
{
if (IsText(value))
{
return TokenKind.Text;
}
if (IsNumber(value))
{
return TokenKind.Number;
}
if (IsWhiteSpace(value))
{
return TokenKind.Space;
}
return TokenKind.Other;
}
/// <summary>
/// Returns a value indicating whether or not the given byte is considered a carriage return (CR).
/// </summary>
/// <param name="value">The value to test.</param>
/// <returns>true if the value is considered a carriage return (CR) character, false if not.</returns>
// ReSharper disable once InconsistentNaming
public static bool IsCR(byte value)
{
return value == 13;
}
/// <summary>
/// Returns a value indicating whether or not the given byte is considered a line feed (LF).
/// </summary>
/// <param name="value">The value to test.</param>
/// <returns>true if the value is considered a line feed (LF) character, false if not.</returns>
// ReSharper disable once InconsistentNaming
public static bool IsLF(byte value)
{
return value == 10;
}
/// <summary>
/// Returns a value indicating whether or not the given byte is considered a text or number character.
/// </summary>
/// <param name="value">The value to test.</param>
/// <returns>true if the value is considered a text or number character, false if not.</returns>
public static bool IsTextOrNumber(byte value)
{
return IsText(value) || IsNumber(value);
}
/// <summary>
>>>>>>> |
<<<<<<<
case HUDSkinComponents.ScoreCounter:
return new LegacyScoreCounter(this);
case HUDSkinComponents.ScoreText:
const string font = "score";
if (!this.HasFont(font))
return null;
return new LegacySpriteText(this, font);
=======
>>>>>>>
case HUDSkinComponents.ScoreCounter:
return new LegacyScoreCounter(this); |
<<<<<<<
using System;
=======
using osu.Framework.Allocation;
>>>>>>>
using System;
using osu.Framework.Allocation;
<<<<<<<
public class OverlayHeaderTabControl : OverlayTabControl<T>
=======
protected TabControlOverlayHeader(OverlayColourScheme colourScheme)
: base(colourScheme)
{
}
[BackgroundDependencyLoader]
private void load(OsuColour colours)
{
TabControl.AccentColour = colours.ForOverlayElement(ColourScheme, 1, 0.75f);
}
public class OverlayHeaderTabControl : OverlayTabControl<string>
>>>>>>>
protected TabControlOverlayHeader(OverlayColourScheme colourScheme)
: base(colourScheme)
{
}
[BackgroundDependencyLoader]
private void load(OsuColour colours)
{
TabControl.AccentColour = colours.ForOverlayElement(ColourScheme, 1, 0.75f);
}
public class OverlayHeaderTabControl : OverlayTabControl<T> |
<<<<<<<
protected bool PauseCooldownActive =>
lastPauseActionTime.HasValue && GameplayClockContainer.GameplayClock.CurrentTime < lastPauseActionTime + pause_cooldown;
private bool canPause =>
=======
/// <summary>
/// A set of conditionals which defines whether the current game state and configuration allows for
/// pausing to be attempted via <see cref="Pause"/>. If false, the game should generally exit if a user pause
/// is attempted.
/// </summary>
private bool pausingSupportedByCurrentState =>
>>>>>>>
protected bool PauseCooldownActive =>
lastPauseActionTime.HasValue && GameplayClockContainer.GameplayClock.CurrentTime < lastPauseActionTime + pause_cooldown;
/// <summary>
/// A set of conditionals which defines whether the current game state and configuration allows for
/// pausing to be attempted via <see cref="Pause"/>. If false, the game should generally exit if a user pause
/// is attempted.
/// </summary>
private bool pausingSupportedByCurrentState =>
<<<<<<<
// cannot pause if we are already in a fail state
&& !HasFailed
// cannot pause if already paused (or in a cooldown state) unless we are in a resuming state.
&& (IsResuming || (GameplayClockContainer.IsPaused.Value == false && !PauseCooldownActive));
=======
&& !HasFailed;
private bool pauseCooldownActive =>
lastPauseActionTime.HasValue && GameplayClockContainer.GameplayClock.CurrentTime < lastPauseActionTime + pause_cooldown;
>>>>>>>
// cannot pause if we are already in a fail state
&& !HasFailed;
<<<<<<<
// ValidForResume is false when restarting
if (ValidForResume)
{
if (PauseCooldownActive && !GameplayClockContainer.IsPaused.Value)
// still want to block if we are within the cooldown period and not already paused.
return true;
}
=======
>>>>>>> |
<<<<<<<
[Cached]
[Cached(typeof(ISamplePlaybackDisabler))]
public readonly GameplayClock GameplayClock;
=======
public GameplayClock GameplayClock => localGameplayClock;
[Cached(typeof(GameplayClock))]
private readonly LocalGameplayClock localGameplayClock;
>>>>>>>
public GameplayClock GameplayClock => localGameplayClock;
[Cached]
[Cached(typeof(ISamplePlaybackDisabler))]
private readonly LocalGameplayClock localGameplayClock; |
<<<<<<<
using osu.Game.Modes.Mania.Beatmaps;
using osu.Game.Modes.Mania.Mods;
=======
>>>>>>>
using osu.Game.Modes.Mania.Mods; |
<<<<<<<
public interface IContentFieldDriver : IEvents {
DriverResult BuildDisplayShape(BuildDisplayModelContext context);
DriverResult BuildEditorShape(BuildEditorModelContext context);
DriverResult UpdateEditorShape(UpdateEditorModelContext context);
=======
public interface IContentFieldDriver : IDependency {
DriverResult BuildDisplayModel(BuildDisplayModelContext context);
DriverResult BuildEditorModel(BuildEditorModelContext context);
DriverResult UpdateEditorModel(UpdateEditorModelContext context);
>>>>>>>
public interface IContentFieldDriver : IDependency {
DriverResult BuildDisplayShape(BuildDisplayModelContext context);
DriverResult BuildEditorShape(BuildEditorModelContext context);
DriverResult UpdateEditorShape(UpdateEditorModelContext context); |
<<<<<<<
=======
using System.Collections.Generic;
using System.Diagnostics;
>>>>>>>
using System.Collections.Generic;
<<<<<<<
try
=======
// this is kind of SILLY
// https://github.com/dotnet/aspnetcore/issues/15198
connection.On<MultiplayerRoomState>(nameof(IMultiplayerClient.RoomStateChanged), ((IMultiplayerClient)this).RoomStateChanged);
connection.On<MultiplayerRoomUser>(nameof(IMultiplayerClient.UserJoined), ((IMultiplayerClient)this).UserJoined);
connection.On<MultiplayerRoomUser>(nameof(IMultiplayerClient.UserLeft), ((IMultiplayerClient)this).UserLeft);
connection.On<int>(nameof(IMultiplayerClient.HostChanged), ((IMultiplayerClient)this).HostChanged);
connection.On<MultiplayerRoomSettings>(nameof(IMultiplayerClient.SettingsChanged), ((IMultiplayerClient)this).SettingsChanged);
connection.On<int, MultiplayerUserState>(nameof(IMultiplayerClient.UserStateChanged), ((IMultiplayerClient)this).UserStateChanged);
connection.On(nameof(IMultiplayerClient.LoadRequested), ((IMultiplayerClient)this).LoadRequested);
connection.On(nameof(IMultiplayerClient.MatchStarted), ((IMultiplayerClient)this).MatchStarted);
connection.On(nameof(IMultiplayerClient.ResultsReady), ((IMultiplayerClient)this).ResultsReady);
connection.On<int, IEnumerable<APIMod>>(nameof(IMultiplayerClient.UserModsChanged), ((IMultiplayerClient)this).UserModsChanged);
connection.Closed += async ex =>
>>>>>>>
try |
<<<<<<<
Playlist.BindCollectionChanged(onPlaylistChanged, true);
=======
>>>>>>> |
<<<<<<<
case HitResult.Ok:
return useStrongExplosion(judgedObject)
? TaikoSkinComponents.TaikoExplosionOkStrong
: TaikoSkinComponents.TaikoExplosionOk;
=======
case HitResult.Good:
return TaikoSkinComponents.TaikoExplosionGood;
>>>>>>>
case HitResult.Ok:
return TaikoSkinComponents.TaikoExplosionOk; |
<<<<<<<
protected override void OnDisplaying(TextArea element, ElementDisplayingContext context) {
context.ElementShape.TokenizedValue = _tokenizer.Replace(element.RuntimeValue, null);
=======
protected override void OnDisplaying(TextArea element, ElementDisplayContext context) {
context.ElementShape.ProcessedName = _tokenizer.Replace(element.Name, context.GetTokenData());
context.ElementShape.ProcessedLabel = _tokenizer.Replace(element.Label, context.GetTokenData());
context.ElementShape.ProcessedValue = _tokenizer.Replace(element.RuntimeValue, context.GetTokenData());
>>>>>>>
protected override void OnDisplaying(TextArea element, ElementDisplayingContext context) {
context.ElementShape.ProcessedName = _tokenizer.Replace(element.Name, context.GetTokenData());
context.ElementShape.ProcessedLabel = _tokenizer.Replace(element.Label, context.GetTokenData());
context.ElementShape.ProcessedValue = _tokenizer.Replace(element.RuntimeValue, context.GetTokenData()); |
<<<<<<<
private CancellationTokenSource initialAddSetsTask;
private GameBeatmap beatmap;
=======
>>>>>>>
private GameBeatmap beatmap; |
<<<<<<<
protected override IReadOnlyDependencyContainer CreateLocalDependencies(IReadOnlyDependencyContainer parent)
{
dependencies = new DependencyContainer(base.CreateLocalDependencies(parent));
dependencies.CacheAs(this);
dependencies.CacheAs(Ruleset);
dependencies.CacheAs<IBindable<RulesetInfo>>(Ruleset);
return dependencies;
}
=======
protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)
=> dependencies = new DependencyContainer(base.CreateChildDependencies(parent));
>>>>>>>
protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)
{
dependencies = new DependencyContainer(base.CreateChildDependencies(parent));
dependencies.CacheAs(this);
dependencies.CacheAs(Ruleset);
dependencies.CacheAs<IBindable<RulesetInfo>>(Ruleset);
return dependencies;
}
<<<<<<<
// manual binding to parent ruleset to allow for delayed load in the incoming direction.
base.Ruleset.ValueChanged += r => updateSelectedBeatmap(beatmapNoDebounce);
Ruleset.ValueChanged += r => base.Ruleset.Value = r;
=======
dependencies.CacheAs(this);
dependencies.CacheAs(Ruleset);
dependencies.CacheAs<IBindable<RulesetInfo>>(Ruleset);
>>>>>>>
// manual binding to parent ruleset to allow for delayed load in the incoming direction.
base.Ruleset.ValueChanged += r => updateSelectedBeatmap(beatmapNoDebounce);
Ruleset.ValueChanged += r => base.Ruleset.Value = r;
dependencies.CacheAs(this);
dependencies.CacheAs(Ruleset);
dependencies.CacheAs<IBindable<RulesetInfo>>(Ruleset); |
<<<<<<<
case TaikoSkinComponents.TaikoExplosionOk:
case TaikoSkinComponents.TaikoExplosionOkStrong:
=======
case TaikoSkinComponents.TaikoExplosionMiss:
var missSprite = this.GetAnimation(getHitName(taikoComponent.Component), true, false);
if (missSprite != null)
return new LegacyHitExplosion(missSprite);
return null;
case TaikoSkinComponents.TaikoExplosionGood:
>>>>>>>
case TaikoSkinComponents.TaikoExplosionMiss:
var missSprite = this.GetAnimation(getHitName(taikoComponent.Component), true, false);
if (missSprite != null)
return new LegacyHitExplosion(missSprite);
return null;
case TaikoSkinComponents.TaikoExplosionOk:
<<<<<<<
case TaikoSkinComponents.TaikoExplosionOkStrong:
return "taiko-hit100k";
=======
>>>>>>> |
<<<<<<<
using osu.Game.Online.Rooms;
=======
using osu.Game.Rulesets.Mods;
using osu.Game.Rulesets.Osu.Mods;
>>>>>>>
using osu.Game.Online.Rooms;
using osu.Game.Rulesets.Mods;
using osu.Game.Rulesets.Osu.Mods; |
<<<<<<<
base.OnResuming(last);
// required due to https://github.com/ppy/osu-framework/issues/3218
ModSelect.SelectedMods.Disabled = false;
ModSelect.SelectedMods.BindTo(selectedMods);
=======
Carousel.AllowSelection = true;
>>>>>>>
base.OnResuming(last);
// required due to https://github.com/ppy/osu-framework/issues/3218
ModSelect.SelectedMods.Disabled = false;
ModSelect.SelectedMods.BindTo(selectedMods);
Carousel.AllowSelection = true; |
<<<<<<<
var osuFile = await OSharp.Beatmap.OsuFile.ReadFromFileAsync(@"\\?\" + osuFilePath).ConfigureAwait(false);
=======
if (!File.Exists(osuFilePath))
{
return null;
}
var osuFile = await OSharp.Beatmap.OsuFile.ReadFromFileAsync(osuFilePath).ConfigureAwait(false);
>>>>>>>
if (!File.Exists(osuFilePath))
{
return null;
}
var osuFile = await OSharp.Beatmap.OsuFile.ReadFromFileAsync(@"\\?\" + osuFilePath).ConfigureAwait(false); |
<<<<<<<
public static readonly string ApiUserSecretKeyPrefix = "COVID-19-RADAR";
public static readonly string AppName = "COVID-19-RADAR";
=======
public static readonly string ApiUserSecretKeyPrefix = "Bearer";
>>>>>>>
public static readonly string ApiUserSecretKeyPrefix = "Bearer";
public static readonly string AppName = "COVID-19-RADAR"; |
<<<<<<<
=======
/// <summary>
/// HOME γ«ι‘δΌΌγγ¦γγγγΌγ«γ©γ€γΊγγγζεεγζ€η΄’γγΎγγ
/// </summary>
internal static string ButtonHome {
get {
return ResourceManager.GetString("ButtonHome", resourceCulture);
}
}
/// <summary>
/// I want to help γ«ι‘δΌΌγγ¦γγγγΌγ«γ©γ€γΊγγγζεεγζ€η΄’γγΎγγ
/// </summary>
>>>>>>>
/// <summary>
/// HOME γ«ι‘δΌΌγγ¦γγγγΌγ«γ©γ€γΊγγγζεεγζ€η΄’γγΎγγ
/// </summary>
internal static string ButtonHome {
get {
return ResourceManager.GetString("ButtonHome", resourceCulture);
}
}
/// <summary>
/// I want to help γ«ι‘δΌΌγγ¦γγγγΌγ«γ©γ€γΊγγγζεεγζ€η΄’γγΎγγ
/// </summary>
<<<<<<<
internal static string TextContainsDescriptionOfConsent1 {
=======
/// <summary>
/// Detected Beacon List γ«ι‘δΌΌγγ¦γγγγΌγ«γ©γ€γΊγγγζεεγζ€η΄’γγΎγγ
/// </summary>
internal static string DetectedBeaconListMenu {
get {
return ResourceManager.GetString("DetectedBeaconListMenu", resourceCulture);
}
}
/// <summary>
/// HOME γ«ι‘δΌΌγγ¦γγγγΌγ«γ©γ€γΊγγγζεεγζ€η΄’γγΎγγ
/// </summary>
internal static string HomeTitle {
>>>>>>>
/// <summary>
/// Detected Beacon List γ«ι‘δΌΌγγ¦γγγγΌγ«γ©γ€γΊγγγζεεγζ€η΄’γγΎγγ
/// </summary>
internal static string DetectedBeaconListMenu {
get {
return ResourceManager.GetString("DetectedBeaconListMenu", resourceCulture);
}
}
/// <summary>
/// HOME γ«ι‘δΌΌγγ¦γγγγΌγ«γ©γ€γΊγγγζεεγζ€η΄’γγΎγγ
/// </summary>
internal static string HomeTitle {
internal static string TextContainsDescriptionOfConsent1 {
<<<<<<<
internal static string TextContainsDescriptionOfConsent2 {
=======
/// <summary>
/// License Agreement Menu γ«ι‘δΌΌγγ¦γγγγΌγ«γ©γ€γΊγγγζεεγζ€η΄’γγΎγγ
/// </summary>
internal static string LicenseAgreementMenu {
get {
return ResourceManager.GetString("LicenseAgreementMenu", resourceCulture);
}
}
/// <summary>
/// List of Contributors γ«ι‘δΌΌγγ¦γγγγΌγ«γ©γ€γΊγγγζεεγζ€η΄’γγΎγγ
/// </summary>
internal static string ListOfContributorsMenu {
>>>>>>>
/// <summary>
/// License Agreement Menu γ«ι‘δΌΌγγ¦γγγγΌγ«γ©γ€γΊγγγζεεγζ€η΄’γγΎγγ
/// </summary>
internal static string LicenseAgreementMenu {
get {
return ResourceManager.GetString("LicenseAgreementMenu", resourceCulture);
}
}
/// <summary>
/// List of Contributors γ«ι‘δΌΌγγ¦γγγγΌγ«γ©γ€γΊγγγζεεγζ€η΄’γγΎγγ
/// </summary>
internal static string ListOfContributorsMenu {
internal static string TextContainsDescriptionOfConsent2 {
<<<<<<<
internal static string ButtonRegister {
=======
/// <summary>
/// 090-1234-4567 γ«ι‘δΌΌγγ¦γγγγΌγ«γ©γ€γΊγγγζεεγζ€η΄’γγΎγγ
/// </summary>
internal static string TextPhoneNumberPlaceholder {
get {
return ResourceManager.GetString("TextPhoneNumberPlaceholder", resourceCulture);
}
}
/// <summary>
/// Protecting our loved ones from COVID19 γ«ι‘δΌΌγγ¦γγγγΌγ«γ©γ€γΊγγγζεεγζ€η΄’γγΎγγ
/// </summary>
internal static string TextProtectingOurLovedOnes {
>>>>>>>
/// <summary>
/// 090-1234-4567 γ«ι‘δΌΌγγ¦γγγγΌγ«γ©γ€γΊγγγζεεγζ€η΄’γγΎγγ
/// </summary>
internal static string TextPhoneNumberPlaceholder {
get {
return ResourceManager.GetString("TextPhoneNumberPlaceholder", resourceCulture);
}
}
/// <summary>
/// Protecting our loved ones from COVID19 γ«ι‘δΌΌγγ¦γγγγΌγ«γ©γ€γΊγγγζεεγζ€η΄’γγΎγγ
/// </summary>
internal static string TextProtectingOurLovedOnes {
internal static string ButtonRegister {
<<<<<<<
internal static string ButtonAgree {
=======
/// <summary>
/// If you received a positive diagnosis, please enter your mobile number and update your status to protect your loved ones. γ«ι‘δΌΌγγ¦γγγγΌγ«γ©γ€γΊγγγζεεγζ€η΄’γγΎγγ
/// </summary>
internal static string TextStatusSettingsDescription {
get {
return ResourceManager.GetString("TextStatusSettingsDescription", resourceCulture);
}
}
/// <summary>
/// Enter the mobile number γ«ι‘δΌΌγγ¦γγγγΌγ«γ©γ€γΊγγγζεεγζ€η΄’γγΎγγ
/// </summary>
internal static string TextStatusSettingsEnterNumber {
get {
return ResourceManager.GetString("TextStatusSettingsEnterNumber", resourceCulture);
}
}
/// <summary>
/// We'll send you a verification code.
///Please check your SMS. γ«ι‘δΌΌγγ¦γγγγΌγ«γ©γ€γΊγγγζεεγζ€η΄’γγΎγγ
/// </summary>
internal static string TextStatusSettingsSMSDescription {
get {
return ResourceManager.GetString("TextStatusSettingsSMSDescription", resourceCulture);
}
}
/// <summary>
/// β» We will not store your phone number. It will be sent directly to the database of the government. γ«ι‘δΌΌγγ¦γγγγΌγ«γ©γ€γΊγγγζεεγζ€η΄’γγΎγγ
/// </summary>
internal static string TextStatusSettingsSMSInfo {
get {
return ResourceManager.GetString("TextStatusSettingsSMSInfo", resourceCulture);
}
}
/// <summary>
/// If you received a positive diagnosis γ«ι‘δΌΌγγ¦γγγγΌγ«γ©γ€γΊγγγζεεγζ€η΄’γγΎγγ
/// </summary>
internal static string TextStatusSettingsSubtitle {
get {
return ResourceManager.GetString("TextStatusSettingsSubtitle", resourceCulture);
}
}
/// <summary>
/// No need to input personal information. We are using unique ID, allocated to you when installing an app. γ«ι‘δΌΌγγ¦γγγγΌγ«γ©γ€γΊγγγζεεγζ€η΄’γγΎγγ
/// </summary>
internal static string TextStep1Description {
>>>>>>>
/// <summary>
/// If you received a positive diagnosis, please enter your mobile number and update your status to protect your loved ones. γ«ι‘δΌΌγγ¦γγγγΌγ«γ©γ€γΊγγγζεεγζ€η΄’γγΎγγ
/// </summary>
internal static string TextStatusSettingsDescription {
get {
return ResourceManager.GetString("TextStatusSettingsDescription", resourceCulture);
}
}
/// <summary>
/// Enter the mobile number γ«ι‘δΌΌγγ¦γγγγΌγ«γ©γ€γΊγγγζεεγζ€η΄’γγΎγγ
/// </summary>
internal static string TextStatusSettingsEnterNumber {
get {
return ResourceManager.GetString("TextStatusSettingsEnterNumber", resourceCulture);
}
}
/// <summary>
/// We'll send you a verification code.
///Please check your SMS. γ«ι‘δΌΌγγ¦γγγγΌγ«γ©γ€γΊγγγζεεγζ€η΄’γγΎγγ
/// </summary>
internal static string TextStatusSettingsSMSDescription {
get {
return ResourceManager.GetString("TextStatusSettingsSMSDescription", resourceCulture);
}
}
/// <summary>
/// β» We will not store your phone number. It will be sent directly to the database of the government. γ«ι‘δΌΌγγ¦γγγγΌγ«γ©γ€γΊγγγζεεγζ€η΄’γγΎγγ
/// </summary>
internal static string TextStatusSettingsSMSInfo {
get {
return ResourceManager.GetString("TextStatusSettingsSMSInfo", resourceCulture);
}
}
/// <summary>
/// If you received a positive diagnosis γ«ι‘δΌΌγγ¦γγγγΌγ«γ©γ€γΊγγγζεεγζ€η΄’γγΎγγ
/// </summary>
internal static string TextStatusSettingsSubtitle {
get {
return ResourceManager.GetString("TextStatusSettingsSubtitle", resourceCulture);
}
}
/// <summary>
/// No need to input personal information. We are using unique ID, allocated to you when installing an app. γ«ι‘δΌΌγγ¦γγγγΌγ«γ©γ€γΊγγγζεεγζ€η΄’γγΎγγ
/// </summary>
internal static string TextStep1Description {
internal static string ButtonAgree {
<<<<<<<
internal static string ListOfContributorsMenu {
=======
/// <summary>
/// You're ready to go γ«ι‘δΌΌγγ¦γγγγΌγ«γ©γ€γΊγγγζεεγζ€η΄’γγΎγγ
/// </summary>
internal static string TextYoureReadyToGo {
get {
return ResourceManager.GetString("TextYoureReadyToGo", resourceCulture);
}
}
/// <summary>
/// App Description γ«ι‘δΌΌγγ¦γγγγΌγ«γ©γ€γΊγγγζεεγζ€η΄’γγΎγγ
/// </summary>
internal static string TitleAppDescription {
>>>>>>>
/// <summary>
/// You're ready to go γ«ι‘δΌΌγγ¦γγγγΌγ«γ©γ€γΊγγγζεεγζ€η΄’γγΎγγ
/// </summary>
internal static string TextYoureReadyToGo {
get {
return ResourceManager.GetString("TextYoureReadyToGo", resourceCulture);
}
}
/// <summary>
/// App Description γ«ι‘δΌΌγγ¦γγγγΌγ«γ©γ€γΊγγγζεεγζ€η΄’γγΎγγ
/// </summary>
internal static string TitleAppDescription {
internal static string ListOfContributorsMenu {
<<<<<<<
internal static string ButtonVerify {
=======
/// <summary>
/// Set up Completed γ«ι‘δΌΌγγ¦γγγγΌγ«γ©γ€γΊγγγζεεγζ€η΄’γγΎγγ
/// </summary>
internal static string TitleSetupCompleted {
get {
return ResourceManager.GetString("TitleSetupCompleted", resourceCulture);
}
}
/// <summary>
/// Status Settings γ«ι‘δΌΌγγ¦γγγγΌγ«γ©γ€γΊγγγζεεγζ€η΄’γγΎγγ
/// </summary>
internal static string TitleStatusSettings {
get {
return ResourceManager.GetString("TitleStatusSettings", resourceCulture);
}
}
/// <summary>
/// Update Information γ«ι‘δΌΌγγ¦γγγγΌγ«γ©γ€γΊγγγζεεγζ€η΄’γγΎγγ
/// </summary>
internal static string UpdateInformationMenu {
>>>>>>>
/// <summary>
/// Set up Completed γ«ι‘δΌΌγγ¦γγγγΌγ«γ©γ€γΊγγγζεεγζ€η΄’γγΎγγ
/// </summary>
internal static string TitleSetupCompleted {
get {
return ResourceManager.GetString("TitleSetupCompleted", resourceCulture);
}
}
/// <summary>
/// Status Settings γ«ι‘δΌΌγγ¦γγγγΌγ«γ©γ€γΊγγγζεεγζ€η΄’γγΎγγ
/// </summary>
internal static string TitleStatusSettings {
get {
return ResourceManager.GetString("TitleStatusSettings", resourceCulture);
}
}
/// <summary>
/// Update Information γ«ι‘δΌΌγγ¦γγγγΌγ«γ©γ€γΊγγγζεεγζ€η΄’γγΎγγ
/// </summary>
internal static string UpdateInformationMenu {
internal static string ButtonVerify { |
<<<<<<<
=======
/// <summary>
/// HOME γ«ι‘δΌΌγγ¦γγγγΌγ«γ©γ€γΊγγγζεεγζ€η΄’γγΎγγ
/// </summary>
internal static string ButtonHome {
get {
return ResourceManager.GetString("ButtonHome", resourceCulture);
}
}
/// <summary>
/// I want to help γ«ι‘δΌΌγγ¦γγγγΌγ«γ©γ€γΊγγγζεεγζ€η΄’γγΎγγ
/// </summary>
>>>>>>>
/// <summary>
/// HOME γ«ι‘δΌΌγγ¦γγγγΌγ«γ©γ€γΊγγγζεεγζ€η΄’γγΎγγ
/// </summary>
internal static string ButtonHome {
get {
return ResourceManager.GetString("ButtonHome", resourceCulture);
}
}
/// <summary>
/// I want to help γ«ι‘δΌΌγγ¦γγγγΌγ«γ©γ€γΊγγγζεεγζ€η΄’γγΎγγ
/// </summary>
<<<<<<<
internal static string TextContainsDescriptionOfConsent1 {
=======
/// <summary>
/// Detected Beacon List γ«ι‘δΌΌγγ¦γγγγΌγ«γ©γ€γΊγγγζεεγζ€η΄’γγΎγγ
/// </summary>
internal static string DetectedBeaconListMenu {
get {
return ResourceManager.GetString("DetectedBeaconListMenu", resourceCulture);
}
}
/// <summary>
/// HOME γ«ι‘δΌΌγγ¦γγγγΌγ«γ©γ€γΊγγγζεεγζ€η΄’γγΎγγ
/// </summary>
internal static string HomeTitle {
>>>>>>>
/// <summary>
/// Detected Beacon List γ«ι‘δΌΌγγ¦γγγγΌγ«γ©γ€γΊγγγζεεγζ€η΄’γγΎγγ
/// </summary>
internal static string DetectedBeaconListMenu {
get {
return ResourceManager.GetString("DetectedBeaconListMenu", resourceCulture);
}
}
/// <summary>
/// HOME γ«ι‘δΌΌγγ¦γγγγΌγ«γ©γ€γΊγγγζεεγζ€η΄’γγΎγγ
/// </summary>
internal static string HomeTitle {
internal static string TextContainsDescriptionOfConsent1 {
<<<<<<<
internal static string TextContainsDescriptionOfConsent2 {
=======
/// <summary>
/// License Agreement Menu γ«ι‘δΌΌγγ¦γγγγΌγ«γ©γ€γΊγγγζεεγζ€η΄’γγΎγγ
/// </summary>
internal static string LicenseAgreementMenu {
get {
return ResourceManager.GetString("LicenseAgreementMenu", resourceCulture);
}
}
/// <summary>
/// List of Contributors γ«ι‘δΌΌγγ¦γγγγΌγ«γ©γ€γΊγγγζεεγζ€η΄’γγΎγγ
/// </summary>
internal static string ListOfContributorsMenu {
>>>>>>>
/// <summary>
/// License Agreement Menu γ«ι‘δΌΌγγ¦γγγγΌγ«γ©γ€γΊγγγζεεγζ€η΄’γγΎγγ
/// </summary>
internal static string LicenseAgreementMenu {
get {
return ResourceManager.GetString("LicenseAgreementMenu", resourceCulture);
}
}
/// <summary>
/// List of Contributors γ«ι‘δΌΌγγ¦γγγγΌγ«γ©γ€γΊγγγζεεγζ€η΄’γγΎγγ
/// </summary>
internal static string ListOfContributorsMenu {
internal static string TextContainsDescriptionOfConsent2 {
<<<<<<<
internal static string ButtonRegister {
=======
/// <summary>
/// 090-1234-4567 γ«ι‘δΌΌγγ¦γγγγΌγ«γ©γ€γΊγγγζεεγζ€η΄’γγΎγγ
/// </summary>
internal static string TextPhoneNumberPlaceholder {
get {
return ResourceManager.GetString("TextPhoneNumberPlaceholder", resourceCulture);
}
}
/// <summary>
/// Protecting our loved ones from COVID19 γ«ι‘δΌΌγγ¦γγγγΌγ«γ©γ€γΊγγγζεεγζ€η΄’γγΎγγ
/// </summary>
internal static string TextProtectingOurLovedOnes {
>>>>>>>
/// <summary>
/// 090-1234-4567 γ«ι‘δΌΌγγ¦γγγγΌγ«γ©γ€γΊγγγζεεγζ€η΄’γγΎγγ
/// </summary>
internal static string TextPhoneNumberPlaceholder {
get {
return ResourceManager.GetString("TextPhoneNumberPlaceholder", resourceCulture);
}
}
/// <summary>
/// Protecting our loved ones from COVID19 γ«ι‘δΌΌγγ¦γγγγΌγ«γ©γ€γΊγγγζεεγζ€η΄’γγΎγγ
/// </summary>
internal static string TextProtectingOurLovedOnes {
internal static string ButtonRegister {
<<<<<<<
internal static string ButtonAgree {
=======
/// <summary>
/// If you received a positive diagnosis, please enter your mobile number and update your status to protect your loved ones. γ«ι‘δΌΌγγ¦γγγγΌγ«γ©γ€γΊγγγζεεγζ€η΄’γγΎγγ
/// </summary>
internal static string TextStatusSettingsDescription {
get {
return ResourceManager.GetString("TextStatusSettingsDescription", resourceCulture);
}
}
/// <summary>
/// Enter the mobile number γ«ι‘δΌΌγγ¦γγγγΌγ«γ©γ€γΊγγγζεεγζ€η΄’γγΎγγ
/// </summary>
internal static string TextStatusSettingsEnterNumber {
get {
return ResourceManager.GetString("TextStatusSettingsEnterNumber", resourceCulture);
}
}
/// <summary>
/// We'll send you a verification code.
///Please check your SMS. γ«ι‘δΌΌγγ¦γγγγΌγ«γ©γ€γΊγγγζεεγζ€η΄’γγΎγγ
/// </summary>
internal static string TextStatusSettingsSMSDescription {
get {
return ResourceManager.GetString("TextStatusSettingsSMSDescription", resourceCulture);
}
}
/// <summary>
/// β» We will not store your phone number. It will be sent directly to the database of the government. γ«ι‘δΌΌγγ¦γγγγΌγ«γ©γ€γΊγγγζεεγζ€η΄’γγΎγγ
/// </summary>
internal static string TextStatusSettingsSMSInfo {
get {
return ResourceManager.GetString("TextStatusSettingsSMSInfo", resourceCulture);
}
}
/// <summary>
/// If you received a positive diagnosis γ«ι‘δΌΌγγ¦γγγγΌγ«γ©γ€γΊγγγζεεγζ€η΄’γγΎγγ
/// </summary>
internal static string TextStatusSettingsSubtitle {
get {
return ResourceManager.GetString("TextStatusSettingsSubtitle", resourceCulture);
}
}
/// <summary>
/// No need to input personal information. We are using unique ID, allocated to you when installing an app. γ«ι‘δΌΌγγ¦γγγγΌγ«γ©γ€γΊγγγζεεγζ€η΄’γγΎγγ
/// </summary>
internal static string TextStep1Description {
>>>>>>>
/// <summary>
/// If you received a positive diagnosis, please enter your mobile number and update your status to protect your loved ones. γ«ι‘δΌΌγγ¦γγγγΌγ«γ©γ€γΊγγγζεεγζ€η΄’γγΎγγ
/// </summary>
internal static string TextStatusSettingsDescription {
get {
return ResourceManager.GetString("TextStatusSettingsDescription", resourceCulture);
}
}
/// <summary>
/// Enter the mobile number γ«ι‘δΌΌγγ¦γγγγΌγ«γ©γ€γΊγγγζεεγζ€η΄’γγΎγγ
/// </summary>
internal static string TextStatusSettingsEnterNumber {
get {
return ResourceManager.GetString("TextStatusSettingsEnterNumber", resourceCulture);
}
}
/// <summary>
/// We'll send you a verification code.
///Please check your SMS. γ«ι‘δΌΌγγ¦γγγγΌγ«γ©γ€γΊγγγζεεγζ€η΄’γγΎγγ
/// </summary>
internal static string TextStatusSettingsSMSDescription {
get {
return ResourceManager.GetString("TextStatusSettingsSMSDescription", resourceCulture);
}
}
/// <summary>
/// β» We will not store your phone number. It will be sent directly to the database of the government. γ«ι‘δΌΌγγ¦γγγγΌγ«γ©γ€γΊγγγζεεγζ€η΄’γγΎγγ
/// </summary>
internal static string TextStatusSettingsSMSInfo {
get {
return ResourceManager.GetString("TextStatusSettingsSMSInfo", resourceCulture);
}
}
/// <summary>
/// If you received a positive diagnosis γ«ι‘δΌΌγγ¦γγγγΌγ«γ©γ€γΊγγγζεεγζ€η΄’γγΎγγ
/// </summary>
internal static string TextStatusSettingsSubtitle {
get {
return ResourceManager.GetString("TextStatusSettingsSubtitle", resourceCulture);
}
}
/// <summary>
/// No need to input personal information. We are using unique ID, allocated to you when installing an app. γ«ι‘δΌΌγγ¦γγγγΌγ«γ©γ€γΊγγγζεεγζ€η΄’γγΎγγ
/// </summary>
internal static string TextStep1Description {
internal static string ButtonAgree {
<<<<<<<
internal static string ListOfContributorsMenu {
=======
/// <summary>
/// You're ready to go γ«ι‘δΌΌγγ¦γγγγΌγ«γ©γ€γΊγγγζεεγζ€η΄’γγΎγγ
/// </summary>
internal static string TextYoureReadyToGo {
get {
return ResourceManager.GetString("TextYoureReadyToGo", resourceCulture);
}
}
/// <summary>
/// App Description γ«ι‘δΌΌγγ¦γγγγΌγ«γ©γ€γΊγγγζεεγζ€η΄’γγΎγγ
/// </summary>
internal static string TitleAppDescription {
>>>>>>>
/// <summary>
/// You're ready to go γ«ι‘δΌΌγγ¦γγγγΌγ«γ©γ€γΊγγγζεεγζ€η΄’γγΎγγ
/// </summary>
internal static string TextYoureReadyToGo {
get {
return ResourceManager.GetString("TextYoureReadyToGo", resourceCulture);
}
}
/// <summary>
/// App Description γ«ι‘δΌΌγγ¦γγγγΌγ«γ©γ€γΊγγγζεεγζ€η΄’γγΎγγ
/// </summary>
internal static string TitleAppDescription {
internal static string ListOfContributorsMenu {
<<<<<<<
internal static string ButtonVerify {
=======
/// <summary>
/// Set up Completed γ«ι‘δΌΌγγ¦γγγγΌγ«γ©γ€γΊγγγζεεγζ€η΄’γγΎγγ
/// </summary>
internal static string TitleSetupCompleted {
get {
return ResourceManager.GetString("TitleSetupCompleted", resourceCulture);
}
}
/// <summary>
/// Status Settings γ«ι‘δΌΌγγ¦γγγγΌγ«γ©γ€γΊγγγζεεγζ€η΄’γγΎγγ
/// </summary>
internal static string TitleStatusSettings {
get {
return ResourceManager.GetString("TitleStatusSettings", resourceCulture);
}
}
/// <summary>
/// Update Information γ«ι‘δΌΌγγ¦γγγγΌγ«γ©γ€γΊγγγζεεγζ€η΄’γγΎγγ
/// </summary>
internal static string UpdateInformationMenu {
>>>>>>>
/// <summary>
/// Set up Completed γ«ι‘δΌΌγγ¦γγγγΌγ«γ©γ€γΊγγγζεεγζ€η΄’γγΎγγ
/// </summary>
internal static string TitleSetupCompleted {
get {
return ResourceManager.GetString("TitleSetupCompleted", resourceCulture);
}
}
/// <summary>
/// Status Settings γ«ι‘δΌΌγγ¦γγγγΌγ«γ©γ€γΊγγγζεεγζ€η΄’γγΎγγ
/// </summary>
internal static string TitleStatusSettings {
get {
return ResourceManager.GetString("TitleStatusSettings", resourceCulture);
}
}
/// <summary>
/// Update Information γ«ι‘δΌΌγγ¦γγγγΌγ«γ©γ€γΊγγγζεεγζ€η΄’γγΎγγ
/// </summary>
internal static string UpdateInformationMenu {
internal static string ButtonVerify { |
<<<<<<<
public string TextUserAgreement { get; set; }
public string TextContainsDescriptionOfConsent1 { get; set; }
public string TextContainsDescriptionOfConsent2 { get; set; }
public string ButtonAgreeAndProceed { get; set; }
=======
private UserDataService _userDataService;
>>>>>>>
private UserDataService _userDataService;
public string TextUserAgreement { get; set; }
public string TextContainsDescriptionOfConsent1 { get; set; }
public string TextContainsDescriptionOfConsent2 { get; set; }
public string ButtonAgreeAndProceed { get; set; }
<<<<<<<
Title = Resx.AppResources.TitleConsentByUserPage;
TextUserAgreement = Resx.AppResources.TextUserAgreement;
TextContainsDescriptionOfConsent1 = Resx.AppResources.TextContainsDescriptionOfConsent1;
TextContainsDescriptionOfConsent2 = Resx.AppResources.TextContainsDescriptionOfConsent2;
ButtonAgreeAndProceed = Resx.AppResources.ButtonAgreeAndProceed;
=======
Title = "Consent by user page";
_userDataService = App.Current.Container.Resolve<UserDataService>();
>>>>>>>
Title = Resx.AppResources.TitleConsentByUserPage;
_userDataService = App.Current.Container.Resolve<UserDataService>();
TextUserAgreement = Resx.AppResources.TextUserAgreement;
TextContainsDescriptionOfConsent1 = Resx.AppResources.TextContainsDescriptionOfConsent1;
TextContainsDescriptionOfConsent2 = Resx.AppResources.TextContainsDescriptionOfConsent2;
ButtonAgreeAndProceed = Resx.AppResources.ButtonAgreeAndProceed; |
<<<<<<<
/// Looks up a localized string similar to Start.
/// </summary>
internal static string ButtonStart {
get {
return ResourceManager.GetString("ButtonStart", resourceCulture);
}
}
/// <summary>
=======
/// Looks up a localized string similar to This app uses Bluetooth signals to determine if you are near another contact tracing app user.
///Select 'Always Allow' to set up Bluetooth..
/// </summary>
internal static string TextBluetoothDescription {
get {
return ResourceManager.GetString("TextBluetoothDescription", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Allow Bluetooth.
/// </summary>
internal static string TextBluetoothTitle {
get {
return ResourceManager.GetString("TextBluetoothTitle", resourceCulture);
}
}
/// <summary>
>>>>>>>
/// Looks up a localized string similar to Start.
/// </summary>
internal static string ButtonStart {
get {
return ResourceManager.GetString("ButtonStart", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to This app uses Bluetooth signals to determine if you are near another contact tracing app user.
///Select 'Always Allow' to set up Bluetooth..
/// </summary>
internal static string TextBluetoothDescription {
get {
return ResourceManager.GetString("TextBluetoothDescription", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Allow Bluetooth.
/// </summary>
internal static string TextBluetoothTitle {
get {
return ResourceManager.GetString("TextBluetoothTitle", resourceCulture);
}
}
/// <summary> |
<<<<<<<
ο»Ώusing Covid19Radar.Resources;
using Prism.Navigation;
=======
ο»Ώusing Covid19Radar.Renderers;
using Covid19Radar.Views;
using Prism.Navigation;
>>>>>>>
ο»Ώusing Covid19Radar.Resources;
using Covid19Radar.Renderers;
using Covid19Radar.Views;
using Prism.Navigation; |
<<<<<<<
{
private INavigationService _navigationService;
private IBeaconService _beaconService;
private ObservableCollection<BeaconDataModel> _beaconDataList;
public ObservableCollection<BeaconDataModel> BeaconDataList
{
get => _beaconDataList;
set => SetProperty(ref _beaconDataList, value);
}
public DetectedBeaconPageViewmodel(INavigationService navigationService, IBeaconService beaconService)
=======
{
public List<BeaconDataModel> Beacons { get; set; }
public DetectedBeaconPageViewmodel(INavigationService navigationService)
>>>>>>>
{
public List<BeaconDataModel> Beacons { get; set; }
private IBeaconService _beaconService;
private ObservableCollection<BeaconDataModel> _beaconDataList;
public ObservableCollection<BeaconDataModel> BeaconDataList
{
get => _beaconDataList;
set => SetProperty(ref _beaconDataList, value);
}
public DetectedBeaconPageViewmodel(INavigationService navigationService, IBeaconService beaconService) |
<<<<<<<
public string TextUserAgreement { get; set; }
public string TextContainsDescriptionOfConsent1 { get; set; }
public string TextContainsDescriptionOfConsent2 { get; set; }
public string ButtonAgreeAndProceed { get; set; }
=======
private UserDataService _userDataService;
>>>>>>>
private UserDataService _userDataService;
public string TextUserAgreement { get; set; }
public string TextContainsDescriptionOfConsent1 { get; set; }
public string TextContainsDescriptionOfConsent2 { get; set; }
public string ButtonAgreeAndProceed { get; set; }
<<<<<<<
Title = Resx.AppResources.TitleConsentByUserPage;
TextUserAgreement = Resx.AppResources.TextUserAgreement;
TextContainsDescriptionOfConsent1 = Resx.AppResources.TextContainsDescriptionOfConsent1;
TextContainsDescriptionOfConsent2 = Resx.AppResources.TextContainsDescriptionOfConsent2;
ButtonAgreeAndProceed = Resx.AppResources.ButtonAgreeAndProceed;
=======
Title = "Consent by user page";
_userDataService = App.Current.Container.Resolve<UserDataService>();
>>>>>>>
Title = Resx.AppResources.TitleConsentByUserPage;
_userDataService = App.Current.Container.Resolve<UserDataService>();
TextUserAgreement = Resx.AppResources.TextUserAgreement;
TextContainsDescriptionOfConsent1 = Resx.AppResources.TextContainsDescriptionOfConsent1;
TextContainsDescriptionOfConsent2 = Resx.AppResources.TextContainsDescriptionOfConsent2;
ButtonAgreeAndProceed = Resx.AppResources.ButtonAgreeAndProceed; |
<<<<<<<
public static readonly string ApiUserSecretKeyPrefix = "COVID-19-RADAR";
public static readonly string AppName = "COVID-19-RADAR";
=======
public static readonly string ApiUserSecretKeyPrefix = "Bearer";
>>>>>>>
public static readonly string ApiUserSecretKeyPrefix = "Bearer";
public static readonly string AppName = "COVID-19-RADAR"; |
<<<<<<<
=======
/// <summary>
/// HOME γ«ι‘δΌΌγγ¦γγγγΌγ«γ©γ€γΊγγγζεεγζ€η΄’γγΎγγ
/// </summary>
internal static string ButtonHome {
get {
return ResourceManager.GetString("ButtonHome", resourceCulture);
}
}
/// <summary>
/// I want to help γ«ι‘δΌΌγγ¦γγγγΌγ«γ©γ€γΊγγγζεεγζ€η΄’γγΎγγ
/// </summary>
>>>>>>>
/// <summary>
/// HOME γ«ι‘δΌΌγγ¦γγγγΌγ«γ©γ€γΊγγγζεεγζ€η΄’γγΎγγ
/// </summary>
internal static string ButtonHome {
get {
return ResourceManager.GetString("ButtonHome", resourceCulture);
}
}
/// <summary>
/// I want to help γ«ι‘δΌΌγγ¦γγγγΌγ«γ©γ€γΊγγγζεεγζ€η΄’γγΎγγ
/// </summary>
<<<<<<<
internal static string TextContainsDescriptionOfConsent1 {
=======
/// <summary>
/// Detected Beacon List γ«ι‘δΌΌγγ¦γγγγΌγ«γ©γ€γΊγγγζεεγζ€η΄’γγΎγγ
/// </summary>
internal static string DetectedBeaconListMenu {
get {
return ResourceManager.GetString("DetectedBeaconListMenu", resourceCulture);
}
}
/// <summary>
/// HOME γ«ι‘δΌΌγγ¦γγγγΌγ«γ©γ€γΊγγγζεεγζ€η΄’γγΎγγ
/// </summary>
internal static string HomeTitle {
>>>>>>>
/// <summary>
/// Detected Beacon List γ«ι‘δΌΌγγ¦γγγγΌγ«γ©γ€γΊγγγζεεγζ€η΄’γγΎγγ
/// </summary>
internal static string DetectedBeaconListMenu {
get {
return ResourceManager.GetString("DetectedBeaconListMenu", resourceCulture);
}
}
/// <summary>
/// HOME γ«ι‘δΌΌγγ¦γγγγΌγ«γ©γ€γΊγγγζεεγζ€η΄’γγΎγγ
/// </summary>
internal static string HomeTitle {
internal static string TextContainsDescriptionOfConsent1 {
<<<<<<<
internal static string TextContainsDescriptionOfConsent2 {
=======
/// <summary>
/// License Agreement Menu γ«ι‘δΌΌγγ¦γγγγΌγ«γ©γ€γΊγγγζεεγζ€η΄’γγΎγγ
/// </summary>
internal static string LicenseAgreementMenu {
get {
return ResourceManager.GetString("LicenseAgreementMenu", resourceCulture);
}
}
/// <summary>
/// List of Contributors γ«ι‘δΌΌγγ¦γγγγΌγ«γ©γ€γΊγγγζεεγζ€η΄’γγΎγγ
/// </summary>
internal static string ListOfContributorsMenu {
>>>>>>>
/// <summary>
/// License Agreement Menu γ«ι‘δΌΌγγ¦γγγγΌγ«γ©γ€γΊγγγζεεγζ€η΄’γγΎγγ
/// </summary>
internal static string LicenseAgreementMenu {
get {
return ResourceManager.GetString("LicenseAgreementMenu", resourceCulture);
}
}
/// <summary>
/// List of Contributors γ«ι‘δΌΌγγ¦γγγγΌγ«γ©γ€γΊγγγζεεγζ€η΄’γγΎγγ
/// </summary>
internal static string ListOfContributorsMenu {
internal static string TextContainsDescriptionOfConsent2 {
<<<<<<<
internal static string ButtonRegister {
=======
/// <summary>
/// 090-1234-4567 γ«ι‘δΌΌγγ¦γγγγΌγ«γ©γ€γΊγγγζεεγζ€η΄’γγΎγγ
/// </summary>
internal static string TextPhoneNumberPlaceholder {
get {
return ResourceManager.GetString("TextPhoneNumberPlaceholder", resourceCulture);
}
}
/// <summary>
/// Protecting our loved ones from COVID19 γ«ι‘δΌΌγγ¦γγγγΌγ«γ©γ€γΊγγγζεεγζ€η΄’γγΎγγ
/// </summary>
internal static string TextProtectingOurLovedOnes {
>>>>>>>
/// <summary>
/// 090-1234-4567 γ«ι‘δΌΌγγ¦γγγγΌγ«γ©γ€γΊγγγζεεγζ€η΄’γγΎγγ
/// </summary>
internal static string TextPhoneNumberPlaceholder {
get {
return ResourceManager.GetString("TextPhoneNumberPlaceholder", resourceCulture);
}
}
/// <summary>
/// Protecting our loved ones from COVID19 γ«ι‘δΌΌγγ¦γγγγΌγ«γ©γ€γΊγγγζεεγζ€η΄’γγΎγγ
/// </summary>
internal static string TextProtectingOurLovedOnes {
internal static string ButtonRegister {
<<<<<<<
internal static string ButtonAgree {
=======
/// <summary>
/// If you received a positive diagnosis, please enter your mobile number and update your status to protect your loved ones. γ«ι‘δΌΌγγ¦γγγγΌγ«γ©γ€γΊγγγζεεγζ€η΄’γγΎγγ
/// </summary>
internal static string TextStatusSettingsDescription {
get {
return ResourceManager.GetString("TextStatusSettingsDescription", resourceCulture);
}
}
/// <summary>
/// Enter the mobile number γ«ι‘δΌΌγγ¦γγγγΌγ«γ©γ€γΊγγγζεεγζ€η΄’γγΎγγ
/// </summary>
internal static string TextStatusSettingsEnterNumber {
get {
return ResourceManager.GetString("TextStatusSettingsEnterNumber", resourceCulture);
}
}
/// <summary>
/// We'll send you a verification code.
///Please check your SMS. γ«ι‘δΌΌγγ¦γγγγΌγ«γ©γ€γΊγγγζεεγζ€η΄’γγΎγγ
/// </summary>
internal static string TextStatusSettingsSMSDescription {
get {
return ResourceManager.GetString("TextStatusSettingsSMSDescription", resourceCulture);
}
}
/// <summary>
/// β» We will not store your phone number. It will be sent directly to the database of the government. γ«ι‘δΌΌγγ¦γγγγΌγ«γ©γ€γΊγγγζεεγζ€η΄’γγΎγγ
/// </summary>
internal static string TextStatusSettingsSMSInfo {
get {
return ResourceManager.GetString("TextStatusSettingsSMSInfo", resourceCulture);
}
}
/// <summary>
/// If you received a positive diagnosis γ«ι‘δΌΌγγ¦γγγγΌγ«γ©γ€γΊγγγζεεγζ€η΄’γγΎγγ
/// </summary>
internal static string TextStatusSettingsSubtitle {
get {
return ResourceManager.GetString("TextStatusSettingsSubtitle", resourceCulture);
}
}
/// <summary>
/// No need to input personal information. We are using unique ID, allocated to you when installing an app. γ«ι‘δΌΌγγ¦γγγγΌγ«γ©γ€γΊγγγζεεγζ€η΄’γγΎγγ
/// </summary>
internal static string TextStep1Description {
>>>>>>>
/// <summary>
/// If you received a positive diagnosis, please enter your mobile number and update your status to protect your loved ones. γ«ι‘δΌΌγγ¦γγγγΌγ«γ©γ€γΊγγγζεεγζ€η΄’γγΎγγ
/// </summary>
internal static string TextStatusSettingsDescription {
get {
return ResourceManager.GetString("TextStatusSettingsDescription", resourceCulture);
}
}
/// <summary>
/// Enter the mobile number γ«ι‘δΌΌγγ¦γγγγΌγ«γ©γ€γΊγγγζεεγζ€η΄’γγΎγγ
/// </summary>
internal static string TextStatusSettingsEnterNumber {
get {
return ResourceManager.GetString("TextStatusSettingsEnterNumber", resourceCulture);
}
}
/// <summary>
/// We'll send you a verification code.
///Please check your SMS. γ«ι‘δΌΌγγ¦γγγγΌγ«γ©γ€γΊγγγζεεγζ€η΄’γγΎγγ
/// </summary>
internal static string TextStatusSettingsSMSDescription {
get {
return ResourceManager.GetString("TextStatusSettingsSMSDescription", resourceCulture);
}
}
/// <summary>
/// β» We will not store your phone number. It will be sent directly to the database of the government. γ«ι‘δΌΌγγ¦γγγγΌγ«γ©γ€γΊγγγζεεγζ€η΄’γγΎγγ
/// </summary>
internal static string TextStatusSettingsSMSInfo {
get {
return ResourceManager.GetString("TextStatusSettingsSMSInfo", resourceCulture);
}
}
/// <summary>
/// If you received a positive diagnosis γ«ι‘δΌΌγγ¦γγγγΌγ«γ©γ€γΊγγγζεεγζ€η΄’γγΎγγ
/// </summary>
internal static string TextStatusSettingsSubtitle {
get {
return ResourceManager.GetString("TextStatusSettingsSubtitle", resourceCulture);
}
}
/// <summary>
/// No need to input personal information. We are using unique ID, allocated to you when installing an app. γ«ι‘δΌΌγγ¦γγγγΌγ«γ©γ€γΊγγγζεεγζ€η΄’γγΎγγ
/// </summary>
internal static string TextStep1Description {
internal static string ButtonAgree {
<<<<<<<
internal static string ListOfContributorsMenu {
=======
/// <summary>
/// You're ready to go γ«ι‘δΌΌγγ¦γγγγΌγ«γ©γ€γΊγγγζεεγζ€η΄’γγΎγγ
/// </summary>
internal static string TextYoureReadyToGo {
get {
return ResourceManager.GetString("TextYoureReadyToGo", resourceCulture);
}
}
/// <summary>
/// App Description γ«ι‘δΌΌγγ¦γγγγΌγ«γ©γ€γΊγγγζεεγζ€η΄’γγΎγγ
/// </summary>
internal static string TitleAppDescription {
>>>>>>>
/// <summary>
/// You're ready to go γ«ι‘δΌΌγγ¦γγγγΌγ«γ©γ€γΊγγγζεεγζ€η΄’γγΎγγ
/// </summary>
internal static string TextYoureReadyToGo {
get {
return ResourceManager.GetString("TextYoureReadyToGo", resourceCulture);
}
}
/// <summary>
/// App Description γ«ι‘δΌΌγγ¦γγγγΌγ«γ©γ€γΊγγγζεεγζ€η΄’γγΎγγ
/// </summary>
internal static string TitleAppDescription {
internal static string ListOfContributorsMenu {
<<<<<<<
internal static string ButtonVerify {
=======
/// <summary>
/// Set up Completed γ«ι‘δΌΌγγ¦γγγγΌγ«γ©γ€γΊγγγζεεγζ€η΄’γγΎγγ
/// </summary>
internal static string TitleSetupCompleted {
get {
return ResourceManager.GetString("TitleSetupCompleted", resourceCulture);
}
}
/// <summary>
/// Status Settings γ«ι‘δΌΌγγ¦γγγγΌγ«γ©γ€γΊγγγζεεγζ€η΄’γγΎγγ
/// </summary>
internal static string TitleStatusSettings {
get {
return ResourceManager.GetString("TitleStatusSettings", resourceCulture);
}
}
/// <summary>
/// Update Information γ«ι‘δΌΌγγ¦γγγγΌγ«γ©γ€γΊγγγζεεγζ€η΄’γγΎγγ
/// </summary>
internal static string UpdateInformationMenu {
>>>>>>>
/// <summary>
/// Set up Completed γ«ι‘δΌΌγγ¦γγγγΌγ«γ©γ€γΊγγγζεεγζ€η΄’γγΎγγ
/// </summary>
internal static string TitleSetupCompleted {
get {
return ResourceManager.GetString("TitleSetupCompleted", resourceCulture);
}
}
/// <summary>
/// Status Settings γ«ι‘δΌΌγγ¦γγγγΌγ«γ©γ€γΊγγγζεεγζ€η΄’γγΎγγ
/// </summary>
internal static string TitleStatusSettings {
get {
return ResourceManager.GetString("TitleStatusSettings", resourceCulture);
}
}
/// <summary>
/// Update Information γ«ι‘δΌΌγγ¦γγγγΌγ«γ©γ€γΊγγγζεεγζ€η΄’γγΎγγ
/// </summary>
internal static string UpdateInformationMenu {
internal static string ButtonVerify { |
<<<<<<<
.SelectMany(x => x.Count() == 1 ?
Observable.Return(x.First().Value) :
Observable.Throw<byte[]>(new KeyNotFoundException()))
=======
.SelectMany(x => x.Count == 1 ?
Observable.Return(x[0].Value) :
ExceptionHelper.ObservableThrowKeyNotFoundException<byte[]>(key))
>>>>>>>
.SelectMany(x => x.Count() == 1 ?
Observable.Return(x.First().Value) :
ExceptionHelper.ObservableThrowKeyNotFoundException<byte[]>(key))
<<<<<<<
.SelectMany(x => x.Count() == 1 ?
Observable.Return(x.First().Value) :
Observable.Throw<byte[]>(new KeyNotFoundException()))
=======
.SelectMany(x => x.Count == 1 ?
Observable.Return(x[0].Value) :
ExceptionHelper.ObservableThrowKeyNotFoundException<byte[]>(key))
>>>>>>>
.SelectMany(x => x.Count() == 1 ?
Observable.Return(x.First().Value) :
ExceptionHelper.ObservableThrowKeyNotFoundException<byte[]>(key)) |
<<<<<<<
=======
>>>>>>>
<<<<<<<
=======
>>>>>>>
<<<<<<<
=======
>>>>>>>
<<<<<<<
#if ENABLE_DYNAMO_SCHEDULER
=======
revitDynamoModel.PackageManagerClient.RequestAuthentication +=
SingleSignOnManager.RegisterSingleSignOn;
>>>>>>> |
<<<<<<<
using Orchard.Core.Common.Models;
using Orchard.Environment.Features;
=======
using Orchard.Themes;
>>>>>>>
using Orchard.Environment.Features; |
<<<<<<<
using System.Collections.Generic;
using System.Linq;
=======
>>>>>>>
using System.Collections.Generic;
using System.Linq;
<<<<<<<
private static readonly List<Action> idleActions = new List<Action>();
enum Versions { ShapeManager = 221 }
=======
enum Versions { ShapeManager = 220 }
>>>>>>>
private static readonly List<Action> idleActions = new List<Action>();
enum Versions { ShapeManager = 221 } |
<<<<<<<
var assemblyLocation = Assembly.GetExecutingAssembly().Location;
var assemblyDirectory = Path.GetDirectoryName(assemblyLocation);
var parentDirectory = Directory.GetParent(assemblyDirectory);
var corePath = parentDirectory.FullName;
=======
DynamoRevit.InitializeUnits();
// Create a remote test config option specifying a fallback path
// one directory above the executing assembly. If the core path is not
// specified in the config, or the config is not present, it is assumed
// that the executing assembly's directory will be a Revit sub-folder, so
// we need to set core to the parent directory.
var remoteConfig = new RemoteTestSessionConfig(Path.GetFullPath(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + @"\..\"));
>>>>>>>
// Create a remote test config option specifying a fallback path
// one directory above the executing assembly. If the core path is not
// specified in the config, or the config is not present, it is assumed
// that the executing assembly's directory will be a Revit sub-folder, so
// we need to set core to the parent directory.
var remoteConfig = new RemoteTestSessionConfig(Path.GetFullPath(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + @"\..\")); |
<<<<<<<
CustomConsole.WriteLineOK("Aura successfully started!");
=======
//Networking init
NetworkInit.Init();
>>>>>>>
NetworkInit.Init();
CustomConsole.WriteLineOK("Aura successfully started!"); |
<<<<<<<
using Cosmos.HAL.PCInformation;
using System;
using System.Collections.Generic;
=======
using Cosmos.HAL;
using Cosmos.System.Network;
using System;
using IPv4 = Cosmos.System.Network.IPv4;
>>>>>>>
using Cosmos.HAL.PCInformation;
using System;
using System.Collections.Generic;
using Cosmos.HAL;
using Cosmos.System.Network;
using System;
using IPv4 = Cosmos.System.Network.IPv4;
<<<<<<<
else if (cmd.Equals("crashcpu"))
{
int value = 1;
value = value - 1;
int result = 1 / value; //Division by 0
}
else if (cmd.Equals("beep"))
{
Kernel.speaker.beep();
}
//else if (cmd.StartsWith("xml "))
//{
// Util.xml.CmdXmlParser.c_CmdXmlParser(cmd, 0, 4);
//}
#endregion Tests
=======
else if (cmd.Equals("net"))
{
Console.WriteLine("Finding network devices...");
//Cosmos.HAL.Drivers.PCI.Network.AMDPCNetII.FindAll();
Cosmos.HAL.Drivers.PCI.Network.AMDPCNetII nic = new Cosmos.HAL.Drivers.PCI.Network.AMDPCNetII(PCI.GetDevice(0x1022, 0x2000));
Console.WriteLine(nic.MACAddress);
IPv4.Address myIP = new IPv4.Address(192, 168, 169, 1);
IPv4.Address mySubnet = new IPv4.Address(255, 255, 255, 0);
IPv4.Address myGateway = new IPv4.Address(192, 168, 1, 1);
IPv4.Config myConfig = new IPv4.Config(myIP, mySubnet, myGateway);
NetworkStack.ConfigIP(nic, myConfig);
nic.Enable();
while (true)
{
NetworkStack.Update();
}
//PCIDevice device;
//device = PCI.GetDevice(0x1022, 0x2000);
//Cosmos.HAL.Drivers.PCI.Network.AMDPCNetII nic = new Cosmos.HAL.Drivers.PCI.Network.AMDPCNetII(device);
//NetworkDevice.Devices.Add(nic);
//Cosmos.System.Network.NetworkStack.Init();
//Cosmos.System.Network.IPv4.Address myIP = new Cosmos.System.Network.IPv4.Address(192, 168, 1, 128);
//Cosmos.System.Network.IPv4.Address mySubnet = new Cosmos.System.Network.IPv4.Address(255, 255, 255, 0);
//Cosmos.System.Network.IPv4.Address myGateway = new Cosmos.System.Network.IPv4.Address(192, 168, 135, 1);
//Cosmos.System.Network.IPv4.Config myConfig = new Cosmos.System.Network.IPv4.Config(myIP, mySubnet, myGateway);
//NetworkStack.ConfigIP(nic, myConfig);
//nic.Enable();
//Console.WriteLine("Found AMD PCNetII NIC on PCI " + device.bus + ":" + device.slot + ":" +
// device.function);
// Console.WriteLine("NIC IRQ: " + device.InterruptLine);
//Console.WriteLine("NIC MAC Address: " + nic.MACAddress.ToString());
//var xClient = new UdpClient(55341);
//xClient.Connect(new Address(192, 168, 1, 12), 55341);
// Cosmos.System.Network.IPv4.EndPoint source = new Cosmos.System.Network.IPv4.EndPoint(new Address(192, 168, 1, 12), 55341);
// xClient.Receive(ref source);
//xClient.Send(new byte[]
// {
// 0x48, 0x65, 0x6c, 0x6c, 0x6f, 0x20, 0x77, 0x6f, 0x72, 0x6c, 0x64, 0x21
// });
// NetworkStack.Update();
// xClient.Close();
Console.WriteLine("Done");
}
#endregion Tests
>>>>>>>
else if (cmd.Equals("crashcpu"))
{
int value = 1;
value = value - 1;
int result = 1 / value; //Division by 0
}
else if (cmd.Equals("beep"))
{
Kernel.speaker.beep();
}
//else if (cmd.StartsWith("xml "))
//{
// Util.xml.CmdXmlParser.c_CmdXmlParser(cmd, 0, 4);
//}
else if (cmd.Equals("net"))
{
Console.WriteLine("Finding network devices...");
//Cosmos.HAL.Drivers.PCI.Network.AMDPCNetII.FindAll();
Cosmos.HAL.Drivers.PCI.Network.AMDPCNetII nic = new Cosmos.HAL.Drivers.PCI.Network.AMDPCNetII(PCI.GetDevice(0x1022, 0x2000));
Console.WriteLine(nic.MACAddress);
IPv4.Address myIP = new IPv4.Address(192, 168, 169, 1);
IPv4.Address mySubnet = new IPv4.Address(255, 255, 255, 0);
IPv4.Address myGateway = new IPv4.Address(192, 168, 1, 1);
IPv4.Config myConfig = new IPv4.Config(myIP, mySubnet, myGateway);
NetworkStack.ConfigIP(nic, myConfig);
nic.Enable();
while (true)
{
NetworkStack.Update();
}
//PCIDevice device;
//device = PCI.GetDevice(0x1022, 0x2000);
//Cosmos.HAL.Drivers.PCI.Network.AMDPCNetII nic = new Cosmos.HAL.Drivers.PCI.Network.AMDPCNetII(device);
//NetworkDevice.Devices.Add(nic);
//Cosmos.System.Network.NetworkStack.Init();
//Cosmos.System.Network.IPv4.Address myIP = new Cosmos.System.Network.IPv4.Address(192, 168, 1, 128);
//Cosmos.System.Network.IPv4.Address mySubnet = new Cosmos.System.Network.IPv4.Address(255, 255, 255, 0);
//Cosmos.System.Network.IPv4.Address myGateway = new Cosmos.System.Network.IPv4.Address(192, 168, 135, 1);
//Cosmos.System.Network.IPv4.Config myConfig = new Cosmos.System.Network.IPv4.Config(myIP, mySubnet, myGateway);
//NetworkStack.ConfigIP(nic, myConfig);
//nic.Enable();
//Console.WriteLine("Found AMD PCNetII NIC on PCI " + device.bus + ":" + device.slot + ":" +
// device.function);
// Console.WriteLine("NIC IRQ: " + device.InterruptLine);
//Console.WriteLine("NIC MAC Address: " + nic.MACAddress.ToString());
//var xClient = new UdpClient(55341);
//xClient.Connect(new Address(192, 168, 1, 12), 55341);
// Cosmos.System.Network.IPv4.EndPoint source = new Cosmos.System.Network.IPv4.EndPoint(new Address(192, 168, 1, 12), 55341);
// xClient.Receive(ref source);
//xClient.Send(new byte[]
// {
// 0x48, 0x65, 0x6c, 0x6c, 0x6f, 0x20, 0x77, 0x6f, 0x72, 0x6c, 0x64, 0x21
// });
// NetworkStack.Update();
// xClient.Close();
Console.WriteLine("Done");
}
#endregion Tests
<<<<<<<
#region Util
else if (cmd.StartsWith("export"))
{
Util.EnvVar.c_Export(cmd);
}
else if (cmd.Equals("lspci"))
{
Util.Lspci.c_Lspci();
}
=======
#region Util
>>>>>>>
#region Util
else if (cmd.StartsWith("export"))
{
Util.EnvVar.c_Export(cmd);
}
else if (cmd.Equals("lspci"))
{
Util.Lspci.c_Lspci();
}
<<<<<<<
Console.WriteLine();
#endregion Util
=======
#endregion Util
>>>>>>>
Console.WriteLine();
#endregion Util |
<<<<<<<
Console.WriteLine("RxOverflow!");
CurAddressPointerReadRegister = (UInt16)(CurBufferAddressRegister - 0x10);
cur_status = (UInt16)(cur_status | 0x01);
=======
CurAddressPointerReadRegister = (ushort)(CurBufferAddressRegister - 0x10);
cur_status = (ushort)(cur_status | 0x01);
>>>>>>>
Console.WriteLine("RxOverflow!");
CurAddressPointerReadRegister = (ushort)(CurBufferAddressRegister - 0x10);
cur_status = (ushort)(cur_status | 0x01); |
<<<<<<<
private readonly ActionTypePassed _actionTypePassed;
=======
private ActionTypePassed _actionTypePassed;
private string _title;
>>>>>>>
private string _title;
private readonly ActionTypePassed _actionTypePassed;
<<<<<<<
public BootstrapActionLink IconAppend(string customCssClass)
{
this._iconAppendCustomClass = customCssClass;
return this;
}
=======
public BootstrapActionLink Title(string title)
{
this._title = title;
return this;
}
>>>>>>>
public BootstrapActionLink IconAppend(string customCssClass)
{
this._iconAppendCustomClass = customCssClass;
return this;
}
public BootstrapActionLink Title(string title)
{
this._title = title;
return this;
} |
<<<<<<<
public const string OptionDebugMode = "Debug mode";
public const bool OptionDebugModeDefaultValue = false;
private const string RegOptionDebugMode = "DebugMode";
public const string OptionDebugModeDescription =
=======
public const string OptionUserDebugMode = "Debug mode";
public const bool OptionUserDebugModeDefaultValue = false;
public const string OptionUserDebugModeDescription =
>>>>>>>
public const string OptionDebugMode = "Debug mode";
public const bool OptionDebugModeDefaultValue = false;
public const string OptionDebugModeDescription =
<<<<<<<
public override bool DebugMode => RegistryReader.ReadBool(RegOptionGeneralBase, RegOptionDebugMode, OptionDebugModeDefaultValue);
=======
public override bool UserDebugMode => XmlOptions.UserDebugMode ?? OptionUserDebugModeDefaultValue;
>>>>>>>
public override bool DebugMode => XmlOptions.DebugMode ?? OptionDebugModeDefaultValue; |
<<<<<<<
using System.Text.RegularExpressions;
=======
using System.Threading;
using System.Threading.Tasks;
>>>>>>>
using System.Text.RegularExpressions;
using System.Threading;
using System.Threading.Tasks;
<<<<<<<
public static void ValidateRegex(string pattern)
{
try
{
Regex.Match(string.Empty, pattern);
}
catch (ArgumentException e)
{
throw new Exception($"Invalid regular expression \"{pattern}\", exception message: {e.Message}");
}
}
public static void ValidateTraitRegexes(string value)
{
// The parser will throw if the value is not well formed.
var parser = new RegexTraitParser(null);
parser.ParseTraitsRegexesString(value, ignoreErrors: false);
}
=======
/// <exception cref="AggregateException">If at least one of the actions has thrown an exception</exception>
public static bool SpawnAndWait(Action[] actions, int timeoutInMs = Timeout.Infinite)
{
var tasks = new Task[actions.Length];
for (int i = 0; i < actions.Length; i++)
{
tasks[i] = Task.Factory.StartNew(actions[i]);
}
return Task.WaitAll(tasks, timeoutInMs);
}
>>>>>>>
/// <exception cref="AggregateException">If at least one of the actions has thrown an exception</exception>
public static bool SpawnAndWait(Action[] actions, int timeoutInMs = Timeout.Infinite)
{
var tasks = new Task[actions.Length];
for (int i = 0; i < actions.Length; i++)
{
tasks[i] = Task.Factory.StartNew(actions[i]);
}
return Task.WaitAll(tasks, timeoutInMs);
}
public static void ValidateRegex(string pattern)
{
try
{
Regex.Match(string.Empty, pattern);
}
catch (ArgumentException e)
{
throw new Exception($"Invalid regular expression \"{pattern}\", exception message: {e.Message}");
}
}
public static void ValidateTraitRegexes(string value)
{
// The parser will throw if the value is not well formed.
var parser = new RegexTraitParser(null);
parser.ParseTraitsRegexesString(value, ignoreErrors: false);
} |
<<<<<<<
int exitCode = _processExecutor.ExecuteCommandBlocking(
=======
_processExecutor.ExecuteCommandBlocking(
>>>>>>>
int exitCode = _processExecutor.ExecuteCommandBlocking(
<<<<<<<
if (printTestOutput)
_logger.LogInfo($"{_threadName}<<<<<<<<<<<<<<< End of Output");
ExecutableResults.Add(new ExecutableResult(executable, exitCode, streamingParser.ExitCodeOutput,
streamingParser.ExitCodeSkip));
=======
>>>>>>>
ExecutableResults.Add(new ExecutableResult(executable, exitCode, streamingParser.ExitCodeOutput,
streamingParser.ExitCodeSkip)); |
<<<<<<<
var testCaseLocations = GetTestCaseLocations(testCaseDescriptors, _settings.GetPathExtension(_executable), _settings.GetAdditionalPdbs(_executable));
=======
var resolver = new TestCaseResolver(_executable, _settings.GetPathExtension(_executable), _diaResolverFactory, _settings.ParseSymbolInformation, _logger);
>>>>>>>
var resolver = new TestCaseResolver(_executable, _settings.GetPathExtension(_executable), _settings.GetAdditionalPdbs(_executable), _diaResolverFactory, _settings.ParseSymbolInformation, _logger);
<<<<<<<
private Dictionary<string, TestCaseLocation> GetTestCaseLocations(IList<TestCaseDescriptor> testCaseDescriptors, string pathExtension, IEnumerable<string> additionalPdbs)
{
var testMethodSignatures = new HashSet<string>();
foreach (var descriptor in testCaseDescriptors)
{
foreach (var signature in _signatureCreator.GetTestMethodSignatures(descriptor))
{
testMethodSignatures.Add(signature);
}
}
string filterString = "*" + GoogleTestConstants.TestBodySignature;
var resolver = new TestCaseResolver(_diaResolverFactory, _logger);
return resolver.ResolveAllTestCases(_executable, testMethodSignatures, filterString, pathExtension, additionalPdbs);
}
=======
>>>>>>> |
<<<<<<<
Directory.CreateDirectory(Path.GetDirectoryName(expectationFile));
Assert.Inconclusive("Test results changed and have been overwritten. Differences: " + msg);
=======
Assert.Inconclusive("Test results changed and have been overwritten.");
>>>>>>>
Assert.Inconclusive("Test results changed and have been overwritten. Differences: " + msg); |
<<<<<<<
ο»Ώ// This file has been modified by Microsoft on 6/2017.
using System;
=======
ο»Ώusing System;
using System.Collections.Generic;
>>>>>>>
ο»Ώ// This file has been modified by Microsoft on 6/2017.
using System;
using System.Collections.Generic;
<<<<<<<
using System.Text.RegularExpressions;
=======
using System.Linq;
using System.Text;
>>>>>>>
using System.Linq;
using System.Text;
using System.Text.RegularExpressions;
<<<<<<<
public static void ValidateRegex(string pattern)
{
try
{
Regex.Match(string.Empty, pattern);
}
catch (ArgumentException e)
{
throw new Exception($"Invalid regular expression \"{pattern}\", exception message: {e.Message}");
}
}
public static void ValidateTraitRegexes(string value)
{
// The parser will throw if the value is not well formed.
var parser = new RegexTraitParser(null);
parser.ParseTraitsRegexesString(value, ignoreErrors: false);
}
=======
public static bool BinaryFileContainsStrings(string executable, Encoding encoding, IEnumerable<string> strings)
{
byte[] file = File.ReadAllBytes(executable);
return strings.All(s => file.IndexOf(encoding.GetBytes(s)) >= 0);
}
>>>>>>>
public static void ValidateRegex(string pattern)
{
try
{
Regex.Match(string.Empty, pattern);
}
catch (ArgumentException e)
{
throw new Exception($"Invalid regular expression \"{pattern}\", exception message: {e.Message}");
}
}
public static void ValidateTraitRegexes(string value)
{
// The parser will throw if the value is not well formed.
var parser = new RegexTraitParser(null);
parser.ParseTraitsRegexesString(value, ignoreErrors: false);
}
public static bool BinaryFileContainsStrings(string executable, Encoding encoding, IEnumerable<string> strings)
{
byte[] file = File.ReadAllBytes(executable);
return strings.All(s => file.IndexOf(encoding.GetBytes(s)) >= 0);
} |
Subsets and Splits
No saved queries yet
Save your SQL queries to embed, download, and access them later. Queries will appear here once saved.